From 9b22c2320c935dade2abc97fe89f424e1a6cf643 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Sat, 1 Dec 2012 10:33:45 +0000
Subject: Moved location_cannons on lancer to lancer_cannon submodel.

---
 base/maps/colonial/lancer.map                 | 52 +++++++++------------------
 base/maps/colonial/oldlancer.map              | 30 ++++++----------
 base/maps/colonial/sections/lancer_cannon.map |  5 +++
 3 files changed, 31 insertions(+), 56 deletions(-)

(limited to 'base/maps/colonial')

diff --git a/base/maps/colonial/lancer.map b/base/maps/colonial/lancer.map
index e233278..c7fd2b8 100644
--- a/base/maps/colonial/lancer.map
+++ b/base/maps/colonial/lancer.map
@@ -3341,46 +3341,26 @@ thorn/panel_01
 }
 // entity 8
 {
-"classname" "location_cannon"
-"origin" "-8.000000 -70.000000 -12.000000"
-}
-// entity 9
-{
-"classname" "location_cannon"
-"origin" "-6.000000 -73.000000 0.000000"
-}
-// entity 10
-{
-"classname" "location_cannon"
-"origin" "-6.000000 73.000000 0.000000"
-}
-// entity 11
-{
-"classname" "location_cannon"
-"origin" "-8.000000 70.000000 -12.000000"
-}
-// entity 12
-{
 "classname" "fx_particles"
 "origin" "-195.000000 0.000000 62.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 13
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-210.000000 54.000000 -32.000000"
 "angle" "-179.999985"
 "script" "dust_trail"
 }
-// entity 14
+// entity 10
 {
 "classname" "light"
 "origin" "-192.000000 0.000000 4.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 15
+// entity 11
 {
 "classname" "fx_particles"
 "origin" "-192.000000 0.000000 4.000000"
@@ -3388,14 +3368,14 @@ thorn/panel_01
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 16
+// entity 12
 {
 "classname" "light"
 "origin" "-196.000000 40.000000 -2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 17
+// entity 13
 {
 "classname" "fx_particles"
 "origin" "-192.000000 36.000000 0.000000"
@@ -3403,14 +3383,14 @@ thorn/panel_01
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 18
+// entity 14
 {
 "classname" "light"
 "origin" "-196.000000 -36.000000 0.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 19
+// entity 15
 {
 "classname" "fx_particles"
 "origin" "-192.000000 -36.000000 0.000000"
@@ -3418,60 +3398,60 @@ thorn/panel_01
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 20
+// entity 16
 {
 "classname" "light"
 "origin" "-196.000000 -32.000000 2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 21
+// entity 17
 {
 "classname" "light"
 "origin" "-196.000000 36.000000 0.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 22
+// entity 18
 {
 "classname" "light"
 "origin" "-196.000000 -40.000000 -2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 23
+// entity 19
 {
 "classname" "light"
 "origin" "-196.000000 32.000000 2.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 24
+// entity 20
 {
 "classname" "light"
 "origin" "-196.000000 0.000000 4.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 25
+// entity 21
 {
 "classname" "misc_model"
 "origin" "-14.000000 70.000000 -12.000000"
 "model" "maps/colonial/sections/lancer_cannon"
 }
-// entity 26
+// entity 22
 {
 "classname" "misc_model"
 "origin" "-11.000000 73.000000 0.000000"
 "model" "maps/colonial/sections/lancer_cannon"
 }
-// entity 27
+// entity 23
 {
 "classname" "misc_model"
 "origin" "-11.000000 -73.000000 0.000000"
 "model" "maps/colonial/sections/lancer_cannon"
 }
-// entity 28
+// entity 24
 {
 "classname" "misc_model"
 "origin" "-14.000000 -70.000000 -12.000000"
diff --git a/base/maps/colonial/oldlancer.map b/base/maps/colonial/oldlancer.map
index a588924..3dcb918 100644
--- a/base/maps/colonial/oldlancer.map
+++ b/base/maps/colonial/oldlancer.map
@@ -975,27 +975,17 @@ glass/dark
 }
 // entity 1
 {
-"classname" "location_cannon"
-"origin" "-8.000000 -28.000000 32.000000"
-}
-// entity 2
-{
-"classname" "location_cannon"
-"origin" "-8.000000 28.000000 32.000000"
-}
-// entity 3
-{
 "classname" "fx_particles"
 "origin" "-136.000000 96.000000 -46.000000"
 "script" "dust_trail"
 }
-// entity 4
+// entity 2
 {
 "classname" "fx_particles"
 "origin" "-136.000000 -96.000000 -46.000000"
 "script" "dust_trail"
 }
-// entity 5
+// entity 3
 {
 "classname" "light"
 "origin" "-49.000000 97.000000 -47.000000"
@@ -1004,7 +994,7 @@ glass/dark
 "spawnflags" "1"
 "time" "0.1"
 }
-// entity 6
+// entity 4
 {
 "classname" "light"
 "origin" "-49.000000 -97.000000 -47.000000"
@@ -1013,7 +1003,7 @@ glass/dark
 "spawnflags" "1"
 "time" "0.1"
 }
-// entity 7
+// entity 5
 {
 "classname" "light"
 "origin" "145.000000 0.000000 -9.000000"
@@ -1021,41 +1011,41 @@ glass/dark
 "time" "0.1"
 "spawnflags" "1"
 }
-// entity 8
+// entity 6
 {
 "classname" "light"
 "origin" "-140.000000 -20.000000 0.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 9
+// entity 7
 {
 "classname" "light"
 "origin" "-140.000000 20.000000 0.000000"
 "light" "12"
 "spawnflags" "4"
 }
-// entity 10
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "-132.000000 20.000000 0.000000"
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 11
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-132.000000 -20.000000 0.000000"
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 12
+// entity 10
 {
 "classname" "misc_model"
 "origin" "-12.000000 28.000000 32.000000"
 "model" "maps/colonial/sections/lancer_cannon"
 }
-// entity 13
+// entity 11
 {
 "classname" "misc_model"
 "origin" "-12.000000 -28.000000 32.000000"
diff --git a/base/maps/colonial/sections/lancer_cannon.map b/base/maps/colonial/sections/lancer_cannon.map
index 8a51c30..7bbb5d3 100644
--- a/base/maps/colonial/sections/lancer_cannon.map
+++ b/base/maps/colonial/sections/lancer_cannon.map
@@ -245,3 +245,8 @@ detail/gatling_decal
 }
 }
 }
+// entity 1
+{
+"classname" "location_cannon"
+"origin" "8.000000 0.000000 0.000000"
+}
-- 
cgit v1.2.3