Separate ACT and TALK properly.

diff --git a/telling.fig b/telling.fig
index 64ea9002c8c5e814c669c6afa9814bc56a99b736..58ff405383a81b207919dba209c8cfe4de1819e4 100644 (file)
--- a/telling.fig
+++ b/telling.fig
@@ -7,21 +7,20 @@ A4
 Single
 -2
 1200 2
-5 1 0 1 0 7 50 0 -1 0.000 0 0 0 0 7860.000 8010.000 7740 8100 7740 7920 8010 8010
 6 540 990 3150 2880
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 1395 1485 405 225 990 1260 1800 1710
 2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
         540 990 3150 990 3150 2880 540 2880 540 990
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 6
-       0 0 1.00 60.00 120.00
+       2 1 1.00 60.00 120.00
         1350 1710 1350 2340 1440 2610 1980 2610 2520 2430 2700 2070
         0.000 1.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
-       0 0 1.00 60.00 120.00
+       2 1 1.00 60.00 120.00
         2700 1800 2610 1440 2250 1350 1800 1440
         0.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 6
-       0 0 1.00 60.00 120.00
+       2 1 1.00 60.00 120.00
         1350 1980 1350 2430 1080 2610 630 2610 630 2160 1080 1620
         0.000 1.000 1.000 1.000 1.000 0.000
 4 0 0 50 0 0 12 0.0000 4 135 570 1080 1530 STATE\001
@@ -34,94 +33,90 @@ Single
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 6840 1575 810 405 6030 1170 7650 1980
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 2340 5895 810 405 3150 5490 1530 6300
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 5625 8505 765 405 6390 8100 4860 8910
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-       0 0 1.00 60.00 120.00
-        6210 1890 3240 4680
 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
        0 0 1.00 60.00 120.00
         3060 4950 2520 5490
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-       0 0 1.00 60.00 120.00
-        2250 4590 2250 5400
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-       0 0 1.00 60.00 120.00
-        5400 6840 5490 8100
 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
        0 0 1.00 60.00 120.00
         4860 8550 2970 8640
-2 1 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 2
-        6300 8280 7740 8100
+2 1 0 1 0 7 50 0 -1 0.000 0 0 7 1 0 2
+       2 1 1.00 60.00 120.00
+        6210 1890 3240 4680
+2 1 0 1 0 7 50 0 -1 0.000 0 0 7 1 0 2
+       2 1 1.00 60.00 120.00
+        5400 6840 5490 8100
+2 1 0 1 0 7 50 0 -1 0.000 0 0 7 1 0 2
+       2 1 1.00 60.00 120.00
+        2250 4590 2250 5400
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
-       0 0 1.00 60.00 120.00
-        5760 2340 5400 2520 5130 2160 5400 1620 5940 1530
+       2 1 1.00 60.00 120.00
+        6255 8775 7155 9135 8280 9225 9000 8910 9000 8280
         0.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
-       0 0 1.00 60.00 120.00
-        5220 2790 5040 3060 5220 3780 5400 6480
-        0.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
-       0 0 1.00 60.00 120.00
-        4680 3330 4320 3690 4410 4140 4950 4680 5310 5220
+       2 1 1.00 60.00 120.00
+        6390 8505 8010 8640 7515 7470 6525 7515 6075 8145
         0.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 7
-       0 0 1.00 60.00 120.00
-        1440 5850 900 5760 810 5310 900 4860 1710 4680 1980 5040
-        2160 5490
-        0.000 1.000 1.000 1.000 1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 6
+       2 1 1.00 60.00 120.00
+        7740 8280 7740 6300 7335 5760 5670 5760 5400 6120 5400 6300
+        0.000 1.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
-       0 0 1.00 60.00 120.00
-        810 5310 990 3870 1800 3690 2250 3960 2250 4320
+       2 1 1.00 60.00 120.00
+        9000 11700 9000 10890 9000 2790 9000 1890 7650 1620
         0.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
-       0 0 1.00 60.00 120.00
+       2 1 1.00 60.00 120.00
         7020 1980 7110 2700 5400 4410 5310 4770
         0.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
-       0 0 1.00 60.00 120.00
-        3150 5850 4500 5850 5040 5850 5310 6030 5400 6210
-        0.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 8
-       0 0 1.00 60.00 120.00
-        1800 8640 1530 8640 1170 9000 1170 12150 1530 12510 8550 12510
-        9000 12060 9000 11700
-        0.000 1.000 1.000 1.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
-       0 0 1.00 60.00 120.00
-        7830 9360 7830 9090 7560 8820 6390 8640
+       2 1 1.00 60.00 120.00
+        5220 2790 5040 3060 5220 3780 5400 6480
         0.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
-       0 0 1.00 60.00 120.00
-        9000 11700 9000 10890 9000 2790 9000 1890 7650 1620
+       2 1 1.00 60.00 120.00
+        5760 2340 5400 2520 5130 2160 5400 1620 5940 1530
+        0.000 1.000 1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
+       2 1 1.00 60.00 120.00
+        4680 3330 4320 3690 4410 4140 4950 4680 5310 5220
+        0.000 1.000 1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
+       2 1 1.00 60.00 120.00
+        3150 5850 4500 5850 5040 5850 5310 6030 5400 6210
         0.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
-       0 0 1.00 60.00 120.00
-        8010 8010 8730 7920 8910 7560 9000 6930
-        0.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 6
-       0 0 1.00 60.00 120.00
+       2 1 1.00 60.00 120.00
         5400 6840 5400 7110 5220 7470 4140 7740 3330 8550 3060 8640
         0.000 1.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 11
-       0 0 1.00 60.00 120.00
-        5490 8955 5400 9540 5715 10260 6030 10350 7650 10260 7920 9810
-        7830 6300 7560 5760 5670 5760 5400 6120 5400 6300
-        0.000 1.000 1.000 1.000 1.000 1.000 1.000 1.000
-        1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 8
+       2 1 1.00 60.00 120.00
+        1800 8640 1530 8640 1170 9000 1170 12150 1530 12510 8550 12510
+        9000 12060 9000 11700
+        0.000 1.000 1.000 1.000 1.000 1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 7
+       2 1 1.00 60.00 120.00
+        5445 9540 5445 10395 5760 11385 6435 11475 7200 11205 7110 10710
+        6525 9675
+        0.000 1.000 1.000 1.000 1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 7
+       2 1 1.00 60.00 120.00
+        5511 8955 5421 9540 5736 10260 6051 10350 6480 10260 6615 9675
+        6075 8865
+        0.000 1.000 1.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 6
-       0 0 1.00 60.00 120.00
+       2 1 1.00 60.00 120.00
         5490 10440 5400 10980 5130 11385 4050 11250 3600 8820 3330 8640
         0.000 1.000 1.000 1.000 1.000 0.000
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 5
+       2 1 1.00 60.00 120.00
+        810 5310 990 3870 1800 3690 2250 3960 2250 4320
+        0.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 7
-       0 0 1.00 60.00 120.00
-        5445 9540 5445 10395 5760 11385 6435 11475 7740 11340 7830 10530
-        7830 9720
+       2 1 1.00 60.00 120.00
+        1440 5850 900 5760 810 5310 900 4860 1710 4680 1980 5040
+        2160 5490
         0.000 1.000 1.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 6
-       0 0 1.00 60.00 120.00
-        6210 8820 6300 9180 6615 9855 7560 9720 7830 9585 7830 9450
-        0.000 1.000 1.000 1.000 1.000 0.000
 4 0 0 50 0 0 12 0.0000 4 135 1065 6255 1620 NO RECORD\001
-4 0 0 50 0 0 12 0.0000 4 135 480 6030 2250 TALK\001
 4 0 0 50 0 0 12 0.0000 4 135 705 5310 8550 PASSED\001
 4 0 0 50 0 0 12 0.0000 4 135 285 4500 4140 id'd\001
 4 0 0 50 0 0 12 0.0000 4 90 510 4320 3150 secure\001
@@ -137,33 +132,34 @@ Single
 4 0 0 50 0 0 12 0.0000 4 135 510 5580 7560 remind\001
 4 0 0 50 0 0 12 0.0000 4 135 735 4500 7380 unreliable\001
 4 0 0 50 0 0 12 0.0000 4 180 990 1980 8730 Delete Msgs\001
-4 0 0 50 0 0 12 0.0000 4 135 480 990 6030 TALK\001
 4 0 0 50 0 0 12 0.0000 4 135 555 3330 6030 IDENT\001
