diff --git a/core/src/io/anuke/mindustry/entities/BulletType.java b/core/src/io/anuke/mindustry/entities/BulletType.java index 7236e90fd2..431a42901e 100644 --- a/core/src/io/anuke/mindustry/entities/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/BulletType.java @@ -56,7 +56,7 @@ public abstract class BulletType extends BaseBulletType{ } } }, - emp = new BulletType(1.6f, 6){ + emp = new BulletType(1.6f, 8){ { lifetime = 50f; hitsize = 6f; @@ -235,7 +235,7 @@ public abstract class BulletType extends BaseBulletType{ DamageArea.damage(!(b.owner instanceof Enemy), b.x, b.y, 25f, (int)(damage * 2f/3f)); } }, - blast = new BulletType(1.1f, 80){ + blast = new BulletType(1.1f, 90){ { lifetime = 0f; hitsize = 8f; @@ -329,7 +329,7 @@ public abstract class BulletType extends BaseBulletType{ Draw.reset(); } }, - spread = new BulletType(2.4f, 7) { + spread = new BulletType(2.4f, 8) { { lifetime = 70; } diff --git a/core/src/io/anuke/mindustry/entities/effect/EMP.java b/core/src/io/anuke/mindustry/entities/effect/EMP.java index 39891a9cb3..7824e958d2 100644 --- a/core/src/io/anuke/mindustry/entities/effect/EMP.java +++ b/core/src/io/anuke/mindustry/entities/effect/EMP.java @@ -54,7 +54,7 @@ public class EMP extends TimedEntity{ if(tile != null && tile.block() instanceof PowerAcceptor){ PowerAcceptor p = (PowerAcceptor)tile.block(); p.setPower(tile, 0f); - tile.entity.damage((int)(damage*1.5f)); //extra damage + tile.entity.damage((int)(damage*2f)); //extra damage } if(tile == null) continue; diff --git a/core/src/io/anuke/mindustry/entities/enemies/types/BlastType.java b/core/src/io/anuke/mindustry/entities/enemies/types/BlastType.java index 4fe047f3e2..e7ca5e17a8 100644 --- a/core/src/io/anuke/mindustry/entities/enemies/types/BlastType.java +++ b/core/src/io/anuke/mindustry/entities/enemies/types/BlastType.java @@ -15,7 +15,7 @@ public class BlastType extends EnemyType { public BlastType() { super("blastenemy"); health = 30; - speed = 0.7f; + speed = 0.8f; bullet = null; turretrotatespeed = 0f; mass = 0.8f; diff --git a/core/src/io/anuke/mindustry/entities/enemies/types/FastType.java b/core/src/io/anuke/mindustry/entities/enemies/types/FastType.java index 415bb7eee9..29c7ed5a0c 100644 --- a/core/src/io/anuke/mindustry/entities/enemies/types/FastType.java +++ b/core/src/io/anuke/mindustry/entities/enemies/types/FastType.java @@ -8,10 +8,10 @@ public class FastType extends EnemyType { super("fastenemy"); speed = 0.73f; - reload = 25; + reload = 20; mass = 0.2f; - health = 40; + health = 50; } } diff --git a/core/src/io/anuke/mindustry/game/Difficulty.java b/core/src/io/anuke/mindustry/game/Difficulty.java index 123b0d6989..ed84960259 100644 --- a/core/src/io/anuke/mindustry/game/Difficulty.java +++ b/core/src/io/anuke/mindustry/game/Difficulty.java @@ -17,8 +17,8 @@ public enum Difficulty { easy(4f, 2f, new DestrutiveHeuristic(b -> b instanceof Generator)), normal(2f, 1f, new DestrutiveHeuristic(b -> b instanceof Smelter || b instanceof Generator)), hard(1.5f, 0.5f, new DestrutiveHeuristic(b -> b instanceof Turret || b instanceof Generator || b instanceof Drill || b instanceof Smelter)), - insane(0.5f, 0.25f, new DestrutiveHeuristic(b -> b instanceof Turret || b instanceof Generator || b instanceof Drill || b instanceof Smelter || b instanceof Router)), - purge(0.35f, 0.01f, new DestrutiveHeuristic(b -> b instanceof Turret || b instanceof Generator || b instanceof Drill || b instanceof Router + insane(0.5f, 0.25f, new DestrutiveHeuristic(b -> b instanceof Generator || b instanceof Drill || b instanceof Smelter || b instanceof Router)), + purge(0.25f, 0.01f, new DestrutiveHeuristic(b -> b instanceof Generator || b instanceof Drill || b instanceof Router || b instanceof Smelter || b instanceof Conveyor || b instanceof LiquidBlock || b instanceof PowerBlock)); /**The scaling of how many waves it takes for one more enemy of a type to appear. diff --git a/core/src/io/anuke/mindustry/resource/Weapon.java b/core/src/io/anuke/mindustry/resource/Weapon.java index ca0ed72f84..8e56bd070b 100644 --- a/core/src/io/anuke/mindustry/resource/Weapon.java +++ b/core/src/io/anuke/mindustry/resource/Weapon.java @@ -21,7 +21,7 @@ public class Weapon extends Upgrade{ effect = Fx.laserShoot; } }, - triblaster = new Weapon("triblaster", 20, BulletType.spread){ + triblaster = new Weapon("triblaster", 16, BulletType.spread){ { shots = 3; effect = Fx.spreadShoot; diff --git a/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java index 4fdacf8d6f..d842143203 100644 --- a/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/DefenseBlocks.java @@ -11,7 +11,7 @@ public class DefenseBlocks{ public static final Block stonewall = new Wall("stonewall"){{ - health = 50*wallHealthMultiplier; + health = 40*wallHealthMultiplier; }}, ironwall = new Wall("ironwall"){{ @@ -50,7 +50,7 @@ public class DefenseBlocks{ repairturret = new RepairTurret("repairturret"){ { range = 30; - reload = 40f; + reload = 25f; health = 60; powerUsed = 0.08f; } @@ -59,7 +59,7 @@ public class DefenseBlocks{ megarepairturret = new RepairTurret("megarepairturret"){ { range = 44; - reload = 20f; + reload = 12f; health = 90; powerUsed = 0.13f; } diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java index 6f3fd37469..c65c074ea0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java @@ -25,7 +25,7 @@ public class WeaponBlocks{ range = 52; reload = 15f; bullet = BulletType.stone; - health = 50; + health = 45; ammo = Item.stone; } }, @@ -37,7 +37,7 @@ public class WeaponBlocks{ bullet = BulletType.stone; ammo = Item.stone; health = 55; - health = 50; + health = 45; } @Override @@ -163,7 +163,7 @@ public class WeaponBlocks{ shootsound = "bigshot"; inaccuracy = 8f; range = 80f; - reload = 8f; + reload = 5f; bullet = BulletType.chain; ammo = Item.uranium; health = 430;