Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional bugfixes

Browse Source
This commit is contained in:
Anuken
2018-10-02 21:44:32 -04:00
parent dd7f91b8c2
commit ce4031af74
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -27,7 +27,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '8b72f5b0fadc4a2133337d9db4651ac4794581d9' uCoreVersion = 'ad9936bf6ebba8cd5b3a654b8973408f7101dc7d'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

7
core/src/io/anuke/mindustry/content/UnitTypes.java
View File

@@ -50,6 +50,7 @@ public class UnitTypes implements ContentList{
maxVelocity = 1.1f; maxVelocity = 1.1f;
speed = 0.2f; speed = 0.2f;
drag = 0.4f; drag = 0.4f;
hitsize = 8f;
mass = 1.75f; mass = 1.75f;
range = 40f; range = 40f;
weapon = Weapons.chainBlaster; weapon = Weapons.chainBlaster;
@@ -60,9 +61,9 @@ public class UnitTypes implements ContentList{
maxVelocity = 0.8f; maxVelocity = 0.8f;
speed = 0.18f; speed = 0.18f;
drag = 0.4f; drag = 0.4f;
mass = 3f; mass = 3.5f;
range = 10f; range = 10f;
hitsize = 8f; hitsize = 9f;
rotatespeed = 0.1f; rotatespeed = 0.1f;
weapon = Weapons.flamethrower; weapon = Weapons.flamethrower;
health = 440; health = 440;
@@ -72,7 +73,7 @@ public class UnitTypes implements ContentList{
maxVelocity = 0.8f; maxVelocity = 0.8f;
speed = 0.15f; speed = 0.15f;
drag = 0.4f; drag = 0.4f;
mass = 4.5f; mass = 5f;
hitsize = 10f; hitsize = 10f;
range = 10f; range = 10f;
rotatespeed = 0.06f; rotatespeed = 0.06f;

2
core/src/io/anuke/mindustry/entities/units/GroundUnit.java
View File

@@ -119,7 +119,7 @@ public abstract class GroundUnit extends BaseUnit{
public void update(){ public void update(){
super.update(); super.update();
stuckTime = !getVelocity().isZero(0.0001f) ? 0f : stuckTime + Timers.delta(); stuckTime = !vec.set(x, y).sub(lastPosition()).isZero(0.0001f) ? 0f : stuckTime + Timers.delta();
if(!velocity.isZero(0.0001f) && (Units.invalidateTarget(target, this) || (distanceTo(target) > getWeapon().getAmmo().getRange()))){ if(!velocity.isZero(0.0001f) && (Units.invalidateTarget(target, this) || (distanceTo(target) > getWeapon().getAmmo().getRange()))){
rotation = Mathf.slerpDelta(rotation, velocity.angle(), type.rotatespeed); rotation = Mathf.slerpDelta(rotation, velocity.angle(), type.rotatespeed);