4 files changed, 113 insertions, 58 deletions
diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index dc149c7..45aa5e0 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -4,6 +4,7 @@
 ; global cargo type definitions
 ; This file describes all types of cargo that can be traded.
 ;
+
 [cargo]
 label=crates
 name=Crates
@@ -16,18 +17,46 @@ volume=1
 info=A popular container used to store cargo during transport.
 
 [cargo]
+label=crystals
+name=Crystals
+volume=1
+info=A base component in optronic processing, anisotropic crystals are used to refract and focus the photon quantums and act as transistors in optronic circuits.
+
+[cargo]
+label=carbosteel
+name=Carbosteel
+volume=1
+info=The result of a metallurgic process to reinforce durasteel with carbon nano-fibres, carbosteel is a lightweight yet durable alloy capable of surviving exposure to extreme conditions.
+info=It does not oxidize like regular durasteel and is widely used for anything from self-sealing stem bolts to ship hulls.
+
+[cargo]
+label=diamonds
+name=Diamonds
+volume=1
+info=Diamonds are a girl's best friend forever.
+
+[cargo]
 label=gold
 name=Gold
 model=models/cargo/gold/gold
 ; default price
 price=300
 volume=1
-info=Since the beginning of recorded history, gold has been a highly sought-after precious metal. Used for coinage, jewelry and a host of industrial applications, gold can be sold almost everywhere at attractive prices.
+info=Since the beginning of recorded history, gold has been a highly sought-after precious metal. 
+info=With wealthy customers like banks, jewellers and the high-tech industry, gold trade is usually a lucrative endeavour.
+
+[cargo]
+label=iron
+name=Iron
+info=As by-product of stellar fusion, iron is one of the more common elements in the universe.
+info=Its weight and vulnerability to oxidation makes it less suitable as construction material, but it is used in the production of stronger alloys like carbosteel.
+price=100
 
 [cargo]
 label=liquor
 name=Liquor
-info=Flavoured ethanol-containing liquids in funky colours.
+info=Although no longer the cheap means of intoxication it used to be, drinkable liquids containing ethanol exist for anyone's budget.
+info=From cheap distilled potatoes, to fine fermented highland grains, each with its own particular taste and hangover.
 ; default price
 price=50
 volume=1
@@ -36,8 +65,25 @@ volume=1
 label=niobium
 name=Niobium
 model=models/cargo/niobium
-info=This soft, grey metal is commonly used in superconducting alloys and optronics. While it is easy to process and refine, rich deposits are rare which makes it a valuable commodity.
+info=This soft, grey metal is commonly used in superconducting alloys and optronic components.
+info=While it is easy to process and refine, rich deposits are rare making it a valuable commodity.
 ; default price
 price=150
 volume=1
 
+[cargo]
+label=optronics
+name=Optronic compononents
+info=Most computing systems today operate on AMTEL Technology Conglomerate's optronic components.
+info=The AMTEL scalable quantum processors are capable of delivering massive amounts of parallel processing power, suitable for every budget and application.
+price=400
+volume = 1
+
+[cargo]
+label=superconductors
+name=Superconductors
+info=Many high-tech components require superconductors to be manufactured. 
+info=Hyperdrives, anti-gravity generators and most home appliances require the unique electro-magnetic properties of these useful materials.
+; default price
+price=250
+volume=1
diff --git a/base/ini/ships.ini b/base/ini/ships.ini
index e077b12..462680d 100644
--- a/base/ini/ships.ini
+++ b/base/ini/ships.ini
@@ -91,35 +91,36 @@ roll    = 15
 info=The unprecedented success of the Vector had stimulated the market for cheap transport vessels and prompted Micron Corporations to develop the larger Matrix, with an increased cargo hold at the cost of speed and maneuverability.
 
 ; ------------------------------------------------------------------ ;
-;		MERCENARY
+; 		JOINT MINERS ASSOCIATION
 ; ------------------------------------------------------------------ ;
 
 [ship]
-label=pod
-name=P.O.D.
-model=maps/mercenary/pod
+label=miningcruiser
+name=Mining Cruiser
+model=maps/miners/cruiser
+jumpdrive=yes
+dock=yes
 
-price=15000
+price=1500000
 
-; technical specifications
-cargo   = 10
-mass    = 15
-thrust  = 1.4
-impulse = 6
-strafe  = 0.15
-turn    = 12
-roll    = 5
+cargo=1000
 
-; info
-info=The P.O.D. was originally designed as a racing vehicle, but the sturdy design placed it at a considerable weight disadvantage against its competitors. The ship fell out of grace on the race circuit, but was picked up by scouts and couriers in need for a small and fast vessel.
-info=
-info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
+[ship]
+label=miningfreighter
+name=Mining Freighter
+model=maps/miners/freighter
+jumpdrive=no
+
+price=100000
+
+cargo=160
 
 
 [ship]
 label=archer
 name=Archer
 model=maps/mercenary/archer
+jumpdrive=no
 
 price=20000
 
@@ -131,13 +132,13 @@ strafe=0.15
 turn=3
 
 info=The Archer was considered to be leap in technology by the Joint Miners Association, allowing for rapid exploration of mineral deposits. Featuring high maneuverability the Archer was capable of outrunning any threat, while having enough cargo-space to return with mineral samples.
-info=
-info=Unfortunately, the Archer was not equipped with adequately ranged sensors. As a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the range since.
+info=Unfortunately, the design revealed several sensor blind spots and as a result, it became vulnerable to pirate ambushes. The Joint Miners Association has been seeking to outplace the sensor range since.
 
 [ship]
 label=longbow
 name=Longbow
 model=maps/mercenary/longbow
+jumpdrive=no
 
 price=45000
 
@@ -148,7 +149,31 @@ impulse=6
 strafe=0.15
 turn=3
 
-info=The replacement for the Archer scout ship. After the first costly mistake, the Joint Miners Association decided to outsource development to a trusted third-party contractor. As a result, the flaws in the ship design were fixed.
+info=The replacement for the Archer scout ship. After the first costly mistake, the Joint Miners Association decided to outsource development to a trusted third-party contractor. As a result, the flaws in the ship design were corrected.
+
+; ------------------------------------------------------------------ ;
+;		MERCENARY
+; ------------------------------------------------------------------ ;
+
+[ship]
+label=pod
+name=P.O.D.
+model=maps/mercenary/pod
+
+price=15000
+
+; technical specifications
+cargo   = 10
+mass    = 15
+thrust  = 1.4
+impulse = 6
+strafe  = 0.15
+turn    = 12
+roll    = 5
+
+; info
+info=The P.O.D. was originally designed as a racing vehicle, but the sturdy design placed it at a considerable weight disadvantage against its competitors. The ship fell out of grace on the race circuit, but was picked up by scouts and couriers in need for a small and fast vessel.
+info=Although only lightly armed, this fast and nimble ship is perfectly capable of evading most blockades.
 
 [ship]
 label=talon
@@ -480,32 +505,6 @@ info=The pirate Juggernaut is a flying fortress designed to serve as support car
 info=The Juggernaut has a lower turning speed compared to other capital ships. However, it has a large array of guns, allowing for a deadly assault when in position.
 
 ; ------------------------------------------------------------------ ;
-; 		MINERS
-; ------------------------------------------------------------------ ;
-
-
-[ship]
-label=miningcruiser
-name=Mining Cruiser
-model=maps/miners/cruiser
-jumpdrive=yes
-dock=yes
-
-price=800000
-
-cargo=1000
-
-[ship]
-label=miningfreighter
-name=Mining Freighter
-model=maps/miners/freighter
-jumpdrive=no
-
-price=100000
-
-cargo=160
-
-; ------------------------------------------------------------------ ;
 ; 		NO FACTION or DERELICT
 ; ------------------------------------------------------------------ ;
 
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 63ef82f..8ca30f7 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -112,7 +112,7 @@ model=maps/colonial/cantor
 [navpoint]
 label=navpoint_west
 name=Navigation point West
-location=-540 840 128
+location=-440 840 128
 model=maps/static/navpoint
 
 [jumpgate]
@@ -120,7 +120,7 @@ label=jumpgate_ghant
 name=Jumpgate Brogha -> Ghant
 model=maps/colonial/jumpgate
 target=ghant:jumpgate_brogha
-location=-540 808 128
+location=-440 808 128
 direction=270
 color=222 192 145
 
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index dccdb16..2bbac9a 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -37,15 +37,24 @@ color=1.0 1.0 1.0
 location=128 64 0
 radius=70
 dock=yes
+info=As final act in a series of trade wars, the Headquarters of the Joint Miners Asssociation was founded conveniently outside the jurisdiction and taxation of the colonies and the central planets.
+info=Nobody objected when the miners colonized this inhospitable frozen world and they tend to keep good relations with their customers. They're also prepared and capable to defend their interests when necessary.
 
 	[ship]
-	label=talon
+	label=archer
 
 	[ship]
-	label=enforcer
+	label=longbow
 
 	[ship]
-	label=betelgeuse
+	label=miningcruiser
+
+	[ship]
+	label=miningfreighter
+
+	[cargo]
+	label=iron
+	price=50
 
 	[cargo]
 	label=liquor
@@ -62,7 +71,7 @@ dock=yes
 [navpoint]
 label=navpoint_east
 name=Navigation Point East
-location=-68 -500 0
+location=-96 -560 0
 model=maps/static/navpoint
 
 [jumpgate]
@@ -70,7 +79,7 @@ label=jumpgate_antwerp
 name=Jumpgate Finnmark -> Antwerp
 model=maps/colonial/jumpgate
 target=antwerp:jumpgate_finnmark
-location=-96 -524 0
+location=-96 -576 4
 direction=95
 color=106 95 87
 colorsecond=152 166 169
@@ -82,12 +91,13 @@ info=Jumpgate to the Antwerp system.
 [navpoint]
 label=navpoint_north
 name=Navigation Point North
-location=-68 -500 0
+location=616 512 0
 model=maps/static/navpoint
 
 [jumppoint]
 label=jumppoint_karelia
 target=karelia:jumppoint_finnmark
 name=Jumppoint Finnmark -> Karelia
+location=624 512 8
 info=Jumppoint to the Karelia system.
-location=512 512 0
+