From 00f24dfb79e9b4499a66466f1001fe38b3e9da5f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Aug 2018 20:10:43 -0400
Subject: [PATCH] Balancing

---
 .../io/anuke/mindustry/content/AmmoTypes.java |  1 +
 .../io/anuke/mindustry/content/Recipes.java   |  4 ++--
 .../content/blocks/TurretBlocks.java          |  2 +-
 .../content/bullets/MissileBullets.java       | 23 ++++++++++++++++---
 .../content/bullets/TurretBullets.java        |  2 +-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java
index 627a881a1f..3c0d52df3e 100644
--- a/core/src/io/anuke/mindustry/content/AmmoTypes.java
+++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java
@@ -151,6 +151,7 @@ public class AmmoTypes implements ContentList{
         missileSurge = new AmmoType(Items.surgealloy, MissileBullets.surge, 1){{
             shootEffect = ShootFx.shootBig2;
             smokeEffect = ShootFx.shootBigSmoke2;
+            reloadMultiplier = 1.1f;
         }};
 
         //artillery
diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index be8b079f7b..5fd7dc6dcc 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -47,8 +47,8 @@ public class Recipes implements ContentList{
         new Recipe(weapon, TurretBlocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130));
         new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60));
         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, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130));
-        new Recipe(weapon, TurretBlocks.fuse, 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));
 
         //DISTRIBUTION
         new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1));
diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
index 3662f012ab..b16eb6be87 100644
--- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
@@ -130,7 +130,7 @@ public class TurretBlocks extends BlockList implements ContentList{
         }};
 
         swarmer = new BurstTurret("swarmer"){{
-            ammoTypes = new AmmoType[]{AmmoTypes.missileExplosive, AmmoTypes.missileIncindiary/*, AmmoTypes.missileSurge*/};
+            ammoTypes = new AmmoType[]{AmmoTypes.missileExplosive, AmmoTypes.missileIncindiary, AmmoTypes.missileSurge};
             reload = 60f;
             shots = 4;
             burstSpacing = 5;
diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
index 98df70168a..5db0273a20 100644
--- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
@@ -5,6 +5,7 @@ import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.entities.bullet.MissileBulletType;
+import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.ContentList;
 import io.anuke.ucore.core.Timers;
@@ -48,10 +49,26 @@ public class MissileBullets extends BulletList implements ContentList{
             }
         };
 
-        surge = new MissileBulletType(3f, 5, "bullet"){
+        surge = new MissileBulletType(3.5f, 15, "bullet"){
             {
-                bulletWidth = 7f;
-                bulletHeight = 9f;
+                bulletWidth = 8f;
+                bulletHeight = 8f;
+                bulletShrink = 0f;
+                drag = -0.01f;
+                splashDamageRadius = 30f;
+                splashDamage = 22f;
+                lifetime = 150f;
+                hiteffect = BulletFx.blastExplosion;
+                despawneffect = BulletFx.blastExplosion;
+            }
+
+            @Override
+            public void hit(Bullet b) {
+                super.hit(b);
+
+                for (int i = 0; i < 2; i++) {
+                    Lightning.create(b.getTeam(), BulletFx.hitLancer, Palette.surge, damage, b.x, b.y, Mathf.random(360f), 14);
+                }
             }
         };
 
diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
index 3b21395b9e..a8a6af9967 100644
--- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
@@ -160,7 +160,7 @@ public class TurretBullets extends BulletList implements ContentList{
             }
         };
 
-        fuseShot = new BulletType(0.01f, 60){
+        fuseShot = new BulletType(0.01f, 70){
             int rays = 3;
             float raySpace = 2f;
             float rayLength = 80f;