From a61454f4098fd84bebcc1262041e7ec50e51dc74 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 20 May 2018 16:30:02 +0000 Subject: [PATCH] Fix experience/hospital indicator overlap in TS. --- mods/ts/rules/civilian-infantry.yaml | 4 ++++ mods/ts/rules/defaults.yaml | 20 +++++++++++++++++++- mods/ts/rules/gdi-infantry.yaml | 4 ++++ mods/ts/rules/nod-infantry.yaml | 3 +++ mods/ts/rules/shared-infantry.yaml | 1 + mods/ts/sequences/misc.yaml | 1 + 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index c951c94e30..cedde3fe75 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -29,6 +29,7 @@ UMAGON: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 400 @@ -86,6 +87,7 @@ MUTANT: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 @@ -112,6 +114,7 @@ MWMN: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 @@ -138,6 +141,7 @@ MUTANT3: Inherits: ^Soldier Inherits@2: ^HealsOnTiberium Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 100 diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 9f02f415ef..bb72a4214f 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -71,6 +71,16 @@ RequiresCondition: rank-elite ZOffset: 256 +^InfantryExperienceHospitalOverrides: + WithDecoration@VETERAN: + BlinkInterval: 32 + BlinkPatterns: + hospitalheal: On, Off + WithDecoration@ELITE: + BlinkInterval: 32 + BlinkPatterns: + hospitalheal: On, Off + ^CrateStatModifiers: FirepowerMultiplier@CRATES: RequiresCondition: crate-firepower @@ -558,14 +568,22 @@ DamageCooldown: 125 RequiresCondition: hospitalheal GrantConditionOnPrerequisite@HOSPITAL: - Condition: hospitalheal + Condition: hospital Prerequisites: cahosp + GrantConditionOnDamageState@HOSPITAL: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical + GrantCondition@HOSPITAL: + RequiresCondition: hospital && damaged + Condition: hospitalheal WithDecoration@REDCROSS: Image: pips Sequence: medic Palette: pips ReferencePoint: Bottom, Right RequiresCondition: hospitalheal + BlinkInterval: 32 + BlinkPattern: Off, On RevealOnFire: EntersTunnels: Voice: Move diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index aeb5d88c0b..c1ff13aa7f 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -1,6 +1,7 @@ E2: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry @@ -33,6 +34,7 @@ E2: MEDIC: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Valued: Cost: 600 Tooltip: @@ -73,6 +75,7 @@ MEDIC: JUMPJET: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 600 @@ -191,6 +194,7 @@ JUMPJET.Husk: GHOST: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@2: ^HealsOnTiberium Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 877c64ba59..66976eb1e9 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -1,6 +1,7 @@ E3: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Infantry @@ -34,6 +35,7 @@ E3: CYBORG: Inherits: ^Cyborg Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Armor: Type: Light @@ -69,6 +71,7 @@ CYBORG: CYC2: Inherits: ^Cyborg Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Armor: Type: Heavy diff --git a/mods/ts/rules/shared-infantry.yaml b/mods/ts/rules/shared-infantry.yaml index 0b5905dda6..51da29cc47 100644 --- a/mods/ts/rules/shared-infantry.yaml +++ b/mods/ts/rules/shared-infantry.yaml @@ -1,6 +1,7 @@ E1: Inherits: ^Soldier Inherits@EXPERIENCE: ^GainsExperience + Inherits@EXPHOSPITAL: ^InfantryExperienceHospitalOverrides Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Infantry diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 909854fbcd..44022a3522 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -66,6 +66,7 @@ rank: Start: 7 elite: pips Start: 8 + Offset: 3, 3 mpspawn: idle: