Added support for MPL 5/6 Card PLO

ChazDazzle · Oct 18, 2023 · 2ff3052 · 2ff3052
1 parent 43868c7
commit 2ff3052
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
@@ -97,8 +97,10 @@ class PokerStars(HandHistoryConverter):
                           'Omaha Hi/Lo' : ('hold','omahahilo'),
                           'OMAHA HI/LO' : ('hold','omahahilo'),
                          '5 Card Omaha' : ('hold', '5_omahahi'),
+                        'Omaha 5 Cards' : ('hold', '5_omahahi'),
                    '5 Card Omaha Hi/Lo' : ('hold', '5_omaha8'),
                          '6 Card Omaha' : ('hold', '6_omahahi'),
+                        'Omaha 6 Cards' : ('hold', '6_omahahi'),
                    '6 Card Omaha Hi/Lo' : ('hold', '6_omaha8'),
                            'Courchevel' : ('hold', 'cour_hi'),
                      'Courchevel Hi/Lo' : ('hold', 'cour_hilo'),
@@ -139,7 +141,7 @@ class PokerStars(HandHistoryConverter):
           # close paren of tournament info
           (?P<MIXED>HORSE|8\-Game|8\-GAME|HOSE|Mixed\sOmaha\sH/L|Mixed\sHold\'em|Mixed\sPLH/PLO|Mixed\sNLH/PLO|Mixed\sOmaha|Triple\sStud)?\s?\(?
           (?P<SPLIT>Split)?\s?
-          (?P<GAME>Hold\'em|HOLD\'EM|Hold\'em|6\+\sHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCARD\sSTUD|7\sCard\sStud\sHi/Lo|7\sCARD\sSTUD\sHI/LO|Omaha|OMAHA|Omaha\sHi/Lo|OMAHA\sHI/LO|Badugi|Triple\sDraw\s2\-7\sLowball|Single\sDraw\s2\-7\sLowball|5\sCard\sDraw|(5|6)\sCard\sOmaha(\sHi/Lo)?|Courchevel(\sHi/Lo)?)\s
+          (?P<GAME>Hold\'em|HOLD\'EM|Hold\'em|6\+\sHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCARD\sSTUD|7\sCard\sStud\sHi/Lo|7\sCARD\sSTUD\sHI/LO|Omaha|OMAHA|Omaha\sHi/Lo|OMAHA\sHI/LO|Badugi|Triple\sDraw\s2\-7\sLowball|Single\sDraw\s2\-7\sLowball|5\sCard\sDraw|(5|6)\sCard\sOmaha(\sHi/Lo)?|Omaha\s(5|6)\sCards|Courchevel(\sHi/Lo)?)\s
           (?P<LIMIT>No\sLimit|NO\sLIMIT|Fixed\sLimit|Limit|LIMIT|Pot\sLimit|POT\sLIMIT|Pot\sLimit\sPre\-Flop,\sNo\sLimit\sPost\-Flop)\)?,?\s
           (-\s)?
           (?P<SHOOTOUT>Match.*,\s)?
@@ -164,9 +166,6 @@ class PokerStars(HandHistoryConverter):
           \)
           (?P<SITOUT>\sis\ssitting\sout)?""" % substitutions, 
           re.MULTILINE|re.VERBOSE)
-
-    #MPLPoker Hand #4227510401:  Hold'em No Limit (₹50/₹100) - 2023/10/17 10:36:50 UTC
-    #Table 'NLH 50/100 #31'(1941947783) 6-max (Real Money) Seat #6 is the button
 
     re_HandInfo     = re.compile("""
           ^\s?Table\s(ID\s)?\'(?P<TABLE>.+?)\'(\(\d+\))?\s

diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/5-Card-PLO-6max-INR-100-200-202310.MPLPoker.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/5-Card-PLO-6max-INR-100-200-202310.MPLPoker.txt
@@ -0,0 +1,22 @@
+MPLPoker Hand #4227871731:  Omaha 5 Cards Pot Limit (₹100/₹200) - 2023/10/17 22:39:01 UTC
+Table 'PLO5  100/200 RIT #7'(1941903751) 6-max (Real Money) Seat #1 is the button
+Seat 1: Player0 (₹8,946.98 in chips)
+Seat 4: Hero (₹20,000 in chips)
+Player0: posts small blind ₹100
+Hero: posts big blind ₹200
+*** HOLE CARDS ***
+Dealt to Hero [2s 6d 7s Kh 3h]
+Player0: calls ₹100
+Hero: checks
+*** FLOP *** [Ah 2d Th]
+Hero: bets ₹300
+Player0: folds
+Uncalled bet (₹300) returned to Hero
+*** SHOW DOWN ***
+Hero: doesn't show hand
+Hero collected ₹400 from pot
+*** SUMMARY ***
+Total pot ₹400 | Rake ₹15.35 
+Board [Ah 2d Th]
+Seat 1: Player0 (button) (small blind) folded on the Flop 
+Seat 4: Hero (big blind) collected (₹400)