From 0c43c43509513ee4aa4b874704ae201456894b5f Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 27 Apr 2016 17:15:56 +0200 Subject: [PATCH 1/4] Remove unneeded "LandWhenIdle: no" definitions from ts defaults.yaml Both ^Helicopter and ^Plane already inherit that from ^Aircraft --- mods/ts/rules/defaults.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index dc9db81002..45a02e5a74 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -536,7 +536,7 @@ CruisingUpgrades: cruising RepairBuildings: gadept RearmBuildings: gahpad, nahpad - LandWhenIdle: no + LandWhenIdle: false Voice: Move IdealSeparation: 853 Voiced: @@ -559,7 +559,6 @@ ^Helicopter: Inherits: ^Aircraft Aircraft: - LandWhenIdle: no CruiseAltitude: 2048 CanHover: True Hovers@CRUISING: @@ -569,7 +568,6 @@ ^Plane: Inherits: ^Aircraft Aircraft: - LandWhenIdle: no CruiseAltitude: 2560 ReturnOnIdle: From 0589a58ac3c1d07ece0ef131f65bf1cc865e1fed Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 27 Apr 2016 17:16:34 +0200 Subject: [PATCH 2/4] Remove an empty "Building:" definition from NASAM --- mods/ts/rules/nod-support.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 02788b7718..bf19196162 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -133,7 +133,6 @@ NASAM: Queue: Defense Prerequisites: naradr, ~structures.nod BuildPaletteOrder: 60 - Building: Selectable: Bounds: 40, 30, -3, -8 RequiresPower: From 47f0b81448a3d8336be1040fcd8eb1f3a8d8db5e Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 27 Apr 2016 17:30:56 +0200 Subject: [PATCH 3/4] Replace yes/no with true/false in all ts rule yamls --- mods/ts/rules/aircraft.yaml | 10 +++++----- mods/ts/rules/defaults.yaml | 2 +- mods/ts/rules/gdi-support.yaml | 6 +++--- mods/ts/rules/gdi-vehicles.yaml | 2 +- mods/ts/rules/nod-structures.yaml | 2 +- mods/ts/rules/nod-support.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 5a1eafd1e1..0a8e3dd07e 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -5,7 +5,7 @@ DPOD: Tooltip: Name: Drop Pod Aircraft: - LandWhenIdle: yes + LandWhenIdle: true TurnSpeed: 5 Speed: 149 InitialFacing: 0 @@ -41,7 +41,7 @@ DSHP: Tooltip: Name: Dropship Aircraft: - LandWhenIdle: yes + LandWhenIdle: true TurnSpeed: 5 Speed: 168 InitialFacing: 0 @@ -167,7 +167,7 @@ ORCATRAN: Prerequisites: ~disabled RenderSprites: Aircraft: - LandWhenIdle: yes + LandWhenIdle: true TurnSpeed: 5 Speed: 84 InitialFacing: 0 @@ -203,7 +203,7 @@ TRNSPORT: BuildPaletteOrder: 10 Prerequisites: ~gahpad, gadept Aircraft: - LandWhenIdle: yes + LandWhenIdle: true TurnSpeed: 5 Speed: 149 InitialFacing: 0 @@ -357,7 +357,7 @@ HUNTER: AutoSelectionSize: DrawLineToTarget: AppearsOnRadar: - UseLocation: yes + UseLocation: true Selectable: SelectionDecorations: Palette: pips diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 45a02e5a74..1dfe1c91e2 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -519,7 +519,7 @@ Inherits@3: ^Cloakable DrawLineToTarget: AppearsOnRadar: - UseLocation: yes + UseLocation: true Targetable@GROUND: TargetTypes: Ground UpgradeTypes: airborne diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index 6def61f38b..47fcc095e6 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -83,17 +83,17 @@ GACTWR: WithSpriteTurret@VULC: UpgradeTypes: tower.vulcan UpgradeMinEnabledLevel: 1 - Recoils: no + Recoils: false Sequence: turret-vulcan WithSpriteTurret@ROCKET: UpgradeTypes: tower.rocket UpgradeMinEnabledLevel: 1 - Recoils: no + Recoils: false Sequence: turret-rocket WithSpriteTurret@SAM: UpgradeTypes: tower.sam UpgradeMinEnabledLevel: 1 - Recoils: no + Recoils: false Sequence: turret-sam Armament@VULCPRIMARY: UpgradeTypes: tower.vulcan diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index c1550db91a..d8b40033ab 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -164,7 +164,7 @@ MMCH: AttackTurreted: Voice: Attack WithSpriteTurret: - Recoils: no + Recoils: false Armament: Weapon: 120mm MuzzleSequence: muzzle diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml index 72438f9c55..e3eff83574 100644 --- a/mods/ts/rules/nod-structures.yaml +++ b/mods/ts/rules/nod-structures.yaml @@ -275,7 +275,7 @@ NARADR: Range: 10c0 WithIdleOverlay@DISH: Sequence: idle-dish - PauseOnLowPower: yes + PauseOnLowPower: true Targetable: TargetTypes: Ground, C4, SpyInfiltrate Power: diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index bf19196162..01a75b5794 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -150,7 +150,7 @@ NASAM: InitialFacing: 224 AttackTurreted: WithSpriteTurret: - Recoils: no + Recoils: false Armament: Weapon: RedEye2 LocalOffset: 384,0,576 From d51960f62161bde123f35789bb859ed1a31758d2 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 27 Apr 2016 17:31:12 +0200 Subject: [PATCH 4/4] Remove a bogus RevealsShroud definition from DPOD --- mods/ts/rules/aircraft.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 0a8e3dd07e..875c944aba 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -14,9 +14,6 @@ DPOD: HP: 60 Armor: Type: Light - RevealsShroud: - Range: 0 - Type: CenterPosition Cargo: Types: Infantry MaxWeight: 1