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=a286376d2b6ba65589e9be77e551700f1bdc6864;hp=eedab9ae7b4cafd191898d4eb7a958d43f1bed96;hb=efd685a5df610ffefc545a41be67e2e0d4b69c7c;hpb=a86f9a86ac468875dd428c068315a2617e8e12ac

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index eedab9a..a286376 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -1,13 +1,56 @@
 
+vessels
+#|   Ship Name    |Gun Size|Volume | Mass  |
+ |Sloop           |small   |20,250 |13,500 |
+ |----------------+--------+-------+-------|
+ |Cutter          |small   |60,750 |40,500 |
+ |----------------+--------+-------+-------|
+ |Dhow            |medium  |20,250 |13,500 |
+ |----------------+--------+-------+-------|
+ |Longship        |small   |20,250 |13,500 |
+ |----------------+--------+-------+-------|
+ |Baghlah         |medium  |27,000 |18,000 |
+ |----------------+--------+-------+-------|
+ |Merchant brig   |medium  |135,000|90,000 |
+ |----------------+--------+-------+-------|
+ |War brig        |medium  |81,000 |54,000 |
+ |----------------+--------+-------+-------|
+ |Merchant galleon|large   |405,000|270,000|
+ |----------------+--------+-------+-------|
+ |Xebec           |medium  |182,250|121,500|
+ |----------------+--------+-------+-------|
+ |War frigate     |large   |324,000|216,000|
+ |----------------+--------+-------+-------|
+ |Grand frigate   |large   |810,000|540,000|
+# From http://yppedia.puzzlepirates.com/Ship; when updating,
+# delete unused columns and check heading is the same as above.
+# If fields reordered must change parser in Commods.pm.
+
+shot
+ small	2
+ medium	3
+ large	4
+
+commodclasses
+ *dye
+ *cloth
+ *forageables
+ *paint
+ *ship-supplies
+ *basic-commodities
+ *enamel
+ *minerals
+ *herbs
+
 commods
  kraken's blood		1kg
- %c dye			1kg
- %c enamel		5kg
- %c paint		1200g 1l
+ %c dye			1kg		*dye
+ %c enamel		5kg		*enamel
+ %c paint		1200g 1l	*paint
 
- %c cloth		700g
- fine %c cloth		700g
- sail cloth		700g
+ %c cloth		700g		*cloth
+ fine %c cloth		700g		*cloth
+ sail cloth		700g		*cloth
 
 nocommods
  black dye
@@ -42,99 +85,138 @@ nocommods
  yellow
 
 commods
- %g gems		10kg
- diamonds		10kg
- emeralds		10kg
- moonstones		10kg
- opals			10kg
- pearls			10kg
- rubies			10kg
- sapphires		10kg
- topazes		10kg
+ %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
- grog			1kg
- fine rum		1kg
-
- broom flower		200g
- butterfly weed		100g
- cowslip		700g
- elderberries		700g
- indigo			700g
- iris root		300g
- lily of the valley	300g
- lobelia		200g
- madder			400g
- nettle			300g
- old man's beard	800g
- pokeweed berries	300g
- sassafras		500g
- weld			300g
- yarrow			200g
-
- bananas		125kg 100l
- coconuts		125kg 100l
- limes			125kg 100l
- mangos			125kg 100l
- pineapples		125kg 100l
-
- carambolas		125kg 100l
- durians		125kg 100l
- passion fruit		125kg 100l
- pomegranates		125kg 100l
- rambutan		125kg 100l
-
- chalcocite		5700g
- cubanite		4700g
- gold nuggets		400g
- leushite		4400g
- lorandite		5500g
- masuyite		5100g
- papagoite		3300g
- serandite		3400g
- sincosite		3000g
- tellurium		6200g
- thorianite		100g
-
- small cannon balls	7100g
- medium cannon balls	14200g 2l
- large cannon balls	21300g 3l
-
- hemp			125kg 250l
- hemp oil		1kg
- iron			7800g
- lacquer		1kg
- stone			2600g
- sugar cane		50kg 100l
- varnish		1kg
- wood			175kg 250l
+ 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
+ cowslip		700g		*herbs
+ elderberries		700g		*herbs
+ indigo			700g		*herbs
+ iris root		300g		*herbs
+ lily of the valley	300g		*herbs
+ lobelia		200g		*herbs
+ madder			400g		*herbs
+ nettle			300g		*herbs
+ old man's beard	800g		*herbs
+ pokeweed berries	300g		*herbs
+ sassafras		500g		*herbs
+ weld			300g		*herbs
+ yarrow			200g		*herbs
+
+ bananas		125kg 100l	*forageables
+ coconuts		125kg 100l	*forageables
+ limes			125kg 100l	*forageables
+ mangos			125kg 100l	*forageables
+ pineapples		125kg 100l	*forageables
+
+ carambolas		125kg 100l	*forageables
+ durians		125kg 100l	*forageables
+ passion fruit		125kg 100l	*forageables
+ pomegranates		125kg 100l	*forageables
+ rambutan		125kg 100l	*forageables
+
+ chalcocite		5700g		*minerals
+ cubanite		4700g		*minerals
+ gold nuggets		400g		*minerals
+ leushite		4400g		*minerals
+ lorandite		5500g		*minerals
+ masuyite		5100g		*minerals
+ papagoite		3300g		*minerals
+ serandite		3400g		*minerals
+ sincosite		3000g		*minerals
+ 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
+
+
+client ypp-sc-tools yarrg
+ lastpage
+
+
+#---------- OCEANS ----------
+# subscriber oceans
 
 ocean Midnight
+
 ocean Cobalt
  Garnet
   Jubilee Island
 
+ocean Ice
+ Vilya
+  Winking Wall Island
+
+# doubloon oceans
+
 ocean Hunter
  Eagle
   Ix Chel
+  Manu Island
+
+ocean Malachite
+ Draco
+  Cetus Island
+  Threewood Island
 
 ocean Sage
  Osprey
   Scurvy Reef
   Gauntlet Island
 
-client ypp-sc-tools yarrg
- lastpage
+ocean Viridian
+
+# family oceans
+
+ocean Crimson
+
+# International oceans (doubloon oceans)
+
+#ocean Jade
+# Cigüeña
+#  Isla Scrimshaw
+# Ibis
+#  Isla Kiwara
+# Águila
+#  Cayo Escorbuto
+
+#ocean Opal
+# Canis
+#  Atchafalaya-Insel
+