Saklad5
/
Bone-Market-Solver
2
0
Fork 0
Code Issues Pull Requests Activity

fix: Correct Exhibition payout 

It appears that the Exhibition buyer pays out a flat 1000 over the
nominal value, rather than 110% of it.
This commit is contained in:
Jeremy Saklad 2022-07-26 14:25:03 -05:00
parent ac0f6adbef
commit 0df01ccf2e
Signed by: Jeremy Saklad
GPG Key ID: 94B02EA3D0B6481B
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonemarketsolver/solve.py
View File

@ -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], model.AddIf(actions[Buyer.EXHIBITION],
cp_model.BoundedLinearExpression(skeleton_in_progress, (110, 212)), cp_model.BoundedLinearExpression(skeleton_in_progress, (110, 212)),
implausibility == 0, implausibility == 0,
value >= 9000, value >= 9000,
antiquity >= 3, antiquity >= 3,
amalgamy == 0, amalgamy == 0,
primary_revenue == exhibition_payout, primary_revenue == value + 1000,
secondary_revenue == 0, secondary_revenue == 0,
difficulty_level == 0, difficulty_level == 0,
added_exhaustion == 0, added_exhaustion == 0,
) )
del exhibition_payout, multiplied_exhibition_value
model.AddIf(actions[Buyer.THE_DUMBWAITER_OF_BALMORAL], model.AddIf(actions[Buyer.THE_DUMBWAITER_OF_BALMORAL],
cp_model.BoundedLinearExpression(skeleton_in_progress, (180, 189)), cp_model.BoundedLinearExpression(skeleton_in_progress, (180, 189)),
value >= 250, value >= 250,