Abandon crappy changes to diagram. Sort out repeated notification problems when...

diff --git a/telling.fig b/telling.fig
index a8a80bfd6038a5480cc04fa4b896543e94cdcb8d..6a02246952a08e8bb64d1b902e8b172d47232867 100644 (file)
--- a/telling.fig
+++ b/telling.fig
@@ -8,7 +8,6 @@ Single
 -2
 1200 2
 6 450 11160 3060 13050
-6 450 11160 3060 13050
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 1305 11655 405 225 900 11430 1710 11880
 2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
         450 11160 3060 11160 3060 13050 450 13050 450 11160
@@ -31,41 +30,54 @@ Single
 4 0 0 50 0 0 12 0.0000 4 135 555 630 12510 inverse\001
 4 0 0 50 0 1 12 0.0000 4 180 270 540 11340 key\001
 -6
--6
-6 810 3060 4320 4275
-4 0 0 50 0 0 10 0.0000 4 135 3510 810 3735 ACT happens 750ms after user does anything (eg talking)\001
-4 0 0 50 0 0 10 0.0000 4 135 2865 900 3375 (if user is invisible this happens straight away)\001
-4 0 0 50 0 0 10 0.0000 4 135 2790 810 4050 TALK happens immediately, but only applies\001
-4 0 0 50 0 0 10 0.0000 4 135 2880 900 4230 to actual in-channel speech (including emotes)\001
-4 0 0 50 0 0 10 0.0000 4 135 3075 810 3195 If user goes away, we go back to UNDELIVERED\001
--6
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 2182 1575 922 450 1260 1125 3105 2025
-1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 2182 1575 877 405 1305 1170 3060 1980
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 7200 3240 810 405 6390 2835 8010 3645
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 2700 7560 810 405 3510 7155 1890 7965
 1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 5985 10170 765 405 6750 9765 5220 10575
+1 2 0 1 0 7 50 0 -1 0.000 1 0.0000 2182 1575 877 405 1305 1170 3060 1980
+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
+        6570 3555 3600 6345
 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
         5760 8505 5850 9765
+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
+        2610 6255 2610 7065
+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
+        3420 6615 2880 7155
 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
         5220 10215 2475 10215
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 8
        2 1 1.00 60.00 120.00
-        1035 10215 855 10215 450 10080 450 9450 450 3150 450 2430
+        1035 10215 855 10215 450 10170 450 9630 450 3150 450 2430
         1035 2070 1350 1800
         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 5
+       2 1 1.00 60.00 120.00
+        6750 10170 8370 10305 7875 9135 6885 9180 6435 9810
+        0.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
+        8100 9945 8100 7965 7695 7425 6030 7425 5760 7785 5760 7965
+        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
+       2 1 1.00 60.00 120.00
+        7380 3645 7470 4365 5760 6075 5670 6435
+        0.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
        2 1 1.00 60.00 120.00
         5580 4455 5400 4725 5580 5445 5760 8145
         0.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
-        5040 4995 4680 5355 4770 5940 5445 6120 5670 6525
+        5040 4995 4680 5355 4770 5805 5310 6345 5670 6885
         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
-        3510 7515 4860 7515 5400 7515 5670 7695 5715 7875
+        3510 7515 4860 7515 5400 7515 5670 7695 5760 7875
         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
        2 1 1.00 60.00 120.00
@@ -77,6 +89,15 @@ Single
         5871 10620 5781 11205 6096 11925 6411 12015 6840 11925 6975 11340
         6435 10530
         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 5
+       2 1 1.00 60.00 120.00
+        1170 6975 1350 5535 2160 5355 2610 5625 2610 5985
+        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
+       2 1 1.00 60.00 120.00
+        1800 7515 1260 7425 1170 6975 1260 6525 2070 6345 2340 6705
+        2520 7155
+        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
         6660 10395 6930 10575 7650 10575 8235 10575 8910 10530 8910 9990
@@ -98,68 +119,28 @@ Single
         5760 8505 5760 8775 5625 9000 5445 9000 3600 9000 3375 9225
         3150 10215 2565 10215
         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 2
-       2 1 1.00 60.00 120.00
-        7155 2385 7155 2835
-        0.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 1575 6435 1575 6975 1575 7155 1800 7155 2070
+        6300 3825 6030 4050 6345 4410 6885 4050 6930 3645
         0.000 1.000 1.000 1.000 0.000
-3 0 0 1 0 7 50 0 -1 0.000 0 1 0 9
-       2 1 1.00 60.00 120.00
-        8910 10035 8910 7335 8910 2610 8910 1980 8775 1575 8505 1575
-        7650 1575 7380 1575 7200 1845
-        0.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 5
        2 1 1.00 60.00 120.00
-        7740 2925 8145 2385 8145 1845 8055 1665 7875 1575
+        3105 1575 6705 1575 7110 1575 7155 1890 7155 2070
         0.000 1.000 1.000 1.000 0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 2
        2 1 1.00 60.00 120.00
-        2025 6840 2205 7245
+        7155 2385 7155 2835
         0.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
-        6570 3555 3915 6120 3645 6120 3195 6120 2295 6120 1935 6255
-        1980 6570
-        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 5
-       2 1 1.00 60.00 120.00
-        3522 6120 2802 6120 2655 6345 2700 6750 2700 7155
-        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
-        3195 7245 3870 6570 3870 6300 3690 6165 3555 6120
-        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
-       2 1 1.00 60.00 120.00
-        5670 6840 5805 7245 6390 7335 6885 7560 6930 7965 6930 9045
-        6930 9360 6480 9855
-        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 10
+3 0 0 1 0 7 50 0 -1 0.000 0 1 0 9
        2 1 1.00 60.00 120.00
-        6750 10170 7425 10170 8100 10125 8100 9135 8100 7200 8100 6030
-        7470 6030 6570 6030 5985 6030 5670 6435
+        8910 10035 8910 7335 8910 4455 8910 2250 8910 1575 8370 1575
+        7605 1575 7245 1575 7155 1845
         0.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 2
-       2 1 1.00 60.00 120.00
-        8100 8550 8100 7875
-        0.000 0.000
+        0.000
 3 0 0 1 0 7 50 0 -1 0.000 0 1 0 4
        2 1 1.00 60.00 120.00
-        7155 3645 7155 4365 7155 4860 5850 5805
+        8010 3240 8505 3240 8775 3240 8910 2880
         0.000 1.000 1.000 0.000
-3 0 2 1 0 7 50 0 -1 3.000 0 1 0 2
-       2 1 1.00 60.00 120.00
-        5850 5805 4995 6435
-        0.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
-        4995 6435 4860 6570 4680 6705 4680 7110 4680 7380 4995 7515
-        0.000 1.000 1.000 1.000 1.000 0.000
 4 0 0 50 0 2 12 0.0000 4 180 3615 990 630 State diagram for !tell and related commands\001
 4 0 0 50 0 0 12 0.0000 4 135 1305 1530 1755 NO MESSAGES\001
 4 0 0 50 0 0 12 0.0000 4 135 1245 3240 1485 MSGS ARRIVE\001
@@ -168,22 +149,28 @@ Single
 4 0 0 50 0 0 12 0.0000 4 135 285 4860 5805 id'd\001
 4 0 0 50 0 0 12 0.0000 4 90 510 4680 4815 secure\001
 4 0 0 50 0 0 12 0.0000 4 135 1110 2160 7605 MENTIONED\001
-4 0 0 50 0 0 12 0.0000 4 135 555 7470 3915 IDENT\001
+4 0 0 50 0 0 12 0.0000 4 135 630 3150 6525 Mention\001
+4 0 0 50 0 0 12 0.0000 4 180 1125 1980 6165 Mention Again\001
+4 0 0 50 0 0 12 0.0000 4 90 360 1530 6615 soon\001
 4 0 0 50 0 0 12 0.0000 4 180 855 5400 8415 Pass Msgs\001
 4 0 0 50 0 0 12 0.0000 4 150 480 5850 9045 pester\001
 4 0 0 50 0 0 12 0.0000 4 135 510 5940 9225 remind\001
 4 0 0 50 0 0 12 0.0000 4 135 555 3690 7695 IDENT\001
 4 0 0 50 0 0 12 0.0000 4 135 645 5580 5085 insecure\001
+4 0 0 50 0 0 12 0.0000 4 135 570 3870 5535 not id'd\001
 4 0 0 50 0 0 12 0.0000 4 150 480 6120 11745 pester\001
 4 0 0 50 0 0 12 0.0000 4 135 510 5265 11745 remind\001
 4 0 0 50 0 0 12 0.0000 4 135 735 4950 12600 very soon\001
 4 0 0 50 0 0 12 0.0000 4 150 1020 6075 12600 not very soon\001
 4 0 0 50 0 0 12 0.0000 4 180 735 4770 10800 is ignored\001
+4 0 0 50 0 0 12 0.0000 4 135 360 1395 7740 ACT\001
 4 0 0 50 0 0 12 0.0000 4 135 555 4815 10620 IDENT\001
+4 0 0 50 0 0 12 0.0000 4 135 285 8145 9495 late\001
+4 0 0 50 0 0 12 0.0000 4 90 360 7515 9585 soon\001
 4 0 0 50 0 0 12 0.0000 4 135 360 6885 10125 ACT\001
-4 0 0 50 0 0 12 0.0000 4 135 360 6390 3915 ACT\001
 4 0 0 50 0 0 12 0.0000 4 135 480 5895 11025 TALK\001
 4 0 0 50 0 0 12 0.0000 4 135 990 6705 3420 MESSAGES\001
+4 0 0 50 0 0 12 0.0000 4 135 285 1395 6255 late\001
 4 0 0 50 0 0 12 0.0000 4 135 915 4275 10170 DEL MSGS\001
 4 0 0 50 0 0 12 0.0000 4 135 1530 1305 8145 DEL MSGS is Error\001
 4 0 0 50 0 0 12 0.0000 4 180 1260 1350 8595 TALK is ignored\001
@@ -194,18 +181,21 @@ Single
 4 0 0 50 0 0 12 0.0000 4 180 1260 1170 10260 Delete All Msgs\001
 4 0 0 50 0 0 12 0.0000 4 135 1245 6975 10755 MSGS ARRIVE\001
 4 0 0 50 0 0 12 0.0000 4 180 2025 1305 8370 MSGS ARRIVE is ignored\001
-4 0 0 50 0 0 12 0.0000 4 135 930 6660 2295 Reset Timer\001
-4 0 0 50 0 0 12 0.0000 4 180 1260 4995 3420 TALK is ignored\001
-4 0 0 50 0 0 12 0.0000 4 135 1530 4725 3195 DEL MSGS is Error\001
-4 0 0 50 0 0 12 0.0000 4 135 690 7875 2970 ARRIVE\001
-4 0 0 50 0 0 12 0.0000 4 135 510 8055 2745 MSGS\001
-4 0 0 50 0 1 10 0.0000 4 165 3675 5400 585 $Id: telling.fig,v 1.1.2.8 2002-02-13 14:17:38 ijackson Exp $\001
-4 0 0 50 0 0 12 0.0000 4 135 1320 6570 3240 UNDELIVERED\001
+4 0 0 50 0 0 12 0.0000 4 135 360 6030 3645 ACT\001
+4 0 0 50 0 0 12 0.0000 4 135 1530 4770 3150 DEL MSGS is Error\001
+4 0 0 50 0 0 12 0.0000 4 135 285 5580 4095 late\001
+4 0 0 50 0 0 12 0.0000 4 90 360 6165 4455 soon\001
+4 0 0 50 0 0 12 0.0000 4 135 690 8055 3645 ARRIVE\001
+4 0 0 50 0 0 12 0.0000 4 135 510 8100 3465 MSGS\001
+4 0 0 50 0 0 12 0.0000 4 135 555 7470 4050 IDENT\001
+4 0 0 50 0 0 12 0.0000 4 180 1260 5220 2925 TALK is ignored\001
+4 0 0 50 0 1 10 0.0000 4 165 3675 5265 585 $Id: telling.fig,v 1.1.2.9 2002-02-13 15:20:24 ijackson Exp $\001
+4 0 0 50 0 0 10 0.0000 4 135 3510 810 3915 ACT happens 750ms after user does anything (eg talking)\001
+4 0 0 50 0 0 10 0.0000 4 135 2865 900 3555 (if user is invisible this happens straight away)\001
+4 0 0 50 0 0 10 0.0000 4 135 2790 810 4230 TALK happens immediately, but only applies\001
+4 0 0 50 0 0 10 0.0000 4 135 2880 900 4410 to actual in-channel speech (including emotes)\001
 4 0 0 50 0 0 12 0.0000 4 135 1320 1530 1530 UNDELIVERED\001
-4 0 0 50 0 0 12 0.0000 4 135 570 4005 5355 not id'd\001
-4 0 0 50 0 0 12 0.0000 4 135 630 1575 6750 Mention\001
-4 0 0 50 0 0 12 0.0000 4 135 285 2205 6030 late\001
-4 0 0 50 0 0 12 0.0000 4 90 360 2790 6525 soon\001
-4 0 0 50 0 0 12 0.0000 4 135 360 3420 7200 ACT\001
-4 0 0 50 0 0 12 0.0000 4 90 360 5895 7155 soon\001
-4 0 0 50 0 0 12 0.0000 4 135 285 5355 7155 late\001
+4 0 0 50 0 0 12 0.0000 4 135 1320 6525 3240 UNDELIVERED\001
+4 0 0 50 0 0 10 0.0000 4 135 3075 810 3375 If user goes away, we go back to UNDELIVERED\001
+4 0 0 50 0 0 10 0.0000 4 105 3285 810 4680 Timer records time since we last did Mention or Pass.\001
+4 0 0 50 0 0 12 0.0000 4 180 1710 6300 2295 Reset Timer to Infinity\001