From b1b35c1e1bbc02b238c9759f5bd6fd03a0e36636 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 30 Sep 2018 11:09:04 +0100 Subject: [PATCH] Rework RA Engineer behaviour. Capturing now behaves as in C&C3:KW - wait for 8 seconds outside the structure before running inside and being disposed. A "Reusable Engineer" lobby option is provided to restore the previous non-disposing behaviour. --- mods/ra/maps/allies-03a/rules.yaml | 4 ---- mods/ra/maps/allies-03b/rules.yaml | 4 ---- mods/ra/maps/intervention/rules.yaml | 14 -------------- mods/ra/maps/soviet-01/rules.yaml | 4 ++++ mods/ra/rules/infantry.yaml | 9 +++++++++ mods/ra/rules/player.yaml | 10 +++++++++- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/mods/ra/maps/allies-03a/rules.yaml b/mods/ra/maps/allies-03a/rules.yaml index 93054f8533..0695a14e00 100644 --- a/mods/ra/maps/allies-03a/rules.yaml +++ b/mods/ra/maps/allies-03a/rules.yaml @@ -45,10 +45,6 @@ powerproxy.paratroopers: HACKE6: Inherits: E6 -RepairsBridges: - Captures: - -ConsumedByCapture: - -EnterCursor: - -EnterBlockedCursor: Targetable: RequiresCondition: !jail Targetable@PRISONER: diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index 22b4329a93..411648cad0 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -45,10 +45,6 @@ powerproxy.paratroopers: HACKE6: Inherits: E6 -RepairsBridges: - Captures: - -ConsumedByCapture: - -EnterCursor: - -EnterBlockedCursor: WithInfantryBody: Targetable: RequiresCondition: !jail diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index 2599922cb9..747d34a50b 100644 --- a/mods/ra/maps/intervention/rules.yaml +++ b/mods/ra/maps/intervention/rules.yaml @@ -35,20 +35,6 @@ MISS: ValidStances: Enemy CaptureManager: -E6.MOD: - Inherits: E6 - Buildable: - Prerequisites: ~barracks - Captures: - CaptureTypes: building - RenderSprites: - Image: e6 - CaptureManager: - -E6: - Buildable: - Prerequisites: ~disabled - TENT: Buildable: Prerequisites: anypower, ~structures.allies, ~techlevel.infonly, mainland diff --git a/mods/ra/maps/soviet-01/rules.yaml b/mods/ra/maps/soviet-01/rules.yaml index 4c0634637f..2e273e721f 100644 --- a/mods/ra/maps/soviet-01/rules.yaml +++ b/mods/ra/maps/soviet-01/rules.yaml @@ -41,7 +41,11 @@ AFLD: -Sellable: DOME: + CaptureManager: + -BeingCapturedCondition: -Sellable: POWR: + CaptureManager: + -BeingCapturedCondition: -Sellable: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index cc025ee34c..80b24eb735 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -241,7 +241,16 @@ E6: EngineerRepair: RepairsBridges: CaptureManager: + GrantConditionOnPrerequisite@GLOBALREUSABLEENGINEER: + Condition: global-reusable-engineers + Prerequisites: global-reusable-engineers Captures: + RequiresCondition: !global-reusable-engineers + CaptureTypes: building + PlayerExperience: 25 + CaptureDelay: 200 + Captures@REUSABLE: + RequiresCondition: global-reusable-engineers CaptureTypes: building PlayerExperience: 25 CaptureDelay: 375 diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml index c933f3f884..32e239f0a5 100644 --- a/mods/ra/rules/player.yaml +++ b/mods/ra/rules/player.yaml @@ -87,7 +87,7 @@ Player: CashTickUpNotification: CashTickUp CashTickDownNotification: CashTickDown DeveloperMode: - CheckboxDisplayOrder: 9 + CheckboxDisplayOrder: 10 GpsWatcher: Shroud: FogCheckboxDisplayOrder: 3 @@ -105,6 +105,14 @@ Player: Enabled: True DisplayOrder: 7 Prerequisites: global-factundeploy + LobbyPrerequisiteCheckbox@REUSABLEENGINEERS: + ID: reusable-engineers + Label: Reusable Engineers + Description: Engineers remain on the battlefield after capturing a structure + Enabled: False + DisplayOrder: 9 + Prerequisites: global-reusable-engineers + FrozenActorLayer: BaseAttackNotifier: PlayerStatistics: