Added attack roll bonus and dc to spell list. Use them in spells with #spellList.dcResult and #spellList.attackRollBonusResult

app/imports/api/creature/actions/applyProperties.js

@@ -62,7 +62,7 @@ function applyPropertyAndWalkChildren({prop, child, targets, ...options}){
 export default function applyProperties({ forest, targets, ...options}){
   forest.forEach(child => {
     let prop = child.node;
-    if (shouldSplit(prop)){
+    if (shouldSplit(prop) && targets.length){
       targets.forEach(target => {
         let targets = [target]
         applyPropertyAndWalkChildren({ targets, prop, child, ...options});

app/imports/api/creature/actions/applySave.js

@@ -69,6 +69,7 @@ export default function applySave({
       return !saveSuccess;
     } else {
       // TODO
+      return true;
     }
   } catch (e){
     log.content.push({

app/imports/api/creature/computation/engine/computeEndStepProperty.js

@@ -14,16 +14,22 @@ export default function computeEndStepProperty(prop, memo){
       break;
     case 'attack':
       computeAction(prop, memo);
-      computeAttack(prop, memo);
+      computePropertyField(prop, memo, 'rollBonus');
       break;
     case 'savingThrow':
-      computeSavingThrow(prop, memo);
+      computePropertyField(prop, memo, 'dc');
       break;
     case 'spellList':
-      computeSpellList(prop, memo);
+      computePropertyField(prop, memo, 'maxPrepared');
+      computePropertyField(prop, memo, 'attackRollBonus');
+      computePropertyField(prop, memo, 'dc');
       break;
     case 'propertySlot':
-      computeSlot(prop, memo);
+      computePropertyField(prop, memo, 'quantityExpected');
+      computePropertyField(prop, memo, 'slotCondition');
+      break;
+    case 'roll':
+      computePropertyField(prop, memo, 'roll', 'compile');
       break;
   }
 }
@@ -111,19 +117,3 @@ function computePropertyField(prop, memo, fieldName, fn){
     delete prop[`${fieldName}Errors`];
   }
 }
-
-function computeAttack(prop, memo){
-  computePropertyField(prop, memo, 'rollBonus');
-}
-
-function computeSavingThrow(prop, memo){
-  computePropertyField(prop, memo, 'dc');
-}
-
-function computeSpellList(prop, memo){
-  computePropertyField(prop, memo, 'maxPrepared');
-}
-
-function computeSlot(prop, memo){
-  computePropertyField(prop, memo, 'slotCondition');
-}

app/imports/api/creature/computation/engine/evaluateCalculation.js

@@ -21,6 +21,9 @@ export default function evaluateCalculation({
     context,
     dependencies,
   };
+  if (typeof string !== 'string'){
+    string = string.toString();
+  }
   // Parse the string
   let calc;
   try {

app/imports/api/creature/denormalise/recomputeSlotFullness.js

@@ -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, {

app/imports/api/properties/Slots.js

@@ -22,9 +22,9 @@ let SlotSchema = new SimpleSchema({
 		type: String,
 	},
   quantityExpected: {
-    type: SimpleSchema.Integer,
+    type: String,
-    defaultValue: 1,
+    optional: true,
-    min: 0,
+    defaultValue: '1',
   },
   ignored: {
     type: Boolean,

app/imports/api/properties/SpellLists.js

@@ -23,6 +23,16 @@ let SpellListSchema = new SimpleSchema({
 		type: String,
 		optional: true,
 	},
+  // Calculation of The attack roll bonus used by spell attacks in this list
+  attackRollBonus: {
+		type: String,
+		optional: true,
+	},
+  // Calculation of the save dc used by spells in this list
+  dc: {
+		type: String,
+		optional: true,
+	},
 });
 
 const ComputedOnlySpellListSchema = new SimpleSchema({
@@ -33,6 +43,7 @@ const ComputedOnlySpellListSchema = new SimpleSchema({
   },
   'descriptionCalculations.$': InlineComputationSchema,
 
+  // maxPrepared
   maxPreparedResult: {
     type: Number,
     optional: true,
@@ -44,6 +55,32 @@ const ComputedOnlySpellListSchema = new SimpleSchema({
   'maxPreparedErrors.$':{
     type: ErrorSchema,
   },
+
+  // attackRollBonus
+  attackRollBonusResult: {
+    type: Number,
+    optional: true,
+  },
+  attackRollBonusErrors: {
+    type: Array,
+    optional: true,
+  },
+  'attackRollBonusErrors.$':{
+    type: ErrorSchema,
+  },
+
+  // dc
+  dcResult: {
+    type: Number,
+    optional: true,
+  },
+  dcErrors: {
+    type: Array,
+    optional: true,
+  },
+  'dcErrors.$':{
+    type: ErrorSchema,
+  },
 });
 
 const ComputedSpellListSchema = new SimpleSchema()

app/imports/server/discord/sendWebhook.js

@@ -10,7 +10,6 @@ export default function sendWebhook({webhookURL, data = {}}){
 
   const hook = new Discord.WebhookClient(id, token);
   // Send a message using the webhook
-  console.log(JSON.stringify(data, null, 2));
   hook.send(data);
 }
 

app/imports/ui/creature/slots/Slots.vue

@@ -8,8 +8,8 @@
       <h3 class="layout row align-center">
         {{ slot.name }}
         <v-spacer />
-        <span v-if="slot.quantityExpected > 1">
+        <span v-if="slot.quantityExpectedResult > 1">
-          {{ slot.totalFilled }} / {{ slot.quantityExpected }}
+          {{ slot.totalFilled }} / {{ slot.quantityExpectedResult }}
         </span>
       </h3>
       <v-list v-if="slot.children.length">
@@ -38,7 +38,7 @@
         </v-list-tile>
       </v-list>
       <v-btn
-        v-if="!slot.quantityExpected || slot.spaceLeft"
+        v-if="!slot.quantityExpectedResult || slot.spaceLeft"
         icon
         :data-id="`slot-add-button-${slot._id}`"
         class="slot-add-button"

app/imports/ui/properties/forms/SlotForm.vue

@@ -28,8 +28,6 @@
     />
     <text-field
       label="Quantity"
-      type="number"
-      min="0"
       hint="How many matching properties must be used to fill this slot, 0 is unlimited"
       :value="model.quantityExpected"
       :error-messages="errors.quantityExpected"

app/imports/ui/properties/forms/SpellListForm.vue

@@ -25,7 +25,7 @@
       @change="change('description', ...arguments)"
     />
     <calculation-error-list :calculations="model.descriptionCalculations" />
-    
+
     <text-field
       label="Maximum prepared spells"
       :value="model.maxPrepared"
@@ -35,6 +35,24 @@
     />
     <calculation-error-list :errors="model.maxPreparedErrors" />
 
+    <text-field
+      label="Spell save DC"
+      :value="model.dc"
+      hint="The spell save DC of spells in this list"
+      :error-messages="errors.dc"
+      @change="change('dc', ...arguments)"
+    />
+    <calculation-error-list :errors="model.dcErrors" />
+
+    <text-field
+      label="Attack roll bonus"
+      :value="model.attackRollBonus"
+      hint="The attack roll bonus of spell attacks made by spells in this list"
+      :error-messages="errors.attackRollBonus"
+      @change="change('attackRollBonus', ...arguments)"
+    />
+    <calculation-error-list :errors="model.attackRollBonusErrors" />
+
     <smart-combobox
       label="Tags"
       multiple

app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue

@@ -10,7 +10,11 @@
     <div
       class="text-no-wrap text-truncate"
     >
-      {{ model.amountResult }} {{ model.stat }} damage
+      <span v-if="model.amountResult < 0">+</span>
+      {{ absoluteAmount }} {{ model.stat }}
+      <span v-if="typeof absoluteAmount === 'string' || absoluteAmount >= 0">
+        damage
+      </span>
     </div>
   </div>
 </template>
@@ -20,5 +24,14 @@ import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeView
 
 export default {
   mixins: [treeNodeViewMixin],
+  computed: {
+    absoluteAmount(){
+      if (typeof this.model.amountResult === 'number'){
+        return Math.abs(this.model.amountResult);
+      } else {
+        return this.model.amountResult;
+      }
+    },
+  }
 }
 </script>

app/imports/ui/properties/viewers/AdjustmentViewer.vue

@@ -1,14 +1,81 @@
 <template lang="html">
-  <div class="adjustment-viewer layout row align-center">
+  <v-list-tile class="effect-viewer">
-    {{ model.amountResult }} {{ model.stat }} damage
+    <v-list-tile-avatar>
-  </div>
+      <v-tooltip bottom>
+        <template
+          v-if="effectIcon !== 'remove'"
+          #activator="{ on }"
+        >
+          <v-icon
+            class="mx-2"
+            style="cursor: default;"
+            v-on="on"
+          >
+            {{ effectIcon }}
+          </v-icon>
+        </template>
+        <span>{{ tooltip }}</span>
+      </v-tooltip>
+    </v-list-tile-avatar>
+    <v-list-tile-action class="headline">
+      {{ displayedValue }}
+    </v-list-tile-action>
+    <v-list-tile-content>
+      <v-list-tile-title>
+        <code>{{ model.stat }}</code>
+        <template v-if="effectIcon === 'remove'">
+          damage
+        </template>
+      </v-list-tile-title>
+    </v-list-tile-content>
+  </v-list-tile>
 </template>
 
 <script>
 	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+  import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
 
 	export default {
 		mixins: [propertyViewerMixin],
+    computed: {
+      effectIcon(){
+        let effectOp = this.model.operation === 'increment' ? 'add' : 'base';
+				let value = this.value;
+        if (typeof value === 'string'){
+          value = 1;
+        }
+        return getEffectIcon(effectOp, -value);
+			},
+      value(){
+        return 'amountResult' in this.model ?
+          this.model.amountResult :
+          this.model.amount;
+      },
+      displayedValue(){
+        if (
+          typeof this.value === 'number' &&
+          this.model.operation !== 'set'
+        ){
+          return Math.abs(this.value);
+        } else {
+          return this.value;
+        }
+      },
+      tooltip(){
+        if (this.model.operation === 'increment'){
+          if (
+            typeof this.value === 'string' ||
+            this.value >= 0
+          ){
+            return 'Minus';
+          } else {
+            return 'Add'
+          }
+        } else {
+          return 'Set'
+        }
+      }
+    },
 	}
 </script>
 

app/imports/ui/properties/viewers/ConstantViewer.vue

@@ -0,0 +1,23 @@
+<template lang="html">
+  <div class="buff-viewer">
+    <property-name :value="model.name" />
+    <property-variable-name :value="model.variableName" />
+    <property-field
+      name="Calculation"
+      :value="model.calculation"
+    />
+    <calculation-error-list :errors="model.errors" />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+
+	export default {
+    components: {
+      CalculationErrorList,
+    },
+		mixins: [propertyViewerMixin],
+	}
+</script>

app/imports/ui/properties/viewers/RollViewer.vue

@@ -0,0 +1,23 @@
+<template lang="html">
+  <div class="buff-viewer">
+    <property-name :value="model.name" />
+    <property-variable-name :value="model.variableName" />
+    <property-field
+      name="Roll"
+      :value="'rollResult' in model ? model.rollResult : model.roll"
+    />
+    <calculation-error-list :errors="model.rollErrors" />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+
+	export default {
+    components: {
+      CalculationErrorList,
+    },
+		mixins: [propertyViewerMixin],
+	}
+</script>

app/imports/ui/properties/viewers/SavingThrowViewer.vue

@@ -0,0 +1,21 @@
+<template lang="html">
+  <div class="buff-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      name="Save"
+      :value="model.stat"
+    />
+    <property-field
+      name="DC"
+      :value="'dcResult' in model ? model.dcResult : model.dc"
+    />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+
+	export default {
+		mixins: [propertyViewerMixin],
+	}
+</script>

app/imports/ui/properties/viewers/SlotFillerViewer.vue

@@ -0,0 +1,37 @@
+<template lang="html">
+  <div class="slot-filler-viewer">
+    <property-name :value="model.name" />
+    <v-img
+      v-if="model.picture"
+      :src="model.picture"
+      :height="200"
+      contain
+      class="slot-card-image"
+    />
+    <property-field
+      name="Type"
+      :value="model.slotFillerType"
+    />
+    <property-field
+      name="Quantity"
+      :value="model.slotQuantityFilled"
+    />
+    <property-field
+      name="Condition"
+      :value="model.slotFillerCondition"
+    />
+    <property-description
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
+    />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+
+	export default {
+		mixins: [propertyViewerMixin],
+	}
+</script>

app/imports/ui/properties/viewers/SlotViewer.vue

@@ -0,0 +1,41 @@
+<template lang="html">
+  <div class="buff-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      name="Type"
+      :value="model.slotType"
+    />
+    <property-field
+      name="Quantity"
+      :value="'quantityExpectedResult' in model ? model.quantityExpectedResult : model.quantityExpected"
+    />
+    <property-field
+      name="Condition"
+      :value="model.slotCondition"
+    />
+    <property-field
+      v-if="'slotConditionResult' in model"
+      name="Condition result"
+      :value="model.slotConditionResult"
+    />
+    <template v-if="model.tags.length">
+      <div class="caption">
+        Tags
+      </div>
+      <property-tags :tags="model.tags" />
+    </template>
+    <property-description
+      :string="model.description"
+      :calculations="model.descriptionCalculations"
+      :inactive="model.inactive"
+    />
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+
+	export default {
+		mixins: [propertyViewerMixin],
+	}
+</script>

app/imports/ui/properties/viewers/SpellListViewer.vue

@@ -4,7 +4,15 @@
     <property-variable-name :value="model.variableName" />
     <property-field
       name="Maximum prepared spells"
-      :value="model.maxPreparedResult"
+      :value="'maxPreparedResult' in model ? model.maxPreparedResult : model.maxPrepared"
+    />
+    <property-field
+      name="Spell Save DC"
+      :value="'dcResult' in model ? model.dcResult : model.dcResult"
+    />
+    <property-field
+      name="Attack roll bonus"
+      :value="'attackRollBonusResult' in model ? model.attackRollBonusResult : model.attackRollBonus"
     />
     <property-description
       :string="model.description"

app/imports/ui/properties/viewers/ToggleViewer.vue

@@ -0,0 +1,31 @@
+<template lang="html">
+  <div class="toggle-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      v-if="model.disabled || model.enabled"
+      name="Status"
+      :value="model.enabled ? 'Enabled' : 'Disabled'"
+    />
+    <template
+      v-else-if="model.condition"
+    >
+      <property-field
+        name="Condition"
+        :value="model.condition"
+      />
+      <property-field
+        v-if="'toggleResult' in model"
+        name="Result"
+        :value="model.toggleResult"
+      />
+    </template>
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+
+	export default {
+		mixins: [propertyViewerMixin],
+	}
+</script>

app/imports/ui/properties/viewers/shared/PropertyField.vue

@@ -1,11 +1,11 @@
 <template lang="html">
   <div v-if="value !== undefined || $slots.default">
-  	<div class="caption">
+    <div class="caption">
-  		{{name}}
+      {{ name }}
-  	</div>
+    </div>
     <p class="ml-2 subheading">
       <slot>
-        {{value}}
+        {{ value }}
       </slot>
     </p>
   </div>
@@ -15,7 +15,7 @@
 export default {
 	props: {
 		name: String,
-		value: [String, Number],
+		value: [String, Number, Boolean],
 	}
 }
 </script>

app/imports/ui/properties/viewers/shared/propertyViewerIndex.js

@@ -5,6 +5,7 @@ import AttributeViewer from '/imports/ui/properties/viewers/AttributeViewer.vue'
 import BuffViewer from '/imports/ui/properties/viewers/BuffViewer.vue';
 import ContainerViewer from '/imports/ui/properties/viewers/ContainerViewer.vue';
 import ClassLevelViewer from '/imports/ui/properties/viewers/ClassLevelViewer.vue';
+import ConstantViewer from '/imports/ui/properties/viewers/ConstantViewer.vue';
 import DamageViewer from '/imports/ui/properties/viewers/DamageViewer.vue';
 import DamageMultiplierViewer from '/imports/ui/properties/viewers/DamageMultiplierViewer.vue';
 import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
@@ -13,10 +14,14 @@ import FolderViewer from '/imports/ui/properties/viewers/FolderViewer.vue';
 import ItemViewer from '/imports/ui/properties/viewers/ItemViewer.vue';
 import NoteViewer from '/imports/ui/properties/viewers/NoteViewer.vue';
 import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.vue';
-//import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
+import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
 import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue';
+import SavingThrowViewer from '/imports/ui/properties/viewers/SavingThrowViewer.vue';
+import SlotViewer from '/imports/ui/properties/viewers/SlotViewer.vue';
+import SlotFillerViewer from '/imports/ui/properties/viewers/SlotFillerViewer.vue';
 import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
 import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
+import ToggleViewer from '/imports/ui/properties/viewers/ToggleViewer.vue';
 
 export default {
   action: ActionViewer,
@@ -26,6 +31,7 @@ export default {
   buff: BuffViewer,
   container: ContainerViewer,
   classLevel: ClassLevelViewer,
+  constant: ConstantViewer,
   damage: DamageViewer,
   damageMultiplier: DamageMultiplierViewer,
   effect: EffectViewer,
@@ -34,8 +40,12 @@ export default {
   item: ItemViewer,
   note: NoteViewer,
   proficiency: ProficiencyViewer,
-//  roll: RollViewer,
+  propertySlot: SlotViewer,
+  roll: RollViewer,
+  savingThrow: SavingThrowViewer,
+  slotFiller: SlotFillerViewer,
   skill: SkillViewer,
   spellList: SpellListViewer,
   spell: SpellViewer,
+  toggle: ToggleViewer,
 };