From 87ee3104210a1f08f8909cd710639a43a1fddbde Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 26 Sep 2010 16:02:47 +0000
Subject: trade definitions for ghant, brogha, antwerp and eastend

---
 base/ini/zones/antwerp.ini            | 42 +++++++++++++++++++++++++++-----
 base/ini/zones/antwerp/buccaneers.ini | 20 ---------------
 base/ini/zones/antwerp/helianthos.ini | 10 --------
 base/ini/zones/brogha.ini             | 46 ++++++++++++++++++++++++++++++-----
 base/ini/zones/brogha/brogha.ini      | 11 ---------
 base/ini/zones/brogha/cantor.ini      | 12 ---------
 base/ini/zones/eastend.ini            | 14 ++++++++---
 base/ini/zones/eastend/ensor.ini      | 10 --------
 base/ini/zones/ghant.ini              | 14 +++++------
 base/ini/zones/ghant/alexandria.ini   | 38 -----------------------------
 base/ini/zones/ghant/custodian.ini    | 17 -------------
 base/ini/zones/ghant/regula.ini       | 27 --------------------
 base/ini/zones/unknown.ini            |  6 +++++
 13 files changed, 98 insertions(+), 169 deletions(-)
 delete mode 100644 base/ini/zones/antwerp/buccaneers.ini
 delete mode 100644 base/ini/zones/antwerp/helianthos.ini
 delete mode 100644 base/ini/zones/brogha/brogha.ini
 delete mode 100644 base/ini/zones/brogha/cantor.ini
 delete mode 100644 base/ini/zones/eastend/ensor.ini
 delete mode 100644 base/ini/zones/ghant/alexandria.ini
 delete mode 100644 base/ini/zones/ghant/custodian.ini
 delete mode 100644 base/ini/zones/ghant/regula.ini

diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 3bbd292..bef5f06 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -3,14 +3,14 @@
 ; world description for the Antwerp system
 ;
 
-; 
+; ------------------------------------------------------------------ 
 ; ZONE IDENTIFICATION
 
 [zone]
 name=Antwerp system
 sky=sky35
 
-;
+; ------------------------------------------------------------------ 
 ; STAR
 
 [star]
@@ -24,6 +24,9 @@ color=248 248 255
 ; [float] entity radius (10 game units == 1km ingame)
 radius=88
 
+; ------------------------------------------------------------------ 
+; STARBASE HELIANTHOS
+
 [station]
 label=helianthos
 name=Starbase Helianthos
@@ -32,7 +35,18 @@ location=512 -512 0
 color=100 100 230
 colorsecond=0 1 0
 
-;
+	[ship]
+	label=sharkan
+
+	[ship]
+	label=custodian
+
+	[cargo]
+	label=liquor
+	price=450
+	amount=0
+
+; ------------------------------------------------------------------ 
 ; BUCCANEERS' DEN
 
 [station]
@@ -42,7 +56,23 @@ model=maps/pirate/juggernaut
 location=-768 1280 0
 color=158 0 255
 
-;
+	[ship]
+	label=raider
+
+	[ship]
+	label=juggernaut
+
+	[cargo]
+	label=gold
+	price=1100
+	amount=-1
+
+	[cargo]
+	label=liquor
+	price=450
+	amount=0
+
+; ------------------------------------------------------------------ 
 ; GHANT JUMPGATE
 
 [navpoint]
@@ -60,7 +90,7 @@ color=158 0 255
 location=-1048 256 8
 direction=0
 
-;
+; ------------------------------------------------------------------ 
 ; DOVER JUMPGATE
 
 [navpoint]
@@ -78,7 +108,7 @@ color=158 0 255
 location=1024 -302 0
 direction=300
 
-;
+; ------------------------------------------------------------------ 
 ; ANARA JUMPGATE
 
 [navpoint]
diff --git a/base/ini/zones/antwerp/buccaneers.ini b/base/ini/zones/antwerp/buccaneers.ini
deleted file mode 100644
index 7ff1a10..0000000
--- a/base/ini/zones/antwerp/buccaneers.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; antwerp/buccaneers.ini
-; Buccaneers' Den menus
-
-;
-; ship dealer
-
-[dealer]
-ship=raider
-ship=juggernaut
-
-[ship]
-label=raider
-
-[ship]
-label=juggernaut
-
-[cargo]
-label=gold
-price=1100
diff --git a/base/ini/zones/antwerp/helianthos.ini b/base/ini/zones/antwerp/helianthos.ini
deleted file mode 100644
index 0181940..0000000
--- a/base/ini/zones/antwerp/helianthos.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-;
-; antwerp/helianthos.ini
-; starbase Helianthos menus
-
-;
-; ship dealer
-
-[dealer]
-ship=sharkan
-ship=custodian
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 5cf1949..db5e3e9 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -3,7 +3,7 @@
 ; world description for the Brogha system
 ;
 
-; 
+; ------------------------------------------------------------------ 
 ; ZONE IDENTIFICATION
 
 [zone]
@@ -12,7 +12,7 @@ name=Brogha system
 ; [string] sky texture
 sky=sky21
 
-;
+; ------------------------------------------------------------------ 
 ; STAR
 
 [star]
@@ -26,7 +26,7 @@ color=255 255 255
 ; [float] entity radius (10 game units == 1km ingame)
 radius=90
 
-;
+; ------------------------------------------------------------------ 
 ; PLANET BROGHA
 
 [planet]
@@ -53,6 +53,21 @@ direction=180
 rotationspeed=1
 ; this is a dockable planet
 dock=yes
+info=Planet Brogha is largest exporter of agricultural products in the Independent Colonies.
+
+	[ship]
+	label=vector
+
+	[ship]
+	label=scalar
+
+	[ship]
+	label=matrix
+
+	[cargo]
+	label=liquor
+	price=250
+	amount=-1
 
 [navpoint]
 label=navpoint_solar
@@ -60,7 +75,7 @@ name=Navigation point Solar
 location=-486 0 16
 model=maps/static/navpoint
 
-;
+; ------------------------------------------------------------------ 
 ; CANTOR STATION
 
 [station]
@@ -72,7 +87,26 @@ colorsecond=.5 .4 .4
 direction=-45
 model=maps/colonial/cantor
 
-;
+	[ship]
+	label=vector
+
+	[ship]
+	label=scalar
+
+	[ship]
+	label=pod
+
+	[cargo]
+	label=gold
+	price=1500
+	amount=0
+
+	[cargo]
+	label=liquor
+	price=300
+	amount=0
+
+; ------------------------------------------------------------------ 
 ; GHANT JUMPGATE
 
 [navpoint]
@@ -90,7 +124,7 @@ location=-540 808 128
 direction=270
 color=222 192 145
 
-;
+; ------------------------------------------------------------------ 
 ; EASTEND JUMPGATE
 
 [navpoint]
diff --git a/base/ini/zones/brogha/brogha.ini b/base/ini/zones/brogha/brogha.ini
deleted file mode 100644
index 91b9aaf..0000000
--- a/base/ini/zones/brogha/brogha.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; brogha/brogha.ini
-; Cantor observatory menus
-
-;
-; ship dealer
-
-[dealer]
-ship=vector
-ship=scalar
-ship=matrix
diff --git a/base/ini/zones/brogha/cantor.ini b/base/ini/zones/brogha/cantor.ini
deleted file mode 100644
index 2fcbc95..0000000
--- a/base/ini/zones/brogha/cantor.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-;
-; brogha/cantor.ini
-; Cantor observatory menus
-
-;
-; ship dealer
-
-[dealer]
-ship=vector
-ship=scalar
-ship=pod
-
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index a1c4b49..482f5d9 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -3,7 +3,7 @@
 ; world description for the East End system
 ;
 
-;
+; ------------------------------------------------------------------ 
 ; ZONE IDENTIFICATION
 
 
@@ -17,7 +17,7 @@ name=Navigation point Origin
 location=0 0 0
 model=maps/static/navpoint
 
-;
+; ------------------------------------------------------------------ 
 ; ENSOR STATION
 
 [station]
@@ -31,7 +31,13 @@ model=maps/independent/ensor
 ; this entity is the default zone view
 default = yes
 
-;
+	[ship]
+	label=avenger
+
+	[ship]
+	label=horizon
+
+; ------------------------------------------------------------------ 
 ; DOVER JUMPGATE
 
 [navpoint]
@@ -50,7 +56,7 @@ colorsecond=0.7 0.8 0.95
 location=520 0 0
 direction=270
 
-;
+; ------------------------------------------------------------------ 
 ; BROGHA JUMPGATE
 
 [navpoint]
diff --git a/base/ini/zones/eastend/ensor.ini b/base/ini/zones/eastend/ensor.ini
deleted file mode 100644
index f44d76b..0000000
--- a/base/ini/zones/eastend/ensor.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-;
-; eastend/ensor.ini
-; Ensor station menus
-
-;
-; ship dealer
-
-[dealer]
-ship=avenger
-ship=horizon
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index e3ca7af..27a0ce1 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -99,22 +99,20 @@ info=Alexandria outpost serves as a commercial and entertainment centre for the
 	; always declare the label first
 	label=crates
 	; price this base sells and busy the cargo at
-	price=15
+	price=25
 	; initial amount, -1 means limitless supply, 0 means this base only buys this cargo
 	amount=-1
 
 	[cargo]
 	label=niobium
-	price=190
+	price=200
 	amount=0
 
 	[cargo]
 	label=liquor
-	price=475
+	price=400
 	amount=5
 
-; ------------------------------------------------------------------
-
 [entity]
 label=alexandria_storage1
 name=storage tanks
@@ -151,7 +149,7 @@ colorsecond=160 160 160
 
 	[cargo]
 	label=liquor
-	price=500
+	price=425
 	amount=0
 
 ; ------------------------------------------------------------------
@@ -191,12 +189,12 @@ info=Regula station is the headquarters of the local mining operation.
 
 	[cargo]
 	label=crates
-	price=25
+	price=50
 	amount=0
 
 	[cargo]
 	label=niobium
-	price=150
+	price=125
 	; unlimited
 	amount=-1
 
diff --git a/base/ini/zones/ghant/alexandria.ini b/base/ini/zones/ghant/alexandria.ini
deleted file mode 100644
index ab61e2c..0000000
--- a/base/ini/zones/ghant/alexandria.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-;
-; ghant/alexandria.ini
-; Alexandria outpost trading definitions
-
-;
-; ship dealer
-
-[dealer]
-ship=vector
-ship=pod
-
-;
-; available ship types
-
-[ship]
-label=vector
-
-[ship]
-label=pod
-
-;
-; available cargo types
-
-[cargo]
-; always declare the label first
-label=crates
-price=15
-amount=-1
-
-[cargo]
-label=niobium
-price=190
-amount=0
-
-[cargo]
-label=liquor
-price=475
-amount=5
diff --git a/base/ini/zones/ghant/custodian.ini b/base/ini/zones/ghant/custodian.ini
deleted file mode 100644
index ab6ff03..0000000
--- a/base/ini/zones/ghant/custodian.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-;
-; ghant/custodian.ini
-; battleship Custodian menus
-
-;
-; ship dealer
-
-[dealer]
-ship=sharkan
-
-[ship]
-label=sharkan
-
-[cargo]
-label=liquor
-price=500
-amount=0
diff --git a/base/ini/zones/ghant/regula.ini b/base/ini/zones/ghant/regula.ini
deleted file mode 100644
index d7f5c8a..0000000
--- a/base/ini/zones/ghant/regula.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-;
-; ghant/regula.ini
-; Regula station menus
-
-;
-; ship dealer
-
-[dealer]
-ship=vector
-ship=scalar
-
-[ship]
-label=vector
-
-[ship]
-label=scalar
-
-[cargo]
-label=crates
-price=25
-amount=0
-
-[cargo]
-label=niobium
-price=150
-; unlimited
-amount=-1
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index d6e5e4e..128dbb8 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -1,3 +1,9 @@
+;
+; unkown.ini
+; world description for the Unkown system
+;
+; this is a test area 
+
 [zone]
 name=Unknown system
 
-- 
cgit v1.2.3