Smol bug fixes

Introduction of SelectOptions for localized dropdowns, fixed certain bugs and custom secondaries
Lumenita · May 20, 2024 · 6933227 · 6933227
1 parent c7e5aae
commit 6933227
Show file tree

Hide file tree

Showing 22 changed files with 305 additions and 151 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -955,6 +955,26 @@
       "kiPoolInnate": "Ki Pool: Innate Power",
       "healthRegen": "Health Regeneration",
       "secAbility": "Sec. Ability"
+    },
+    "customSecondaryDropdown": {
+      "none": "NONE",
+      "agi": "AGI",
+      "con": "CON",
+      "str": "STR",
+      "dex": "DEX",
+      "int": "INT",
+      "per": "PER",
+      "pow": "POW",
+      "wp": "WP"
+    },
+    "MonsterPowerDropdown": {
+      "other": "Other Power",
+      "essential": "Essential",
+      "disadv": "Dis-Advantage",
+      "combat": "Combat",
+      "defense": "Defensive",
+      "misc": "Misc",
+      "divine": "Divine"
     }
   }
 }
diff --git a/lang/es.json b/lang/es.json
@@ -100,10 +100,10 @@
       "multiWield": "Ambidestría",
       "unarmed": "Desarmado",
       "special": "Especial",
-      "innate": "Innate",
-      "shortDesc": "Short Desc.",
-      "monster": "Creature",
-      "details": "Details"
+      "innate": "Innato",
+      "shortDesc": "Desc. Corta",
+      "monster": "Criatura",
+      "details": "Detalles"
     },
     "generalTab": {
       "characteristics": "Características",
@@ -176,7 +176,7 @@
       "lockpicking": "Cerrajería",
       "poisons": "Venenos",
       "stealth": "Sigilo",
-      "them.": "Robo",
+      "theft": "Robo",
       "traplore": "Trampería",
       "creative": "Creativas",
       "alchemy": "Alquimia",
@@ -208,10 +208,10 @@
       "lifePoints": "Puntos de Vida",
       "addAdvantage": "Añadir ventaja",
       "addDisadvantage": "Añadir Desventaja",
-      "custom": "Custom"
+      "custom": "Personalización"
     },
     "sheet": {
-      "newItem": "Deidad Nueva",
+      "newItem": "Nuevo",
       "nameItem": "Nombre es requerido",
       "edit": "Editar",
       "delete": "Eliminar",
@@ -255,15 +255,15 @@
       "poisonRes": "Resistencia a Venenos",
       "magicRes": "Resistencia Mágica",
       "psychicRes": "Resistencia Psíquica",
-      "source": "Source",
-      "duration": "Duration",
-      "add": "Add",
-      "tempEff": "Temporary Effects",
-      "passEff": "Passive Effects",
-      "InEff": "Inactive Effects",
-      "newEff": "New Effect",
-      "kiTechTitle": "Ki Technique",
-      "monsterPowTitle": "Monster Power"
+      "source": "Fuente",
+      "duration": "Duración",
+      "add": "Añadir",
+      "tempEff": "Efecto Temporal",
+      "passEff": "Efecto Pasivo",
+      "InEff": "Efecto Inactivo",
+      "newEff": "Efecto Nuevo",
+      "kiTechTitle": "Tecnica Ki",
+      "monsterPowTitle": "Poder de Criatura"
     },
     "magicTab": {
       "mproj": "Proyección Mágica",
@@ -611,7 +611,7 @@
       "actionType": "Tipo de acción",
       "frequency": "Frecuencia",
       "acquired": "Acq.",
-      "reserve": "Reserve"
+      "reserve": "Reserva"
     },
     "armoryTab": {
       "wearArmor": "Llevar Armadura",
@@ -666,6 +666,14 @@
       "finalDmg": "Daño Final",
       "totalPerPen": "Pen. Percepc. Total",
       "natPen": "Penal. Natural",
+      "ArmorClass": "Clase",
+      "ArmorLoc": "Localización",
+      "ArmorSoft": "Blanda",
+      "ArmorHeavy": "Dura",
+      "ArmorNatural": "Natural",
+      "ArmorCompleta": "Completa",
+      "ArmorPeto": "Peto",
+      "ArmorCamisola": "Camisola",
       "movePen": "Penal. Movimie.",
       "perPen": "Penal. Percepción",
       "armorValues": "Valor Armadura",
@@ -681,6 +689,23 @@
       "shieldNorm": "Escudo",
       "shieldTower": "Corporal",
       "wepDetails": "Detalles del Arma",
+      "weptype0": "Tipología Primaria",
+      "weptype1": "Tipologia Secundaria",
+      "weptype3": "Asta",
+      "weptype4": "Cuerda",
+      "weptype2": "Arma corta",
+      "weptype6": "Espada",
+      "weptype10": "Maza",
+      "weptype7": "Hacha",
+      "weptype9": "Mandoble",
+      "weptype11": "Proyectil",
+      "weptype8": "Lanzable",
+      "weptype5": "Escudo",
+      "weptype12": "Arma natural",
+      "Recharge": "Cadencia / Recarga",
+      "Range": "Alcance (m.)",
+      "fuereq1": "Fuerza Requerida 1",
+      "fuereq2": "Fuerza Requerida 2",
       "dmgTypes": "Tipos de Daño",
       "primary": "Primario",
       "secondary": "Secundario",
@@ -750,10 +775,10 @@
       "changeTemp": "Cambiar Valores de Temp Sec",
       "changeSpec": "Cambiar Valores de Spec Sec",
       "open": "Abrir",
-      "generalSettings": "General Settings",
-      "dpMod": "DP Mod",
-      "hideMonster": "Hide Creature Tab",
-      "hideEffect": "Hide Effect Tab"
+      "generalSettings": "Configuración General",
+      "dpMod": "Mod PD",
+      "hideMonster": "Ocultar pestaña Criatura",
+      "hideEffect": "Ocultar pestaña Efectos"
     },
     "metaMagic": {
       "arcTitle": "Arcana Shepirah",
@@ -896,64 +921,84 @@
       "fumbleDetail": "Intercambia el método en que son calculadas las pifias entre la versión antigua del Core y el Core Exxet Esto significa que cada vez que se produce un resultado de pifia en una tirada, automáticamente se lance 1D100 para calcular el rango de pifia.",
       "meterName": "Usar metros en lugar de pies",
       "meterDetail": "Permite cambiar la medida del movimiento pasando de pies a metros. Requiere refrescar (f5) para que tenga efecto.",
-      "changeThemeName": "Change Color Theme",
-      "changeThemeDetails": "Changes the color theme for everything to a light version, requires refresh (f5) to take effect."
+      "changeThemeName": "Cambiar paleta de colores",
+      "changeThemeDetails": "Cambia la paleta de colores de la ficha a una versión más luminosa, requiere refrescar (F5) para que tenga efecto."
     },
     "monsterPowers": {
-      "essentialAbi": "Essential Abilities",
-      "disadvAbi": "Disadvantages",
-      "miscAbi": "Misc Powers",
-      "divineAbi": "Divine Powers",
-      "combatAbi": "Combat Powers",
-      "defenseAbi": "Defensive Powers",
-      "otherAbi": "Other Powers",
+      "essentialAbi": "Habilidades Esenciales",
+      "disadvAbi": "Desventajas",
+      "miscAbi": "Poderes varios",
+      "divineAbi": "Poderes Divinos",
+      "combatAbi": "Poderes ofensivos",
+      "defenseAbi": "Poderes defensivos",
+      "otherAbi": "Otros poderes",
       "hpMonster": "Monst",
-      "addMonsterPower": "Add Monster Power",
+      "addMonsterPower": "Añadir Poder Criatura",
       "info": "Info",
-      "natWep": "Do I have natural weapons?",
-      "natWepDmg": "Natural weapons base dmg",
-      "natWepFort": "Natural weapons fortitude",
-      "NatWepBreak": "Natural weapons breakage",
-      "physDmg": "Physical attack base dmg",
-      "actionArea": "Monster action area",
-      "dmgRes": "Are I dmg resistance?",
-      "baseArmor": "base armor value",
-      "healthMult": "Health multiple",
-      "dpHP": "DP spent for LP",
-      "totalAddHP": "Total additive LP",
-      "additional": "Additional",
-      "dpCost": "Dp Cost",
+      "natWep": "¿Tiene armas naturales?",
+      "natWepDmg": "Daño base de las armas naturales",
+      "natWepFort": "Entereza de las armas naturales",
+      "NatWepBreak": "Rotura de las armas naturales",
+      "physDmg": "Daño base ataques físicos",
+      "actionArea": "Área de accion Criatura",
+      "dmgRes": "¿Es de Acumulación?",
+      "baseArmor": "Armadura Base Criatura",
+      "healthMult": "Múltiplo de acumulación",
+      "dpHP": "PD usados por múltiplos",
+      "totalAddHP": "Vida añadida por múltiplos",
+      "additional": "Adicional",
+      "dpCost": "Coste PD",
       "monstChar": "Monst Base",
-      "monstCharacteristic": "Monster Characteristics",
-      "replaceChar": "Replace base char w/ monster char?",
-      "showShortDesc": "Show short desc. of powers",
-      "hideDis": "Hide disadvantages",
-      "hideDivine": "Hide divine powers",
-      "hideDef": "Hide defensive powers",
-      "totalCharDp": "Total Char. DP Spent",
-      "totalPowDp": "Total Powers DP Spent",
-      "totalDpSpent": "Total DP Spent"
+      "monstCharacteristic": "Características criatura",
+      "replaceChar": "¿Aplicar caract. Criatura a General?",
+      "showShortDesc": "Mostrar desc. corta de poderes",
+      "hideDis": "Ocultar desventajas",
+      "hideDivine": "Ocultar poderes divinos",
+      "hideDef": "Ocultar poderes defensivos",
+      "totalCharDp": "PDs totales gastados en Caracter.",
+      "totalPowDp": "PDs totales gastados en Poderes",
+      "totalDpSpent": "PDs totales gastados"
     },
     "activeEffectChanges": {
-      "magicRegen": "Magic Regeneration",
-      "summoning": "Summoning Ability",
-      "pp": "Psychic Point",
-      "kiAcuAgi": "Ki Accumulation: Agility",
-      "kiPoolAgi": "Ki Pool: Agility",
-      "kiAcuCon": "Ki Accumulation: Constitution",
-      "kiPoolCon": "Ki Pool: Constitution",
-      "kiAcuDex": "Ki Accumulation: Dexterity",
-      "kiPoolDex": "Ki Pool: Dexterity",
-      "kiAcuStr": "Ki Accumulation: Strength",
-      "kiPoolStr": "Ki Pool: Strength",
-      "kiAcuPow": "Ki Accumulation: Power",
-      "kiPoolPow": "Ki Pool: Power",
-      "kiAcuWP": "Ki Accumulation: Willpower",
-      "kiPoolWP": "Ki Pool: Willpower",
-      "kiPoolUnified": "Ki Pool: Unified",
-      "kiPoolInnate": "Ki Pool: Innate Power",
-      "healthRegen": "Health Regeneration",
-      "secAbility": "Sec. Ability"
+      "magicRegen": "Regeneración mágica",
+      "summoning": "Habilidad convocación",
+      "pp": "Consumo de voluntad (CV)",
+      "kiAcuAgi": "Acumulación de Ki: Agilidad",
+      "kiPoolAgi": "Reserva de Ki: Agilidad",
+      "kiAcuCon": "Acumulación de Ki: Constitución",
+      "kiPoolCon": "Reserva de Ki: Constitución",
+      "kiAcuDex": "Acumulación de Ki: Destreza",
+      "kiPoolDex": "Reserva de Ki: Destreza",
+      "kiAcuStr": "Acumulación de Ki: Fuerza",
+      "kiPoolStr": "Reserva de Ki: Fuerza",
+      "kiAcuPow": "Acumulación de Ki: Poder",
+      "kiPoolPow": "Reserva de Ki: Poder",
+      "kiAcuWP": "Acumulación de Ki: Voluntad",
+      "kiPoolWP": "Reserva de Ki: Voluntad",
+      "kiPoolUnified": "Reserva de Ki: Unificado",
+      "kiPoolInnate": "Reserva de Ki: Poder innato",
+      "healthRegen": "Regeneración de Vida",
+      "secAbility": "Habilidad Sec."
+    },
+    "customSecondaryDropdown": {
+      "none": "NADA",
+      "agi": "AGI",
+      "con": "CON",
+      "str": "FUE",
+      "dex": "DES",
+      "int": "INT",
+      "per": "PER",
+      "pow": "POD",
+      "wp": "VOL"
+    },
+    "MonsterPowerDropdown": {
+      "other": "Otros poderes",
+      "essential": "Habilidades Esenciales",
+      "disadv": "Desventajas",
+      "combat": "Poderes ofensivos",
+      "defense": "Poderes defensivos",
+      "misc": "Poderes varios",
+      "divine": "Poderes Divinos"
     }
   }
 }
