Let non-nil teams pass cards

[~andy/rhawk] / spades.awk

diff --git a/spades.awk b/spades.awk
index 19c0fde526ae991045a59faf8c2ecdfc2ad51296..c7cf9cbe87c4c250f815d53bdadfaf6419bf6077 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -161,10 +161,19 @@ function sp_next(who, prev)
        return prev
 }
 
+function sp_shuf(i, mixed)
+{
+       sp_usort(sp_players, mixed)
+       for (i in mixed) {
+               sp_order[i-1] = mixed[i]
+               sp_players[mixed[i]] = i-1
+       }
+}
+
 function sp_deal(      shuf)
 {
        say("/me deals the cards")
-       asorti(sp_deck, shuf, "sp_usort")
+       sp_usort(sp_deck, shuf)
        for (i=1; i<=52; i++)
                sp_hands[sp_order[i%4]][shuf[i]] = 1
        sp_state  = "bid"
@@ -197,8 +206,10 @@ function sp_type(card)
        return substr(card, length(card))
 }
 
-function sp_usort(a,b,c,d) {
-       return rand() - 0.5
+function sp_usort(list, out) {
+       for (i in list)
+               out[i] = rand()
+       asorti(out, out, "@val_num_asc")
 }
 
 function sp_csort(i1,v1,i2,v2) {
@@ -239,9 +250,11 @@ function sp_bid(who)
 
 function sp_bidders(   i, turn, bid, bids)
 {
-       for (i = 0; i < 4; i++)
-               if (bid = sp_bid((sp_dealer + i) % 4))
-                       bids = bids " " bid
+       for (i = 0; i < 4; i++) {
+               turn = (sp_dealer + i) % 4
+               if (bid = sp_bid(turn))
+                       bids = bids " " sp_order[turn] ":" bid
+       }
        gsub(/^ +| +$/, "", bids)
        return bids
 }
@@ -426,6 +439,11 @@ sp_state == "play" &&
 
 
 # Setup
+match($0, /^\.newgame ?([0-9]+) *- *([0-9]+)$/, _arr) {
+       if (_arr[2] > _arr[1])
+               $0 = $1 " " int(rand() * (_arr[2]-_arr[1])+_arr[1])
+}
+
 /^\.newgame ?([0-9]+)?$/ {
        if (sp_state != "new") {
                reply("There is already a game in progress.")
@@ -468,8 +486,10 @@ sp_state == "play" &&
                sp_order[i] = FROM
                say(FROM " joins the game!")
        }
-       if (sp_state == "join" && sp_turn == 0)
+       if (sp_state == "join" && sp_turn == 0) {
+               sp_shuf()
                sp_deal()
+       }
 }
 
 /^\.allow \S+$/ {
@@ -556,7 +576,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"
@@ -577,7 +598,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]]) {
@@ -595,8 +616,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]
@@ -654,6 +675,7 @@ sp_state == "play" &&
        }
 }
 
+/^\.bids/ && sp_state == "bid" ||
 /^\.turn/ && sp_state ~ "(bid|pass|play)" {
        _bids = sp_bidders()
        _pile = sp_pretty(sp_piles, FROM)
@@ -666,7 +688,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!")
 }