git34 - reading CB/2B/3B now. Some doc updates

pyfpdb/fpdb.py

@@ -347,7 +347,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 		self.window.connect("delete_event", self.delete_event)
 		self.window.connect("destroy", self.destroy)
-		self.window.set_title("Free Poker DB - version: alpha1+, git33")
+		self.window.set_title("Free Poker DB - version: alpha1+, git34")
 		self.window.set_border_width(1)
 		self.window.set_size_request(950,400)
 		self.window.set_resizable(True)

pyfpdb/fpdb_db.py

@@ -289,7 +289,7 @@ class fpdb_db:
 		thirdBarrelChance INT,
 		thirdBarrelDone INT)""")
 		
-		self.cursor.execute("INSERT INTO settings VALUES (33);")
+		self.cursor.execute("INSERT INTO settings VALUES (34);")
 		self.cursor.execute("INSERT INTO sites VALUES (DEFAULT, \"Full Tilt Poker\", 'USD');")
 		self.cursor.execute("INSERT INTO sites VALUES (DEFAULT, \"PokerStars\", 'USD');")
 		self.db.commit()

pyfpdb/fpdb_simple.py

@@ -1495,7 +1495,7 @@ def generateHudData(player_ids, category, action_types, actionTypeByNo, winnings
 		
 		if someoneStole and (positions[player]=='B' or positions[player]=='S') and firstPfRaiserId!=player_ids[player]:
 			street=0
-			for count in range (len(action_types[street][player])):#finally individual actions
+			for count in range (len(action_types[street][player])):#individual actions
 				if positions[player]=='B':
 					myFoldBbToStealChance=True
 					if action_types[street][player][count]=="fold":
@@ -1522,11 +1522,14 @@ def generateHudData(player_ids, category, action_types, actionTypeByNo, winnings
 		myContBetChance=False
 		myContBetDone=False
 		
-		#calc CB
+		if PFR[player]:
+			myContBetChance=True
+			if raisedFlop[player]:
+				myContBetDone=True
 				
 		contBetChance.append(myContBetChance)
 		contBetDone.append(myContBetDone)
-	result['contBetChance']=contBetDone
+	result['contBetChance']=contBetChance
 	result['contBetDone']=contBetDone
 	
 	#now 2B
@@ -1536,11 +1539,14 @@ def generateHudData(player_ids, category, action_types, actionTypeByNo, winnings
 		mySecondBarrelChance=False
 		mySecondBarrelDone=False
 		
-		#calc 2b
+		if contBetDone[player]:
+			mySecondBarrelChance=True
+			if raisedTurn[player]:
+				mySecondBarrelDone=True
 
 		secondBarrelChance.append(mySecondBarrelChance)
 		secondBarrelDone.append(mySecondBarrelDone)
-	result['secondBarrelChance']=secondBarrelDone
+	result['secondBarrelChance']=secondBarrelChance
 	result['secondBarrelDone']=secondBarrelDone
 	
 	#now 3B
@@ -1550,11 +1556,14 @@ def generateHudData(player_ids, category, action_types, actionTypeByNo, winnings
 		myThirdBarrelChance=False
 		myThirdBarrelDone=False
 		
-		#calc 3b
+		if secondBarrelDone[player]:
+			myThirdBarrelChance=True
+			if raisedRiver[player]:
+				myThirdBarrelDone=True
 
 		thirdBarrelChance.append(myThirdBarrelChance)
 		thirdBarrelDone.append(myThirdBarrelDone)
-	result['thirdBarrelChance']=thirdBarrelDone
+	result['thirdBarrelChance']=thirdBarrelChance
 	result['thirdBarrelDone']=thirdBarrelDone
 	
 	return result