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

Various tweaks

Browse Source
This commit is contained in:
Anuken
2020-08-18 00:04:57 -04:00
parent 7e0391a8a0
commit 0bd122c570
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/content/Bullets.java
View File

@@ -240,7 +240,7 @@ public class Bullets implements ContentList{
explodeRange = 20f; explodeRange = 20f;
}}; }};
missileExplosive = new MissileBulletType(2.7f, 10){{ missileExplosive = new MissileBulletType(3f, 10){{
width = 8f; width = 8f;
height = 8f; height = 8f;
shrinkY = 0f; shrinkY = 0f;
@@ -248,7 +248,6 @@ public class Bullets implements ContentList{
splashDamageRadius = 30f; splashDamageRadius = 30f;
splashDamage = 30f; splashDamage = 30f;
ammoMultiplier = 4f; ammoMultiplier = 4f;
lifetime = 100f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
@@ -256,7 +255,7 @@ public class Bullets implements ContentList{
statusDuration = 60f; statusDuration = 60f;
}}; }};
missileIncendiary = new MissileBulletType(2.9f, 12){{ missileIncendiary = new MissileBulletType(3f, 12){{
frontColor = Pal.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Pal.lightOrange; backColor = Pal.lightOrange;
width = 7f; width = 7f;
@@ -266,19 +265,17 @@ public class Bullets implements ContentList{
homingPower = 0.08f; homingPower = 0.08f;
splashDamageRadius = 20f; splashDamageRadius = 20f;
splashDamage = 20f; splashDamage = 20f;
lifetime = 100f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
status = StatusEffects.burning; status = StatusEffects.burning;
}}; }};
missileSurge = new MissileBulletType(4.4f, 20){{ missileSurge = new MissileBulletType(3f, 20){{
width = 8f; width = 8f;
height = 8f; height = 8f;
shrinkY = 0f; shrinkY = 0f;
drag = -0.01f; drag = -0.01f;
splashDamageRadius = 28f; splashDamageRadius = 28f;
splashDamage = 40f; splashDamage = 40f;
lifetime = 100f;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
lightning = 2; lightning = 2;

1
core/src/mindustry/entities/bullet/MissileBulletType.java
View File

@@ -15,6 +15,7 @@ public class MissileBulletType extends BasicBulletType{
height = 8f; height = 8f;
hitSound = Sounds.explosion; hitSound = Sounds.explosion;
trailChance = 0.2f; trailChance = 0.2f;
lifetime = 49f;
} }
public MissileBulletType(float speed, float damage){ public MissileBulletType(float speed, float damage){

8
core/src/mindustry/input/DesktopInput.java
View File

@@ -566,9 +566,9 @@ public class DesktopInput extends InputHandler{
protected void updateMovement(Unit unit){ protected void updateMovement(Unit unit){
boolean omni = !(unit instanceof WaterMovec); 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; float baseSpeed = unit.type().speed;
//limit speed to minimum formation speed to preserve formation //limit speed to minimum formation speed to preserve formation
@@ -602,8 +602,8 @@ public class DesktopInput extends InputHandler{
unit.moveAt(movement); unit.moveAt(movement);
}else{ }else{
unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len())); unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len()));
if(!movement.isZero() && legs){ if(!movement.isZero() && ground){
unit.vel.rotateTo(movement.angle(), unit.type().rotateSpeed * Time.delta); unit.vel.rotateTo(movement.angle(), unit.type().rotateSpeed);
} }
} }

2
core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
View File

@@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{
clearChatInput(); clearChatInput();
} }
return shown && !Vars.net.active(); return shown;
}); });
update(() -> { update(() -> {