From a017018bee7dc3a94b0f5c5066fc75620f3f44aa Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Nov 2017 01:39:36 +0100 Subject: [PATCH] Fix official mods Aircraft.RearmBuildings setups Only aircraft that a) have an AmmoPool and b) don't auto-reload should define RearmBuildings. --- mods/cnc/rules/aircraft.yaml | 2 -- mods/ra/rules/aircraft.yaml | 4 ++++ mods/ra/rules/defaults.yaml | 2 -- mods/ts/rules/aircraft.yaml | 4 ++++ mods/ts/rules/defaults.yaml | 1 - 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 5f42fbded8..a7e53a31be 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -65,7 +65,6 @@ HELI: Queue: Aircraft.Nod Description: Helicopter Gunship with Chainguns.\n Strong vs Infantry, Light Vehicles and\n Aircraft\n Weak vs Tanks Aircraft: - RearmBuildings: hpad InitialFacing: 224 TurnSpeed: 7 Speed: 180 @@ -124,7 +123,6 @@ ORCA: Queue: Aircraft.GDI Description: Helicopter Gunship with AG Missiles.\n Strong vs Buildings, Tanks\n Weak vs Infantry Aircraft: - RearmBuildings: hpad InitialFacing: 224 TurnSpeed: 7 Speed: 186 diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 97142499c2..e24fd88839 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -111,6 +111,7 @@ MIG: AttackPlane: FacingTolerance: 20 Aircraft: + RearmBuildings: afld CruiseAltitude: 2560 InitialFacing: 192 TurnSpeed: 4 @@ -175,6 +176,7 @@ YAK: AttackPlane: FacingTolerance: 20 Aircraft: + RearmBuildings: afld CruiseAltitude: 2560 InitialFacing: 192 TurnSpeed: 4 @@ -290,6 +292,7 @@ HELI: AttackHeli: FacingTolerance: 20 Aircraft: + RearmBuildings: hpad LandWhenIdle: false InitialFacing: 224 TurnSpeed: 4 @@ -352,6 +355,7 @@ HIND: AttackHeli: FacingTolerance: 20 Aircraft: + RearmBuildings: hpad LandWhenIdle: false InitialFacing: 224 TurnSpeed: 4 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index d75045dde3..fcb3797b78 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -507,7 +507,6 @@ Bounds: 24,24 Aircraft: RepairBuildings: fix - RearmBuildings: afld AirborneCondition: airborne Targetable@GROUND: TargetTypes: Ground, Repair, Vehicle @@ -560,7 +559,6 @@ Tooltip: GenericName: Helicopter Aircraft: - RearmBuildings: hpad CanHover: True CruisingCondition: cruising WaitDistanceFromResupplyBase: 4c0 diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 7f528bbe0d..73de1f35d4 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -78,6 +78,7 @@ ORCA: Selectable: Bounds: 30,24 Aircraft: + RearmBuildings: gahpad, nahpad TurnSpeed: 5 Speed: 186 MoveIntoShroud: false @@ -120,6 +121,7 @@ ORCAB: Selectable: Bounds: 30,24 Aircraft: + RearmBuildings: gahpad, nahpad CruiseAltitude: 3072 MaximumPitch: 120 TurnSpeed: 3 @@ -245,6 +247,7 @@ SCRIN: Voiced: VoiceSet: Scrin Aircraft: + RearmBuildings: gahpad, nahpad CruiseAltitude: 2560 MaximumPitch: 90 TurnSpeed: 3 @@ -293,6 +296,7 @@ APACHE: Selectable: Bounds: 30,24 Aircraft: + RearmBuildings: gahpad, nahpad TurnSpeed: 5 Speed: 130 MoveIntoShroud: false diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index a750fe45f6..a3fb4fe428 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -814,7 +814,6 @@ Aircraft: AirborneCondition: airborne RepairBuildings: gadept - RearmBuildings: gahpad, nahpad LandWhenIdle: false Voice: Move IdealSeparation: 853