From 0df01ccf2e79e633d676b44d3d1a4a4b49125d6a Mon Sep 17 00:00:00 2001 From: Jeremy Saklad Date: Tue, 26 Jul 2022 14:25:03 -0500 Subject: [PATCH] fix: Correct Exhibition payout It appears that the Exhibition buyer pays out a flat 1000 over the nominal value, rather than 110% of it. --- bonemarketsolver/solve.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/bonemarketsolver/solve.py b/bonemarketsolver/solve.py index 37c1e3b..8990d66 100644 --- a/bonemarketsolver/solve.py +++ b/bonemarketsolver/solve.py @@ -1088,28 +1088,18 @@ def Solve(shadowy_level, bone_market_fluctuations = None, zoological_mania = Non ), ) - # Exhibition - - exhibition_payout = model.NewIntVar('exhibition payout', lb = 0) - - multiplied_exhibition_value = model.NewIntVar('multiplied exhibition value', lb = 0) - model.Add(multiplied_exhibition_value == 11*value) - model.AddDivisionEquality(exhibition_payout, multiplied_exhibition_value, 10) - model.AddIf(actions[Buyer.EXHIBITION], cp_model.BoundedLinearExpression(skeleton_in_progress, (110, 212)), implausibility == 0, value >= 9000, antiquity >= 3, amalgamy == 0, - primary_revenue == exhibition_payout, + primary_revenue == value + 1000, secondary_revenue == 0, difficulty_level == 0, added_exhaustion == 0, ) - del exhibition_payout, multiplied_exhibition_value - model.AddIf(actions[Buyer.THE_DUMBWAITER_OF_BALMORAL], cp_model.BoundedLinearExpression(skeleton_in_progress, (180, 189)), value >= 250,