From f58fc12a65b6270615da8a81ff6f554c5802fe73 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Tue, 20 Aug 2013 03:21:01 +0000 Subject: [PATCH] Reorder status commands --- spades.awk | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/spades.awk b/spades.awk index 1509117..a8c2749 100644 --- a/spades.awk +++ b/spades.awk @@ -636,22 +636,6 @@ sp_state == "play" && } } -/^\.bids$/ && sp_state ~ "(pass|play)" { - say(sp_order[0] " bid " sp_bids[0] ", " \ - sp_order[2] " bid " sp_bids[2] ", " \ - "total: " sp_bids[0] + sp_bids[2]) - say(sp_order[1] " bid " sp_bids[1] ", " \ - sp_order[3] " bid " sp_bids[3] ", " \ - "total: " sp_bids[1] + sp_bids[3]) -} - -/^\.tricks$/ && sp_state == "play" { - say(sp_order[0] " took " int(sp_tricks[0]) "/" int(sp_bids[0]) ", " \ - sp_order[2] " took " int(sp_tricks[2]) "/" int(sp_bids[2])) - say(sp_order[1] " took " int(sp_tricks[1]) "/" int(sp_bids[1]) ", " \ - sp_order[3] " took " int(sp_tricks[3]) "/" int(sp_bids[3])) -} - /^\.turn/ && sp_state ~ "(bid|pass|play)" { _bids = sp_bidders() _pile = sp_pretty(sp_piles, FROM) @@ -668,6 +652,22 @@ sp_state == "play" && say("Waiting for " sp_order[_i] " to pass a card!") } +/^\.bids$/ && sp_state ~ "(pass|play)" { + say(sp_order[0] " bid " sp_bids[0] ", " \ + sp_order[2] " bid " sp_bids[2] ", " \ + "total: " sp_bids[0] + sp_bids[2]) + say(sp_order[1] " bid " sp_bids[1] ", " \ + sp_order[3] " bid " sp_bids[3] ", " \ + "total: " sp_bids[1] + sp_bids[3]) +} + +/^\.tricks$/ && sp_state == "play" { + say(sp_order[0] " took " int(sp_tricks[0]) "/" int(sp_bids[0]) ", " \ + sp_order[2] " took " int(sp_tricks[2]) "/" int(sp_bids[2])) + say(sp_order[1] " took " int(sp_tricks[1]) "/" int(sp_bids[1]) ", " \ + sp_order[3] " took " int(sp_tricks[3]) "/" int(sp_bids[3])) +} + (TO == NICK || DST == sp_channel) && /^\.(score|status)$/ { if (sp_state == "new") { -- 2.43.2