Patch the readPlayerStacks : different behaviours between tourney and ring hands
modified: FulltiltToFpdb.py In tourneys, players sitting out are considered as in the hand. That's not the case in ring games.
This commit is contained in:
		
							parent
							
								
									c5aedf321f
								
							
						
					
					
						commit
						e403c18780
					
				|  | @ -57,7 +57,8 @@ class Fulltilt(HandHistoryConverter): | |||
|                                     (?:.*?\n(?P<CANCELLED>Hand\s\#(?P=HID)\shas\sbeen\scanceled))? | ||||
|                                  ''', re.VERBOSE|re.DOTALL) | ||||
|     re_Button       = re.compile('^The button is in seat #(?P<BUTTON>\d+)', re.MULTILINE) | ||||
|     re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)', re.MULTILINE) | ||||
|     re_PlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$(?P<CASH>[,.0-9]+)\)$', re.MULTILINE) | ||||
|     re_TourneyPlayerInfo   = re.compile('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(\$?(?P<CASH>[,.0-9]+)\)', re.MULTILINE) | ||||
|     re_Board        = re.compile(r"\[(?P<CARDS>.+)\]") | ||||
| 
 | ||||
| # These regexes are for FTP only | ||||
|  | @ -65,6 +66,9 @@ class Fulltilt(HandHistoryConverter): | |||
|     re_Max          = re.compile("(?P<MAX>\d+)( max)?", re.MULTILINE) | ||||
|     # NB: if we ever match "Full Tilt Poker" we should also match "FullTiltPoker", which PT Stud erroneously exports. | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|     mixes = { 'HORSE': 'horse', '7-Game': '7game', 'HOSE': 'hose', 'HA': 'ha'} | ||||
| 
 | ||||
| 
 | ||||
|  | @ -208,7 +212,11 @@ class Fulltilt(HandHistoryConverter): | |||
| #FIXME:        hand.buttonpos = int(m.group('BUTTON')) | ||||
| 
 | ||||
|     def readPlayerStacks(self, hand): | ||||
|         if hand.gametype['type'] == "ring" : | ||||
|             m = self.re_PlayerInfo.finditer(hand.handText) | ||||
|         else:   #if hand.gametype['type'] == "tour" | ||||
|             m = self.re_TourneyPlayerInfo.finditer(hand.handText) | ||||
| 
 | ||||
|         players = [] | ||||
|         for a in m: | ||||
|             hand.addPlayer(int(a.group('SEAT')), a.group('PNAME'), a.group('CASH')) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user