From edb99489b80ae61238e6a692cc79686d08c17806 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 11 Oct 2015 22:04:25 +0000 Subject: [PATCH] Fix .last command formatting --- spades.awk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/spades.awk b/spades.awk index fe39906..cf21935 100644 --- a/spades.awk +++ b/spades.awk @@ -33,7 +33,7 @@ function sp_reset(type) if (type >= 1) { sp_state = "bid" # {new,join,bid,pass,play} sp_broken = 0 # Whether spades are broken - sp_last = "" # The result of the last hand + 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 @@ -84,7 +84,7 @@ function sp_save(file, game) # Per round game["state"] = sp_state; game["broken"] = sp_broken; - game["last"] = sp_last; + json_copy(game, "last", sp_last); json_copy(game, "looked", sp_looked); json_copy(game, "bids", sp_bids); json_copy(game, "nil", sp_nil); @@ -125,7 +125,7 @@ function sp_load(file, game) # Per round sp_state = game["state"]; sp_broken = game["broken"]; - sp_last = game["last"]; + sp_acopy(sp_last, game["last"]); sp_acopy(sp_looked, game["looked"]); sp_acopy(sp_bids, game["bids"]); sp_acopy(sp_nil, game["nil"]); @@ -337,7 +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 = sp_pile[winner] " took " sp_piles + sp_last["player"] = sp_pile[winner]; + sp_last["pile"] = sp_piles; sp_next(sp_pile[winner]) sp_reset(0) } @@ -741,10 +742,11 @@ sp_state == "play" && } /^\.last/ && sp_state == "play" { - if (!sp_last) + if (!isarray(sp_last)) say("No tricks have been taken!"); else - say(sp_pretty(sp_last, FROM)); + say(sp_last["player"] " took " \ + sp_pretty(sp_last["hand"], FROM)); } /^\.bids/ && sp_state == "bid" || -- 2.43.2