Updated MAnticore ship with weapons and collision model,

added iships for sale and patrol to the Praetoria system.

3 files changed, 312 insertions, 28 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 0253535..c7b51ee 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -436,33 +436,6 @@ turn    = 14000
 roll    = 1400
 
 ; ------------------------------------------------------------------ ;
-;		PRAETORIAN EXPRESS
-; ------------------------------------------------------------------ ;
-
-; ---- P.O.D. ------------------------------------------------------ ;
-
-[ship]
-label=pod
-name=P.O.D.
-template=ship_small
-model=maps/mercenary/pod
-price=15000
-
-cargo   = 15
-armor	= 75
-
-; technical specifications
-thrust  = 2
-impulse = 10
-strafe  = 0.2
-turn    = 20
-roll    = 20
-
-; info
-info=The P.O.D. was originally designed as a racing vehicle, but the sturdy design placed it at a considerable weight disadvantage against its competitors. The ship fell out of grace on the race circuit, but was picked up by scouts and couriers in need for a small and fast vessel.
-info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
-
-; ------------------------------------------------------------------ ;
 ;		MERCENARY
 ; ------------------------------------------------------------------ ;
 
@@ -597,7 +570,7 @@ strafe  = 0.4
 turn    = 32
 roll    = 15
 
-info=The 'bumblebee' class corvette provides a solid comprimise between speed and firepower.
+info=The 'bumblebee' class corvette provides a solid compromise between speed and firepower.
 info=
 info=Originally designed as a pleasure yacht by the Lindblade shipyards, the Bumblebee quickly found a niche among the independent market due to its attractive price. It provides a comfortable compromise between nimble engines and tough armor plating.
 
@@ -735,6 +708,50 @@ info=
 info=For authorized personnel only.
 
 ; ------------------------------------------------------------------ ;
+;		PRAETORIA
+; ------------------------------------------------------------------ ;
+
+; ---- Manticore --------------------------------------------------- ;
+
+[ship]
+label=manticore
+template=ship_medium
+model=maps/praetoria/manticore
+price=75000
+
+cargo=25
+armor=750
+
+thrust  = 4
+impulse = 22.5
+strafe  = 0.5
+turn    = 65
+roll    = 25
+
+; ---- P.O.D. ------------------------------------------------------ ;
+
+[ship]
+label=pod
+name=P.O.D.
+template=ship_small
+model=maps/mercenary/pod
+price=15000
+
+cargo   = 15
+armor	= 75
+
+; technical specifications
+thrust  = 2
+impulse = 10
+strafe  = 0.2
+turn    = 20
+roll    = 20
+
+; info
+info=The P.O.D. was originally designed as a racing vehicle, but the sturdy design placed it at a considerable weight disadvantage against its competitors. The ship fell out of grace on the race circuit, but was picked up by scouts and couriers in need for a small and fast vessel.
+info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
+
+; ------------------------------------------------------------------ ;
 ;		DAGON
 ; ------------------------------------------------------------------ ;
 
diff --git a/base/ini/zones/praetoria.ini b/base/ini/zones/praetoria.ini
index 4adbf1c..aed3d5d 100644
--- a/base/ini/zones/praetoria.ini
+++ b/base/ini/zones/praetoria.ini
@@ -45,6 +45,9 @@ rotationspeed=0.5
 dock=yes
 info=House Praetoria capital planet.
 
+	[ship]
+	label=manticore
+
 [planet]
 label=caesar
 name=Caesar
@@ -74,6 +77,9 @@ faction=praetoria
 color=255 255 255
 info=Praetorian Intelligence headquarters.
 
+	[ship]
+	label=manticore
+
 [jumpgate]
 label=jumpgate_phoenicia
 name=class G star
@@ -82,3 +88,41 @@ angles=0 110 0
 target=phoenicia:jumpgate_praetoria
 faction=praetoria
 
