6 files changed, 106 insertions, 49 deletions
diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index 2b8a8e7..4589575 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -3,8 +3,8 @@
 ;
 ; global cargo type definitions
 ; This file describes all types of cargo that can be traded.
-; The price key sets the default price at which the cargo 
-; is bought by stations.
+;
+; The price key sets the default buy price at which the cargo is bought by stations.
 ;
 
 [cargo]
@@ -109,7 +109,7 @@ name=Water
 info=Also known as Dihydrogenoxide, water is a chemical substance required by all humanoid life.
 info=The rarity of planets abundant in fresh water invokes the requirement for water-synthesis.
 info=The majority of used water is recycled, however remote colonies and stations will pay a high price for fresh supplies.
-price=5
+price=10
 volume=1
 
 [cargo]
@@ -126,5 +126,5 @@ label=medicines
 name=Medicines
 model=models/cargo/medicines/medicines
 info=Medicines are an integral component of a long life and good health. Due to supply problems and the lack of nearby medical facilities, remote locations will pay highly for medicinal supplies.
-price=225
+price=250
 volume=1
diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
index 8dc4703..23aa798 100644
--- a/base/ini/zones/albion.ini
+++ b/base/ini/zones/albion.ini
@@ -37,23 +37,16 @@ yaw=140
 info=Planet Albion is the home of the Albion University.
 
 	[cargo]
-	label=medicines
-	price=200
-	amount=-1
-
-	[cargo]
 	label=water
 	price=5
 	amount=-1
 
 	[cargo]
 	label=gold
-	price=1250
 	amount=0
 
 	[cargo]
 	label=diamonds
-	price=2250
 	amount=0
 
 ; ------------------------------------------------------------------
@@ -61,19 +54,18 @@ info=Planet Albion is the home of the Albion University.
 
 [station]
 label=brisbane
-name=Brisbane station
+name=Brisbane medical research
 model=maps/lindblade/station15
 faction=lindblade
 location=-355 110 10
 radius=8
 yaw=30
 
-	[cargo]
-	label=iron
-	
-	[cargo]
-	label=carbosteel
-	
+[cargo]
+	label=medicines
+	price=200
+	amount=-1
+
 ; ------------------------------------------------------------------ 
 ; LINDBLADE JUMPGATE
 
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 8c449d4..fb48920 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -67,9 +67,6 @@ info=Planet Brogha is the largest exporter of agricultural products in the Indep
 	[ship]
 	label=scalar
 
-	[ship]
-	label=matrix
-
 	[cargo]
 	label=liquor
 	price=250
@@ -77,12 +74,20 @@ info=Planet Brogha is the largest exporter of agricultural products in the Indep
 
 	[cargo]
 	label=water
-	price=4
 	amount=-1
 
 	[cargo]
 	label=gold
-	price=1250
+	; default price
+	;price=
+	; no initial supply
+	amount=0
+	
+	[cargo]
+	label=diamonds
+	; default price
+	;price=
+	; no initial supply
 	amount=0
 	
 	; weapon trade definitions
@@ -104,24 +109,16 @@ name=Navigation point Solar
 location=-486 0 16
 
 ; ------------------------------------------------------------------ 
-; CANTOR STATION
+; CANTOR OBSERVATORY
 
 [station]
 label=cantor
 name=Cantor observatory
 model=maps/colonial/cantor
-faction=colonies
+faction=research
 location=-512 0 32
 yaw=-45
 
-	[ship]
-	label=pod
-
-	[cargo]
-	label=gold
-	price=1500
-	amount=0
-
 	[cargo]
 	label=liquor
 	price=300
@@ -131,6 +128,11 @@ yaw=-45
 	label=water
 	price=10
 	amount=0
+	
+	[cargo]
+	label=medicines
+	price=290
+	amount=0
 
 ; ------------------------------------------------------------------ 
 ; GHANT JUMPGATE
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 8949cab..a858865 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -81,14 +81,35 @@ info=fiscal climate of the Independent Colonies.
 	amount=0
 
 	[cargo]
+	label=iron
+	; default price
+	;price=
+	; no initial supply
+	amount=0
+
+	[cargo]
+	label=carbosteel
+	; default price
+	;price=
+	; no initial supply
+	amount=0
+	
+	[cargo]
+	label=optronics
+	; default price
+	;price=
+	; no initial supply
+	amount=0
+	
+	[cargo]
 	label=water
-	price=8
 	amount=-1
 
 	[cargo]
 	label=gold
-	price=1250
-	amount=0
+
+	[cargo]
+	label=diamonds
 
 	; available ship types
 	[ship]
@@ -99,9 +120,17 @@ info=fiscal climate of the Independent Colonies.
 	
 	; weapon trade definitions
 	[weapon]
+	label=mine_dumb
+	amount=-1
+	
+	[weapon]
 	label=laser1
 	amount=-1
 
+	[weapon]
+	label=laser2
+	amount=-1
+	
 ; ------------------------------------------------------------------
 ; ALEXANDRIA OUTPOST
 
@@ -131,6 +160,7 @@ info=Because of its remote location, it is also a popular transit zone for more
 	label=vector
 
 	; available cargo types
+	
 	[cargo]
 	; always declare the label first
 	label=crates
@@ -153,14 +183,8 @@ info=Because of its remote location, it is also a popular transit zone for more
 	amount=0
 
 	[cargo]
-	label=iron
-	price=150
-	; no initial supply
-	amount=0
-
-	[cargo]
-	label=carbosteel
-	price=500
+	label=medicines
+	price=275
 	; no initial supply
 	amount=0
 
diff --git a/base/ini/zones/khorsand.ini b/base/ini/zones/khorsand.ini
index e4fa363..b4f81a6 100644
--- a/base/ini/zones/khorsand.ini
+++ b/base/ini/zones/khorsand.ini
@@ -72,9 +72,6 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 	[ship]
 	label=vector
 
-	[ship]
-	label=scalar
-
 	[cargo]
 	label=crates
 	price=45
@@ -99,6 +96,10 @@ info=Kerman refinery is the largest niobium processing facility in the Independe
 	label=superconductors
 	price=250
 	amount=-1
+	
+	[weapon]
+	label=laser1
+	amount=-1
 
 [entity]
 label=kerman_storage1
diff --git a/base/ini/zones/warsaw.ini b/base/ini/zones/warsaw.ini
index 76b5a50..ca546f6 100644
--- a/base/ini/zones/warsaw.ini
+++ b/base/ini/zones/warsaw.ini
@@ -70,14 +70,39 @@ dock=yes
 ; [string] globe texture name
 texture=planets/warsaw
 
+info=As the corporate headquarters of Micron Corporation, spaceship components are in high demand on planet Warsaw.
+
+	[cargo]
+	label=water
+	price=5
+	amount=-1
+	
+	[cargo]
+	label=crates
+	price=30
+	amount=-1
+	
 	[cargo]
 	label=gold
-	price=1250
 	amount=0
 	
 	[cargo]
+	label=diamonds
+	amount=0
+
+	[cargo]
 	label=superconductors
-	price=350
+	price=310
+	amount=0
+	
+	[cargo]
+	label=optronics
+	price=500
+	amount=0
+	
+	[cargo]
+	label=carbosteel
+	price=325
 	amount=0
 
 	; available ship types
@@ -89,3 +114,16 @@ texture=planets/warsaw
 
 	[ship]
 	label=matrix
+	
+		; weapon trade definitions
+	[weapon]
+	label=mine_dumb
+	amount=-1
+	
+	[weapon]
+	label=laser1
+	amount=-1
+	
+	[weapon]
+	label=laser2
+	amount=-1