diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 61ff3c7b2d..16c3d3991c 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index e1e0512c43..a2502e4b8a 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -181,8 +181,8 @@ public class MapView extends Element implements GestureListener{ if(Core.scene.getKeyboardFocus() == null || !(Core.scene.getKeyboardFocus() instanceof TextField) && !Core.input.keyDown(KeyCode.controlLeft)){ float ax = Core.input.axis(Binding.move_x); float ay = Core.input.axis(Binding.move_y); - offsetx -= ax * 15f / zoom; - offsety -= ay * 15f / zoom; + offsetx -= ax * 15 * Time.delta / zoom; + offsety -= ay * 15 * Time.delta / zoom; } if(Core.input.keyTap(KeyCode.shiftLeft)){ diff --git a/core/src/mindustry/entities/abilities/MoveLightningAbility.java b/core/src/mindustry/entities/abilities/MoveLightningAbility.java index cec4332dd2..d91a0d6cc8 100644 --- a/core/src/mindustry/entities/abilities/MoveLightningAbility.java +++ b/core/src/mindustry/entities/abilities/MoveLightningAbility.java @@ -36,8 +36,6 @@ public class MoveLightningAbility extends Ability{ public Effect shootEffect = Fx.sparkShoot; public boolean parentizeEffects; public Sound shootSound = Sounds.spark; - - protected float side = 1f; MoveLightningAbility(){} @@ -66,7 +64,7 @@ public class MoveLightningAbility extends Ability{ public void update(Unit unit){ float scl = Mathf.clamp((unit.vel().len() - minSpeed) / (maxSpeed - minSpeed)); if(Mathf.chance(Time.delta * chance * scl)){ - float x = unit.x + Angles.trnsx(unit.rotation, offset, width * side), y = unit.y + Angles.trnsy(unit.rotation, offset, width * side); + float x = unit.x + Angles.trnsx(unit.rotation, offset, width), y = unit.y + Angles.trnsy(unit.rotation, offset, width); shootEffect.at(x, y, unit.rotation, color, parentizeEffects ? unit : null); shootSound.at(unit); @@ -78,8 +76,6 @@ public class MoveLightningAbility extends Ability{ if(bullet != null){ bullet.create(unit, unit.team, x, y, unit.rotation + bulletAngle + Mathf.range(bulletSpread)); } - - side *= -1f; } } diff --git a/servers_v7.json b/servers_v7.json index 1fa352ca86..6178f0da0f 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -25,7 +25,7 @@ }, { "name": "DarkDustry", - "address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] + "address": ["darkdustry.ml", "darkdustry.ml:5000", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"] }, { "name": "Chaotic Neutral",