From 01843d1c81b80066520ab77e2b833c20c3baa846 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Mon, 11 Nov 2013 08:06:40 +0000
Subject: Moved location_cannons on talon to wings to prevent self-collision
 when firing. Added two extra location_cannons to talon.

---
 base/maps/mercenary/sections/talon_cannon.map |  5 ++
 base/maps/mercenary/talon.map                 | 90 +++++++++++++++++++--------
 2 files changed, 69 insertions(+), 26 deletions(-)

(limited to 'base/maps')

diff --git a/base/maps/mercenary/sections/talon_cannon.map b/base/maps/mercenary/sections/talon_cannon.map
index f281791..4b0d26e 100644
--- a/base/maps/mercenary/sections/talon_cannon.map
+++ b/base/maps/mercenary/sections/talon_cannon.map
@@ -349,3 +349,8 @@ detail/gatling_decal
 }
 }
 }
+// entity 1
+{
+"classname" "location_cannon"
+"origin" "16.000000 0.000000 0.000000"
+}
diff --git a/base/maps/mercenary/talon.map b/base/maps/mercenary/talon.map
index ae92090..f9f25f3 100644
--- a/base/maps/mercenary/talon.map
+++ b/base/maps/mercenary/talon.map
@@ -1787,6 +1787,42 @@ colors/grey75_shiny
 ( 80 37 -33 ) ( -48 36 -34 ) ( -48 37 -33 ) colors/grey25 0 0 0 0.5 0.5 0 0 0
 ( -16 24 -18 ) ( -16 40 -38 ) ( 112 24 -18 ) thorn/panel_01_bright 0 0 0 0.5 0.5 0 0 0
 }
+// brush 177
+{
+( 0 -152 -12 ) ( -8 -152 12 ) ( 0 -152 12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 0 -136 12 ) ( 0 -152 -12 ) ( 0 -152 12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 0 -136 -12 ) ( -8 -136 12 ) ( -8 -136 -12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 0 -128 64 ) ( -8 -160 -64 ) ( 0 -128 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 64 -64 16 ) ( -64 -192 1 ) ( -64 -64 16 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 64 -192 -1 ) ( -64 -64 -16 ) ( -64 -192 -1 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+}
+// brush 178
+{
+( 8 -120 -12 ) ( 0 -120 12 ) ( 8 -120 12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 8 -104 12 ) ( 8 -120 -12 ) ( 8 -120 12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 8 -104 -12 ) ( 0 -104 12 ) ( 0 -104 -12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 8 -96 64 ) ( 0 -128 -64 ) ( 8 -96 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 64 -192 -1 ) ( -64 -64 -16 ) ( -64 -192 -1 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 64 -64 16 ) ( -64 -192 1 ) ( -64 -64 16 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+}
+// brush 179
+{
+( 0 152 12 ) ( -8 152 12 ) ( 0 152 -12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 0 152 12 ) ( 0 152 -12 ) ( 0 136 12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( -8 136 -12 ) ( -8 136 12 ) ( 0 136 -12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 0 128 -64 ) ( -8 160 -64 ) ( 0 128 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -64 64 16 ) ( -64 192 1 ) ( 64 64 16 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( -64 192 -1 ) ( -64 64 -16 ) ( 64 192 -1 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+}
+// brush 180
+{
+( 8 120 12 ) ( 0 120 12 ) ( 8 120 -12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 8 120 12 ) ( 8 120 -12 ) ( 8 104 12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 0 104 -12 ) ( 0 104 12 ) ( 8 104 -12 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( 8 96 -64 ) ( 0 128 -64 ) ( 8 96 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -64 192 -1 ) ( -64 64 -16 ) ( 64 192 -1 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+( -64 64 16 ) ( -64 192 1 ) ( 64 64 16 ) colors/grey50 0 0 0 0.5 0.5 134217728 0 0
+}
 }
 // entity 1
 {
@@ -1839,29 +1875,19 @@ colors/grey75_shiny
 }
 // entity 7
 {
-"classname" "location_cannon"
-"origin" "120.000000 24.000000 0.000000"
-}
-// entity 8
-{
-"classname" "location_cannon"
-"origin" "120.000000 -24.000000 0.000000"
-}
-// entity 9
-{
 "classname" "light"
 "origin" "-120.000000 0.000000 0.000000"
 "flare" "4"
 "spawnflags" "4"
 }
-// entity 10
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "-80.000000 0.000000 88.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 11
+// entity 9
 {
 "classname" "light"
 "origin" "-78.000000 -47.000000 -47.000000"
@@ -1869,7 +1895,7 @@ colors/grey75_shiny
 "_color" "0 1 0"
 "flare" "4"
 }
-// entity 12
+// entity 10
 {
 "classname" "light"
 "origin" "-78.000000 47.000000 -47.000000"
@@ -1877,7 +1903,7 @@ colors/grey75_shiny
 "_color" "1 0 0"
 "flare" "4"
 }
-// entity 13
+// entity 11
 {
 "classname" "light"
 "origin" "-76.000000 -188.000000 0.000000"
@@ -1888,7 +1914,7 @@ colors/grey75_shiny
 "_color" "0 1.0 0"
 "spawnflags" "1"
 }
-// entity 14
+// entity 12
 {
 "classname" "light"
 "origin" "-76.000000 188.000000 0.000000"
@@ -1899,28 +1925,28 @@ colors/grey75_shiny
 "_color" "1.0 0 0"
 "spawnflags" "1"
 }
-// entity 15
+// entity 13
 {
 "classname" "fx_particles"
 "origin" "-80.000000 -48.000000 -48.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 16
+// entity 14
 {
 "classname" "fx_particles"
 "origin" "-80.000000 48.000000 -48.000000"
 "angle" "180.000000"
 "script" "dust_trail"
 }
-// entity 17
+// entity 15
 {
 "classname" "light"
 "origin" "-79.000000 0.000000 87.000000"
 "light" "10"
 "flare" "4"
 }
-// entity 18
+// entity 16
 {
 "classname" "fx_particles"
 "origin" "-104.000000 41.000000 0.000000"
@@ -1928,23 +1954,35 @@ colors/grey75_shiny
 "script" "engine_exhaust"
 "scale" "0.4"
 }
+// entity 17
+{
+"classname" "misc_model"
+"origin" "0.000000 -144.000000 0.000000"
+"model" "maps/mercenary/sections/talon_cannon"
+}
+// entity 18
+{
+"classname" "fx_particles"
+"origin" "-92.000000 0.000000 0.000000"
+"angle" "180.000000"
+"script" "engine_exhaust"
+"scale" "0.6"
+}
 // entity 19
 {
 "classname" "misc_model"
-"origin" "116.000000 -24.000000 0.000000"
+"origin" "8.000000 -112.000000 0.000000"
 "model" "maps/mercenary/sections/talon_cannon"
 }
 // entity 20
 {
 "classname" "misc_model"
-"origin" "116.000000 24.000000 0.000000"
+"origin" "0.000000 144.000000 0.000000"
 "model" "maps/mercenary/sections/talon_cannon"
 }
 // entity 21
 {
-"classname" "fx_particles"
-"origin" "-92.000000 0.000000 0.000000"
-"angle" "180.000000"
-"script" "engine_exhaust"
-"scale" "0.6"
+"classname" "misc_model"
+"origin" "8.000000 112.000000 0.000000"
+"model" "maps/mercenary/sections/talon_cannon"
 }
-- 
cgit v1.2.3