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

diff --git a/spades.awk b/spades.awk
index 59fba19..fa79e88 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"];
@@ -168,13 +169,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)
@@ -463,7 +464,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,18 +516,18 @@ 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))
 	}
 }
 
@@ -553,7 +554,7 @@ sp_state == "play" &&
 		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) ")")
@@ -603,6 +604,9 @@ sp_state == "play" &&
 		    sp_order[2] " " sp_order[3])
 	}
 	if (sp_state == "bid" || sp_state == "play") {
+		say("playing to: " \
+		    sp_playto " points, " \
+		    sp_limit  " bags")
 		say(sp_team(0) ": " \
 		    int(sp_scores[0]) " points, " \
 		    int(sp_bags(0))   " bags")