6 files changed, 54 insertions, 9 deletions

diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index 6e240dc..9f18ee5 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -114,3 +114,12 @@ info=Terraformers are responsible for modifying the surrounding surface and atmo
 info=The TrueForm terraforming company are accountable for the manufacturing of all terraformers.

 price=1500

 volume=4

+

+

+[cargo]

+label=medicines

+name=Medicines

+info=Medicines are an integral to the success of all known races.

+info=Dwellers of the border worlds still suffer from acute infection rates and will pay highly for medicinal supplies.

+price=225

+volume=1

diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index fdf5fb0..e1b4510 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -88,7 +88,7 @@ template=ship_small
 model=maps/merchant/scalar
 jumpdrive=yes
 
-price=15000
+price=12500
 
 ; technical specifications
 cargo   = 40
@@ -139,7 +139,7 @@ model=maps/miners/cruiser
 jumpdrive=yes
 dock=yes
 
-price=1500000
+price=1000000
 cargo=1000
 
 thrust  = 40
@@ -155,8 +155,8 @@ template=ship_large
 model=maps/miners/freighter
 jumpdrive=no
 
-price=100000
-cargo=160
+price=110000
+cargo=230
 
 thrust  = 7.8
 impulse = 40
@@ -171,8 +171,8 @@ template=ship_small
 model=maps/miners/surveyor
 jumpdrive=no
 
-price=10000
-cargo=5
+price=11500
+cargo=25
 
 thrust  = 1.9
 impulse = 10
@@ -280,7 +280,7 @@ name=Enforcer
 template=ship_medium
 model=maps/mercenary/enforcer
 price=45000
-cargo=25
+cargo=35
 
 thrust=1.6
 impulse=7
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 6d8eec5..5f49c98 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -65,6 +65,12 @@ yaw=45
 pitch=5
 rotationspeed=1.0
 radius=72
+dock=yes
+
+	[cargo]
+	label=water
+	price=5
+	amount=-1
 
 ; ------------------------------------------------------------------ 
 ; BUCCANEERS' DEN
diff --git a/base/ini/zones/caledonia.ini b/base/ini/zones/caledonia.ini
index 8c75d9a..324b003 100644
--- a/base/ini/zones/caledonia.ini
+++ b/base/ini/zones/caledonia.ini
@@ -57,3 +57,13 @@ target=karelia:jumppoint_caledonia
 color=0.5 0.1 0.1
 location=-524 0 32
 yaw=0
+
+; ------------------------------------------------------------------ 
+; FINNMARK JUMPGATE
+
+[jumpgate]
+label=jumpgate_finnmark
+target=finnmark:jumpgate_caledonia
+faction=lindblade
+location=-612 532 0
+yaw=-30
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index 59cec87..920dc4f 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -132,13 +132,18 @@ name=Jumpgate Finnmark -> Kronenbaden
 location=-584 896 0
 model=maps/colonial/jumpgate
 yaw=0
-faction=colonies
+faction=miners
+
+[jumppoint]
+label=jumppoint_kronenbaden
+target=kronenbaden:jumppoint_finnmark
+location=-570 896 0
 
 [station]
 label=jumpgate_construction
 name=Jumpgate Construction
 model=maps/colonial/regula
-faction=colonies
+faction=miners
 location=-572 902 0
 yaw=0
 
@@ -151,3 +156,13 @@ yaw=0
 	label=water
 	price=20
 	amount=0
+
+; ------------------------------------------------------------------ 
+; CALEDONIA JUMPGATE
+
+[jumpgate]
+label=jumpgate_caledonia
+target=caledonia:jumpgate_finnmark
+location=556 -960 -32
+yaw=120
+faction=miners
diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini
index 1aa492a..cdd2aab 100644
--- a/base/ini/zones/kronenbaden.ini
+++ b/base/ini/zones/kronenbaden.ini
@@ -82,6 +82,11 @@ model=maps/colonial/jumpgate
 yaw=180
 faction=colonies
 
+[jumppoint]
+label=jumppoint_finnmark
+target=finnmark:jumppoint_kronenbaden
+location=1365 356 8
+
 [station]
 label=jumpgate_construction
 name=Jumpgate Construction Site