Added new turret sprites

core/assets/version.properties

@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Sun Mar 04 21:59:47 EST 2018
+#Mon Mar 05 14:09:58 EST 2018
 version=release
-androidBuildCode=384
+androidBuildCode=391
 name=Mindustry
 code=3.4
 build=custom build

core/src/io/anuke/mindustry/entities/Bullet.java

@@ -67,7 +67,7 @@ public class Bullet extends BulletEntity{
 
 	@Override
 	public boolean collides(SolidEntity other){
-		return true;
+		return (other instanceof Player) == (owner instanceof Enemy);
 	}
 
 	@Override

core/src/io/anuke/mindustry/resource/Recipes.java

@@ -44,6 +44,8 @@ public class Recipes {
 			new Recipe(weapon, WeaponBlocks.magmaturret, stack(Item.steel, 80), stack(Item.titanium, 70), stack(Item.dirium, 60)),
 			new Recipe(weapon, WeaponBlocks.chainturret, stack(Item.steel, 50), stack(Item.titanium, 25), stack(Item.dirium, 40)),
 			new Recipe(weapon, WeaponBlocks.titanturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),
+			new Recipe(weapon, WeaponBlocks.missileturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),
+			new Recipe(weapon, WeaponBlocks.fornaxcannon, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)),
 
 			new Recipe(crafting, ProductionBlocks.smelter, stack(Item.stone, 40), stack(Item.iron, 40)),
 			new Recipe(crafting, ProductionBlocks.crucible, stack(Item.titanium, 50), stack(Item.steel, 50)),

core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java

@@ -198,5 +198,38 @@ public class WeaponBlocks{
 			shootEffect = Fx.titanshot;
 			shootShake = 3f;
 		}
+	},
+
+	fornaxcannon = new PowerTurret("fornaxcannon") {
+		{
+			shootsound = "blast";
+			range = 120f;
+			reload = 23f;
+			bullet = BulletType.titanshell;
+			ammo = Item.uranium;
+			health = 800;
+			ammoMultiplier = 4;
+			size = 3;
+			rotatespeed = 0.07f;
+			shootCone = 9f;
+			shootEffect = Fx.titanshot;
+			shootShake = 3f;
+		}
+	},
+	missileturret = new PowerTurret("missileturret") {
+		{
+			shootsound = "blast";
+			range = 120f;
+			reload = 23f;
+			bullet = BulletType.titanshell;
+			ammo = Item.uranium;
+			health = 800;
+			ammoMultiplier = 4;
+			size = 2;
+			rotatespeed = 0.07f;
+			shootCone = 9f;
+			shootEffect = Fx.titanshot;
+			shootShake = 3f;
+		}
 	};
 }