From bcd701dad1f5e2a609f735d6390f500f4ed3c30c Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 14 Nov 2009 14:13:11 +0000
Subject: renamed commodities.ini to cargo.ini, helianthos does not sell
 merchant ships, sell scalar in the brogha system

---
 base/ini/cargo.ini                    | 22 ++++++++++++++++++++++
 base/ini/commodities.ini              | 21 ---------------------
 base/ini/ships.ini                    | 11 +++--------
 base/ini/zones/antwerp/helianthos.ini |  5 +----
 base/ini/zones/brogha/brogha.ini      |  2 +-
 base/ini/zones/brogha/cantor.ini      |  2 +-
 base/ini/zones/unknown.ini            |  6 +++---
 7 files changed, 31 insertions(+), 38 deletions(-)
 create mode 100644 base/ini/cargo.ini
 delete mode 100644 base/ini/commodities.ini

diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
new file mode 100644
index 0000000..9154a29
--- /dev/null
+++ b/base/ini/cargo.ini
@@ -0,0 +1,22 @@
+[cargo]
+label=antracite
+name=Antracite
+info=Black coal, usually found underground.
+
+[cargo]
+label=candy
+name=Candy
+info=Candy for the sweet tooth.
+
+[cargo]
+label=liquor
+name=Liquor
+info=Flavoured liquids containing ethanol.
+
+[cargo]
+label=osirium
+name=Osirium
+info=Liquid metal similar to quicksilver,
+info=emits a faint blue light when exposed
+info=to ultra-violet radiation.
+
diff --git a/base/ini/commodities.ini b/base/ini/commodities.ini
deleted file mode 100644
index add79bc..0000000
--- a/base/ini/commodities.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[commodity]
-label=antracite
-name=Antracite
-info=Black coal, usually found underground.
-
-[commodity]
-label=candy
-name=Candy
-info=Candy for the sweet tooth.
-
-[commodity]
-label=liquor
-name=Liquor
-info=Flavoured liquids containing ethanol.
-
-[commodity]
-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
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
 
-- 
cgit v1.2.3