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

Added descentSpeed to UnitType.java (#11490)

Browse Source 
plus fixing up descriptions for accuracy on what they do
This commit is contained in:
SomeonesShade
2026-02-06 11:50:31 +08:00
committed by GitHub
parent 6a2ef5a8ca
commit a2825a08a9
7 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/types/GroundAI.java
View File

@@ -55,7 +55,7 @@ public class GroundAI extends AIController{
} }
if(unit.type.canBoost && unit.elevation > 0.001f && !unit.onSolid()){ if(unit.type.canBoost && unit.elevation > 0.001f && !unit.onSolid()){
unit.elevation = Mathf.approachDelta(unit.elevation, 0f, unit.type.riseSpeed); unit.elevation = Mathf.approachDelta(unit.elevation, 0f, unit.type.descentSpeed);
} }
faceTarget(); faceTarget();

2
core/src/mindustry/ai/types/HugAI.java
View File

@@ -54,7 +54,7 @@ public class HugAI extends AIController{
} }
if(unit.type.canBoost && unit.elevation > 0.001f && !unit.onSolid()){ if(unit.type.canBoost && unit.elevation > 0.001f && !unit.onSolid()){
unit.elevation = Mathf.approachDelta(unit.elevation, 0f, unit.type.riseSpeed); unit.elevation = Mathf.approachDelta(unit.elevation, 0f, unit.type.descentSpeed);
} }
faceTarget(); faceTarget();

3
core/src/mindustry/ai/types/LogicAI.java
View File

@@ -109,7 +109,8 @@ public class LogicAI extends AIController{
} }
if(unit.type.canBoost && !unit.type.flying){ if(unit.type.canBoost && !unit.type.flying){
unit.elevation = Mathf.approachDelta(unit.elevation, Mathf.num(boost || unit.onSolid() || (unit.isFlying() && !unit.canLand())), unit.type.riseSpeed); boolean shouldBoost = boost || unit.onSolid() || (unit.isFlying() && !unit.canLand());
unit.elevation = Mathf.approachDelta(unit.elevation, Mathf.num(shouldBoost), shouldBoost ? unit.type.riseSpeed : unit.type.descentSpeed);
} }
//look where moving if there's nothing to aim at //look where moving if there's nothing to aim at

6
core/src/mindustry/content/UnitTypes.java
View File

@@ -398,7 +398,7 @@ public class UnitTypes{
health = 320f; health = 320f;
buildSpeed = 0.5f; buildSpeed = 0.5f;
armor = 4f; armor = 4f;
riseSpeed = 0.07f; riseSpeed = descentSpeed = 0.07f;
mineTier = 2; mineTier = 2;
mineSpeed = 3f; mineSpeed = 3f;
@@ -454,7 +454,7 @@ public class UnitTypes{
canBoost = true; canBoost = true;
armor = 9f; armor = 9f;
mechLandShake = 2f; mechLandShake = 2f;
riseSpeed = 0.05f; riseSpeed = descentSpeed = 0.05f;
mechFrontSway = 0.55f; mechFrontSway = 0.55f;
ammoType = new PowerAmmoType(1500); ammoType = new PowerAmmoType(1500);
@@ -510,7 +510,7 @@ public class UnitTypes{
engineOffset = 12f; engineOffset = 12f;
engineSize = 6f; engineSize = 6f;
lowAltitude = true; lowAltitude = true;
riseSpeed = 0.02f; riseSpeed = descentSpeed = 0.02f;
health = 8200f; health = 8200f;
armor = 9f; armor = 9f;

3
core/src/mindustry/entities/comp/PlayerComp.java
View File

@@ -167,7 +167,8 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
//update some basic state to sync things //update some basic state to sync things
if(unit.type.canBoost){ if(unit.type.canBoost){
unit.elevation = Mathf.approachDelta(unit.elevation, unit.onSolid() || boosting || (unit.isFlying() && !unit.canLand()) ? 1f : 0f, unit.type.riseSpeed); boolean shouldBoost = unit.onSolid() || boosting || (unit.isFlying() && !unit.canLand());
unit.elevation = Mathf.approachDelta(unit.elevation, shouldBoost ? 1f : 0f, shouldBoost ? unit.type.riseSpeed : unit.type.descentSpeed);
} }
}else if((core = bestCore()) != null){ }else if((core = bestCore()) != null){
//have a small delay before death to prevent the camera from jumping around too quickly //have a small delay before death to prevent the camera from jumping around too quickly

3
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -113,7 +113,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
public void updateBoosting(boolean boost){ public void updateBoosting(boolean boost){
if(!type.canBoost || dead) return; if(!type.canBoost || dead) return;
elevation = Mathf.approachDelta(elevation, type.canBoost ? Mathf.num(boost || onSolid() || (isFlying() && !canLand())) : 0f, type.riseSpeed); boolean shouldBoost = boost || onSolid() || (isFlying() && !canLand());
elevation = Mathf.approachDelta(elevation, type.canBoost ? Mathf.num(shouldBoost) : 0f, shouldBoost ? type.riseSpeed : type.descentSpeed);
} }
/** Move based on preferred unit movement type. */ /** Move based on preferred unit movement type. */

4
core/src/mindustry/type/UnitType.java
View File

@@ -77,7 +77,9 @@ public class UnitType extends UnlockableContent implements Senseable{
rippleScale = 1f, rippleScale = 1f,
/** boosting rise speed as fraction */ /** boosting rise speed as fraction */
riseSpeed = 0.08f, riseSpeed = 0.08f,
/** how fast this unit falls when not boosting */ /** boosting descent speed as fraction */
descentSpeed = 0.08f,
/** how fast this unit falls upon death */
fallSpeed = 0.018f, fallSpeed = 0.018f,
/** how many ticks it takes this missile to accelerate to full speed */ /** how many ticks it takes this missile to accelerate to full speed */
missileAccelTime = 0f, missileAccelTime = 0f,