X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fsource-info.txt;h=d35468ddfe79ca48409cfc2c80ca9987e1c68c01;hp=a286376d2b6ba65589e9be77e551700f1bdc6864;hb=53dfe71f6c510ee12bbf6bdaeb3984024d34a7be;hpb=217ac850a0e5cca6b2eb24d30ac443d263912e4f

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index a286376..d35468d 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -1,3 +1,4 @@
+# -*- fundamental -*-
 
 vessels
 #|   Ship Name    |Gun Size|Volume | Mass  |
@@ -32,89 +33,100 @@ 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
- %c enamel		5kg		*enamel
- %c paint		1200g 1l	*paint
-
- %c cloth		700g		*cloth
- fine %c cloth		700g		*cloth
- sail cloth		700g		*cloth
+ kraken's blood		1kg		*dye			@105
+ %d dye			1kg		*dye			@0
+ %enamel 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			@150000
+
+%d
+ red								@100
+ yellow								@110
+ blue								@120
+ green								@130
+ lime
+ navy
 
-nocommods
- black dye
+%enamel
+ %c								@0
 
 %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								@100000+
+ tan								@100000+
+ white								@100000+
+ black								@100000+
+ grey								@100000+
+ yellow								@100000+
+ pink								@100000+
+ violet								@100000+
+ purple								@100000+
+ navy								@100000+
+ blue								@100000+
+ aqua								@100000+
+ lime								@100000+
+ green								@100000+
+ orange								@100000+
+ aqua								@100000+
+ lime								@100000+
+ green								@100000+
+ orange								@100000+
+ maroon								@100000+
+ brown								@100000+
+ gold								@100000+
+ rose								@100000+
+ lavender							@100000+
+ mint								@100000+
+ light green							@100000+
+ magenta							@200000+
+ lemon								@200000+
+ peach								@200000+
+ light blue							@200000+
+ persimmon							@200000+
 
 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
+ %g gems		10kg		*forageables		@0
+ diamonds		10kg		*forageables		@200000+
+ emeralds		10kg		*forageables		@200000+
+ moonstones		10kg		*forageables		@200000+
+ opals			10kg		*forageables		@200000+
+ pearls			10kg		*forageables		@200000+
+ rubies			10kg		*forageables		@200000+
+ sapphires		10kg		*forageables		@200000+
+ topazes		10kg		*forageables		@200000+
 
 %g
- amber							@9100
- amethyst						@9110
- beryl							@9120
- coral							@9130
- jade							@9140
- jasper							@9150
- jet							@9160
- lapis lazuli						@9170
- quartz							@9180
- tigereye						@9190
+ amber								@200000+
+ amethyst							@200000+
+ beryl								@200000+
+ coral								@200000+
+ jade								@200000+
+ jasper								@200000+
+ jet								@200000+
+ lapis lazuli							@200000+
+ quartz								@200000+
+ tigereye							@200000+
 
 commods
- 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
+ swill			1kg		*ship-supplies		@0+
+ grog			1kg		*ship-supplies		@0+
+ fine rum		1kg		*ship-supplies		@0+
+ small cannon balls	7100g		*ship-supplies		@0+
+ medium cannon balls	14200g 2l	*ship-supplies		@0+
+ large cannon balls	21300g 3l	*ship-supplies		@0+
 
  broom flower		200g		*herbs
  butterfly weed		100g		*herbs
@@ -156,14 +168,14 @@ commods
  tellurium		6200g		*minerals
  thorianite		100g		*minerals
 
- hemp			125kg 250l	*basic-commodities
- hemp oil		1kg		*basic-commodities
- iron			7800g		*basic-commodities
- lacquer		1kg		*basic-commodities
- stone			2600g		*basic-commodities
- sugar cane		50kg 100l	*basic-commodities
- varnish		1kg		*basic-commodities
- wood			175kg 250l	*basic-commodities
+ iron			7800g		*basic-commodities	@110
+ sugar cane		50kg 100l	*basic-commodities	@120
+ hemp			125kg 250l	*basic-commodities	@130
+ wood			175kg 250l	*basic-commodities	@140
+ stone			2600g		*basic-commodities	@150
+ hemp oil		1kg		*basic-commodities	@160
+ varnish		1kg		*basic-commodities	@180
+ lacquer		1kg		*basic-commodities	@190
 
 
 client ypp-sc-tools yarrg