0.87.1, fix #123

Rughalt · Nov 14, 2020 · 0414a75 · 0414a75
1 parent d4756e9
commit 0414a75
Show file tree

Hide file tree

Showing 15 changed files with 266 additions and 205 deletions.
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -13,6 +13,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -21,6 +24,6 @@ jobs:
         with:
           tag_name: ${{ github.ref }}
           release_name: Version ${{ github.ref }}
-          body_path: changelogs/changelog.${GITHUB_REF##*/}.md
+          body_path: changelogs/changelog.${{ steps.get_version.outputs.VERSION }}.md
           draft: false
           prerelease: false
diff --git a/D35E.css b/D35E.css
@@ -3160,7 +3160,7 @@
   border-right: 0;
 }
 .D35E.sheet.actor.npc.lite .monsterblock .actor-name {
-  text-align: right;
+  text-align: left;
   text-transform: uppercase;
   flex: 0;
   color: #3a5868;
@@ -4782,6 +4782,26 @@ tr.introjs-showElement > th {
 .d35ecustom .master-block .minion-of {
   font-size: 18px;
 }
+.d35ecustom .monsterblock {
+  padding: 4px;
+  border-radius: 2px;
+  background: url(/systems/D35E/icons/ui/parchment-2.png) repeat;
+}
+.d35ecustom .monsterblock .roll-link {
+  color: #2C606D !important;
+}
+.d35ecustom .monsterblock .roll-link:hover {
+  text-shadow: 0 0 10px #2C606D !important;
+  color: #2C606D !important;
+}
+.d35ecustom .monsterblock .image-d20 {
+  display: inline-block;
+  background-image: url(../../icons/dice/d20black.svg);
+  background-size: 100%;
+  height: 20px !important;
+  width: 20px !important;
+  vertical-align: middle;
+}
 .secret {
   display: none;
 }

diff --git a/changelogs/changelog.0.87.0.md b/changelogs/changelog.0.87.0.md
@@ -12,8 +12,4 @@
 - [#120](https://github.com/Rughalt/D35E/issues/120) - Actor inventory weight calculated wrongly using containers
 - [#118](https://github.com/Rughalt/D35E/issues/118) - Elemental and Giant types missed in race details
 - [#116](https://github.com/Rughalt/D35E/issues/116) - Ki strike and Purity of Body have empty "classes" list and not added automatically
-- [#110](https://github.com/Rughalt/D35E/issues/110) - Size modifiers to carrying weight stops applying if Strength is over 30 (thanks to @red5h4d0w)
-
-
-
-
+- [#110](https://github.com/Rughalt/D35E/issues/110) - Size modifiers to carrying weight stops applying if Strength is over 30 (thanks to @red5h4d0w)
diff --git a/changelogs/changelog.0.87.1.md b/changelogs/changelog.0.87.1.md
@@ -0,0 +1,6 @@
+### Features
+- Added and assigned over 100 icons to Spells from SRD
+
+### Bug Fixes
+- Fixed message about Constitution Drain not existing in roll data
+- Fixes attack effect rolls not appearing correctly
diff --git a/less/npc-lite.less b/less/npc-lite.less
@@ -39,7 +39,7 @@
 
   .monsterblock {
     .actor-name {
-      text-align: right;
+      text-align: left;
       text-transform: uppercase;
       flex: 0;
       color: #3a5868;

diff --git a/less/system.less b/less/system.less
@@ -1061,6 +1061,29 @@
       font-size: 18px;
     }
   }
+
+  .monsterblock {
+    padding: 4px;
+    border-radius: 2px;
+    background: url(/systems/D35E/icons/ui/parchment-2.png) repeat;
+
+
+    .roll-link{
+      color: #2C606D !important;
+      &:hover {
+        text-shadow: 0 0 10px #2C606D !important;
+        color: #2C606D !important;
+      }
+    }
+    .image-d20 {
+      display: inline-block;
+      background-image: url(../../icons/dice/d20black.svg);
+      background-size: 100%;
+      height: 20px !important;
+      width: 20px !important;
+      vertical-align: middle;
+    }
+  }
 }
 
 .secret {

diff --git a/module/actor/entity.js b/module/actor/entity.js
@@ -2267,7 +2267,7 @@ export class ActorPF extends Actor {
             linkData(data, updateData, `data.abilities.${a}.mod`, Math.max(-5, updateData[`data.abilities.${a}.mod`] - Math.floor(updateData[`data.abilities.${a}.damage`] / 2) - Math.floor(ablPenalty / 2)));
             linkData(data, updateData, `data.abilities.${a}.origMod`, Math.floor((updateData[`data.abilities.${a}.origTotal`] - 10) / 2));
             linkData(data, updateData, `data.abilities.${a}.origMod`, Math.max(-5, updateData[`data.abilities.${a}.origMod`] - Math.floor(updateData[`data.abilities.${a}.damage`] / 2) - Math.floor(ablPenalty / 2)));
-
+            linkData(data, updateData, `data.abilities.${a}.drain`, updateData[`data.abilities.${a}.drain`] + (changes[`data.abilities.${a}.drain`] || 0));
             modDiffs[a] = updateData[`data.abilities.${a}.mod`] - prevMods[a];
         }
 

diff --git a/module/item/entity.js b/module/item/entity.js
@@ -1669,6 +1669,7 @@ export class ItemPF extends Item {
         // Create effect string
         let notes = []
         const noteObjects = actor.getContextNotes("attacks.effect");
+
         for (let noteObj of noteObjects) {
             rollData.item = {};
             //if (noteObj.item != null) rollData.item = duplicate(noteObj.item.data.data);
@@ -1677,6 +1678,9 @@ export class ItemPF extends Item {
             for (let note of noteObj.notes) {
                 notes.push(...note.split(/[\n\r]+/).map(o => TextEditor.enrichHTML(`<span class="tag">${ItemPF._fillTemplate(o,rollData)}</span>`, {rollData: rollData})));
             }
+            for (let note of (itemData.effectNotes || "").split(/[\n\r]+/)) {
+                notes.push(...note.split(/[\n\r]+/).map(o => TextEditor.enrichHTML(`<span class="tag">${ItemPF._fillTemplate(o,rollData)}</span>`, {rollData: rollData})));
+            }
         }
 
         const inner = notes.join('')

diff --git a/packs/classes.db b/packs/classes.db
diff --git a/packs/minion-classes.db b/packs/minion-classes.db
diff --git a/packs/racial-hd.db b/packs/racial-hd.db
diff --git a/packs/spells.db b/packs/spells.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.87.0",
+  "version": "0.87.1",
   "author": "Rughalt",
   "templateVersion": 2,
   "scripts": [],

diff --git a/templates/actors/npc-sheet-monster.html b/templates/actors/npc-sheet-monster.html
@@ -2,7 +2,7 @@
   <h1 class="handserif actor-name">{{actor.name}}</h1>
   <div class="flexcol">
     <div><strong>{{ localize 'D35E.HitDice' }}:</strong> {{numberFormat data.attributes.hd.total decimals=0 sign=true}}</div>
-    <div><strong>{{ localize 'D35E.Initiative' }}:</strong> {{numberFormat data.attributes.init.total decimals=0 sign=true}}</div>
+    <div><strong>{{ localize 'D35E.Initiative' }}:</strong> <a class="attribute initiative" data-attribute="init"><span class="attribute-name roll-link">{{numberFormat data.attributes.init.total decimals=0 sign=true}}<div class="rollable image-d20"></div></span></a></div>
     <div><strong>{{ localize 'D35E.Speed' }}:</strong></div>
     <div><strong>{{ localize 'D35E.ArmorClass' }}:</strong>
       {{#each data.attributes.ac as |ac id|}}

diff --git a/templates/welcome-screen.html b/templates/welcome-screen.html
@@ -194,6 +194,19 @@ <h2></h2>
     </div>
     <div class="tab" data-tab="changelog">
         <h1>Changelog</h1>
+        <h2>v0.87.1</h2>
+        <h3>Features</h3>
+        <ul>
+            <li> Added and assigned over 100 icons to Spells from SRD
+        </ul>
+
+        <h3>Bug Fixes</h3>
+        <ul>
+            <li> Fixed message about Constitution Drain not existing in roll data
+            <li> Fixes attack effect rolls not appearing correctly
+        </ul>
+
+        <h2>v0.87.0</h2>
         <h3>SRD</h3>
         <ul>
             <li>Implemented numerous Magical Items