Rearrange sp_say

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index 08f2776277aebd4cf895d10c44df417e09e91c62..04a03a97dd984d91fa6af2388769cab2b268ef17 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -62,6 +62,7 @@ function sp_reset(type)
        if (type >= 3) {
                sp_channel  = ""    #     channel to play in
                sp_log      = ""    #     Log file name
+               sp_sock     = ""    #     UDP log socket
                delete sp_notify    # [p] E-mail notification address
        }
 }
@@ -158,9 +159,10 @@ function sp_load(file,     game)
 
 function sp_say(msg)
 {
+       say(sp_channel, msg)
+       print msg |& sp_sock
        print strftime("%Y-%m-%d %H:%M:%S | ") msg >> "logs/" sp_log
        fflush("logs/" sp_log)
-       say(sp_channel, msg);
 }
 
 function sp_pretty(cards, who)
@@ -475,7 +477,9 @@ BEGIN {
        srand(seed)
        sp_init()
        sp_reset(2)
-       sp_load("var/sp_cur.json");
+       sp_load("var/sp_cur.json")
+       sp_sock = "/inet/udp/0/localhost/6173"
+       print "starting rhawk" |& sp_sock
        #if (sp_channel)
        #       sp_say("Game restored.")
 }
@@ -714,7 +718,7 @@ sp_state ~ "(bid|pass|play)" &&
        for (_i in sp_share)
                _lines[sp_share[_i]] = _lines[sp_share[_i]] " " _i
        for (_i in _lines)
-               sp_say(_i " allowed:" _lines[_i])
+               say(_i " allowed:" _lines[_i])
 }
 
 !sp_valid &&
@@ -860,13 +864,21 @@ sp_state == "play" &&
 
 /^\.bids/ && sp_state == "bid" ||
 /^\.turn/ && sp_state ~ "(bid|pass|play)" {
-       _bids  = sp_bidders()
-       _pile  = sp_pretty(sp_piles, FROM)
-       _extra = ""
-
-       for (_i in sp_share)
-               if (/!/ && sp_share[_i] == sp_player)
+       _bids   = sp_bidders()
+       _pile   = sp_pretty(sp_piles, FROM)
+       _extra  = ""
+       delete _notify
+
+       if (/!!/)
+               _notify[0] = sp_player
+       for (_i in sp_share) {
+               if (sp_share[_i] != sp_player)
+                       continue
+               if (/!/)
                        _extra = _extra " " _i "!"
+               if (/!!!/)
+                       _notify[length(_notify)] = _i
+       }
 
        if (sp_state == "bid" && !_bids)
                say("It is " sp_player "'s bid!" _extra)
@@ -877,23 +889,25 @@ sp_state == "play" &&
        if (sp_state == "play" && _pile)
                say("It is " sp_player "'s turn!" _extra " (" _pile ")")
 
+       if (sp_state == "bid" || sp_state == "play") {
+               for (_i in _notify) {
+                       if (_notify[_i] in sp_notify) {
+                               _bids = _bids ? _bids    : "none"
+                               _pile = _pile ? sp_piles : "none"
+                               mail_send(sp_notify[_notify[_i]],     \
+                                       "It is your " sp_state "!", \
+                                       "Bids so far:  " _bids "\n" \
+                                       "Cards played: " _pile)
+                               say("Notified " _notify[_i] " at " sp_notify[_notify[_i]])
+                       } else {
+                               say("No email address for " _notify[_i])
+                       }
+               }
+       }
+
        for (_i=0; sp_state == "pass" && _i<4; _i++)
                if (sp_passer(_i) && !sp_pass[_i])
                        say("Waiting for " sp_order[_i] " to pass a card!")
-
-       if (/!!/ && (sp_state == "bid" || sp_state == "play")) {
-               if (sp_player in sp_notify) {
-                       _bids = _bids ? _bids    : "none"
-                       _pile = _pile ? sp_piles : "none"
-                       mail_send(sp_notify[sp_player],     \
-                               "It is your " sp_state "!", \
-                               "Bids so far:  " _bids "\n" \
-                               "Cards played: " _pile)
-                       say("Notified " sp_player " at " sp_notify[sp_player])
-               } else {
-                       say("No email address for " sp_player)
-               }
-       }
 }
 
 /^\.bids$/ && sp_state ~ "(pass|play)" {