Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2010-11-13 23:19:15 +0000
committerEvan Goers <mega@osirion.org>2010-11-13 23:19:15 +0000
commit43d1a7bf5a5fe1c77117df7835fe3b34da3f3564 (patch)
treef54a76b84abe6439b9083fa75efe6354206412e4 /base
parent69a806dde3d62dfc00e5b6df7d84d90a69c91c4a (diff)
Fixed spelling mistake on colossus(doh).
Change Battleship Custodian to a ship and not a straight model. Rename ship_capital to ship_dreadnought. Change halcyon to ship_frigate.
Diffstat (limited to 'base')
-rw-r--r--base/ini/ships.ini16
-rw-r--r--base/ini/zones/ghant.ini8
-rw-r--r--base/maps/tsukhan/colossus.map (renamed from base/maps/tsukhan/colosus.map)0
3 files changed, 12 insertions, 12 deletions
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index 49f6a1b..e5218cc 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -36,7 +36,7 @@ label=ship_battleship
radius=7
[template]
-label=ship_capital
+label=ship_dreadnought
radius=10
; ------------------------------------------------------------------ ;
@@ -416,7 +416,7 @@ cargo=685
[ship]
label=halcyon
name=Halcyon
-template=ship_large
+template=ship_frigate
model=maps/lindblade/halcyon
jumpdrive=yes
@@ -433,10 +433,10 @@ info=For authorized personnel only.
; ------------------------------------------------------------------ ;
[ship]
-label=colosus
-name=Colosus
-template=ship_capital
-model=maps/tsukhan/colosus
+label=colossus
+name=Colossus
+template=ship_dreadnought
+model=maps/tsukhan/colossus
jumpdrive=yes
price=10000000
@@ -594,7 +594,7 @@ info=The Juggernaut has a lower turning speed compared to other capital ships. H
[ship]
label=hades
name=Hades
-template=ship_capital
+template=ship_dreadnought
model=maps/derelict/hades
jumpdrive=yes
@@ -608,7 +608,7 @@ info=For authorized personnel only.
[ship]
label=ares
name=Ares
-template=ship_capital
+template=ship_dreadnought
model=maps/derelict/ares
jumpdrive=yes
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 463b14a..ef32dc6 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -136,9 +136,9 @@ direction=45
; BATTLESHIP CUSTODIAN
[station]
+ship=custodian
label=custodian
-name=battleship Custodian
-model=maps/colonial/custodian
+name=Battleship Custodian
faction=militia
location=-204 -656 32
direction=305
@@ -158,7 +158,7 @@ direction=305
; [string] entity label
label=seymour
; [string] entity name
-name=planet Seymour
+name=Planet Seymour
; [x y x] entity location
location=-128 1032 -32
; [r g b] entity color, values in the 0-1 range
@@ -173,7 +173,7 @@ radius=68
[station]
label=regula
-name=Regula station
+name=Regula Station
model=maps/colonial/regula
location=-128 928 -32
color=0.4 0.7 0
diff --git a/base/maps/tsukhan/colosus.map b/base/maps/tsukhan/colossus.map
index 625e5d3..625e5d3 100644
--- a/base/maps/tsukhan/colosus.map
+++ b/base/maps/tsukhan/colossus.map