diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index e4e02792ea..c4dac32493 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -240,7 +240,7 @@ public class Bullets implements ContentList{ explodeRange = 20f; }}; - missileExplosive = new MissileBulletType(2.7f, 10){{ + missileExplosive = new MissileBulletType(3f, 10){{ width = 8f; height = 8f; shrinkY = 0f; @@ -248,7 +248,6 @@ public class Bullets implements ContentList{ splashDamageRadius = 30f; splashDamage = 30f; ammoMultiplier = 4f; - lifetime = 100f; hitEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion; @@ -256,7 +255,7 @@ public class Bullets implements ContentList{ statusDuration = 60f; }}; - missileIncendiary = new MissileBulletType(2.9f, 12){{ + missileIncendiary = new MissileBulletType(3f, 12){{ frontColor = Pal.lightishOrange; backColor = Pal.lightOrange; width = 7f; @@ -266,19 +265,17 @@ public class Bullets implements ContentList{ homingPower = 0.08f; splashDamageRadius = 20f; splashDamage = 20f; - lifetime = 100f; hitEffect = Fx.blastExplosion; status = StatusEffects.burning; }}; - missileSurge = new MissileBulletType(4.4f, 20){{ + missileSurge = new MissileBulletType(3f, 20){{ width = 8f; height = 8f; shrinkY = 0f; drag = -0.01f; splashDamageRadius = 28f; splashDamage = 40f; - lifetime = 100f; hitEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion; lightning = 2; diff --git a/core/src/mindustry/entities/bullet/MissileBulletType.java b/core/src/mindustry/entities/bullet/MissileBulletType.java index a3670ac3c0..274a806f5e 100644 --- a/core/src/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/mindustry/entities/bullet/MissileBulletType.java @@ -15,6 +15,7 @@ public class MissileBulletType extends BasicBulletType{ height = 8f; hitSound = Sounds.explosion; trailChance = 0.2f; + lifetime = 49f; } public MissileBulletType(float speed, float damage){ diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 503fe35184..93f85a1b53 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -566,9 +566,9 @@ public class DesktopInput extends InputHandler{ protected void updateMovement(Unit unit){ boolean omni = !(unit instanceof WaterMovec); - boolean legs = unit.isGrounded(); + boolean ground = unit.isGrounded(); - float strafePenalty = legs ? 1f : Mathf.lerp(1f, unit.type().strafePenalty, Angles.angleDist(unit.vel().angle(), unit.rotation()) / 180f); + float strafePenalty = ground ? 1f : Mathf.lerp(1f, unit.type().strafePenalty, Angles.angleDist(unit.vel().angle(), unit.rotation()) / 180f); float baseSpeed = unit.type().speed; //limit speed to minimum formation speed to preserve formation @@ -602,8 +602,8 @@ public class DesktopInput extends InputHandler{ unit.moveAt(movement); }else{ unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len())); - if(!movement.isZero() && legs){ - unit.vel.rotateTo(movement.angle(), unit.type().rotateSpeed * Time.delta); + if(!movement.isZero() && ground){ + unit.vel.rotateTo(movement.angle(), unit.type().rotateSpeed); } } diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java index 68a1a21848..7e11818548 100644 --- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java +++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java @@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{ clearChatInput(); } - return shown && !Vars.net.active(); + return shown; }); update(() -> {