OnGame: Parse herocards
This commit is contained in:
		
							parent
							
								
									ce5d029d0b
								
							
						
					
					
						commit
						ce93c2f7fe
					
				|  | @ -122,7 +122,7 @@ class OnGame(HandHistoryConverter): | |||
|             self.re_Antes     = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P<ANTE>[.0-9]+)" % subst, re.MULTILINE) | ||||
|             self.re_BringIn   = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P<BRINGIN>[.0-9]+)" % subst, re.MULTILINE) | ||||
|             self.re_PostBoth  = re.compile('.*\n(?P<PNAME>.*): posts small \& big blinds \(\$? (?P<SBBB>[.0-9]+)\)') | ||||
|             self.re_HeroCards = re.compile('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<CARDS>.*) \]') | ||||
|             self.re_HeroCards = re.compile('Dealing\sto\s%(PLYR)s:\s\[(?P<CARDS>.*)\]' % subst) | ||||
| 
 | ||||
|             #lopllopl checks, Eurolll checks, .Lucchess checks. | ||||
|             self.re_Action = re.compile('(, )?(?P<PNAME>.*?)(?P<ATYPE> bets| checks| raises| calls| folds)( (?P<BET>\d*\.?\d*))?( and is all-in)?') | ||||
|  | @ -275,17 +275,15 @@ class OnGame(HandHistoryConverter): | |||
|             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN')) | ||||
| 
 | ||||
|     def readHeroCards(self, hand): | ||||
|         m = self.re_HeroCards.search(hand.handText) | ||||
|         if(m == None): | ||||
|             #Not involved in hand | ||||
|             hand.involved = False | ||||
|         else: | ||||
|             hand.hero = m.group('PNAME') | ||||
|             # "2c, qh" -> set(["2c","qc"]) | ||||
|             # Also works with Omaha hands. | ||||
|             cards = m.group('CARDS') | ||||
|             cards = set(cards.split(',')) | ||||
|             hand.addHoleCards(cards, m.group('PNAME')) | ||||
|         # streets PREFLOP, PREDRAW, and THIRD are special cases beacause | ||||
|         # we need to grab hero's cards | ||||
|         for street in ('PREFLOP', 'DEAL'): | ||||
|             if street in hand.streets.keys(): | ||||
|                 m = self.re_HeroCards.finditer(hand.streets[street]) | ||||
|             for found in m: | ||||
|                 hand.hero = found.group('PNAME') | ||||
|                 newcards = found.group('CARDS').split(', ') | ||||
|                 hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True) | ||||
| 
 | ||||
|     def readAction_old(self, hand, street): | ||||
|         m = self.re_Action.finditer(hand.streets.group(street)) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user