diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 873f7be417..7ef5fc834e 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/mods/ra/maps/allies-03a/map.yaml @@ -1250,7 +1250,7 @@ Actors: Owner: Greece Facing: 128 SubCell: 0 - PrisonedEngi: hacke6 + PrisonedEngi: e6 Location: 57,67 Owner: Greece Facing: 96 diff --git a/mods/ra/maps/allies-03a/rules.yaml b/mods/ra/maps/allies-03a/rules.yaml index 050c9f8421..3890ebee4c 100644 --- a/mods/ra/maps/allies-03a/rules.yaml +++ b/mods/ra/maps/allies-03a/rules.yaml @@ -18,15 +18,14 @@ powerproxy.paratroopers: ParatroopersPower: DropItems: E1,E1,E1,E2,E2 -HACKE6: - Inherits: E6 +E6: + Buildable: + Prerequisites: ~disabled -RepairsBridges: Targetable: RequiresCondition: !jail Targetable@PRISONER: TargetTypes: Prisoner - RenderSprites: - Image: E6 ExternalCondition@JAIL: Condition: jail @@ -184,10 +183,6 @@ E4: Buildable: Prerequisites: ~disabled -E6: - Buildable: - Prerequisites: ~disabled - THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-03b/allies03b.lua b/mods/ra/maps/allies-03b/allies03b.lua index 102b0f037c..c0fb11fccf 100644 --- a/mods/ra/maps/allies-03b/allies03b.lua +++ b/mods/ra/maps/allies-03b/allies03b.lua @@ -361,7 +361,7 @@ InitTriggers = function() -- The engineers need to leave the enemy base to count as 'freed' Trigger.OnExitedProximityTrigger(BaseCameraWaypoint.CenterPosition, WDist.New(7 * 1024), function(a, id) - if a.Type == "hacke6" and not EngisFreed then + if a.Type == "e6" and not EngisFreed then EngisFreed = true Trigger.RemoveProximityTrigger(id) end diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml index ad847ad4b4..5e3c109fcf 100644 --- a/mods/ra/maps/allies-03b/map.yaml +++ b/mods/ra/maps/allies-03b/map.yaml @@ -1124,22 +1124,22 @@ Actors: Health: 15 Facing: 192 SubCell: 0 - PrisonedEngi1: hacke6 + PrisonedEngi1: e6 Location: 91,86 Owner: Greece Facing: 192 SubCell: 0 - PrisonedEngi2: hacke6 + PrisonedEngi2: e6 Location: 91,86 Owner: Greece Facing: 192 SubCell: 1 - PrisonedEngi3: hacke6 + PrisonedEngi3: e6 Location: 91,86 Owner: Greece Facing: 192 SubCell: 2 - PrisonedEngi4: hacke6 + PrisonedEngi4: e6 Location: 91,86 Owner: Greece Facing: 192 diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index c8b65244ab..a5c93a5b12 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -18,16 +18,14 @@ powerproxy.paratroopers: ParatroopersPower: DropItems: E1,E1,E1,E2,E2 -HACKE6: - Inherits: E6 +E6: + Buildable: + Prerequisites: ~disabled -RepairsBridges: - WithInfantryBody: Targetable: RequiresCondition: !jail Targetable@PRISONER: TargetTypes: Prisoner - RenderSprites: - Image: E6 ExternalCondition@JAIL: Condition: jail @@ -136,10 +134,6 @@ E4: Buildable: Prerequisites: ~disabled -E6: - Buildable: - Prerequisites: ~disabled - THF: Buildable: Prerequisites: ~disabled