From 53032576e29b127eb3b9af00d2a2b1764a5e9803 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Mon, 29 Oct 2018 12:59:40 +0300 Subject: [PATCH] Update default mods for Heal WH full health check removal --- mods/ra/rules/defaults.yaml | 34 +++++++++++++++++++++++++++----- mods/ra/weapons/other.yaml | 4 ++-- mods/ts/rules/defaults.yaml | 18 ++++++++++++++--- mods/ts/weapons/healweapons.yaml | 4 ++-- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index b0396b720d..fb9b6b73b1 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -249,8 +249,14 @@ Selectable: Bounds: 24, 24 Targetable: - TargetTypes: Ground, Repair, Vehicle RequiresCondition: !parachute + TargetTypes: Ground, Vehicle + Targetable@REPAIR: + RequiresCondition: !parachute && damaged + TargetTypes: Repair + GrantConditionOnDamageState@DAMAGED: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical Repairable: Chronoshiftable: Passenger: @@ -330,8 +336,14 @@ Bounds: 18,20,0,-6 DecorationBounds: 12,18,0,-8 Targetable: - TargetTypes: Ground, Infantry, Disguise RequiresCondition: !parachute + TargetTypes: Ground, Infantry, Disguise + Targetable@HEAL: + RequiresCondition: !parachute && damaged + TargetTypes: Heal + GrantConditionOnDamageState@DAMAGED: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical QuantizeFacingsFromSequence: Sequence: stand WithInfantryBody: @@ -479,7 +491,13 @@ Selectable: Bounds: 24,24 Targetable: - TargetTypes: Ground, Water, Ship, Repair + TargetTypes: Ground, Water, Ship + Targetable@REPAIR: + RequiresCondition: damaged + TargetTypes: Repair + GrantConditionOnDamageState@DAMAGED: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical HiddenUnderFog: AttackMove: ActorLostNotification: @@ -528,11 +546,17 @@ Aircraft: AirborneCondition: airborne Targetable@GROUND: - TargetTypes: Ground, Repair, Vehicle RequiresCondition: !airborne + TargetTypes: Ground, Vehicle Targetable@AIRBORNE: - TargetTypes: Air RequiresCondition: airborne + TargetTypes: Air + Targetable@REPAIR: + RequiresCondition: !airborne && damaged + TargetTypes: Repair + GrantConditionOnDamageState@DAMAGED: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical HiddenUnderFog: Type: GroundPosition AttackMove: diff --git a/mods/ra/weapons/other.yaml b/mods/ra/weapons/other.yaml index dcc814066e..1633710c3b 100644 --- a/mods/ra/weapons/other.yaml +++ b/mods/ra/weapons/other.yaml @@ -120,14 +120,14 @@ Heal: ReloadDelay: 80 Range: 4c0 Report: heal2.aud - ValidTargets: Infantry + ValidTargets: Heal Projectile: Bullet Speed: 1c682 Warhead@1Dam: SpreadDamage Spread: 213 Damage: -5000 ValidStances: Ally - ValidTargets: Infantry + ValidTargets: Heal DebugOverlayColor: 00FF00 Repair: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 172b76dfec..c34749586d 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -550,6 +550,12 @@ Targetable: RequiresCondition: !inside-tunnel TargetTypes: Ground, Infantry + Targetable@HEAL: + RequiresCondition: !inside-tunnel && damaged + TargetTypes: Heal + GrantConditionOnDamageState@DAMAGED: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical QuantizeFacingsFromSequence: Sequence: stand WithInfantryBody: @@ -734,7 +740,13 @@ VoiceSet: Vehicle Targetable: RequiresCondition: !inside-tunnel - TargetTypes: Ground, Vehicle, Repair + TargetTypes: Ground, Vehicle + Targetable@REPAIR: + RequiresCondition: !inside-tunnel && damaged + TargetTypes: Repair + GrantConditionOnDamageState@DAMAGED: + Condition: damaged + ValidDamageStates: Light, Medium, Heavy, Critical Repairable: RepairBuildings: gadept Voice: Move @@ -764,10 +776,10 @@ Weapons: SmallDebris Pieces: 3, 7 Range: 2c0, 5c0 - GrantConditionOnDamageState@DAMAGED: + GrantConditionOnDamageState@DAMAGEDSPEED: Condition: damagedspeed ValidDamageStates: Heavy - GrantConditionOnDamageState@CRITICAL: + GrantConditionOnDamageState@CRITICALSPEED: Condition: criticalspeed ValidDamageStates: Critical SpeedMultiplier@DAMAGED: diff --git a/mods/ts/weapons/healweapons.yaml b/mods/ts/weapons/healweapons.yaml index 3bc40878d5..ac40a925c4 100644 --- a/mods/ts/weapons/healweapons.yaml +++ b/mods/ts/weapons/healweapons.yaml @@ -2,13 +2,13 @@ ReloadDelay: 80 Range: 2c849 Report: healer1.aud - ValidTargets: Infantry + ValidTargets: Heal TargetActorCenter: true Projectile: InstantHit Warhead@1Dam: TargetDamage DebugOverlayColor: 00FF00 Damage: -5000 - ValidTargets: Infantry + ValidTargets: Heal Heal: Inherits: ^HealWeapon