Minor spades bug fixes

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index 58695c378874326e7ae2d854476d48c4237f3bd0..e5516e0710079d6575d33603f95be6254fc557a6 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -43,13 +43,13 @@ function sp_reset(type)
        # Per game
        if (type >= 2) {
                sp_channel  = ""    #     channel to play in
-               sp_state    = "new" #     {new,join,bid,play}
+               sp_state    = "new" #     {new,join,bid,pass,play}
                sp_owner    = ""    #     Who started the game
                sp_playto   = 0     #     Score the game will go to
                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)
        }
 }
@@ -395,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)
@@ -404,7 +404,7 @@ sp_state == "play" &&
 
 
 # Setup
-/^\.newgame ?([0-9]+)?/ {
+/^\.newgame ?([0-9]+)?$/ {
        if (sp_state != "new") {
                reply("There is already a game in progress.")
        } else {
@@ -451,7 +451,7 @@ sp_state == "play" &&
 }
 
 !sp_valid &&
-(sp_state "bid" || sp_state == "play") &&
+(sp_state == "bid" || sp_state == "play") &&
 /^\.(bid|play)\>/ {
        if (sp_from in sp_players)
                say(".slap " FROM ", it is not your turn.")
@@ -549,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")
        }
@@ -617,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")