From 1bd4e19477f9b912f3b3746723e35abfc62fb155 Mon Sep 17 00:00:00 2001 From: Richard Orilla Date: Mon, 25 May 2020 18:20:36 +0800 Subject: [PATCH 1/4] Modified the following rules: 1. Allied Construction Yard(gacnst) 2. Allied Airforce Command Headquarters (gaairc) 3. Allied Ore Purifier (gaorep) Changed constructions yard and airforce command to not pause the animation when it is on low power (This is how it works on the original game) Changed the ore purifier to halt on animation when it is on low power (This is how it works on the original game) --- mods/ra2/rules/allied-structures.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mods/ra2/rules/allied-structures.yaml b/mods/ra2/rules/allied-structures.yaml index 4ec984541..8534aaa02 100644 --- a/mods/ra2/rules/allied-structures.yaml +++ b/mods/ra2/rules/allied-structures.yaml @@ -59,7 +59,6 @@ gacnst: ValidPowerStates: Low, Critical WithIdleOverlay@fans: Sequence: idle-fans - PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithBuildingPlacedOverlay: ProvidesPrerequisite: @@ -300,19 +299,15 @@ gaairc: Range: 10c0 WithIdleOverlay@top: Sequence: idle-top - PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithIdleOverlay@bottom: Sequence: idle-bottom - PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithIdleOverlay@mid: Sequence: idle-mid - PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithIdleOverlay@lights: Sequence: idle-lights - PauseOnCondition: lowpower RequiresCondition: !build-incomplete Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate @@ -867,9 +862,13 @@ gaorep: Type: Wood RevealsShroud: Range: 5c0 - WithIdleOverlay@glow: + WithIdleOverlay: Sequence: idle-glow + PauseOnCondition: lowpower RequiresCondition: !build-incomplete + GrantConditionOnPowerState@LOWPOWER: + Condition: lowpower + ValidPowerStates: Low, Critical ResourcePurifier: Modifier: 25 Power: From 2645565691e797c9e534a0e5f915223b701cdd75 Mon Sep 17 00:00:00 2001 From: Richard Orilla Date: Thu, 6 Apr 2023 20:49:13 +0800 Subject: [PATCH 2/4] modified: mods/ra2/sequences/allied-structures.yaml - Added new animation named idle-fans-low-power which is just like idle-fans but with larger ticks to make the animation appear slower --- mods/ra2/sequences/allied-structures.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ra2/sequences/allied-structures.yaml b/mods/ra2/sequences/allied-structures.yaml index df76bb111..7d656fdfb 100644 --- a/mods/ra2/sequences/allied-structures.yaml +++ b/mods/ra2/sequences/allied-structures.yaml @@ -10,6 +10,9 @@ gacnst: idle-fans: ggcnst_a Length: 6 Tick: 150 + idle-fans-low-power: ggcnst_a + Length: 6 + Tick: 600 damaged-idle-fans: ggcnst_a Start: 5 Length: 6 From daa94353e872bdd74f7126995cdf2cd33b5ea5a2 Mon Sep 17 00:00:00 2001 From: Richard Orilla Date: Thu, 6 Apr 2023 20:51:17 +0800 Subject: [PATCH 3/4] modified: mods/ra2/rules/allied-structures.yaml - Made allied construction yard's fan animation slow down when low power and reverted animation pauses on Airforce command and Ore Purifier --- mods/ra2/rules/allied-structures.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mods/ra2/rules/allied-structures.yaml b/mods/ra2/rules/allied-structures.yaml index 3cdf87000..6e8e42958 100644 --- a/mods/ra2/rules/allied-structures.yaml +++ b/mods/ra2/rules/allied-structures.yaml @@ -57,9 +57,12 @@ gacnst: GrantConditionOnPowerState@LOWPOWER: Condition: lowpower ValidPowerStates: Low, Critical + WithIdleOverlay@fans@LOWPOWER: + Sequence: idle-fans-low-power + RequiresCondition: !build-incomplete WithIdleOverlay@fans: Sequence: idle-fans - RequiresCondition: !build-incomplete + RequiresCondition: !build-incomplete && !lowpower WithBuildingPlacedOverlay: ProvidesPrerequisite: Prerequisite: structures.allies @@ -305,15 +308,19 @@ gaairc: Range: 10c0 WithIdleOverlay@top: Sequence: idle-top + PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithIdleOverlay@bottom: Sequence: idle-bottom + PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithIdleOverlay@mid: Sequence: idle-mid + PauseOnCondition: lowpower RequiresCondition: !build-incomplete WithIdleOverlay@lights: Sequence: idle-lights + PauseOnCondition: lowpower RequiresCondition: !build-incomplete Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure, SpyInfiltrate @@ -878,13 +885,9 @@ gaorep: Type: Wood RevealsShroud: Range: 5c0 - WithIdleOverlay: + WithIdleOverlay@glow: Sequence: idle-glow - PauseOnCondition: lowpower RequiresCondition: !build-incomplete - GrantConditionOnPowerState@LOWPOWER: - Condition: lowpower - ValidPowerStates: Low, Critical ResourcePurifier: Modifier: 25 Power: From acdad43e5c147f88231a4807fb5b94daa35c35a6 Mon Sep 17 00:00:00 2001 From: Richard Orilla Date: Fri, 7 Apr 2023 08:53:12 +0800 Subject: [PATCH 4/4] modified: mods/ra2/rules/allied-structures.yaml Added safeguard lowpower condition in the Sequence idle-fans-low-power Co-authored-by: Pavel Penev --- mods/ra2/rules/allied-structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra2/rules/allied-structures.yaml b/mods/ra2/rules/allied-structures.yaml index 6e8e42958..d624ff354 100644 --- a/mods/ra2/rules/allied-structures.yaml +++ b/mods/ra2/rules/allied-structures.yaml @@ -59,7 +59,7 @@ gacnst: ValidPowerStates: Low, Critical WithIdleOverlay@fans@LOWPOWER: Sequence: idle-fans-low-power - RequiresCondition: !build-incomplete + RequiresCondition: !build-incomplete && lowpower WithIdleOverlay@fans: Sequence: idle-fans RequiresCondition: !build-incomplete && !lowpower