Fixed infinite copper bug

This commit is contained in:
Anuken
2019-02-04 22:04:00 -05:00
parent 6e7514491c
commit fe765e5a5b
3 changed files with 4 additions and 4 deletions

View File

@@ -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);

View File

@@ -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){

View File

@@ -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);
}
}