chiark / gitweb /
Merge branch 'ceb'
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 15 Nov 2009 18:33:55 +0000 (18:33 +0000)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 15 Nov 2009 18:33:55 +0000 (18:33 +0000)
1  2 
yarrg/source-info.txt

diff --combined yarrg/source-info.txt
index 593924d45411aed42ddca167c7be169838725b60,fe66847f1dfadd38f9b81e43975758770501d482..effc2213bc04968d7b6e559d93715397cedb6ccc
@@@ -62,9 -62,32 +62,32 @@@ commod
   navy
  
  %enamel
-  %c                                                           @0
+  %enamelc                                                     @0
+  %newc                                                                @10000
  
  %c
+  %oldc                                                                @0
+  %newc                                                                @10000
+ # enamel colours are in a different order to everything else
+ %enamelc
+  red                                                          @100000+
+  orange                                                               @100000+
+  yellow                                                               @100000+
+  green                                                                @100000+
+  blue                                                         @100000+
+  purple                                                               @100000+
+  white                                                                @100000+
+  black                                                                @100000+
+  tan                                                          @100000+
+  grey                                                         @100000+
+  pink                                                         @100000+
+  violet                                                               @100000+
+  navy                                                         @100000+
+  aqua                                                         @100000+
+  lime                                                         @100000+
+ %oldc
   red                                                          @100000+
   tan                                                          @100000+
   white                                                                @100000+
   lime                                                         @100000+
   green                                                                @100000+
   orange                                                               @100000+
-  aqua                                                         @100000+
-  lime                                                         @100000+
-  green                                                                @100000+
-  orange                                                               @100000+
+ %newc
   maroon                                                               @100000+
   brown                                                                @100000+
   gold                                                         @100000+
   lavender                                                     @100000+
   mint                                                         @100000+
   light green                                                  @100000+
+ # the following come after sailcloth in the cloth list, hence the higher number:
   magenta                                                      @200000+
   lemon                                                                @200000+
   peach                                                                @200000+
@@@ -128,49 -150,48 +150,48 @@@ commod
   medium cannon balls  14200g 2l       *ship_supplies          @0+
   large cannon balls   21300g 3l       *ship_supplies          @0+
  
-  broom flower         200g            *herbs
-  butterfly weed               100g            *herbs
-  cowslip              700g            *herbs
-  elderberries         700g            *herbs
-  indigo                       700g            *herbs
-  iris root            300g            *herbs
-  lily of the valley   300g            *herbs
-  lobelia              200g            *herbs
-  madder                       400g            *herbs
-  nettle                       300g            *herbs
-  old man's beard      800g            *herbs
-  pokeweed berries     300g            *herbs
-  sassafras            500g            *herbs
-  weld                 300g            *herbs
-  yarrow                       200g            *herbs
-  bananas              125kg 100l      *forageables
-  coconuts             125kg 100l      *forageables
-  limes                        125kg 100l      *forageables
-  mangos                       125kg 100l      *forageables
-  pineapples           125kg 100l      *forageables
-  carambolas           125kg 100l      *forageables
-  durians              125kg 100l      *forageables
-  passion fruit                125kg 100l      *forageables
-  pomegranates         125kg 100l      *forageables
-  rambutan             125kg 100l      *forageables
-  chalcocite           5700g           *minerals
-  cubanite             4700g           *minerals
-  gold nuggets         400g            *minerals
-  leushite             4400g           *minerals
-  lorandite            5500g           *minerals
-  masuyite             5100g           *minerals
-  papagoite            3300g           *minerals
-  serandite            3400g           *minerals
-  sincosite            3000g           *minerals
-  tellurium            6200g           *minerals
-  thorianite           100g            *minerals
-  iron                 7800g           *basic_commodities      @110
-  sugar cane           50kg 100l       *basic_commodities      @120
-  hemp                 125kg 250l      *basic_commodities      @130
+  madder                       400g            *herbs                  @0+
+  old man's beard      800g            *herbs                  @0+
+  yarrow                       200g            *herbs                  @0+
+  sassafras            500g            *herbs                  @0+
+  iris root            300g            *herbs                  @0+
+  weld                 300g            *herbs                  @0+
+  broom flower         200g            *herbs                  @0+
+  lobelia              200g            *herbs                  @0+
+  pokeweed berries     300g            *herbs                  @0+
+  indigo                       700g            *herbs                  @0+
+  elderberries         700g            *herbs                  @0+
+  cowslip              700g            *herbs                  @0+
+  lily of the valley   300g            *herbs                  @0+
+  nettle                       300g            *herbs                  @0+
+  butterfly weed               100g            *herbs                  @0+
+  bananas              125kg 100l      *forageables            @300000+
+  carambolas           125kg 100l      *forageables            @300000+
+  coconuts             125kg 100l      *forageables            @300000+
+  durians              125kg 100l      *forageables            @300000+
+  limes                        125kg 100l      *forageables            @300000+
+  mangos                       125kg 100l      *forageables            @300000+
+  passion fruit                125kg 100l      *forageables            @300000+
+  pineapples           125kg 100l      *forageables            @300000+
+  pomegranates         125kg 100l      *forageables            @300000+
+  rambutan             125kg 100l      *forageables            @300000+
+  lorandite            5500g           *minerals               @0+
+  leushite             4400g           *minerals               @0+
+  tellurium            6200g           *minerals               @0+
+  thorianite           100g            *minerals               @0+
+  chalcocite           5700g           *minerals               @0+
+  cubanite             4700g           *minerals               @0+
+  serandite            3400g           *minerals               @0+
+  papagoite            3300g           *minerals               @0+
+  sincosite            3000g           *minerals               @0+
+  masuyite             5100g           *minerals               @0+
+  gold nuggets         400g            *minerals               @0+
+  sugar cane           50kg 100l       *basic_commodities      @110
+  hemp                 125kg 250l      *basic_commodities      @120
+  iron                 7800g           *basic_commodities      @130
   wood                 175kg 250l      *basic_commodities      @140
   stone                        2600g           *basic_commodities      @150
   hemp oil             1kg             *basic_commodities      @160
  client ypp-sc-tools yarrg
   lastpage
  
 +client jpctb greenend
 +
  
  #---------- OCEANS ----------
  # subscriber oceans