Merge pull request #8215 from abcdefg30/raflare

Removed bogus traits from ra FLARE
2015-05-23 08:50:21 +02:00
parent fe45a85349 89db7bbf05
commit 78f1e9fb2f
5 changed files with 4 additions and 14 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -680,5 +680,4 @@
 	Selectable:
 		Selectable: false
 		Bounds: 15,15,-1,-1
-	BodyOrientation:

--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -112,10 +112,7 @@ crate:
 	Selectable:
 		Selectable: false
 		Bounds: 15,15,-1,-1
-	ProximityCaptor:
-		Types: Crate
 	Passenger:
-	BodyOrientation:

 mpspawn:
 	Immobile:
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -632,9 +632,6 @@
 	Selectable:
 		Selectable: false
 		Bounds: 15,15,-1,-1
-	ProximityCaptor:
-		Types: Crate
-	BodyOrientation:
 	Parachutable:
 		KilledOnImpassableTerrain: false
 		ParachuteSequence: parach
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -206,8 +206,6 @@ SONAR:
 FLARE:
 	Immobile:
 		OccupiesSpace: false
-	Health:
-		HP: 1000
 	RevealsShroud:
 		Range: 3c0
 	RenderSprites:
@@ -217,8 +215,10 @@ FLARE:
 	HiddenUnderFog:
 	Tooltip:
 		Name: Flare
-	ProximityCaptor:
-		Types: Flare
+		ShowOwnerRow: false
+	Selectable:
+		Selectable: false
+		Bounds: 25,25
 	BodyOrientation:

 MINE:
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -111,9 +111,6 @@
 	Selectable:
 		Selectable: false
 		Bounds: 25,25,-1,-1
-	ProximityCaptor:
-		Types: Crate
-	BodyOrientation:

 ^Wall:
 	AppearsOnRadar: