diff options
| -rw-r--r-- | base/ini/factions.ini | 4 | ||||
| -rw-r--r-- | base/ini/world.ini | 3 | ||||
| -rw-r--r-- | base/ini/zones/finnmark.ini | 6 | ||||
| -rw-r--r-- | base/ini/zones/kronenbaden.ini | 73 | ||||
| -rw-r--r-- | base/ini/zones/unknown.ini | 27 | ||||
| -rw-r--r-- | base/ini/zones/vostok.ini | 28 | ||||
| -rw-r--r-- | base/ini/zones/warsaw.ini | 10 |
7 files changed, 104 insertions, 47 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini index 35a544f..9f3995e 100644 --- a/base/ini/factions.ini +++ b/base/ini/factions.ini @@ -69,8 +69,8 @@ color=217 131 0 reputation=0 [reputation] - faction=praetoria - couerier=100 + faction=courier + reputation=100 [faction] label=courier diff --git a/base/ini/world.ini b/base/ini/world.ini index beac29d..b22ec6d 100644 --- a/base/ini/world.ini +++ b/base/ini/world.ini @@ -16,6 +16,7 @@ zone=antwerp zone=kronenbaden zone=khorsand zone=warsaw +zone=vostok ; neutral systems zone=finnmark @@ -59,4 +60,4 @@ zone=gamma_kosiya ; misc systems zone=race -;zone=unknown +zone=unknown diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini index 60f5066..d405792 100644 --- a/base/ini/zones/finnmark.ini +++ b/base/ini/zones/finnmark.ini @@ -178,15 +178,15 @@ target=karelia:jumppoint_finnmark [entity] label=jumpgate_unfinished name=Jumpgate Finnmark -> Kronenbaden -location=-584 896 0 -radius=5.4 +location=-587 889 0 +radius=8 infoname=Jumpgate under construction model=maps/common/jumpgate_construction faction=miners [jumppoint] label=jumppoint_kronenbaden -location=-590 896 0 +location=-710 836 0 target=kronenbaden:jumppoint_finnmark [station] diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini index 997cf82..487fee1 100644 --- a/base/ini/zones/kronenbaden.ini +++ b/base/ini/zones/kronenbaden.ini @@ -10,29 +10,29 @@ sky=sky23 location=378 284 0 ; faction faction=colonies + ; zone information info=The Kronenbaden system. -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; STAR [star] -location=450 1320 512 name=class F star +location=450 1320 512 radius=58 color=1.0 1.0 0.9 -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; PLANET BADEN [planet] label=Baden name=planet Baden location=786 -400 -64 +angles=0 90 0 texture=planets/baden -yaw=90 dock=yes - faction=colonies ; reset faction colors color=255 255 255 @@ -49,28 +49,29 @@ info=Planet Baden is a lush agricultural planet. label=water price=5 amount=-1 - + [cargo] label=phosphine price=860 amount=0 - + [ship] label=galaxy -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; PLANET KRONE [planet] label=krone name=planet Krone location=-512 256 -128 +angles=0 210 0 texture=planets/krone -yaw=210 faction=colonies ; set color to white color=1.0 1.0 1.0 dock=yes + info=Planet Krone is an industrial planet with a harsh climate. [cargo] @@ -82,7 +83,7 @@ info=Planet Krone is an industrial planet with a harsh climate. label=phosphine price=840 amount=-1 - + [cargo] label=liquor price=255 @@ -92,17 +93,17 @@ info=Planet Krone is an industrial planet with a harsh climate. label=iron price=125 amount=0 - + [cargo] label=niobium price=215 amount=0 - + [cargo] label=gold price=1275 amount=0 - + [cargo] label=water price=12 @@ -110,68 +111,68 @@ info=Planet Krone is an industrial planet with a harsh climate. [ship] label=vector - + [ship] label=scalar -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; ANTWERP JUMPGATE [jumpgate] label=jumpgate_antwerp -target=antwerp:jumpgate_kronenbaden location=256 -1280 -72 -yaw=120 +angles=0 120 0 +target=antwerp:jumpgate_kronenbaden faction=colonies -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; GHANT JUMPGATE [jumpgate] label=jumpgate_ghant -target=ghant:jumpgate_kronenbaden location=-400 -768 32 -yaw=40 +angles=0 40 0 +target=ghant:jumpgate_kronenbaden faction=colonies - -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; WARSAW JUMPGATE [jumpgate] label=jumpgate_warsaw -target=warsaw:jumpgate_kronenbaden location=-1024 768 -64 -yaw=300 +angles=0 300 0 +target=warsaw:jumpgate_kronenbaden faction=colonies -; ------------------------------------------------------------------ +; ------------------------------------------------------------------ ; FINNMARK JUMPGATE CONSTRUCTION SITE [entity] label=jumpgate_unfinished name=Jumpgate Kronenbaden -> Finnmark +location=1388 372 8 +angles=0 180 0 +radius=8 infoname=Jumpgate under construction -location=1380 356 8 model=maps/common/jumpgate_construction -yaw=180 faction=colonies -radius=5.4 [jumppoint] label=jumppoint_finnmark +location=1472 324 8 +angles=0 180 0 target=finnmark:jumppoint_kronenbaden -location=1365 356 8 [station] label=jumpgate_construction name=Jumpgate construction +location=1372 350 8 +angles=0 90 0 +radius=6 infoname=Jumpgate construction site model=maps/colonial/outpost -radius=6 faction=colonies -location=1372 350 8 -yaw=90 [cargo] label=gateparts @@ -188,6 +189,7 @@ yaw=90 [patrol] label=convoy_merchants +location=0 0 0 faction=merchants profile=convoy @@ -196,14 +198,14 @@ profile=convoy ship=galaxy cannon=laser1 turret=turretlaser1 - + [npc] name=Merchant ship=vector cannon=blaster1 ; maximal amount of ships of this type amount=2 - + [waypoint] target=baden ; dock at this waypoint @@ -215,8 +217,9 @@ profile=convoy target=krone dock=yes cargo=gateparts - + [waypoint] target=jumpgate_construction dock=yes cargo=water + diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini index e49e6db..6981680 100644 --- a/base/ini/zones/unknown.ini +++ b/base/ini/zones/unknown.ini @@ -2,13 +2,14 @@ ; unknown.ini ; world description for the Unknown system ; -; this is a test area +; this is a test area [zone] name=Unknown system sky=test ambient=1 1 1 showonmap=false + info=The Unkown system is a test area for various engine features. [navpoint] @@ -23,7 +24,7 @@ faction=neutral [entity] ship=scalar -location=4 0 0 +location=4 0 0 faction=neutral [entity] @@ -52,16 +53,30 @@ faction=militia [entity] label=alexandria name=Alexandria outpost -model=maps/colonial/alexandria location=32 64 0 -yaw=270 +angles=0 270 0 +model=maps/colonial/alexandria faction=colonies [entity] label=trident name=Trident -model=maps/independent/trident location=32 -64 0 -yaw=90 +angles=0 90 0 +model=maps/independent/trident faction=neutral +[entity] +template=jumpgate +label=jumpgate +name=Jumpgate +location=-55 -20 0 +radius=8 + +[entity] +template=jumpgate +label=jumpgate_construction +name=Jumpgate under construction +location=-56 35 0 +radius=8 +model=maps/common/jumpgate_construction diff --git a/base/ini/zones/vostok.ini b/base/ini/zones/vostok.ini new file mode 100644 index 0000000..4117e79 --- /dev/null +++ b/base/ini/zones/vostok.ini @@ -0,0 +1,28 @@ +; +; vostok.ini +; world description for the Vostok system +; +; ------------------------------------------------------------------ +; ZONE IDENTIFICATION + +[zone] +; [string] zone name +name=Vostok system +; [string] skybox name +;sky= +; [r g b] ambient color +ambient=0.05 0.05 0.05 +; [x y z] galactic location +location=388 167 0 +; faction +faction=colonies + +; zone information +info=The Vostok system system marks the border of the Independent Colonies with the Southern Rim. + +[jumpgate] +label=jumpgate_warsaw +location=1224 -984 0 +angles=0 140 0 +target=warsaw:jumpgate_vostok +faction=colonies diff --git a/base/ini/zones/warsaw.ini b/base/ini/zones/warsaw.ini index 765b8a9..6ac5428 100644 --- a/base/ini/zones/warsaw.ini +++ b/base/ini/zones/warsaw.ini @@ -121,3 +121,13 @@ info=As the corporate headquarters of Micron Corporation, spaceship components a label=laser2 amount=-1 +; ------------------------------------------------------------------ +; GHANT JUMPGATE + +[jumpgate] +label=jumpgate_vostok +location=-1288 746 64 +angles=0 -40 0 +target=vostok:jumpgate_warsaw +faction=colonies + |