X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fsource-info.txt;h=eb3e7d2c26926f1747f62dee2f9d0a62f149323f;hb=8c4b9a2fd6ebad42b3b3a5a13c671aade14c1f03;hp=effc2213bc04968d7b6e559d93715397cedb6ccc;hpb=b14effcf3ea7900eb4198f6e50112da751f29add;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index effc221..eb3e7d2 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -8,6 +8,8 @@ vessels
  |----------------+--------+-------+-------|
  |Dhow            |medium  |20,250 |13,500 |
  |----------------+--------+-------+-------|
+ |Fanchuan        |large   |20,250 |13,500 |
+ |----------------+--------+-------+-------|
  |Longship        |small   |20,250 |13,500 |
  |----------------+--------+-------+-------|
  |Baghlah         |medium  |27,000 |18,000 |
@@ -120,15 +122,15 @@ commods
  persimmon							@200000+
 
 commods
- %g gems		10kg		*forageables		@0
- diamonds		10kg		*forageables		@200000+
- emeralds		10kg		*forageables		@200000+
- moonstones		10kg		*forageables		@200000+
- opals			10kg		*forageables		@200000+
- pearls			10kg		*forageables		@200000+
- rubies			10kg		*forageables		@200000+
- sapphires		10kg		*forageables		@200000+
- topazes		10kg		*forageables		@200000+
+ %g gems		10kg	!g	*forageables		@0
+ diamonds		10kg	!g	*forageables		@200000+
+ emeralds		10kg	!g	*forageables		@200000+
+ moonstones		10kg	!g	*forageables		@200000+
+ opals			10kg	!g	*forageables		@200000+
+ pearls			10kg	!g	*forageables		@200000+
+ rubies			10kg	!g	*forageables		@200000+
+ sapphires		10kg	!g	*forageables		@200000+
+ topazes		10kg	!g	*forageables		@200000+
 
 %g
  amber								@200000+
@@ -141,6 +143,7 @@ commods
  lapis lazuli							@200000+
  quartz								@200000+
  tigereye							@200000+
+ topaz								@200000+
 
 commods
  swill			1kg		*ship_supplies		@0+
@@ -149,6 +152,7 @@ commods
  small cannon balls	7100g		*ship_supplies		@0+
  medium cannon balls	14200g 2l	*ship_supplies		@0+
  large cannon balls	21300g 3l	*ship_supplies		@0+
+ lifeboats		25kg 100l	*ship_supplies		@0+
 
  madder			400g		*herbs			@0+
  old man's beard	800g		*herbs			@0+
@@ -197,49 +201,42 @@ commods
  hemp oil		1kg		*basic_commodities	@160
  varnish		1kg		*basic_commodities	@180
  lacquer		1kg		*basic_commodities	@190
+ kraken's ink		100g 1l		*basic_commodities	@200
 
 
 client ypp-sc-tools yarrg
  lastpage
 
 client jpctb greenend
-
+ bug-094
 
 #---------- OCEANS ----------
 # subscriber oceans
 
-ocean Midnight
-
-ocean Cobalt
+ocean Cerulean
  Garnet
   Jubilee Island
 
-ocean Ice
- Vilya
-  Winking Wall Island
-
 # doubloon oceans
 
-ocean Hunter
- Eagle
-  Ix Chel
-  Manu Island
-
-ocean Malachite
- Draco
-  Cetus Island
-  Threewood Island
-
-ocean Sage
+ocean Emerald
+ Crab
+  The Beaufort Islands
  Osprey
   Scurvy Reef
   Gauntlet Island
+ Pleiades
+  Morgana Island
 
-ocean Viridian
-
-# family oceans
-
-ocean Crimson
+ocean Meridian
+ Draco
+  Cetus Island
+  Threewood Island
+  Wyvern Island
+ Basilisk
+  Zechstein Island
+ Komodo
+  Buyan's Vortice
 
 # International oceans (doubloon oceans)
 
@@ -255,3 +252,10 @@ ocean Crimson
 # Canis
 #  Atchafalaya-Insel
 
+# Test ocean
+
+ocean Ice
+ Vilya
+  Winking Wall Island
+
+ocean Obsidian