From 4ed7725e20e503a8281f2bba4ca43a46788edfaa Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 17 Nov 2016 13:16:25 +0000 Subject: [PATCH] Update RA rules. --- mods/ra/maps/allies-03a/rules.yaml | 6 ++--- mods/ra/maps/allies-03b/rules.yaml | 6 ++--- mods/ra/maps/infiltration/rules.yaml | 3 +-- mods/ra/rules/aircraft.yaml | 24 +++++++------------- mods/ra/rules/defaults.yaml | 33 ++++++++++------------------ mods/ra/rules/infantry.yaml | 3 +-- mods/ra/rules/ships.yaml | 15 +++++-------- mods/ra/rules/structures.yaml | 24 +++++++------------- mods/ra/rules/vehicles.yaml | 12 ++++------ 9 files changed, 42 insertions(+), 84 deletions(-) diff --git a/mods/ra/maps/allies-03a/rules.yaml b/mods/ra/maps/allies-03a/rules.yaml index ccc672b505..2955853830 100644 --- a/mods/ra/maps/allies-03a/rules.yaml +++ b/mods/ra/maps/allies-03a/rules.yaml @@ -33,8 +33,7 @@ HACKE6: Captures: CaptureTypes: building Targetable: - UpgradeTypes: jail - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !jail Targetable@PRISONER: TargetTypes: Prisoner RenderSprites: @@ -42,8 +41,7 @@ HACKE6: MEDI: Targetable: - UpgradeTypes: jail - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !jail Targetable@PRISONER: TargetTypes: Prisoner diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index 27e9ddd615..530c8d2656 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -34,8 +34,7 @@ HACKE6: CaptureTypes: building WithInfantryBody: Targetable: - UpgradeTypes: jail - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !jail Targetable@PRISONER: TargetTypes: Prisoner RenderSprites: @@ -43,8 +42,7 @@ HACKE6: MEDI: Targetable: - UpgradeTypes: jail - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !jail Targetable@PRISONER: TargetTypes: Prisoner diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index 335a78f22f..4c5e72a40b 100644 --- a/mods/ra/maps/infiltration/rules.yaml +++ b/mods/ra/maps/infiltration/rules.yaml @@ -71,8 +71,7 @@ TRUK.Hijackable: Buildable: Prerequisites: ~disabled Mobile: - UpgradeTypes: mobile - UpgradeMinEnabledLevel: 1 + RequiresCondition: mobile Cargo: Types: Infantry MaxWeight: 5 diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index d58a75c600..05f13db960 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -223,23 +223,19 @@ TRAN: WithIdleOverlay@ROTOR1AIR: Offset: 597,0,213 Sequence: rotor - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne WithIdleOverlay@ROTOR1GROUND: Offset: 597,0,213 Sequence: slow-rotor - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne WithIdleOverlay@ROTOR2AIR: Offset: -597,0,341 Sequence: rotor2 - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne WithIdleOverlay@ROTOR2GROUND: Offset: -597,0,341 Sequence: slow-rotor2 - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne Cargo: Types: Infantry MaxWeight: 8 @@ -287,13 +283,11 @@ HELI: WithIdleOverlay@ROTORAIR: Offset: 0,0,85 Sequence: rotor - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne WithIdleOverlay@ROTORGROUND: Offset: 0,0,85 Sequence: slow-rotor - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne AmmoPool: Ammo: 8 SelectionDecorations: @@ -345,12 +339,10 @@ HIND: InitialStanceAI: HoldFire WithIdleOverlay@ROTORAIR: Sequence: rotor - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne WithIdleOverlay@ROTORGROUND: Sequence: slow-rotor - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne AmmoPool: Ammo: 24 PipCount: 6 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 3548dbed3b..af0005dd20 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -40,8 +40,7 @@ Delay: 100 HealIfBelow: 100 DamageCooldown: 125 - UpgradeTypes: selfheal - UpgradeMinEnabledLevel: 1 + RequiresCondition: selfheal WithRankDecoration: Image: rank Sequence: rank @@ -54,8 +53,7 @@ ^IronCurtainable: UpgradeOverlay@IRONCURTAIN: - UpgradeTypes: invulnerability - UpgradeMinEnabledLevel: 1 + RequiresCondition: invulnerability DamageMultiplier@IRONCURTAIN: UpgradeTypes: invulnerability Modifier: 0 @@ -87,8 +85,7 @@ Bounds: 24, 24 Targetable: TargetTypes: Ground, Repair, Vehicle - UpgradeTypes: parachute - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !parachute Repairable: Chronoshiftable: Passenger: @@ -133,14 +130,13 @@ EmptyWeapon: UnitExplodeSmall WithFacingSpriteBody: WithParachute: - UpgradeTypes: parachute - UpgradeMinEnabledLevel: 1 ShadowImage: parach-shadow ShadowSequence: idle Image: parach Sequence: idle OpeningSequence: open Offset: 0,0,200 + RequiresCondition: parachute BodyOrientation: UseClassicFacingFudge: True @@ -195,8 +191,7 @@ Bounds: 12,18,0,-8 Targetable: TargetTypes: Ground, Infantry, Disguise - UpgradeTypes: parachute - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !parachute QuantizeFacingsFromSequence: Sequence: stand WithInfantryBody: @@ -228,8 +223,7 @@ Delay: 100 HealIfBelow: 100 DamageCooldown: 125 - UpgradeTypes: hospitalheal - UpgradeMinEnabledLevel: 1 + RequiresCondition: hospitalheal GlobalUpgradable: Upgrades: hospitalheal Prerequisites: hosp @@ -252,14 +246,13 @@ Voiced: VoiceSet: GenericVoice WithParachute: - UpgradeTypes: parachute - UpgradeMinEnabledLevel: 1 ShadowImage: parach-shadow ShadowSequence: idle Image: parach Sequence: idle OpeningSequence: open Offset: 0,0,427 + RequiresCondition: parachute ^Soldier: Inherits: ^Infantry @@ -370,12 +363,10 @@ CruisingUpgrades: cruising Targetable@GROUND: TargetTypes: Ground, Repair, Vehicle - UpgradeTypes: airborne - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !airborne Targetable@AIRBORNE: TargetTypes: Air - UpgradeTypes: airborne - UpgradeMinEnabledLevel: 1 + RequiresCondition: airborne HiddenUnderFog: Type: CenterPosition AttackMove: @@ -414,8 +405,7 @@ GpsDot: String: Helicopter Hovers@CRUISING: - UpgradeTypes: cruising - UpgradeMinEnabledLevel: 1 + RequiresCondition: cruising BodyOrientation: UseClassicFacingFudge: True @@ -825,13 +815,12 @@ KilledOnImpassableTerrain: false Passenger: WithParachute: - UpgradeTypes: parachute - UpgradeMinEnabledLevel: 1 Image: parach Sequence: idle OpeningSequence: open ShadowImage: parach-shadow ShadowSequence: idle + RequiresCondition: parachute UpgradeManager: ^Mine: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index e589bcc3e7..dac456257e 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -226,8 +226,7 @@ SPY: Palette: effect ReferencePoint: Top, Right ZOffset: 256 - UpgradeTypes: disguise - UpgradeMinEnabledLevel: 1 + RequiresCondition: disguise IgnoresDisguise: DetectCloaked: CloakTypes: Cloak, Hijacker diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 61c661375b..2c2c0fb2d6 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -21,12 +21,10 @@ SS: Range: 6c0 Targetable: TargetTypes: Ground, Water, Repair - UpgradeTypes: underwater - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !underwater Targetable@UNDERWATER: TargetTypes: Underwater, Repair - UpgradeTypes: underwater - UpgradeMinEnabledLevel: 1 + RequiresCondition: underwater Cloak: CloakTypes: Underwater InitialDelay: 0 @@ -77,12 +75,10 @@ MSUB: Range: 6c0 Targetable: TargetTypes: Ground, Water, Repair - UpgradeTypes: underwater - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !underwater Targetable@UNDERWATER: TargetTypes: Underwater, Repair - UpgradeTypes: underwater - UpgradeMinEnabledLevel: 1 + RequiresCondition: underwater Cloak: CloakTypes: Underwater InitialDelay: 0 @@ -230,12 +226,11 @@ LST: Armor: Type: Heavy Mobile: - UpgradeTypes: notmobile - UpgradeMaxEnabledLevel: 0 TurnSpeed: 10 Speed: 113 TerrainSpeeds: Beach: 70 + RequiresCondition: !notmobile RevealsShroud: Range: 6c0 SelectionDecorations: diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 646650367b..58730edadc 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -174,8 +174,7 @@ SPEN: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary SYRD: Inherits: ^Building @@ -270,8 +269,7 @@ SYRD: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary IRON: Inherits: ^ScienceBuilding @@ -877,8 +875,7 @@ WEAP: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary FACT: Inherits: ^Building @@ -1116,8 +1113,7 @@ HPAD: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary WithRearmAnimation: AFLD: @@ -1233,8 +1229,7 @@ AFLD: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary WithRearmAnimation: POWR: @@ -1413,8 +1408,7 @@ BARR: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary KENN: Inherits: ^Building @@ -1461,8 +1455,7 @@ KENN: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary TENT: Inherits: ^Building @@ -1541,8 +1534,7 @@ TENT: Sequence: tag-primary ReferencePoint: Top ZOffset: 256 - UpgradeTypes: primary - UpgradeMinEnabledLevel: 1 + RequiresCondition: primary FIX: Inherits: ^Building diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 86fb5b6507..2578daeaf4 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -338,8 +338,7 @@ JEEP: Mobile: TurnSpeed: 10 Speed: 170 - UpgradeTypes: notmobile - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !notmobile RevealsShroud: Range: 8c0 Turreted: @@ -378,8 +377,7 @@ APC: Mobile: Speed: 142 Crushes: wall, mine, crate, infantry - UpgradeTypes: notmobile - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !notmobile RevealsShroud: Range: 5c0 Armament: @@ -651,8 +649,7 @@ DTRK: AttackSuicides: -DamageMultiplier@IRONCURTAIN: KillsSelf: - UpgradeTypes: invulnerability - UpgradeMinEnabledLevel: 1 + RequiresCondition: invulnerability Chronoshiftable: ExplodeInstead: yes @@ -738,8 +735,7 @@ STNK: Mobile: Speed: 142 Crushes: wall, mine, crate, infantry - UpgradeTypes: notmobile - UpgradeMaxEnabledLevel: 0 + RequiresCondition: !notmobile RevealsShroud: Range: 7c0 AutoTarget: