Merge branch 'scaling' into 'master'

Support Heightened +1 damage scaling for prepared slots See merge request hooking/foundry-vtt---pathfinder-2e!18
foundryvtt · Feb 18, 2020 · f0ed876 · f0ed876
2 parents 763302d + 554c8f8
commit f0ed876
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 9 deletions.
diff --git a/scripts/actor/sheet/base.js b/scripts/actor/sheet/base.js
@@ -884,7 +884,7 @@ class ActorSheetPF2e extends ActorSheet {
  event.preventDefault();
  let itemId = $(event.currentTarget).parents(".item").attr("data-item-id"),
  item = this.actor.getOwnedItem(itemId);
- item.roll();
+ item.roll(event);
  }
 
  /* -------------------------------------------- */

diff --git a/scripts/config.js b/scripts/config.js
@@ -845,3 +845,9 @@ CONFIG.languages = {
  "terran": "Terran",
  "undercommon": "Undercommon"
 };
+
+CONFIG.spellScalingModes = {
+ "none": "None",
+ "cantrip": "Cantrip",
+ "level": "Heightened +1"
+}
diff --git a/scripts/item/item.js b/scripts/item/item.js
@@ -7,16 +7,18 @@ class ItemPF2e extends Item {
  * Roll the item to Chat, creating a chat card which contains follow up attack or damage roll options
  * @return {Promise}
  */
- async roll() {
+ async roll(event) {
 
  // Basic template rendering data
  const template = `systems/pf2e/templates/chat/${this.data.type}-card.html`
  const token = this.actor.token;
+ const nearestItem = event.currentTarget.closest(".item")
  const templateData = {
  actor: this.actor,
  tokenId: token ? `${token.scene._id}.${token._id}` : null,
  item: this.data,
- data: this.getChatData()
+ data: this.getChatData(),
+ contextualItemData: nearestItem.dataset
  };
 
  // Basic chat message data
@@ -604,14 +606,18 @@ class ItemPF2e extends Item {
  rollSpellDamage(event) {
  if ( this.type !== "spell" ) throw "Wrong item type!";
 
+ const button = event.currentTarget,
+ card = button.closest('*[data-spell-lvl]');
+
  // Get data
  let itemData = this.data.data,
  spellcastingEntry = this.actor.getOwnedItem(itemData.location.value),
  rollData = duplicate(this.actor.data.data),
  abl = spellcastingEntry.data.data.ability.value || "int",
  parts = [itemData.damage.value],
  isHeal = itemData.spellType.value === "heal",
- dtype = CONFIG.damageTypes[itemData.damageType.value];
+ dtype = CONFIG.damageTypes[itemData.damageType.value],
+ spellLvl = parseInt(card.dataset.spellLvl);
 
  // Append damage type to title
  let title = this.name + (isHeal ? " - Healing" : " - Damage");
@@ -622,6 +628,9 @@ class ItemPF2e extends Item {
  rollData.item = itemData;
 
  if (itemData.damage.applyMod) parts.push(rollData.abilities[abl].mod);
+ if (itemData.scaling.mode === "level" && itemData.scaling.formula !== "" && itemData.level.value < spellLvl) {
+ parts.push(`(${spellLvl - itemData.level.value})*(${itemData.scaling.formula})`)
+ }
 
  // Call the roll helper utility
  DicePF2e.damageRoll({

diff --git a/scripts/item/sheet.js b/scripts/item/sheet.js
@@ -54,7 +54,8 @@ class ItemSheetPF2e extends ItemSheet {
  //spellBasic: CONFIG.spellBasic,
  spellComponents: this._formatSpellComponents(data.data),
  areaSizes: CONFIG.areaSizes,
- areaTypes: CONFIG.areaTypes
+ areaTypes: CONFIG.areaTypes,
+ spellScalingModes: CONFIG.spellScalingModes
  });
  }
 
@@ -231,4 +232,4 @@ Hooks.on('renderChatLog', (log, html, data) => ItemPF2e.chatListeners(html));
 
 // Register Item Sheet
 Items.unregisterSheet("core", ItemSheet);
-Items.registerSheet("pf2e", ItemSheetPF2e, {makeDefault: true});
+Items.registerSheet("pf2e", ItemSheetPF2e, {makeDefault: true});
diff --git a/template.json b/template.json
@@ -912,6 +912,12 @@
  "type": "String",
  "label": "Damage Type"
  },
+ "scaling": {
+ "type": "String",
+ "label": "Scaling",
+ "mode": null,
+ "formula": null
+ },
  "save": {
  "type": "String",
  "label": "Saving Throw",
@@ -1138,4 +1144,4 @@
  }
  }
  }
-}
+}
diff --git a/templates/chat/spell-card.html b/templates/chat/spell-card.html
@@ -1,4 +1,4 @@
-<div class="pf2e chat-card item-card" data-actor-id="{{actor._id}}" data-item-id="{{item._id}}" {{#if tokenId}}data-token-id="{{tokenId}}"{{/if}}>
+<div class="pf2e chat-card item-card" data-spell-lvl="{{contextualItemData.spellLvl}}" data-actor-id="{{actor._id}}" data-item-id="{{item._id}}" {{#if tokenId}}data-token-id="{{tokenId}}"{{/if}}>
  <header class="card-header flexrow">
  <img src="{{item.img}}" title="{{item.name}}" width="36" height="36"/>
  <h3>{{item.name}}</h3>

diff --git a/templates/items/spell-details.html b/templates/items/spell-details.html
@@ -73,6 +73,18 @@
  </select>
 </div>
 
+<div class="form-group">
+ <label>{{data.scaling.label}}</label>
+ <select name="data.scaling.mode">
+ {{#select data.scaling.mode}}
+ {{#each spellScalingModes as |name key|}}
+ <option value="{{key}}">{{name}}</option>
+ {{/each}}
+ {{/select}}
+ </select>
+ <input type="text" name="data.scaling.formula" value="{{data.scaling.formula}}" placeholder="Scaling Formula"/>
+</div>
+
 <div class="form-group">
  <label>{{data.save.label}}</label>
  <div class="details-container-two-columns">
@@ -193,4 +205,4 @@
  <span class="tag {{k}}">{{v}}</span>
  {{/each}}
  </ul>
-</div>
+</div>