From 534c7c09faac666737dadf6d2b5eed1bf1d2f404 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 9 Feb 2015 21:47:03 +0000 Subject: Removed the infoname key from zone descriptions, minor ini file cleanups. --- base/ini/zones/anara.ini | 8 ++++---- base/ini/zones/antwerp.ini | 8 ++++---- base/ini/zones/brogha.ini | 2 +- base/ini/zones/carthagio.ini | 7 +++---- base/ini/zones/dagon.ini | 32 ++++++++++++++++++++++++-------- base/ini/zones/finnmark.ini | 12 ++++++------ base/ini/zones/ghant.ini | 32 +++++++++++--------------------- base/ini/zones/hellas.ini | 3 +-- base/ini/zones/kronenbaden.ini | 7 ++++--- base/ini/zones/praetoria.ini | 5 +++-- base/ini/zones/vostok.ini | 7 ++++--- 11 files changed, 65 insertions(+), 58 deletions(-) (limited to 'base') diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini index 791f8ef..edc3c1c 100644 --- a/base/ini/zones/anara.ini +++ b/base/ini/zones/anara.ini @@ -24,12 +24,12 @@ location=0 0 0 ; GALILEO OUTPOST [station] -label=galileo_outpost -name=Galileo outpost +label=galileo +name=Galileo research facility model=maps/independent/researchstation faction=research location=128 768 32 -infoname=Research facility +info=Research facility [ship] label=tyson @@ -158,7 +158,7 @@ profile=convoy amount=3 [waypoint] - target=anara:galileo_outpost + target=anara:galileo dock=yes cargo=water diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini index 8e5b74a..ad335fd 100644 --- a/base/ini/zones/antwerp.ini +++ b/base/ini/zones/antwerp.ini @@ -38,13 +38,14 @@ label=helianthos name=starbase Helianthos location=548 -716 0 angles=0 90 0 -infoname=Colonial starbase model=maps/colonial/helianthos faction=militia turret=turretblaster1 ; override faction secnodary color colorsecond=0 1 0 +info=Colonial starbase. + [ship] label=tiger @@ -91,9 +92,8 @@ faction=militia ; reset faction colors color=255 255 255 colorsecond=255 255 255 -infoname=Colonial Militia headquarters -info=Planet Antwerp is the headquarters of the colonial militia. +info=Planet Antwerp is the headquarters of the Colonial Militia. ; available cargo types [cargo] @@ -142,7 +142,7 @@ angles=0 270 0 radius=18 model=maps/pirate/base_large faction=pirates -infoname=Pirate base +info=Pirate base. [ship] label=raider diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini index 6c8cb82..14269cd 100644 --- a/base/ini/zones/brogha.ini +++ b/base/ini/zones/brogha.ini @@ -110,7 +110,7 @@ model=maps/colonial/cantor faction=research location=-512 0 32 yaw=-45 -infoname=Research facility +info=Research facility. [cargo] label=liquor diff --git a/base/ini/zones/carthagio.ini b/base/ini/zones/carthagio.ini index cb6d96c..13b1607 100644 --- a/base/ini/zones/carthagio.ini +++ b/base/ini/zones/carthagio.ini @@ -38,8 +38,7 @@ color=255 255 255 ; [string] globe texture name texture= -infoname=Praetorian planet -info=This planet needs a texture and a story background. +info=This Praetorian planet needs a texture and a story background. info=Since it is in a gas mining system it most likely supports industry. [cargo] @@ -158,12 +157,12 @@ showonmap=true [station] label=medusa -name=Medusa facility +name=Medusa refinery location=-298 -288 0 angles=0 69 0 radius=16 model=maps/common/border_station_03 -infoname=Gas mining facility +info=Phosphine gas processing facility. [cargo] label=water diff --git a/base/ini/zones/dagon.ini b/base/ini/zones/dagon.ini index 682f937..f5d8061 100644 --- a/base/ini/zones/dagon.ini +++ b/base/ini/zones/dagon.ini @@ -16,6 +16,20 @@ faction=dagon info=The Dagon system, capital of House Dagon +; ------------------------------------------------------------------ +; STAR + +[star] +label=star +name=class F star +location=-80 -1600 0 +angles=0 90 0 +radius=90 +color=255 255 255 + +; ------------------------------------------------------------------ +; PLANET DAGON + [planet] label=dagon name=planet Dagon @@ -25,13 +39,17 @@ faction=dagon texture=planets/dagon dock=yes color=255 255 255 -infoname=House Dagon capital + +info=House Dagon capital planet. [cargo] label=water price=5 amount=-1 +; ------------------------------------------------------------------ +; RASHEEN JUMPGATE + [jumpgate] label=jumpgate_rasheen location=-264 1420 0 @@ -39,13 +57,8 @@ angles=0 -69 0 target=rasheen:jumpgate_dagon faction=dagon -[star] -label=star -name=class F star -location=-80 -1600 0 -angles=0 90 0 -radius=90 -color=255 255 255 +; ------------------------------------------------------------------ +; ASHRAN JUMPGATE [jumpgate] label=jumpgate_ashran @@ -54,6 +67,9 @@ angles=0 160 0 target=ashran:jumpgate_dagon faction=dagon +; ------------------------------------------------------------------ +; XIBALBA JUMPGATE + [jumpgate] label=jumpgate_xibalba location=-1096 -588 0 diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini index ecf7ca7..ad6a78b 100644 --- a/base/ini/zones/finnmark.ini +++ b/base/ini/zones/finnmark.ini @@ -46,7 +46,6 @@ faction=miners ;override faction color color=1.0 1.0 1.0 dock=yes -infoname=Miners Union headquarters info=As final act in a series of trade wars, the headquarters of the Miners Union was founded conveniently outside the jurisdiction and taxation of the colonies and the central planets. info=Nobody objected when the miners colonized this inhospitable frozen world and they tend to keep good relations with their customers. They're also prepared and capable to defend their interests when necessary. @@ -101,15 +100,14 @@ info=Nobody objected when the miners colonized this inhospitable frozen world an [station] label=kvalsund -name=Kvalsund +name=Kvalsund mining facility location=-556 52 0 angles=0 20 0 radius=10 model=maps/miners/kvalsund faction=miners -infoname=Iron mining facility -info=The Kvalsund mining asteroid. +info=The Kvalsund facility is built on top of an iron-rich asteroid. [ship] label=miningsurveyor @@ -180,10 +178,11 @@ label=jumpgate_unfinished name=Jumpgate Finnmark -> Kronenbaden location=-587 889 0 radius=8 -infoname=Jumpgate under construction model=maps/common/jumpgate_construction faction=miners +info=Jumpgate under construction + [jumppoint] label=jumppoint_kronenbaden location=-710 836 0 @@ -195,10 +194,11 @@ name=Jumpgate Construction location=-572 902 0 angles=0 -90 0 radius=6 -infoname=Jumpgate construction site model=maps/colonial/outpost faction=miners +info=Jumpgate construction site + [cargo] label=gateparts price=1025 diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini index 8a5d1af..ada99c0 100644 --- a/base/ini/zones/ghant.ini +++ b/base/ini/zones/ghant.ini @@ -21,7 +21,7 @@ faction=colonies info=The Ghant system is the headquarters of the Merchants Association. ; ------------------------------------------------------------------ -; ORIGIN +; NAVPOINT ORIGIN [navpoint] ; [string] entity label @@ -70,8 +70,6 @@ faction=colonies ; reset faction colors color=255 255 255 colorsecond=255 255 255 -; info text -infoname=Independent Colonies info=Despite its relatively unimportant strategic value, planet Ghant represents the political and economical info=heartland of the Independent Colonies. Most of this once mineral-rich world's natural resources have been @@ -154,16 +152,10 @@ model=maps/colonial/alexandria faction=merchants ; this is the default base where new players are docked default=yes -; info text -infoname=Merchants Association headquarters -info=The Merchants Association has located its headquarters in geosynchronous around planet Ghant, -info=enjoying the favourable fiscal climate of the Independent Colonies. -info= +info=The Merchants Association has located its headquarters here near planet Ghant, enjoying the favourable fiscal climate of the Independent Colonies. info=While Alexandria outpost acts as a local hub for commerce and entertainment, -info=it is also a popular transit zone for more shady operations, -info= -info= +info=it is also a popular transit zone for more shady operations giving rise to the nickname ''Queen of the Wasteland''. ; ship trade definitions [ship] @@ -248,7 +240,6 @@ cannon=blaster1 ; type of turrets turret=turretblaster1 ; info text -infoname=Colonial cruiser [ship] label=tiger @@ -273,7 +264,7 @@ infoname=Colonial cruiser amount=-1 ; ------------------------------------------------------------------ -; PLANET SEYMOUR +; SEYMOUR [planet] ; [string] entity label @@ -299,9 +290,8 @@ location=-128 928 -32 angles=0 225 0 model=maps/colonial/regula color=0.4 0.7 0 -infoname=Niobium mining facility -info=Regula station is the headquarters of the local niobium mining operation. +info=Regula station is a local niobium mining operation. [ship] label=vector @@ -356,6 +346,8 @@ angles=-15 120 0 model=maps/colonial/ikarus faction=militia +info=Military communications satellite. + ; ------------------------------------------------------------------ ; BROGHA JUMPGATE @@ -399,14 +391,13 @@ radius=10 model=maps/pirate/base_asteroid faction=pirates turret=turretlaser1 -infoname=Pirate asteroid base [ship] label=raider [cargo] label=liquor - price=400 + price=350 amount=0 [cargo] @@ -540,14 +531,13 @@ radius=10 model=maps/pirate/base_small faction=pirates turret=turretlaser1 -infoname=Pirate depot [ship] label=raider [cargo] label=liquor - price=415 + price=325 amount=0 [cargo] @@ -565,7 +555,7 @@ infoname=Pirate depot amount=-1 ; ------------------------------------------------------------------ -; ORIGIN +; NAVPOINT WEST [navpoint] label=navpoint_west @@ -574,7 +564,7 @@ location=-328 1600 0 angles=0 270 0 ; ------------------------------------------------------------------ -; ORIGIN +; NAVPOINT EAST [navpoint] label=navpoint_east diff --git a/base/ini/zones/hellas.ini b/base/ini/zones/hellas.ini index 30fa4e6..2688e54 100644 --- a/base/ini/zones/hellas.ini +++ b/base/ini/zones/hellas.ini @@ -29,7 +29,7 @@ location=0 -12 0 angles=0 230 0 radius=92 color=255 76 11 -infoname=Red dwarf +info=Red dwarf star. ; ------------------------------------------------------------------ ; TRIREME STATION @@ -44,7 +44,6 @@ model=maps/common/border_station_02 faction=courier color=255 255 255 colorsecond=217 131 0 -infoname=Praetorian Express headquarters info=After much debate, the senate gave its consent to the relocation of info=Praetorian Express' headquarters to the Hellas system in 535 A.E. info=Less than two years later, Trireme station had been inaugerated. diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini index e22dced..4750cea 100644 --- a/base/ini/zones/kronenbaden.ini +++ b/base/ini/zones/kronenbaden.ini @@ -161,9 +161,9 @@ name=Jumpgate Kronenbaden -> Finnmark location=1388 372 8 angles=0 180 0 radius=8 -infoname=Jumpgate under construction model=maps/common/jumpgate_construction faction=colonies +info=Jumpgate under construction [jumppoint] label=jumppoint_finnmark @@ -177,10 +177,11 @@ name=Jumpgate construction location=1372 350 8 angles=0 90 0 radius=6 -infoname=Jumpgate construction site model=maps/colonial/outpost faction=colonies +info=Jumpgate construction site. + [cargo] label=gateparts price=1275 @@ -202,7 +203,7 @@ angles=0 -105 0 radius=14 model=maps/pirate/base_asteroid02 faction=pirates -infoname=Pirate base +info=Pirate base. [ship] label=raider diff --git a/base/ini/zones/praetoria.ini b/base/ini/zones/praetoria.ini index 9355a63..4adbf1c 100644 --- a/base/ini/zones/praetoria.ini +++ b/base/ini/zones/praetoria.ini @@ -43,7 +43,7 @@ radius=68 texture=planets/praetoria rotationspeed=0.5 dock=yes -infoname=House Praetoria capital +info=House Praetoria capital planet. [planet] label=caesar @@ -53,6 +53,7 @@ angles=0 -15 0 radius=50 texture=planets/caesar rotationspeed=0.25 +info=A lifeless moon. [jumpgate] label=jumpgate_carthagio @@ -71,7 +72,7 @@ radius=14 model=maps/common/border_station_01 faction=praetoria color=255 255 255 -infoname=Praetorian Intelligence headquarters +info=Praetorian Intelligence headquarters. [jumpgate] label=jumpgate_phoenicia diff --git a/base/ini/zones/vostok.ini b/base/ini/zones/vostok.ini index 106515c..6bf8f10 100644 --- a/base/ini/zones/vostok.ini +++ b/base/ini/zones/vostok.ini @@ -50,13 +50,14 @@ label=gesser name=Starbase Gesser location=320 -696 -8 angles=0 15 0 -infoname=Colonial starbase model=maps/colonial/helianthos faction=militia turret=turretblaster1 ; override faction secnodary color colorsecond=0 1 0 +info=Colonial starbase. + [ship] label=tiger @@ -92,14 +93,14 @@ colorsecond=0 1 0 [station] label=zavulon -name=Zavulon Base +name=Zavulon base location=1096 1176 12 angles=0 245 0 radius=14 model=maps/pirate/repair_station faction=twilight turret=turretlaser2 -infoname=Twilight Guard base +info=Twilight Guard base. [ship] label=raider -- cgit v1.2.3