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

Add flyingLayer to units (#10312)

Browse Source
This commit is contained in:
MEEPofFaith
2025-02-04 11:26:26 -08:00
committed by GitHub
parent 0bb5e00ed4
commit 3dd53fd66e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,8 @@ public class UnitType extends UnlockableContent implements Senseable{
/** for ground units, the layer upon which this unit is drawn */ /** for ground units, the layer upon which this unit is drawn */
groundLayer = Layer.groundUnit, groundLayer = Layer.groundUnit,
/** For units that fly, the layer upon which this unit is drawn. If no value is set, defaults to Layer.flyingUnitLow or Layer.flyingUnit depending on lowAltitude */
flyingLayer = -1,
/** Payload capacity of this unit in world units^2 */ /** Payload capacity of this unit in world units^2 */
payloadCapacity = 8, payloadCapacity = 8,
/** building speed multiplier; <0 to disable. */ /** building speed multiplier; <0 to disable. */
@@ -730,6 +732,7 @@ public class UnitType extends UnlockableContent implements Senseable{
autoFindTarget = !weapons.contains(w -> w.shootStatus.speedMultiplier < 0.99f) || alwaysShootWhenMoving; autoFindTarget = !weapons.contains(w -> w.shootStatus.speedMultiplier < 0.99f) || alwaysShootWhenMoving;
} }
if(flyingLayer < 0) flyingLayer = lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit;
clipSize = Math.max(clipSize, lightRadius * 1.1f); clipSize = Math.max(clipSize, lightRadius * 1.1f);
singleTarget = weapons.size <= 1 && !forceMultiTarget; singleTarget = weapons.size <= 1 && !forceMultiTarget;
@@ -1226,7 +1229,7 @@ public class UnitType extends UnlockableContent implements Senseable{
boolean isPayload = !unit.isAdded(); boolean isPayload = !unit.isAdded();
Mechc mech = unit instanceof Mechc ? (Mechc)unit : null; Mechc mech = unit instanceof Mechc ? (Mechc)unit : null;
float z = isPayload ? Draw.z() : unit.elevation > 0.5f ? (lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit) : groundLayer + Mathf.clamp(hitSize / 4000f, 0, 0.01f); float z = isPayload ? Draw.z() : (unit.elevation > 0.5f ? flyingLayer : groundLayer) + Mathf.clamp(hitSize / 4000f, 0, 0.01f);
if(unit.controller().isBeingControlled(player.unit())){ if(unit.controller().isBeingControlled(player.unit())){
drawControl(unit); drawControl(unit);