ADD - Spell & Psi power damage & shield inputs

Author: Julen-BZ

src/lang/en.json

@@ -327,6 +327,8 @@
   "anima.ui.mystic.spell.grade.intermediate.title": "Intermediate",
   "anima.ui.mystic.spell.grade.maintenanceCost.title": "Maint.",
   "anima.ui.mystic.spell.grade.zeon.title": "Zeon",
+  "anima.ui.mystic.spell.grade.damage.title": "Damage",
+  "anima.ui.mystic.spell.grade.shieldPoints.title": "shield",
   "anima.ui.mystic.spell.hasDailyMaintenance.title": "Daily Mant.?",
   "anima.ui.mystic.spell.visible.title": "Visible",
   "anima.ui.mystic.spell.level.title": "Level",
@@ -874,5 +876,6 @@
   "anima.ui.effects.effectsList.edit.title": "Edit",
   "anima.ui.effects.effectsList.delete.title": "Delete",
   "anima.effects.newEffect": "New effect"
+
 
 }

src/lang/es.json

@@ -329,6 +329,8 @@
   "anima.ui.mystic.spell.grade.intermediate.title": "Intermedio",
   "anima.ui.mystic.spell.grade.maintenanceCost.title": "Mant.",
   "anima.ui.mystic.spell.grade.zeon.title": "Zeón",
+  "anima.ui.mystic.spell.grade.damage.title": "Daño",
+  "anima.ui.mystic.spell.grade.shieldPoints.title": "Escudo",
   "anima.ui.mystic.spell.hasDailyMaintenance.title": "¿Mant. Diario?",
   "anima.ui.mystic.spell.visible.title": "Visible",
   "anima.ui.mystic.spell.level.title": "Nivel",
@@ -875,4 +877,5 @@
  "anima.ui.effects.effectsList.edit.title": "Editar",
  "anima.ui.effects.effectsList.delete.title": "Eliminar",
  "anima.effects.newEffect": "Nuevo efecto"
+
 }

src/lang/fr.json

@@ -316,6 +316,8 @@
   "anima.ui.mystic.spell.grade.intermediate.title": "Intermédiaire",
   "anima.ui.mystic.spell.grade.maintenanceCost.title": "Maint.",
   "anima.ui.mystic.spell.grade.zeon.title": "Zéon",
+  "anima.ui.mystic.spell.grade.damage.title": "Damage",
+  "anima.ui.mystic.spell.grade.shieldPoints.title": "shield",
   "anima.ui.mystic.spell.hasDailyMaintenance.title": "Maint. quotidien ?",
   "anima.ui.mystic.spell.level.title": "Niveau",
   "anima.ui.mystic.spell.spellType.animatic.title": "Animique",
@@ -760,4 +762,5 @@
   "anima.ui.effects.effectsList.edit.title": "Edit",
   "anima.ui.effects.effectsList.delete.title": "Delete",
   "anima.effects.newEffect": "New effect"
+
 }

src/module/actor/utils/buttonCallbacks/castPsychicPower.js

@@ -163,7 +163,7 @@ export async function castPsychicPower(sheet, event) {
 
   // ---------- DEFENSE: create shield ----------
   if (combatType === 'defense') {
-    const shieldPoints = Number(shieldValueCheck(effectText) ?? 0) || 0;
+    const shieldPoints = Number(shieldValueCheck(effectData?.shieldPoints) ?? 0) || 0;
 
     const defaultAbilityFormula =
       '@psychic.psychicProjection.imbalance.defensive.base.value';
@@ -246,7 +246,7 @@ export async function castPsychicPowerDifficulty(sheet, event) {
   const combatType = power.system?.combatType?.value ?? 'attack';
 
   if (combatType === 'defense') {
-    const shieldPoints = Number(shieldValueCheck(effectText) ?? 0) || 0;
+    const shieldPoints = Number(shieldValueCheck(effectData?.shieldPoints) ?? 0) || 0;
     const defaultAbilityFormula =
       '@psychic.psychicProjection.imbalance.defensive.base.value';
 

src/module/actor/utils/prepareActor/calculations/actor/domine/mutateDomineData.js

@@ -1,4 +1,4 @@
-export const mutateDomineData = async data => {
+export const mutateDomineData = data => {
   const allActionsPenalty = data.general.modifiers.allActions.final.value;
 
   const { domine } = data;

src/module/actor/utils/prepareActor/calculations/actor/mystic/mutateMysticData.js

@@ -16,7 +16,8 @@ export const mutateMysticData = data => {
   if (mystic.act.via.length !== 0) {
     for (const actVia of mystic.act.via) {
       actVia.system.final.value = Math.max(
-        actVia.system.base.value + Math.min(0, -roundTo5Multiples(-allActionsPenalty / 2)),
+        actVia.system.base.value +
+          Math.min(0, -roundTo5Multiples(-allActionsPenalty / 2)),
         0
       );
     }
@@ -40,38 +41,31 @@ export const mutateMysticData = data => {
     0
   );
   mystic.magicProjection.imbalance.offensive.final.value = Math.max(
-    mystic.magicProjection.imbalance.offensive.base.value +
-    allActionsPenalty,
+    mystic.magicProjection.imbalance.offensive.base.value + allActionsPenalty,
     0
   );
 
   mystic.magicProjection.imbalance.defensive.final.value = Math.max(
-    mystic.magicProjection.imbalance.defensive.base.value +
-    allActionsPenalty,
+    mystic.magicProjection.imbalance.defensive.base.value + allActionsPenalty,
     0
   );
 
   const dailyZeon = mystic.spellMaintenances.reduce(
-    (acc, currentValue) =>
-      acc + (Number(currentValue.system.cost.value) || 0),
+    (acc, currentValue) => acc + (Number(currentValue.system.cost.value) || 0),
     0
   );
-  
+
   const perTurnZeon = mystic.selectedSpells.reduce(
-    (acc, currentValue) =>
-      acc + (Number(currentValue.system.cost.value) || 0),
+    (acc, currentValue) => acc + (Number(currentValue.system.cost.value) || 0),
     0
   );
 
   mystic.spellsMaintenanceCost = perTurnZeon;
 
   const manualMaintained = Number(mystic.zeonMaintained?.max) || 0;
   mystic.zeonMaintained.value = perTurnZeon + manualMaintained;
-  
-  mystic.zeonRegeneration.final.value = Math.max(
-    mystic.zeonRegeneration.base.value - dailyZeon,
-    0
-  );
+
+  mystic.zeonRegeneration.final.value = mystic.zeonRegeneration.base.value - dailyZeon;
 
   mystic.summoning.summon.final.value =
     mystic.summoning.summon.base.value + Math.min(allActionsPenalty, 0);

src/module/actor/utils/prepareActor/calculations/items/weapon/calculations/calculateWeaponArmorReduction.js

@@ -3,9 +3,11 @@ import { WeaponSizeProportion } from '../../../../../../../types/combat/WeaponIt
 /**
  * @param {import('../../../../../../../types/Items').WeaponDataSource} weapon
  */
-export const calculateWeaponArmorReduction = (weapon) => {
-  let reducedArmor = weapon.system.reducedArmor.base.value + weapon.system.reducedArmor.special.value;
-
+export const calculateWeaponArmorReduction = weapon => {
+  let reducedArmor = Math.max(
+    weapon.system.reducedArmor.base.value + weapon.system.reducedArmor.special.value,
+    0
+  );
 
   return reducedArmor;
-};
+};

src/scss/actor/parts/psychic.scss

@@ -154,22 +154,22 @@
         }
 
         .effect-row {
-          display: flex;
+          display: grid;
+          grid-template-columns: 3rem 3rem 1fr; // dificultad | daño/escudo | descripción
+          column-gap: 0.5rem;
+          align-items: center;
 
           margin-top: 0.5rem;
 
-          .difficulty {
-            margin-right: 0.5rem;
-            width: 3rem;
-          }
+          .difficulty { width: 3rem; }
+          .damage, .shield-points { width: 100%; } 
+          .description { width: 100%; }
 
-          .description {
-            width: 100%;
-          }
+          .damage-title, .shield-points-title { grid-column: 2; margin: 0; font-weight: bold; text-align: center;}
+          .description-title { grid-column: 3; margin: 0; font-weight: bold; }text-align: center;
 
           .input {
             @include input;
-
             text-align: center;
             height: 1.25rem;
             line-height: 1.25rem;
@@ -184,6 +184,7 @@
           }
         }
 
+
         .psychic-power-header {
           padding-right: 0.5rem;
           padding-left: 0.5rem;

src/templates/actor/parts/combat/parts/supernatural-shields.hbs

@@ -1,10 +1,14 @@
 {{#> "systems/animabf/templates/common/ui/group.hbs"
   class="supernatural-shields"
 }}
-  {{>
+  {{!-- {{>
   "systems/animabf/templates/common/ui/group-header.hbs"
     title=(localize "anima.ui.combat.supernaturalShields.title")
     addRowButtonData="add-supernatural-shield"
+  }} --}}
+  {{>
+  "systems/animabf/templates/common/ui/group-header.hbs"
+    title=(localize "anima.ui.combat.supernaturalShields.title")
   }}
   {{#> "systems/animabf/templates/common/ui/group-body.hbs"
     class="supernatural-shields"

src/templates/actor/parts/mystic/parts/spells/grade/grade.hbs

@@ -33,6 +33,26 @@
     inputName=this.maintenanceCostInputName
     inputValue=this.grade.maintenanceCost.value
   }}
+  {{#if (is 'eq' this.spellCombatType 'attack')}}
+  {{>
+  "systems/animabf/templates/common/ui/vertical-titled-input.hbs"
+    class="damage"
+    hideTitle=this.hideTitle
+    title=(localize "anima.ui.mystic.spell.grade.damage.title")
+    inputName=this.damageInputName
+    inputValue=this.grade.damage.value
+  }}
+  {{/if}}
+  {{#if (is 'eq' this.spellCombatType 'defense')}}
+  {{>
+  "systems/animabf/templates/common/ui/vertical-titled-input.hbs"
+    class="shield-points"
+    hideTitle=this.hideTitle
+    title=(localize "anima.ui.mystic.spell.grade.shieldPoints.title")
+    inputName=this.shieldPointsInputName
+    inputValue=this.grade.shieldPoints.value
+  }}
+  {{/if}}
   {{>
   "systems/animabf/templates/common/ui/vertical-titled-input.hbs"
     class="description"