WIP commod ordering improvements

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index 0b002c5699a76284dc8195ef21d5234993d2b1f2..b685dbc42d2eb3bbff288516e9fa04ac123aacf9 100644 (file)
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -33,25 +33,25 @@ shot
  large 4
 
 commodclasses
  large 4
 
 commodclasses

- *dye
+ *basic-commodities
+ *ship-supplies
+ *herbs
+ *minerals

  *cloth
  *cloth

- *forageables
+ *dye

  *paint
  *paint

- *ship-supplies
- *basic-commodities

  *enamel
  *enamel

- *minerals
- *herbs
+ *forageables

 
 commods
 
 commods

- kraken's blood                1kg
+ kraken's blood                1kg             *dye                    @105

  %d dye                        1kg             *dye                    @0
  %c enamel             5kg             *enamel                 @0
  %c paint              1200g 1l        *paint                  @0
 
  %c cloth              700g            *cloth                  @2
  fine %c cloth         700g            *cloth                  @5
  %d dye                        1kg             *dye                    @0
  %c enamel             5kg             *enamel                 @0
  %c paint              1200g 1l        *paint                  @0
 
  %c cloth              700g            *cloth                  @2
  fine %c cloth         700g            *cloth                  @5

- sail cloth            700g            *cloth
+ sail cloth            700g            *cloth                  @315

 
 %d
  red                                                           @100
 
 %d
  red                                                           @100


@@ -90,26 +90,26 @@ commods
 
 commods
  %g gems               10kg            *forageables            @0
 
 commods
  %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
+ diamonds              10kg            *forageables            @5200
+ emeralds              10kg            *forageables            @5210
+ moonstones            10kg            *forageables            @5220
+ opals                 10kg            *forageables            @5230
+ pearls                        10kg            *forageables            @5240
+ rubies                        10kg            *forageables            @5250
+ sapphires             10kg            *forageables            @5260
+ topazes               10kg            *forageables            @5270

 
 %g
 
 %g

- amber                                                         @9100
- amethyst                                                      @9110
- beryl                                                         @9120
- coral                                                         @9130
- jade                                                          @9140
- jasper                                                                @9150
- jet                                                           @9160
- lapis lazuli                                                  @9170
- quartz                                                                @9180
- tigereye                                                      @9190
+ amber                                                         @5100
+ amethyst                                                      @5110
+ beryl                                                         @5120
+ coral                                                         @5130
+ jade                                                          @5140
+ jasper                                                                @5150
+ jet                                                           @5160
+ lapis lazuli                                                  @5170
+ quartz                                                                @5180
+ tigereye                                                      @5190

 
 commods
  swill                 1kg             *ship-supplies          @10
 
 commods
  swill                 1kg             *ship-supplies          @10