From fe765e5a5baaa4396dc0fa678d267246b5a31226 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 4 Feb 2019 22:04:00 -0500 Subject: [PATCH] Fixed infinite copper bug --- core/src/io/anuke/mindustry/content/Zones.java | 2 +- core/src/io/anuke/mindustry/core/GameState.java | 2 +- core/src/io/anuke/mindustry/game/GlobalData.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 58dfd7fe7c..6e6eca1c1a 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -61,7 +61,7 @@ public class Zones implements ContentList{ }}; craters = new Zone("craters", new MapGenerator("craters", 1).dist(0)){{ - deployCost = ItemStack.with(Items.copper, 300); + deployCost = ItemStack.with(Items.copper, 200); startingItems = ItemStack.with(Items.copper, 200); conditionWave = 15; itemRequirements = ItemStack.with(Items.copper, 2000); diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java index b1d19aa9ec..fd521bf2c0 100644 --- a/core/src/io/anuke/mindustry/core/GameState.java +++ b/core/src/io/anuke/mindustry/core/GameState.java @@ -38,7 +38,7 @@ public class GameState{ } public boolean isPaused(){ - return is(State.paused) && !Net.active(); + return (is(State.paused) && !Net.active()) || gameOver; } public boolean is(State astate){ diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index d12c5d1889..63acfe5100 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -119,8 +119,8 @@ public class GlobalData{ } //set up default values - if(!Core.settings.has("item-" + Items.copper)){ - addItem(Items.copper, 500); + if(!Core.settings.has("item-" + Items.copper.name)){ + addItem(Items.copper, 300); } }