From 5b8f9cd10c9bff37452e041c8bf66074864ba919 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Mon, 11 Nov 2013 08:26:17 +0000
Subject: Gave goliath turrets.

---
 base/maps/colonial/goliath.map      | 224 ++++++++++++++++++++----------------
 base/maps/weapons/turret_simple.map |  10 ++
 2 files changed, 135 insertions(+), 99 deletions(-)
 create mode 100644 base/maps/weapons/turret_simple.map

diff --git a/base/maps/colonial/goliath.map b/base/maps/colonial/goliath.map
index 8593ad0..d3e1c87 100644
--- a/base/maps/colonial/goliath.map
+++ b/base/maps/colonial/goliath.map
@@ -8885,201 +8885,227 @@ thorn/panel_01
 }
 // entity 301
 {
-"classname" "location_cannon"
-"origin" "-124.001465 39.999969 155.994339"
-"angles" "-71.999992 -90.000000 0.000000"
+"classname" "light"
+"origin" "599.000000 -33.000000 -3.000000"
+"light" "4"
+"_color" "1 0 0"
+"frequency" "1"
+"spawnflags" "1"
+"time" "0.1"
+"offset" "0.9"
 }
 // entity 302
 {
-"classname" "location_cannon"
-"origin" "-124.001465 -24.000031 139.994339"
-"angles" "-71.999992 -90.000000 0.000000"
+"classname" "light"
+"origin" "498.000000 154.000000 -50.000000"
+"light" "8"
+"_color" "1 0 0"
+"frequency" "1"
+"spawnflags" "1"
+"time" "0.1"
+"offset" "0.9"
 }
 // entity 303
 {
-"classname" "location_cannon"
-"origin" "-996.001465 23.999969 143.994339"
-"angles" "-90.000000 0.000000 -0.000000"
+"classname" "light"
+"origin" "446.000000 198.000000 -42.000000"
+"light" "8"
+"_color" "1 0 0"
+"frequency" "1"
+"spawnflags" "1"
+"time" "0.1"
+"offset" "0.9"
 }
 // entity 304
 {
-"classname" "location_cannon"
-"origin" "-276.001465 39.999969 155.994339"
-"angles" "-71.999992 -90.000000 0.000000"
+"classname" "light"
+"origin" "238.000000 286.000000 -18.000000"
+"light" "8"
+"_color" "1 0 0"
+"frequency" "1"
+"spawnflags" "1"
+"time" "0.1"
+"offset" "0.9"
 }
 // entity 305
 {
-"classname" "location_cannon"
-"origin" "-276.001465 -24.000031 139.994339"
-"angles" "-72 -89.999985 0.000000"
-}
-// entity 306
-{
-"classname" "location_cannon"
-"origin" "-528.001465 -72.000031 113.994339"
-"angles" "-71.999992 -90.000000 0.000000"
-}
-// entity 307
-{
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-656.001465 -72.000031 113.994339"
 "angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 308
+// entity 306
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-784.001465 -72.000031 113.994339"
 "angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 309
+// entity 307
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-912.001465 -72.000031 113.994339"
 "angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 310
+// entity 308
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-21.999969 311.000031 128.999985"
 "angles" "-45.000008 90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 311
+// entity 309
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-205.999969 309.000031 126.999985"
 "angles" "-45 90 0"
+"model" "maps/weapons/turret_simple"
 }
-// entity 312
+// entity 310
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-231.999969 343.000031 96.999985"
 "angles" "-45.000008 90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 313
+// entity 311
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-21.999969 339.000031 100.999985"
 "angles" "-45.000008 90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 314
+// entity 312
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "448.000031 0.000000 28.000000"
 "angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 315
+// entity 313
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "320.000031 -16.000000 36.000000"
 "angles" "-72 -90 0"
+"model" "maps/weapons/turret_simple"
 }
-// entity 316
+// entity 314
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "416.000000 64.000000 -40.000000"
 "angles" "90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 317
+// entity 315
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "416.000000 0.000000 -40.000000"
 "angles" "90 0 0"
+"model" "maps/weapons/turret_simple"
 }
