Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base/ini
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2010-11-24 03:36:37 +0000
committerEvan Goers <mega@osirion.org>2010-11-24 03:36:37 +0000
commitf927e7a291e973cfec2ae5821674ca91fa53f4a0 (patch)
tree94ce134544d116ce3b107931ad8d1f815efe5260 /base/ini
parent23281aedfd11e638f83a040d66a20e664ac184d6 (diff)
unknown.ini: gave faction sizes, etc.
ships.ini: added 'tiger' colonial light fighter. ghant.ini: gave 'tiger' to battleship custodian buy menu. tiger.map: new colonial light fighter.
Diffstat (limited to 'base/ini')
-rw-r--r--base/ini/factions.ini6
-rw-r--r--base/ini/ships.ini14
-rw-r--r--base/ini/zones/ghant.ini3
-rw-r--r--base/ini/zones/unknown.ini29
4 files changed, 34 insertions, 18 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index bde5ef6..bf5f8b8 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -71,3 +71,9 @@ name=Tsu-Khan Elite
color=0.1 0.1 0.1
colorsecond=0.25 0.25 0.25
+
+[faction]
+label=derelict
+name=Derelict
+color=0.2 0.2 0.2
+colorsecond=0.3 0.3 0.3
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 92afdf1..0a297ed 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -295,6 +295,20 @@ roll = 1.2
info=This military scoutship's lack of firepower is compensated by its phenomenal speed and maneuverability.
info=The Sharkan is the fastest ship known to exist, which makes it an excellent choice for hit and run operations.
+[ship]
+label=tiger
+name=Tiger
+template=ship_small
+model=maps/colonial/tiger
+price=13000
+cargo=7
+
+thrust = 1.2
+impulse = 9.95
+strafe = 0.3
+turn = 5
+roll = 5
+
; ------------------------------------------------------------------ ;
; INDEPENDENT
; ------------------------------------------------------------------ ;
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 476259d..0277cb9 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -146,6 +146,9 @@ yaw=305
[ship]
label=sharkan
+ [ship]
+ label=tiger
+
[cargo]
label=liquor
price=350
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 2000d62..e707eef 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -16,41 +16,35 @@ model=maps/static/navpoint
[entity]
ship=vector
location=4 -8 0
-color=0.5 0 0
-colorsecond=0.8 0.2 0
+faction=independent
[entity]
ship=scalar
location=4 0 0
-color=0.5 0 0
-colorsecond=0.8 0.2 0
+faction=independent
[entity]
ship=matrix
location=4 8 0
-color=0.5 0 0
-colorsecond=0.8 0.2 0
+faction=independent
[entity]
-label=hades
+ship=hades
label=Hades derelict
-model=maps/derelict/hades
location=32 -16 0
-color=127 26 127
+faction=derelict
[entity]
ship=juggernaut
name=Pirate Juggernaut
-model=maps/pirate/juggernaut
location=32 16 0
+faction=pirates
[entity]
-label=custodian
+ship=custodian
name=Colonial Battleship
-model=maps/colonial/custodian
location=32 32 0
-color=222 192 145
-colorsecond=160 160 160
+faction=militia
[entity]
label=alexandria
@@ -58,14 +52,13 @@ name=Alexandria outpost
model=maps/colonial/alexandria
location=32 64 0
yaw=270
-color=222 192 145
-colorsecond=160 160 160
+faction=colonies
[entity]
label=ensor
name=Ensor station
model=maps/independent/ensor
location=32 -64 0
-color=0.7 0.7 0.9
-colorsecond=0.7 0.8 0.95
yaw=90
+faction=independent
+