From 77a9fd2ed3ecd9dd1edba6e614ffec62fea80c44 Mon Sep 17 00:00:00 2001 From: Chris Rericha Date: Mon, 10 Feb 2025 00:00:56 -0500 Subject: [PATCH 1/2] [1844] Allow EMR cross buying from sbb --- lib/engine/step/train.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/engine/step/train.rb b/lib/engine/step/train.rb index b83b1f8ea7..6790926be1 100644 --- a/lib/engine/step/train.rb +++ b/lib/engine/step/train.rb @@ -178,7 +178,9 @@ def buyable_trains(entity) other_trains = [] if entity.cash.zero? && @game.class::EBUY_FROM_OTHERS == :never - other_trains.reject! { |t| entity.cash < t.price && must_buy_at_face_value?(t, entity) } + unless president_may_contribute?(entity) + other_trains.reject! { |t| entity.cash < t.price && must_buy_at_face_value?(t, entity) } + end depot_trains + other_trains end From 2e22dbc8b1e763898686e3e4fae0b0c39c6afbeb Mon Sep 17 00:00:00 2001 From: Chris Rericha Date: Mon, 17 Feb 2025 19:01:03 -0500 Subject: [PATCH 2/2] [1848] Use base class signature for president_may_contribute? --- lib/engine/game/g_1848/step/buy_train.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/engine/game/g_1848/step/buy_train.rb b/lib/engine/game/g_1848/step/buy_train.rb index 5624ae763a..47b8f77efc 100644 --- a/lib/engine/game/g_1848/step/buy_train.rb +++ b/lib/engine/game/g_1848/step/buy_train.rb @@ -129,7 +129,7 @@ def ebuy_president_can_contribute?(_corporation) false end - def president_may_contribute? + def president_may_contribute?(_entity, _shell = nil) false end