Merge branch 'master' of ../ypp-sc-tools

diff --git a/yarrg/icons/jk.xbm b/yarrg/icons/jk.xbm
new file mode 100644 (file)
index 0000000..c27ff5b
--- /dev/null
+++ b/yarrg/icons/jk.xbm
@@ -0,0 +1,5 @@
+#define jk_width 12
+#define jk_height 10
+static unsigned char jk_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
+   0x8c, 0x01, 0x8c, 0x01, 0xf8, 0x00, 0x00, 0x00};

diff --git a/yarrg/web/devel b/yarrg/web/devel
index e23d0af4e646daa63ce466d1b376269bb14b2c18..6289b9a43c042fc2b693dc6afb3f9fbf69e3fc45 100755 (executable)
--- a/yarrg/web/devel
+++ b/yarrg/web/devel
@@ -52,14 +52,18 @@ Note that there is <strong>NO WARRANTY</strong> !
 
 <h3>Source code</h3>
 
+<kbd>git clone git://git.yarrg.chiark.net/ypp-sc-tools.main.git</kbd><br>
+clones the master tree through which we push most changes.
+<p>
+
 <kbd>git clone http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/.git/</kbd><br>
 obtains the source code of the latest version released for use as a
-client, which you can also find
+screenscraper client, which you can also find
 <a href="http://www.chiark.greenend.org.uk/~ijackson/ypp-sc-tools/master/">as
 an unpacked tree</a>
 
 <p><a href="source.tar.gz">Live website source code</a> can
-be downloaded, in case we have made changes but not yet pushed them
+be downloaded:  In case we have made changes but not yet pushed them
 (perhaps because we haven't done a release), and to make it easy for
 anyone else who runs a copy of the website to provide everyone with
 the source for their version, the website code itself lets you download
@@ -71,10 +75,12 @@ gives you the source code for the pages you are now looking at.
 <h4>Lookup website</h4>
  <ul>
  <li><a href="http://yarrg.chiark.net/">Main released site</a>,
-     with <a href="http://yarrg.chiark.net/source.tar.gz">source code</a>
+     with <a href="http://yarrg.chiark.net/source.tar.gz">source code</a> (and
+   <a href="git://git.yarrg.chiark.net/ypp-sc-tools.web-live.git">committed changes via git</a>)
  <li><a href="http://yarrg.chiark.net/test/data">Released code; testing database instance (updated with yarrg --test-servers)</a> (source code as above)
  <li><a href="http://yarrg.chiark.net/test/code">Testing version of the site code</a>,
-     with <a href="http://yarrg.chiark.net/test/code/source.tar.gz">source code</a>
+     with <a href="http://yarrg.chiark.net/test/code/source.tar.gz">source code</a> (and
+   <a href="git://git.yarrg.chiark.net/ypp-sc-tools.web-test.git">committed changes via git</a>)
  <li><a href="http://yarrg.chiark.net/test/both">Testing code running against the testing database instance</a> (source code as above)
  </ul>
 
@@ -92,8 +98,10 @@ are normally accessed only via the upload client but you may also
 download their source directly:
 
  <ul>
- <li><a href="http://upload.yarrg.chiark.net/commod-update-receiver?get_source=1">Main production instance</a>
- <li><a href="http://upload.yarrg.chiark.net/test/commod-update-receiver?get_source=1">Testing database instance</a>
+ <li><a href="http://upload.yarrg.chiark.net/commod-update-receiver?get_source=1">Main production instance</a> including uncommitted changes; or
+   <a href="git://git.yarrg.chiark.net/ypp-sc-tools.db-live.git">committed changes via git</a>
+ <li><a href="http://upload.yarrg.chiark.net/test/commod-update-receiver?get_source=1">Testing database instance</a> including uncommitted changes; or
+   <a href="git://git.yarrg.chiark.net/ypp-sc-tools.db-test.git">committed changes via git</a>
  </ul>
 
 <h3>Data</h3>

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 272a11432b37f6c6d7169f773b89a621790e7326..af77cbab45221214c58b5d6296ec42c192bd82f0 100755 (executable)
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -254,6 +254,7 @@ proc vesselclasses-init {} {
        dhow            cm      dh      Dhow
        longship        dm      ls      Longship
        baghlah         em      bg      Baghlah
+       junk            eo      jk      Junk
        merchbrig       fm      mb      {Merchant Brig}
        warbrig         gm      wb      {War Brig}
        xebec           hm      xe      Xebec
@@ -379,7 +380,11 @@ proc show-report-decode {code} {
 
     switch -exact $subclass {
        {} { report-set subclass {Ordinary} }
-       F { report-set subclass {"Frost class"} }
+       E { report-set subclass {Emerald class} }
+       F { report-set subclass {Frost class} }
+       R { report-set subclass {Rogue class} }
+       V { report-set subclass {Verdant class} }
+       I { report-set subclass {Inferno class} }
        default { report-set subclass "Subclass \"$subclass\"" }
     }
 
@@ -582,7 +587,11 @@ proc vessel {vin} {
     set subclass [errexpect-arrayget vi vesselSubclass]
     switch -exact $subclass {
        null            { lappend codel {} }
+       celtic          { lappend codel E }
        icy             { lappend codel F }
+       rogue           { lappend codel R }
+       verdant         { lappend codel V }
+       inferno         { lappend codel I }
        default         { lappend codel ($subclass) }
     }