diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a39b2abb29..37be0efdb7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -736,7 +736,7 @@ block.pneumatic-drill.name = Pneumatic Drill block.laser-drill.name = Laser Drill block.water-extractor.name = Water Extractor block.cultivator.name = Cultivator -block.dart-mech-pad.name = Dart Ship Pad +block.dart-mech-pad.name = Alpha Mech Pad block.delta-mech-pad.name = Delta Mech Pad block.javelin-ship-pad.name = Javelin Ship Pad block.trident-ship-pad.name = Trident Ship Pad diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index fb9465cdd0..71bb947b89 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1644,7 +1644,7 @@ public class Blocks implements ContentList{ dartPad = new MechPad("dart-mech-pad"){{ requirements(Category.upgrade, ItemStack.with(Items.lead, 200, Items.graphite, 100, Items.copper, 150)); - mech = Mechs.dart; + mech = Mechs.alpha; size = 2; consumes.powerBuffered(50f); }}; diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index 449add9ab3..864e49460c 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -632,7 +632,6 @@ public class Bullets implements ContentList{ }}; oilShot = new LiquidBulletType(Liquids.oil){{ - speed = 2f; drag = 0.03f; }}; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index b6fffbc3e5..050ff47c16 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -359,6 +359,6 @@ public class Mechs implements ContentList{ } }; - starter = alpha; + starter = dart; } } diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 876e2732c7..7b7f53b098 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -590,7 +590,6 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public void update(){ - clampCamera(); if(state.is(State.menu) || player.isDead()){ selection.clear(); removals.clear(); @@ -730,17 +729,6 @@ public class MobileInput extends InputHandler implements GestureListener{ return true; } - void clampCamera(){ - if(player.isDead()) return; - - Vector2 v = Core.camera.position; - //change to 1/2 to clamp to viewport - float scaling = 1f; - - v.x = clerp(v.x, player.x - Core.camera.width*scaling, player.x + Core.camera.width*scaling); - v.y = clerp(v.y, player.y - Core.camera.height*scaling, player.y + Core.camera.height*scaling); - } - float clerp(float value, float min, float max){ final float alpha = 0.07f; return value < min ? Mathf.lerpDelta(value, min, alpha) : value > max ? Mathf.lerpDelta(value, max, alpha) : value;