WIP icons - new nice icon set

diff --git a/yarrg/iconsdir/backup/ct.xbm b/yarrg/iconsdir/backup/ct.xbm
new file mode 100644 (file)
index 0000000..9e0256b
--- /dev/null
+++ b/yarrg/iconsdir/backup/ct.xbm
@@ -0,0 +1,5 @@
+#define ct_width 12
+#define ct_height 10
+static unsigned char ct_bits[] = {
+   0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0xa0, 0x00, 0x60, 0x01, 0xb8, 0x01,
+   0x68, 0x01, 0xb8, 0x00, 0x60, 0x00, 0x00, 0x00};

diff --git a/yarrg/iconsdir/backup/ls.xbm b/yarrg/iconsdir/backup/ls.xbm
new file mode 100644 (file)
index 0000000..ba462f0
--- /dev/null
+++ b/yarrg/iconsdir/backup/ls.xbm
@@ -0,0 +1,5 @@
+#define ls_width 12
+#define ls_height 10
+static unsigned char ls_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0xfe, 0x03, 0x54, 0x05, 0xa8, 0x0a, 0xa8, 0x0a,
+   0xa8, 0x0a, 0x54, 0x05, 0xfe, 0x03, 0x00, 0x00};

diff --git a/yarrg/iconsdir/backup/mb.xbm b/yarrg/iconsdir/backup/mb.xbm
new file mode 100644 (file)
index 0000000..4873d27
--- /dev/null
+++ b/yarrg/iconsdir/backup/mb.xbm
@@ -0,0 +1,5 @@
+#define mb_width 12
+#define mb_height 10
+static unsigned char mb_bits[] = {
+   0x00, 0x00, 0x40, 0x00, 0xc8, 0x00, 0x58, 0x01, 0xe8, 0x02, 0x4e, 0x03,
+   0xca, 0x02, 0x6e, 0x01, 0xd8, 0x00, 0x00, 0x00};

diff --git a/yarrg/iconsdir/backup/mg.xbm b/yarrg/iconsdir/backup/mg.xbm
new file mode 100644 (file)
index 0000000..5e3afeb
--- /dev/null
+++ b/yarrg/iconsdir/backup/mg.xbm
@@ -0,0 +1,5 @@
+#define mg_width 12
+#define mg_height 10
+static unsigned char mg_bits[] = {
+   0x20, 0x00, 0x60, 0x00, 0xa4, 0x02, 0x6c, 0x05, 0xb4, 0x09, 0x64, 0x09,
+   0xa7, 0x09, 0x65, 0x09, 0xb7, 0x0d, 0x6c, 0x07};

diff --git a/yarrg/iconsdir/battle.xbm b/yarrg/iconsdir/battle.xbm
new file mode 100644 (file)
index 0000000..34a70ee
--- /dev/null
+++ b/yarrg/iconsdir/battle.xbm
@@ -0,0 +1,4 @@
+#define battle_width 5
+#define battle_height 9
+static unsigned char battle_bits[] = {
+   0x0e, 0x0e, 0x0e, 0x04, 0x11, 0x0a, 0x04, 0x0a, 0x11};

diff --git a/yarrg/iconsdir/bg.xbm b/yarrg/iconsdir/bg.xbm
new file mode 100644 (file)
index 0000000..583f3a1
--- /dev/null
+++ b/yarrg/iconsdir/bg.xbm
@@ -0,0 +1,5 @@
+#define bg_width 12
+#define bg_height 10
+static unsigned char bg_bits[] = {
+   0x10, 0x00, 0x30, 0x00, 0x50, 0x00, 0x92, 0x00, 0x16, 0x01, 0x1a, 0x02,
+   0x12, 0x04, 0xe2, 0x0f, 0x42, 0x00, 0xfe, 0x00 };

