From be9fdc41bddabbfdf039959b9192d3ec30e78b5c Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 31 Jul 2016 16:15:12 +0200
Subject: Updated MAnticore ship with weapons and collision model, added iships
 for sale and patrol to the Praetoria system.

---
 base/ini/ships.ini           | 73 +++++++++++++++++++++++++++-----------------
 base/ini/zones/praetoria.ini | 44 ++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 28 deletions(-)

(limited to 'base/ini')

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
@@ -435,33 +435,6 @@ strafe  = 2
 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.
 
@@ -734,6 +707,50 @@ info=^1CLASSIFIED^N
 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
+
-- 
cgit v1.2.3