X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=spades.awk;h=d0a626063962d7b1e31611e6f72714fed085e254;hb=ba197f8ee6cc9bb2423d155ae7acd053e5a9bbb4;hp=9a1332e0c28d87bdf783987dec95b8ea34a25b86;hpb=2cc4461062b8496408f7ae49f864a5067faf4645;p=~andy%2Frhawk

diff --git a/spades.awk b/spades.awk
index 9a1332e..d0a6260 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
 	}
@@ -49,10 +49,10 @@ function sp_reset(type)
 		sp_dealer   =-1     #     Who is dealing this round
 		sp_turn     = 0     #     Index of who's turn it is
 		sp_player   = ""    #     Who's turn it is
-		sp_limit    = 10    #     Bag out limit
+		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_cloaks    # [c] Player cloaks cloaks["cloak"] -> "name"
+		delete sp_auths     # [c] Player auth names auths["auth"] -> "name"
 		delete sp_order     # [i] Player order order[i] -> "name"
 		delete sp_scores    # [i] Teams score
 	}
@@ -91,7 +91,7 @@ function sp_save(file,	game)
 	game["limit"]   = sp_limit;
 	json_copy(game, "hands",   sp_hands);
 	json_copy(game, "players", sp_players);
-	json_copy(game, "cloaks",  sp_cloaks);
+	json_copy(game, "auths",   sp_auths);
 	json_copy(game, "order",   sp_order);
 	json_copy(game, "scores",  sp_scores);
 
@@ -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"];
@@ -128,16 +129,18 @@ function sp_load(file,	game)
 	sp_limit   = game["limit"];
 	sp_acopy(sp_hands,   game["hands"]);
 	sp_acopy(sp_players, game["players"]);
-	sp_acopy(sp_cloaks,  game["cloaks"]);
+	sp_acopy(sp_auths,   game["auths"]);
 	sp_acopy(sp_order,   game["order"]);
 	sp_acopy(sp_scores,  game["scores"]);
 }
 
 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)
@@ -264,7 +273,7 @@ function sp_score(	bids, tricks)
 		     sp_nil[i] == 2 && !sp_tricks[i] ? "makes blind nil!" :
 		     sp_nil[i] == 2 &&  sp_tricks[i] ? "fails miserably at blind nil!" :
 		                                       "unknown"))
-		sp_scores[i%2] += 100 * sp_nil[i] * \
+		sp_scores[i%2] += sp_limit * 10 * sp_nil[i] * \
 			(sp_tricks[i] == 0 ? 1 : -1)
 	}
 }
@@ -304,12 +313,10 @@ function sp_play(card,	winner, pi)
 			say("Game over!")
 			winner = sp_scores[0] > sp_scores[1] ? 0 : 1
 			looser = !winner
-			say(sp_team(winner) " wins the game " \
+			say(CHANNEL, sp_team(winner) " wins the game " \
 			    sp_scores[winner] " to " sp_scores[looser])
-			say(sp_order[winner+0] "++")
-			say(sp_order[winner+2] "++")
-			say(sp_order[looser+0] "--")
-			say(sp_order[looser+2] "--")
+			say(CHANNEL, sp_order[winner+0] "++")
+			say(CHANNEL, sp_order[winner+2] "++")
 			sp_reset(2)
 
 		} else {
@@ -331,27 +338,28 @@ BEGIN {
 	sp_init()
 	sp_reset(2)
 	sp_load("var/sp_cur.json");
-	if (sp_channel)
-		say(sp_channel, "Game restored.")
+	#if (sp_channel)
+	#	say(sp_channel, "Game restored.")
 }
 
 // {
-	sp_from  = AUTH in sp_cloaks ? sp_cloaks[AUTH] : FROM
+	sp_from  = AUTH in sp_auths ? sp_auths[AUTH] : FROM
 	sp_valid = sp_from && sp_from == sp_player
 }
 
+CMD == "PRIVMSG" &&
 ! /help/ &&
 /[Ss]pades/ {
 	say("Spades! " sp_pretty("As,Ah,Ad,Ac", FROM))
 }
 
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.savegame/ {
 	sp_save("var/sp_save.json");
 	say("Game saved.")
 }
 
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.loadgame/ {
 	sp_load("var/sp_save.json");
 	say("Game loaded.")
@@ -376,31 +384,41 @@ FROM == OWNER &&
 }
 
 # Debugging
-FROM == OWNER &&
+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" &&
+/^\.force (\w+) (\S+)$/ {
 	say(sp_channel, FROM " is cheating for " $2)
+	sp_from = $2
+	sp_play($3)
+	next
 }
 
 
 # Setup
-/^\.newgame ?([0-9]+)?/ {
+/^\.newgame ?([0-9]+)?$/ {
 	if (sp_state != "new") {
 		reply("There is already a game in progress.")
 	} else {
+		$1         = ".join"
 		sp_owner   = FROM
 		sp_playto  = $2 ? $2 : 200
 		sp_limit   = sp_playto > 200 ? 10 : 5;
 		sp_state   = "join"
 		sp_channel = DST
 		say(sp_owner " starts a game of Spades to " sp_playto " with " sp_limit " bags!")
-		#say("#rhnoise", sp_owner " starts a game of Spades in " DST "!")
 	}
 }
 
-(sp_from == sp_owner || FROM == OWNER) &&
+(sp_from == sp_owner || AUTH == OWNER) &&
 /^\.endgame$/ {
 	if (sp_state == "new") {
 		reply("There is no game in progress.")
@@ -424,7 +442,7 @@ FROM == OWNER &&
 		i = sp_next()
 		sp_players[FROM] = i
 		if (AUTH)
-			sp_cloaks[AUTH] = FROM
+			sp_auths[AUTH] = FROM
 		sp_order[i] = FROM
 		say(FROM " joins the game!")
 	}
@@ -462,7 +480,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) {
@@ -514,45 +532,46 @@ 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)) {
+/^\.play (\S+)/ {
+	_card = $2
+	gsub(/[^A-Za-z0-9]/, "", _card);
+	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) ")")
@@ -562,7 +581,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])
@@ -578,7 +597,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)
@@ -589,6 +608,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) &&
@@ -596,12 +618,17 @@ sp_state == "play" &&
 	if (sp_state == "new") {
 		say("There is no game in progress")
 	}
+	if (sp_state ~ "join|bid|pass|play") {
+		say("Playing to: " \
+		    sp_playto " points, " \
+		    sp_limit  " bags")
+	}
 	if (sp_state == "join") {
 		say("Waiting for players: " \
 		    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(sp_team(0) ": " \
 		    int(sp_scores[0]) " points, " \
 		    int(sp_bags(0))   " bags")