feat(presence): allow striking appearance to affect presence attacks

phBalance · Nov 24, 2024 · 292593b · 292593b
1 parent dd56585
commit 292593b
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Releases
 
-## Version 4.0.8 [Hero System 6e (Unofficial) v2](https://github.com/dmdorman/hero6e-foundryvtt)
+## Version 4.0.8 (So far...) [Hero System 6e (Unofficial) v2](https://github.com/dmdorman/hero6e-foundryvtt)
 
+- Support striking appearance. Can be optionally enabled for presence and interaction skill rolls. [#1509](https://github.com/dmdorman/hero6e-foundryvtt/issues/1509)
 - Improved DEADLYBLOW so it does not apply to adjustment powers, sense-affecting powers, or ENTANGLES. GM still has to confirm DEADLYBLOW with applicable powers. [#1493](https://github.com/dmdorman/hero6e-foundryvtt/issues/1493)
 
 ## Version 4.0.7

diff --git a/FEATURES.md b/FEATURES.md
@@ -116,14 +116,14 @@ Our support ratings:
 | EIDETIC MEMORY         |    D    |                                                                                             |
 | ENVIRONMENTAL MOVEMENT |    D    |                                                                                             |
 | LIGHTNING CALCULATOR   |    D    |                                                                                             |
-| LIGHTNING REFLEXES     |    B    | A second token in the combat tracker is shown, but up to player/gm to determine when to use |
+| LIGHTNING REFLEXES     |    B    | A second token in the combat tracker is shown, but up to player/GM to determine when to use |
 | LIGHTSLEEP             |    D    |                                                                                             |
 | OFF-HAND DEFENSE       |    D    |                                                                                             |
 | PERFECT PITCH          |    D    |                                                                                             |
 | RESISTANCE             |    D    |                                                                                             |
 | SIMULATE DEATH         |    D    |                                                                                             |
 | SPEED READING          |    D    |                                                                                             |
-| STRIKING APPEARANCE    |    D    |                                                                                             |
+| STRIKING APPEARANCE    |    B    | Up to player/GM to determine when to use                                                    |
 | UNIVERSAL TRANSLATOR   |    D    |                                                                                             |
 | WEAPONMASTER           |    B    |                                                                                             |
 

diff --git a/module/item/skill.mjs b/module/item/skill.mjs
@@ -90,7 +90,6 @@ async function _renderSkillForm(item, actor, stateData) {
         }
     }
 
-    // Enhanced Perception + Skill Levels
     const skillMods = [
         ...skillLevels,
         ...helperItems,

diff --git a/module/utility/presence-attack.mjs b/module/utility/presence-attack.mjs
@@ -4,41 +4,76 @@ import { HeroRoller } from "./dice.mjs";
 async function _renderForm(actor, stateData) {
     const token = actor.token;
 
+    // Certain skills/talents/powers may help or hinder this roll
+    const attackMods = [];
+    // Striking appearance may help
+    const strikingAppearance = actor.items.filter((item) => item.system.XMLID === "STRIKING_APPEARANCE");
+    for (const saTalent of strikingAppearance) {
+        saTalent.system.checked = false;
+        saTalent.system.active = true;
+        attackMods.push(saTalent);
+    }
+
     const templateData = {
         actor: actor.system,
         tokenId: token?.uuid || null,
         state: stateData,
+        preAttackMods: attackMods,
     };
 
-    var path = `systems/${HEROSYS.module}/templates/pop-out/presence-attack-card.hbs`;
-
+    const path = `systems/${HEROSYS.module}/templates/pop-out/presence-attack-card.hbs`;
     return await renderTemplate(path, templateData);
 }
 
 async function presenceAttackRoll(actor, html) {
     const form = html[0].querySelector("form");
     const rollModifier = parseFloat(form.mod.value);
-
     const presence = parseInt(actor.system.characteristics.pre.value);
     const presenceDice = presence / 5;
     const partialDice = presenceDice % 1;
 
-    const heroRoller = new HeroRoller()
+    const preAttackRoller = new HeroRoller()
         .makeBasicRoll()
         .addDice(Math.trunc(presenceDice), "Presence Attack")
-        .addHalfDice(Math.sign(partialDice) * (Math.abs(partialDice) >= 0.5 ? 1 : 0), "Presence Attack")
+        .addHalfDice(Math.sign(partialDice) * (Math.abs(partialDice) >= 0.5 ? 1 : 0), "Presence Attack Half Dice")
         .addDice(Math.trunc(rollModifier), "Roll Modifier")
         .addHalfDice(Math.abs(rollModifier) % 1 >= 0.5 ? 1 : 0, "Roll Modifier");
-    await heroRoller.roll();
 
-    const cardHtml = await heroRoller.render("Presence Attack");
+    // Presence Attack Modifiers
+    const preAttackModInputs = form.querySelectorAll("INPUT:checked");
+    for (const preAttackInput of preAttackModInputs) {
+        const preAttack = actor.items.get(preAttackInput.id);
+        const levels = parseInt(preAttack.system.LEVELS || 0);
+        if (levels > 0) {
+            preAttackRoller.addDice(levels, preAttack.name);
+        }
+    }
+
+    await preAttackRoller.roll();
+
+    const rollHtml = await preAttackRoller.render("Presence Attack");
+    const tags = await preAttackRoller.tags();
+
+    // render card
     const token = actor.token;
     const speaker = ChatMessage.getSpeaker({ actor: actor, token });
     speaker.alias = actor.name;
 
+    const cardData = {
+        tags: tags.map((tag) => {
+            return { ...tag, value: tag.value.signedString() };
+        }),
+        rolls: preAttackRoller.rawRolls(),
+        renderedRoll: rollHtml,
+        user: game.user._id,
+        speaker: speaker,
+    };
+    const template = `systems/${HEROSYS.module}/templates/chat/presence-attack-result-card.hbs`;
+    const cardHtml = await renderTemplate(template, cardData);
+
     const chatData = {
         style: CONST.CHAT_MESSAGE_STYLES.OOC,
-        rolls: heroRoller.rawRolls(),
+        rolls: preAttackRoller.rawRolls(),
         author: game.user._id,
         content: cardHtml,
         speaker: speaker,
@@ -47,7 +82,7 @@ async function presenceAttackRoll(actor, html) {
     return ChatMessage.create(chatData);
 }
 
-async function presenceAttackPopOut(actor) {
+export async function presenceAttackPopOut(actor) {
     const content = await _renderForm(actor, {});
 
     // Attack Card as a Pop Out
@@ -72,5 +107,3 @@ async function presenceAttackPopOut(actor) {
         new Dialog(data, options).render(true);
     });
 }
-
-export { presenceAttackPopOut };
diff --git a/templates/chat/presence-attack-result-card.hbs b/templates/chat/presence-attack-result-card.hbs
@@ -0,0 +1,14 @@
+{{ log 'HEROSYS presence-attack-result-card' this }}
+<div class="hero chat-card">
+    <div class="card-section tags">
+        {{#each tags as |tag id|}}
+            <span class="tag tag-transparent" {{#if tag.title}}title="{{tag.title}}"{{/if}}>{{tag.name}}
+                {{tag.value}}
+            </span>
+        {{/each}}
+    </div>
+
+    <div class="card-section">
+        <div class="damage-roll">{{{ renderedRoll }}}</div>
+    </div>
+</div>
diff --git a/templates/pop-out/item-skill-card.hbs b/templates/pop-out/item-skill-card.hbs
@@ -15,7 +15,7 @@
 
     {{#if skillMods.length}}
         <div class="form-group">
-        <label>Skill Mods</label>
+        <label>Skill Modifiers</label>
             <table>
                 {{#each skillMods}}
                     {{#if this.system.active}}

diff --git a/templates/pop-out/presence-attack-card.hbs b/templates/pop-out/presence-attack-card.hbs
@@ -3,4 +3,34 @@
         <label>Roll Modifier</label>
         <input type="number" name="mod" value="0"/>
     </div>
+
+    {{#if preAttackMods.length}}
+        <div class="form-group">
+            <label>Attack Modifiers</label>
+            <table>
+                {{#each preAttackMods}}
+                    {{#if this.system.active}}
+                        <tr>
+                            <td style="width:1%">
+                                <input class="item-toggle" id="{{this.id}}" type="checkbox" {{checked
+                                this.system.checked}} data-dtype="Boolean"/>
+                            </td>
+                            <td style="text-align:left">
+                                {{this.system.description}}
+                            </td>
+                        </tr>   
+                    {{else}}
+                        <tr title="This power is inactive" style="opacity:50%">
+                            <td>
+                                <i class="fas fa-ban"></i>
+                            </td>
+                            <td style="text-align:left">
+                                {{this.system.description}}
+                            </td>
+                        </tr>
+                    {{/if}}   
+                {{/each}}
+            </table>
+        </div>
+    {{/if}}
 </form>