X-Git-Url: http://pileus.org/git/?p=~andy%2Frhawk;a=blobdiff_plain;f=spades.awk;h=740d1b8e347003b11fc6acf764fe22719521374f;hp=04a03a97dd984d91fa6af2388769cab2b268ef17;hb=HEAD;hpb=6d31661edfd81e23d36f2a393144d1a70419a752

diff --git a/spades.awk b/spades.awk
index 04a03a9..740d1b8 100644
--- a/spades.awk
+++ b/spades.awk
@@ -56,6 +56,7 @@ function sp_reset(type)
 		delete sp_share     # [c] Player teammates share["friend"] -> "name"
 		delete sp_order     # [i] Player order order[i] -> "name"
 		delete sp_scores    # [i] Teams score
+		delete sp_teams     # [i] Teams names
 	}
 
 	# Persistent
@@ -106,6 +107,7 @@ function sp_save(file,	game)
 	json_copy(game, "share",   sp_share);
 	json_copy(game, "order",   sp_order);
 	json_copy(game, "scores",  sp_scores);
+	json_copy(game, "teams",   sp_teams);
 
 	# Persistent
 	game["channel"] = sp_channel;
@@ -150,6 +152,7 @@ function sp_load(file,	game)
 	sp_acopy(sp_share,   game["share"]);
 	sp_acopy(sp_order,   game["order"]);
 	sp_acopy(sp_scores,  game["scores"]);
+	sp_acopy(sp_teams,   game["teams"]);
 
 	# Persistent
 	sp_channel = game["channel"];
@@ -161,7 +164,7 @@ function sp_say(msg)
 {
 	say(sp_channel, msg)
 	print msg |& sp_sock
-	print strftime("%Y-%m-%d %H:%M:%S | ") msg >> "logs/" sp_log
+	print strftime("%Y-%m-%d %H:%M:%S | ") sp_ugly(msg) >> "logs/" sp_log
 	fflush("logs/" sp_log)
 }
 
@@ -180,6 +183,16 @@ function sp_pretty(cards, who)
 	return cards
 }
 
+function sp_ugly(cards, who)
+{
+	gsub(/[\2\17]|\3[14],00|/, "", cards)
+	gsub(/♠/, "s", cards)
+	gsub(/♥/, "h", cards)
+	gsub(/♦/, "d", cards)
+	gsub(/♣/, "c", cards)
+	return cards
+}
+
 function sp_next(who, prev)
 {
 	prev      = sp_turn
@@ -255,10 +268,13 @@ function sp_winner(	card, tmp)
 	return tmp[1]
 }
 
-function sp_team(i)
+function sp_team(i, players)
 {
 	#return "{" sp_order[i+0] "," sp_order[i+2] "}"
-	return sp_order[i+0] "/" sp_order[i+2]
+	if ((i in sp_teams) && !players)
+		return sp_teams[i]
+	else
+		return sp_order[i+0] "/" sp_order[i+2]
 }
 
 function sp_bags(i,	bags)
