Count starting limbs in cost of adding joints
Some torsos, notably the Headless Skeleton, come with pre-filled limbs that must be factored into the calculation.
This commit is contained in:
parent
244e87e4bf
commit
c6c04c1025
|
@ -1338,7 +1338,7 @@ def Solve(bone_market_fluctuations, zoological_mania, occasional_buyer = None, d
|
||||||
add_joints = actions[Appendage.ADD_JOINTS]
|
add_joints = actions[Appendage.ADD_JOINTS]
|
||||||
|
|
||||||
base_joints = model.NewIntVar(0, cp_model.INT32_MAX, 'base joints')
|
base_joints = model.NewIntVar(0, cp_model.INT32_MAX, 'base joints')
|
||||||
model.Add(base_joints == cp_model.LinearExpr.ScalProd([value for (key, value) in actions.items() if isinstance(key, Torso)], [torso.value.limbs_needed for torso in Torso]))
|
model.Add(base_joints == cp_model.LinearExpr.ScalProd([value for (key, value) in actions.items() if isinstance(key, Torso)], [torso.value.limbs_needed + torso.value.arms + torso.value.legs + torso.value.wings + torso.value.fins + torso.value.tentacles for torso in Torso]))
|
||||||
|
|
||||||
add_joints_amber_cost_multiple = model.NewIntVar(0, cp_model.INT32_MAX, 'add joints amber cost multiple')
|
add_joints_amber_cost_multiple = model.NewIntVar(0, cp_model.INT32_MAX, 'add joints amber cost multiple')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue