diff options
author | Stijn Buys <ingar@osirion.org> | 2009-11-14 14:13:11 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-11-14 14:13:11 +0000 |
commit | bcd701dad1f5e2a609f735d6390f500f4ed3c30c (patch) | |
tree | e1195a7ab5e6f1d60fb093434f4016c389230710 | |
parent | 7b075e679fede1337c655c99bed3ae27c1ea8510 (diff) |
renamed commodities.ini to cargo.ini, helianthos does not sell merchant ships, sell scalar in the brogha system
-rw-r--r-- | base/ini/cargo.ini (renamed from base/ini/commodities.ini) | 11 | ||||
-rw-r--r-- | base/ini/ships.ini | 11 | ||||
-rw-r--r-- | base/ini/zones/antwerp/helianthos.ini | 5 | ||||
-rw-r--r-- | base/ini/zones/brogha/brogha.ini | 2 | ||||
-rw-r--r-- | base/ini/zones/brogha/cantor.ini | 2 | ||||
-rw-r--r-- | base/ini/zones/unknown.ini | 6 |
6 files changed, 15 insertions, 22 deletions
diff --git a/base/ini/commodities.ini b/base/ini/cargo.ini index add79bc..9154a29 100644 --- a/base/ini/commodities.ini +++ b/base/ini/cargo.ini @@ -1,21 +1,22 @@ -[commodity]
+[cargo]
label=antracite
name=Antracite
info=Black coal, usually found underground.
-[commodity]
+[cargo]
label=candy
name=Candy
info=Candy for the sweet tooth.
-[commodity]
+[cargo]
label=liquor
name=Liquor
info=Flavoured liquids containing ethanol.
-[commodity]
+[cargo]
label=osirium
name=Osirium
info=Liquid metal similar to quicksilver,
info=emits a faint blue light when exposed
-info=to ultra-violet radiation.
\ No newline at end of file +info=to ultra-violet radiation.
+
diff --git a/base/ini/ships.ini b/base/ini/ships.ini index 61e8017..9e9b0d6 100644 --- a/base/ini/ships.ini +++ b/base/ini/ships.ini @@ -296,8 +296,7 @@ turnspeed=20 jumpdrive=yes info=^1CLASSIFIED^N info= -info=You are not authorized access to intel -info=regarding this ship. +info=For authorized personnel only. ; ------------------------------------------------------------------ ; ; TSU-KHAN @@ -314,7 +313,6 @@ jumpdrive=yes ; ---- maximal width ------------------------| info=^1CLASSIFIED^N info= -info=You are not authorized access to intel info=regarding this ship. [ship] @@ -513,8 +511,7 @@ jumpdrive=yes ; ---- maximal width ------------------------| info=^1CLASSIFIED^N info= -info=You are not authorized access to intel -info=regarding this ship. +info=For authorized personnel only. [ship] label=ares @@ -527,9 +524,7 @@ jumpdrive=yes ; ---- maximal width ------------------------| info=^1CLASSIFIED^N info= -info=You are not authorized access to intel -info=regarding this ship. - +info=For authorized personnel only. ; ; Test ship - model does not exist diff --git a/base/ini/zones/antwerp/helianthos.ini b/base/ini/zones/antwerp/helianthos.ini index 68f4e68..0181940 100644 --- a/base/ini/zones/antwerp/helianthos.ini +++ b/base/ini/zones/antwerp/helianthos.ini @@ -6,8 +6,5 @@ ; ship dealer [dealer] -ship=vector -ship=matrix -ship=tensor -ship=scalar ship=sharkan +ship=custodian diff --git a/base/ini/zones/brogha/brogha.ini b/base/ini/zones/brogha/brogha.ini index d0d8eae..91b9aaf 100644 --- a/base/ini/zones/brogha/brogha.ini +++ b/base/ini/zones/brogha/brogha.ini @@ -7,5 +7,5 @@ [dealer] ship=vector +ship=scalar ship=matrix -ship=pod diff --git a/base/ini/zones/brogha/cantor.ini b/base/ini/zones/brogha/cantor.ini index 590542d..2fcbc95 100644 --- a/base/ini/zones/brogha/cantor.ini +++ b/base/ini/zones/brogha/cantor.ini @@ -7,6 +7,6 @@ [dealer] ship=vector -ship=matrix +ship=scalar ship=pod diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini index 26b147f..04ca5c5 100644 --- a/base/ini/zones/unknown.ini +++ b/base/ini/zones/unknown.ini @@ -32,9 +32,9 @@ color=0.5 0 0 colorsecond=0.8 0.2 0 [entity] -label=heavycruiser -label=Tsu'Khan Heavy Cruiser -model=maps/tsukhan/heavycruiser +label=hades +label=Hades derelict +model=maps/derelict/hades location=32 -16 0 color=127 26 127 |