From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Oct 2011 19:58:53 +0000 (+0100)
Subject: Merge chiark:/u/ijackson/things/Yarrgweb/ypp-sc-tools.test into stable-6.x
X-Git-Tag: 6.8.2^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-test.git;a=commitdiff_plain;h=f7cbc65243a86793fc2c845db6b4bec233b18491;hp=4dbb6c3acfdb73f76c221ab016a4406a7b4daacb

Merge chiark:/u/ijackson/things/Yarrgweb/ypp-sc-tools.test into stable-6.x
---

diff --git a/yarrg/icons/fc.xbm b/yarrg/icons/fc.xbm
new file mode 100644
index 0000000..2f92031
--- /dev/null
+++ b/yarrg/icons/fc.xbm
@@ -0,0 +1,5 @@
+#define fc_width 12
+#define fc_height 10
+static unsigned char fc_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x60, 0x00, 0x98, 0x01, 0x60, 0x00,
+   0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/yarrg/icons/vessel-info b/yarrg/icons/vessel-info
index ef0adbb..17a044f 100644
--- a/yarrg/icons/vessel-info
+++ b/yarrg/icons/vessel-info
@@ -2,6 +2,7 @@
 	smsloop		am	sl	Sloop
 	lgsloop		bm	ct	Cutter
 	dhow		cm	dh	Dhow
+	fanchuan	cw	fc	Fanchuan
 	longship	dm	ls	Longship
 	baghlah		em	bg	Baghlah
 	junk		eo	jk	Junk
@@ -21,4 +22,6 @@
 	fancy		M	{Midas class}
 	phantom		G	{Phantom class}
 	imperial	P	{Imperial class}
+	fortune		O	{Fortune class}
+	lagoon		L	{Lagoon class}
 }
diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index 164e874..b7ef35a 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -8,6 +8,8 @@ vessels
  |----------------+--------+-------+-------|
  |Dhow            |medium  |20,250 |13,500 |
  |----------------+--------+-------+-------|
+ |Fanchuan        |large   |20,250 |13,500 |
+ |----------------+--------+-------+-------|
  |Longship        |small   |20,250 |13,500 |
  |----------------+--------+-------+-------|
  |Baghlah         |medium  |27,000 |18,000 |