diff --git a/core/assets-raw/sprites/blocks/environment/coal1.png b/core/assets-raw/sprites/blocks/environment/coal1.png index a65216e00d..3caf5ed1b5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal1.png and b/core/assets-raw/sprites/blocks/environment/coal1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/copper3.png index 47128d4f81..c2f1a903ed 100644 Binary files a/core/assets-raw/sprites/blocks/environment/copper3.png and b/core/assets-raw/sprites/blocks/environment/copper3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/darksand2.png b/core/assets-raw/sprites/blocks/environment/darksand2.png index 2ee445aba9..978f2d22d1 100644 Binary files a/core/assets-raw/sprites/blocks/environment/darksand2.png and b/core/assets-raw/sprites/blocks/environment/darksand2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/salt.png b/core/assets-raw/sprites/blocks/environment/salt.png index df9fd72915..f6cde0093c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/salt.png and b/core/assets-raw/sprites/blocks/environment/salt.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand2.png b/core/assets-raw/sprites/blocks/environment/sand2.png index 2d6b23f129..c13afa2030 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand2.png and b/core/assets-raw/sprites/blocks/environment/sand2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/titanium1.png b/core/assets-raw/sprites/blocks/environment/titanium1.png index 21d2c9a938..4cfd1bf647 100644 Binary files a/core/assets-raw/sprites/blocks/environment/titanium1.png and b/core/assets-raw/sprites/blocks/environment/titanium1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/titanium2.png b/core/assets-raw/sprites/blocks/environment/titanium2.png index e1edbe3046..60e9d13134 100644 Binary files a/core/assets-raw/sprites/blocks/environment/titanium2.png and b/core/assets-raw/sprites/blocks/environment/titanium2.png differ diff --git a/core/assets/maps/islands.msav b/core/assets/maps/islands.msav index 66ad2aa646..48e13f8b6f 100644 Binary files a/core/assets/maps/islands.msav and b/core/assets/maps/islands.msav differ diff --git a/core/assets/maps/nuclearProductionComplex.msav b/core/assets/maps/nuclearProductionComplex.msav index 248f9096fd..4ce3e3484e 100644 Binary files a/core/assets/maps/nuclearProductionComplex.msav and b/core/assets/maps/nuclearProductionComplex.msav differ diff --git a/core/assets/maps/tarFields.msav b/core/assets/maps/tarFields.msav index 48eb25f358..45a9848818 100644 Binary files a/core/assets/maps/tarFields.msav and b/core/assets/maps/tarFields.msav differ diff --git a/core/assets/music/game5.mp3 b/core/assets/music/game5.mp3 new file mode 100644 index 0000000000..3e421d83ae Binary files /dev/null and b/core/assets/music/game5.mp3 differ diff --git a/core/assets/music/game6.mp3 b/core/assets/music/game6.mp3 new file mode 100644 index 0000000000..9eb948ab5e Binary files /dev/null and b/core/assets/music/game6.mp3 differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 5798f3aa23..884068b960 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 47d8021cfa..83dd14a279 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index a73f66b3ca..b3776249dc 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 9bfdb72ef2..b8fa620413 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index dac4f7486a..6184ab6ec4 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 72de064f1c..ca7013fa3f 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -153,7 +153,7 @@ public class Zones implements ContentList{ launchPeriod = 10; zoneRequirements = ZoneRequirement.with(ruinousShores, 20); blockRequirements = new Block[]{Blocks.coalCentrifuge, Blocks.conduit, Blocks.wave}; - resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand}; + resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium, Items.sand}; }}; desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift")){{ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 6a7582a9b1..10a22a92d8 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -272,8 +272,6 @@ public class Control implements ApplicationListener{ Tile core = state.teams.get(defaultTeam).cores.first(); core.entity.items.clear(); - state.set(State.playing); - control.saves.zoneSave(); logic.play(); state.rules.waveTimer = false; state.rules.waveSpacing = 60f * 30; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 77bdd2bcbe..2a56882dcd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -3,7 +3,8 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.*; import io.anuke.arc.collection.*; import io.anuke.arc.files.*; -import io.anuke.arc.function.*; +import io.anuke.arc.graphics.*; +import io.anuke.arc.graphics.Texture.*; import io.anuke.arc.input.*; import io.anuke.arc.scene.*; import io.anuke.arc.scene.event.*; @@ -41,6 +42,7 @@ public class SettingsMenuDialog extends SettingsDialog{ }); shown(() -> { + back(); if(!state.is(State.menu)){ wasPaused = state.is(State.paused); state.set(State.paused); @@ -60,14 +62,9 @@ public class SettingsMenuDialog extends SettingsDialog{ menu = new Table("button"); - Consumer s = table -> { - table.row(); - table.addImageTextButton("$back", "icon-arrow-left", iconsize, this::back).size(240f, 60f).colspan(2).padTop(15f); - }; - - game = new SettingsTable(s); - graphics = new SettingsTable(s); - sound = new SettingsTable(s); + game = new SettingsTable(); + graphics = new SettingsTable(); + sound = new SettingsTable(); prefs = new Table(); prefs.top(); @@ -104,8 +101,6 @@ public class SettingsMenuDialog extends SettingsDialog{ row(); add(buttons).fillX(); - hidden(this::back); - addSettings(); } @@ -193,6 +188,7 @@ public class SettingsMenuDialog extends SettingsDialog{ }).size(220f, 60f).pad(6).left(); table.add(); table.row(); + hide(); } }); @@ -251,8 +247,6 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("lasers", true); graphics.checkPref("pixelate", false); - //TODO is this necessary? - /* graphics.checkPref("linear", false, b -> { for(Texture tex : Core.atlas.getTextures()){ TextureFilter filter = b ? TextureFilter.Linear : TextureFilter.Nearest; @@ -265,7 +259,7 @@ public class SettingsMenuDialog extends SettingsDialog{ TextureFilter filter = TextureFilter.Linear; tex.setFilter(filter, filter); } - }*/ + } } private void back(){ @@ -276,17 +270,23 @@ public class SettingsMenuDialog extends SettingsDialog{ private void visible(int index){ prefs.clearChildren(); - Table table = new Table[]{game, graphics, sound}[index]; - prefs.add(table); + prefs.add(new Table[]{game, graphics, sound}[index]); } @Override public void addCloseButton(){ - buttons.addImageTextButton("$menu", "icon-arrow-left", 30f, this::hide).size(230f, 64f); + buttons.addImageTextButton("$back", "icon-arrow-left", 30f, () -> { + if(prefs.getChildren().first() != menu){ + back(); + }else{ + hide(); + } + }).size(230f, 64f); keyDown(key -> { - if(key == KeyCode.ESCAPE || key == KeyCode.BACK) + if(key == KeyCode.ESCAPE || key == KeyCode.BACK){ hide(); + } }); } } diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java index 3a7b050c6a..4012013965 100644 --- a/tools/src/io/anuke/mindustry/Generators.java +++ b/tools/src/io/anuke/mindustry/Generators.java @@ -249,7 +249,7 @@ public class Generators{ Image image = new Image(32, 32); Image shadow = ImagePacker.get(item.name + (i + 1)); - int offset = image.width / tilesize; + int offset = image.width / tilesize - 1; for(int x = 0; x < image.width; x++){ for(int y = offset; y < image.height; y++){