+; ------------------------------------------------------------------
+; MILITIA PATROL
+
+[patrol]
+label=patrol_praetoria
+location=28 -790 0
+faction=praetoria
+profile=patrol
+
+	[npc]
+	name=Praetorian Guard
+	ship=manticore
+	cannon=neutron2
+	amount=2
+	
+	[npc]
+	name=Praetorian Guard
+	ship=manticore
+	cannon=neutron1
+	amount=3
+	
+	[waypoint]
+	target=olduvai
+	dock=yes
+	
+	[waypoint]
+	target=jumpgate_carthagio
+	
+	[waypoint]
+	target=jumpgate_hellas
+	
+	[waypoint]
+	target=praetoria
+	dock=yes
+	
+	[waypoint]
+	target=jumpgate_phoenicia
+
diff --git a/base/maps/praetoria/manticore.map b/base/maps/praetoria/manticore.map
index 24a24d1..dfb5847 100644
--- a/base/maps/praetoria/manticore.map
+++ b/base/maps/praetoria/manticore.map
@@ -2996,6 +2996,219 @@ colors/grey75
 ( -1280 96 -128 ) ( -1248 88 -144 ) ( -1248 96 -144 ) thorn/panel_01_secondary 0 0 0 0.5 0.5 0 0 0
 ( -1216 80 -96 ) ( -1248 88 -144 ) ( -1280 88 -128 ) thorn/panel_01_secondary 0 0 0 0.5 0.5 0 0 0
 }