-// entity 318
+// entity 316
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-288.000000 160.000000 128.000000"
 "angles" "-90 0 0"
+"model" "maps/weapons/turret_simple"
 }
-// entity 319
+// entity 317
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-824.001465 223.999969 111.994339"
 "angles" "-90 0.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 320
+// entity 318
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-996.001465 87.999969 143.994339"
 "angles" "-90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 321
+// entity 319
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-768.000000 40.000000 -64.000000"
 "angles" "90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
-// entity 322
+// entity 320
 {
-"classname" "location_cannon"
+"classname" "misc_model"
 "origin" "-64.000000 40.000000 -96.000000"
 "angles" "90 0 0"
+"model" "maps/weapons/turret_simple"
+}
+// entity 321
+{
+"classname" "misc_model"
+"origin" "-124.001465 39.999969 155.994339"
+"angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
+}
+// entity 322
+{
+"classname" "misc_model"
+"origin" "-124.001465 -24.000031 139.994339"
+"angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 323
 {
-"classname" "location_cannon"
-"origin" "-144.000000 40.000000 -96.000000"
-"angles" "90.000000 0.000000 -0.000000"
+"classname" "misc_model"
+"origin" "-996.001465 23.999969 143.994339"
+"angles" "-90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 324
 {
-"classname" "location_cannon"
-"origin" "-224.000000 40.000000 -96.000000"
-"angles" "90.000000 0.000000 -0.000000"
+"classname" "misc_model"
+"origin" "-276.001465 39.999969 155.994339"
+"angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 325
 {
-"classname" "location_cannon"
-"origin" "-512.000000 40.000000 -64.000000"
-"angles" "90.000000 0.000000 -0.000000"
+"classname" "misc_model"
+"origin" "-276.001465 -24.000031 139.994339"
+"angles" "-72 -89.999985 0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 326
 {
-"classname" "location_cannon"
-"origin" "-640.000000 40.000000 -64.000000"
-"angles" "90.000000 0.000000 -0.000000"
+"classname" "misc_model"
+"origin" "-528.001465 -72.000031 113.994339"
+"angles" "-71.999992 -90.000000 0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 327
 {
-"classname" "light"
-"origin" "599.000000 -33.000000 -3.000000"
-"light" "4"
-"_color" "1 0 0"
-"frequency" "1"
-"spawnflags" "1"
-"time" "0.1"
-"offset" "0.9"
+"classname" "misc_model"
+"origin" "-144.000000 40.000000 -96.000000"
+"angles" "90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 328
 {
-"classname" "light"
-"origin" "498.000000 154.000000 -50.000000"
-"light" "8"
-"_color" "1 0 0"
-"frequency" "1"
-"spawnflags" "1"
-"time" "0.1"
-"offset" "0.9"
+"classname" "misc_model"
+"origin" "-224.000000 40.000000 -96.000000"
+"angles" "90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 329
 {
-"classname" "light"
-"origin" "446.000000 198.000000 -42.000000"
-"light" "8"
-"_color" "1 0 0"
-"frequency" "1"
-"spawnflags" "1"
-"time" "0.1"
-"offset" "0.9"
+"classname" "misc_model"
+"origin" "-512.000000 40.000000 -64.000000"
+"angles" "90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
 // entity 330
 {
-"classname" "light"
-"origin" "238.000000 286.000000 -18.000000"
-"light" "8"
-"_color" "1 0 0"
-"frequency" "1"
-"spawnflags" "1"
-"time" "0.1"
-"offset" "0.9"
+"classname" "misc_model"
+"origin" "-640.000000 40.000000 -64.000000"
+"angles" "90.000000 0.000000 -0.000000"
+"model" "maps/weapons/turret_simple"
 }
diff --git a/base/maps/weapons/turret_simple.map b/base/maps/weapons/turret_simple.map
new file mode 100644
index 0000000..7b4a6f6
--- /dev/null
+++ b/base/maps/weapons/turret_simple.map
@@ -0,0 +1,10 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+}
+// entity 1
+{
+"classname" "location_turret"
+"origin" "8.000000 0.000000 0.000000"
+}
-- 
cgit v1.2.3