diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 79c1f7d6..1f8ecbeb 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -62,7 +62,7 @@ class Everleaf(HandHistoryConverter): def readSupportedGames(self): return [["ring", "hold", "nl"], ["ring", "hold", "pl"], - ["ring", "omaha", "pl"] + ["ring", "omahahi", "pl"] ] def determineGameType(self): @@ -221,7 +221,7 @@ class Everleaf(HandHistoryConverter): if __name__ == "__main__": c = Configuration.Config() if len(sys.argv) == 1: - testfile = "regression-test-files/everleaf/Speed_Kuala_full.txt" + testfile = "regression-test-files/everleaf/plo/Naos.txt" else: testfile = sys.argv[1] e = Everleaf(c, testfile) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 80591a5f..a1c43ead 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -39,7 +39,7 @@ class Hand: self.gametype = gametype self.string = string - if gametype[1] == "hold" or self.gametype[1] == "omaha": + if gametype[1] == "hold" or self.gametype[1] == "omahahi": self.streetList = ['PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8": self.streetList = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order @@ -403,7 +403,7 @@ Map the tuple self.gametype onto the pokerstars string describing it return string def writeHand(self, fh=sys.__stdout__): - if self.gametype[1] == "hold" or self.gametype[1] == "omaha": + if self.gametype[1] == "hold" or self.gametype[1] == "omahahi": self.writeHoldemHand(fh) else: self.writeStudHand(fh) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 93e0beb6..3ed2f4c9 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -141,7 +141,7 @@ class HandHistoryConverter: self.markStreets(hand) # Different calls if stud or holdem like - if self.gametype[1] == "hold" or self.gametype[1] == "omaha": + if self.gametype[1] == "hold" or self.gametype[1] == "omahahi": self.readBlinds(hand) self.readButton(hand) self.readHeroCards(hand) # want to generalise to draw games @@ -155,7 +155,7 @@ class HandHistoryConverter: for street in hand.streetList: # go through them in order print "DEBUG: ", street if hand.streets.group(street) is not None: - if self.gametype[1] == "hold" or self.gametype[1] == "omaha": + if self.gametype[1] == "hold" or self.gametype[1] == "omahahi": self.readCommunityCards(hand, street) # read community cards elif self.gametype[1] == "razz" or self.gametype[1] == "stud" or self.gametype[1] == "stud8": self.readPlayerCards(hand, street)