Normalise commodity name case (from uploads)

[ypp-sc-tools.db-test.git] / yarrg / source-info.txt

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index fe66847f1dfadd38f9b81e43975758770501d482..e160fcbad6631d004b6f9845ca30121b095738ee 100644 (file)
--- 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 |
@@ -43,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
@@ -120,15 +135,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,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+
@@ -165,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+
@@ -197,47 +216,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)
 
@@ -253,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