Display spades score and bag limits

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index ced873493f3c3e9bc80bc088f0df0d2c47651736..ae7393a813a6998213b946dedc67a3cdb8d1ed3f 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -17,7 +17,7 @@ function sp_init(cards, tmp0, tmp1)
 function sp_reset(type)
 {
        # Per message
-       if (type >= 0) {
+       if (type <  0) {
                sp_from     = ""    #    The speakers player name
                sp_valid    = ""    #    It is the speaker turn
        }
@@ -102,7 +102,8 @@ function sp_save(file,      game)
 function sp_load(file, game)
 {
        # Load
-       json_load(file, game);
+       if (!json_load(file, game))
+               return
 
        # Per hand
        sp_suit    = game["suit"];
@@ -168,13 +169,13 @@ function sp_deal( shuf)
        say("Bidding starts with " sp_player "!")
 }
 
-function sp_hand(who,  sort, str)
+function sp_hand(to, who,      sort, str)
 {
        asorti(sp_hands[who], sort, "sp_csort")
        for (i=0; i<length(sort); i++)
                str = str "" sprintf("%4s", sort[i])
        gsub(/^ +| +$/, "", str)
-       return sp_pretty(str, who)
+       return sp_pretty(str, to)
 }
 
 function sp_hasa(who, expr)
@@ -346,13 +347,13 @@ CMD == "PRIVMSG" &&
        say("Spades! " sp_pretty("As,Ah,Ad,Ac", FROM))
 }
 
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.savegame/ {
        sp_save("var/sp_save.json");
        say("Game saved.")
 }
 
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.loadgame/ {
        sp_load("var/sp_save.json");
        say("Game loaded.")
@@ -377,7 +378,7 @@ FROM == OWNER &&
 }
 
 # Debugging
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.deal (\w+) (.*)/ {
        delete sp_hands[$2]
        for (i=3; i<=NF; i++)
@@ -401,7 +402,7 @@ FROM == OWNER &&
        }
 }
 
-(sp_from == sp_owner || FROM == OWNER) &&
+(sp_from == sp_owner || AUTH == OWNER) &&
 /^\.endgame$/ {
        if (sp_state == "new") {
                reply("There is no game in progress.")
@@ -463,7 +464,7 @@ sp_state == "bid" &&
                        say("Bidding goes to " sp_player "!")
                } else {
                        for (p in sp_players)
-                               say(p, "You have: " sp_hand(p))
+                               say(p, "You have: " sp_hand(p, p))
                        sp_state = "play"
                        for (i=0; i<2; i++) {
                                if (sp_nil[i] == 2 || sp_nil[i+2] == 2) {
@@ -515,7 +516,7 @@ sp_state == "pass" &&
                }
                say(sp_channel, "Cards have been passed, play starts with " sp_player "!")
                for (p in sp_players)
-                       say(p, "You have: " sp_hand(p))
+                       say(p, "You have: " sp_hand(p, p))
                sp_state = "play"
        }
 }
@@ -526,7 +527,7 @@ sp_state ~ "(play|bid)" &&
                say(".slap " FROM ", you are not playing.")
        } else {
                sp_looked[sp_players[sp_from]] = 1
-               say(FROM, "You have: " sp_hand(sp_from))
+               say(FROM, "You have: " sp_hand(FROM, sp_from))
        }
 }
 
@@ -553,7 +554,7 @@ sp_state == "play" &&
                sp_play(card)
                if (sp_state == "play") {
                        if (length(sp_hands[sp_from]))
-                               say(FROM, "You have: " sp_hand(sp_from))
+                               say(FROM, "You have: " sp_hand(FROM, sp_from))
                        if (sp_piles)
                                say(sp_player ": it is your turn! " \
                                    "(" sp_pretty(sp_piles, sp_player) ")")
@@ -603,6 +604,9 @@ sp_state == "play" &&
                    sp_order[2] " " sp_order[3])
        }
        if (sp_state == "bid" || sp_state == "play") {
+               say("playing to: " \
+                   sp_playto " points, " \
+                   sp_limit  " bags")
                say(sp_team(0) ": " \
                    int(sp_scores[0]) " points, " \
                    int(sp_bags(0))   " bags")