X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=spades.awk;h=a010c0f0d610fd6ff31b863996d136ce2c50a427;hb=3c3c400eb65785a84b03e21bc01f690078882fc8;hp=a68db4a5a0e52f23557e3552f08561ea6d196059;hpb=6eac07af1ef9ef8c977778e0209e74a6d8f1f267;p=~andy%2Frhawk

diff --git a/spades.awk b/spades.awk
index a68db4a..a010c0f 100644
--- a/spades.awk
+++ b/spades.awk
@@ -182,7 +182,7 @@ function sp_deal(	shuf)
 	sp_dealer = (sp_dealer+1)%4
 	sp_turn   =  sp_dealer
 	sp_player =  sp_order[sp_turn]
-	say("Bidding starts with " sp_player "!")
+	say(sp_player ": you bid first!")
 }
 
 function sp_hand(to, who,	sort, str)
@@ -299,9 +299,9 @@ function sp_score(	bids, times, tricks)
 			(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])
+		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])
+		say(sp_team(1) " lead " sp_scores[1] " to " sp_scores[0] " of " sp_playto)
 	else
 		say("tied at " sp_scores[0])
 }
@@ -395,6 +395,10 @@ AUTH == OWNER &&
 }
 
 # Help
+/^\.help$/ {
+	say(".help spades -- play a game of spades")
+}
+
 /^\.help [Ss]pades$/ {
 	say("Spades -- play a game of spades")
 	say(".help game -- setup and administer the game")
@@ -461,12 +465,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 {
@@ -579,9 +583,9 @@ 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")
+		reply("You can only bid from 0 to 13")
 	} else {
 		i = sp_next()
 		sp_bids[i] = $2
@@ -595,7 +599,7 @@ sp_state == "bid" &&
 			sp_nil[i] = 0
 		}
 		if (sp_turn != sp_dealer) {
-			say("Bidding goes to " sp_player "!")
+			say(sp_player ": it is your bid! (" sp_bidders() ")")
 		} else {
 			for (p in sp_players)
 				say(p, "You have: " sp_hand(p, p))
@@ -608,7 +612,7 @@ sp_state == "bid" &&
 				}
 			}
 			if (sp_state == "play")
-				say("Play starts with " sp_player "!")
+				say(sp_player ": you have the opening lead!")
 		}
 	}
 }
@@ -648,7 +652,8 @@ sp_state == "pass" &&
 			delete sp_hands[sp_order[i]][_card]
 			sp_hands[sp_order[_partner]][_card] = 1
 		}
-		say(sp_channel, "Cards have been passed, play starts with " sp_player "!")
+		say(sp_channel, "Cards have been passed!")
+		say(sp_channel, sp_player ": you have the opening lead!")
 		for (p in sp_players)
 			say(p, "You have: " sp_hand(p, p))
 		sp_state = "play"
@@ -701,16 +706,23 @@ 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_passer(_i) && !sp_pass[_i])
 			say("Waiting for " sp_order[_i] " to pass a card!")