X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fsource-info.txt;h=0b002c5699a76284dc8195ef21d5234993d2b1f2;hb=fbbf1b60aab06cbe70d07562a7b1a0431b1e9d1c;hp=9a33278a263d06aea1927b510d99958ff98e1da9;hpb=a7ea2fcf98297e6e9e631082f778d11b17b13620;p=ypp-sc-tools.main.git

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index 9a33278..0b002c5 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -1,3 +1,4 @@
+# -*- fundamental -*-
 
 vessels
 #|   Ship Name    |Gun Size|Volume | Mass  |
@@ -44,73 +45,80 @@ commodclasses
 
 commods
  kraken's blood		1kg
- %c dye			1kg		*dye
- %c enamel		5kg		*enamel
- %c paint		1200g 1l	*paint
+ %d 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
- 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
- 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 +160,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