Fix .last command formatting

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index 50952f182b4e8f13ae13d4a641a442bcd88ed529..cf21935f8240ccc025b24e714829942d852ee5b1 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -33,6 +33,7 @@ function sp_reset(type)
        if (type >= 1) {
                sp_state    = "bid" #     {new,join,bid,pass,play}
                sp_broken   = 0     #     Whether spades are broken
+               delete sp_last      # [x] The result of the last hand
                delete sp_hands     # [p] Each players cards
                delete sp_looked    # [i] Whether a player has looked a their cards
                delete sp_bids      # [i] Each players bid
@@ -83,6 +84,7 @@ function sp_save(file,        game)
        # Per round
        game["state"]   = sp_state;
        game["broken"]  = sp_broken;
+       json_copy(game, "last",    sp_last);
        json_copy(game, "looked",  sp_looked);
        json_copy(game, "bids",    sp_bids);
        json_copy(game, "nil",     sp_nil);
@@ -123,6 +125,7 @@ function sp_load(file,      game)
        # Per round
        sp_state   = game["state"];
        sp_broken  = game["broken"];
+       sp_acopy(sp_last,    game["last"]);
        sp_acopy(sp_looked,  game["looked"]);
        sp_acopy(sp_bids,    game["bids"]);
        sp_acopy(sp_nil,     game["nil"]);
@@ -334,6 +337,8 @@ function sp_play(card,      winner, pi)
                sp_tricks[pi]++
                say(sp_pile[winner] " wins with " sp_pretty(winner, FROM) \
                    " (" sp_pretty(sp_piles, FROM) ")")
+               sp_last["player"] = sp_pile[winner];
+               sp_last["pile"]   = sp_piles;
                sp_next(sp_pile[winner])
                sp_reset(0)
        }
@@ -428,6 +433,7 @@ AUTH == OWNER &&
        say(".bid [n] -- bid for <n> tricks")
        say(".pass [card] -- pass a card to your partner")
        say(".play [card] -- play a card")
+       say(".last -- show who took the previous trick")
        say(".turn -- check whose turn it is")
        say(".bids -- check what everyone bid")
        say(".tricks -- check how many trick have been taken")
@@ -735,6 +741,14 @@ sp_state == "play" &&
        }
 }
 
+/^\.last/ && sp_state == "play" {
+       if (!isarray(sp_last))
+               say("No tricks have been taken!");
+       else
+               say(sp_last["player"] " took " \
+                   sp_pretty(sp_last["hand"], FROM));
+}
+
 /^\.bids/ && sp_state == "bid" ||
 /^\.turn/ && sp_state ~ "(bid|pass|play)" {
        _bids  = sp_bidders()