Version 0.93.3

Rughalt · Jun 13, 2021 · b604129 · b604129
1 parent f28f9d4
commit b604129
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 11 deletions.
diff --git a/changelogs/changelog.0.93.3.md b/changelogs/changelog.0.93.3.md
@@ -0,0 +1,26 @@
+### SRD Update
+- Fixed magic items
+    - Rings of Epic Wizardy
+    - Rings of Epic Psionics
+    - Ring of Iron Skin
+    - Ring of Protetction
+    - Headband of Intellect
+
+### New features:
+- Buff list is now default subtab in buff section of character sheet
+
+### All changes:
+- [590](https://github.com/Rughalt/D35E/issues/590) - the notes in the chat when you try a skill check are missing closed 
+- [589](https://github.com/Rughalt/D35E/issues/589) - Buff cannot access @item.level on DR formula closed 
+- [588](https://github.com/Rughalt/D35E/issues/588) - DR X/Bludgeoning considers "Custom: B" not bludgeoning closed 
+- [587](https://github.com/Rughalt/D35E/issues/587) - Special actions in Combat Changes don't recognize @range as a variable closed 
+- [583](https://github.com/Rughalt/D35E/issues/583) - Class skills not working. closed 
+- [582](https://github.com/Rughalt/D35E/issues/582) - Actors don't have the Low Light Vision Check Box on the ProtoType Token closed 
+- [580](https://github.com/Rughalt/D35E/issues/580) - Feats no longer get applied to the appropriate feat pools. closed 
+- [578](https://github.com/Rughalt/D35E/issues/578) - NPC's only get base skill points at first level instead of 4 times closed 
+- [577](https://github.com/Rughalt/D35E/issues/577) - Make buffs subtab default  closed 
+- [574](https://github.com/Rughalt/D35E/issues/574) - [bug] adding a Common buff adds a missing icon in status list closed 
+- [571](https://github.com/Rughalt/D35E/issues/571) - Soulknife Speed of Tought class ability is missing a UID closed 
+- [570](https://github.com/Rughalt/D35E/issues/570) - [Bug] Full-Attack Combat item does not show on the quick bar. closed 
+- [560](https://github.com/Rughalt/D35E/issues/560) - Ring of Protection +x closed 
+- [536](https://github.com/Rughalt/D35E/issues/536) - Headband of Intellect doesn't have the +int ability score enhancement applied closed 
diff --git a/module/actor/entity.js b/module/actor/entity.js
@@ -3026,6 +3026,7 @@ export class ActorPF extends Actor {
             return true;
         }).forEach(_obj => {
             let obj = _obj.data;
+            erDrRollData.item = _obj.getRollData()
             if (obj.data.resistances) {
                 (obj.data?.resistances || []).forEach(resistance => {
                     if (!resistance[1]) return;
@@ -3064,7 +3065,7 @@ export class ActorPF extends Actor {
                         }
                         erDrRollData.level = obj.data.levels || 0
                         erDrRollData.levels= obj.data.levels || 0
-                        _dr.value = Math.max(_dr.value, new Roll35e(dr[0] || "0", erDrRollData).roll().total)
+                        _dr.value = Math.max(_dr.value, Roll35e.safeRoll(dr[0] || "0", erDrRollData).total)
                         _dr.immunity = _dr.immunity || dr[2];
                         _dr.modified = true;
                         if  (!_dr.items)
@@ -3080,6 +3081,7 @@ export class ActorPF extends Actor {
                     data.shieldType = obj.data?.equipmentSubtype
                 if (obj.data.enhancements !== undefined) {
                     obj.data.enhancements.items.forEach(enhancementItem => {
+                        erDrRollData.item = enhancementItem.data;
                         (enhancementItem.data?.resistances || []).forEach(resistance => {
                             if (!resistance[1]) return;
                             let _resistance = data.combinedResistances.find(res => res.uid === resistance[1])
@@ -4821,7 +4823,7 @@ export class ActorPF extends Actor {
         const noteObjects = this.getContextNotes(`skill.${isSubSkill ? skillParts[2] : skillId}`);
         for (let noteObj of noteObjects) {
             rollData.item = {};
-            if (noteObj.item != null) rollData.item = duplicate(new ItemPF(noteObj.item.data, {owner: this.owner}));
+            if (noteObj.item != null) rollData.item = new ItemPF(noteObj.item.data, {owner: this.owner}).getRollData();
 
             for (let note of noteObj.notes) {
                 notes.push(...note.split(/[\n\r]+/).map(o => TextEditor.enrichHTML(ItemPF._fillTemplate(o, rollData), {rollData: rollData})));

diff --git a/module/item/entity.js b/module/item/entity.js
@@ -2145,6 +2145,12 @@ export class ItemPF extends Item {
                 }
             }
             if (c.length === 6) {
+                if (typeof c[5] === "string") {
+                    c[5] = c[5].replace(/@range1/g, combatChangesRollData.range1)
+                    c[5] = c[5].replace(/@range2/g, combatChangesRollData.range2)
+                    c[5] = c[5].replace(/@range3/g, combatChangesRollData.range3)
+                    c[5] = c[5].replace(/@range/g, combatChangesRollData.range)
+                }
                 c.push(this.id)
                 c.push(this.name)
                 c.push(this.img)

diff --git a/module/item/sheets/base.js b/module/item/sheets/base.js
@@ -647,11 +647,10 @@ export class ItemSheetPF extends ItemSheet {
             for (let [k, v] of Object.entries(CONFIG.D35E.contextNoteTargets)) {
                 if (typeof v === "object") data.contextNotes.targets[k] = v._label;
             }
-            this.item.data.data.contextNotes.forEach(item => {
+            data.data.data.contextNotes.forEach(item => {
                 item.subNotes = {};
                 // Add specific skills
                 if (item[1] === "skill") {
-
                     if (this.item.actor != null) {
                         const actorSkills = this.item.actor.data.data.skills;
                         for (let [s, skl] of Object.entries(actorSkills)) {
@@ -660,7 +659,7 @@ export class ItemSheetPF extends ItemSheet {
                                 else item.subNotes[`skill.${s}`] = CONFIG.D35E.skills[s];
                             } else {
                                 for (let [s2, skl2] of Object.entries(skl.subSkills)) {
-                                    item.subNotes[`skill.${s2}`] = `${CONFIG.D35E.skills[s]} (${skl2.name})`;
+                                    item.subNotes[`skill.${s}.subSkills.${s2}`] = `${CONFIG.D35E.skills[s]} (${skl2.name})`;
                                 }
                             }
                         }
@@ -671,11 +670,12 @@ export class ItemSheetPF extends ItemSheet {
                                 else item.subNotes[`skill.${s}`] = CONFIG.D35E.skills[s];
                             } else {
                                 for (let [s2, skl2] of Object.entries(skl.subSkills)) {
-                                    item.subNotes[`skill.${s}`] = `${CONFIG.D35E.skills[s]} (${skl2.name})`;
+                                    item.subNotes[`skill.${s}.subSkills.${s2}`] = `${CONFIG.D35E.skills[s]} (${skl2.name})`;
                                 }
                             }
                         }
                     }
+
                 }
                 // Add static targets
                 else if (item[1] != null && CONFIG.D35E.contextNoteTargets.hasOwnProperty(item[1])) {

diff --git a/packs/class-abilities.db b/packs/class-abilities.db
diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
   "name": "D35E",
   "title": "3.5e SRD",
   "description": "Implementation of 3.5 edition System Reference Document for Foundry VTT. Aiming to provide 100% SRD coverage.",
-  "version": "0.93.2",
+  "version": "0.93.3",
   "author": "Rughalt",
   "templateVersion": 2,
   "scripts": [],

diff --git a/templates/items/buff.html b/templates/items/buff.html
@@ -21,8 +21,8 @@ <h4 class="item-type">{{itemType}}</h4>
           {{labels.buffType}}
         </li>
         <li class="tooltip">
-          <span class="tooltipcontent">@item.level : {{data.datalevel}}</span>
-          <input type="text" name="data.level" value="{{#if data.data.level}}{{data.datalevel}}{{/if}}" placeholder="{{localize "D35E.Level"}}"/>
+          <span class="tooltipcontent">@item.level : {{data.data.level}}</span>
+          <input type="text" name="data.level" value="{{#if data.data.level}}{{data.data.level}}{{/if}}" placeholder="{{localize "D35E.Level"}}"/>
         </li>
       </ul>
     </div>