X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=spades.awk;h=c043eebb579d6d942c3bff6bd4855ac177d03e49;hb=7c0cb1f9fb1b5684991570e0fcb401a0502c7ee3;hp=155f90a422d96eb7cf3d9a5ef669e4986d7b5f8f;hpb=9cd789e98d14937ee5cbc7820148b284ebf37c03;p=~andy%2Frhawk

diff --git a/spades.awk b/spades.awk
index 155f90a..c043eeb 100644
--- 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) {
@@ -230,19 +241,19 @@ function sp_bags(i,	bags)
 	return bags
 }
 
+function sp_bid(who)
+{
+	return sp_nil[who] == 0 ? sp_bids[who] :
+	       sp_nil[who] == 1 ? "nil"        :
+	       sp_nil[who] == 2 ? "blind"      : "n/a"
+}
+
 function sp_bidders(	i, turn, bid, bids)
 {
 	for (i = 0; i < 4; i++) {
 		turn = (sp_dealer + i) % 4
-		if (sp_bids[turn] && !sp_nil[turn])
-			bid  = sp_order[turn] ":" sp_bids[turn]
-		else if (sp_nil[turn] == 1)
-			bid  = sp_order[turn] ":" "nil"
-		else if (sp_nil[turn] == 2)
-			bid  = sp_order[turn] ":" "blind"
-		else
-			continue
-		bids = bids " " bid
+		if (bid = sp_bid(turn))
+			bids = bids " " sp_order[turn] ":" bid
 	}
 	gsub(/^ +| +$/, "", bids)
 	return bids
@@ -417,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+)$/ {
@@ -428,6 +447,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.")
@@ -470,8 +494,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+$/ {
@@ -521,8 +547,11 @@ sp_state == "play" &&
 
 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 &&
@@ -558,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"
@@ -579,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]]) {
@@ -597,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]
@@ -656,6 +686,7 @@ sp_state == "play" &&
 	}
 }
 
+/^\.bids/ && sp_state == "bid" ||
 /^\.turn/ && sp_state ~ "(bid|pass|play)" {
 	_bids = sp_bidders()
 	_pile = sp_pretty(sp_piles, FROM)
@@ -668,24 +699,24 @@ 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!")
 }
 
 /^\.bids$/ && sp_state ~ "(pass|play)" {
-	say(sp_order[0] " bid " sp_bids[0] ", " \
-	    sp_order[2] " bid " sp_bids[2] ", " \
+	say(sp_order[0] " bid " sp_bid(0) ", " \
+	    sp_order[2] " bid " sp_bid(2) ", " \
 	    "total: " sp_bids[0] + sp_bids[2])
-	say(sp_order[1] " bid " sp_bids[1] ", " \
-	    sp_order[3] " bid " sp_bids[3] ", " \
+	say(sp_order[1] " bid " sp_bid(1) ", " \
+	    sp_order[3] " bid " sp_bid(3) ", " \
 	    "total: " sp_bids[1] + sp_bids[3])
 }
 
 /^\.tricks$/ && sp_state == "play" {
-	say(sp_order[0] " took " int(sp_tricks[0]) "/" int(sp_bids[0]) ", " \
-	    sp_order[2] " took " int(sp_tricks[2]) "/" int(sp_bids[2]))
-	say(sp_order[1] " took " int(sp_tricks[1]) "/" int(sp_bids[1]) ", " \
-	    sp_order[3] " took " int(sp_tricks[3]) "/" int(sp_bids[3]))
+	say(sp_order[0] " took " int(sp_tricks[0]) "/" sp_bid(0) ", " \
+	    sp_order[2] " took " int(sp_tricks[2]) "/" sp_bid(2))
+	say(sp_order[1] " took " int(sp_tricks[1]) "/" sp_bid(1) ", " \
+	    sp_order[3] " took " int(sp_tricks[3]) "/" sp_bid(3))
 }
 
 (TO == NICK || DST == sp_channel) &&