Added ProximityCaptor and filtering of possible captors for KOTH

2010-11-22 11:49:45 +01:00
parent de26b63fd2
commit 0f17fa34a8
8 changed files with 152 additions and 14 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -28,6 +28,8 @@
 	ActorLostNotification:
 		Notification: unitlost.aud
 	AttackMove:
+	ProximityCaptor:
+		Types:Vehicle

 ^Tank:
 	AppearsOnRadar:
@@ -59,6 +61,8 @@
 	ActorLostNotification:
 		Notification: unitlost.aud
 	AttackMove:
+	ProximityCaptor:
+		Types:Tank

 ^Helicopter:
 	AppearsOnRadar:
@@ -79,6 +83,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlost.aud
+	ProximityCaptor:
+		Types:Helicopter

 ^Infantry:
 	AppearsOnRadar:
@@ -118,6 +124,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlost.aud
+	ProximityCaptor:
+		Types:Infantry

 ^CivInfantry:
 	Inherits: ^Infantry
@@ -141,6 +149,8 @@
 #	ActorLostNotification:
 #		Notification: civdead1.aud
 #		NotifyAll: true
+	ProximityCaptor:
+		Types:CivilianInfantry

 ^Plane:
 	AppearsOnRadar:
@@ -155,6 +165,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlost.aud
+	ProximityCaptor:
+		Types:Plane

 ^Ship:
 	AppearsOnRadar:
@@ -173,6 +185,8 @@
 	ActorLostNotification:
 		Notification: unitlost.aud
 	AttackMove:
+	ProximityCaptor:
+		Types:Ship

 ^Building:
 	AppearsOnRadar:
@@ -211,6 +225,8 @@
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	ShakeOnDeath:
+	ProximityCaptor:
+		Types:Building

 ^CivBuilding:
 	Inherits: ^Building
@@ -226,6 +242,8 @@
 #	-FrozenUnderFog:
 	Tooltip:
 		Name: Civilian Building
+	ProximityCaptor:
+		Types:CivilianBuilding

 ^CivField:
 	Inherits: ^CivBuilding
@@ -237,6 +255,9 @@
 	RenderBuilding:
 		OverrideTileset: DESERT
 		OverrideImage: v23
+	-ProximityCaptor:
+	ProximityCaptor:
+		Types:CivilianField

 ^Wall:
 	AppearsOnRadar:
@@ -263,6 +284,8 @@
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
+	ProximityCaptor:
+		Types:Wall

 ^Tree:
 	Tooltip:
@@ -277,6 +300,8 @@
 		Terrain: Tree
 	EditorAppearance:
 		RelativeToTopLeft: yes
+	ProximityCaptor:
+		Types:Tree
 		
 ^Rock:
 	Tooltip:
@@ -291,6 +316,8 @@
 		Terrain: Tree
 	EditorAppearance:
 		RelativeToTopLeft: yes
+	ProximityCaptor:
+		Types:Rock

 ^Husk:
 	Health:
@@ -303,6 +330,8 @@
 	HiddenUnderFog:
 	AppearsOnRadar:
 	Burns:
+	ProximityCaptor:
+		Types:Husk

 ^Bridge:
 	Tooltip:
@@ -318,3 +347,5 @@
 	Building:
 		Footprint: ______ ______ ______ ______
 		Dimensions: 6,4
+	ProximityCaptor:
+		Types:Bridge
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -191,3 +191,5 @@ CRATE:
 		Unit: mcv
 	RenderUnit:
 	BelowUnits:
+	ProximityCaptor:
+		Types:Crate
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -25,7 +25,9 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlst1.aud
-
+	ProximityCaptor:
+		Types:Vehicle
+		
 ^Tank:
 	AppearsOnRadar:
 	Mobile:
@@ -53,6 +55,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlst1.aud
+	ProximityCaptor:
+		Types:Tank

 ^Infantry:
 	AppearsOnRadar:
@@ -87,6 +91,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlst1.aud
+	ProximityCaptor:
+		Types:Infantry

 ^Ship:
 	AppearsOnRadar:
@@ -107,6 +113,8 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: navylst1.aud
+	ProximityCaptor:
+		Types:Ship

 ^Plane:
 	AppearsOnRadar:
@@ -122,10 +130,13 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: aunitl1.aud
+<<<<<<< HEAD
 	DebugAircraftFacing:
 	DebugAircraftSubPxX:
 	DebugAircraftSubPxY:
 	DebugAircraftAltitude:
+	ProximityCaptor:
+		Types:Plane

 ^Building:
 	AppearsOnRadar:
@@ -151,6 +162,8 @@
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	ShakeOnDeath:
+	ProximityCaptor:
+		Types:Building

 ^Wall:
 	AppearsOnRadar:
@@ -179,6 +192,8 @@
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
+	ProximityCaptor:
+		Types:Wall

 ^CivBuilding:
 	Inherits: ^Building
@@ -189,12 +204,17 @@
 		Type: Wood
 	Tooltip:
 		Name: Civilian Building
+	ProximityCaptor:
+		Types:CivilianBuilding

 ^CivField:
 	Inherits: ^CivBuilding
 	-Selectable:
 	Tooltip:
 		Name: Field
+	-ProximityCaptor:
+	ProximityCaptor:
+		Types:CivilianField

 ^Tree:
 	Tooltip:
@@ -209,6 +229,8 @@
 		Terrain: Tree
 	EditorAppearance:
 		RelativeToTopLeft: yes
+	ProximityCaptor:
+		Types:Tree

 ^Husk:
 	Health:
@@ -221,6 +243,8 @@
 	HiddenUnderFog:
 	AppearsOnRadar:
 	Burns:
+	ProximityCaptor:
+		Types:Husk

 ^Bridge:
 	Tooltip:
@@ -233,3 +257,5 @@
 		Dimensions: 4,2
 	Health:
 		HP: 1000
+	ProximityCaptor:
+		Types:Bridge
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -281,6 +281,9 @@ C1:
 		Range: 2
 	AttackFrontal:
 		PrimaryWeapon: Pistol
+	-ProximityCaptor:
+	ProximityCaptor:
+		Types:CivilianInfantry

 C2:
 	Inherits: ^Infantry
@@ -299,6 +302,9 @@ C2:
 		Range: 2
 	AttackFrontal:
 		PrimaryWeapon: Pistol
+	-ProximityCaptor:
+	ProximityCaptor:
+		Types:CivilianInfantry

 SHOK:
 	Inherits: ^Infantry
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -208,6 +208,8 @@ MINP:
 	InvisibleToOthers:
 	Tooltip:
 		Name: Anti-Personnel Mine
+	ProximityCaptor:
+		Types:Mine

 MINV:
 	Mine:
@@ -221,6 +223,8 @@ MINV:
 	InvisibleToOthers:
 	Tooltip:
 		Name: Anti-Tank Mine
+	ProximityCaptor:
+		Types:Mine

 CRATE:
 	Tooltip:
@@ -279,13 +283,17 @@ CRATE:
 		Unit: 4tnk
 	RenderUnit:
 	BelowUnits:
+	ProximityCaptor:
+		Types:Crate

 CAMERA:
 	Aircraft:
 	Health:
 		HP:1000
 	RevealsShroud:
-		Range: 10
+		Range: 10	
+	ProximityCaptor:
+		Types:Camera

 FLARE:
 	Aircraft:
@@ -298,6 +306,8 @@ FLARE:
 	HiddenUnderFog:
 	Tooltip:
 		Name: Flare
+	ProximityCaptor:
+		Types: Flare

 powerproxy.parabombs:
 	AirstrikePower:
@@ -318,4 +328,4 @@ powerproxy.sonarpulse:
 		AllowMultiple: yes
 		OneShot: yes
 		EndChargeSound: pulse1.aud
-		SelectTargetSound: slcttgt1.aud
+		SelectTargetSound: slcttgt1.aud