diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap index 130da8e7a2..6b8bfc55f9 100644 Binary files a/core/assets/maps/frozenForest.mmap and b/core/assets/maps/frozenForest.mmap differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 4b9103edb5..3ca432a273 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -751,41 +751,41 @@ public class Blocks implements ContentList{ }}; conduit = new Conduit("conduit"){{ - requirements(Category.liquid, ItemStack.with(Items.lead, 1)); + requirements(Category.liquid, ItemStack.with(Items.metaglass, 1)); health = 45; }}; pulseConduit = new Conduit("pulse-conduit"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.lead, 1)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 1, Items.metaglass, 2)); liquidCapacity = 16f; liquidFlowFactor = 4.9f; health = 90; }}; liquidRouter = new LiquidRouter("liquid-router"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4)); liquidCapacity = 20f; }}; liquidTank = new LiquidTank("liquid-tank"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.lead, 50)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 50, Items.metaglass, 50)); size = 3; liquidCapacity = 1500f; health = 500; }}; liquidJunction = new LiquidJunction("liquid-junction"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.lead, 4)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 4, Items.metaglass, 4)); }}; bridgeConduit = new LiquidExtendingBridge("bridge-conduit"){{ - requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.lead, 8)); + requirements(Category.liquid, ItemStack.with(Items.titanium, 8, Items.metaglass, 8)); range = 4; hasPower = false; }}; phaseConduit = new LiquidBridge("phase-conduit"){{ - requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.lead, 20, Items.titanium, 20)); + requirements(Category.liquid, ItemStack.with(Items.phasefabric, 10, Items.silicon, 15, Items.metaglass, 40, Items.titanium, 20)); range = 12; hasPower = true; consumes.power(0.30f); diff --git a/core/src/io/anuke/mindustry/content/Loadouts.java b/core/src/io/anuke/mindustry/content/Loadouts.java index f4c647f5b7..a9c7f5bc3f 100644 --- a/core/src/io/anuke/mindustry/content/Loadouts.java +++ b/core/src/io/anuke/mindustry/content/Loadouts.java @@ -6,6 +6,7 @@ import io.anuke.mindustry.type.Loadout; public class Loadouts implements ContentList{ public static Loadout basicShard, + advancedShard, basicFoundation, basicNucleus; @@ -20,14 +21,23 @@ public class Loadouts implements ContentList{ " C# C# " ); + advancedShard = new Loadout( + " ### ", + " #1# ", + "#######", + "C#^ ^C#", + " ## ## ", + " C# C# " + ); + basicFoundation = new Loadout( " #### ", " #### ", " #2## ", " #### ", - " ^ ^ ", - " ## ## ", - " C# C# " + " ^^^^ ", + " ###### ", + " C#C#C# " ); basicNucleus = new Loadout( diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 55c57289bd..059f2261e9 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -115,7 +115,7 @@ public class Zones implements ContentList{ }}; }}; - frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 2) + frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 1) .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{ loadout = Loadouts.basicFoundation; baseLaunchCost = ItemStack.with(Items.copper, 100); diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index ffbab24e7b..6726f6fd7f 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -116,7 +116,7 @@ public class GlobalData{ //set up default values if(!Core.settings.has("item-" + Items.copper.name)){ - addItem(Items.copper, 300); + addItem(Items.copper, 50); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index bb794e667a..1a6e383dd3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -8,6 +8,7 @@ import io.anuke.arc.scene.ui.Tooltip; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.utils.UIUtils; import io.anuke.mindustry.Vars; +import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.Pal; @@ -77,6 +78,6 @@ public class DatabaseDialog extends FloatingDialog{ } boolean unlocked(UnlockableContent content){ - return !Vars.world.isZone() || content.unlocked(); + return (!Vars.world.isZone() && !Vars.state.is(State.menu)) || content.unlocked(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java index 5b4c1a99a5..ef6d0d5c7c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java +++ b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java @@ -28,7 +28,7 @@ public interface SelectionTrait{ for(Item item : items){ if(!data.isUnlocked(item) && world.isZone()) continue; - ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> {}).group(group).get(); + ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> control.input(0).frag.config.hideConfig()).group(group).get(); button.changed(() -> consumer.accept(button.isChecked() ? item : null)); button.getStyle().imageUp = new TextureRegionDrawable(item.icon(Icon.medium)); button.update(() -> button.setChecked(holder.get() == item));