diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 4e431cdd3e..9b785d638e 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -325,11 +325,9 @@ LandWhenIdle: false AirborneCondition: airborne CruisingCondition: cruising - CanHover: True - TakeOffOnResupply: true - VTOL: true LandableTerrainTypes: Clear, Rough, Road, Beach, Tiberium, BlueTiberium Crushes: crate, infantry + FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation, TakeOffOnResupply, TurnToDock InitialFacing: 224 HiddenUnderFog: Type: GroundPosition @@ -1089,8 +1087,7 @@ Offset: 43, 128, 0 ZOffset: -129 Aircraft: - CanHover: True - VTOL: true + FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation FallsToEarth: Spins: True Moves: False diff --git a/mods/d2k/maps/atreides-05/rules.yaml b/mods/d2k/maps/atreides-05/rules.yaml index 0971fc04f3..c0aaa2a5be 100644 --- a/mods/d2k/maps/atreides-05/rules.yaml +++ b/mods/d2k/maps/atreides-05/rules.yaml @@ -26,7 +26,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise barracks.harkonnen: Inherits: barracks diff --git a/mods/d2k/maps/harkonnen-05/rules.yaml b/mods/d2k/maps/harkonnen-05/rules.yaml index bb267bdd62..320ac74f62 100644 --- a/mods/d2k/maps/harkonnen-05/rules.yaml +++ b/mods/d2k/maps/harkonnen-05/rules.yaml @@ -32,7 +32,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise concreteb: Buildable: diff --git a/mods/d2k/maps/harkonnen-06a/rules.yaml b/mods/d2k/maps/harkonnen-06a/rules.yaml index 1b1acffa1d..498bf55228 100644 --- a/mods/d2k/maps/harkonnen-06a/rules.yaml +++ b/mods/d2k/maps/harkonnen-06a/rules.yaml @@ -36,7 +36,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise concreteb: Buildable: diff --git a/mods/d2k/maps/harkonnen-06b/rules.yaml b/mods/d2k/maps/harkonnen-06b/rules.yaml index 41b64f017a..5538e6c2e4 100644 --- a/mods/d2k/maps/harkonnen-06b/rules.yaml +++ b/mods/d2k/maps/harkonnen-06b/rules.yaml @@ -36,7 +36,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise concreteb: Buildable: diff --git a/mods/d2k/maps/harkonnen-08/rules.yaml b/mods/d2k/maps/harkonnen-08/rules.yaml index 2973e7723f..dd3e73d927 100644 --- a/mods/d2k/maps/harkonnen-08/rules.yaml +++ b/mods/d2k/maps/harkonnen-08/rules.yaml @@ -34,7 +34,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise mpsardaukar: Buildable: diff --git a/mods/d2k/maps/harkonnen-09a/rules.yaml b/mods/d2k/maps/harkonnen-09a/rules.yaml index a3299a8c39..297d86b6cb 100644 --- a/mods/d2k/maps/harkonnen-09a/rules.yaml +++ b/mods/d2k/maps/harkonnen-09a/rules.yaml @@ -35,7 +35,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise mpsardaukar: Buildable: diff --git a/mods/d2k/maps/harkonnen-09b/rules.yaml b/mods/d2k/maps/harkonnen-09b/rules.yaml index 9909af20fe..3cd46cd986 100644 --- a/mods/d2k/maps/harkonnen-09b/rules.yaml +++ b/mods/d2k/maps/harkonnen-09b/rules.yaml @@ -38,7 +38,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise mpsardaukar: Buildable: diff --git a/mods/d2k/maps/ordos-05/rules.yaml b/mods/d2k/maps/ordos-05/rules.yaml index a0418fc70e..6f9cc8fc3c 100644 --- a/mods/d2k/maps/ordos-05/rules.yaml +++ b/mods/d2k/maps/ordos-05/rules.yaml @@ -34,7 +34,6 @@ carryall.reinforce: frigate: Aircraft: LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune, Concrete - VTOL: true # The frigate would teleport to land otherwise concreteb: Buildable: diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index d18424a5fc..2858327663 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -9,6 +9,7 @@ carryall.reinforce: Armor: Type: light Aircraft: + FlightDynamics: VTOL, Slide, MoveIntoShroud, TakeOffOnCreation CruiseAltitude: 2160 CruisingCondition: cruising InitialFacing: 0 @@ -18,8 +19,6 @@ carryall.reinforce: Repulsable: False LandWhenIdle: False AirborneCondition: airborne - CanHover: True - VTOL: true IdleTurnSpeed: 1 Targetable@GROUND: TargetTypes: Ground, Vehicle @@ -77,6 +76,7 @@ frigate: Tooltip: Name: Frigate Aircraft: + FlightDynamics: VTOL, Hover, MoveIntoShroud, TakeOffOnCreation Speed: 189 TurnSpeed: 1 Repulsable: False @@ -99,12 +99,11 @@ ornithopter: Armor: Type: light Aircraft: + FlightDynamics: MoveIntoShroud, TakeOffOnCreation Speed: 224 TurnSpeed: 2 Repulsable: False - CanHover: True CruiseAltitude: 1920 - VTOL: true AmmoPool: Ammo: 5 Tooltip: @@ -132,8 +131,7 @@ carryall.husk: Aircraft: TurnSpeed: 4 Speed: 144 - CanHover: True - VTOL: true + FlightDynamics: VTOL, Slide, MoveIntoShroud, TakeOffOnCreation RenderSprites: Image: carryall @@ -146,7 +144,6 @@ carryall.huskVTOL: Velocity: 0c128 Aircraft: TurnSpeed: 4 - CanHover: True - VTOL: true + FlightDynamics: VTOL, Slide, MoveIntoShroud, TakeOffOnCreation RenderSprites: Image: carryall diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 28a8d56e2e..eb7f28a4f2 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -626,14 +626,12 @@ Tooltip: GenericName: Helicopter Aircraft: - CanHover: True CruisingCondition: cruising WaitDistanceFromResupplyBase: 4c0 - TakeOffOnResupply: true - VTOL: true LandableTerrainTypes: Clear, Rough, Road, Ore, Beach, Gems Crushes: crate, mine, infantry InitialFacing: 224 + FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation, TakeOffOnResupply, TurnToDock GpsDot: String: Helicopter Hovers@CRUISING: @@ -1045,8 +1043,7 @@ Tooltip: GenericName: Destroyed Helicopter Aircraft: - CanHover: True - VTOL: true + FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation FallsToEarth: Explosion: UnitExplodeHeli BodyOrientation: diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 41cf0b9272..b55c7743c2 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -1,5 +1,5 @@ DPOD: - Inherits: ^Helicopter + Inherits: ^Aircraft Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 10 @@ -32,7 +32,7 @@ DPOD: -SpawnActorOnDeath: DSHP: - Inherits: ^Helicopter + Inherits: ^Aircraft Valued: Cost: 1000 Tooltip: @@ -49,6 +49,7 @@ DSHP: IdealSeparation: 1275 CruiseAltitude: 12c512 AltitudeVelocity: 256 + FlightDynamics: VTOL, Hover, MoveIntoShroud, TakeOffOnCreation, TurnToDock Health: HP: 20000 Armor: @@ -66,7 +67,7 @@ DSHP: Actor: DSHP.Husk ORCA: - Inherits: ^Helicopter + Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@EMPDISABLE: ^EmpDisable @@ -86,10 +87,10 @@ ORCA: Aircraft: TurnSpeed: 5 Speed: 186 - MoveIntoShroud: false TakeoffSounds: orcaup1.aud LandingSounds: orcadwn1.aud AltitudeVelocity: 128 + FlightDynamics: VTOL, Hover, TakeOffOnCreation, TakeOffOnResupply, TurnToDock Health: HP: 20000 Armor: @@ -141,7 +142,6 @@ ORCAB: TurnSpeed: 3 Speed: 96 CruisingCondition: cruising - MoveIntoShroud: false TakeoffSounds: orcaup1.aud LandingSounds: orcadwn1.aud ReturnOnIdle: @@ -177,7 +177,7 @@ ORCAB: RearmActors: gahpad, nahpad ORCATRAN: - Inherits: ^Helicopter + Inherits: ^Aircraft Valued: Cost: 1200 Tooltip: @@ -194,9 +194,12 @@ ORCATRAN: TurnSpeed: 5 Speed: 84 InitialFacing: 0 + LandableTerrainTypes: Clear, Road, Rail, DirtRoad, Rough, Tiberium, BlueTiberium, Veins + Crushes: crate, infantry TakeoffSounds: orcaup1.aud LandingSounds: orcadwn1.aud IdealSeparation: 1275 + FlightDynamics: VTOL, Hover, MoveIntoShroud, TakeOffOnCreation, TurnToDock Health: HP: 20000 Armor: @@ -215,7 +218,7 @@ ORCATRAN: Actor: ORCATRAN.Husk TRNSPORT: - Inherits: ^Helicopter + Inherits: ^Aircraft Valued: Cost: 750 Tooltip: @@ -233,7 +236,6 @@ TRNSPORT: InitialFacing: 0 TakeoffSounds: dropup1.aud LandingSounds: dropdwn1.aud - MoveIntoShroud: false Carryall: Voice: Move LocalOffset: 0,0,-317 @@ -277,7 +279,6 @@ SCRIN: TurnSpeed: 3 Speed: 168 AirborneCondition: airborne - MoveIntoShroud: false TakeoffSounds: dropup1.aud LandingSounds: dropdwn1.aud ReturnOnIdle: @@ -311,7 +312,7 @@ SCRIN: RearmActors: gahpad, nahpad APACHE: - Inherits: ^Helicopter + Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@EMPDISABLE: ^EmpDisable @@ -331,7 +332,7 @@ APACHE: Aircraft: TurnSpeed: 5 Speed: 130 - MoveIntoShroud: false + FlightDynamics: VTOL, Hover, TakeOffOnCreation, TakeOffOnResupply, TurnToDock Health: HP: 22500 Armor: @@ -382,9 +383,8 @@ HUNTER: TurnSpeed: 16 Speed: 355 CruiseAltitude: 3c128 - CanHover: True CruisingCondition: cruising - VTOL: true + FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud, TakeOffOnCreation AttackAircraft: FacingTolerance: 128 AttackType: Hover diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 5b842b1375..667ae23e46 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -871,12 +871,16 @@ Voice: Move Aircraft: AirborneCondition: airborne + CruisingCondition: cruising + CruiseAltitude: 4c704 + AltitudeVelocity: 96 LandWhenIdle: false Voice: Move IdealSeparation: 853 MaximumPitch: 120 LandableTerrainTypes: Clear, Road, Rail, DirtRoad, Rough, Tiberium, BlueTiberium, Veins Crushes: crate, infantry + FlightDynamics: VTOL, TakeOffOnCreation, TakeOffOnResupply, TurnToDock Voiced: VoiceSet: Heli HiddenUnderFog: @@ -900,16 +904,6 @@ Categories: Aircraft SpawnActorOnDeath: RequiresCondition: airborne - -^Helicopter: - Inherits: ^Aircraft - Aircraft: - CruiseAltitude: 4c704 - AltitudeVelocity: 96 - CanHover: True - CruisingCondition: cruising - TakeOffOnResupply: true - VTOL: true Hovers@CRUISING: RequiresCondition: cruising BobDistance: -64 diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index d973817b65..81c8da6efa 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -174,8 +174,7 @@ JUMPJET.Husk: Explosion: Aircraft: Speed: 186 - CanHover: True - VTOL: true + FlightDynamics: VTOL, Slide, Hover, MoveIntoShroud RenderSprites: Image: jumpjet WithSpriteBody: