Merge pull request #147 from Savantford/experimental

3.1.1: Char Options Fixes & Health Changes
Savantford · Feb 20, 2024 · 1bff913 · 1bff913
2 parents f7f93d5 + df1c72e
commit 1bff913
Show file tree

Hide file tree

Showing 31 changed files with 115 additions and 192 deletions.
diff --git a/assets/icons/targeted-grey.svg b/assets/icons/targeted-grey.svg
diff --git a/assets/ui/ww-cross-grey.svg → assets/ui/cross-grey.svg b/assets/ui/ww-cross-grey.svg → assets/ui/cross-grey.svg
diff --git a/lang/en.json b/lang/en.json
@@ -200,6 +200,8 @@
         "Size": "Size # Area",
         "Spread": "Spread from Central Point (BROKEN)",
         "MeasuredUnit": "yard(s)",
+        "Targets": "Targets",
+        "Target": "Target",
         "Dialog": {
             "SelectTargets": "Please select one or more tokens to target.",
             "Confirm": "Confirm Targets and Continue",

diff --git a/module/chat/chat-html-templates.mjs b/module/chat/chat-html-templates.mjs
@@ -9,7 +9,7 @@ export async function diceTotalHtml(roll) {
 export function targetHeader(target, html, noItem) {
   if ((target.id === undefined) || noItem) return (html ? html : '');
 
-  else return `<p class="owner-only chat-target">${i18n('WW.Target')}: ${target.name}</p><p class="non-owner-only chat-target">${i18n('WW.Target')}: ???</p><div class="chat-target-content">${html}</div>`;
+  else return `<p class="owner-only chat-target">${i18n('WW.Targeting.Target')}: ${target.name}</p><p class="non-owner-only chat-target">${i18n('WW.Targeting.Target')}: ???</p><div class="chat-target-content">${html}</div>`;
 }
 
 // Prepare html header for a target

diff --git a/module/chat/chat-listeners.mjs b/module/chat/chat-listeners.mjs
@@ -138,7 +138,7 @@ function _onMessageButtonContext(element) {
   game.combat?.combatants.forEach(c => {
     const actor = c.actor;
 
-    if (actor.testUserPermission(user, "OBSERVER") && (!menuItems.find(o => o.uuid === actor.uuid))) menuItems.push({
+    if (actor && actor.testUserPermission(user, "OBSERVER") && (!menuItems.find(o => o.uuid === actor.uuid))) menuItems.push({
       name: actor.name,
       icon: iconToHTML(actor.img, actor.uuid),
       group: 'combatants',
@@ -152,7 +152,7 @@ function _onMessageButtonContext(element) {
   for (const id in game.actors.tokens) {
     const actor = game.actors.tokens[id];
 
-    if (actor.testUserPermission(user, "OBSERVER") && (!menuItems.find(o => o.uuid === actor.uuid))) menuItems.push({
+    if (actor && actor.testUserPermission(user, "OBSERVER") && (!menuItems.find(o => o.uuid === actor.uuid))) menuItems.push({
       name: actor.name,
       icon: iconToHTML(actor.img, actor.uuid),
       group: 'tokens',

diff --git a/module/data/actors/common.mjs b/module/data/actors/common.mjs
@@ -185,22 +185,16 @@ function makeDefense(type) {
 
 function makeHealth(type) {
 
-  if (type == 'Character') { return new fields.SchemaField({
-    current: makeIntField(),
-    normal: makeIntField(),
-    starting: makeIntField(10),
-    novice: makeIntField(),
-    expert: makeIntField(),
-    master: makeIntField(),
-    lost: makeIntField(),
-    bonus: makeIntField()
-  })}
-
-  else if (type == 'NPC') return new fields.SchemaField({
+  if (type == 'Character') {
+    return new fields.SchemaField({
+      current: makeIntField(),
+      normal: makeIntField(),
+      lost: makeIntField()
+    })
+} else if (type == 'NPC') return new fields.SchemaField({
     current: makeIntField(),
     normal: makeIntField(10),
-    lost: makeIntField(),
-    bonus: makeIntField()
+    lost: makeIntField()
   })
 
   else return {}

diff --git a/module/dice/roll-attribute.mjs b/module/dice/roll-attribute.mjs
@@ -130,7 +130,7 @@ export default class RollAttribute extends FormApplication {
       for (const t of this.targets) {
 
         // Set boons text
-        const boonsNo = parseInt(boonsFinal) + t.boonsAgainst[against];
+        const boonsNo = parseInt(boonsFinal) + (t.boonsAgainst ? t.boonsAgainst[against] : 0);
         if (boonsNo != 0) { boons = (boonsNo < 0 ? "" : "+") + boonsNo + "d6kh" } else { boons = ""; };
 
         // Determine the rollFormula
@@ -429,7 +429,7 @@ export default class RollAttribute extends FormApplication {
       let targetsDisplay = '';
 
       context.targets.forEach(t => {
-        const boonsNo = t.boonsAgainst[against];
+        const boonsNo = t.boonsagainst ? t.boonsAgainst[against] : 0;
 
         targetsDisplay += '<p>' + t.name;
 
@@ -539,12 +539,11 @@ export default class RollAttribute extends FormApplication {
 
     // Add htmls to finalHtml
     if (options.singleRoll) {
-      console.log('chegou no single')
       if (anyHtml) finalHtml += buttonsHeader(anyHtml, 'Any', !this.item);
       if (enemiesHtml) finalHtml += buttonsHeader(enemiesHtml, 'Enemies', !this.item);
       if (alliesHtml) finalHtml += buttonsHeader(alliesHtml, 'Allies', !this.item);
+
     } else {
-      console.log('chegou no multi')
       finalHtml += '<div class="chat-buttons">';
       if (anyHtml) finalHtml += anyHtml;
       if (enemiesHtml) finalHtml += enemiesHtml;
@@ -578,9 +577,9 @@ export default class RollAttribute extends FormApplication {
         targets.push({
           id: t.id,
           name: t.document.name,
-          attributes: t.document.actor.system.attributes,
-          defense: t.document.actor.system.stats.defense.total,
-          boonsAgainst: t.document.actor.system.boons.against
+          attributes: t.document.actor?.system.attributes,
+          defense: t.document.actor?.system.stats.defense.total,
+          boonsAgainst: t.document.actor?.system.boons.against
         })
       });
 

diff --git a/module/documents/active-effect.mjs b/module/documents/active-effect.mjs
@@ -33,8 +33,6 @@ export default class WWActiveEffect extends ActiveEffect {
   async _onUpdate(data, options, userId) {
     super._onUpdate(data, options, userId);
 
-    // If benefits were changed
-    console.log('preparing effect data')
   }
 
   /* -------------------------------------------- */
@@ -203,11 +201,11 @@ export default class WWActiveEffect extends ActiveEffect {
    */
 
   apply(actor, change) {
-
+    
     // Save label key and get real change key
     const labelKey = change.key;
     change.key = CONFIG.WW.EFFECT_CHANGE_KEYS[change.key];
-
+    
     // Determine the data type of the target field
     const current = foundry.utils.getProperty(actor, change.key) ?? null;
 
@@ -221,12 +219,6 @@ export default class WWActiveEffect extends ActiveEffect {
     // Alter Change Values to negative values if they are meant to be
     if (labelKey.includes('banes') || (labelKey.includes('Reduce') && !labelKey.includes('health'))) change.value = -change.value;
 
-    // Fix modes automatically according to the label key
-    if (labelKey === 'speed.normal') {
-      change.mode = 5;
-      change.priority = 1;
-    }
-
     // Cast the effect change value to the correct type
     let delta;
     try {

diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
@@ -41,6 +41,9 @@ export default class WWActor extends Actor {
       }
     };
 
+    // Create bonus Health
+    this.system.stats.health.bonus = 0;
+
     // Create objects
     this.system.autoFail = {};
     this.system.against = {};
@@ -154,9 +157,7 @@ export default class WWActor extends Actor {
     if (changed.system?.stats?.level) {
 
       for (const i of this.items) {
-
         if (i.charOption) i.updateBenefitsOnActor();
-
       }
 
     }
@@ -322,8 +323,6 @@ export default class WWActor extends Actor {
 
   /* Apply Affliction */
   async applyAffliction(key) {
-
-    console.log(key)
 
     // Get affliction
     const effect = CONFIG.statusEffects.find(a => a.id === key);
@@ -388,14 +387,14 @@ export default class WWActor extends Actor {
   _calculateHealth(system) {
     const health = system.stats.health;
     const level = system.stats.level;
-
+    
     // Health override effect exists
     if (health.override) {
       health.normal = health.override;
     } else {
 
       // If Character, calculate normal Health from Paths
-      if (this.type === 'Character') {
+      /*if (this.type === 'Character') {
         function count(levels) { // Count how many of provided levels the Character has
           let newValue = 0;
   
@@ -420,7 +419,7 @@ export default class WWActor extends Actor {
   
         // Calculate normal Health
         health.normal = health.starting + noviceBonus + expertBonus + masterBonus;
-      }
+      }*/
 
       // Assign current health
       health.current = health.normal + health.bonus - health.lost;

diff --git a/module/documents/item.mjs b/module/documents/item.mjs
@@ -243,37 +243,51 @@ export default class WWItem extends Item {
 
     if (stats.naturalIncrease) changes.push({
       key: 'defense.naturalIncrease',
-      value: stats.naturalIncrease
+      value: stats.naturalIncrease,
+      mode: 2,
+      priority: null
     })
 
     if (stats.armoredIncrease) changes.push({
       key: 'defense.armoredIncrease',
-      value: stats.armoredIncrease
+      value: stats.armoredIncrease,
+      mode: 2,
+      priority: null
     })
 
     if (stats.healthIncrease) changes.push({
       key: 'health.increase',
-      value: stats.healthIncrease
+      value: stats.healthIncrease,
+      mode: 2,
+      priority: null
     })
 
     if (stats.sizeNormal) changes.push({
       key: 'size.normal',
-      value: stats.sizeNormal
+      value: stats.sizeNormal,
+      mode: 4,
+      priority: 1
     })
 
     if (stats.speedNormal) changes.push({
       key: 'speed.normal',
-      value: stats.speedNormal
+      value: stats.speedNormal,
+      mode: 4,
+      priority: 1
     })
 
     if (stats.speedIncrease) changes.push({
       key: 'speed.increase',
-      value: stats.speedIncrease
+      value: stats.speedIncrease,
+      mode: 2,
+      priority: null
     })
 
     if (stats.bonusDamage) changes.push({
       key: 'bonusDamage.increase',
-      value: stats.bonusDamage
+      value: stats.bonusDamage,
+      mode: 2,
+      priority: null
     })
 
     // Create effect data object
@@ -354,26 +368,34 @@ export default class WWItem extends Item {
 
     // Return if no actor exists
     if (!this.actor) return;
-
-    const benefits = this.system.benefits;
-    const level = this.actor.system.stats.level;
 
     // Get actor list entries granted by the character option
-    const aDetails = {
-      senses: this.actor.system.details.senses.filter(i => {
+    const filteredDetails = {
+      types: await this.actor.system.details.types.filter(i => {
         return i.grantedBy === this._id;
       }),
-      languages: this.actor.system.details.languages.filter(i => {
+      senses: await this.actor.system.details.senses.filter(i => {
         return i.grantedBy === this._id;
       }),
-      immune: this.actor.system.details.immune.filter(i => {
+      languages: await this.actor.system.details.languages.filter(i => {
         return i.grantedBy === this._id;
       }),
-      traditions: this.actor.system.details.traditions.filter(i => {
+      immune: await this.actor.system.details.immune.filter(i => {
+        return i.grantedBy === this._id;
+      }),
+      traditions: await this.actor.system.details.traditions.filter(i => {
         return i.grantedBy === this._id;
       })
     }
-
+
+    // Shortcuts
+    const benefits = this.system.benefits;
+    const level = this.actor.system.stats.level;
+
+    // Create newDetails to store data
+    const newDetails = {};
+
+    // Loop through each benefit
     for (const b in benefits) {
 
       const benefit = benefits[b];
@@ -382,35 +404,42 @@ export default class WWItem extends Item {
       // If level does not meet the requirement, ignore it
       if (level >= benefit.levelReq) {
 
-        if (benefit.senses) await benefit.senses.forEach(e => this._addEntry(aDetails, e, 'senses'));
+        if (benefit.types) this._addEntries(newDetails, filteredDetails, benefit, 'types');
+
+        if (benefit.senses) this._addEntries(newDetails, filteredDetails, benefit, 'senses');
+
+        if (benefit.languages) this._addEntries(newDetails, filteredDetails, benefit, 'languages');
 
-        if (benefit.languages) await benefit.languages.forEach(e => this._addEntry(aDetails, e, 'languages'));
+        if (benefit.immune) this._addEntries(newDetails, filteredDetails, benefit, 'immune');
 
-        if (benefit.immune) await benefit.immune.forEach(e => this._addEntry(aDetails, e, 'immune'));
-
-        if (benefit.traditions) await benefit.traditions.forEach(e => this._addEntry(aDetails, e, 'traditions'));
+        if (benefit.traditions) this._addEntries(newDetails, filteredDetails, benefit, 'traditions');
 
       }
 
     }
 
-  }
+    // Update actor with new details object
+    await this.actor.update({['system.details']: {...this.actor.system.details, ...newDetails} });
 
-  async _addEntry(actorDetails, entry, arrName) {
+  }
 
-    // If entry with the same name is not found, add it to the actor's entries list
-    if (!actorDetails[arrName].find(ae => ae.name === entry.name )) {
+  _addEntries(newDetails, filteredDetails, benefit, arrName) {
+    const arr = [...benefit[arrName]];
 
-      // Store the char option id on grantedBy
-      entry.grantedBy = this._id;
+    // For each entry
+    arr.forEach(entry => {
 
-      // Create new array
-      const arr = [...this.actor.system.details[arrName], entry];
+      if (!filteredDetails[arrName].find(ae => ae.name === entry.name )) {
+
+        // Store the char option id on grantedBy
+        entry.grantedBy = this._id;
+
+      }
 
-      // Update actor with new array
-      await this.actor.update({['system.details.' + arrName]: arr});
+    });
 
-    }
+    // Add entries to newDetails object
+    newDetails[arrName] = newDetails[arrName] ? newDetails[arrName].concat(arr) : arr;
 
   }
 

diff --git a/module/sheets/actor-sheet.mjs b/module/sheets/actor-sheet.mjs
@@ -367,11 +367,6 @@ export default class WWActorSheet extends ActorSheet {
 
     // Input resize
     resizeInput(html);
-
-    // Edit Health button
-    html.find('.health-edit').click(ev => {
-      new healthDetails(this.actor).render(true)
-    });
 
     // Rest button dialog + function
     html.find('.rest-button').click(this._onRest.bind(this));

diff --git a/packs/armor/000503.log → packs/armor/000505.log b/packs/armor/000503.log → packs/armor/000505.log
diff --git a/packs/armor/CURRENT b/packs/armor/CURRENT
@@ -1 +1 @@
-MANIFEST-000502
+MANIFEST-000504
diff --git a/packs/armor/LOG b/packs/armor/LOG
@@ -1,3 +1,3 @@
-2024/02/19-15:51:57.421 694 Recovering log #500
-2024/02/19-15:51:57.426 694 Delete type=0 #500
-2024/02/19-15:51:57.426 694 Delete type=3 #498
+2024/02/20-15:20:16.604 2784 Recovering log #503
+2024/02/20-15:20:16.608 2784 Delete type=0 #503
+2024/02/20-15:20:16.608 2784 Delete type=3 #502