X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fsource-info.txt;h=e160fcbad6631d004b6f9845ca30121b095738ee;hb=HEAD;hp=fdd5125739959c0341fe82289c35417bd0a0d318;hpb=d4025d3e358f2e8327de882e6ca8ac31c5180327;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index fdd5125..e160fcb 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -45,6 +45,19 @@ commodclasses
  *enamel
  *forageables
 
+# Commodities are defined in `commods` sections
+# Each line is
+#  <name> <facts>
+# and the <facts> can be
+#  <mass>kg
+#  <volume>l
+#  *<class> (see commodclasses, above)
+#  @<sort-number>    sort order value, for where in the commods list it goes
+#  @<sort-number>+   sort order value; 10x line number is added
+# The <name> can contain `%<reference>` which is then defined in
+# a `%<reference>` section.
+# Volume defaults to 1l.
+
 commods
  kraken's blood		1kg		*dye			@105
  %d dye			1kg		*dye			@0
@@ -143,14 +156,17 @@ commods
  lapis lazuli							@200000+
  quartz								@200000+
  tigereye							@200000+
+ topaz								@200000+
 
 commods
  swill			1kg		*ship_supplies		@0+
  grog			1kg		*ship_supplies		@0+
  fine rum		1kg		*ship_supplies		@0+
+ rum spice		800g		*ship_supplies		@0+
  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+
@@ -167,6 +183,7 @@ commods
  lily of the valley	300g		*herbs			@0+
  nettle			300g		*herbs			@0+
  butterfly weed		100g		*herbs			@0+
+ allspice		800g		*herbs			@0+
 
  bananas		125kg 100l	*forageables		@300000+
  carambolas		125kg 100l	*forageables		@300000+
@@ -199,6 +216,7 @@ 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
@@ -210,45 +228,20 @@ client jpctb greenend
 #---------- OCEANS ----------
 # subscriber oceans
 
-ocean Midnight
-
-ocean Cobalt
- Garnet
-  Jubilee Island
-
 ocean Cerulean
  Garnet
   Jubilee Island
 
-ocean Ice
- Vilya
-  Winking Wall Island
-
 # doubloon oceans
 
-ocean Hunter
- Eagle
-  Ix Chel
-  Manu Island
-
 ocean Emerald
  Crab
   The Beaufort Islands
  Osprey
   Scurvy Reef
   Gauntlet Island
-
-ocean Malachite
- Draco
-  Cetus Island
-  Threewood Island
-
-ocean Sage
- Osprey
-  Scurvy Reef
-  Gauntlet Island
-
-ocean Viridian
+ Pleiades
+  Morgana Island
 
 ocean Meridian
  Draco
@@ -260,10 +253,6 @@ ocean Meridian
  Komodo
   Buyan's Vortice
 
-# family oceans
-
-ocean Crimson
-
 # International oceans (doubloon oceans)
 
 #ocean Jade
@@ -278,3 +267,15 @@ ocean Crimson
 # Canis
 #  Atchafalaya-Insel
 
+# Test ocean
+
+ocean Ice
+ Vilya
+  Winking Wall Island
+
+ocean Obsidian
+ Ye Bloody Bounding Main
+  Loggerhead Island
+  Melanaster Island
+  Picklepine Ridge
+  Woodtick Island