From b875e9f0a2d5c5a747e22a1a12974ea61b7cb639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 15 Nov 2013 14:31:07 +0100
Subject: [PATCH] remove bit-rotted Proxmity trait

---
 mods/cnc/weapons.yaml               | 10 ----------
 mods/d2k/weapons.yaml               |  4 ----
 mods/ra/maps/Fort-Lonestar/map.yaml |  2 --
 mods/ra/weapons.yaml                |  9 ---------
 mods/ts/weapons.yaml                |  8 --------
 5 files changed, 33 deletions(-)

diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml
index e3d428b734..284e77dccd 100644
--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
@@ -225,7 +225,6 @@ Rockets:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 15
@@ -258,7 +257,6 @@ BikeRockets:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
@@ -291,7 +289,6 @@ OrcaAGMissiles:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
@@ -323,7 +320,6 @@ OrcaAAMissiles:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
@@ -541,7 +537,6 @@ MammothMissiles:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
@@ -605,7 +600,6 @@ MammothMissiles:
 		Arm: 0
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 5
 		Image: DRAGON
 		ROT: 10
@@ -680,7 +674,6 @@ BoatMissile:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 5
 		Image: DRAGON
 		ROT: 10
@@ -712,7 +705,6 @@ TowerMissle:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 20
@@ -812,7 +804,6 @@ SAMMissile:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Proximity: yes
 		Image: MISSILE
 		ROT: 20
 		Speed: 50
@@ -840,7 +831,6 @@ HonestJohn:
 		Arm: 10
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 5
 		Image: patriot
 		Trail: smokey
diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml
index 268520cb8e..7ac25ba50e 100644
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -28,7 +28,6 @@ Bazooka:
 		Speed: 25
 		Arm: 2
 		Shadow: yes
-		Proximity: true
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: RPG
@@ -102,7 +101,6 @@ Slung:
 		High: true
 		Shadow: yes
 		Angle: .15
-		Proximity: true
 		Inaccuracy: 12
 		Image: MISSILE
 	Warhead:
@@ -174,7 +172,6 @@ QuadRockets:
 	Projectile: Missile
 		Arm: 0
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: RPG
 		ROT: 10
@@ -229,7 +226,6 @@ TowerMissile:
 		Arm: 0
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 12
 		Image: MISSILE2
 		ROT: 10
diff --git a/mods/ra/maps/Fort-Lonestar/map.yaml b/mods/ra/maps/Fort-Lonestar/map.yaml
index 288d4ed84c..9d7f788104 100644
--- a/mods/ra/maps/Fort-Lonestar/map.yaml
+++ b/mods/ra/maps/Fort-Lonestar/map.yaml
@@ -1086,7 +1086,6 @@ Weapons:
 			Arm: 2
 			High: true
 			Shadow: false
-			Proximity: true
 			Trail: smokey
 			ContrailLength: 150
 			Inaccuracy: 20
@@ -1208,7 +1207,6 @@ Weapons:
 			Arm: 10
 			High: true
 			Shadow: false
-			Proximity: true
 			Trail: smokey
 			Inaccuracy: 10
 			Image: V2
diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml
index 58ba39b52c..47f67f800d 100644
--- a/mods/ra/weapons.yaml
+++ b/mods/ra/weapons.yaml
@@ -126,7 +126,6 @@ Maverick:
 		Arm: 2
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Inaccuracy: 12
 		Image: DRAGON
@@ -284,7 +283,6 @@ Dragon:
 		Arm: 2
 		High: true
 		Shadow: false
-		Proximity: true
 		Trail: smokey
 		ContrailLength: 10
 		Inaccuracy: 3
@@ -318,7 +316,6 @@ HellfireAG:
 		Arm: 2
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
@@ -351,7 +348,6 @@ HellfireAA:
 		Arm: 2
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
@@ -518,7 +514,6 @@ MammothTusk:
 		Arm: 2
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Inaccuracy: 3
 		Image: DRAGON
@@ -688,7 +683,6 @@ Nike:
 		Arm: 3
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Image: MISSILE
 		ROT: 25
@@ -717,7 +711,6 @@ RedEye:
 		Arm: 3
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Image: MISSILE
 		ROT: 20
@@ -801,7 +794,6 @@ Stinger:
 		Arm: 3
 		High: true
 		Shadow: false
-		Proximity: true
 		ContrailLength: 10
 		Image: DRAGON
 		ROT: 20
@@ -1277,7 +1269,6 @@ ChronoTusk:
 		Arm: 2
 		High: true
 		Shadow: false
-		Proximity: true
 		Trail: smokey
 		ContrailLength: 10
 		Inaccuracy: 3
diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml
index a155459543..5b582305f3 100644
--- a/mods/ts/weapons.yaml
+++ b/mods/ts/weapons.yaml
@@ -47,7 +47,6 @@ Bazooka:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 8
@@ -74,7 +73,6 @@ MultiCluster:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 8
@@ -256,7 +254,6 @@ HoverMissile:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 8
@@ -307,7 +304,6 @@ MammothTusk:
 		Arm: 0
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 10
@@ -436,7 +432,6 @@ BikeMissile:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 8
@@ -517,7 +512,6 @@ Dragon:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 8
@@ -590,7 +584,6 @@ Hellfire:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: DRAGON
 		ROT: 8
@@ -639,7 +632,6 @@ Proton:
 		Arm: 2
 		High: yes
 		Shadow: yes
-		Proximity: yes
 		Inaccuracy: 3
 		Image: TORPEDO
 		ROT: 1