X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=spades.awk;h=0f9c7840ba6615c5788f95ce651556411cc48e1f;hb=b99d91d6fbfe25cb1883c5f620ad439206344725;hp=c3a281b3bc10dca015d61eb4d2cb55b4060943c2;hpb=259debfe48ecaaab9d84181c57aa686e63c261bb;p=~andy%2Frhawk

diff --git a/spades.awk b/spades.awk
index c3a281b..0f9c784 100644
--- a/spades.awk
+++ b/spades.awk
@@ -33,6 +33,7 @@ function sp_reset(type)
 	if (type >= 1) {
 		sp_state    = "bid" #     {new,join,bid,pass,play}
 		sp_broken   = 0     #     Whether spades are broken
+		delete sp_hands     # [p] Each players cards
 		delete sp_looked    # [i] Whether a player has looked a their cards
 		delete sp_bids      # [i] Each players bid
 		delete sp_nil       # [i] Nil multiplier 0=regular, 1=nil, 2=blind
@@ -50,7 +51,6 @@ function sp_reset(type)
 		sp_turn     = 0     #     Index of who's turn it is
 		sp_player   = ""    #     Who's turn it is
 		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"
 		delete sp_share     # [c] Player teammates share["friend"] -> "name"
@@ -61,9 +61,11 @@ function sp_reset(type)
 
 function sp_acopy(dst, src,	key)
 {
-	if (isarray(src))
+	if (isarray(src)) {
+		delete(dst)
 		for (key in src)
 			json_copy(dst, key, src[key])
+	}
 }
 
 function sp_save(file,	game)
@@ -248,6 +250,12 @@ function sp_bid(who)
 	       sp_nil[who] == 2 ? "blind"      : "n/a"
 }
 
+function sp_passer(who)
+{
+	return sp_nil[(who+0)%4] == 2 || sp_nil[(who+1)%4] != 0 ||
+	       sp_nil[(who+2)%4] == 2 || sp_nil[(who+3)%4] != 0
+}
+
 function sp_bidders(	i, turn, bid, bids)
 {
 	for (i = 0; i < 4; i++) {
@@ -290,6 +298,12 @@ function sp_score(	bids, times, tricks)
 		sp_scores[i%2] += sp_limit * 10 * sp_nil[i] * \
 			(sp_tricks[i] == 0 ? 1 : -1)
 	}
+	if (sp_scores[0] > sp_scores[1])
+		say(sp_team(0) " lead " sp_scores[0] " to " sp_scores[1] " of " sp_playto)
+	else if (sp_scores[1] > sp_scores[0])
+		say(sp_team(1) " lead " sp_scores[1] " to " sp_scores[0] " of " sp_playto)
+	else
+		say("tied at " sp_scores[0])
 }
 
 function sp_play(card,	winner, pi)
@@ -447,12 +461,12 @@ sp_state == "play" &&
 
 
 # Setup
-match($0, /^\.newgame ?([0-9]+) *- *([0-9]+)$/, _arr) {
+match($0, /^\.newgame ?([1-9][0-9]*) *- *([1-9][0-9]*)$/, _arr) {
 	if (_arr[2] > _arr[1])
 		$0 = $1 " " int(rand() * (_arr[2]-_arr[1])+_arr[1])
 }
 
-/^\.newgame ?([0-9]+)?$/ {
+/^\.newgame ?([1-9][0-9]*)?$/ {
 	if (sp_state != "new") {
 		reply("There is already a game in progress.")
 	} else {
@@ -547,8 +561,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 &&
@@ -562,7 +579,7 @@ sp_state ~ "(bid|pass|play)" &&
 
 sp_valid &&
 sp_state == "bid" &&
-/^\.bid [0-9]+$/ {
+/^\.bid (0|[1-9][0-9]*)$/ {
 	if ($2 < 0 || $2 > 13) {
 		say("You can only bid from 0 to 13")
 	} else {
@@ -578,14 +595,13 @@ sp_state == "bid" &&
 			sp_nil[i] = 0
 		}
 		if (sp_turn != sp_dealer) {
-			say("Bidding goes to " sp_player "!")
+			say("Bidding goes to " sp_player "! (" sp_bidders() ")")
 		} else {
 			for (p in sp_players)
 				say(p, "You have: " sp_hand(p, p))
 			sp_state = "play"
 			for (i=0; i<2; i++) {
-				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) {
+				if (sp_passer(i)) {
 					say(sp_team(i) ": select a card to pass " \
 					    "(/msg " NICK " .pass <card>)")
 					sp_state = "pass"
@@ -606,7 +622,7 @@ sp_state == "pass" &&
 	if (!(sp_from in sp_players)) {
 		say(".slap " FROM ", you are not playing.")
 	}
-	else if (sp_nil[_team] == 1 && sp_nil[_team+2] == 1) {
+	else if (!sp_passer(_team)) {
 		reply("Your team did not go blind")
 	}
 	else if (sp_pass[sp_players[sp_from]]) {
@@ -624,8 +640,8 @@ sp_state == "pass" &&
 	}
 
 	# check for end of passing
-	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]))) {
+	if ((!sp_passer(0) || (sp_pass[0] && sp_pass[2])) &&
+	    (!sp_passer(1) || (sp_pass[1] && sp_pass[3]))) {
 		for (i in sp_pass) {
 			_partner = (i+2)%4
 			_card    = sp_pass[i]
@@ -685,18 +701,25 @@ sp_state == "play" &&
 
 /^\.bids/ && sp_state == "bid" ||
 /^\.turn/ && sp_state ~ "(bid|pass|play)" {
-	_bids = sp_bidders()
-	_pile = sp_pretty(sp_piles, FROM)
+	_bids  = sp_bidders()
+	_pile  = sp_pretty(sp_piles, FROM)
+	_extra = ""
+
+	for (_i in sp_share)
+		if (/!/ && sp_share[_i] == sp_player)
+			_extra = _extra " " _i "!"
+
 	if (sp_state == "bid" && !_bids)
-		say("It is " sp_player "'s bid!")
+		say("It is " sp_player "'s bid!" _extra)
 	if (sp_state == "bid" && _bids)
-		say("It is " sp_player "'s bid! (" _bids ")")
+		say("It is " sp_player "'s bid!" _extra " (" _bids ")")
 	if (sp_state == "play" && !_pile)
-		say("It is " sp_player "'s turn!")
+		say("It is " sp_player "'s turn!" _extra)
 	if (sp_state == "play" && _pile)
-		say("It is " sp_player "'s turn! (" _pile ")")
+		say("It is " sp_player "'s turn!" _extra " (" _pile ")")
+
 	for (_i=0; sp_state == "pass" && _i<4; _i++)
-		if ((sp_nil[_i%2+0]!=1 || sp_nil[_i%2+2]!=1) && !sp_pass[_i])
+		if (sp_passer(_i) && !sp_pass[_i])
 			say("Waiting for " sp_order[_i] " to pass a card!")
 }