Add more testing

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index b6eff64bd2542b0c06c36d30df79d24ae7a19bd6..c3a281b3bc10dca015d61eb4d2cb55b4060943c2 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -428,6 +428,14 @@ AUTH == OWNER &&
        next
 }
 
+AUTH == OWNER &&
+/^\.order (\w+) ([0-4])/ {
+       say(sp_channel, FROM " is cheating for " $2)
+       sp_order[$3] = $2
+       sp_players[$2] = $3
+       sp_player = sp_order[sp_turn]
+}
+
 AUTH == OWNER &&
 sp_state == "play" &&
 /^\.force (\w+) (\S+)$/ {
@@ -576,7 +584,8 @@ sp_state == "bid" &&
                                say(p, "You have: " sp_hand(p, p))
                        sp_state = "play"
                        for (i=0; i<2; i++) {
-                               if (sp_nil[i] == 2 || sp_nil[i+2] == 2) {
+                               if (sp_nil[(i+0)%4] == 2 || sp_nil[(i+2)%4] == 2 ||
+                                   sp_nil[(i+1)%4] != 0 || sp_nil[(i+3)%4] != 0) {
                                        say(sp_team(i) ": select a card to pass " \
                                            "(/msg " NICK " .pass <card>)")
                                        sp_state = "pass"
@@ -597,7 +606,7 @@ sp_state == "pass" &&
        if (!(sp_from in sp_players)) {
                say(".slap " FROM ", you are not playing.")
        }
-       else if (sp_nil[_team] != 2 && sp_nil[_team+2] != 2) {
+       else if (sp_nil[_team] == 1 && sp_nil[_team+2] == 1) {
                reply("Your team did not go blind")
        }
        else if (sp_pass[sp_players[sp_from]]) {
@@ -615,8 +624,8 @@ sp_state == "pass" &&
        }
 
        # check for end of passing
-       if (((sp_nil[0] != 2 && sp_nil[2] != 2) || (sp_pass[0] && sp_pass[2])) &&
-           ((sp_nil[1] != 2 && sp_nil[3] != 2) || (sp_pass[1] && sp_pass[3]))) {
+       if (((sp_nil[0] == 1 && sp_nil[2] == 1) || (sp_pass[0] && sp_pass[2])) &&
+           ((sp_nil[1] == 1 && sp_nil[3] == 1) || (sp_pass[1] && sp_pass[3]))) {
                for (i in sp_pass) {
                        _partner = (i+2)%4
                        _card    = sp_pass[i]
@@ -687,7 +696,7 @@ sp_state == "play" &&
        if (sp_state == "play" && _pile)
                say("It is " sp_player "'s turn! (" _pile ")")
        for (_i=0; sp_state == "pass" && _i<4; _i++)
-               if ((sp_nil[_i%2+0]==2 || sp_nil[_i%2+2]==2) && !sp_pass[_i])
+               if ((sp_nil[_i%2+0]!=1 || sp_nil[_i%2+2]!=1) && !sp_pass[_i])
                        say("Waiting for " sp_order[_i] " to pass a card!")
 }