diff options
author | Stijn Buys <ingar@osirion.org> | 2013-11-17 00:36:02 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2013-11-17 00:36:02 +0000 |
commit | 775a6f36b38a5023643de87df23a71ef840213be (patch) | |
tree | dccab9ea5ec9fc6526c46115fb0d6e6b3021e138 | |
parent | 24c1f3cf27b212b63e9ce252e94e632edd1cf90b (diff) |
Added Xibalba system,
various world updates.
-rw-r--r-- | base/ini/world.ini | 1 | ||||
-rw-r--r-- | base/ini/zones/anara.ini | 14 | ||||
-rw-r--r-- | base/ini/zones/antwerp.ini | 10 | ||||
-rw-r--r-- | base/ini/zones/brogha.ini | 59 | ||||
-rw-r--r-- | base/ini/zones/camorra.ini | 34 | ||||
-rw-r--r-- | base/ini/zones/ghant.ini | 2 | ||||
-rw-r--r-- | base/ini/zones/oran.ini | 20 | ||||
-rw-r--r-- | base/ini/zones/phoenicia.ini | 26 | ||||
-rw-r--r-- | base/ini/zones/praetoria.ini | 11 | ||||
-rw-r--r-- | base/ini/zones/xibalba.ini | 25 |
10 files changed, 164 insertions, 38 deletions
diff --git a/base/ini/world.ini b/base/ini/world.ini index b22ec6d..b631687 100644 --- a/base/ini/world.ini +++ b/base/ini/world.ini @@ -46,6 +46,7 @@ zone=phoenicia ; dagon space zone=rasheen +zone=xibalba ; dragon eye nebula zone=cadiz diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini index bbdf0b0..6f54ade 100644 --- a/base/ini/zones/anara.ini +++ b/base/ini/zones/anara.ini @@ -25,20 +25,14 @@ location=0 0 0 [station] label=galileo_outpost -name=Galileo Outpost +name=Galileo outpost model=maps/independent/researchstation faction=research location=128 768 32 - - - [ship] - label=anansi - - [ship] - label=iktomi +infoname=Research facility [ship] - label=galaxy + label=tyson [cargo] label=liquor @@ -52,7 +46,7 @@ location=128 768 32 [cargo] label=water - price=12 + price=18 amount=0 [entity] diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini index 676ecdd..4a807f2 100644 --- a/base/ini/zones/antwerp.ini +++ b/base/ini/zones/antwerp.ini @@ -131,11 +131,11 @@ info=Planet Antwerp is the headquarters of the colonial militia. amount=-1 ; ------------------------------------------------------------------ -; BUCCANEERS' DEN +; HOBOKEN DRIFT [station] -label=buccaneers -name=Buccaneers Den +label=hoboken +name=Hoboken drift location=-340 1372 -256 angles=0 270 0 radius=18 @@ -302,14 +302,14 @@ profile=patrol amount=2 [waypoint] - target=buccaneers + target=hoboken dock=yes [waypoint] target=jumpgate_kronenbaden [waypoint] - target=buccaneers + target=hoboken dock=yes [waypoint] diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini index 730a585..d110827 100644 --- a/base/ini/zones/brogha.ini +++ b/base/ini/zones/brogha.ini @@ -109,6 +109,7 @@ model=maps/colonial/cantor faction=research location=-512 0 32 yaw=-45 +infoname=Research facility [cargo] label=liquor @@ -124,6 +125,10 @@ yaw=-45 label=medicines price=290 amount=0 + + [cargo] + label=optronics + price=520 ; ------------------------------------------------------------------ ; GHANT JUMPGATE @@ -155,3 +160,57 @@ target=khorsand:jumpgate_brogha faction=colonies location=-256 -768 8 yaw=90 + +; ------------------------------------------------------------------ +; MERCHANT TRADE ROUTE + +[patrol] +label=convoy_merchants +location=1192 -912 0 +faction=merchants +profile=convoy + + [npc] + name=Merchant + ; ship model used by this NPC type + ship=scalar + ; the type of cannon this NPC type will use + cannon=laser2 + ; the type of turret this NPC type will use + turret=turretlaser1 + ; maximal amount of NPCs of this type to add + amount=2 + + [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] + target=brogha + ; dock at this waypoint + dock=yes + ; cargo to buy at this waypoint + cargo=liquor + + [waypoint] + target=jumpgate_ghant + ; dock at this waypoint + dock=yes + + [waypoint] + target=ghant:ghant + ; dock at this waypoint + dock=yes + ; cargo to buy at this waypoint + cargo=niobium + + [waypoint] + target=ghant:jumpgate_brogha + ; dock at this waypoint + dock=yes +
\ No newline at end of file diff --git a/base/ini/zones/camorra.ini b/base/ini/zones/camorra.ini index c84628e..d57e254 100644 --- a/base/ini/zones/camorra.ini +++ b/base/ini/zones/camorra.ini @@ -28,19 +28,39 @@ angles=0 140 0 radius=102 color=255 191 127 +; ------------------------------------------------------------------ +; ORAN JUMPGATE +; + [jumpgate] label=jumpgate_oran +faction=neutral location=192 896 0 angles=0 -90 0 target=oran:jumpgate_camorra -faction=neutral -[station] -label=port_royal -name=Port Royal +; ------------------------------------------------------------------ +; PLANET NAPLES +; +[planet] +label=naples +name=planet Naples +faction=camorra location=-312 -432 0 angles=0 60 0 -radius=12 -model=maps/pirate/port_royal -faction=camorra +color=255 255 255 + + [cargo] + label=gold + price=1800 + amount=-1 + + [cargo] + label=liquor + price=650 + amount=0 + [cargo] + label=water + price=40 + amount=0 diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini index dfcf5ed..85f90ae 100644 --- a/base/ini/zones/ghant.ini +++ b/base/ini/zones/ghant.ini @@ -277,7 +277,7 @@ infoname=Colonial cruiser ; [string] entity label label=seymour ; [string] entity name -name=Planet Seymour +name=Seymour ; [x y x] entity location location=-128 1032 -32 ; [float] entity radius (10 game units == 1km ingame) diff --git a/base/ini/zones/oran.ini b/base/ini/zones/oran.ini index 5c6d4c0..4f995cd 100644 --- a/base/ini/zones/oran.ini +++ b/base/ini/zones/oran.ini @@ -18,29 +18,37 @@ info=The Oran system. [jumpgate] label=jumpgate_gibraltar -location=-56 1080 -8 +location=80 1256 -8 angles=0 -80 0 target=gibraltar:jumpgate_oran faction=neutral [jumpgate] label=jumpgate_camorra -location=576 -1168 -8 -angles=0 100 0 +location=328 -1280 32 +angles=-5 100 0 target=camorra:jumpgate_oran faction=neutral [jumpgate] label=jumpgate_phoenicia -location=-1080 -736 -8 -angles=0 40 0 +location=-1208 -312 -16 +angles=0 10 0 target=phoenicia:jumpgate_oran faction=neutral [star] label=star name=class F star -location=1848 304 0 +location=8 -8 0 angles=0 180 0 radius=72 color=255 255 222 + +[jumpgate] +label=jumpgate_xibalba +location=1072 -64 -8 +angles=0 160 16 +target=xibalba:jumpgate_oran +faction=neutral + diff --git a/base/ini/zones/phoenicia.ini b/base/ini/zones/phoenicia.ini index 6c6c75c..08511a6 100644 --- a/base/ini/zones/phoenicia.ini +++ b/base/ini/zones/phoenicia.ini @@ -21,49 +21,59 @@ info=The Phoenicia system. [racetrack] label=racetrack name=Race Start -location=64 0 0 +location=26 84 0 angles=0 180 0 model=maps/race/checkpoint color=.5 .5 .5 +showonmap=yes [checkpoint] label=checkpoint1 name=Checkpoint 1 -location=102 3 0 +location=64 87 0 angles=0 180 0 model=maps/race/checkpoint [checkpoint] label=checkpoint2 name=Checkpoint 2 -location=129 2 4 +location=91 86 4 angles=0 170 0 model=maps/race/checkpoint [checkpoint] label=checkpoint3 name=Checkpoint 3 -location=149 -12 4 +location=111 72 4 angles=0 135 0 model=maps/race/checkpoint [checkpoint] label=checkpoint4 name=Race Finish -location=158 -37 4 +location=120 47 4 angles=0 90 0 model=maps/race/checkpoint [jumpgate] label=jumpgate_oran -location=732 688 0 +location=826 116 0 angles=0 210 0 target=oran:jumpgate_phoenicia faction=praetoria + [star] label=star name=class B star -location=368 -1704 0 -angles=0 90 0 +location=-704 -1444 0 +angles=0 45 0 radius=132 color=244 244 255 + +[jumpgate] +label=jumpgate_praetoria +location=-538 600 0 +angles=0 -60 0 +target=praetoria:jumpgate_phoenicia +faction=praetoria + diff --git a/base/ini/zones/praetoria.ini b/base/ini/zones/praetoria.ini index 297ed43..9355a63 100644 --- a/base/ini/zones/praetoria.ini +++ b/base/ini/zones/praetoria.ini @@ -67,8 +67,17 @@ label=olduvai name=Olduvai station location=-887 -113 0 angles=0 119 0 +radius=14 model=maps/common/border_station_01 faction=praetoria -radius=14 color=255 255 255 infoname=Praetorian Intelligence headquarters + +[jumpgate] +label=jumpgate_phoenicia +name=class G star +location=184 -944 -8 +angles=0 110 0 +target=phoenicia:jumpgate_praetoria +faction=praetoria + diff --git a/base/ini/zones/xibalba.ini b/base/ini/zones/xibalba.ini new file mode 100644 index 0000000..24b7789 --- /dev/null +++ b/base/ini/zones/xibalba.ini @@ -0,0 +1,25 @@ +; +; xibalba.ini +; world description for the Xibalba system +; +; ------------------------------------------------------------------ +; ZONE IDENTIFICATION +; + +[zone] +name=Xibalba system +sky= +; [x y z] galactic location +location=752 504 0 +ambient=0.15 0.2 0.15 +faction=dagon + +info=The Xibalba system. + +[jumpgate] +label=jumpgate_oran +location=-60 960 0 +angles=0 -75 0 +target=oran:jumpgate_xibalba +faction=dagon + |