diff --git a/yarrg/iconsdir/ct.xbm b/yarrg/iconsdir/ct.xbm
new file mode 100644 (file)
index 0000000..1b49a53
--- /dev/null
+++ b/yarrg/iconsdir/ct.xbm
@@ -0,0 +1,5 @@
+#define ct_width 12
+#define ct_height 10
+static unsigned char ct_bits[] = {
+   0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0xa0, 0x00, 0x30, 0x01, 0x28, 0x01,
+   0xa4, 0x00, 0x7c, 0x00, 0x20, 0x00, 0xfc, 0x01};

diff --git a/yarrg/iconsdir/dh.xbm b/yarrg/iconsdir/dh.xbm
new file mode 100644 (file)
index 0000000..2b0b69f
--- /dev/null
+++ b/yarrg/iconsdir/dh.xbm
@@ -0,0 +1,5 @@
+#define dh_width 12
+#define dh_height 10
+static unsigned char dh_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x18, 0x00, 0x28, 0x00, 0x48, 0x00,
+   0x88, 0x00, 0x08, 0x01, 0xf8, 0x03, 0x00, 0x00};

diff --git a/yarrg/iconsdir/gf.xbm b/yarrg/iconsdir/gf.xbm
new file mode 100644 (file)
index 0000000..7ea0b9e
--- /dev/null
+++ b/yarrg/iconsdir/gf.xbm
@@ -0,0 +1,5 @@
+#define gf_width 12
+#define gf_height 10
+static unsigned char gf_bits[] = {
+   0xd8, 0x00, 0xdb, 0x06, 0xdb, 0x06, 0xdb, 0x06, 0xdb, 0x06, 0xdb, 0x06,
+   0xdb, 0x06, 0xdb, 0x06, 0xff, 0x0f, 0xff, 0x07};

diff --git a/yarrg/iconsdir/locked.xbm b/yarrg/iconsdir/locked.xbm
new file mode 100644 (file)
index 0000000..9b60488
--- /dev/null
+++ b/yarrg/iconsdir/locked.xbm
@@ -0,0 +1,4 @@
+#define locked_width 5
+#define locked_height 9
+static unsigned char locked_bits[] = {
+   0x00, 0x0e, 0x11, 0x11, 0x1f, 0x1f, 0x1b, 0x1f, 0x1f};

diff --git a/yarrg/iconsdir/ls.xbm b/yarrg/iconsdir/ls.xbm
new file mode 100644 (file)
index 0000000..008a607
--- /dev/null
+++ b/yarrg/iconsdir/ls.xbm
@@ -0,0 +1,5 @@
+#define ls_width 12
+#define ls_height 10
+static unsigned char ls_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x54, 0x01, 0xa8, 0x02, 0xa8, 0x02,
+   0xa8, 0x02, 0x54, 0x01, 0xfe, 0x00, 0x00, 0x00};

diff --git a/yarrg/iconsdir/mb.xbm b/yarrg/iconsdir/mb.xbm
new file mode 100644 (file)
index 0000000..41f6ee5
--- /dev/null
+++ b/yarrg/iconsdir/mb.xbm
@@ -0,0 +1,5 @@
+#define mb_width 12
+#define mb_height 10
+static unsigned char mb_bits[] = {
+   0x80, 0x00, 0x90, 0x01, 0xb0, 0x02, 0xd0, 0x04, 0x98, 0x04, 0x94, 0x04,
+   0xd2, 0x02, 0xbe, 0x01, 0x90, 0x00, 0xfe, 0x07};

diff --git a/yarrg/iconsdir/mg.xbm b/yarrg/iconsdir/mg.xbm
new file mode 100644 (file)
index 0000000..e4c457d
--- /dev/null
+++ b/yarrg/iconsdir/mg.xbm
@@ -0,0 +1,5 @@
+#define mf_width 12
+#define mf_height 10
+static unsigned char mf_bits[] = {
+   0x20, 0x00, 0x68, 0x01, 0xb8, 0x03, 0x28, 0x05, 0x2c, 0x09, 0x2a, 0x09,
+   0xb9, 0x05, 0x6f, 0x03, 0x28, 0x01, 0xff, 0x0f};

diff --git a/yarrg/iconsdir/sl.xbm b/yarrg/iconsdir/sl.xbm
new file mode 100644 (file)
index 0000000..64a8b65
--- /dev/null
+++ b/yarrg/iconsdir/sl.xbm
@@ -0,0 +1,5 @@
+#define sl_width 12
+#define sl_height 10
+static unsigned char sl_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00,
+   0x60, 0x00, 0x40, 0x00, 0xf8, 0x03, 0x00, 0x00};

diff --git a/yarrg/iconsdir/unlocked.xbm b/yarrg/iconsdir/unlocked.xbm
new file mode 100644 (file)
index 0000000..545fc0b
--- /dev/null
+++ b/yarrg/iconsdir/unlocked.xbm
@@ -0,0 +1,4 @@
+#define unlocked_width 5
+#define unlocked_height 9
+static unsigned char unlocked_bits[] = {
+   0x00, 0x02, 0x05, 0x05, 0x04, 0x1c, 0x1c, 0x14, 0x1c};

diff --git a/yarrg/iconsdir/wb.xbm b/yarrg/iconsdir/wb.xbm
new file mode 100644 (file)
index 0000000..859b6ef
--- /dev/null
+++ b/yarrg/iconsdir/wb.xbm
@@ -0,0 +1,5 @@
+#define wb_width 12
+#define wb_height 10
+static unsigned char wb_bits[] = {
+   0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00,
+   0x6c, 0x00, 0x48, 0x00, 0xfe, 0x03, 0x00, 0x00};

diff --git a/yarrg/iconsdir/wf.xbm b/yarrg/iconsdir/wf.xbm
new file mode 100644 (file)
index 0000000..b1419fe
--- /dev/null
+++ b/yarrg/iconsdir/wf.xbm
@@ -0,0 +1,5 @@
+#define wf_width 12
+#define wf_height 10
+static unsigned char wf_bits[] = {
+   0x00, 0x00, 0x60, 0x00, 0x60, 0x03, 0x6c, 0x03, 0x6c, 0x03, 0x6c, 0x03,
+   0x6c, 0x03, 0x6c, 0x03, 0x6c, 0x03, 0xfe, 0x0f};

diff --git a/yarrg/iconsdir/xe.xbm b/yarrg/iconsdir/xe.xbm
new file mode 100644 (file)
index 0000000..307d242
--- /dev/null
+++ b/yarrg/iconsdir/xe.xbm
@@ -0,0 +1,5 @@
+#define xe_width 12
+#define xe_height 10
+static unsigned char xe_bits[] = {
+   0x44, 0x00, 0xcc, 0x00, 0x54, 0x01, 0x65, 0x02, 0x47, 0x04, 0x85, 0x0f,
+   0x09, 0x01, 0x11, 0x02, 0xe1, 0x07, 0x7f, 0x00};

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 0639d4abba33ecfcc80aa02efded735072da17c6..adf76eb4d23af50e9ed0102106638aaa46c2aba0 100755 (executable)
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -692,15 +692,17 @@ proc draw {} {
        if {$c > 1} {
            set qty [format "%2d" $c]
        } else {
        if {$c > 1} {
            set qty [format "%2d" $c]
        } else {

-           set qty [format "99" $c]
+           set qty [format "  " $c]

        }
 
        }
 

+       regsub {[a-z][a-z]} $text {} text
+

        set stackx $x
        incr stackx 2
        set tid [canvas-horiz-stack stackx $y \
                 text -anchor nw -font fixed -text $qty]
        incr stackx -1
        set stackx $x
        incr stackx 2
        set tid [canvas-horiz-stack stackx $y \
                 text -anchor nw -font fixed -text $qty]
        incr stackx -1

-       canvas-horiz-stack stackx [expr {$y+1}] \
+       canvas-horiz-stack stackx [expr {$y+2}] \

            image -anchor nw -image ship-icon/$vc_code2abbrev([lindex [split $code _] 1])
        incr stackx
        canvas-horiz-stack stackx $y \
            image -anchor nw -image ship-icon/$vc_code2abbrev([lindex [split $code _] 1])
        incr stackx
        canvas-horiz-stack stackx $y \