From 39276b4b035aaf7968cd16740235399fd0221039 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 11 Feb 2019 13:50:56 -0500 Subject: [PATCH] Default wave tweaks / Zone reseach requirements changed --- core/src/io/anuke/mindustry/content/Blocks.java | 2 +- core/src/io/anuke/mindustry/content/Zones.java | 2 +- core/src/io/anuke/mindustry/game/Rules.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 341efc7e6a..faa44e129c 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -980,7 +980,7 @@ public class Blocks implements ContentList{ }}; coreFoundation = new CoreBlock("core-foundation"){{ - requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000)); + requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 3000, Items.silicon, 2000)); health = 2000; itemCapacity = 6000; diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 386d715c69..628e9673e8 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -331,7 +331,7 @@ public class Zones implements ContentList{ itemRequirements = ItemStack.with(Items.silicon, 8000, Items.titanium, 6000, Items.graphite, 4000); conditionWave = 20; zoneRequirements = new Zone[]{stainedMountains}; - blockRequirements = new Block[]{Blocks.launchPad, Blocks.unloader, Blocks.coreFoundation}; + blockRequirements = new Block[]{Blocks.launchPad, Blocks.unloader}; resources = new Item[]{Items.scrap}; rules = () -> new Rules(){{ waves = true; diff --git a/core/src/io/anuke/mindustry/game/Rules.java b/core/src/io/anuke/mindustry/game/Rules.java index ce6d1c7552..b7d9c86dc7 100644 --- a/core/src/io/anuke/mindustry/game/Rules.java +++ b/core/src/io/anuke/mindustry/game/Rules.java @@ -24,7 +24,7 @@ public class Rules{ /**Player respawn time in ticks.*/ public float respawnTime = 60 * 4; /**Time between waves in ticks.*/ - public float waveSpacing = 60 * 60; + public float waveSpacing = 60 * 60 * 2; /**Zone ID, -1 for invalid zone.*/ public byte zone = -1; /**Spawn layout. Since only zones modify this, it should be assigned on save load.*/