+// brush 264
+{
+( 0 96 32 ) ( 0 -96 32 ) ( -320 96 32 ) common/clip 0 0 0 1 1 0 0 0
+( -128 56 -160 ) ( -128 56 32 ) ( -320 96 32 ) common/clip 0 0 0 1 1 0 0 0
+( -128 56 -136 ) ( -128 -56 -136 ) ( -128 -56 32 ) common/noclip 0 0 0 1 1 0 0 0
+( -128 -56 -136 ) ( -128 56 -136 ) ( -320 -96 -160 ) common/clip 0 0 0 1 1 0 0 0
+( -128 -56 32 ) ( -128 -56 -160 ) ( -320 -96 32 ) common/clip 0 0 0 1 1 0 0 0
+( -320 -96 -160 ) ( -320 96 -160 ) ( -320 -96 32 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 265
+{
+( 0 96 32 ) ( 0 -96 32 ) ( -128 96 32 ) common/clip 0 0 0 1 1 0 0 0
+( 0 40 -128 ) ( 0 40 32 ) ( -128 56 32 ) common/clip 0 0 0 1 1 0 0 0
+( 0 40 32 ) ( 0 40 -128 ) ( 0 -40 -128 ) common/noclip 0 0 0 1 1 0 0 0
+( 0 -96 -128 ) ( 0 96 -128 ) ( -128 -96 -136 ) common/clip 0 0 0 1 1 0 0 0
+( 0 -40 32 ) ( 0 -40 -128 ) ( -128 -56 32 ) common/clip 0 0 0 1 1 0 0 0
+( -128 -96 -136 ) ( -128 96 -136 ) ( -128 -96 32 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 266
+{
+( 64 56 32 ) ( 64 -56 32 ) ( 0 56 32 ) common/clip 0 0 0 1 1 0 0 0
+( 72 40 32 ) ( 8 40 32 ) ( 72 40 -128 ) common/clip 0 0 0 1 1 0 0 0
+( 64 56 32 ) ( 64 56 -128 ) ( 64 -56 32 ) common/clip 0 0 0 1 1 0 0 0
+( 8 -40 -128 ) ( 8 -40 32 ) ( 72 -40 -128 ) common/clip 0 0 0 1 1 0 0 0
+( 0 -56 -128 ) ( 0 56 -128 ) ( 0 -56 32 ) common/noclip 0 0 0 1 1 0 0 0
+( 16 -40 -176 ) ( 64 -40 -176 ) ( 16 40 -176 ) common/clip 0 0 0 1 1 0 0 0
+( 0 40 -128 ) ( 0 -40 -128 ) ( 16 40 -176 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 267
+{
+( 320 56 48 ) ( 320 -56 48 ) ( 64 -40 32 ) common/clip 0 0 0 1 1 0 0 0
+( 320 56 -128 ) ( 320 56 32 ) ( 64 40 32 ) common/clip 0 0 0 1 1 0 0 0
+( 320 -56 48 ) ( 320 56 48 ) ( 320 -56 -160 ) common/noclip 0 0 0 1 1 0 0 0
+( 320 -56 -160 ) ( 320 56 -160 ) ( 64 -40 -128 ) common/clip 0 0 0 1 1 0 0 0
+( 320 -56 32 ) ( 320 -56 -128 ) ( 64 -40 32 ) common/clip 0 0 0 1 1 0 0 0
+( 64 -40 -128 ) ( 64 40 -128 ) ( 64 -40 32 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 268
+{
+( 424 56 48 ) ( 424 -56 48 ) ( 320 56 48 ) common/noclip 0 0 0 1 1 0 0 0
+( 424 56 48 ) ( 320 56 48 ) ( 424 56 -176 ) common/clip 0 0 0 1 1 0 0 0
+( 432 56 48 ) ( 432 56 -176 ) ( 432 -56 48 ) common/clip 0 0 0 1 1 0 0 0
+( 320 -56 -176 ) ( 320 -56 48 ) ( 424 -56 -176 ) common/clip 0 0 0 1 1 0 0 0
+( 320 -56 -176 ) ( 320 56 -176 ) ( 320 -56 48 ) common/clip 0 0 0 1 1 0 0 0
+( 368 56 -336 ) ( 368 -56 -336 ) ( 384 -56 -272 ) common/clip 0 0 0 1 1 0 0 0
+( 368 -56 -336 ) ( 368 56 -336 ) ( 344 -56 -336 ) common/clip 0 0 0 1 1 0 0 0
+( 344 -56 -336 ) ( 344 56 -336 ) ( 320 56 -272 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 269
+{
+( 480 23.625 152 ) ( 480 -23.625 152 ) ( 384 -24 176 ) common/clip 0 0 0 1 1 0 0 0
+( 464 24 160 ) ( 384 24 176 ) ( 320 56 48 ) common/clip 0 0 0 1 1 0 0 0
+( 480 -23.625 152 ) ( 480 23.625 152 ) ( 432 -50.875 48 ) common/clip 0 0 0 1 1 0 0 0
+( 320 -56 48 ) ( 432 -56 48 ) ( 320 56 48 ) common/noclip 0 0 0 1 1 0 0 0
+( 384 -24 176 ) ( 464 -24 160 ) ( 320 -56 48 ) common/clip 0 0 0 1 1 0 0 0
+( 384 56 176 ) ( 384 -56 176 ) ( 320 56 48 ) common/clip 0 0 0 1 1 0 0 0
+( 456 64 160 ) ( 464 64 120 ) ( 456 -64 160 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 270
+{
+( -320 -96 32 ) ( -352 -96 112 ) ( -352 96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -576 96 -160 ) ( -352 96 112 ) ( -576 96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -320 96 32 ) ( -320 96 -160 ) ( -320 -96 32 ) common/noclip 0 0 0 1 1 0 0 0
+( -576 -96 -160 ) ( -576 -96 112 ) ( -352 -96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -576 96 112 ) ( -352 -96 112 ) ( -576 -96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -576 96 -160 ) ( -576 96 112 ) ( -576 -96 112 ) common/noclip 0 0 0 1 1 0 0 0
+( -368 64 -160 ) ( -432 64 -160 ) ( -368 -64 -160 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 271
+{
+( -384 96 -160 ) ( -384 -96 -160 ) ( -448 96 -160 ) common/noclip 0 0 0 1 1 0 0 0
+( -384 96 -160 ) ( -448 96 -160 ) ( -384 96 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -384 -96 -288 ) ( -384 96 -288 ) ( -448 -96 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -96 -224 ) ( -448 -96 -160 ) ( -384 -96 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -96 -224 ) ( -448 96 -224 ) ( -448 -96 -160 ) common/noclip 0 0 0 1 1 0 0 0
+( -352 96 -288 ) ( -352 -96 -288 ) ( -320 -96 -160 ) common/clip 0 0 0 1 1 0 0 0
+( -352 -96 -288 ) ( -384 96 -288 ) ( -384 -96 -288 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 272
+{
+( -512 96 -160 ) ( -512 -96 -160 ) ( -640 96 -160 ) common/noclip 0 0 0 1 1 0 0 0
+( -448 96 -160 ) ( -576 96 -160 ) ( -448 96 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -576 96 -208 ) ( -576 -96 -208 ) ( -512 -96 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -640 -96 -224 ) ( -640 -96 -160 ) ( -512 -96 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -576 -96 -208 ) ( -576 96 -208 ) ( -576 96 -160 ) common/noclip 0 0 0 1 1 0 0 0
+( -448 96 -160 ) ( -448 96 -224 ) ( -448 -96 -160 ) common/noclip 0 0 0 1 1 0 0 0
+( -576 -96 -224 ) ( -448 -96 -224 ) ( -576 96 -224 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 273
+{
+( -656 96 112 ) ( -656 -96 112 ) ( -688 96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -656 96 112 ) ( -688 96 112 ) ( -656 96 -192 ) common/clip 0 0 0 1 1 0 0 0
+( -688 96 -96 ) ( -688 -96 -96 ) ( -656 -96 -192 ) common/clip 0 0 0 1 1 0 0 0
+( -688 -96 -192 ) ( -688 -96 112 ) ( -656 -96 -192 ) common/clip 0 0 0 1 1 0 0 0
+( -688 -96 -96 ) ( -688 96 -96 ) ( -688 96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -576 96 112 ) ( -576 96 -208 ) ( -576 -96 112 ) common/noclip 0 0 0 1 1 0 0 0
+( -656 96 -192 ) ( -656 -96 -192 ) ( -576 -96 -208 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 274
+{
+( -688 96 112 ) ( -688 -96 112 ) ( -960 96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -688 96 112 ) ( -960 96 112 ) ( -688 96 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -688 96 112 ) ( -688 96 -64 ) ( -688 -96 112 ) common/noclip 0 0 0 1 1 0 0 0
+( -960 -96 -64 ) ( -688 -96 -64 ) ( -960 96 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -960 -96 -64 ) ( -960 -96 112 ) ( -688 -96 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -960 -96 -64 ) ( -960 96 -64 ) ( -960 -96 112 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 275
+{
+( -1040 -96 128 ) ( -1040 96 128 ) ( -960 -96 112 ) common/clip 0 0 0 1 1 0 0 0
+( -960 96 112 ) ( -1024 96 112 ) ( -960 96 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -960 96 112 ) ( -960 96 -64 ) ( -960 -96 112 ) common/noclip 0 0 0 1 1 0 0 0
+( -1040 96 -208 ) ( -1040 -96 -208 ) ( -960 -96 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -1024 -96 -64 ) ( -1024 -96 112 ) ( -960 -96 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -1040 96 128 ) ( -1040 -96 128 ) ( -1152 96 128 ) common/clip 0 0 0 1 1 0 0 0
+( -1152 96 -128 ) ( -1152 -96 -128 ) ( -1040 -96 -208 ) common/clip 0 0 0 1 1 0 0 0
+( -1152 -96 -128 ) ( -1152 96 -128 ) ( -1152 96 128 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 276
+{
+( -1152 96 128 ) ( -1280 96 128 ) ( -1152 96 -128 ) common/clip 0 0 0 1 1 0 0 0
+( -1248 96 -144 ) ( -1248 -96 -144 ) ( -1152 96 -128 ) common/clip 0 0 0 1 1 0 0 0
+( -1280 -96 -128 ) ( -1280 -96 128 ) ( -1152 -96 -128 ) common/clip 0 0 0 1 1 0 0 0
+( -1248 -96 -144 ) ( -1248 96 -144 ) ( -1280 -96 -128 ) common/clip 0 0 0 1 1 0 0 0
+( -1152 96 128 ) ( -1152 -96 128 ) ( -1280 96 128 ) common/clip 0 0 0 1 1 0 0 0
+( -1152 96 128 ) ( -1152 96 -128 ) ( -1152 -96 128 ) common/noclip 0 0 0 1 1 0 0 0
+( -1280 -96 -160 ) ( -1280 96 -160 ) ( -1280 96 128 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 277
+{
+( -1152 0 176 ) ( -1152 -32 176 ) ( -1184 -32 176 ) common/clip 0 0 0 1 1 0 0 0
+( -1072 32 176 ) ( -1184 32 176 ) ( -1072 32 128 ) common/clip 0 0 0 1 1 0 0 0
+( -1152 -32 176 ) ( -1152 0 176 ) ( -1072 -32 128 ) common/clip 0 0 0 1 1 0 0 0
+( -1168 0 128 ) ( -1168 -32 128 ) ( -1072 -32 128 ) common/noclip 0 0 0 1 1 0 0 0
+( -1184 -32 128 ) ( -1184 -32 176 ) ( -1072 -32 128 ) common/clip 0 0 0 1 1 0 0 0
+( -1168 -32 128 ) ( -1168 0 128 ) ( -1184 0 176 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 278
+{
+( -544 80 32 ) ( -448 192 32 ) ( -448 80 32 ) common/clip 0 0 0 1 1 0 0 0
+( -448 96 32 ) ( -448 96 -32 ) ( -512 96 -32 ) common/clip 0 0 0 1 1 0 0 0
+( -448 192 32 ) ( -448 80 -160 ) ( -448 80 32 ) common/clip 0 0 0 1 1 0 0 0
+( -544 208 -128 ) ( -512 96 -32 ) ( -448 96 -32 ) common/clip 0 0 0 1 1 0 0 0
+( -448 192 32 ) ( -512 192 32 ) ( -512 192 -128 ) common/noclip 0 0 0 1 1 0 0 0
+( -512 80 -32 ) ( -512 192 -128 ) ( -512 192 32 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 279
+{
+( -768 192 48 ) ( -448 224 48 ) ( -448 192 48 ) common/clip 0 0 0 1 1 0 0 0
+( -448 192 -224 ) ( -768 192 48 ) ( -448 192 48 ) common/clip 0 0 0 1 1 0 0 0
+( -736 192 -64 ) ( -416 224 -64 ) ( -736 224 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -448 224 -224 ) ( -768 224 48 ) ( -768 224 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -768 224 48 ) ( -768 192 -224 ) ( -768 224 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -544 -64 -16 ) ( -544 -64 16 ) ( -544 64 -16 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 280
+{
+( -448 192 -240 ) ( -544 192 -64 ) ( -448 192 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -448 224 -64 ) ( -448 224 -224 ) ( -448 192 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -448 224 -224 ) ( -512 224 -224 ) ( -512 192 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -448 224 -240 ) ( -544 224 -64 ) ( -544 224 -240 ) common/clip 0 0 0 1 1 0 0 0
+( -544 192 -64 ) ( -512 192 -224 ) ( -512 224 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -768 192 48 ) ( -448 224 48 ) ( -448 192 48 ) common/clip 0 0 0 1 1 0 0 0
+( -544 64 -16 ) ( -544 -64 16 ) ( -544 -64 -16 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 281
+{
+( -448 -192 48 ) ( -448 -224 48 ) ( -768 -192 48 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -192 48 ) ( -768 -192 48 ) ( -448 -192 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -736 -224 -64 ) ( -416 -224 -64 ) ( -736 -192 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -768 -224 -224 ) ( -768 -224 48 ) ( -448 -224 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -768 -224 -224 ) ( -768 -192 -224 ) ( -768 -224 48 ) common/clip 0 0 0 1 1 0 0 0
+( -544 -64 -16 ) ( -544 64 16 ) ( -544 64 -16 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 282
+{
+( -448 -80 32 ) ( -448 -192 32 ) ( -544 -80 32 ) common/clip 0 0 0 1 1 0 0 0
+( -512 -96 -32 ) ( -448 -96 -32 ) ( -448 -96 32 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -80 32 ) ( -448 -80 -160 ) ( -448 -192 32 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -96 -32 ) ( -512 -96 -32 ) ( -544 -208 -128 ) common/clip 0 0 0 1 1 0 0 0
+( -512 -192 -128 ) ( -512 -192 32 ) ( -448 -192 32 ) common/noclip 0 0 0 1 1 0 0 0
+( -512 -192 32 ) ( -512 -192 -128 ) ( -512 -80 -32 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 283
+{
+( -448 -192 -64 ) ( -544 -192 -64 ) ( -448 -192 -240 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -192 -224 ) ( -448 -224 -224 ) ( -448 -224 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -512 -192 -224 ) ( -512 -224 -224 ) ( -448 -224 -224 ) common/clip 0 0 0 1 1 0 0 0
+( -544 -224 -240 ) ( -544 -224 -64 ) ( -448 -224 -240 ) common/clip 0 0 0 1 1 0 0 0
+( -512 -224 -224 ) ( -512 -192 -224 ) ( -544 -192 -64 ) common/clip 0 0 0 1 1 0 0 0
+( -448 -192 48 ) ( -448 -224 48 ) ( -768 -192 48 ) common/clip 0 0 0 1 1 0 0 0
+( -544 64 -16 ) ( -544 64 16 ) ( -544 -64 -16 ) common/noclip 0 0 0 1 1 0 0 0
+}
+// brush 284
+{
+( -640 -6.875 240 ) ( -640 6.875 240 ) ( -560 -6.875 256 ) common/clip 0 0 0 1 1 0 0 0
+( -528 16 224 ) ( -752 16 224 ) ( -528 48 112 ) common/clip 0 0 0 1 1 0 0 0
+( -512 16 192 ) ( -512 -16 192 ) ( -560 6.875 256 ) common/clip 0 0 0 1 1 0 0 0
+( -512 -16 192 ) ( -512 16 192 ) ( -576 -25.125 192 ) common/noclip 0 0 0 1 1 0 0 0
+( -752 -16 224 ) ( -528 -16 224 ) ( -528 -48 112 ) common/clip 0 0 0 1 1 0 0 0
+( -640 6.875 240 ) ( -640 -6.875 240 ) ( -576 25.125 192 ) common/clip 0 0 0 1 1 0 0 0
+}
+// brush 285
+{
+( -512 16 192 ) ( -512 -16 192 ) ( -576 -25.125 192 ) common/noclip 0 0 0 1 1 0 0 0
+( -512 16 224 ) ( -736 16 224 ) ( -512 48 112 ) common/clip 0 0 0 1 1 0 0 0
+( -736 -96 112 ) ( -512 -96 112 ) ( -736 96 112 ) common/noclip 0 0 0 1 1 0 0 0
+( -736 -16 224 ) ( -512 -16 224 ) ( -512 -48 112 ) common/clip 0 0 0 1 1 0 0 0
+( -512 -16 192 ) ( -512 16 192 ) ( -352 34.25 160 ) common/clip 0 0 0 1 1 0 0 0
+( -352 -16 160 ) ( -352 16 160 ) ( -352 48 112 ) common/clip 0 0 0 1 1 0 0 0
+( -640 -25.125 128 ) ( -640 25.125 128 ) ( -576 -25.125 192 ) common/clip 0 0 0 1 1 0 0 0
+( -640 25.125 128 ) ( -640 -25.125 128 ) ( -640 48 112 ) common/clip 0 0 0 1 1 0 0 0
+}
 }
 // entity 1
 {
@@ -3109,3 +3322,13 @@ colors/grey75
 "spawnflags" "1"
 "frequency" "2"
 }
+// entity 17
+{
+"classname" "location_cannon"
+"origin" "-432.000000 208.000000 -24.000000"
+}
+// entity 18
+{
+"classname" "location_cannon"
+"origin" "-432.000000 -208.000000 -24.000000"
+}