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 (file)
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 ef0adbbc710e3a0e0aa4f225dd9ddcd31f61730f..17a044fdf846dd2e8aef02ce5af0e3222b76d2ab 100644 (file)
--- 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 164e8746f56472e6a4c90558cb605578661223ce..b7ef35a9ac5a90bf953a7bbb6ce2ced4b1e603eb 100644 (file)
--- 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 |