From 6933227dfc46ce2a3cc7fe99d6e44f0fcab26d4c Mon Sep 17 00:00:00 2001 From: Lumenita <61290963+Lumenita@users.noreply.github.com> Date: Mon, 20 May 2024 15:38:06 -0500 Subject: [PATCH] Smol bug fixes Introduction of SelectOptions for localized dropdowns, fixed certain bugs and custom secondaries --- lang/en.json | 20 ++ lang/es.json | 189 +++++++++++------- lang/fr.json | 20 ++ module/abfalter.js | 13 +- module/actor/abfalterActor.js | 4 +- module/actor/abfalterCharacterSheet.js | 3 + module/config.js | 22 ++ module/item/abfalterItem.js | 37 ++-- module/item/abfalterItemSheet.js | 4 + module/utilities/migration.js | 58 +++++- packs/compendiums/{000009.log => 000094.log} | 0 packs/compendiums/CURRENT | 2 +- packs/compendiums/LOG | 11 +- packs/compendiums/LOG.old | 11 +- .../{MANIFEST-000008 => MANIFEST-000092} | Bin 146 -> 161 bytes system.json | 4 +- template.json | 4 +- templates/actor/parts/general.html | 20 +- templates/actor/parts/monster.html | 14 +- templates/item/dailyMaint.html | 4 +- templates/item/monsterPower.html | 12 +- templates/item/turnMaint.html | 4 +- 22 files changed, 305 insertions(+), 151 deletions(-) rename packs/compendiums/{000009.log => 000094.log} (100%) rename packs/compendiums/{MANIFEST-000008 => MANIFEST-000092} (79%) diff --git a/lang/en.json b/lang/en.json index 1d5d9a5..bfc52ed 100644 --- 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" } } } \ No newline at end of file diff --git a/lang/es.json b/lang/es.json index d17b74b..b16e809 100644 --- 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" } } } \ No newline at end of file diff --git a/lang/fr.json b/lang/fr.json index df15193..a6c1e36 100644 --- 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" } } } \ No newline at end of file diff --git a/module/abfalter.js b/module/abfalter.js index 511f074..23e456e 100644 --- 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 index 8a9281a..816713b 100644 --- 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 index b76cd8c..f0ff27a 100644 --- 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" }); diff --git a/module/config.js b/module/config.js index 64a663e..cf607ee 100644 --- a/module/config.js +++ b/module/config.js @@ -966,4 +966,26 @@ abfalter.activeEffectChanges = { healthRegen: "abfalter.activeEffectChanges.healthRegen", secAbility: "abfalter.activeEffectChanges.secAbility" +} + +abfalter.customSecondaryDropdown = { + none: "abfalter.customSecondaryDropdown.none", + agi: "abfalter.customSecondaryDropdown.agi", + con: "abfalter.customSecondaryDropdown.con", + str: "abfalter.customSecondaryDropdown.str", + dex: "abfalter.customSecondaryDropdown.dex", + int: "abfalter.customSecondaryDropdown.int", + per: "abfalter.customSecondaryDropdown.per", + pow: "abfalter.customSecondaryDropdown.pow", + wp: "abfalter.customSecondaryDropdown.wp", +} + +abfalter.MonsterPowerDropdown = { + other: "abfalter.MonsterPowerDropdown.other", + essential: "abfalter.MonsterPowerDropdown.essential", + disadv: "abfalter.MonsterPowerDropdown.disadv", + combat: "abfalter.MonsterPowerDropdown.combat", + defense: "abfalter.MonsterPowerDropdown.defense", + misc: "abfalter.MonsterPowerDropdown.misc", + divine: "abfalter.MonsterPowerDropdown.divine" } \ No newline at end of file diff --git a/module/item/abfalterItem.js b/module/item/abfalterItem.js index 3937ad7..b0d8ffd 100644 --- a/module/item/abfalterItem.js +++ b/module/item/abfalterItem.js @@ -265,36 +265,47 @@ export default class abfalterItem extends Item { } prepareSecondary() { + if (this.parent != null) { this.system.aam = this.parent.system.aamFinal; this.system.collapse = this.parent.system.toggles.customSecondary; + switch (this.system.atr) { - case game.i18n.localize('abfalter.basicInfo.agi'): + case "agi": this.system.mod = this.parent.system.stats.Agility.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.agi'); break; - case game.i18n.localize('abfalter.basicInfo.con'): + case "con": this.system.mod = this.parent.system.stats.Constitution.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.con'); break; - case game.i18n.localize('abfalter.basicInfo.str'): + case "str": this.system.mod = this.parent.system.stats.Strength.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.str'); break; - case game.i18n.localize('abfalter.basicInfo.dex'): + case "dex": this.system.mod = this.parent.system.stats.Dexterity.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.dex'); break; - case game.i18n.localize('abfalter.basicInfo.per'): + case "int": this.system.mod = this.parent.system.stats.Perception.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.int'); break; - case game.i18n.localize('abfalter.basicInfo.int'): + case "per": this.system.mod = this.parent.system.stats.Intelligence.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.per'); break; - case game.i18n.localize('abfalter.basicInfo.pow'): + case "pow": this.system.mod = this.parent.system.stats.Power.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.pow'); break; - case game.i18n.localize('abfalter.basicInfo.wp'): + case "wp": this.system.mod = this.parent.system.stats.Willpower.mod; + this.system.localizedName = game.i18n.localize('abfalter.basicInfo.wp'); break; default: this.system.mod = 0; + this.system.localizedName = game.i18n.localize('abfalter.customSecondaryDropdown.none'); break; } } else { @@ -303,11 +314,11 @@ export default class abfalterItem extends Item { this.system.collapse = false; } - if (this.system.atr == game.i18n.localize('abfalter.basicInfo.agi') || this.system.atr == game.i18n.localize('abfalter.basicInfo.con') || - this.system.atr == game.i18n.localize('abfalter.basicInfo.str') || this.system.atr == game.i18n.localize('abfalter.basicInfo.dex')) { + if (this.system.atr == "agi" || this.system.atr == "con" || + this.system.atr == "str" || this.system.atr == "dex" ) { this.system.tag = "physical"; - } else if (this.system.atr == game.i18n.localize('abfalter.basicInfo.per') || this.system.atr == game.i18n.localize('abfalter.basicInfo.int') || - this.system.atr == game.i18n.localize('abfalter.basicInfo.pow') || this.system.atr == game.i18n.localize('abfalter.basicInfo.wp')) { + } else if (this.system.atr == "per" || this.system.atr == "pow" || + this.system.atr == "int" || this.system.atr == "wp") { this.system.tag = "mental"; } else { this.system.tag = "" @@ -318,6 +329,8 @@ export default class abfalterItem extends Item { this.system.natFinal = 100; } this.system.finalValue = Math.floor(~~this.system.base + ~~this.system.extra + ~~this.system.spec + ~~this.system.temp + this.system.natFinal + ~~this.system.aam); + + } prepareMonsterPower() { diff --git a/module/item/abfalterItemSheet.js b/module/item/abfalterItemSheet.js index e975a28..23d9daa 100644 --- a/module/item/abfalterItemSheet.js +++ b/module/item/abfalterItemSheet.js @@ -106,6 +106,10 @@ export default class abfalterItemSheet extends ItemSheet { effects: prepareActiveEffectCategories(this.item.effects), config: CONFIG.abfalter, }; + + //Dropdowns + sheetData.monsterTypeObjList = CONFIG.abfalter.MonsterPowerDropdown; + return sheetData; } diff --git a/module/utilities/migration.js b/module/utilities/migration.js index ea0739b..05e9ff8 100644 --- a/module/utilities/migration.js +++ b/module/utilities/migration.js @@ -1,6 +1,6 @@ -function migrateActorData(actor) { - let updateData = {}; - +async function migrateActorData(actor) { + /* + let updateData = {}; if (actor.metaMagic) { updateData["system.metaMagic.cost"] = 0; updateData["system.metaMagic.extraCost"] = 0; @@ -19,7 +19,50 @@ function migrateActorData(actor) { updateData["system.mproj.temp2"] = 0; } - return updateData; + */ + const updates = []; + for (const item of actor.items) if (item.type === "monsterPower") { + let newType = ""; + switch (item.system.type) { + case "": + case "other": + newType = "other"; + break; + case "1": + case "essential": + newType = "essential"; + break; + case "2": + case "disadv": + newType = "disadv"; + break; + case "3": + case "combat": + newType = "combat"; + break; + case "4": + case "defense": + newType = "defense"; + break; + case "5": + case "misc": + newType = "misc"; + break; + case "6": + case "divine": + newType = "divine"; + break; + default: + newType = "other"; + break; + } + item.system.type = newType; + + // Collect the updates + updates.push({ _id: item.id, 'system.type': newType }); + } + + return updates; } function migrateSceneData(scene) { @@ -40,10 +83,11 @@ function migrateSceneData(scene) { export async function migrateWorld() { for (let actor of game.actors.contents) { - const updateData = migrateActorData(actor.system); + const updateData = await migrateActorData(actor); if (!foundry.utils.isEmpty(updateData)) { - console.log(`Migrating Actor entity ${actor.name}`); - await actor.update(updateData); + console.log(`Migrating Actor entity ${actor.system.name}`); + //await actor.update(updateData); + await actor.updateEmbeddedDocuments("Item", updateData); } } diff --git a/packs/compendiums/000009.log b/packs/compendiums/000094.log similarity index 100% rename from packs/compendiums/000009.log rename to packs/compendiums/000094.log diff --git a/packs/compendiums/CURRENT b/packs/compendiums/CURRENT index d408ea0..5b83d76 100644 --- a/packs/compendiums/CURRENT +++ b/packs/compendiums/CURRENT @@ -1 +1 @@ -MANIFEST-000008 +MANIFEST-000092 diff --git a/packs/compendiums/LOG b/packs/compendiums/LOG index f128bd4..8183a7b 100644 --- a/packs/compendiums/LOG +++ b/packs/compendiums/LOG @@ -1,3 +1,8 @@ -2024/04/24-07:03:06.998 3ad8 Recovering log #7 -2024/04/24-07:03:07.012 3ad8 Delete type=0 #7 -2024/04/24-07:03:07.012 3ad8 Delete type=3 #6 +2024/05/20-15:35:56.262 5d60 Recovering log #90 +2024/05/20-15:35:56.271 5d60 Delete type=0 #90 +2024/05/20-15:35:56.271 5d60 Delete type=3 #88 +2024/05/20-15:36:47.604 6a48 Level-0 table #95: started +2024/05/20-15:36:47.605 6a48 Level-0 table #95: 0 bytes OK +2024/05/20-15:36:47.608 6a48 Delete type=0 #93 +2024/05/20-15:36:47.609 6a48 Manual compaction at level-0 from '!journal!wCO5xTIw9mb5vNS8' @ 72057594037927935 : 1 .. '!journal.pages!wCO5xTIw9mb5vNS8.i2dwb1oXdQ1EpuvI' @ 0 : 0; will stop at (end) +2024/05/20-15:36:47.609 6a48 Manual compaction at level-1 from '!journal!wCO5xTIw9mb5vNS8' @ 72057594037927935 : 1 .. '!journal.pages!wCO5xTIw9mb5vNS8.i2dwb1oXdQ1EpuvI' @ 0 : 0; will stop at (end) diff --git a/packs/compendiums/LOG.old b/packs/compendiums/LOG.old index ef7a26e..683c9e6 100644 --- a/packs/compendiums/LOG.old +++ b/packs/compendiums/LOG.old @@ -1,3 +1,8 @@ -2024/04/24-06:44:50.855 734c Recovering log #4 -2024/04/24-06:44:50.865 734c Delete type=0 #4 -2024/04/24-06:44:50.865 734c Delete type=3 #2 +2024/05/20-15:32:41.840 52c Recovering log #86 +2024/05/20-15:32:41.849 52c Delete type=0 #86 +2024/05/20-15:32:41.849 52c Delete type=3 #84 +2024/05/20-15:35:06.693 6a48 Level-0 table #91: started +2024/05/20-15:35:06.693 6a48 Level-0 table #91: 0 bytes OK +2024/05/20-15:35:06.697 6a48 Delete type=0 #89 +2024/05/20-15:35:06.705 6a48 Manual compaction at level-0 from '!journal!wCO5xTIw9mb5vNS8' @ 72057594037927935 : 1 .. '!journal.pages!wCO5xTIw9mb5vNS8.i2dwb1oXdQ1EpuvI' @ 0 : 0; will stop at (end) +2024/05/20-15:35:06.705 6a48 Manual compaction at level-1 from '!journal!wCO5xTIw9mb5vNS8' @ 72057594037927935 : 1 .. '!journal.pages!wCO5xTIw9mb5vNS8.i2dwb1oXdQ1EpuvI' @ 0 : 0; will stop at (end) diff --git a/packs/compendiums/MANIFEST-000008 b/packs/compendiums/MANIFEST-000092 similarity index 79% rename from packs/compendiums/MANIFEST-000008 rename to packs/compendiums/MANIFEST-000092 index 5812737a07185557a90a9316f35262b5c756be1c..4a981089c63c7fb81d4d881ee68a99191e14aa9e 100644 GIT binary patch delta 37 pcmbQlxR7x|vz*~O-6tFjj7+hd49syX;^uj*w?N!DAUA {{localize "abfalter.generalTab.secAbility"}} - + {{selectOptions ../customSecObjList selected=system.atr localize=true}} + @@ -1952,7 +1944,7 @@
{{localize "abfalter.generalTab.secAbility"}}
{{else}}
- @@ -1960,7 +1952,7 @@
{{localize "abfalter.generalTab.secAbility"}}
- {{secondary.system.atr}} + {{secondary.system.localizedName}}
{{/if}} diff --git a/templates/actor/parts/monster.html b/templates/actor/parts/monster.html index a513c3f..9f143a8 100644 --- a/templates/actor/parts/monster.html +++ b/templates/actor/parts/monster.html @@ -168,7 +168,7 @@
{{localize "abfalter.monsterPowers.essentialAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type "1"}} + {{#ifEquals system.type "essential"}}
{{#if system.expand}}
@@ -218,7 +218,7 @@
{{localize "abfalter.monsterPowers.disadvAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type "2"}} + {{#ifEquals system.type "disadv"}}
{{#if system.expand}}
@@ -268,7 +268,7 @@
{{localize "abfalter.monsterPowers.miscAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type "5"}} + {{#ifEquals system.type "misc"}}
{{#if system.expand}}
@@ -318,7 +318,7 @@
{{localize "abfalter.monsterPowers.divineAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type "6"}} + {{#ifEquals system.type "divine"}}
{{#if system.expand}}
@@ -370,7 +370,7 @@
{{localize "abfalter.monsterPowers.combatAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type "3"}} + {{#ifEquals system.type "combat"}}
{{#if system.expand}}
@@ -420,7 +420,7 @@
{{localize "abfalter.monsterPowers.defenseAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type "4"}} + {{#ifEquals system.type "defense"}}
{{#if system.expand}}
@@ -470,7 +470,7 @@
{{localize "abfalter.monsterPowers.otherAbi"}}
{{#each monsterPowers as |monsterPower id|}} - {{#ifEquals system.type ""}} + {{#ifEquals system.type "other"}}
{{#if system.expand}}
diff --git a/templates/item/dailyMaint.html b/templates/item/dailyMaint.html index abb718e..1b1cbe5 100644 --- a/templates/item/dailyMaint.html +++ b/templates/item/dailyMaint.html @@ -7,8 +7,8 @@
{{localize "abfalter.magicTab.dailySpellMaint"}}
- - + +
{{localize "abfalter.basicInfo.description"}}
diff --git a/templates/item/monsterPower.html b/templates/item/monsterPower.html index 6a2767f..7145965 100644 --- a/templates/item/monsterPower.html +++ b/templates/item/monsterPower.html @@ -16,16 +16,8 @@

{{localize "abfalter.sheet.monsterPowTitle"}}

  • - + {{selectOptions monsterTypeObjList selected=data.type localize=true}}
  • {{localize "abfalter.basicInfo.cost"}}: {{data.cost}}
    • diff --git a/templates/item/turnMaint.html b/templates/item/turnMaint.html index a93cf63..15eee8f 100644 --- a/templates/item/turnMaint.html +++ b/templates/item/turnMaint.html @@ -7,8 +7,8 @@
    {{localize "abfalter.magicTab.turnSpellMaint"}}
    - - + +
    {{localize "abfalter.basicInfo.description"}}