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!ia0y~yU;weXIM^5%7`sfBUT9^Y4w}kFOM-WFi4iTMwB?`=jNv7 zl`uFLr6!i7rYMwWmSiZnd-?{1H}Z)yFfizNx;TbNTux3<5dZW4fBm`t|NlQ<&~3a> v(<>z*q2kzq10Q%!9m||0Y4+^|E5n`&G383ZzZV!77#KWV{an^LB{Ts5CPY0X 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!ia0y~yU;weXIM^5%7<&VJAT@z$X+&W zJ;Np)<&`-MLHng$TP)sRozl68gL%Qa?7EW?ZCBnOJ7D^8&9u*T#(Mc`2fpr{y>OGH zz(mfnV;1%2XG=3*XK`@35XJl;^6mH6ntvc#naogWK-x(9+jzUAMFWG rH5Pcj*XwWI-5-t4iz9yS|H?FHsY`V`Ki;O^-g5Z=fq&cMKM$J50zMB?()zJ*zb6GU3~+l#On^2Qi{V=|pO zQ}SbV!>X4veEi!^**Iq}TCSyiC`anDfT{7T!wG*T%xt-IVZTytX4KWi=XT2Ms}>Qj zs`(Zi-dByPYZ#(9OMH&qKUmoAI=yMJYt*P#l^xuD_ zGox_n{;!knrj^#d>*(I={^VNP_Q;7-b(NT2tA4(|kaJSry_r8gnJ_rGT!>;esQU5z zS!vidhK#k=N*^}Me(M(2Ry~tDb*gS+-fD%+kg#nmo{N>XzZ3R<+Bx;xpSxBJPt*L} V%tJJb85kHCJYD@<);T3K0RTDCkvISV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2a5edf540a30221054f5016526c82b8ff7d3f660 GIT binary patch literal 827 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lorG)mgXaP};{NFGnV^gMJo{eJHKsu5|eKt z6?4#l$KY7ml{@hlufNOJ=z28ETS?ICo63$8i;7Qg`lEB}{{9n-9QJNd67P1+n{xkK zOo-@aCEG1Kzd#K2j{ zOV8zpe|}@E5Or%C@8=zIvm#$?P<}3=n|#LfO@^E(7i;)MPy6EgQ?E^Z#&;l^J<4SM z5&6Cy9k)*Vn@*RtEZ^uMQ}LuGHZv(U^V5IE`75fQm(1Jw-pldaPf=D||2_I`|81iW cz4^!Fzk5dNlaPI(3=9kmp00i_>zopr0F~Wix&QzG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ba8029995717af78d7d08fb5e3a8ccc09854bd4e GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG za29w(7Bet#3xhBt!>lz{~#EoaKg5OXHmgM_7AMvmKIM`4sZ$C$IKg~F+n-Kyt8cUe#zSGfAb~JGdw75 zy)G&^{ll5pU3Z`52?_3TV-)|`!=itGyRgGP%YNoN1*+@JX1H@GPIzwF9^>+C`zD?9 zuN_>(4hb+RwtN*_q;PCm=CdXH-ls1%(R1@yz4TC_jQBD4`heYx>jQTmxUx-`;o7aq zCu6TOCiFaf_}cku-VbY@_1f?5e-HNQ30=FjZE$SO`i*7G z^VXi47q@)tTya;%1J56aUCoQIU-Co#<(uUTf*zF~O%&gl`Ki;O^-g z5Z=fq&cMK+=jq}YB5^r6K|%aaJ5x!am`>K~jgk$%4;gc~BrmR+>OL_grKaO_?VlSr doLLzd>|%r?=WNzm&cMLH;OXk;vd$@?2>^1nF}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!ia0y~yU;weXIM^5%79@$ zzdP|+CYeY5sg!Kg621vm4((#HQ4CA?7#!NCeaz~*!gx$#x6e;EdgC)^=~`#+Ss7hL3U6vJUO9bx=aSB_gur$CHP|2hwqv-PC*E*0>EO$U ziBlZ@A{c$V}2%Z?kizvjQv+d1!Ur=i=Otn9US z_Skpt_S*R~bCIO(?@jyj9#_g;J!l>t?XT5kys2I8)ZZ5mmdUVuV6KVokYBt1pAG{9 O1B0ilpUXO@geCy!(W=S- 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;