Removed deprecated keys,

converted patrols to the new syntax,
added npc weapon types.

1 files changed, 0 insertions, 18 deletions

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 4c6499c..3ac116d 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -57,8 +57,6 @@ armor=10000
 label=vector
 ; name of the ship model
 name=Micron Vector
-; name of the NPC using this ship model
-npcname=Merchant
 ; template, defines the ships size class
 template=ship_small
 ; 3d model file name, can be a .map or a .ase file
@@ -98,7 +96,6 @@ info=capable of outrunning many larger ships.
 [ship]
 label=scalar
 name=Micron Scalar
-npcname=Merchant
 template=ship_small
 model=maps/merchant/scalar
 jumpdrive=no
@@ -155,7 +152,6 @@ info=with an increased cargo hold at the cost of speed and maneuverability.
 [ship]
 label=tiger
 name=Tiger
-npcname=Militia
 template=ship_small
 model=maps/colonial/tiger
 
@@ -178,7 +174,6 @@ info=Known for its speed and maneuverability, the Tiger class interceptor was se
 [ship]
 label=lancer
 name=Lancer mkII
-npcname=Militia
 template=ship_medium
 model=maps/colonial/lancer
 jumpdrive=no
@@ -200,7 +195,6 @@ info=and a beam cannon mount to fight frigates and other small capital ships.
 [ship]
 label=custodian
 name=Custodian-class colonial cruiser
-npcname=Colonial cruiser
 template=ship_cruiser
 model=maps/colonial/custodian
 jumpdrive=yes
@@ -225,7 +219,6 @@ info=this carrier can deploy several wings of fighters to wherever conflict requ
 [ship]
 label=goliath
 name=Goliath-class colonial battleship
-npcname=Colonial battleship
 template=ship_battleship
 model=maps/colonial/goliath
 jumpdrive=yes
@@ -275,7 +268,6 @@ info=
 [ship]
 label=galaxy
 name=Galaxy
-npcname=Merchant transport
 template=ship_large
 model=maps/independent/galaxy
 jumpdrive=yes
@@ -296,7 +288,6 @@ roll    = 50
 [ship]
 label=wagon
 name=Wagon
-npcname=Merchant  transport
 template=ship_large
 model=maps/colonial/wagon
 jumpdrive=yes
@@ -321,7 +312,6 @@ roll    = 55
 ;
 label=tyson
 name=Tyson Deep-Space Explorer
-npcname=Explorer
 template=ship_frigate
 model=maps/colonial/tyson
 jumpdrive=yes
@@ -358,7 +348,6 @@ info=The Tyson-class science vessel is on the forefront of Colonial scientific r
 [ship]
 label=miningfreighter
 name=JMA Mining Freighter
-npcname=JMA transport
 template=ship_large
 model=maps/miners/freighter
 jumpdrive=no
@@ -376,8 +365,6 @@ roll    = 14
 
 [ship]
 label=miningsurveyor
-npcname=JMA Mining Surveyor
-npcname=JMA scout
 template=ship_small
 model=maps/miners/surveyor
 jumpdrive=no
@@ -396,7 +383,6 @@ roll    = 1.4
 [ship]
 label=miningprotector
 name=Mining Protector
-npcname=JMA defence force
 template=ship_medium
 model=maps/miners/protector
 jumpdrive=no
@@ -415,7 +401,6 @@ roll    = 98
 [ship]
 label=miningdefender
 name=JMA Mining Defender
-npcname=JMA defence force
 template=ship_small
 model=maps/miners/defender
 jumpdrive=no
@@ -434,7 +419,6 @@ roll    = 8
 [ship]
 label=miningcruiser
 name=JMA Mining cruiser
-npcname=JMA cruiser
 template=ship_cruiser
 model=maps/miners/cruiser
 jumpdrive=yes
@@ -960,7 +944,6 @@ info=It is based upon the original heavy cruiser design that was used to win the
 [ship]
 label=raider
 name=Raider
-npcname=Pirate
 template=ship_medium
 model=maps/pirate/raider
 jumpdrive=no
@@ -979,7 +962,6 @@ info=Many pirate factions cover the surfaces of their Raiders with spikes for mo
 [ship]
 label=jaguar
 name=Jaguar
-npcname=Pirate
 template=ship_large
 model=maps/pirate/jaguar
 jumpdrive=no