From 7889db43a8ec59324bfe980cd309c42e741edf01 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Jan 2019 09:46:49 -0500 Subject: [PATCH] Zone generator requirement --- core/src/io/anuke/mindustry/editor/MapRenderer.java | 1 - .../mindustry/maps/generators/BasicGenerator.java | 13 +++++++++++++ .../mindustry/maps/generators/RandomGenerator.java | 3 +-- core/src/io/anuke/mindustry/type/Zone.java | 5 +++-- 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index 2097124959..fac6adf728 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -99,7 +99,6 @@ public class MapRenderer implements Disposable{ private void render(int wx, int wy){ int x = wx / chunksize, y = wy / chunksize; IndexedRenderer mesh = chunks[x][y]; - //TileDataMarker data = editor.getMap().readAt(wx, wy); byte bf = editor.getMap().read(wx, wy, DataPosition.floor); byte bw = editor.getMap().read(wx, wy, DataPosition.wall); byte btr = editor.getMap().read(wx, wy, DataPosition.rotationTeam); diff --git a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java new file mode 100644 index 0000000000..5cbf6a4ea1 --- /dev/null +++ b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java @@ -0,0 +1,13 @@ +package io.anuke.mindustry.maps.generators; + +public class BasicGenerator extends RandomGenerator{ + + public BasicGenerator(int width, int height){ + super(width, height); + } + + @Override + public void generate(int x, int y){ + + } +} diff --git a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java b/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java index f85e228ccb..89396d1eaa 100644 --- a/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/RandomGenerator.java @@ -9,9 +9,8 @@ public abstract class RandomGenerator extends Generator{ protected Block floor; protected Block block; - public RandomGenerator(int width, int height, Block floor){ + public RandomGenerator(int width, int height){ super(width, height); - this.floor = floor; } @Override diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index 68e4163191..caaf693533 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -8,11 +8,12 @@ import io.anuke.mindustry.maps.generators.Generator; public class Zone extends UnlockableContent{ public final String name; + public final Generator generator; public ItemStack[] deployCost = {}; - public Generator generator; - public Zone(String name){ + public Zone(String name, Generator generator){ this.name = name; + this.generator = generator; } @Override