Add silver and oil dmg.

AnthonyMonette · Nov 10, 2021 · 1b13080 · 1b13080
1 parent 666d973
commit 1b13080
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -749,9 +749,15 @@
     "WITCHER.Damage.totalSP": "Total Stopping Power",
     "WITCHER.Damage.afterSPReduct": "Damage after sp reducttion",
     "WITCHER.Damage.afterLocationModifier": "Damage after location modifier",
-    "WITCHER.Damage.afterResistances": "Damage after resistances",
+    "WITCHER.Damage.afterResistances": "Damage after resistances/vulnerabilities",
     "WITCHER.Damage.totalApplied": "Total Damage Applied",
     "WITCHER.Damage.NotEnough": "Not enough damage to pierce the armor",
+    "WITCHER.Damage.isVulnerable": "Vulnerable to the attack",
+    "WITCHER.Damage.oilDmg": "Add Oil Damages (+5)",
+    "WITCHER.Damage.silverDmg": "Add Silver Damages",
+    "WITCHER.Damage.silver": "Silver",
+    "WITCHER.Damage.oil": "Oil",
+
 
     "WITCHER.Context.applyDmg": "Apply Damage",
     "WITCHER.Context.Defense": "Defense",

diff --git a/module/sheets/WitcherActorSheet.js b/module/sheets/WitcherActorSheet.js
@@ -1172,7 +1172,7 @@ export default class WitcherActorSheet extends ActorSheet {
       <div class="flex">
         <div>
           <div><input id="R" type="checkbox" unchecked/> ${game.i18n.localize("WITCHER.Heal.resting")}</div>
-          <div> <input id="SF" type="checkbox" unchecked/> ${game.i18n.localize("WITCHER.Heal.sterilized")}</div>
+          <div><input id="SF" type="checkbox" unchecked/> ${game.i18n.localize("WITCHER.Heal.sterilized")}</div>
         </div>
         <div>
           <div><input id="HH" type="checkbox" unchecked/> ${game.i18n.localize("WITCHER.Heal.healinghand")}</div>

diff --git a/scripts/actions.js b/scripts/actions.js
@@ -26,21 +26,37 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){
     <option value="L. leg"> ${game.i18n.localize("WITCHER.Dialog.attackLLeg")} </option>
     <option value="R. Leg"> ${game.i18n.localize("WITCHER.Dialog.attackRLeg")} </option>
     <option value="Tail/wing"> ${game.i18n.localize("WITCHER.Dialog.attackTail")} </option>
+    `;    
+    const silverOptions = `
+    <option></option>
+    <option value="1d6">1d6</option>
+    <option value="2d6">2d6</option>
+    <option value="3d6">3d6</option>
+    <option value="4d6">4d6</option>
+    <option value="5d6">5d6</option>
     `;
 
     let content = `<label>${game.i18n.localize("WITCHER.Damage.damageType")}: <select name="damageType">${damageTypeOption}</select></label> <br />
       <label>${game.i18n.localize("WITCHER.Damage.ChangeLocation")}: <select name="changeLocation">${locationOptions}</select></label> <br />`
 
     if (actor.type == "monster"){ 
         content += `<label>${game.i18n.localize("WITCHER.Damage.resistSilver")}: <input type="checkbox" name="resistNonSilver"></label><br />
-                    <label>${game.i18n.localize("WITCHER.Damage.resistMeteorite")}: <input type="checkbox" name="resistNonMeteorite"></label>`
+                    <label>${game.i18n.localize("WITCHER.Damage.resistMeteorite")}: <input type="checkbox" name="resistNonMeteorite"></label><br />`
     }
+    content += `<label>${game.i18n.localize("WITCHER.Damage.isVulnerable")}: <input type="checkbox" name="vulnerable"></label><br />
+    <label>${game.i18n.localize("WITCHER.Damage.oilDmg")}: <input type="checkbox" name="oilDmg"></label><br />
+    <label>${game.i18n.localize("WITCHER.Damage.silverDmg")}: <select name="silverDmg">${silverOptions}</select></label><br />`
 
     let cancel = true
     let damageType = 0
     let resistSilver = false;
     let resistMeteorite = false;
     let newLocation = false;
+    let isVulnerable = false;
+    let addOilDmg = false;
+    let silverDmg;
+
+    let infoTotalDmg = totalDamage
 
     let dialogData = {
         buttons : [
@@ -50,16 +66,31 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){
                 newLocation = html.find("[name=changeLocation]")[0].value;
                 resistSilver = html.find("[name=resistNonSilver]").prop("checked");
                 resistMeteorite = html.find("[name=resistNonMeteorite]").prop("checked");
+                isVulnerable = html.find("[name=vulnerable]").prop("checked");
+                addOilDmg = html.find("[name=oilDmg]").prop("checked");
+                silverDmg = html.find("[name=silverDmg]")[0].value;
                 cancel = false
              } ]],
-        title : game.i18n.localize("WITCHER.Items.transferTitle"),
+        title : game.i18n.localize("WITCHER.Context.applyDmg"),
         content : content
     }
     await buttonDialog(dialogData)
 
+    if (silverDmg){
+      let silverRoll = new Roll(silverDmg).roll()
+      totalDamage = Number(totalDamage) + silverRoll.total
+      infoTotalDmg += `+${silverRoll.total}[${game.i18n.localize("WITCHER.Damage.silver")}]`
+    }
+
     if (newLocation != "Empty"){
       location = newLocation
     }
+    if (addOilDmg){
+      totalDamage = Number(totalDamage) + 5
+      infoTotalDmg += `+5[${game.i18n.localize("WITCHER.Damage.oil")}]`
+    }
+
+    infoTotalDmg = totalDamage +": " +infoTotalDmg;
 
     let armorSet = {};
     let totalSP = 0
@@ -72,7 +103,6 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){
                 values = getArmorSp(armorSet["lightArmor"]?.data.data.headStopping, armorSet["mediumArmor"]?.data.data.headStopping, armorSet["heavyArmor"]?.data.data.headStopping)
                 displaySP = values[0]
                 totalSP = values[1]
-                console.log(values)
                 break;
             case "Torso":
                 armorSet = getArmors(torsoAmors)
@@ -141,14 +171,14 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){
         return
     }
 
-    let infoTotalDmg = totalDamage
     totalDamage -= totalSP < 0 ? 0: totalSP;
 
     let infoAfterSPReduction = totalDamage < 0 ? 0: totalDamage
 
     if (cancel) {
         return
     }
+
     if (totalDamage <=0){
         let messageContent = `${game.i18n.localize("WITCHER.Damage.initial")}: ${infoTotalDmg} <br />
         ${game.i18n.localize("WITCHER.Damage.totalSP")}: ${displaySP}<br />
@@ -193,7 +223,9 @@ async function ApplyDamage(actor, dmgType, location, totalDamage){
     if (resistSilver || resistMeteorite) {
         totalDamage *= 0.5
     }
-
+    if (isVulnerable) {
+      totalDamage *= 2
+    }
     let infoAfterResistance = totalDamage
 
     switch(location){