From 570226a05139a43275341ae0df70e84b3d9ec834 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 24 May 2018 15:40:36 -0400 Subject: [PATCH] Renamed all turrets --- .../blocks/turrets/{ => bases}/block-1.png | Bin .../turrets/{ => bases}/block-2-top.png | Bin .../blocks/turrets/{ => bases}/block-2.png | Bin .../turrets/{ => bases}/block-3-top.png | Bin .../blocks/turrets/{ => bases}/block-3.png | Bin .../sprites/blocks/turrets/scatter-heat.png | Bin 0 -> 196 bytes .../sprites/blocks/turrets/scatter.png | Bin 343 -> 0 bytes .../arc-heat.png} | Bin .../{teslaturret.png => turrets/arc.png} | Bin .../crux-heat.png} | Bin .../crux-panel-left.png} | Bin .../crux-panel-right.png} | Bin .../blocks/turrets/{ => turrets}/duo.png | Bin .../{fornaxcannon.png => turrets/fuse.png} | Bin .../lancer-heat.png} | Bin .../{laserturret.png => turrets/lancer.png} | Bin .../scatter-heat.png} | Bin .../blocks/turrets/turrets/scatter.png | Bin 0 -> 372 bytes .../turrets/{ => turrets}/scorch-shoot.png | Bin .../{flameturret.png => turrets/scorch.png} | Bin .../swarmer.png} | Bin .../{flakturret.png => turrets/vrux.png} | Bin .../wave-liquid.png} | Bin .../{liquidturret.png => turrets/wave.png} | Bin .../turrets/{ => unprocessed}/chainturret.png | Bin .../turrets/unprocessed/fornaxcannon.png | Bin 0 -> 827 bytes .../{ => unprocessed}/megarepairturret.png | Bin .../turrets/unprocessed/missileturret.png | Bin 0 -> 422 bytes .../{ => unprocessed}/railgunturret-heat.png | Bin .../{ => unprocessed}/railgunturret.png | Bin .../{ => unprocessed}/repairturret.png | Bin .../turrets/unprocessed/teslaturret-heat.png | Bin 0 -> 180 bytes .../turrets/unprocessed/teslaturret.png | Bin 0 -> 414 bytes .../turrets/{ => unprocessed}/titancannon.png | Bin .../io/anuke/mindustry/content/Recipes.java | 23 +++-- .../content/blocks/WeaponBlocks.java | 85 ++++++++---------- .../io/anuke/mindustry/core/NetClient.java | 2 - .../io/anuke/mindustry/core/NetServer.java | 1 - 38 files changed, 48 insertions(+), 63 deletions(-) rename core/assets-raw/sprites/blocks/turrets/{ => bases}/block-1.png (100%) rename core/assets-raw/sprites/blocks/turrets/{ => bases}/block-2-top.png (100%) rename core/assets-raw/sprites/blocks/turrets/{ => bases}/block-2.png (100%) rename core/assets-raw/sprites/blocks/turrets/{ => bases}/block-3-top.png (100%) rename core/assets-raw/sprites/blocks/turrets/{ => bases}/block-3.png (100%) create mode 100644 core/assets-raw/sprites/blocks/turrets/scatter-heat.png delete mode 100644 core/assets-raw/sprites/blocks/turrets/scatter.png rename core/assets-raw/sprites/blocks/turrets/{teslaturret-heat.png => turrets/arc-heat.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{teslaturret.png => turrets/arc.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{flakturret-heat.png => turrets/crux-heat.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{flakturret-panel-left.png => turrets/crux-panel-left.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{flakturret-panel-right.png => turrets/crux-panel-right.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{ => turrets}/duo.png (100%) rename core/assets-raw/sprites/blocks/turrets/{fornaxcannon.png => turrets/fuse.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{laserturret-heat.png => turrets/lancer-heat.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{laserturret.png => turrets/lancer.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{gatlingturret-heat.png => turrets/scatter-heat.png} (100%) create mode 100644 core/assets-raw/sprites/blocks/turrets/turrets/scatter.png rename core/assets-raw/sprites/blocks/turrets/{ => turrets}/scorch-shoot.png (100%) rename core/assets-raw/sprites/blocks/turrets/{flameturret.png => turrets/scorch.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{missileturret.png => turrets/swarmer.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{flakturret.png => turrets/vrux.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{liquidturret-liquid.png => turrets/wave-liquid.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{liquidturret.png => turrets/wave.png} (100%) rename core/assets-raw/sprites/blocks/turrets/{ => unprocessed}/chainturret.png (100%) create mode 100644 core/assets-raw/sprites/blocks/turrets/unprocessed/fornaxcannon.png rename core/assets-raw/sprites/blocks/turrets/{ => unprocessed}/megarepairturret.png (100%) create mode 100644 core/assets-raw/sprites/blocks/turrets/unprocessed/missileturret.png rename core/assets-raw/sprites/blocks/turrets/{ => unprocessed}/railgunturret-heat.png (100%) rename core/assets-raw/sprites/blocks/turrets/{ => unprocessed}/railgunturret.png (100%) rename core/assets-raw/sprites/blocks/turrets/{ => unprocessed}/repairturret.png (100%) create mode 100644 core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret-heat.png create mode 100644 core/assets-raw/sprites/blocks/turrets/unprocessed/teslaturret.png rename core/assets-raw/sprites/blocks/turrets/{ => unprocessed}/titancannon.png (100%) 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 0000000000000000000000000000000000000000..4bec862cb6c5c062aadb87f0a5187bc6e1debddd GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyD(g5*v_zUaai(Qpa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWq-sfAtbGSv-{;SppayVYeb22er|4RUI~M9QEFmI zYKlU6W=V#EyQgnJcq5-UP?3(Oi(`ny<>Ukf@jw6n*Pr|U|Nrv^-Np+wy;2eqDvljE l@PX&lvCLVLX5UV*GVG}kQ?3;JdjY7A!PC{xWt~$(696VeJtP1C literal 0 HcmV?d00001 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 48b8baa5e8e20915b96d457693f613a2fce4616a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv`=%%UQ?MlNs9P6rA}mbgZgIOpf)rskC}I2WZRmZYXA zlxLP?D7bt2281{Ai31hw_jGX#k+?jyZy{e(f=KKB`5O&2TcTz34{%SIahF|TrsfZx zlzEQaH=i(HknFrz%b50)nf2MRBML?{4pv^W+^>}Au|Gi=gPUYWxX zv|rk_#p3Wrm=~O#57Cte3BL;OoxW3pYs$Oyn#(W>J5B zwlwo~76+FLQOpk_-+q6+Ns{40l(G`T9l3K-JiSdzHih2gQJK2-(Vp;BV}a*;z5eFi i{n6;WIO6C2uS|26x>QFq3hV=Vg~8L+&t;ucLK6U+5`n1z 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 0000000000000000000000000000000000000000..075325a110c2c89dd006ee94360ffe2ed19d1ce0 GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv`=tP(@a z$G`2AjdS**R!2obYGD%$7?R_ABLPMqOQeZl}z?Y7z0On*V!x{+zpa zE{^d?q0fxl3@&-OE-ea~R}3HjwqtHsq`}btgVeVIVa`aoB89D34?>ng(zl&svpmvm4e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00N^)L_t(Y$BkA!Xd+P%{#F(b zLO?hyES7^Tatfvw0w)JKRs;jrSsfgL<#~~9EUvu5X7OT5K>`-RPDmgq5iGO4g37Xi z@JbsY&ELg(GvzudlR-@KXmX5M@=`=sG;h$t&LXu0<5N;8t39MyR@o^dvt4FDjQ z%b_%ANl`#zUO_6ALMoNw`;+(s|4t+l$mMc@XORFz$Kp3FMNz;Q^T}TWig_JwFV3;O zIOnoee~LTx)Bym-7!*YT0CeLSXVstLB>n*V?PnwhEnl5DfapAXdFx~^Zyf@Ol7VRF z1&Mi;Xip&W_g^U46G;RCfZEGadjI7kR{g2ZP6UyL!y%G`7M{-P4gjdC3IIr_(*S_Q zx3biYXB+^y`tSz;@Z<3a08p|g($iVp(KHQ~W%=yZm8PFX0Fa+`xB*2+kt2J^uZe=P zEDQNrC%nk(N)zvHIuZcbw!H({_Be=P7(PRytE#HVZ+n5!`)E2EjQ{}G2W6OY6#y_E zkN+uT4}rzA56qOSxIQRjJRYOnZol4W^Z6W<31y?}`tES?yaNf*qX2yXGzz>RWTYqx zejYt?*;VZg7-K#?T6gLxXHqPz12s*9rfF_rz!e4R1r@pWvgBNEG#XsNFbpupcGTQo z(bw*8D2n2mOCk|U_9VE-qI1i#{4CnvzsRCMy|5w|i$!jf-}YQo6|*8eqG*_&tH@EB zhBGNbbMhj4$3%YC;l(uNDsLWL*Le*@ikfnj%Y#5-VNsgLbTL)S+pTr-IxQN=zPc@evId`#09C+k> zU1?%nY4ZO8pQwB1be_5INe5thoWi~21nUGd_78$V z3MXtkcor3GWdFdrZE5jD{`X*?p3t>hJ5K2Iyl1e_KfkK%@c(R|-3G_jtlwD1Ja6r(d2!3P z&J}lMJn;N+*wwrU`z1f*U%pwsAm~x)(M0i$SuRn3Pbkbf4aTa()7Bet#3xhBt!>lJYD@<);T3K0RVEfF}nZ& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6c083ce15f2d880193d81801fa468eb260aedb6d GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4u_bxCyDx`7I;J! zGca%qgD@k*tT_@uLG}_)Usv`=%%UQCf@hb%R|5)3mbgZgIOpf)rskC}I2WZRmZYXA zlxLP?D7bt2281{Ai8C-TvU$2VhDclvov_jSaDYt9{&273T1%Qa_a_s z857^u6nx-Z%QW literal 0 HcmV?d00001 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;