@@ -373,8 +389,8 @@ function sp_play(card,	winner, pi)
 	    sp_tricks[2] + sp_tricks[3] == 13) {
 		sp_say("Round over!")
 		sp_score()
-		if (sp_scores[0] >= sp_playto || sp_scores[1] >= sp_playto &&
-		    sp_scores[0]              != sp_scores[1]) {
+		if ((sp_scores[0] >= sp_playto || sp_scores[1] >= sp_playto) &&
+		    (sp_scores[0]              != sp_scores[1])) {
 			sp_say("Game over!")
 			winner = sp_scores[0] > sp_scores[1] ? 0 : 1
 			looser = !winner
@@ -387,7 +403,7 @@ function sp_play(card,	winner, pi)
 		} else {
 			if (sp_scores[0] == sp_scores[1] &&
 			    sp_scores[0] >= sp_playto)
-				sp_say("It's tie! Playing an extra round!");
+				sp_say("It's a tie! Playing an extra round!");
 			sp_reset(1)
 			sp_deal()
 		}
@@ -422,7 +438,7 @@ function sp_cur(list)
 	return list[length(list)-1]
 }
 
-function sp_stats(file,   line, arr, time, user, turn, start, delay, extra)
+function sp_stats(file,   line, arr, time, user, turn, start, delay, short, extra)
 {
 	# Process log file
 	while ((stat = getline line < file) > 0) {
@@ -461,9 +477,10 @@ function sp_stats(file,   line, arr, time, user, turn, start, delay, extra)
 
 	# Output statistics
 	for (user in delay) {
+		short = length(user) <= 4 ? user : substr(user, 0, 4)
 		extra = (user != turn) ? "" : \
 			", " sp_delay(sp_cur(delay[user])) " (cur)";
-		say("latency for " user \
+		say("latency for " short \
 			": " sp_delay(sp_avg(delay[user])) " (avg)" \
 			", " sp_delay(sp_max(delay[user])) " (max)" extra)
 	}
@@ -522,7 +539,7 @@ AUTH == OWNER &&
 }
 
 /^\.help game$/ {
-	say(".newgame [score] -- start a game to <score> points, default 500")
+	say(".newgame [score] -- start a game to <score> points, default 300")
 	say(".endgame -- abort the current game")
 	say(".savegame -- save the current game to disk")
 	say(".loadgame -- load the previously saved game")
@@ -535,6 +552,7 @@ AUTH == OWNER &&
 	say(".bid [n] -- bid for <n> tricks")
 	say(".pass [card] -- pass a card to your partner")
 	say(".play [card] -- play a card")
+	say(".team [name] -- set your team name")
 	say(".last -- show who took the previous trick")
 	say(".turn -- check whose turn it is")
 	say(".bids -- check what everyone bid")
@@ -592,7 +610,7 @@ match($0, /^\.newgame ?([1-9][0-9]*) *- *([1-9][0-9]*)$/, _arr) {
 	} else {
 		$1         = ".join"
 		sp_owner   = FROM
-		sp_playto  = $2 ? $2 : 200
+		sp_playto  = $2 ? $2 : 300
 		sp_limit   = sp_playto > 200 ? 10 : 5;
 		sp_state   = "join"
 		sp_channel = DST
@@ -601,14 +619,27 @@ match($0, /^\.newgame ?([1-9][0-9]*) *- *([1-9][0-9]*)$/, _arr) {
 	}
 }
 
-(sp_from == sp_owner || AUTH == OWNER) &&
-/^\.endgame$/ {
+/^\.(endgame|fliptable)$/ {
 	if (sp_state == "new") {
 		reply("There is no game in progress.")
-	} else {
+	}
+	else if (!(sp_from in sp_players)) {
+		reply("You are not playing")
+	}
+	else if (sp_state == "join") {
 		sp_say(FROM " ends the game")
 		sp_reset(2)
 	}
+	else {
+		_looser = (sp_players[sp_from]+0) % 2;
+		_winner = (sp_players[sp_from]+1) % 2;
+		sp_say(FROM " goes on a rampage")
+		say(CHANNEL, sp_team(_winner) " wins the game " \
+		    sp_scores[_winner] " to " sp_scores[_looser])
+		say(CHANNEL, sp_order[_winner+0] "++")
+		say(CHANNEL, sp_order[_winner+2] "++")
+		sp_reset(2)
+	}
 }
 
 /^\.join/ {
@@ -630,6 +661,8 @@ match($0, /^\.newgame ?([1-9][0-9]*) *- *([1-9][0-9]*)$/, _arr) {
 		sp_say(FROM " joins the game!")
 	}
 	if (sp_state == "join" && sp_turn == 0) {
+		sp_scores[0] = 0
+		sp_scores[1] = 0
 		sp_shuf()
 		sp_deal()
 	}
@@ -680,6 +713,28 @@ match($0, /^\.newgame ?([1-9][0-9]*) *- *([1-9][0-9]*)$/, _arr) {
 	}
 }
 
+/^\.team/ {
+	gsub(/^\.team */, "")
+	_team = sp_from in sp_players ? sp_players[sp_from] % 2 : 0
+	if (sp_state ~ "new|join") {
+		reply("The game has not yet started")
+	}
+	else if (!(sp_from in sp_players)) {
+		reply("You are not playing")
+	}
+	else if ($0 ~ /^[^a-zA-Z0-9]/) {
+		reply("Invalid team name")
+	}
+	else if ($0 ~ /^./) {
+		sp_teams[_team] = substr($0, 0, 32)
+		sp_say(sp_team(_team,1) " are now known as " sp_team(_team))
+	}
+	else {
+		delete sp_teams[_team]
+		sp_say(sp_team(_team,1) " are boring")
+	}
+}
+
 /^\.whoami/ {
 	if (!(sp_from in sp_players))
 		reply("You are not playing")
@@ -756,7 +811,7 @@ sp_state == "bid" &&
 			sp_state = "play"
 			for (i=0; i<2; i++) {
 				if (sp_passer(i)) {
-					sp_say(sp_team(i) ": select a card to pass " \
+					sp_say(sp_team(i,1) ": select a card to pass " \
 					    "(/msg " NICK " .pass <card>)")
 					sp_state = "pass"
 				}
@@ -967,6 +1022,6 @@ sp_state == "play" &&
 	sp_stats("logs/" $2 ".log");
 }
 
-/^\.((new|end|load)game|join|look|bid|pass|play|notify)/ {
+/^\.((new|end|load)game|fliptable|join|look|bid|pass|play|allow|deny|team|notify)/ {
 	sp_save("var/sp_cur.json");
 }