acpc_poker_types 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f24714536d94582ffb4a4928f906807a9f25d78
-  data.tar.gz: 2982a1f06ee0b343448a8983d0c1a9bf6c083ad6
+  metadata.gz: 0e7db77dcac1bb6a8abf691890b233c4989f3a3e
+  data.tar.gz: 7c5962907fc4347379e80c716207efb468db404c
 SHA512:
-  metadata.gz: 70a557cd1d3932d9dee54c9184dce445b701e3ac46633f7f9d48cd3d1424c4ee8c8acf8ee5dffa3a6b37ea54e1859ed90de534b18884df33571bfa28bc0b7ee5
-  data.tar.gz: dd2ca29159f8330e67a9bbbed5a4bc4ad1a0ac731116b1bca7793b885db1e638d16ae8b1f7ff92c7483d04f894f6cbc2aa8e1ba6992901c5d9607849f6045416
+  metadata.gz: cbf955f892695ed3ef36e87b61cb374e01869429decd6b0c78611269f21c5a6a12e668ef91542460a185668edea981ad81da7b8c86bf77add96f77322ebba389
+  data.tar.gz: d284cf1b711a6ea1d4100a9903cf949a6f62a85b9121d701b0d43935dbe3a187b336636ff060fd10b44d60bfcaa02999037d98e10d1fe8802a7faa59636933a4

data/lib/acpc_poker_types/hand_player.rb

@@ -87,26 +87,22 @@ class HandPlayer
     else
       l_actions << PokerAction.new(PokerAction::CHECK)
     end
-    if !wager_illegal && stack > amount_to_call.to_r
-      max_wager_by = stack - amount_to_call.to_r
-      min_wager_by_adjusted = [min_wager_by + amount_to_call.to_r, max_wager_by].min
+    if !wager_illegal && wager_allowed_by_stack?(amount_to_call)
+      min_wager_by_cost = [min_wager_by + amount_to_call.to_r, stack].min
+
+      add_wager_actions = ->(wager_character) do
+        l_actions << PokerAction.new(wager_character, cost: min_wager_by_cost)
+        if all_in_allowed?(betting_type, min_wager_by_cost)
+          l_actions << PokerAction.new(wager_character, cost: stack)
+        end
+      end
 
       if (
-        amount_to_call.to_r > 0 ||
-        (
-          contributions.length > in_round &&
-          contributions[in_round] > 0
-        )
+        amount_to_call.to_r > 0 || contributions[in_round].to_i > 0
       )
-        l_actions << PokerAction.new(PokerAction::RAISE, cost: min_wager_by_adjusted)
-        unless betting_type == GameDefinition::BETTING_TYPES[:limit] || min_wager_by_adjusted == max_wager_by
-          l_actions << PokerAction.new(PokerAction::RAISE, cost: max_wager_by)
-        end
+        add_wager_actions.call(PokerAction::RAISE)
       else
-        l_actions << PokerAction.new(PokerAction::BET, cost: min_wager_by_adjusted)
-        unless betting_type == GameDefinition::BETTING_TYPES[:limit] || min_wager_by_adjusted == max_wager_by
-          l_actions << PokerAction.new(PokerAction::BET, cost: max_wager_by)
-        end
+        add_wager_actions.call(PokerAction::BET)
       end
     end
 
@@ -141,5 +137,13 @@ class HandPlayer
   def round
     @actions.length - 1
   end
+
+  def wager_allowed_by_stack?(amount_to_call)
+    stack > amount_to_call.to_r
+  end
+
+  def all_in_allowed?(betting_type, min_wager_by_cost)
+    betting_type != GameDefinition::BETTING_TYPES[:limit] && min_wager_by_cost < stack
+  end
 end
 end

data/lib/acpc_poker_types/hand_player_group.rb

@@ -81,7 +81,10 @@ class HandPlayerGroup < DelegateClass(Array)
     @players[acting_player_position].legal_actions(
       in_round: round,
       amount_to_call: amount_to_call(acting_player_position),
-      wager_illegal: num_wagers(round) >= game_def.max_number_of_wagers[round],
+      wager_illegal: (
+        game_def.max_number_of_wagers[round] &&
+        num_wagers(round) >= game_def.max_number_of_wagers[round]
+      ),
       betting_type: game_def.betting_type,
       min_wager_by: min_wager_by
     )

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '7.2.0'
+  VERSION = '7.2.1'
 end

data/spec/match_state_spec.rb

@@ -944,6 +944,48 @@ describe MatchState do
 
       patient.must_equal x_actions
 
+      patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
+    end
+    it 'should work properly in no-limit after an opponent has bet' do
+      game_definition = GameDefinition.parse_file(AcpcDealer::GAME_DEFINITION_FILE_PATHS[2][:nolimit])
+
+      patient = MatchState.parse("MATCHSTATE:0:0:r9550:Jh7d|").legal_actions(
+        game_definition
+      )
+
+      blind = 100
+      to_call = 9550 - blind
+      to_all_in = game_definition.chip_stacks[0] - blind
+
+      x_actions = [
+        PokerAction.new(PokerAction::CALL, cost: to_call),
+        PokerAction.new(PokerAction::FOLD, cost: 0),
+        PokerAction.new(PokerAction::RAISE, cost: 2 * to_call),
+        PokerAction.new(PokerAction::RAISE, cost: to_all_in)
+      ]
+
+      patient.must_equal x_actions
+
+      patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
+    end
+    it 'should not error' do
+      game_definition = GameDefinition.parse_file(AcpcDealer::GAME_DEFINITION_FILE_PATHS[2][:nolimit])
+
+      patient = MatchState.parse("MATCHSTATE:0:0:r9550c/:Jh7d|/QhQsJs").legal_actions(
+        game_definition
+      )
+
+      blind = 100
+      to_all_in = game_definition.chip_stacks[0] - 9550
+
+      x_actions = [
+        PokerAction.new(PokerAction::CHECK, cost: 0),
+        PokerAction.new(PokerAction::BET, cost: game_definition.min_wagers[1]),
+        PokerAction.new(PokerAction::BET, cost: to_all_in)
+      ]
+
+      patient.must_equal x_actions
+
       patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Dustin Morrill