Say score during join mode too

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index 3433716990e1ae403d76c6812af01d8211ce0fe8..d0a626063962d7b1e31611e6f72714fed085e254 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -49,7 +49,7 @@ function sp_reset(type)
                sp_dealer   =-1     #     Who is dealing this round
                sp_turn     = 0     #     Index of who's turn it is
                sp_player   = ""    #     Who's turn it is
-               sp_limit    = 10    #     Bag out limit
+               sp_limit    = 10    #     Bag out limit / nil bonus
                delete sp_hands     # [p] Each players cards
                delete sp_players   # [p] Player names players["name"] -> i
                delete sp_auths     # [c] Player auth names auths["auth"] -> "name"
@@ -273,7 +273,7 @@ function sp_score(  bids, times, tricks)
                     sp_nil[i] == 2 && !sp_tricks[i] ? "makes blind nil!" :
                     sp_nil[i] == 2 &&  sp_tricks[i] ? "fails miserably at blind nil!" :
                                                       "unknown"))
-               sp_scores[i%2] += 100 * sp_nil[i] * \
+               sp_scores[i%2] += sp_limit * 10 * sp_nil[i] * \
                        (sp_tricks[i] == 0 ? 1 : -1)
        }
 }
@@ -313,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 {
@@ -397,7 +395,7 @@ AUTH == OWNER &&
 
 AUTH == OWNER &&
 sp_state == "play" &&
-/^\.play (\w+) (\S+)$/ {
+/^\.force (\w+) (\S+)$/ {
        say(sp_channel, FROM " is cheating for " $2)
        sp_from = $2
        sp_play($3)
@@ -406,17 +404,17 @@ sp_state == "play" &&
 
 
 # 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 "!")
        }
 }
 
@@ -551,8 +549,9 @@ sp_state ~ "(bid|pass|play)" &&
 
 sp_valid &&
 sp_state == "play" &&
-/^\.play (\S+)$/ {
+/^\.play (\S+)/ {
        _card = $2
+       gsub(/[^A-Za-z0-9]/, "", _card);
        if (!(_card in sp_deck)) {
                reply("Invalid card")
        }
@@ -619,15 +618,17 @@ sp_state == "play" &&
        if (sp_state == "new") {
                say("There is no game in progress")
        }
+       if (sp_state ~ "join|bid|pass|play") {
+               say("Playing to: " \
+                   sp_playto " points, " \
+                   sp_limit  " bags")
+       }
        if (sp_state == "join") {
                say("Waiting for players: " \
                    sp_order[0] " " sp_order[1] " " \
                    sp_order[2] " " sp_order[3])
        }
        if (sp_state ~ "bid|pass|play") {
-               say("Playing to: " \
-                   sp_playto " points, " \
-                   sp_limit  " bags")
                say(sp_team(0) ": " \
                    int(sp_scores[0]) " points, " \
                    int(sp_bags(0))   " bags")