Air unit adjust

ABrandau · Jan 13, 2024 · 4cfbe81 · 4cfbe81
1 parent c401470
commit 4cfbe81
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 106 deletions.
diff --git a/mods/sp/rules/aircraft.yaml b/mods/sp/rules/aircraft.yaml
@@ -192,7 +192,7 @@ ORCAB:
 		RequiresCondition: ceramic_plating
 
 DSHP:
-	Inherits: ^Helicopter
+	Inherits: ^AirTransport
 	Inherits@PIPS: ^CargoPips
 	Inherits@SHADOW: ^AircraftShadow
 	Valued:
@@ -268,7 +268,7 @@ DSHP.HIGH:
 		RequiresCondition: HeavyDamaged
 
 ORCATRAN:
-	Inherits: ^Helicopter
+	Inherits: ^AirTransport
 	Inherits@CERAMICS: ^AffectedByCeramicPlating
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
 	Inherits@PIPS: ^CargoPips
@@ -526,7 +526,7 @@ SCRIN:
 		Damage: 50
 
 CERBERUS:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@SHADOW: ^AircraftShadow
@@ -556,7 +556,6 @@ CERBERUS:
 		Repulsable: true
 		MoveIntoShroud: true
 		IdealSeparation: 1706
-	-Rearmable:
 	Health:
 		HP: 45000
 	Armament@sweep1:
@@ -1072,7 +1071,7 @@ STORMRIDER:
 		Damage: 20
 
 DRACHE:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@1: ^ScrinAircraftGeneric
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
 	Inherits@SELECTIONMODE: ^LowPrioritySelectionMode
@@ -1102,7 +1101,6 @@ DRACHE:
 		MoveIntoShroud: true
 		IdealSeparation: 1706
 		LandableTerrainTypes: Clear, Ice, Rough, Road, DirtRoad, Ground, Green, Tiberium, BlueTiberium
-	-Rearmable:
 	Targetable@MC:
 		RequiresCondition: !mindcontrolled && !suddendeath
 	MustBeDestroyed:
@@ -1213,7 +1211,7 @@ SCRGLYDER1:
 		Damage: 90
 
 SCRDESTROYER:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@1: ^ScrinAircraftGeneric
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
@@ -1234,7 +1232,6 @@ SCRDESTROYER:
 		Prerequisites: ~scrair, scrradr, ~techlevel.4
 		BuildDuration: 1000
 		BuildDurationModifier: 100
-	-Rearmable:
 	Selectable:
 		Bounds: 1460,1800,0,-723
 	AutoTarget:
@@ -1315,7 +1312,7 @@ SCRDESTROYER:
 		Upgrades: upgrade.disc_barrage, upgrade.hyper_flight_rotors
 
 SCRTRANS:
-	Inherits: ^Helicopter
+	Inherits: ^AirTransport
 	Inherits@1: ^ScrinAircraftGeneric
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
 	Inherits@HYPERFLIGHT: ^AffectedByHyperFlightRotors
@@ -1394,7 +1391,7 @@ SCRTRANS:
 		Stats: Armor, Sight, Speed, None, None, None, Cargo
 
 SCRCARRIER:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@1: ^ScrinAircraftGeneric
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
@@ -1428,7 +1425,6 @@ SCRCARRIER:
 		MoveIntoShroud: true
 	SpeedMultiplier@HYPERFLIGHTROTORS:
 		Modifier: 150
-	-Rearmable:
 	Health:
 		HP: 60000
 	Armament:
@@ -1487,7 +1483,7 @@ SCRCARRIER:
 		Damage: 20
 
 SCRBATTLESHIP:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@1: ^ScrinAircraftGeneric
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
@@ -1527,7 +1523,6 @@ SCRBATTLESHIP:
 		Repulsable: true
 		IdealSeparation: 1920
 		MoveIntoShroud: true
-	-Rearmable:
 	Health:
 		HP: 200000
 	Armament@1:
@@ -1660,7 +1655,7 @@ WASP:
 		Damage: 60
 
 BASILISK:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
 	Inherits@EXPERIENCE: ^GainsExperience
@@ -1691,7 +1686,6 @@ BASILISK:
 		Speed: 90
 		MoveIntoShroud: true
 		IdealSeparation: 1706
-	-Rearmable:
 	Health:
 		HP: 45000
 	Armament:
