X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=spades.awk;h=3433716990e1ae403d76c6812af01d8211ce0fe8;hb=3514fec8a88bac382673ae4ed1eb31622e00fbf6;hp=59fba1916c342fa73bb9b5832323c8d85b43163a;hpb=d09b51abe14c518c9e3d133100649774328247f8;p=~andy%2Frhawk

diff --git a/spades.awk b/spades.awk
index 59fba19..3433716 100644
--- a/spades.awk
+++ b/spades.awk
@@ -17,7 +17,7 @@ function sp_init(cards, tmp0, tmp1)
 function sp_reset(type)
 {
 	# Per message
-	if (type >= 0) {
+	if (type <  0) {
 		sp_from     = ""    #    The speakers player name
 		sp_valid    = ""    #    It is the speaker turn
 	}
@@ -102,7 +102,8 @@ function sp_save(file,	game)
 function sp_load(file,	game)
 {
 	# Load
-	json_load(file, game);
+	if (!json_load(file, game))
+		return
 
 	# Per hand
 	sp_suit    = game["suit"];
@@ -135,9 +136,11 @@ function sp_load(file,	game)
 
 function sp_pretty(cards, who)
 {
-	if (!plain[who]) {
+	if (!nocolor[who]) {
 		gsub(/[0-9JQKA]*[sc]/, "\0031,00\002&\017", cards) # black
 		gsub(/[0-9JQKA]*[hd]/, "\0034,00\002&\017", cards) # red
+	}
+	if (!nounicode[who]) {
 		gsub(/s/, "\002♠", cards)
 		gsub(/h/, "\002♥", cards)
 		gsub(/d/, "\002♦", cards)
@@ -168,13 +171,13 @@ function sp_deal(	shuf)
 	say("Bidding starts with " sp_player "!")
 }
 
-function sp_hand(who,	sort, str)
+function sp_hand(to, who,	sort, str)
 {
 	asorti(sp_hands[who], sort, "sp_csort")
 	for (i=0; i<length(sort); i++)
 		str = str "" sprintf("%4s", sort[i])
 	gsub(/^ +| +$/, "", str)
-	return sp_pretty(str, who)
+	return sp_pretty(str, to)
 }
 
 function sp_hasa(who, expr)
@@ -228,24 +231,30 @@ 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]) {
+		if (sp_bids[turn] && !sp_nil[turn])
 			bid  = sp_order[turn] ":" sp_bids[turn]
-			bids = bids " " bid
-		}
+		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
 	}
 	gsub(/^ +| +$/, "", bids)
 	return bids
 }
 
-function sp_score(	bids, tricks)
+function sp_score(	bids, times, tricks)
 {
 	for (i=0; i<2; i++) {
 		bids   = sp_bids[i]   + sp_bids[i+2]
 		tricks = sp_tricks[i] + sp_tricks[i+2]
 		bags   = tricks - bids
-		if (sp_bags(i) + bags >= sp_limit) {
-			say(sp_team(i) " bag out")
-			sp_scores[i] -= sp_limit * 10
+		times  = int((sp_bags(i) + bags) / sp_limit)
+		if (times > 0) {
+			say(sp_team(i) " bag" (times>1?" way ":" ") "out")
+			sp_scores[i] -= sp_limit * 10 * times;
 		}
 		if (tricks >= bids) {
 			say(sp_team(i) " make their bid: " tricks "/" bids)
@@ -379,10 +388,20 @@ AUTH == OWNER &&
 # Debugging
 AUTH == OWNER &&
 /^\.deal (\w+) (.*)/ {
+	say(sp_channel, FROM " is cheating for " $2)
 	delete sp_hands[$2]
 	for (i=3; i<=NF; i++)
 		sp_hands[$2][$i] = 1
+	next
+}
+
+AUTH == OWNER &&
+sp_state == "play" &&
+/^\.play (\w+) (\S+)$/ {
 	say(sp_channel, FROM " is cheating for " $2)
+	sp_from = $2
+	sp_play($3)
+	next
 }
 
 
@@ -463,7 +482,7 @@ sp_state == "bid" &&
 			say("Bidding goes to " sp_player "!")
 		} else {
 			for (p in sp_players)
-				say(p, "You have: " sp_hand(p))
+				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) {
@@ -515,45 +534,45 @@ sp_state == "pass" &&
 		}
 		say(sp_channel, "Cards have been passed, play starts with " sp_player "!")
 		for (p in sp_players)
-			say(p, "You have: " sp_hand(p))
+			say(p, "You have: " sp_hand(p, p))
 		sp_state = "play"
 	}
 }
 
-sp_state ~ "(play|bid)" &&
+sp_state ~ "(bid|pass|play)" &&
 /^\.look$/ {
 	if (!(sp_from in sp_players)) {
 		say(".slap " FROM ", you are not playing.")
 	} else {
 		sp_looked[sp_players[sp_from]] = 1
-		say(FROM, "You have: " sp_hand(sp_from))
+		say(FROM, "You have: " sp_hand(FROM, sp_from))
 	}
 }
 
 sp_valid &&
 sp_state == "play" &&
 /^\.play (\S+)$/ {
-	card = $2
-	if (!(card in sp_deck)) {
+	_card = $2
+	if (!(_card in sp_deck)) {
 		reply("Invalid card")
 	}
-	else if (!(card in sp_hands[sp_from])) {
+	else if (!(_card in sp_hands[sp_from])) {
 		reply("You do not have that card")
 	}
-	else if (sp_suit && card !~ sp_suit && sp_hasa(sp_from, sp_suit)) {
+	else if (sp_suit && _card !~ sp_suit && sp_hasa(sp_from, sp_suit)) {
 		reply("You must follow suit (" sp_suit ")")
 	}
-	else if (card ~ /s/ && length(sp_hands[sp_from]) == 13 && sp_hasa(sp_from, "[^s]$")) {
+	else if (_card ~ /s/ && length(sp_hands[sp_from]) == 13 && sp_hasa(sp_from, "[^s]$")) {
 		reply("You cannot trump on the first hand")
 	}
-	else if (card ~ /s/ && length(sp_pile) == 0 && sp_hasa(sp_from, "[^s]$") && !sp_broken) {
+	else if (_card ~ /s/ && length(sp_pile) == 0 && sp_hasa(sp_from, "[^s]$") && !sp_broken) {
 		reply("Spades have not been broken")
 	}
 	else {
-		sp_play(card)
+		sp_play(_card)
 		if (sp_state == "play") {
 			if (length(sp_hands[sp_from]))
-				say(FROM, "You have: " sp_hand(sp_from))
+				say(FROM, "You have: " sp_hand(FROM, sp_from))
 			if (sp_piles)
 				say(sp_player ": it is your turn! " \
 				    "(" sp_pretty(sp_piles, sp_player) ")")
@@ -563,7 +582,7 @@ sp_state == "play" &&
 	}
 }
 
-/^\.bids$/ && sp_state == "play" {
+/^\.bids$/ && sp_state ~ "(pass|play)" {
 	say(sp_order[0] " bid " sp_bids[0] ", " \
 	    sp_order[2] " bid " sp_bids[2] ", " \
 	    "total: " sp_bids[0] + sp_bids[2])
@@ -579,7 +598,7 @@ sp_state == "play" &&
 	    sp_order[3] " took " int(sp_tricks[3]) "/" int(sp_bids[3]))
 }
 
-/^\.turn/ && sp_state ~ "(play|bid)" {
+/^\.turn/ && sp_state ~ "(bid|pass|play)" {
 	_bids = sp_bidders()
 	_pile = sp_pretty(sp_piles, FROM)
 	if (sp_state == "bid" && !_bids)
@@ -590,6 +609,9 @@ sp_state == "play" &&
 		say("It is " sp_player "'s turn!")
 	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])
+			say("Waiting for " sp_order[_i] " to pass a card!")
 }
 
 (TO == NICK || DST == sp_channel) &&
@@ -602,7 +624,10 @@ sp_state == "play" &&
 		    sp_order[0] " " sp_order[1] " " \
 		    sp_order[2] " " sp_order[3])
 	}
-	if (sp_state == "bid" || sp_state == "play") {
+	if (sp_state ~ "bid|pass|play") {
+		say("Playing to: " \
+		    sp_playto " points, " \
+		    sp_limit  " bags")
 		say(sp_team(0) ": " \
 		    int(sp_scores[0]) " points, " \
 		    int(sp_bags(0))   " bags")