From 06a63fbeb63e035c43cc11971dd5342c0b410934 Mon Sep 17 00:00:00 2001 From: Stijn Buys <ingar@osirion.org> Date: Sat, 9 Nov 2013 20:16:07 +0000 Subject: Removed deprecated keys, converted patrols to the new syntax, added npc weapon types. --- base/ini/factions.ini | 8 +++-- base/ini/ships.ini | 18 ----------- base/ini/zones/antwerp.ini | 34 +++++++++++++-------- base/ini/zones/finnmark.ini | 68 +++++++++++++++++++++++++++++++++--------- base/ini/zones/ghant.ini | 23 +++++++++----- base/ini/zones/kronenbaden.ini | 15 ++++++---- 6 files changed, 106 insertions(+), 60 deletions(-) diff --git a/base/ini/factions.ini b/base/ini/factions.ini index 9dd54f1..17618a6 100644 --- a/base/ini/factions.ini +++ b/base/ini/factions.ini @@ -45,7 +45,7 @@ color=0.5 0.5 0.5 [reputation] faction=default - reputation=-100 + reputation=-25 [faction] ; faction label @@ -106,7 +106,6 @@ label=pirates name=Pirates color=0.6 0.5 0.1 colorsecond=0.2 0.2 0.2 -lawfull=false info=Pirates are bad guys who want to steal your cargo. @@ -119,7 +118,10 @@ label=camorra name=Camorra Syndicate color=0.6 0.5 0.1 colorsecond=0.2 0.2 0.2 -lawfull=false + + [reputation] + faction=default + reputation=-100 ; tsu-khan factions [faction] 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 diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini index 7b58428..a0f3ff0 100644 --- a/base/ini/zones/antwerp.ini +++ b/base/ini/zones/antwerp.ini @@ -235,15 +235,18 @@ label=patrol_militia faction=militia profile=patrol - [ship] - label=tiger - amount=3 + [npc] + name=Militia + ship=tiger + cannon=blaster1 + amount=2 - [ship] - label=tiger + [npc] + name=Militia + ship=tiger + cannon=blaster1 amount=3 - [waypoint] target=helianthos dock=yes @@ -268,16 +271,21 @@ label=patrol_pirates faction=pirates profile=patrol - [ship] - label=raider - amount=2 + [npc] + name=Pirate + ship=raider + cannon=laser2 - [ship] - label=raider + [npc] + name=Pirate + ship=raider + cannon=laser1 amount=2 - [ship] - label=raider + [npc] + name=Pirate + ship=raider + cannon=laser1 amount=2 [waypoint] diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini index 09ce22b..4874f30 100644 --- a/base/ini/zones/finnmark.ini +++ b/base/ini/zones/finnmark.ini @@ -76,19 +76,41 @@ info=Nobody objected when the miners colonized this inhospitable frozen world an label=water price=4 amount=-1 + + + [weapon] + label=laser1 + + [weapon] + label=laser2 + + [weapon] + label=turretlaser1 + + [weapon] + label=turretlaser2 + + [weapon] + label=blaster1 + + [weapon] + label=blaster2 ; ------------------------------------------------------------------ ; KVALSUND MINING OPERATIONS [station] label=kvalsund -name=Kvalsund mining operations +name=Kvalsund model=maps/miners/kvalsund faction=miners location=-256 512 0 radius=10 yaw=-90 +infoname=Iron mining facility +info=The Kvalsund mining asteroid. + [ship] label=miningsurveyor @@ -108,6 +130,18 @@ yaw=-90 label=liquor price=260 amount=0 + + [weapon] + label=laser1 + + [weapon] + label=laser2 + + [weapon] + label=turretlaser1 + + [weapon] + label=blaster1 ; ------------------------------------------------------------------ ; ANTWERP JUMPGATE @@ -141,16 +175,15 @@ location=624 512 8 ; ------------------------------------------------------------------ [entity] -label=Jumpgate Finnmark -> Kronenbadeb -name=Unfinished Jumpgate +label=jumpgate_unfinished +name=Jumpgate Finnmark -> Kronenbaden +infoname=Jumpgate under construction location=-584 896 0 model=maps/common/jumpgate_construction yaw=0 faction=miners radius=5.4 -infoname=Jumpgate under construction - [jumppoint] label=jumppoint_kronenbaden target=kronenbaden:jumppoint_finnmark @@ -193,8 +226,11 @@ faction=neutral profile=convoy faction=miners - [ship] - label=miningfreighter + [npc] + name=JMA transport + ship=miningfreighter + cannon=laser2 + turret=turretlaser2 amount=2 [waypoint] @@ -214,13 +250,17 @@ faction=miners profile=patrol faction=miners - [ship] - label=miningprotector - amount=2 + [npc] + name=JMA defence force + ship=miningprotector + cannon=blaster2 + amount=1 - [ship] - label=miningprotector - amount=2 + [npc] + name=JMA defence force + ship=miningprotector + cannon=blaster1 + amount=3 [waypoint] target=finnmark @@ -240,4 +280,4 @@ faction=miners target=jumpgate_construction [waypoint] - target=jumppoint_finnmark + target=jumppoint_karelia diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini index bec3898..1c45e7b 100644 --- a/base/ini/zones/ghant.ini +++ b/base/ini/zones/ghant.ini @@ -387,9 +387,13 @@ label=convoy_merchants faction=merchants profile=convoy - [ship] - label=vector - ; maximal amount of ships of this type + [npc] + name=Merchant + ; ship model used by this NPC type + ship=vector + ; the type of cannon this NPC type will use + cannon=laser1 + ; maximal amount of NPCs of this type to add amount=3 [waypoint] @@ -412,13 +416,18 @@ label=patrol_militia faction=militia profile=patrol - [ship] - label=tiger + [npc] + name=Militia + ship=tiger + cannon=blaster1 - [ship] - label=tiger + [npc] + name=Militia + ship=tiger + cannon=blaster1 amount=3 + [waypoint] target=custodian dock=yes diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini index a530cda..654aa40 100644 --- a/base/ini/zones/kronenbaden.ini +++ b/base/ini/zones/kronenbaden.ini @@ -138,12 +138,12 @@ faction=colonies [entity] label=jumpgate_unfinished name=Jumpgate Kronenbaden -> Finnmark +infoname=Jumpgate under construction location=1380 356 8 model=maps/common/jumpgate_construction yaw=180 faction=colonies radius=5.4 -infoname=JUmpgate under construction [jumppoint] label=jumppoint_finnmark @@ -178,11 +178,16 @@ label=convoy_merchants faction=merchants profile=convoy - [ship] - label=galaxy + [npc] + name=Merchant transport + ship=galaxy + cannon=laser1 + turret=turretlaser1 - [ship] - label=vector + [npc] + name=Merchant + ship=vector + cannon=blaster1 ; maximal amount of ships of this type amount=2 -- cgit v1.2.3