Renamed all turrets

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));

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;
+	}};
 }

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 -> {

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;