Fix broken playto scores

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index 418b238222803510815bbc2e04f5e7c4ebbee4c6..8475bf9036fece6785b410f4f4e8253018ba71bf 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -245,15 +245,16 @@ function sp_bidders(      i, turn, bid, bids)
        return bids
 }
 
-function sp_score(     bids, tricks)
+function sp_score(     bids, times, tricks)
 {
        for (i=0; i<2; i++) {
                bids   = sp_bids[i]   + sp_bids[i+2]
                tricks = sp_tricks[i] + sp_tricks[i+2]
                bags   = tricks - bids
-               if (sp_bags(i) + bags >= sp_limit) {
-                       say(sp_team(i) " bag out")
-                       sp_scores[i] -= sp_limit * 10
+               times  = int((sp_bags(i) + bags) / sp_limit)
+               if (times > 0) {
+                       say(sp_team(i) " bag" (times>1?" way ":" ") "out")
+                       sp_scores[i] -= sp_limit * 10 * times;
                }
                if (tricks >= bids) {
                        say(sp_team(i) " make their bid: " tricks "/" bids)
@@ -312,12 +313,10 @@ function sp_play(card,    winner, pi)
                        say("Game over!")
                        winner = sp_scores[0] > sp_scores[1] ? 0 : 1
                        looser = !winner
-                       say(sp_team(winner) " wins the game " \
+                       say(CHANNEL, sp_team(winner) " wins the game " \
                            sp_scores[winner] " to " sp_scores[looser])
-                       say(sp_order[winner+0] "++")
-                       say(sp_order[winner+2] "++")
-                       say(sp_order[looser+0] "--")
-                       say(sp_order[looser+2] "--")
+                       say(CHANNEL, sp_order[winner+0] "++")
+                       say(CHANNEL, sp_order[winner+2] "++")
                        sp_reset(2)
 
                } else {
@@ -387,25 +386,35 @@ AUTH == OWNER &&
 # Debugging
 AUTH == OWNER &&
 /^\.deal (\w+) (.*)/ {
+       say(sp_channel, FROM " is cheating for " $2)
        delete sp_hands[$2]
        for (i=3; i<=NF; i++)
                sp_hands[$2][$i] = 1
+       next
+}
+
+AUTH == OWNER &&
+sp_state == "play" &&
+/^\.force (\w+) (\S+)$/ {
        say(sp_channel, FROM " is cheating for " $2)
+       sp_from = $2
+       sp_play($3)
+       next
 }
 
 
 # Setup
-/^\.newgame ?([0-9]+)?/ {
+/^\.newgame ?([0-9]+)?$/ {
        if (sp_state != "new") {
                reply("There is already a game in progress.")
        } else {
+               $1         = ".join"
                sp_owner   = FROM
                sp_playto  = $2 ? $2 : 200
                sp_limit   = sp_playto > 200 ? 10 : 5;
                sp_state   = "join"
                sp_channel = DST
                say(sp_owner " starts a game of Spades to " sp_playto " with " sp_limit " bags!")
-               #say("#rhnoise", sp_owner " starts a game of Spades in " DST "!")
        }
 }
 
@@ -540,25 +549,26 @@ sp_state ~ "(bid|pass|play)" &&
 
 sp_valid &&
 sp_state == "play" &&
-/^\.play (\S+)$/ {
-       card = $2
-       if (!(card in sp_deck)) {
+/^\.play (\S+)/ {
+       _card = $2
+       gsub(/[^A-Za-z0-9]/, "", _card);
+       if (!(_card in sp_deck)) {
                reply("Invalid card")
        }
-       else if (!(card in sp_hands[sp_from])) {
+       else if (!(_card in sp_hands[sp_from])) {
                reply("You do not have that card")
        }
-       else if (sp_suit && card !~ sp_suit && sp_hasa(sp_from, sp_suit)) {
+       else if (sp_suit && _card !~ sp_suit && sp_hasa(sp_from, sp_suit)) {
                reply("You must follow suit (" sp_suit ")")
        }
-       else if (card ~ /s/ && length(sp_hands[sp_from]) == 13 && sp_hasa(sp_from, "[^s]$")) {
+       else if (_card ~ /s/ && length(sp_hands[sp_from]) == 13 && sp_hasa(sp_from, "[^s]$")) {
                reply("You cannot trump on the first hand")
        }
-       else if (card ~ /s/ && length(sp_pile) == 0 && sp_hasa(sp_from, "[^s]$") && !sp_broken) {
+       else if (_card ~ /s/ && length(sp_pile) == 0 && sp_hasa(sp_from, "[^s]$") && !sp_broken) {
                reply("Spades have not been broken")
        }
        else {
-               sp_play(card)
+               sp_play(_card)
                if (sp_state == "play") {
                        if (length(sp_hands[sp_from]))
                                say(FROM, "You have: " sp_hand(FROM, sp_from))