Protocol updates for more flexibility and better testing.

docs/pokerth.asn1

@@ -268,7 +268,6 @@ PlayerInfoData ::= SEQUENCE {
 UnknownPlayerInfo ::= SEQUENCE {
 }
 
-
 -- The following request will not be confirmed by the server. It is used,
 -- optionally, to reduce server traffic. The server might ignore it.
 SubscriptionRequestMessage ::= [APPLICATION 10] SEQUENCE {
@@ -351,9 +350,9 @@ NetGameInfo ::= SEQUENCE {
 	delayBetweenHands			INTEGER(5..20), -- These are seconds
 	playerActionTimeout			INTEGER(0..60), -- These are seconds
 	firstSmallBlind				INTEGER(1..20000),
-	endRaiseSmallBlindValue		INTEGER(0..1000000),
-	startMoney					INTEGER(1..1000000),
-	manualBlinds				SEQUENCE SIZE(0..30) OF INTEGER(1..1000000)
+	endRaiseSmallBlindValue		InitialAmountOfMoney,
+	startMoney					InitialNonZeroAmountOfMoney,
+	manualBlinds				SEQUENCE SIZE(0..30) OF InitialNonZeroAmountOfMoney
 }
 
 GamePlayerMessage ::= [APPLICATION 13] SEQUENCE {
@@ -442,7 +441,7 @@ StartEventAckMessage ::= [APPLICATION 21] SEQUENCE {
 
 RejoinPlayerData ::= SEQUENCE {
 	playerId					NonZeroId,
-	playerMoney					INTEGER(0..10000000)
+	playerMoney					AmountOfMoney
 }
 
 GameStartModeInitial ::= SEQUENCE {
@@ -491,14 +490,14 @@ MyActionRequestMessage ::= [APPLICATION 25] SEQUENCE {
 	handNum						NonZeroId,
 	gameState					NetGameState,
 	myAction					NetPlayerAction,
-	myRelativeBet				INTEGER(0..10000000)
+	myRelativeBet				AmountOfMoney
 }
 
 YourActionRejectedMessage ::= [APPLICATION 26] SEQUENCE {
 	gameId						NonZeroId,
 	gameState					NetGameState,
 	yourAction					NetPlayerAction,
-	yourRelativeBet				INTEGER(0..10000000),
+	yourRelativeBet				AmountOfMoney,
 	rejectionReason				ENUMERATED {
 		rejectedInvalidGameState	(1),
 		rejectedNotYourTurn			(2),
@@ -511,10 +510,10 @@ PlayersActionDoneMessage ::= [APPLICATION 27] SEQUENCE {
 	playerId					NonZeroId,
 	gameState					NetGameState,
 	playerAction				NetPlayerAction,
-	totalPlayerBet				INTEGER(0..10000000),
-	playerMoney					INTEGER(0..10000000),
-	highestSet					INTEGER(0..10000000),
-	minimumRaise				INTEGER(0..10000000) -- TODO
+	totalPlayerBet				AmountOfMoney,
+	playerMoney					AmountOfMoney,
+	highestSet					AmountOfMoney,
+	minimumRaise				AmountOfMoney
 }
 
 DealFlopCardsMessage ::= [APPLICATION 28] SEQUENCE {
@@ -563,14 +562,14 @@ PlayerResult ::= SEQUENCE {
 	resultCard2					Card,
 	bestHandPosition			SEQUENCE SIZE(5) OF INTEGER, -- TODO size restrictions
 	cardsValue					INTEGER,
-	moneyWon					INTEGER(0..10000000),
-	playerMoney					INTEGER(0..10000000)
+	moneyWon					AmountOfMoney,
+	playerMoney					AmountOfMoney
 }
 
 EndOfHandHideCards ::= SEQUENCE {
 	playerId					NonZeroId,
-	moneyWon					INTEGER(0..10000000),
-	playerMoney					INTEGER(0..10000000)
+	moneyWon					AmountOfMoney,
+	playerMoney					AmountOfMoney
 }
 
 ShowMyCardsRequestMessage ::= [APPLICATION 33] SEQUENCE {
@@ -803,4 +802,8 @@ Guid ::= OCTET STRING (SIZE(16))
 
 Card ::= INTEGER(0..51)
 
+AmountOfMoney ::= INTEGER(0..10000000)
+InitialAmountOfMoney ::= INTEGER(0..1000000)
+InitialNonZeroAmountOfMoney ::= INTEGER(1..1000000)
+
 END