Merge pull request #1544 from Miskatonic-Investigative-Society/develop

0.10.14

.github/CHANGELOG.md

@@ -9,6 +9,14 @@ Happy gaming !
 
 When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.
 
+## Version 0.10.14
+
+When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.
+
+- Fix calculated base values in Investigator Wizard in FoundryVTT v12
+- Fix link creation on FoundryVTT v12
+- Update to German localization, thanks to @MrViso #1539
+
 ## Version 0.10.13
 
 When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.

.github/TRANSLATIONS.md

@@ -2,6 +2,8 @@
 
 Thank you for being interested in making Call of Cthulhu 7th Edition for Foundry VTT better! Below is a list of translations keys on existing files that still need translated, based on `en.json`. Feel free to create a new `*.json` file for a language that is not shown here!
 
+The **de** translation is currently up to date
+
 The following translations have more than 50 untranslated strings [are you able to help?](./ABANDONED.md)
 
 [cn.json (419 untranslated strings)](./ABANDONED.md#cnjson)
@@ -18,57 +20,57 @@ The following translations have more than 50 untranslated strings [are you able
 
 
 
-|Key|de|es|fr|it|ja|pl|uk|zh-TW|
-|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-|**Remaining**:|**10**|**37**|**10**|**2**|**18**|**36**|**36**|**48**|
-|[CoC7.EraRegency](#coc7eraregency)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.EraRegencyPulp](#coc7eraregencypulp)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.EraReignOfTerror](#coc7erareignofterror)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.ErrorCombinedRollsRequireSingleActor](#coc7errorcombinedrollsrequiresingleactor)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[CoC7.ErrorNoActorPermission](#coc7errornoactorpermission)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[CoC7.ErrorOpposedRollsLimitedToTwoActors](#coc7erroropposedrollslimitedtotwoactors)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[CoC7.ErrorRollAlreadyCompleted](#coc7errorrollalreadycompleted)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[CoC7.ErrorTokenIncorrect](#coc7errortokenincorrect)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.Inactive](#coc7inactive)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.InfoSkillAddedAtBase](#coc7infoskilladdedatbase)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.LinkCheckDiffModifPushing](#coc7linkcheckdiffmodifpushing)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.LinkCheckDiffPushing](#coc7linkcheckdiffpushing)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.LinkCheckModifPushing](#coc7linkcheckmodifpushing)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.LinkCheckPushing](#coc7linkcheckpushing)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.MonetaryDefaultAristocracy](#coc7monetarydefaultaristocracy)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.MonetaryDefaultDestitute](#coc7monetarydefaultdestitute)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.MonetaryDefaultEstablished](#coc7monetarydefaultestablished)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.MonetaryDefaultGentry](#coc7monetarydefaultgentry)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.MonetaryDefaultLower](#coc7monetarydefaultlower)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.MonetaryDefaultMiddle](#coc7monetarydefaultmiddle)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.MonetaryDefaultProfessional](#coc7monetarydefaultprofessional)|❌|❌|❌|✅|❌|❌|❌|❌|
-|[CoC7.Passive](#coc7passive)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.PersonalSpecialityPlaceholder](#coc7personalspecialityplaceholder)|✅|❌|✅|✅|❌|✅|✅|❌|
-|[CoC7.PickWhichActorDesc](#coc7pickwhichactordesc)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[CoC7.PickWhichActorTitle](#coc7pickwhichactortitle)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[CoC7.RangedSpecializationName](#coc7rangedspecializationname)|❌|❌|❌|❌|❌|❌|❌|❌|
-|[CoC7.RealRollDecaderPlaceholderName](#coc7realrolldecaderplaceholdername)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.SanityLossType](#coc7sanitylosstype)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.SkillRanged](#coc7skillranged)|❌|❌|❌|❌|❌|❌|❌|❌|
-|[CoC7.Suppressed](#coc7suppressed)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.System.Documentation](#coc7systemdocumentation)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.Temporary](#coc7temporary)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.TokenCreationRoll.Averaged](#coc7tokencreationrollaveraged)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.TokenCreationRoll.ButtonAverage](#coc7tokencreationrollbuttonaverage)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.TokenCreationRoll.ButtonRoll](#coc7tokencreationrollbuttonroll)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.TokenCreationRoll.Prompt](#coc7tokencreationrollprompt)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.TokenCreationRoll.Rolled](#coc7tokencreationrollrolled)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.TokenCreationRoll.Title](#coc7tokencreationrolltitle)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[CoC7.Unavailable](#coc7unavailable)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[CoC7.WaitingOnUser](#coc7waitingonuser)|✅|❌|✅|✅|❌|❌|❌|❌|
-|[SETTINGS.SceneDistanceNotCalcualtedNoError](#settingsscenedistancenotcalcualtednoerror)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[SETTINGS.SceneDistanceNotCalcualtedNoErrorHint](#settingsscenedistancenotcalcualtednoerrorhint)|✅|✅|✅|✅|✅|✅|✅|❌|
-|[SETTINGS.TokenDropMode](#settingstokendropmode)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[SETTINGS.TokenDropModeAsk](#settingstokendropmodeask)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[SETTINGS.TokenDropModeAverage](#settingstokendropmodeaverage)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[SETTINGS.TokenDropModeHint](#settingstokendropmodehint)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[SETTINGS.TokenDropModeIgnore](#settingstokendropmodeignore)|✅|❌|✅|✅|✅|❌|❌|❌|
-|[SETTINGS.TokenDropModeRoll](#settingstokendropmoderoll)|✅|❌|✅|✅|✅|❌|❌|❌|
+|Key|es|fr|it|ja|pl|uk|zh-TW|
+|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+|**Remaining**:|**37**|**10**|**2**|**18**|**36**|**36**|**48**|
+|[CoC7.EraRegency](#coc7eraregency)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.EraRegencyPulp](#coc7eraregencypulp)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.EraReignOfTerror](#coc7erareignofterror)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.ErrorCombinedRollsRequireSingleActor](#coc7errorcombinedrollsrequiresingleactor)|❌|✅|✅|❌|❌|❌|❌|
+|[CoC7.ErrorNoActorPermission](#coc7errornoactorpermission)|❌|✅|✅|❌|❌|❌|❌|
+|[CoC7.ErrorOpposedRollsLimitedToTwoActors](#coc7erroropposedrollslimitedtotwoactors)|❌|✅|✅|❌|❌|❌|❌|
+|[CoC7.ErrorRollAlreadyCompleted](#coc7errorrollalreadycompleted)|❌|✅|✅|❌|❌|❌|❌|
+|[CoC7.ErrorTokenIncorrect](#coc7errortokenincorrect)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.Inactive](#coc7inactive)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.InfoSkillAddedAtBase](#coc7infoskilladdedatbase)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.LinkCheckDiffModifPushing](#coc7linkcheckdiffmodifpushing)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.LinkCheckDiffPushing](#coc7linkcheckdiffpushing)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.LinkCheckModifPushing](#coc7linkcheckmodifpushing)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.LinkCheckPushing](#coc7linkcheckpushing)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.MonetaryDefaultAristocracy](#coc7monetarydefaultaristocracy)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.MonetaryDefaultDestitute](#coc7monetarydefaultdestitute)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.MonetaryDefaultEstablished](#coc7monetarydefaultestablished)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.MonetaryDefaultGentry](#coc7monetarydefaultgentry)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.MonetaryDefaultLower](#coc7monetarydefaultlower)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.MonetaryDefaultMiddle](#coc7monetarydefaultmiddle)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.MonetaryDefaultProfessional](#coc7monetarydefaultprofessional)|❌|❌|✅|❌|❌|❌|❌|
+|[CoC7.Passive](#coc7passive)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.PersonalSpecialityPlaceholder](#coc7personalspecialityplaceholder)|❌|✅|✅|❌|✅|✅|❌|
+|[CoC7.PickWhichActorDesc](#coc7pickwhichactordesc)|❌|✅|✅|❌|❌|❌|❌|
+|[CoC7.PickWhichActorTitle](#coc7pickwhichactortitle)|❌|✅|✅|❌|❌|❌|❌|
+|[CoC7.RangedSpecializationName](#coc7rangedspecializationname)|❌|❌|❌|❌|❌|❌|❌|
+|[CoC7.RealRollDecaderPlaceholderName](#coc7realrolldecaderplaceholdername)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.SanityLossType](#coc7sanitylosstype)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.SkillRanged](#coc7skillranged)|❌|❌|❌|❌|❌|❌|❌|
+|[CoC7.Suppressed](#coc7suppressed)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.System.Documentation](#coc7systemdocumentation)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.Temporary](#coc7temporary)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.TokenCreationRoll.Averaged](#coc7tokencreationrollaveraged)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.TokenCreationRoll.ButtonAverage](#coc7tokencreationrollbuttonaverage)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.TokenCreationRoll.ButtonRoll](#coc7tokencreationrollbuttonroll)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.TokenCreationRoll.Prompt](#coc7tokencreationrollprompt)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.TokenCreationRoll.Rolled](#coc7tokencreationrollrolled)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.TokenCreationRoll.Title](#coc7tokencreationrolltitle)|✅|✅|✅|✅|✅|✅|❌|
+|[CoC7.Unavailable](#coc7unavailable)|❌|✅|✅|✅|❌|❌|❌|
+|[CoC7.WaitingOnUser](#coc7waitingonuser)|❌|✅|✅|❌|❌|❌|❌|
+|[SETTINGS.SceneDistanceNotCalcualtedNoError](#settingsscenedistancenotcalcualtednoerror)|✅|✅|✅|✅|✅|✅|❌|
+|[SETTINGS.SceneDistanceNotCalcualtedNoErrorHint](#settingsscenedistancenotcalcualtednoerrorhint)|✅|✅|✅|✅|✅|✅|❌|
+|[SETTINGS.TokenDropMode](#settingstokendropmode)|❌|✅|✅|✅|❌|❌|❌|
+|[SETTINGS.TokenDropModeAsk](#settingstokendropmodeask)|❌|✅|✅|✅|❌|❌|❌|
+|[SETTINGS.TokenDropModeAverage](#settingstokendropmodeaverage)|❌|✅|✅|✅|❌|❌|❌|
+|[SETTINGS.TokenDropModeHint](#settingstokendropmodehint)|❌|✅|✅|✅|❌|❌|❌|
+|[SETTINGS.TokenDropModeIgnore](#settingstokendropmodeignore)|❌|✅|✅|✅|❌|❌|❌|
+|[SETTINGS.TokenDropModeRoll](#settingstokendropmoderoll)|❌|✅|✅|✅|❌|❌|❌|
 ##### CoC7.EraRegency
 ```  "CoC7.EraRegency": "Regency Cthulhu - Standard",```
 ##### CoC7.EraRegencyPulp

lang/de.json

@@ -375,6 +375,7 @@
   "CoC7.EraModernPulp": "Modern - Pulp",
   "CoC7.EraRegency": "Regency Cthulhu",
   "CoC7.EraRegencyPulp": "Regency Cthulhu - Pulp",
+  "CoC7.EraReignOfTerror": "Schreckensherrschaft",
   "CoC7.Eras": "Cthulhu Ären",
   "CoC7.EraAvailability": "Verfügbarkeit",
 
@@ -387,7 +388,8 @@
   "CoC7.SkillPush": "Forciert",
   "CoC7.SkillCombat": "Kampf",
   "CoC7.SkillFighting": "Nahkampf",
-  "CoC7.SkillFirearm": "Fernkampf",
+  "CoC7.SkillFirearm": "Feuerwaffen",
+  "CoC7.SkillRanged": "Fernkampf",
   "CoC7.SkillRequiresName": "Benötigt Name",
   "CoC7.SkillKeepBaseValue": "Grundwert behalten",
   "CoC7.SkillPickNameOnly": "Spezialisierung wählen",
@@ -427,7 +429,8 @@
 
   "CoC7.FightingSpecializationName": "Nahkampf",
   "CoC7.UnarmedWeaponName": "Handgemenge",
-  "CoC7.FirearmSpecializationName": "Fernkampf",
+  "CoC7.FirearmSpecializationName": "Feuerwaffen",
+  "CoC7.RangedSpecializationName": "Fernkampf",
   "CoC7.DriveSpecializationName": "Fahren",
   "CoC7.PilotSpecializationName": "Steuern",
   "CoC7.AnySpecName": "Eine",
@@ -546,11 +549,18 @@
   "CoC7.MonetaryFormatLsd": "£sd",
   "CoC7.MonetaryFormatRoman": "Roman",
   "CoC7.MonetaryDefaultPenniless": "Bettelarm",
+  "CoC7.MonetaryDefaultDestitute": "Mittellos",
   "CoC7.MonetaryDefaultPoor": "Arm",
   "CoC7.MonetaryDefaultAverage": "Normal",
+  "CoC7.MonetaryDefaultLower": "Unterschicht",
+  "CoC7.MonetaryDefaultMiddle": "Aufstrebende Mittelschicht / Berufseinsteiger",
   "CoC7.MonetaryDefaultWealthy": "Wohlhabend",
+  "CoC7.MonetaryDefaultEstablished": "Armer Adel / Etablierte Berufstätige",
+  "CoC7.MonetaryDefaultProfessional": "Durchschnittlicher Adel / Wohlhabende Berufstätige",
+  "CoC7.MonetaryDefaultGentry": "Wohlhabender Adel",
   "CoC7.MonetaryDefaultRich": "Reich",
   "CoC7.MonetaryDefaultSuperRich": "Schwerreich",
+  "CoC7.MonetaryDefaultAristocracy": "Aristokrat",
 
   "CoC7.PossessionsNotes": "Notizen:",
   "CoC7.PossessionsNotesHolder": "Notizen",

module/actors/actor.js

@@ -1644,9 +1644,9 @@ export class CoCActor extends Actor {
 
   static getCharacteristicDefinition () {
     const characteristics = []
-    for (const [key, value] of Object.entries(
-      game.system.template.Actor.templates.characteristics.characteristics
-    )) {
+    // FoundryVTT v11
+    const characteristicList = (!foundry.utils.isNewerVersion(game.version, '12') ? game.system.template.Actor.templates.characteristics.characteristics : game.system.template.Actor.character.characteristics)
+    for (const [key, value] of Object.entries(characteristicList)) {
       characteristics.push({
         key,
         shortName: game.i18n.localize(value.short),

module/apps/investigator-wizard.js

@@ -1,4 +1,5 @@
 /* global $, Actor, ChatMessage, CONST, FormApplication, foundry, game, Hooks, renderTemplate, Roll, TextEditor, ui */
+import { AverageRoll } from '../apps/average-roll.js'
 import { COC7 } from '../config.js'
 import { CoCActor } from '../actors/actor.js'
 import { CoC7OccupationSheet } from '../items/sheets/occupation.js'
@@ -810,7 +811,7 @@ export class CoC7InvestigatorWizard extends FormApplication {
                   }
                 }
                 if (!Number.isNumeric(base)) {
-                  base = Math.floor(new Roll(base).evaluate({ async: false }).total)
+                  base = Math.floor(new AverageRoll('(' + base + ')')[(!foundry.utils.isNewerVersion(game.version, '12') ? 'evaluate' : 'evaluateSync')/* // FoundryVTT v11 */]({ minimize: true, maximize: true }).total)
                 }
                 let totalPoints = parseInt(base, 10)
                 if (Number(row.personalPoints) > 0) {
@@ -1665,7 +1666,7 @@ export class CoC7InvestigatorWizard extends FormApplication {
             }
           }
           if (!Number.isNumeric(base)) {
-            base = Math.floor(new Roll(base).evaluate({ async: false }).total)
+            base = Math.floor(new AverageRoll('(' + base + ')')[(!foundry.utils.isNewerVersion(game.version, '12') ? 'evaluate' : 'evaluateSync')/* // FoundryVTT v11 */]({ minimize: true, maximize: true }).total)
           }
           item.system.base = base
           item.system.adjustments = item.system.adjustments ?? {}

module/utilities.js

@@ -201,9 +201,8 @@ export class CoC7Utilities {
           label: game.i18n.localize('CoC7.Luck')
         }
       default: {
-        for (const [, value] of Object.entries(
-          game.system.template.Actor.templates.characteristics.characteristics
-        )) {
+        const characteristicList = (!foundry.utils.isNewerVersion(game.version, '12') ? game.system.template.Actor.templates.characteristics.characteristics : game.system.template.Actor.character.characteristics)
+        for (const [, value] of Object.entries(characteristicList)) {
           if (charKey === game.i18n.localize(value.short).toLowerCase()) {
             return {
               short: game.i18n.localize(value.short),

system.json

@@ -2,7 +2,7 @@
   "id": "CoC7",
   "title": "Call of Cthulhu 7th Edition",
   "description": "An implementation of the Call of Cthulhu 7th Edition game system for Foundry Virtual Tabletop.",
-  "version": "0.10.13",
+  "version": "0.10.14",
   "authors": [
     {
       "name": "Miskatonic Investigative Society"
@@ -151,5 +151,5 @@
   "secondaryTokenAttribute": "attribs.san",
   "url": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT",
   "manifest": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/latest/download/system.json",
-  "download": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/download/0.10.13/system.zip"
+  "download": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/download/0.10.14/system.zip"
 }