bugfixes and deprecations

Author: Plushtoast

README.md

@@ -10,7 +10,7 @@ If you want to learn more checkout the [German](https://ulisses-spiele.de/virtua
 In the FVTT Game Systems Menu, click Install System and enter the Manifest URL:
 
 ```
-https://raw.githubusercontent.com/Plushtoast/dsa5-foundryVTT/foundry11/system.json
+https://raw.githubusercontent.com/Plushtoast/dsa5-foundryVTT/foundry12/system.json
 ```
 
 ## Roadmap

icons/spellicons/license.txt

@@ -0,0 +1,41 @@
+Base Icons made by the following authors.
+Borders made by Carina Wittrin.
+
+Icons provided under the Creative Commons 3.0 BY or CC0 if mentioned below.
+
+- Lorc, http://lorcblog.blogspot.com
+- Delapouite, https://delapouite.com
+- John Colburn, http://ninmunanmu.com
+- Felbrigg, http://blackdogofdoom.blogspot.co.uk
+- John Redman, http://www.uniquedicetowers.com
+- Carl Olsen, https://twitter.com/unstoppableCarl
+- Sbed, http://opengameart.org/content/95-game-icons
+- PriorBlue
+- Willdabeast, http://wjbstories.blogspot.com
+- Viscious Speed, http://viscious-speed.deviantart.com - CC0
+- Lord Berandas, http://berandas.deviantart.com
+- Irongamer, http://ecesisllc.wix.com/home
+- HeavenlyDog, http://www.gnomosygoblins.blogspot.com
+- Lucas
+- Faithtoken, http://fungustoken.deviantart.com
+- Skoll
+- Andy Meneely, http://www.se.rit.edu/~andy/
+- Cathelineau
+- Kier Heyl
+- Aussiesim
+- Sparker, http://citizenparker.com
+- Zeromancer - CC0
+- Rihlsul
+- Quoting
+- Guard13007, https://guard13007.com
+- DarkZaitzev, http://darkzaitzev.deviantart.com
+- SpencerDub
+- GeneralAce135
+- Zajkonur
+- Catsu
+- Starseeker
+- Pepijn Poolman
+- Pierre Leducq
+- Caro Asercion
+
+More info and icons available at https://game-icons.net

lang/de.json

@@ -1810,8 +1810,8 @@
         "tokenhotbarLayout": "Tokenhotbar Layout",
         "tokenhotbarLayoutHint": "Layout und Ausklappausrichtung der Tokenhotbar",
         "tokenhotbarLayout0": "Horizontal, nach oben",
-        "tokenhotbarLayout1": "Horizontal, nach unten",
-        "tokenhotbarLayout2": "Vertikal, nach links",
+        "tokenhotbarLayout1": "Vertikal, nach links",
+        "tokenhotbarLayout2": "Horizontal, nach unten",
         "tokenhotbarLayout3": "Vertikal, nach rechts",
         "resetTokenbar": "Reset Tokenhotbar",
         "resetTokenbarHint": "Stelle die Position der Tokenhotbar auf den Ursprungswert",

lang/en.json

@@ -1743,8 +1743,8 @@
         "tokenhotbarLayout": "Tokenhotbar Layout",
         "tokenhotbarLayoutHint": "Layout and direction of the token hotbar",
         "tokenhotbarLayout0": "Horizontal, upwards",
-        "tokenhotbarLayout1": "Horizontal, downwards",
-        "tokenhotbarLayout2": "Vertical, left",
+        "tokenhotbarLayout1": "Vertical, left",
+        "tokenhotbarLayout2": "Horizontal, downwards",
         "tokenhotbarLayout3": "Vertical, right",
         "resetTokenbar": "Reset token hotbar",
         "resetTokenbarHint": "Reset the position of the token hotbar",

modules/actor/actor-dsa5.js

@@ -2731,43 +2731,44 @@ export default class Actordsa5 extends Actor {
 
   _checkMaximumItemAdvancement(item, newValue) {
     let max = 0
+    const maxBonus = AdvantageRulesDSA5.vantageStep(this, `${game.i18n.localize(`LocalizedIDs.${item.type == "combatskill" ? "exceptionalCombatTechnique" : "exceptionalSkill"}`)} (${item.name})`)
     switch (item.type) {
         case "combatskill":
-            max = Math.max(...(item.system.guidevalue.value.split("/").map(x => this.system.characteristics[x].value))) + 2 + AdvantageRulesDSA5.vantageStep(this, `${game.i18n.localize('LocalizedIDs.exceptionalCombatTechnique')} (${item.name})`)
+            max = Math.max(...(item.system.guidevalue.value.split("/").map(x => this.system.characteristics[x].value))) + 2 + maxBonus
             break
         case "spell":
         case "ritual":
             let focusValue = 0
             for (const feature of item.system.feature.replace(/\(a-z äöü\-\)/gi, "").split(",").map(x => x.trim())) {
                 if (SpecialabilityRulesDSA5.hasAbility(this, `${game.i18n.localize('LocalizedIDs.propertyKnowledge')} (${feature})`)) {
-                    focusValue = this.maxByAttr(item)
+                    focusValue = this.maxByAttr(item, maxBonus)
                     break
                 }
             }
-            max = Math.max(14 + AdvantageRulesDSA5.vantageStep(this, `${game.i18n.localize('LocalizedIDs.exceptionalSkill')} (${item.name})`), focusValue)
+            max = Math.max(14 + maxBonus, focusValue)
             break
         case "liturgy":
         case "ceremony":
             const aspect = new RegExp(`^${game.i18n.localize("LocalizedIDs.aspectKnowledge")}`)
             let aspectValue = 0
             if (this.items.filter(x => x.type == "specialability" && aspect.test(x.name)).some(x => item.system.distribution.value.includes(x.name.split("(")[1].split(")")[0]))) {
-                aspectValue = this.maxByAttr(item)
+                aspectValue = this.maxByAttr(item, maxBonus)
             }
-            max = Math.max(14 + AdvantageRulesDSA5.vantageStep(this, `${game.i18n.localize('LocalizedIDs.exceptionalSkill')} (${item.name})`), aspectValue)
+            max = Math.max(14 + maxBonus, aspectValue)
             break
         case "skill":
-            max = this.maxByAttr(item)
+            max = this.maxByAttr(item, maxBonus)
             break
     }
     const result = newValue <= max
     if (!result)
         ui.notifications.error(game.i18n.localize("DSAError.AdvanceMaximumReached"))
 
-    return { result, max }
+    return { result, max, maxBonus }
   }
 
-  maxByAttr(item) {
-    return Math.max(...[this.system.characteristics[item.system.characteristic1.value].value, this.system.characteristics[item.system.characteristic2.value].value, this.system.characteristics[item.system.characteristic3.value].value]) + 2 + AdvantageRulesDSA5.vantageStep(this, `${game.i18n.localize('LocalizedIDs.exceptionalSkill')} (${item.name})`)
+  maxByAttr(item, advantageBonus) {
+    return Math.max(...[this.system.characteristics[item.system.characteristic1.value].value, this.system.characteristics[item.system.characteristic2.value].value, this.system.characteristics[item.system.characteristic3.value].value]) + 2 + advantageBonus
   }
 
   async basicTest({ testData, cardOptions }, options = {}) {

modules/actor/actor-sheet.js

@@ -130,7 +130,10 @@ export default class ActorSheetDsa5 extends ActorSheet {
         sheetData["sizeCategories"] = DSA5.sizeCategories
         sheetData.isGM = game.user.isGM;
         sheetData["initDies"] = { "": "-", "1d6": "1d6", "2d6": "2d6", "3d6": "3d6", "4d6": "4d6" }
-        sheetData.horseSpeeds = Object.keys(Riding.speedKeys)
+        sheetData.horseSpeeds = Object.keys(Riding.speedKeys).reduce((acc, key) => { 
+            acc[key] = game.i18n.localize(`RIDING.speeds.${key}`)
+            return acc
+        }, {})
         DSA5StatusEffects.prepareActiveEffects(this.actor, sheetData)
         sheetData.enrichedOwnerdescription = await TextEditor.enrichHTML(getProperty(this.actor.system, "details.notes.ownerdescription"), {secrets: this.object.isOwner, async: true})
         sheetData.enrichedGmdescription = await TextEditor.enrichHTML(getProperty(this.actor.system, "details.notes.gmdescription"), {secrets: this.object.isOwner, async: true})

modules/hooks/actor.js

@@ -300,10 +300,15 @@ export default function() {
     }
 
     Hooks.on("updateToken", (token, data, options) => {
-        Riding.updateTokenHook(token, data, options);      
+        if ( !token.rendered ) return;
+        
+        Riding.updateTokenHook(token, data, options); 
 
-        (token.object.animationContexts.entries().next().value[1].promise || Promise.resolve()).then(() => {
-           token.object.drawAuras();
+        const animationName = options.animation?.name || token.object.animationName;
+        const animationPromise = token.object.animationContexts.get(animationName)?.promise;
+
+        (animationPromise || Promise.resolve()).then(() => {
+            token.object?.drawAuras();
         })
     })
 
@@ -318,7 +323,7 @@ export default function() {
 
     Hooks.on("canvasReady", canvas =>  {
         for(let token of canvas.scene.tokens){
-            token.object.drawAuras();
+            token.object?.drawAuras();
         }  
     })
 
@@ -355,7 +360,7 @@ export default function() {
         obfuscateName(token, {})
         randomWeaponSelection(token)
         Riding.createTokenHook(token, options, id)
-        token.object.drawAuras();
+        token.object?.drawAuras();
     })
 
     Hooks.on('hoverToken', (token, hovered) => {

modules/hooks/configuration.js

@@ -316,8 +316,8 @@ export function setupConfiguration() {
         type: Number,
         choices: {
             0: game.i18n.localize('DSASETTINGS.tokenhotbarLayout0'),
-            2: game.i18n.localize('DSASETTINGS.tokenhotbarLayout1'),
-            1: game.i18n.localize('DSASETTINGS.tokenhotbarLayout2'),
+            1: game.i18n.localize('DSASETTINGS.tokenhotbarLayout1'),
+            2: game.i18n.localize('DSASETTINGS.tokenhotbarLayout2'),
             3: game.i18n.localize('DSASETTINGS.tokenhotbarLayout3')
         },
         onChange: async(val) => {
@@ -875,7 +875,8 @@ class ConfigureTokenHotbar extends FormApplication {
             tokenhotbaropacity: game.settings.get("dsa5", "tokenhotbaropacity"),
             hotbarv3: game.settings.get("dsa5", "hotbarv3"),
             isGM: game.user.isGM,
-            gmButtons: game.dsa5.apps.tokenHotbar?.gmItems
+            gmButtons: game.dsa5.apps.tokenHotbar?.gmItems,
+            layoutChoices: game.settings.settings.get("dsa5.tokenhotbarLayout").choices 
         })
         return data
     }

modules/hooks/tokenHUD.js

@@ -1,6 +1,6 @@
 import Riding from "../system/riding.js";
 import { TokenHoverHud } from "./actor.js";
-const { deepClone, getProperty } = foundry.utils
+const { getProperty } = foundry.utils
 
 function addThirdBarToHUD(html, actor, app) {
     if (actor.system.isPriest && actor.system.isMage) {
@@ -76,13 +76,14 @@ async function splitSwarm(actor, token) {
                 label: game.i18n.localize("ok"),
                 callback: async(dialog) => {
                     const split = Number(dialog.find('input[type="range"]').val())
-                    const newtoken = deepClone(token)
+                    const newtokenData = token.toObject()
+                    delete newtokenData._id
 
                     const newHp = Math.floor(actor.system.status.wounds.value / actor.system.swarm.count * split)
                     const oldHp = actor.system.status.wounds.value - newHp
 
                     await actor.update({ "system.swarm.count": actor.system.swarm.count - split, "system.status.wounds.value": oldHp }, {skipSwarmUpdate: true})
-                    await canvas.scene.createEmbeddedDocuments("Token", [newtoken])
+                    const newtoken = (await canvas.scene.createEmbeddedDocuments("Token", [newtokenData]))[0]
                     await newtoken.actor.update({ "system.swarm.count": split, "system.status.wounds.value": newHp}, {skipSwarmUpdate: true})
                     const axis = ["x", "y"][Math.floor(Math.random() * 2)]
                     const dir = Math.random() > 0.5 ? 1 : -1

modules/item/item-dsa5.js

@@ -274,11 +274,10 @@ export default class Itemdsa5 extends Item {
                     /=\d+/.test(vals[0]) ||
                     /\*\d(\.\d)*/.test(vals[0])
                 ) {
-                    if (itemModifiers[vals[1].toLowerCase()] == undefined) {
-                        itemModifiers[vals[1].toLowerCase()] = [vals[0]]
-                    } else {
-                        itemModifiers[vals[1].toLowerCase()].push(vals[0])
-                    }
+                    const key = vals[1].toLowerCase()
+                    if (itemModifiers[key] == undefined) itemModifiers[key] = []
+                        
+                    itemModifiers[key].push(vals[0])
                 }
             }
         }
@@ -525,14 +524,19 @@ export default class Itemdsa5 extends Item {
             mountedOptions = duplicate(DSA5.mountedRangeOptions)
         }
 
+        let finalMountedOptions = {}
+        for(let key of Object.keys(mountedOptions)){
+            finalMountedOptions[`${game.i18n.localize('mountedRangeOptions.' + key)} (${mountedOptions[key]})`] = mountedOptions[key]
+        }
+
         this.swarmModifiers(actor, "attack", situationalModifiers)
 
         mergeObject(data, {
             rangeOptions,
             rangeDistance: Object.keys(rangeOptions)[DPS.distanceModifier(game.canvas.tokens.get(tokenId), source, currentAmmo)],
             sizeOptions: DSA5.rangeSizeCategories,
             visionOptions: DSA5.rangeVision,
-            mountedOptions,
+            mountedOptions: finalMountedOptions, 
             shooterMovementOptions: DSA5.shooterMovementOptions,
             targetMovementOptions: DSA5.targetMomevementOptions,
             targetSize,