diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 88ee998208..eafd18e1a2 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 39035db4af..e70e6fad36 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5be52a0dd0..f558d46d57 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1728,6 +1728,7 @@ public class Blocks implements ContentList{ constructTime = 60f * 60f; upgrades = new UnitType[][]{ + {UnitTypes.revenant, UnitTypes.lich}, }; }}; @@ -1742,6 +1743,7 @@ public class Blocks implements ContentList{ constructTime = 60f * 60f * 3; upgrades = new UnitType[][]{ + {UnitTypes.lich, UnitTypes.reaper}, }; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b8f023f4b7..6254716aaf 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -414,6 +414,27 @@ public class UnitTypes implements ContentList{ }}); }}; + lich = new UnitType("lich"){{ + speed = 1.1f; + accel = 0.02f; + drag = 0.05f; + rotateSpeed = 2.5f; + flying = true; + lowAltitude = true; + health = 75000; + engineOffset = 38; + engineSize = 7.3f; + hitsize = 58f; + + weapons.add(new Weapon(){{ + y = 1.5f; + reload = 28f; + alternate = true; + ejectEffect = Fx.shellEjectSmall; + bullet = Bullets.standardCopper; + shootSound = Sounds.shoot; + }}); + }}; vanguard = new UnitType("vanguard"){{ speed = 1.3f; diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index e6dd15d6d5..43194b073a 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -111,7 +111,6 @@ public class Reconstructor extends UnitBlock{ } Draw.z(Layer.blockOver + 0.1f); - Drawf.shadow(x, y, size * tilesize, 0.5f); Draw.rect(topRegion, x, y); } diff --git a/core/src/mindustry/world/consumers/ConsumeItems.java b/core/src/mindustry/world/consumers/ConsumeItems.java index 0889ac7ad1..bd916b81e4 100644 --- a/core/src/mindustry/world/consumers/ConsumeItems.java +++ b/core/src/mindustry/world/consumers/ConsumeItems.java @@ -1,5 +1,6 @@ package mindustry.world.consumers; +import arc.math.*; import arc.struct.*; import arc.scene.ui.layout.*; import arc.util.ArcAnnotate.*; @@ -37,7 +38,7 @@ public class ConsumeItems extends Consume{ public void build(Tilec tile, Table table){ for(ItemStack stack : items){ table.add(new ReqImage(new ItemImage(stack.item.icon(Cicon.medium), stack.amount), - () -> tile.items() != null && tile.items().has(stack.item, stack.amount))).size(8 * 4).padRight(5); + () -> tile.items() != null && tile.items().has(stack.item, stack.amount))).size(8 * 4).padRight(Mathf.digits(stack.amount) * 6); } } diff --git a/gradle.properties b/gradle.properties index 07c1628ab4..a08a85b4d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=e95eb53c39027f21e905952937ae4450bde62c18 +archash=32cdefdd1bc69da409eee465d854727e89dadb09