diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png index 2b30255f53..427eecae3c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png and b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks-large.png b/core/assets-raw/sprites/blocks/environment/icerocks-large.png index 0a2f8b5d40..f43c40e61a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks-large.png and b/core/assets-raw/sprites/blocks/environment/icerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks1.png b/core/assets-raw/sprites/blocks/environment/icerocks1.png index c690d8d2f8..8b93485477 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks1.png and b/core/assets-raw/sprites/blocks/environment/icerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks2.png b/core/assets-raw/sprites/blocks/environment/icerocks2.png index 9b2cd18d2f..7264d6aa03 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks2.png and b/core/assets-raw/sprites/blocks/environment/icerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks1.png b/core/assets-raw/sprites/blocks/environment/saltrocks1.png index 5ad770404e..74045a27a7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks1.png and b/core/assets-raw/sprites/blocks/environment/saltrocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks2.png b/core/assets-raw/sprites/blocks/environment/saltrocks2.png index b44d62eba4..25b801e550 100644 Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks2.png and b/core/assets-raw/sprites/blocks/environment/saltrocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png index ff3efd9395..e9148b71b9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png and b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks1.png b/core/assets-raw/sprites/blocks/environment/sandrocks1.png index 2217bbd5e0..55f9afbbd5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks1.png and b/core/assets-raw/sprites/blocks/environment/sandrocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks2.png b/core/assets-raw/sprites/blocks/environment/sandrocks2.png index b2dacd5abf..2078ee2f2d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks2.png and b/core/assets-raw/sprites/blocks/environment/sandrocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png index b881f006f3..eb0a0f8ad8 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png and b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks1.png b/core/assets-raw/sprites/blocks/environment/snowrocks1.png index 32bb74348d..c61d6f7f9e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks1.png and b/core/assets-raw/sprites/blocks/environment/snowrocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks2.png b/core/assets-raw/sprites/blocks/environment/snowrocks2.png index 8ddeafa1ff..3d659efc32 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks2.png and b/core/assets-raw/sprites/blocks/environment/snowrocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster1.png b/core/assets-raw/sprites/blocks/environment/spore-cluster1.png index 9e3738039b..9bfdd4a4d2 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster1.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster2.png b/core/assets-raw/sprites/blocks/environment/spore-cluster2.png index 4aaa8d86e3..4696b76ed9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster2.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster3.png b/core/assets-raw/sprites/blocks/environment/spore-cluster3.png index 57462c7762..047cada29a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster3.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster3.png differ diff --git a/core/assets-raw/sprites/ui/inventory.9.png b/core/assets-raw/sprites/ui/inventory.9.png index 7d6bd10d44..0bbff5a0fe 100644 Binary files a/core/assets-raw/sprites/ui/inventory.9.png and b/core/assets-raw/sprites/ui/inventory.9.png differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 69bee62d95..b47ce31d52 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 e46e8052d8..d4d4211c33 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 cb846cb23e..75381e6536 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 68bba1e639..b17996082b 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 7a5fa9f88e..6db856796b 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/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 03ef92ed63..d66ecd9757 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1308,7 +1308,7 @@ public class Blocks implements ContentList{ inaccuracy = 17f; shootCone = 35f; - health = 260 * size * size; + health = 200 * size * size; }}; scorch = new ItemTurret("scorch"){{ @@ -1444,7 +1444,7 @@ public class Blocks implements ContentList{ burstSpacing = 3f; shots = 4; ammoUseEffect = Fx.shellEjectBig; - health = 360; + health = 240 * size * size;; }}; fuse = new ItemTurret("fuse"){{ @@ -1521,7 +1521,7 @@ public class Blocks implements ContentList{ shootShake = 2f; range = 290f; - health = 550; + health = 130 * size * size; }}; cyclone = new ItemTurret("cyclone"){{ diff --git a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java index a6097b77ab..90ec2d7d8f 100644 --- a/core/src/io/anuke/mindustry/graphics/MenuRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/MenuRenderer.java @@ -213,8 +213,6 @@ public class MenuRenderer implements Disposable{ } } - //Draw.rect("error", world.width() * tilesize/2f, world.height() * tilesize/2f, 100f, 100f); - cacheWall = batch.endCache(); Core.batch = prev; @@ -281,15 +279,15 @@ public class MenuRenderer implements Disposable{ } private void flyers(PositionConsumer cons){ - float tw = width * tilesize * 2; - float th = height * tilesize * 2; + float tw = width * tilesize * 2.5f; + float th = height * tilesize * 1.5f; float range = 500f; float offset = -600f; for(int i = 0; i < flyers; i++){ - Tmp.v1.trns(flyerRot, time * (2.5f + flyerType.speed)); + Tmp.v1.trns(flyerRot, time * (2f + flyerType.speed)); - cons.accept((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % tw, + cons.accept((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % (tw + Mathf.randomSeed(i + 5, 0, 500)), (Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java index a293d46c18..bafcbbafc0 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java @@ -14,13 +14,21 @@ public class MapPlayDialog extends FloatingDialog{ CustomRulesDialog dialog = new CustomRulesDialog(); Rules rules; Gamemode selectedGamemode = Gamemode.survival; + Map lastMap; public MapPlayDialog(){ super(""); setFillParent(false); + + onResize(() -> { + if(lastMap != null){ + show(lastMap); + } + }); } public void show(Map map){ + this.lastMap = map; title.setText(map.name()); cont.clearChildren(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index 949c6f2736..b7da02cdf2 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -52,6 +52,7 @@ public class BlockInventoryFragment extends Fragment{ @Override public void build(Group parent){ table = new Table(); + table.setName("inventory"); table.setTransform(true); parent.setTransform(true); parent.addChild(table); @@ -69,10 +70,11 @@ public class BlockInventoryFragment extends Fragment{ } public void hide(){ - table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interpolation.pow3Out), Actions.visible(false), Actions.run(() -> { - table.clear(); + table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interpolation.pow3Out), Actions.run(() -> { + table.clearChildren(); + table.clearListeners(); table.update(null); - })); + }), Actions.visible(false)); table.touchable(Touchable.disabled); tile = null; } @@ -82,9 +84,11 @@ public class BlockInventoryFragment extends Fragment{ IntSet container = new IntSet(); table.clearChildren(); + table.clearActions(); table.background("inventory"); table.touchable(Touchable.enabled); table.update(() -> { + if(state.is(State.menu) || tile == null || tile.entity == null || !tile.block().isAccessible() || tile.entity.items.total() == 0){ hide(); }else{ @@ -170,9 +174,13 @@ public class BlockInventoryFragment extends Fragment{ updateTablePosition(); + table.visible(true); + if(actions){ - table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true), - Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out)); + table.setScale(0f, 1f); + table.actions(Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out)); + }else{ + table.setScale(1f, 1f); } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index cc00cf2c44..ce919290eb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -146,7 +146,7 @@ public class MenuFragment extends Fragment{ new Buttoni("$play", "icon-play-2", new Buttoni("$campaign", "icon-play-2", ui.deploy::show), new Buttoni("$joingame", "icon-add", ui.join::show), - new Buttoni("$customgame", "icon-terrain", ui.custom::show), + new Buttoni("$customgame", "icon-editor", ui.custom::show), new Buttoni("$loadgame", "icon-load", ui.load::show) ), new Buttoni("$editor", "icon-editor", ui.maps::show),