X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fsource-info.txt;h=b685dbc42d2eb3bbff288516e9fa04ac123aacf9;hb=55991aabcdac0bb80bb43bae1a1845e48c187292;hp=1c49a39b717200f6f1f8b7fc5c2c7b0734a4e6be;hpb=a673d16659090b2b2a4ec033e1d432ababd10722;p=ypp-sc-tools.main.git

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index 1c49a39..b685dbc 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -33,80 +33,83 @@ shot
  large	4
 
 commodclasses
- *dye
+ *basic-commodities
+ *ship-supplies
+ *herbs
+ *minerals
  *cloth
- *forageables
+ *dye
  *paint
- *ship-supplies
- *basic-commodities
  *enamel
- *minerals
- *herbs
+ *forageables
 
 commods
- kraken's blood		1kg
- %c dye			1kg		*dye			@0
+ 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
- sail cloth		700g		*cloth
+ sail cloth		700g		*cloth			@315
 
-nocommods
- black dye
+%d
+ red								@100
+ yellow								@110
+ blue								@120
+ green								@130
 
 %c
- aqua
- black
- blue
- brown
- gold
- green
- grey
- lavender
- lemon
- light blue
- light green
- lime
- magenta
- maroon
- mint
- navy
- orange
- peach
- persimmon
- pink
- purple
- red
- rose
- tan
- violet
- white
- yellow
+ red								@100
+ tan								@110
+ white								@120
+ black								@130
+ grey								@140
+ yellow								@150
+ pink								@160
+ violet								@170
+ purple								@180
+ navy								@190
+ blue								@200
+ aqua								@210
+ lime								@220
+ green								@230
+ orange								@240
+ maroon								@250
+ brown								@260
+ gold								@270
+ rose								@280
+ lavender							@290
+ mint								@300
+ light green							@310
+ magenta							@320
+ lemon								@330
+ peach								@340
+ light blue							@350
+ persimmon							@360
 
 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
- 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