@@ -1730,7 +1724,7 @@ BASILISK:
 		Damage: 400
 
 DEVOURER:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@CLOAKEFFECT: ^WithTriggerCloakEffect-Building
 	Inherits@EXPERIENCE: ^GainsExperience
@@ -1761,7 +1755,6 @@ DEVOURER:
 		Repulsable: true
 		IdealSeparation: 1706
 		MoveIntoShroud: true
-	-Rearmable:
 	Health:
 		HP: 150000
 	Voiced:

diff --git a/mods/sp/rules/campaignstuff.yaml b/mods/sp/rules/campaignstuff.yaml
@@ -1378,7 +1378,7 @@ GAIONTUR:
 		Damage: 2000
 
 KODK:
-	Inherits: ^CombatHelicopter
+	Inherits: ^CombatAirCruiser
 	Inherits@SHADOW: ^AircraftShadow
 	Inherits@VISION: ^9CellVisionAir
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
@@ -1406,7 +1406,6 @@ KODK:
 		Voice: Attack
 	AutoTarget:
 		ScanRadius: 10 #PREF: save trait looks up and scan armaments
-	-Rearmable:
 	Health:
 		HP: 45000
 	SpawnHuskEffectOnDeath:

diff --git a/mods/sp/rules/defaults.yaml b/mods/sp/rules/defaults.yaml
@@ -2590,7 +2590,7 @@
 		AirborneCondition: airborne
 		CruisingCondition: cruising
 		Voice: Move
-		CruiseAltitude: 4c0
+		CruiseAltitude: 4c050
 		IdealSeparation: 1c0
 		AltitudeVelocity: 300
 		MaximumPitch: 90
@@ -2649,15 +2649,18 @@
 		RequiresCondition: !airborne
 		ZOffset: -1000
 
+### Different type of air unit use different set of "CruiseAltitude"
+## so big aircraft won't block the way of small aircraft.
 ^Helicopter:
 	Inherits: ^Aircraft
 	Aircraft:
-		CruiseAltitude: 3c1023
+		CruiseAltitude: 4c0
 		Crushes: crate, mine, minetrigger
 		LandableTerrainTypes: Clear, Ice, Rough, Road, DirtRoad, Ground, Green, Tiberium, BlueTiberium
 		VTOL: true
 		CanHover: true
 		CanSlide: true
+		-CruisingCondition:
 	Targetable@AIRBORNE:
 		TargetTypes: Air #, Helicopter
 		RequiresCondition: airborne
@@ -2670,6 +2673,54 @@
 	Rearmable:
 		RearmActors: nahpad, gahpad, muair, cabair, civheli, tdhelipad
 
+^CombatAirCruiser:
+	Inherits: ^CombatHelicopter
+	-Rearmable:
+	Aircraft:
+		CruiseAltitude: 3c930
+
+^AirTransport:
+	Inherits: ^Helicopter
+	Aircraft:
+		CruiseAltitude: 3c930
+
+^AirInfantry:
+	Inherits: ^Aircraft
+	Aircraft:
+		CruiseAltitude: 3c980
+		TurnSpeed: 40
+		Speed: 150
+		IdealSeparation: 1c0
+		LandableTerrainTypes: Clear, Ice, Rough, Road, DirtRoad, Ground, Green, Tiberium, BlueTiberium
+		CanHover: true
+		Repulsable: true
+		MoveIntoShroud: true
+		TakeOffOnResupply: true
+		VTOL: true
+		CanSlide: true
+	Selectable:
+		Bounds: 664,1809,0,-603
+	HitShape:
+		UseTargetableCellsOffsets: true
+		Type: Rectangle
+			TopLeft: -250, -250
+			BottomRight: 250, 250
+	TakeOffOnMake:
+	Targetable@GROUND:
+		TargetTypes: Infantry, Ground
+	Targetable@AIRBORNE:
+		TargetTypes: Air, OrganicVehicle, NoRepair
+	-Repairable:
+	-GrantConditionOnDamageState@HeavyDamaged:
+	-SpawnSparks:
+	-FloatingSpriteEmitter@spawnsmoke:
+	-ExplodesAlsoTransported@Shrapnel:
+	Cloak@CLOAKGENERATOR:
+		-CloakedCondition:
+	-Sellable:
+	-GrantConditionOnClientDock@Sellable:
+	-IssueOrderToBot@AISell:
+
 ^Plane:
 	Inherits: ^Aircraft
 	Rearmable: