trading definition updates for kiana and lindblade by thorn, trading definitions update for anara

8 files changed, 45 insertions, 54 deletions

diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index 51ec2d5..04f6d11 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -30,8 +30,23 @@ location=128 768 32
 color=106 95 87
 colorsecond=152 166 169
 
+	[ship]
+	label=avenger
+
+	[ship]
+	label=shootingstar
+
+	[ship]
+	label=jupiter
+
+	[cargo]
+	label=liquor
+	price=500
+	amount=0
+
 ;
 ; this is the line of navpoints for leading ships through anara's gas clouds
+
 [navpoint]
 label=navpoint_path01
 name=Safety Buoy
diff --git a/base/ini/zones/anara/galileo_outpost.ini b/base/ini/zones/anara/galileo_outpost.ini
deleted file mode 100644
index adb7f8d..0000000
--- a/base/ini/zones/anara/galileo_outpost.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; anara/galileo_outpost.ini
-; Galileo Outpost menus
-
-;
-; ship dealer
-
-[dealer]
-ship=avenger
-ship=shootingstar
-ship=jupiter
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index 468919f..52415b5 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -52,6 +52,12 @@ default=yes
 color=127 26 127
 colorsecond=0 0 0
 
+	[ship]
+	label=imp
+
+	[ship]
+	label=ravager
+
 [planet]
 label=tsukhan_generator
 name=M-L13
@@ -198,3 +204,12 @@ location=256 16 16
 model=maps/tsukhan/ravager
 color=127 26 127
 colorsecond=0 0 0
+
+	[ship]
+	label=imp
+
+	[ship]
+	label=inquisitor
+
+	[ship]
+	label=obliterator
diff --git a/base/ini/zones/kiana/battleship_kt98.ini b/base/ini/zones/kiana/battleship_kt98.ini
deleted file mode 100644
index c7c28c3..0000000
--- a/base/ini/zones/kiana/battleship_kt98.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; kiana/battleship_kt98.ini
-; Battleship K-T98 menus
-
-;
-; ship dealer
-
-[dealer]
-ship=imp
-ship=inquisitor
-ship=obliterator
diff --git a/base/ini/zones/kiana/tsukhan_central.ini b/base/ini/zones/kiana/tsukhan_central.ini
deleted file mode 100644
index 69750c8..0000000
--- a/base/ini/zones/kiana/tsukhan_central.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-;
-; kiana/tsukhan_central.ini
-; Tsu-Khan Central menus
-
-;
-; ship dealer
-
-[dealer]
-ship=imp
-ship=ravager
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 2215f40..25db9f1 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -57,6 +57,18 @@ color=0.5 0.1 0.1
 direction=250
 pitch=0
 
+	[ship]
+	label=halcyon
+
+	[ship]
+	label=avatar
+
+	[cargo]
+	label=gold
+	price=1500
+	amount=0
+
+
 ;
 ; STATION 15
 [station]
@@ -67,6 +79,9 @@ color=0.5 0.1 0.1
 location=-292 -68 8
 direction=315
 
+	[ship]
+	label=supertanker
+
 [navpoint]
 label=navpoint_15
 name=Navigation point 15
diff --git a/base/ini/zones/lindblade/lindblade_central.ini b/base/ini/zones/lindblade/lindblade_central.ini
deleted file mode 100644
index 0d11373..0000000
--- a/base/ini/zones/lindblade/lindblade_central.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; lindblade/lindblade_central.ini
-; Lindblade Central menus
-
-;
-; ship dealer
-
-[dealer]
-ship=halcyon
-ship=avatar
-
diff --git a/base/ini/zones/lindblade/station15.ini b/base/ini/zones/lindblade/station15.ini
deleted file mode 100644
index b19e340..0000000
--- a/base/ini/zones/lindblade/station15.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; lindblade/station15.ini
-; Station 15 menus
-
-;
-; ship dealer
-
-[dealer]
-ship=supertanker
-
-