Merge pull request #97 from RuijieZ/bug-fix

Bug fix
ItalyToast · Dec 5, 2023 · 141712a · 141712a
2 parents 4a128a5 + 2a5c966
commit 141712a
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 1 deletion.
diff --git a/HandHistories.Parser.UnitTests/HandHistories.Parser.UnitTests.csproj b/HandHistories.Parser.UnitTests/HandHistories.Parser.UnitTests.csproj
@@ -425,6 +425,9 @@
     <None Update="SampleHandHistories\GGPoker\CashGame\GeneralHands\Straddle.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="SampleHandHistories\GGPoker\CashGame\HandActionTests\UncalledBetAndPaysCashoutFee.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="SampleHandHistories\GGPoker\CashGame\Limits\Limit1.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/...UnitTests/Parsers/HandParserTests/HandActionTests/HandParserHandActionTestsGGPokerImpl.cs b/...UnitTests/Parsers/HandParserTests/HandActionTests/HandParserHandActionTestsGGPokerImpl.cs
@@ -74,6 +74,38 @@ public void RecivesCashout_Works()
             TestParseActions("ReceivesCashout", expectedActions, expectedWinners);
         }
 
+        [Test]
+        public void UncalledBet_PaysCashoutFee_Works()
+        {
+            List<HandAction> expectedActions = new List<HandAction>()
+            {
+                new HandAction("1bc2d84c", HandActionType.SMALL_BLIND, -0.5m, Street.Preflop),
+                new HandAction("52d14g62", HandActionType.BIG_BLIND, -1m, Street.Preflop),
+                new HandAction("Hero", HandActionType.RAISE, 2.5m, Street.Preflop),
+                new HandAction("8dc10ffk", HandActionType.CALL, 2.5m, Street.Preflop),
+                new HandAction("d1bba42", HandActionType.CALL, 2.5m, Street.Preflop),
+                new HandAction("16254bdk", HandActionType.CALL, 2.5m, Street.Preflop),
+                new HandAction("1bc2d84c", HandActionType.RAISE, 103.28m, Street.Preflop, true),
+                new HandAction("52d14g62", HandActionType.FOLD, 0m, Street.Preflop),
+                new HandAction("Hero", HandActionType.FOLD, 0m, Street.Preflop),
+                new HandAction("8dc10ffk", HandActionType.RAISE, 137.97m, Street.Preflop, true),
+                new HandAction("d1bba42", HandActionType.FOLD, 0m, Street.Preflop),
+                new HandAction("16254bdk", HandActionType.FOLD, 0m, Street.Preflop),
+                new HandAction("8dc10ffk", HandActionType.UNCALLED_BET, 36.69m, Street.Preflop),
+
+                new HandAction("8dc10ffk", HandActionType.SHOW, 0, Street.Showdown),
+                new HandAction("1bc2d84c", HandActionType.SHOW, 0, Street.Showdown),
+                new HandAction("8dc10ffk", HandActionType.PAYS_INSURANCE_FEE, 35.19m, Street.Showdown),
+            };
+
+            var expectedWinners = new List<WinningsAction>()
+            {
+                new WinningsAction("8dc10ffk", WinningsActionType.WINS, 210.06m, 0)
+            };
+
+            TestParseActions("UncalledBetAndPaysCashoutFee", expectedActions, expectedWinners);
+        }
+
         [Test]
         public void PostingDead_Works()
         {

diff --git a/...sts/SampleHandHistories/GGPoker/CashGame/HandActionTests/UncalledBetAndPaysCashoutFee.txt b/...sts/SampleHandHistories/GGPoker/CashGame/HandActionTests/UncalledBetAndPaysCashoutFee.txt
@@ -0,0 +1,46 @@
+Poker Hand #HD434130: Hold'em No Limit  ($0.5/$1) - 2020/07/13 11:16:01
+Table 'NLHSilver1' 6-max Seat #6 is the button
+Seat 1: 1bc2d84c ($103.78 in chips)
+Seat 2: 52d14g62 ($100 in chips)
+Seat 3: Hero ($98.13 in chips)
+Seat 4: 8dc10ffk ($140.47 in chips)
+Seat 5: d1bba42 ($72.73 in chips)
+Seat 6: 16254bdk ($115.14 in chips)
+1bc2d84c: posts small blind $0.5
+52d14g62: posts big blind $1
+*** HOLE CARDS ***
+Dealt to 1bc2d84c 
+Dealt to 52d14g62 
+Dealt to Hero [Jh Ac]
+Dealt to 8dc10ffk 
+Dealt to d1bba42 
+Dealt to 16254bdk 
+Hero: raises $1.5 to $2.5
+8dc10ffk: calls $2.5
+d1bba42: calls $2.5
+16254bdk: calls $2.5
+1bc2d84c: raises $101.28 to $103.78 and is all-in
+52d14g62: folds
+Hero: folds
+8dc10ffk: raises $36.69 to $140.47 and is all-in
+d1bba42: folds
+16254bdk: folds
+Uncalled bet ($36.69) returned to 8dc10ffk
+8dc10ffk: shows [Ks Kd]
+1bc2d84c: shows [Ah Kc]
+*** FLOP *** [4d Ts 5h]
+*** TURN *** [4d Ts 5h] [6s]
+8dc10ffk: Chooses to EV Cashout 
+*** RIVER *** [4d Ts 5h 6s] [Th]
+8dc10ffk: Pays Cashout Risk ($35.19)
+*** SHOWDOWN ***
+8dc10ffk collected $210.06 from pot
+*** SUMMARY ***
+Total pot $216.06 | Rake $5 | Jackpot $1 | Bingo $0
+Board [4d Ts 5h 6s Th]
+Seat 1: 1bc2d84c (small blind) showed [Ah Kc] and lost with Pair of Tens
+Seat 2: 52d14g62 (big blind) folded before Flop
+Seat 3: Hero folded before Flop
+Seat 4: 8dc10ffk showed [Ks Kd] and won ($210.06) with Pair of Kings and Pair of Tens, Cashout Risk ($35.19)
+Seat 5: d1bba42 folded before Flop
+Seat 6: 16254bdk (button) folded before Flop
diff --git a/HandHistories.Parser/Parsers/FastParser/GGPoker/GGPokerFastParserImpl.cs b/HandHistories.Parser/Parsers/FastParser/GGPoker/GGPokerFastParserImpl.cs
@@ -636,7 +636,7 @@ private bool ParseLine(string line, ref Street currentStreet, List<HandAction> h
             {
                 handActions.Add(ParseUncalledBetLine(line, currentStreet));
                 currentStreet = Street.Showdown;
-                return true;
+                return false;
             }
 
             if (line.Contains(" shows "))