Spectre WIP

core/src/io/anuke/mindustry/content/AmmoTypes.java

@@ -10,6 +10,7 @@ import io.anuke.mindustry.type.ContentType;
 
 public class AmmoTypes implements ContentList{
     public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite,
+    bulletDenseBig, bulletPyratiteBig, bulletThoriumBig,
     shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech,
             healBlaster, bulletGlaive,
             flakExplosive, flakPlastic, flakSurge,
@@ -115,6 +116,23 @@ public class AmmoTypes implements ContentList{
             inaccuracy = 3f;
         }};
 
+        bulletDenseBig = new AmmoType(Items.densealloy, StandardBullets.denseBig, 1){{
+            shootEffect = ShootFx.shootBig;
+            smokeEffect = ShootFx.shootBigSmoke;
+            reloadMultiplier = 0.6f;
+        }};
+
+        bulletThoriumBig = new AmmoType(Items.thorium, StandardBullets.thoriumBig, 1){{
+            shootEffect = ShootFx.shootBig;
+            smokeEffect = ShootFx.shootBigSmoke;
+        }};
+
+        bulletPyratiteBig = new AmmoType(Items.pyratite, StandardBullets.tracerBig, 2){{
+            shootEffect = ShootFx.shootBig;
+            smokeEffect = ShootFx.shootBigSmoke;
+            inaccuracy = 3f;
+        }};
+
         //flak
 
         flakExplosive = new AmmoType(Items.blastCompound, FlakBullets.explosive, 5){{

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

@@ -54,6 +54,8 @@ public class Recipes implements ContentList{
         new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120));
         new Recipe(weapon, TurretBlocks.cyclone, new ItemStack(Items.copper, 400), new ItemStack(Items.densealloy, 400), new ItemStack(Items.surgealloy, 200), new ItemStack(Items.plastanium, 150));
         new Recipe(weapon, TurretBlocks.fuse, new ItemStack(Items.copper, 450), new ItemStack(Items.densealloy, 450), new ItemStack(Items.surgealloy, 250));
+        new Recipe(weapon, TurretBlocks.spectre, new ItemStack(Items.copper, 450), new ItemStack(Items.densealloy, 450), new ItemStack(Items.surgealloy, 250));
+        new Recipe(weapon, TurretBlocks.meltdown, new ItemStack(Items.copper, 450), new ItemStack(Items.densealloy, 450), new ItemStack(Items.surgealloy, 250));
 
         //DISTRIBUTION
         new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1));

core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java

@@ -210,11 +210,17 @@ public class TurretBlocks extends BlockList implements ContentList{
             size = 3;
         }};
 
-        spectre = new ItemTurret("spectre"){{
+        spectre = new DoubleTurret("spectre"){{
-            ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
+            ammoTypes = new AmmoType[]{AmmoTypes.bulletDenseBig, AmmoTypes.bulletPyratiteBig, AmmoTypes.bulletThoriumBig};
-            reload = 25f;
+            reload = 3f;
             restitution = 0.03f;
-            ammoUseEffect = ShootFx.shellEjectSmall;
+            ammoUseEffect = ShootFx.shellEjectMedium;
+            range = 200f;
+            recoil = 2f;
+            xRand = 3f;
+            shotWidth = 4f;
+            shootShake = 1.5f;
+            shots = 2;
             size = 4;
         }};
 

core/src/io/anuke/mindustry/content/bullets/StandardBullets.java

@@ -8,7 +8,7 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 
 public class StandardBullets extends BulletList implements ContentList{
-    public static BulletType copper, dense, thorium, homing, tracer, mechSmall, glaive;
+    public static BulletType copper, dense, thorium, homing, tracer, mechSmall, glaive, denseBig, thoriumBig, tracerBig;
 
     @Override
     public void load(){
@@ -76,5 +76,33 @@ public class StandardBullets extends BulletList implements ContentList{
                 despawneffect = BulletFx.hitBulletSmall;
             }
         };
+
+        denseBig = new BasicBulletType(10f, 36, "bullet"){
+            {
+                bulletWidth = 16f;
+                bulletHeight = 21f;
+                armorPierce = 0.2f;
+            }
+        };
+
+        thoriumBig = new BasicBulletType(11f, 58, "bullet"){
+            {
+                bulletWidth = 17f;
+                bulletHeight = 23f;
+                armorPierce = 0.5f;
+            }
+        };
+
+        tracerBig = new BasicBulletType(9f, 22, "bullet"){
+            {
+                bulletWidth = 17f;
+                bulletHeight = 21f;
+                frontColor = Palette.lightishOrange;
+                backColor = Palette.lightOrange;
+                incendSpread = 3f;
+                incendAmount = 1;
+                incendChance = 0.3f;
+            }
+        };
     }
 }