Zone tweaks

This commit is contained in:
Anuken
2019-02-28 12:03:24 -05:00
parent 2aff73a958
commit 914f1b38f8
5 changed files with 10 additions and 7 deletions
Binary file not shown.
Binary file not shown.
@@ -51,8 +51,8 @@ public class UnitTypes implements ContentList{
}}; }};
crawler = new UnitType("crawler", Crawler.class, Crawler::new){{ crawler = new UnitType("crawler", Crawler.class, Crawler::new){{
maxVelocity = 1.1f; maxVelocity = 1.2f;
speed = 0.22f; speed = 0.26f;
drag = 0.4f; drag = 0.4f;
hitsize = 8f; hitsize = 8f;
mass = 1.75f; mass = 1.75f;
@@ -75,9 +75,9 @@ public class Zones implements ContentList{
rules = () -> new Rules(){{ rules = () -> new Rules(){{
waves = true; waves = true;
waveTimer = true; waveTimer = true;
waveSpacing = 60 * 60 * 1.5f; waveSpacing = 60 * 60 * 1f;
spawns = Array.with( spawns = Array.with(
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(UnitTypes.crawler){{
unitScaling = 1.5f; unitScaling = 1.5f;
}}, }},
@@ -89,7 +89,7 @@ public class Zones implements ContentList{
}}, }},
new SpawnGroup(UnitTypes.dagger){{ new SpawnGroup(UnitTypes.dagger){{
begin = 10; begin = 3;
unitScaling = 1.5f; unitScaling = 1.5f;
}}, }},
@@ -446,7 +446,7 @@ public class Zones implements ContentList{
launchPeriod = 20; launchPeriod = 20;
zoneRequirements = new Zone[]{ruinousShores}; zoneRequirements = new Zone[]{ruinousShores};
blockRequirements = new Block[]{Blocks.thermalGenerator}; blockRequirements = new Block[]{Blocks.thermalGenerator};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium}; resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand};
rules = () -> new Rules(){{ rules = () -> new Rules(){{
waves = true; waves = true;
waveTimer = true; waveTimer = true;
@@ -549,7 +549,7 @@ public class Zones implements ContentList{
launchPeriod = 15; launchPeriod = 15;
zoneRequirements = new Zone[]{impact}; zoneRequirements = new Zone[]{impact};
blockRequirements = new Block[]{Blocks.blastDrill, Blocks.thermalGenerator}; blockRequirements = new Block[]{Blocks.blastDrill, Blocks.thermalGenerator};
resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium}; resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium, Items.sand};
rules = () -> new Rules(){{ rules = () -> new Rules(){{
waves = true; waves = true;
waveTimer = true; waveTimer = true;
@@ -17,6 +17,8 @@ import io.anuke.mindustry.maps.generators.Generator;
import io.anuke.mindustry.maps.generators.MapGenerator; import io.anuke.mindustry.maps.generators.MapGenerator;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import java.util.Arrays;
import static io.anuke.mindustry.Vars.data; import static io.anuke.mindustry.Vars.data;
import static io.anuke.mindustry.Vars.state; import static io.anuke.mindustry.Vars.state;
@@ -133,6 +135,7 @@ public class Zone extends UnlockableContent{
@Override @Override
public void init(){ public void init(){
generator.init(loadout); generator.init(loadout);
Arrays.sort(resources);
Array<ItemStack> arr = Core.settings.getObject(name + "-starting-items", Array.class, () -> null); Array<ItemStack> arr = Core.settings.getObject(name + "-starting-items", Array.class, () -> null);
if(arr != null){ if(arr != null){