X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=spades.awk;h=c043eebb579d6d942c3bff6bd4855ac177d03e49;hb=d835858f06efd16a8044b0c0066a8a498f5f216a;hp=8e7e7ee62df3544677c16af40e8043e3d35f1ecd;hpb=617f4b2df352d4b34a670e69512a3a73d0936d87;p=~andy%2Frhawk

diff --git a/spades.awk b/spades.awk
index 8e7e7ee..c043eeb 100644
--- a/spades.awk
+++ b/spades.awk
@@ -163,7 +163,7 @@ function sp_next(who, prev)
 
 function sp_shuf(i, mixed)
 {
-	asorti(sp_players, mixed, "sp_usort")
+	sp_usort(sp_players, mixed)
 	for (i in mixed) {
 		sp_order[i-1] = mixed[i]
 		sp_players[mixed[i]] = i-1
@@ -173,7 +173,7 @@ function sp_shuf(i, mixed)
 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"
@@ -206,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) {
@@ -426,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+)$/ {
@@ -537,8 +547,11 @@ match($0, /^\.newgame ?([0-9]+) *- *([0-9]+)$/, _arr) {
 
 sp_state ~ "(bid|pass|play)" &&
 /^\.show/ {
+	delete _lines
 	for (_i in sp_share)
-		say(_i " can play for " sp_share[_i]);
+		_lines[sp_share[_i]] = _lines[sp_share[_i]] " " _i
+	for (_i in _lines)
+		say(_i " allowed:" _lines[_i])
 }
 
 !sp_valid &&
@@ -574,7 +587,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"
@@ -595,7 +609,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]]) {
@@ -613,8 +627,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]
@@ -685,7 +699,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!")
 }