-4 0 0 50 0 0 12 0.0000 4 135 885 6390 8100 NEW MSG\001
-4 0 0 50 0 0 12 0.0000 4 135 285 7920 8910 late\001
-4 0 0 50 0 0 12 0.0000 4 90 360 7200 9000 soon\001
 4 0 0 50 0 0 12 0.0000 4 135 1425 1890 6480 DEL MSG is Error\001
 4 0 0 50 0 0 12 0.0000 4 135 1425 7470 1260 DEL MSG is Error\001
 4 0 0 50 0 0 12 0.0000 4 135 405 5490 2790 msgs\001
 4 0 0 50 0 0 12 0.0000 4 135 645 5220 3420 insecure\001
 4 0 0 50 0 0 12 0.0000 4 135 570 3510 3870 not id'd\001
 4 0 0 50 0 2 12 0.0000 4 180 3615 630 630 State diagram for !tell and related commands\001
-4 0 0 50 0 0 12 0.0000 4 180 1665 1890 6750 NEW MSG is ignored\001
-4 0 0 50 0 0 12 0.0000 4 135 810 3960 8460 DEL MSG\001
-4 0 0 50 0 0 12 0.0000 4 180 1665 7020 990 NEW MSG is ignored\001
 4 0 0 50 0 0 12 0.0000 4 150 480 5760 10080 pester\001
 4 0 0 50 0 1 12 0.0000 4 195 4485 3960 13050 $Id$\001
-4 0 0 50 0 0 12 0.0000 4 135 360 1080 6255 ACT\001
-4 0 0 50 0 0 12 0.0000 4 135 360 6390 9180 ACT\001
-4 0 0 50 0 0 12 0.0000 4 135 360 6120 2475 ACT\001
 4 0 0 50 0 0 12 0.0000 4 135 510 4905 10080 remind\001
 4 0 0 50 0 0 12 0.0000 4 135 735 4590 10935 very soon\001
 4 0 0 50 0 0 12 0.0000 4 150 1020 5715 10935 not very soon\001
-4 0 0 50 0 0 12 0.0000 4 135 480 5535 9225 TALK\001
-4 0 0 50 0 0 10 0.0000 4 135 2745 450 7740 ACT happens 750ms after user does anything\001
-4 0 0 50 0 0 10 0.0000 4 135 2730 540 7920 provided user doesn't vanish in the meantime\001
 4 0 0 50 0 0 10 0.0000 4 135 2880 540 7470 to actual in-channel speech (including emotes)\001
-4 0 0 50 0 0 12 0.0000 4 135 555 4410 8955 IDENT\001
 4 0 0 50 0 0 12 0.0000 4 180 735 4410 9135 is ignored\001
 4 0 0 50 0 0 10 0.0000 4 135 2790 450 7290 TALK happens immediately, but only applies\001
-4 0 0 50 0 0 10 0.0000 4 135 2850 450 8190 If user goes away, we go back to NO RECORD\001
+4 0 0 50 0 0 10 0.0000 4 135 2850 450 8010 If user goes away, we go back to NO RECORD\001
+4 0 0 50 0 0 10 0.0000 4 135 2865 540 8190 (if user is invisible this happens straight away)\001
+4 0 0 50 0 0 12 0.0000 4 135 360 1035 6075 ACT\001
+4 0 0 50 0 0 10 0.0000 4 135 3510 450 7740 ACT happens 750ms after user does anything (eg talking)\001
+4 0 0 50 0 0 12 0.0000 4 180 1665 1890 6705 NEW MSG is ignored\001
+4 0 0 50 0 0 12 0.0000 4 180 1920 1935 6930 TALK (per se) is ignored\001
+4 0 0 50 0 0 12 0.0000 4 180 1665 7020 1035 NEW MSG is ignored\001
+4 0 0 50 0 0 12 0.0000 4 180 1920 6615 810 TALK (per se) is ignored\001
+4 0 0 50 0 0 12 0.0000 4 135 555 4455 8955 IDENT\001
+4 0 0 50 0 0 12 0.0000 4 135 810 4050 8505 DEL MSG\001
+4 0 0 50 0 0 12 0.0000 4 135 285 7785 7830 late\001
+4 0 0 50 0 0 12 0.0000 4 90 360 7155 7920 soon\001
+4 0 0 50 0 0 12 0.0000 4 135 885 6525 8865 NEW MSG\001
+4 0 0 50 0 0 12 0.0000 4 135 360 6525 8460 ACT\001
+4 0 0 50 0 0 12 0.0000 4 135 360 6030 2250 ACT\001
+4 0 0 50 0 0 12 0.0000 4 135 480 5535 9360 TALK\001