WIP commodity sorting: syntactic improvements

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

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index 9a33278a263d06aea1927b510d99958ff98e1da9..1c49a39b717200f6f1f8b7fc5c2c7b0734a4e6be 100644 (file)
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -1,3 +1,4 @@
+# -*- fundamental -*-
 
 vessels
 #|   Ship Name    |Gun Size|Volume | Mass  |
@@ -44,12 +45,12 @@ commodclasses
 
 commods
  kraken's blood                1kg
- %c dye                        1kg             *dye
- %c enamel             5kg             *enamel
- %c paint              1200g 1l        *paint
+ %c dye                        1kg             *dye                    @0
+ %c enamel             5kg             *enamel                 @0
+ %c paint              1200g 1l        *paint                  @0
 
- %c cloth              700g            *cloth
- fine %c cloth         700g            *cloth
+ %c cloth              700g            *cloth                  @2
+ fine %c cloth         700g            *cloth                  @5
  sail cloth            700g            *cloth
 
 nocommods
@@ -85,32 +86,36 @@ nocommods
  yellow
 
 commods
- %g gems               10kg            *forageables
- diamonds              10kg            *forageables
- emeralds              10kg            *forageables
- moonstones            10kg            *forageables
- opals                 10kg            *forageables
- pearls                        10kg            *forageables
- rubies                        10kg            *forageables
- sapphires             10kg            *forageables
- topazes               10kg            *forageables
+ %g gems               10kg            *forageables            @0
+ diamonds              10kg            *forageables            @9200
+ emeralds              10kg            *forageables            @9210
+ moonstones            10kg            *forageables            @9220
+ opals                 10kg            *forageables            @9230
+ pearls                        10kg            *forageables            @9240
+ rubies                        10kg            *forageables            @9250
+ sapphires             10kg            *forageables            @9260
+ topazes               10kg            *forageables            @9270
 
 %g
- amber
- amethyst
- beryl
- coral
- jade
- jasper
- jet
- lapis lazuli
- quartz
- tigereye
+ amber                                                         @9100
+ amethyst                                                      @9110
+ beryl                                                         @9120
+ coral                                                         @9130
+ jade                                                          @9140
+ jasper                                                                @9150
+ jet                                                           @9160
+ lapis lazuli                                                  @9170
+ quartz                                                                @9180
+ tigereye                                                      @9190
 
 commods
- swill                 1kg             *ship-supplies @10
- grog                  1kg             *ship-supplies @20
- fine rum              1kg             *ship-supplies @30
+ swill                 1kg             *ship-supplies          @10
+ grog                  1kg             *ship-supplies          @20
+ fine rum              1kg             *ship-supplies          @30
+
+ small cannon balls    7100g           *ship-supplies          @60
+ medium cannon balls   14200g 2l       *ship-supplies          @70
+ large cannon balls    21300g 3l       *ship-supplies          @80
 
  broom flower          200g            *herbs
  butterfly weed                100g            *herbs
@@ -152,10 +157,6 @@ commods
  tellurium             6200g           *minerals
  thorianite            100g            *minerals
 
- small cannon balls    7100g           *ship-supplies @60
- medium cannon balls   14200g 2l       *ship-supplies @70
- large cannon balls    21300g 3l       *ship-supplies @80
-
  hemp                  125kg 250l      *basic-commodities
  hemp oil              1kg             *basic-commodities
  iron                  7800g           *basic-commodities