Merge branch 'master' of git://git.assembla.com/fpdb

create-release.sh

@@ -29,8 +29,8 @@ cp -R regression-test fpdb-$1/
 cp -R utils fpdb-$1/
 
 cd fpdb-$1
-zip -r ../../fpdb-1.0_$1.zip *
+zip -r releases/fpdb-1.0_$1.zip *
-tar -cf - * | bzip2 >> ../../fpdb-1.0_$1.tar.bz2
+tar -cf - * | bzip2 >> releases/fpdb-1.0_$1.tar.bz2
 cd ..
 rm -r fpdb-$1
 

docs/tabledesign.html

@@ -312,11 +312,10 @@ The program itself is licensed under AGPLv3, see agpl-3.0.txt</p>
 </TABLE>
 <p><BR></P>
 <p><B>Table HandsPlayers</B></P>
-<p>cardX: can be 1 through 20, one for each card. In holdem only 1-2 of these are used, in omaha 1-4, in stud/razz 1-7, in single draw games 1-10 is used and in badugi 1-16 (4*4) is used.</P>
+<p>cardX: can be 1 through 20, one for each card. In holdem only 1-2 of these are used, in omaha 1-4, in stud/razz 1-7, in single draw 1-10, in tripple draw all 20 and in badugi 1-16 (4*4).</P>
-<p>For the draw games: the first 5 (badugi: 4) cards are the initial cards, the next 5 (badugi: 4) are after the first draw. If a player keeps some cards then those cards' spaces are filled with "k", short for "kept".<br>
+<p>For the draw games: the first 5 (badugi: 4) cards are the initial cards, the next 5 (badugi: 4) are after the first draw, etc.<br>
-Example 1: If a player gets 2-6 spades for his first five cards and decides to throw away the 4 and then gets a 7 of spades then the first 10 fields of cardXValue would be as follows: 2, 3, 4, 5, 6, k, k, 7, k, k<br>
+Example 1: If a player gets 2-6 spades for his first five cards and decides to throw away the 4 and then gets a 7 of spades then the first 10 fields of cardXValue would be as follows: 2, 3, 4, 5, 6, 2, 3, 5, 6, 7<br>
-Example 2: If a player gets 2, 3, 5, 8, J of spades for his first five cards and decides to throw away the 2 and the 3 and then gets a Q and K of spades then the first 10 fields of cardXValue would be as follows: 2, 3, 5, 8, J, Q, K, k, k, k<br>
+Example 2: If a player gets 2, 3, 5, 8, J of spades for his first five cards and decides to throw away the 2 and the 3 and then gets a Q and K of spades then the first 10 fields of cardXValue would be as follows: 2, 3, 5, 8, J, 5, 8, J, Q, K.</p>
-Note that it will k in the space of which card was there previously, so in example 2 where the player kept the last 3 cards, the last 3 fields of the first draw (ie. card8-10Value) are replaced with k.</p>
 <p>I did not separate this into an extra table because I felt the lost space is not sufficiently large. Also the benefit for searching is far less relevant.</P>
 <TABLE BORDER=1 CELLPADDING=2 CELLSPACING=0>
 	<TR VALIGN=TOP>
@@ -370,6 +369,17 @@ Note that it will k in the space of which card was there previously, so in examp
 		<TD><P>char(1)</P></TD>
 		<TD><P>h=hearts, s=spades, d=diamonds, c=clubs, unknown/no card=x</P></TD>
 	</TR>
+	<TR VALIGN=TOP>
+		<TD><P>cardXDiscarded</P></TD>
+		<TD><P>boolean</P></TD>
+		<TD><P>Whether the card was discarded (this only applies to draw games, X can be 1 through 15 since the final cards can obviously not be discarded).</P></TD>
+	</TR>
+	<TR VALIGN=TOP>
+		<TD><P>DrawnX</P></TD>
+		<TD><P>smallint</P></TD>
+		<TD><p>X can be 1 through 3.<br>
+			This field denotes how many cards the player has drawn on each draw.</P></TD>
+	</TR>
 	<TR VALIGN=TOP>
 		<TD><P>winnings</P></TD>
 		<TD><P>int</P></TD>