mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Switched default mech to dart / Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-05-03 09:21:45 -04:00
parent 0c396f76b2
commit a161c09441
5 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -736,7 +736,7 @@ block.pneumatic-drill.name = Pneumatic Drill
block.laser-drill.name = Laser Drill block.laser-drill.name = Laser Drill
block.water-extractor.name = Water Extractor block.water-extractor.name = Water Extractor
block.cultivator.name = Cultivator 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.delta-mech-pad.name = Delta Mech Pad
block.javelin-ship-pad.name = Javelin Ship Pad block.javelin-ship-pad.name = Javelin Ship Pad
block.trident-ship-pad.name = Trident Ship Pad block.trident-ship-pad.name = Trident Ship Pad

2
core/src/io/anuke/mindustry/content/Blocks.java
View File

@ -1644,7 +1644,7 @@ public class Blocks implements ContentList{
dartPad = new MechPad("dart-mech-pad"){{ dartPad = new MechPad("dart-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 200, Items.graphite, 100, Items.copper, 150)); requirements(Category.upgrade, ItemStack.with(Items.lead, 200, Items.graphite, 100, Items.copper, 150));
mech = Mechs.dart; mech = Mechs.alpha;
size = 2; size = 2;
consumes.powerBuffered(50f); consumes.powerBuffered(50f);
}}; }};

1
core/src/io/anuke/mindustry/content/Bullets.java
View File

@ -632,7 +632,6 @@ public class Bullets implements ContentList{
}}; }};
oilShot = new LiquidBulletType(Liquids.oil){{ oilShot = new LiquidBulletType(Liquids.oil){{
speed = 2f;
drag = 0.03f; drag = 0.03f;
}}; }};

2
core/src/io/anuke/mindustry/content/Mechs.java
View File

@ -359,6 +359,6 @@ public class Mechs implements ContentList{
} }
}; };
starter = alpha; starter = dart;
} }
} }

12
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@ -590,7 +590,6 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override @Override
public void update(){ public void update(){
clampCamera();
if(state.is(State.menu) || player.isDead()){ if(state.is(State.menu) || player.isDead()){
selection.clear(); selection.clear();
removals.clear(); removals.clear();
@ -730,17 +729,6 @@ public class MobileInput extends InputHandler implements GestureListener{
return true; 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){ float clerp(float value, float min, float max){
final float alpha = 0.07f; final float alpha = 0.07f;
return value < min ? Mathf.lerpDelta(value, min, alpha) : value > max ? Mathf.lerpDelta(value, max, alpha) : value; return value < min ? Mathf.lerpDelta(value, min, alpha) : value > max ? Mathf.lerpDelta(value, max, alpha) : value;