Slot quantity is now a computed value, added property viewer for slots
This commit is contained in:
@@ -23,6 +23,7 @@ export default function computeEndStepProperty(prop, memo){
|
||||
computePropertyField(prop, memo, 'maxPrepared');
|
||||
break;
|
||||
case 'propertySlot':
|
||||
computePropertyField(prop, memo, 'quantityExpected');
|
||||
computePropertyField(prop, memo, 'slotCondition');
|
||||
break;
|
||||
case 'roll':
|
||||
|
||||
@@ -21,6 +21,9 @@ export default function evaluateCalculation({
|
||||
context,
|
||||
dependencies,
|
||||
};
|
||||
if (typeof string !== 'string'){
|
||||
string = string.toString();
|
||||
}
|
||||
// Parse the string
|
||||
let calc;
|
||||
try {
|
||||
|
||||
@@ -23,10 +23,14 @@ export default function recomputeSlotFullness(ancestorId){
|
||||
}
|
||||
});
|
||||
let spaceLeft;
|
||||
if (slot.quantityExpected === 0){
|
||||
let expected = slot.quantityExpectedResult;
|
||||
if (typeof expected !== 'number'){
|
||||
expected = 1;
|
||||
}
|
||||
if (expected === 0){
|
||||
spaceLeft = null;
|
||||
} else {
|
||||
spaceLeft = slot.quantityExpected - totalFilled;
|
||||
spaceLeft = expected - totalFilled;
|
||||
}
|
||||
if (slot.totalFilled !== totalFilled || slot.spaceLeft !== spaceLeft){
|
||||
CreatureProperties.update(slot._id, {
|
||||
|
||||
@@ -22,9 +22,9 @@ let SlotSchema = new SimpleSchema({
|
||||
type: String,
|
||||
},
|
||||
quantityExpected: {
|
||||
type: SimpleSchema.Integer,
|
||||
defaultValue: 1,
|
||||
min: 0,
|
||||
type: String,
|
||||
optional: true,
|
||||
defaultValue: '1',
|
||||
},
|
||||
ignored: {
|
||||
type: Boolean,
|
||||
|
||||
Reference in New Issue
Block a user