Keep the effects of the Capture Lock on RA mod.

OpenRA · Apr 15, 2018 · d8ab516 · d8ab516
1 parent 96d88b0
commit d8ab516
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
@@ -632,6 +632,7 @@
 	AcceptsDeliveredCash:
 	WithMakeAnimation:
 	ExternalCapturable:
+		CaptureCondition: being_captured
 	ExternalCapturableBar:
 	EmitInfantryOnSell:
 		ActorTypes: e1,e1,e1,tecn,tecn
@@ -641,6 +642,7 @@
 		String: Structure
 	Sellable:
 		SellSounds: cashturn.aud
+		RequiresCondition: !being_captured
 
 ^ScienceBuilding:
 	Inherits: ^Building

diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
@@ -181,6 +181,7 @@ SPEN:
 		ProductionTypes: Ship
 	Production:
 		Produces: Ship, Submarine
+		DisableExitOnCondition: being_captured
 	PrimaryBuilding:
 		PrimaryCondition: primary
 	-EmitInfantryOnSell:
@@ -290,6 +291,7 @@ SYRD:
 		ProductionTypes: Ship, Boat
 	Production:
 		Produces: Ship, Boat
+		DisableExitOnCondition: being_captured
 	PrimaryBuilding:
 		PrimaryCondition: primary
 	-EmitInfantryOnSell:
@@ -947,6 +949,7 @@ WEAP:
 		ExitCell: 1,2
 	Production:
 		Produces: Vehicle
+		DisableExitOnCondition: being_captured
 	ProvidesPrerequisite@allies:
 		Factions: allies, england, france, germany
 		Prerequisite: vehicles.allies
@@ -1083,6 +1086,7 @@ FACT:
 		IntoActor: mcv
 		Offset: 1,1
 		Facing: 96
+		PauseOnCondition: being_captured
 		RequiresCondition: factundeploy
 	GrantConditionOnPrerequisite@GLOBALFACTUNDEPLOY:
 		Condition: factundeploy
@@ -1094,6 +1098,7 @@ FACT:
 		Color: 8A8A8A
 	BaseProvider:
 		Range: 16c0
+		PauseOnCondition: being_captured
 	WithBuildingPlacedAnimation:
 	Power:
 		Amount: 0
@@ -1247,6 +1252,7 @@ HPAD:
 	RallyPoint:
 	Production:
 		Produces: Aircraft, Helicopter
+		DisableExitOnCondition: being_captured
 	Reservable:
 	ProductionBar:
 	PrimaryBuilding:
@@ -1334,6 +1340,7 @@ AFLD:
 	RallyPoint:
 	Production:
 		Produces: Aircraft, Plane
+		DisableExitOnCondition: being_captured
 	Reservable:
 	ProvidesPrerequisite@soviet:
 		Factions: soviet, russia, ukraine
@@ -1597,6 +1604,7 @@ BARR:
 		ProductionTypes: Soldier, Infantry
 	Production:
 		Produces: Infantry, Soldier
+		DisableExitOnCondition: being_captured
 	PrimaryBuilding:
 		PrimaryCondition: primary
 	ProductionBar:
@@ -1674,6 +1682,7 @@ KENN:
 		ProductionTypes: Dog, Infantry
 	Production:
 		Produces: Infantry, Dog
+		DisableExitOnCondition: being_captured
 	PrimaryBuilding:
 		PrimaryCondition: primary
 	ProductionBar:
@@ -1729,6 +1738,7 @@ TENT:
 		ProductionTypes: Soldier, Infantry
 	Production:
 		Produces: Infantry, Soldier
+		DisableExitOnCondition: being_captured
 	PrimaryBuilding:
 		PrimaryCondition: primary
 	ProductionBar: