Unlockable cleanup / Added javelin ship / Mobile fixes

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

@@ -2,6 +2,7 @@ package io.anuke.mindustry.content;
 
 import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.content.bullets.*;
+import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.content.fx.Fx;
 import io.anuke.mindustry.content.fx.ShootFx;
 import io.anuke.mindustry.game.Content;
@@ -10,7 +11,7 @@ import io.anuke.mindustry.type.ContentList;
 
 public class AmmoTypes implements ContentList {
     public static AmmoType bulletTungsten, bulletLead, bulletCarbide, bulletThorium, bulletSilicon, bulletPyratite,
-            shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite,
+            shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile,
             flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge,
             artilleryCarbide, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive,
             basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid;
@@ -50,6 +51,12 @@ public class AmmoTypes implements ContentList {
             shootEffect = ShootFx.shootSmallFlame;
         }};
 
+        weaponMissile = new AmmoType(Items.carbide, MissileBullets.javelin, 2) {{
+            shootEffect = BulletFx.hitBulletSmall;
+            smokeEffect = Fx.none;
+            reloadMultiplier = 1.2f;
+        }};
+
         //bullets
 
         bulletLead = new AmmoType(Items.lead, StandardBullets.lead, 5) {{

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

@@ -9,7 +9,7 @@ import io.anuke.mindustry.type.Mech;
 import io.anuke.mindustry.type.Upgrade;
 
 public class Mechs implements ContentList {
-    public static Mech alpha, delta, tau, omega, dart, trident, javelin, halberd;
+    public static Mech alpha, delta, tau, omega, dart, javelin, trident, halberd;
 
     /**These are not new mechs, just re-assignments for convenience.*/
     public static Mech starterDesktop, starterMobile;
@@ -57,16 +57,18 @@ public class Mechs implements ContentList {
             trailColor = Palette.lightTrail;
         }};
 
-        trident = new Mech("trident-ship", true){{
-            drillPower = 1;
-            speed = 0.4f;
-            maxSpeed = 3f;
-            drag = 0.1f;
-        }};
-
         javelin = new Mech("javelin-ship", true){{
             drillPower = -1;
             speed = 0.4f;
+            maxSpeed = 3.6f;
+            drag = 0.09f;
+            weapon = Weapons.missiles;
+            trailColor = Color.valueOf("d3ddff");
+        }};
+
+        trident = new Mech("trident-ship", true){{
+            drillPower = 1;
+            speed = 0.4f;
             maxSpeed = 3f;
             drag = 0.1f;
         }};

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

@@ -123,7 +123,7 @@ public class Recipes implements ContentList{
         new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240))
                 .setDesktop(); //dart is desktop only, because it's the starter mobile ship
 
-        new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200));
+        new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200));
 
         new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.carbide, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250))
                 .setDesktop();

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

@@ -9,7 +9,7 @@ import io.anuke.mindustry.type.Upgrade;
 import io.anuke.mindustry.type.Weapon;
 
 public class Weapons implements ContentList {
-    public static Weapon blaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower;
+    public static Weapon blaster, chainBlaster, shockgun, sapper, swarmer, bomber, flakgun, flamethrower, missiles;
 
     @Override
     public void load() {
@@ -22,6 +22,17 @@ public class Weapons implements ContentList {
             setAmmo(AmmoTypes.bulletLead);
         }};
 
+        missiles = new Weapon("missiles") {{
+            length = 1.5f;
+            reload = 40f;
+            shots = 2;
+            inaccuracy = 10f;
+            roundrobin = false;
+            roundrobin = true;
+            ejectEffect = Fx.none;
+            setAmmo(AmmoTypes.weaponMissile);
+        }};
+
         chainBlaster = new Weapon("chain-blaster") {{
             length = 1.5f;
             reload = 20f;

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

@@ -5,13 +5,13 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.units.MechFactory;
 
 public class UpgradeBlocks extends BlockList {
-    public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, tridentFactory, javelinFactory, halberdFactory;
+    public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, javelinFactory, tridentFactory, halberdFactory;
 
     @Override
     public void load() {
         deltaFactory = new MechFactory("delta-mech-factory"){{
             mech = Mechs.delta;
-           size = 2;
+            size = 2;
         }};
 
         tauFactory = new MechFactory("tau-mech-factory"){{
@@ -29,13 +29,13 @@ public class UpgradeBlocks extends BlockList {
             size = 2;
         }};
 
-        tridentFactory = new MechFactory("trident-ship-factory"){{
-            mech = Mechs.trident;
+        javelinFactory = new MechFactory("javelin-ship-factory"){{
+            mech = Mechs.javelin;
             size = 2;
         }};
 
-        javelinFactory = new MechFactory("javelin-ship-factory"){{
-            mech = Mechs.javelin;
+        tridentFactory = new MechFactory("trident-ship-factory"){{
+            mech = Mechs.trident;
             size = 2;
         }};
 

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

@@ -7,7 +7,7 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.ContentList;
 
 public class MissileBullets extends BulletList implements ContentList {
-    public static BulletType explosive, incindiary, surge;
+    public static BulletType explosive, incindiary, surge, javelin;
 
     @Override
     public void load() {
@@ -50,5 +50,20 @@ public class MissileBullets extends BulletList implements ContentList {
                 bulletHeight = 9f;
             }
         };
+
+        javelin = new MissileBulletType(2.5f, 10, "missile") {
+            {
+                bulletWidth = 8f;
+                bulletHeight = 8f;
+                bulletShrink = 0f;
+                drag = -0.02f;
+                keepVelocity = false;
+                splashDamageRadius = 25f;
+                splashDamage = 15f;
+                lifetime = 90f;
+                hiteffect = BulletFx.blastExplosion;
+                despawneffect = BulletFx.blastExplosion;
+            }
+        };
     }
 }