From e267519c6dc56e2fa98ccb4a5614ec970722d8dd Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 5 Sep 2020 22:58:07 -0400 Subject: [PATCH] Balance & bugfixes --- core/src/mindustry/content/Blocks.java | 6 +++--- core/src/mindustry/content/UnitTypes.java | 8 +++++--- core/src/mindustry/entities/comp/UnitComp.java | 6 ++++++ core/src/mindustry/entities/comp/WaterMoveComp.java | 6 ------ core/src/mindustry/graphics/g3d/PlanetRenderer.java | 2 +- core/src/mindustry/type/UnitType.java | 1 + 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a9949e55e5..56609d7e2e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -509,7 +509,7 @@ public class Blocks implements ContentList{ siliconCrucible = new AttributeSmelter("silicon-crucible"){{ requirements(Category.crafting, with(Items.titanium, 120, Items.metaglass, 80, Items.plastanium, 35, Items.silicon, 60)); craftEffect = Fx.smeltsmoke; - outputItem = new ItemStack(Items.silicon, 6); + outputItem = new ItemStack(Items.silicon, 8); craftTime = 90f; size = 3; hasPower = true; @@ -1564,13 +1564,13 @@ public class Blocks implements ContentList{ segment = new PointDefenseTurret("segment"){{ requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 25)); - range = 100f; + range = 125f; hasPower = true; consumes.power(3f); size = 2; shootLength = 5f; bulletDamage = 18f; - reloadTime = 15f; + reloadTime = 11f; health = 190 * size * size; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index c1647463b4..a98061b873 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -138,6 +138,7 @@ public class UnitTypes implements ContentList{ health = 9000; armor = 11f; mechLegMoveScl = 1.3f; + canDrown = false; weapons.add( new Weapon("scepter-weapon"){{ @@ -194,6 +195,7 @@ public class UnitTypes implements ContentList{ health = 24000; armor = 14f; mechLegMoveScl = 1.75f; + canDrown = false; weapons.add( new Weapon("reign-weapon"){{ @@ -206,7 +208,7 @@ public class UnitTypes implements ContentList{ ejectEffect = Fx.shellEjectBig; shootSound = Sounds.artillery; - bullet = new BasicBulletType(13f, 45){{ + bullet = new BasicBulletType(13f, 55){{ pierce = true; width = 14f; height = 32f; @@ -674,7 +676,7 @@ public class UnitTypes implements ContentList{ statusDuration = 60f * 10; fragLifeMin = 0.3f; - fragBullets = 12; + fragBullets = 9; fragBullet = new ArtilleryBulletType(2.3f, 30){{ hitEffect = Fx.sapExplosion; @@ -683,7 +685,7 @@ public class UnitTypes implements ContentList{ width = height = 20f; collidesTiles = false; splashDamageRadius = 90f; - splashDamage = 55f; + splashDamage = 45f; backColor = Pal.sapBulletBack; frontColor = lightningColor = Pal.sapBullet; lightning = 2; diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 53b53b4182..f54e32f05b 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -90,6 +90,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I return 0; } + @Override + @Replace + public boolean canDrown(){ + return isGrounded() && !hovering && type.canDrown && !(this instanceof WaterMovec); + } + @Override public int itemCapacity(){ return type.itemCapacity; diff --git a/core/src/mindustry/entities/comp/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java index 92d3fffbf1..9671d694ea 100644 --- a/core/src/mindustry/entities/comp/WaterMoveComp.java +++ b/core/src/mindustry/entities/comp/WaterMoveComp.java @@ -83,12 +83,6 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{ } } - @Replace - @Override - public boolean canDrown(){ - return false; - } - @Replace public float floorSpeedMultiplier(){ Floor on = isFlying() ? Blocks.air.asFloor() : floorOn(); diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index 18611b463b..e0e76c0cee 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -37,7 +37,7 @@ public class PlanetRenderer implements Disposable{ /** Camera used for rendering. */ public Camera3D cam = new Camera3D(); /** Raw vertex batch. */ - public final VertexBatch3D batch = new VertexBatch3D(10000, false, true, 0); + public final VertexBatch3D batch = new VertexBatch3D(20000, false, true, 0); public float zoom = 1f; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 4e7c78a0b0..2d06ddcd16 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -69,6 +69,7 @@ public class UnitType extends UnlockableContent{ public int mineTier = -1; public float buildSpeed = 1f, mineSpeed = 1f; + public boolean canDrown = true; public float engineOffset = 5f, engineSize = 2.5f; public float strafePenalty = 0.5f; public float hitsize = 6f;