From 9c42af211c1a61a997ae6865cd23ae4f8c5f8f95 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 19 Sep 2010 19:46:35 +0000
Subject: trade and cargo updates

---
 base/ini/cargo.ini                    | 30 +++++++++++++++++++++++-------
 base/ini/menu.ini                     |  8 ++++----
 base/ini/zones/antwerp/buccaneers.ini |  9 +++++++++
 base/ini/zones/ghant/alexandria.ini   |  6 ++++++
 4 files changed, 42 insertions(+), 11 deletions(-)

(limited to 'base/ini')

diff --git a/base/ini/cargo.ini b/base/ini/cargo.ini
index fc5b3d0..dc149c7 100644
--- a/base/ini/cargo.ini
+++ b/base/ini/cargo.ini
@@ -7,21 +7,37 @@
 [cargo]
 label=crates
 name=Crates
-info=A popular container used to store cargo during transport.
-model=maps/cargo/crate_bs
+model=maps/cargo/crate
 ; default price
 price=20
+; volume per unit, in cubic meters
+volume=1
+; information
+info=A popular container used to store cargo during transport.
 
 [cargo]
-label=niobium
-name=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.
+label=gold
+name=Gold
+model=models/cargo/gold/gold
 ; default price
-price=150
+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.
 
 [cargo]
 label=liquor
 name=Liquor
 info=Flavoured ethanol-containing liquids in funky colours.
 ; default price
-price=50
\ No newline at end of file
+price=50
+volume=1
+
+[cargo]
+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.
+; default price
+price=150
+volume=1
+
diff --git a/base/ini/menu.ini b/base/ini/menu.ini
index 7e1457f..221a0eb 100644
--- a/base/ini/menu.ini
+++ b/base/ini/menu.ini
@@ -10,7 +10,7 @@
 [menu]
 label=main
 ; background bitmap
-background=banner
+background=bitmaps/banner
 
 [label]
 text=Main Menu
@@ -37,7 +37,7 @@ command=quit
 
 [menu]
 label=options
-background=banner
+background=bitmaps/banner
 
 [label]
 text=Options
@@ -78,7 +78,7 @@ align=center
 
 [menu] 
 label=game
-background=banner
+background=bitmaps/banner
 
 [label]
 text=Main Menu
@@ -105,7 +105,7 @@ command=menu hide
 
 [menu]
 label=join
-background=banner
+background=bitmaps/banner
 
 [label]
 text=Project::OSiRiON
diff --git a/base/ini/zones/antwerp/buccaneers.ini b/base/ini/zones/antwerp/buccaneers.ini
index 9f867ed..7ff1a10 100644
--- a/base/ini/zones/antwerp/buccaneers.ini
+++ b/base/ini/zones/antwerp/buccaneers.ini
@@ -9,3 +9,12 @@
 ship=raider
 ship=juggernaut
 
+[ship]
+label=raider
+
+[ship]
+label=juggernaut
+
+[cargo]
+label=gold
+price=1100
diff --git a/base/ini/zones/ghant/alexandria.ini b/base/ini/zones/ghant/alexandria.ini
index 72db703..93231c6 100644
--- a/base/ini/zones/ghant/alexandria.ini
+++ b/base/ini/zones/ghant/alexandria.ini
@@ -22,9 +22,15 @@ label=pod
 ; available cargo types
 
 [cargo]
+; always declare the label first
 label=crates
 price=20
 
 [cargo]
 label=niobium
 price=250
+
+[cargo]
+label=liquor
+price=300
+
-- 
cgit v1.2.3