diff --git a/core/assets-raw/sprites/blocks/turrets/block-1.png b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/block-1.png rename to core/assets-raw/sprites/blocks/turrets/bases/block-1.png diff --git a/core/assets-raw/sprites/blocks/turrets/block-2-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-2-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/block-2-top.png rename to core/assets-raw/sprites/blocks/turrets/bases/block-2-top.png diff --git a/core/assets-raw/sprites/blocks/turrets/block-2.png b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/block-2.png rename to core/assets-raw/sprites/blocks/turrets/bases/block-2.png diff --git a/core/assets-raw/sprites/blocks/turrets/block-3-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-3-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/block-3-top.png rename to core/assets-raw/sprites/blocks/turrets/bases/block-3-top.png diff --git a/core/assets-raw/sprites/blocks/turrets/block-3.png b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/block-3.png rename to core/assets-raw/sprites/blocks/turrets/bases/block-3.png diff --git a/core/assets-raw/sprites/blocks/turrets/scatter-heat.png b/core/assets-raw/sprites/blocks/turrets/scatter-heat.png new file mode 100644 index 0000000000..4bec862cb6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scatter-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png deleted file mode 100644 index 48b8baa5e8..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/turrets/teslaturret-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/teslaturret-heat.png rename to core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/teslaturret.png b/core/assets-raw/sprites/blocks/turrets/turrets/arc.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/teslaturret.png rename to core/assets-raw/sprites/blocks/turrets/turrets/arc.png diff --git a/core/assets-raw/sprites/blocks/turrets/flakturret-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/crux-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/flakturret-heat.png rename to core/assets-raw/sprites/blocks/turrets/turrets/crux-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/flakturret-panel-left.png b/core/assets-raw/sprites/blocks/turrets/turrets/crux-panel-left.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/flakturret-panel-left.png rename to core/assets-raw/sprites/blocks/turrets/turrets/crux-panel-left.png diff --git a/core/assets-raw/sprites/blocks/turrets/flakturret-panel-right.png b/core/assets-raw/sprites/blocks/turrets/turrets/crux-panel-right.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/flakturret-panel-right.png rename to core/assets-raw/sprites/blocks/turrets/turrets/crux-panel-right.png diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/turrets/duo.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/duo.png rename to core/assets-raw/sprites/blocks/turrets/turrets/duo.png diff --git a/core/assets-raw/sprites/blocks/turrets/fornaxcannon.png b/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/fornaxcannon.png rename to core/assets-raw/sprites/blocks/turrets/turrets/fuse.png diff --git a/core/assets-raw/sprites/blocks/turrets/laserturret-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/lancer-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/laserturret-heat.png rename to core/assets-raw/sprites/blocks/turrets/turrets/lancer-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/laserturret.png b/core/assets-raw/sprites/blocks/turrets/turrets/lancer.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/laserturret.png rename to core/assets-raw/sprites/blocks/turrets/turrets/lancer.png diff --git a/core/assets-raw/sprites/blocks/turrets/gatlingturret-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/scatter-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/gatlingturret-heat.png rename to core/assets-raw/sprites/blocks/turrets/turrets/scatter-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png new file mode 100644 index 0000000000..075325a110 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scorch-shoot.png b/core/assets-raw/sprites/blocks/turrets/turrets/scorch-shoot.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/scorch-shoot.png rename to core/assets-raw/sprites/blocks/turrets/turrets/scorch-shoot.png diff --git a/core/assets-raw/sprites/blocks/turrets/flameturret.png b/core/assets-raw/sprites/blocks/turrets/turrets/scorch.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/flameturret.png rename to core/assets-raw/sprites/blocks/turrets/turrets/scorch.png diff --git a/core/assets-raw/sprites/blocks/turrets/missileturret.png b/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/missileturret.png rename to core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png diff --git a/core/assets-raw/sprites/blocks/turrets/flakturret.png b/core/assets-raw/sprites/blocks/turrets/turrets/vrux.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/flakturret.png rename to core/assets-raw/sprites/blocks/turrets/turrets/vrux.png diff --git a/core/assets-raw/sprites/blocks/turrets/liquidturret-liquid.png b/core/assets-raw/sprites/blocks/turrets/turrets/wave-liquid.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/liquidturret-liquid.png rename to core/assets-raw/sprites/blocks/turrets/turrets/wave-liquid.png diff --git a/core/assets-raw/sprites/blocks/turrets/liquidturret.png b/core/assets-raw/sprites/blocks/turrets/turrets/wave.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/liquidturret.png rename to core/assets-raw/sprites/blocks/turrets/turrets/wave.png diff --git a/core/assets-raw/sprites/blocks/turrets/chainturret.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/chainturret.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/chainturret.png rename to core/assets-raw/sprites/blocks/turrets/unprocessed/chainturret.png diff --git a/core/assets-raw/sprites/blocks/turrets/unprocessed/fornaxcannon.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/fornaxcannon.png new file mode 100644 index 0000000000..2a5edf540a Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/unprocessed/fornaxcannon.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/megarepairturret.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/megarepairturret.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/megarepairturret.png rename to core/assets-raw/sprites/blocks/turrets/unprocessed/megarepairturret.png diff --git a/core/assets-raw/sprites/blocks/turrets/unprocessed/missileturret.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/missileturret.png new file mode 100644 index 0000000000..ba80299957 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/unprocessed/missileturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/railgunturret-heat.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/railgunturret-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/railgunturret-heat.png rename to core/assets-raw/sprites/blocks/turrets/unprocessed/railgunturret-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/railgunturret.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/railgunturret.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/railgunturret.png rename to core/assets-raw/sprites/blocks/turrets/unprocessed/railgunturret.png diff --git a/core/assets-raw/sprites/blocks/turrets/repairturret.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/repairturret.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/repairturret.png rename to core/assets-raw/sprites/blocks/turrets/unprocessed/repairturret.png diff --git a/core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret-heat.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret-heat.png new file mode 100644 index 0000000000..dd8046dac7 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret.png new file mode 100644 index 0000000000..6c083ce15f Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/titancannon.png b/core/assets-raw/sprites/blocks/turrets/unprocessed/titancannon.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/titancannon.png rename to core/assets-raw/sprites/blocks/turrets/unprocessed/titancannon.png diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 2180561285..4fd72cc7bb 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -34,18 +34,17 @@ public class Recipes { new Recipe(distribution, DistributionBlocks.bridgeconveyor, new ItemStack(Items.steel, 5)); new Recipe(distribution, DistributionBlocks.laserconveyor, new ItemStack(Items.steel, 5)); - new Recipe(weapon, WeaponBlocks.doubleturret, new ItemStack(Items.iron, 7)); - new Recipe(weapon, WeaponBlocks.gatlingturret, new ItemStack(Items.iron, 8)); - new Recipe(weapon, WeaponBlocks.flameturret, new ItemStack(Items.iron, 12), new ItemStack(Items.steel, 9)); - new Recipe(weapon, WeaponBlocks.railgunturret, new ItemStack(Items.iron, 15), new ItemStack(Items.steel, 10)); - new Recipe(weapon, WeaponBlocks.laserturret, new ItemStack(Items.steel, 12), new ItemStack(Items.titanium, 12)); - new Recipe(weapon, WeaponBlocks.flakturret, new ItemStack(Items.steel, 25), new ItemStack(Items.titanium, 15)); - new Recipe(weapon, WeaponBlocks.teslaturret, new ItemStack(Items.steel, 20), new ItemStack(Items.titanium, 25), new ItemStack(Items.densealloy, 15)); - new Recipe(weapon, WeaponBlocks.liquidturret, new ItemStack(Items.steel, 80), new ItemStack(Items.titanium, 70), new ItemStack(Items.densealloy, 60)); - new Recipe(weapon, WeaponBlocks.chainturret, new ItemStack(Items.steel, 50), new ItemStack(Items.titanium, 25), new ItemStack(Items.densealloy, 40)); - new Recipe(weapon, WeaponBlocks.titanturret, new ItemStack(Items.steel, 70), new ItemStack(Items.titanium, 50), new ItemStack(Items.densealloy, 55)); - new Recipe(weapon, WeaponBlocks.missileturret, new ItemStack(Items.steel, 70), new ItemStack(Items.titanium, 50), new ItemStack(Items.densealloy, 55)); - new Recipe(weapon, WeaponBlocks.fornaxcannon, new ItemStack(Items.steel, 70), new ItemStack(Items.titanium, 50), new ItemStack(Items.densealloy, 55)); + new Recipe(weapon, WeaponBlocks.duo, new ItemStack(Items.iron, 7)); + new Recipe(weapon, WeaponBlocks.scatter, new ItemStack(Items.iron, 8)); + new Recipe(weapon, WeaponBlocks.scorch, new ItemStack(Items.iron, 12), new ItemStack(Items.steel, 9)); + new Recipe(weapon, WeaponBlocks.wave, new ItemStack(Items.iron, 15), new ItemStack(Items.steel, 10)); + new Recipe(weapon, WeaponBlocks.lancer, new ItemStack(Items.steel, 12), new ItemStack(Items.titanium, 12)); + new Recipe(weapon, WeaponBlocks.crux, new ItemStack(Items.steel, 25), new ItemStack(Items.titanium, 15)); + new Recipe(weapon, WeaponBlocks.arc, new ItemStack(Items.steel, 20), new ItemStack(Items.titanium, 25), new ItemStack(Items.densealloy, 15)); + new Recipe(weapon, WeaponBlocks.swarmer, new ItemStack(Items.steel, 80), new ItemStack(Items.titanium, 70), new ItemStack(Items.densealloy, 60)); + new Recipe(weapon, WeaponBlocks.fuse, new ItemStack(Items.steel, 70), new ItemStack(Items.titanium, 50), new ItemStack(Items.densealloy, 55)); + new Recipe(weapon, WeaponBlocks.spectre, new ItemStack(Items.steel, 70), new ItemStack(Items.titanium, 50), new ItemStack(Items.densealloy, 55)); + new Recipe(weapon, WeaponBlocks.meltdown, new ItemStack(Items.steel, 70), new ItemStack(Items.titanium, 50), new ItemStack(Items.densealloy, 55)); new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.iron, 40)); new Recipe(crafting, CraftingBlocks.alloysmelter, new ItemStack(Items.titanium, 50), new ItemStack(Items.steel, 50)); diff --git a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java index ab3a27a60e..49e9793b28 100644 --- a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java @@ -5,7 +5,6 @@ import io.anuke.mindustry.content.AmmoTypes; import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.types.defense.Turret; import io.anuke.mindustry.world.blocks.types.defense.turrets.*; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.util.Angles; @@ -15,14 +14,14 @@ import io.anuke.ucore.util.Strings; public class WeaponBlocks{ public static Block - doubleturret = new DoubleTurret("doubleturret"){{ + duo = new DoubleTurret("duo"){{ ammoTypes = new AmmoType[]{AmmoTypes.basicIron}; reload = 25f; restitution = 0.03f; ammoUseEffect = ShootFx.shellEjectSmall; }}, - gatlingturret = new BurstTurret("gatlingturret") {{ + scatter = new BurstTurret("scatter") {{ ammoTypes = new AmmoType[]{AmmoTypes.basicIron}; ammoPerShot = 1; shots = 3; @@ -33,7 +32,7 @@ public class WeaponBlocks{ ammoUseEffect = ShootFx.shellEjectSmall; }}, - flameturret = new LiquidTurret("flameturret"){{ + scorch = new LiquidTurret("scorch"){{ ammoTypes = new AmmoType[]{AmmoTypes.basicFlame}; recoil = 0f; reload = 5f; @@ -44,19 +43,28 @@ public class WeaponBlocks{ Draw.rect(entity.target != null ? name + "-shoot" : name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); }; }}, - - railgunturret = new ItemTurret("railgunturret"){{ - range = 100f; - ammoTypes = new AmmoType[]{AmmoTypes.basicSteel}; - reload = 100f; - restitution = 0.03f; - ammoEjectBack = 2f; - recoil = 3f; - shootShake = 2f; - ammoUseEffect = ShootFx.shellEjectMedium; + + wave = new LiquidTurret("wave") {{ + ammoTypes = new AmmoType[]{AmmoTypes.water, AmmoTypes.lava, AmmoTypes.cryofluid, AmmoTypes.oil}; + size = 2; + recoil = 0f; + reload = 4f; + inaccuracy = 5f; + shootCone = 50f; + shootEffect = ShootFx.shootLiquid; + range = 70f; + + drawer = (tile, entity) -> { + Draw.rect(name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + + Draw.color(entity.liquids.liquid.color); + Draw.alpha(entity.liquids.amount/liquidCapacity); + Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + Draw.color(); + }; }}, - flakturret = new ItemTurret("flakturret"){{ + crux = new ItemTurret("crux"){{ size = 2; range = 100f; ammoTypes = new AmmoType[]{AmmoTypes.basicLeadFrag}; @@ -82,7 +90,7 @@ public class WeaponBlocks{ }; }}, - laserturret = new LaserTurret("laserturret"){{ + lancer = new LaserTurret("lancer"){{ range = 70f; chargeTime = 70f; chargeMaxDelay = 30f; @@ -98,7 +106,7 @@ public class WeaponBlocks{ heatColor = Color.RED; }}, - teslaturret = new LaserTurret("teslaturret"){{ + arc = new LaserTurret("arc"){{ shootType = AmmoTypes.lightning; reload = 100f; chargeTime = 70f; @@ -110,41 +118,22 @@ public class WeaponBlocks{ chargeBeginEffect = ShootFx.lancerLaserChargeBegin; heatColor = Color.RED; recoil = 3f; - }}, - - liquidturret = new LiquidTurret("liquidturret") {{ - ammoTypes = new AmmoType[]{AmmoTypes.water, AmmoTypes.lava, AmmoTypes.cryofluid, AmmoTypes.oil}; size = 2; - recoil = 0f; - reload = 4f; - inaccuracy = 5f; - shootCone = 50f; - shootEffect = ShootFx.shootLiquid; - range = 70f; - - drawer = (tile, entity) -> { - Draw.rect(name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - - Draw.color(entity.liquids.liquid.color); - Draw.alpha(entity.liquids.amount/liquidCapacity); - Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - Draw.color(); - }; - }}, - - chainturret = new Turret("chainturret"){{ - - }}, - - titanturret = new Turret("titancannon"){{ - }}, - fornaxcannon = new PowerTurret("fornaxcannon") { + swarmer = new PowerTurret("missileturret") {{ + size = 2; + }}, - }, + fuse = new PowerTurret("fornaxcannon") {{ + size = 3; + }}, - missileturret = new PowerTurret("missileturret") { + spectre = new PowerTurret("spectre") {{ + size = 3; + }}, - }; + meltdown = new PowerTurret("meltdown") {{ + size = 3; + }}; } diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index 4d06b6a779..6eac54287a 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -188,8 +188,6 @@ public class NetClient extends Module { recent.put(packet.entity.id, packet.entity); packet.entity.add(); - - Log.info("Recieved entity {0}", packet.entity.id); }); Net.handleClient(EntityDeathPacket.class, packet -> { diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 6ebafabf90..d601c841d7 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -10,7 +10,6 @@ import io.anuke.mindustry.entities.BulletType; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.SyncEntity; import io.anuke.mindustry.gen.CallServer; -import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.io.Version; import io.anuke.mindustry.net.*; import io.anuke.mindustry.net.Administration.PlayerInfo;