diff --git a/lang/fr.json b/lang/fr.json
@@ -954,6 +954,26 @@
       "kiPoolInnate": "Ki Pool: Innate Power",
       "healthRegen": "Health Regeneration",
       "secAbility": "Sec. Ability"
+    },
+    "customSecondaryDropdown": {
+      "none": "NONE",
+      "agi": "AGI",
+      "con": "CON",
+      "str": "FOR",
+      "dex": "DEX",
+      "int": "INT",
+      "per": "PER",
+      "pow": "POU",
+      "wp": "VOL"
+    },
+    "MonsterPowerDropdown": {
+      "other": "Other Power",
+      "essential": "Essential",
+      "disadv": "Dis-Advantage",
+      "combat": "Combat",
+      "defense": "Defensive",
+      "misc": "Misc",
+      "divine": "Divine"
     }
   }
 }
diff --git a/module/abfalter.js b/module/abfalter.js
@@ -56,7 +56,7 @@ Hooks.once("ready", function () {
     }
 
     const currentVersion = game.settings.get("abfalter", "systemMigrationVersion");
-    const NEEDS_MIGRATION_VERSION = "1.1.1";
+    const NEEDS_MIGRATION_VERSION = "1.3.0";
 
     const needsMigration = !currentVersion || isNewerVersion(NEEDS_MIGRATION_VERSION, currentVersion);
 
@@ -69,17 +69,6 @@ Hooks.once('setup', function () {
     // Set active effect keys-labels
     abfalterEffectConfig.initializeChangeKeys();
 
-    /* WIP Localized Select fields
-    abfalter.monstPowType = {
-        other: game.i18n.localize('abfalter.basicInfo.other'),
-        essential: game.i18n.localize('abfalter.basicInfo.essential'),
-        disadvantage: game.i18n.localize('abfalter.basicInfo.disadvantage'),
-        combat: game.i18n.localize('abfalter.basicInfo.combat'),
-        defensive: game.i18n.localize('abfalter.basicInfo.defensive'),
-        misc: game.i18n.localize('abfalter.basicInfo.misc'),
-        divine: game.i18n.localize('abfalter.basicInfo.divine')
-    };
-    preLocalize("monstPowType");*/
 })
 
 Handlebars.registerHelper('ifEquals', function (arg1, arg2, options) {

diff --git a/module/actor/abfalterActor.js b/module/actor/abfalterActor.js
@@ -1698,7 +1698,7 @@ export default class abfalterActor extends Actor {
             data.wepFinSpd = data.weaponSpeed - 10;
             data.weaponName = game.i18n.localize('abfalter.basicInfo.multiWield');
         } else if (data.weaponNumber == 0) {
-            data.wepFinSpd = 0;
+            data.wepFinSpd = 20;
             data.weaponName = game.i18n.localize('abfalter.basicInfo.unarmed');
         } else {
             data.wepFinSpd = data.weaponSpeed;
@@ -2567,7 +2567,7 @@ export default class abfalterActor extends Actor {
 
         // Reload Items to get Atk/Def
         this.items.reduce((arr, item) => {
-            if (item.type === "weapon") {
+            if (item.type === "weapon" || item.type === "secondary" ) {
                 item.prepareData();
             }
         });

diff --git a/module/actor/abfalterCharacterSheet.js b/module/actor/abfalterCharacterSheet.js
@@ -99,6 +99,9 @@ export default class abfalterCharacterSheet extends ActorSheet {
             config: CONFIG.abfalter
         }
 
+        //Dropdowns
+        sheetData.customSecObjList = CONFIG.abfalter.customSecondaryDropdown;
+
         //Initialize Items
         sheetData.inventories = baseData.items.filter(function (item) { return item.type == "inventory" });
         sheetData.weapons = baseData.items.filter(function (item) { return item.type == "weapon" });