Merge remote-tracking branch 'mason/master'

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

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index fe66847f1dfadd38f9b81e43975758770501d482..7a6c21ce633cfcb64670f996226ae2b5c682479a 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 |
@@ -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+
@@ -202,42 +205,36 @@ commods
 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 +250,8 @@ ocean Crimson
 # Canis
 #  Atchafalaya-Insel
 
+# Test ocean
+
+ocean Ice
+ Vilya
+  Winking Wall Island