Merge pull request #2038 from crnormand/bugfix/v0.17.15

Bugfix/v0.17.15
crnormand · Nov 27, 2024 · 6f8b428 · 6f8b428
2 parents 7fb7fe6 + 79d0ace
commit 6f8b428
Show file tree

Hide file tree

Showing 34 changed files with 513 additions and 1,207 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,7 +2,15 @@
 
 Release 0.17.16
 
-- Feature: Multiple actor import. Import multiple GCS and GCA files with one command.
+- Feature: Multiple actor import. Import multiple GCS and GCA files with one command. #1994
+- Bugfix: Errors occurring when users drop damage onto mooks/NPCs #2024
+- Bugfix: Larger Fonts Hides "skills" in tabbed view till window is pulled open further #2015
+- Bugfix: Attack mixup if weapon name differs only in a postfix #2025
+- Bugfix: Damage dropping not working as intended #2007
+- Bugfix: Duplicating the specialization name to other skills #2035
+- Feature: Remove the homebrew rules from the modifier bucket, and add MA maneuvers to the bucket. #2023
+- Bugfix: Slam calculator appears not to be working #2022
+- Bugfix: Importing a Character Causes Endless Error Loop #2019
 
 Release 0.17.15 10/31/2024
 

diff --git a/lang/de.json b/lang/de.json
@@ -1,19 +1,32 @@
 {
   "__NOTE TO TRANSLATOR__": "If a given text is the same as the English (en.json), there is no need to include it here. It will fallback to en.json.",
-  "GURPS.changelog": "LIESMICH",
-  "GURPS.DontShowAgain": "Zeige LIESMICH nicht noch einmal",
+  "gurps": {
+    "changelog": {
+      "readme": "LIESMICH",
+      "dontShowAgain": "Zeige LIESMICH nicht noch einmal"
+    },
+    "sheet": {
+      "personal": {
+        "tab": "Persönlich",
+        "portrait": "Portrait",
+        "identity": "Identität",
+        "name": "Name",
+        "player": "Spieler",
+        "title": "Titel",
+        "miscellaneous": "Sonstiges",
+        "created": "Erstellt",
+        "modified": "Modifiziert",
+        "options": "Optionen"
+      }
+    },
+    "modifiers": {
+      "determinedAttack": "Entschlossener Angriff"
+    }
+  },
   "__Char Sheet__": "=========",
-  "GURPS.personalTab": "Persönlich",
   "GURPS.resourcesModsTab": "Ressourcen und Modifikatoren",
   "__Character Sheet Identity__": "=========",
-  "GURPS.identity": "Identität",
-  "GURPS.identityPlayer": "Spieler",
-  "GURPS.identityTitle": "Titel",
   "__Character Sheet Miscellaneous__": "=========",
-  "GURPS.miscellaneous": "Sonstiges",
-  "GURPS.miscellaneousCreated": "Erstellt",
-  "GURPS.miscellaneousModified": "Modifiziert",
-  "GURPS.miscellaneousOptions": "Optionen",
   "__Character Description__": "=========",
   "GURPS.description": "Beschreibung",
   "GURPS.descriptionAge": "Alter",
@@ -455,7 +468,7 @@
   "GURPS.modifierQuality": "Ausrüstungs Qualität",
   "GURPS.modifierQualityBest": "Best Mögliche",
   "GURPS.modifierQualityFine": "Ausgezeichnete Qualität (Kosten ×20)",
-  "GURPS.modifierQualityGood": "Gute Qualität (Kosten ×5",
+  "GURPS.modifierQualityGood": "Gute Qualität (Kosten ×5)",
   "GURPS.modifierQualityImprovised": "Improvisiert",
   "GURPS.modifierQualityImprovTech": "Improvisiert (technologisch)",
   "GURPS.modifierQualityMissing": "Fehlende/Beschädigte Ausrüstung",
@@ -944,4 +957,4 @@
   "GURPS.effectModNoTokenSelected": "Kein Token ausgewählt",
   "GURPS.settingActiveEffects": "Aktive Effekte einschalten",
   "GURPS.settingHintActiveEffects": "Erlaubt der SL, Aktive Effekte zu erstellen und anzuwenden"
-}
+}
diff --git a/lang/en.json b/lang/en.json
@@ -1,23 +1,143 @@
 {
-  "GURPS.title": "GURPS",
-  "GURPS.changelog": "README",
-  "GURPS.DontShowAgain": "Don't show README again",
-  "GURPS.copyrightGURPS": "GURPS is a trademark of Steve Jackson Games, and its rules and art are copyrighted by Steve Jackson Games. All rights are reserved by Steve Jackson Games. This game aid is the original creation of Chris Normand/Nose66 and is released for free distribution, and not for resale, under the permissions granted by http://www.sjgames.com/general/online_policy.html",
-  "GURPS.copyrightGCS": "GCS is copyrighted 1998-2020 by Richard A. Wilkes. All rights reserved ",
+  "gurps": {
+    "copyright": "GURPS is a trademark of Steve Jackson Games, and its rules and art are copyrighted by Steve Jackson Games. All rights are reserved by Steve Jackson Games. This game aid is the original creation of Chris Normand/Nose66 and is released for free distribution, and not for resale, under the permissions granted by http://www.sjgames.com/general/online_policy.html",
+    "changelog": {
+      "readme": "README",
+      "title": "GURPS",
+      "dontShowAgain": "Don't show README again"
+    },
+    "sheet": {
+      "personal": {
+        "tab": "Personal",
+        "portrait": "Portrait",
+        "identity": "Identity",
+        "name": "Name",
+        "player": "Player",
+        "title": "Title",
+        "miscellaneous": "Miscellaneous",
+        "created": "Created",
+        "modified": "Modified",
+        "options": "Options"
+      },
+      "gcs": {
+        "copyright": "GCS is copyrighted 1998-2024 by Richard A. Wilkes. All rights reserved."
+      }
+    },
+    "modifiers": {
+      "aim": "to hit (Aim)",
+      "allOutAim": "to Aiming (All-Out Aim)",
+      "allOutAimBraced": "to Aiming (All-Out Aim: Braced)",
+      "aoaDetermined": "to hit (AoA: Determined)",
+      "aoaRanged": "to hit (AoA: Ranged)",
+      "aoaRangedDetermined": "to hit (AoA: Determined)",
+      "aoaStrong": "damage (AoA: Strong)",
+      "aodIncreased": "to defense (AoD: Increased)",
+      "blockRetreat": "to Block/Parry (Retreat)",
+      "committedAim": "to Aiming (Committed Aim)",
+      "committedAimBraced": "to Aiming (Committed Aim: Braced)",
+      "committedAimDefense": "to defense (Committed Aim)",
+      "committedAttackRanged": "to hit (Committed Attack (Ranged))",
+      "committedDetermined": "to hit (Committed: Determined)",
+      "committedRanged": "to hit (Committed: Ranged)",
+      "committedStrong": "damage (Committed: Strong)",
+      "deceptive": "to hit (Deceptive Attack)",
+      "deceptiveDefense": "to defense (Deceptive Attack)",
+      "defenseSide": "to defense (attacked from side)",
+      "defensive": "damage (Defensive Attack)",
+      "defensiveDefense": "to Parry/Block (Defensive)",
+      "dodgeAcrobatic": "to Dodge (Acrobatic, success)",
+      "dodgeAcrobaticFail": "to Dodge (Acrobatic, fail)",
+      "dodgeAndDrop": "to Dodge (Dodge and Drop)",
+      "dodgeRetreat": "to Dodge (Retreat)",
+      "extraEffort": "Extra Effort",
+      "fencingRetreat": "to Parry (Fencing, etc. Retreat)",
+      "feverishDefense": "to defense (Feverish)",
+      "heroicCharge": "Heroic Charge",
+      "mightyBlow": "damage (Mighty Blow)",
+      "moveAndAttack": "to hit (Move and Attack)",
+      "onTargetAiming": "On Target",
+      "popup": "to hit (Popup Attack)",
+      "rapidStrike": "to hit (Rapid Strike)",
+      "riposte": "to attack or defense (Riposte)",
+      "shieldDB": "to defense (Shield DB)",
+      "telegraphic": "to hit (Telegraphic Attack)",
+      "pdf": {
+        "aim": "B364",
+        "allOutAim": "PY77:25",
+        "allOutAimBraced": "PY77:25",
+        "aoaDetermined": "B365",
+        "aoaRanged": "PY77:26",
+        "aoaRangedDetermined": "B365",
+        "aoaStrong": "B365",
+        "aodIncreased": "B366",
+        "blockRetreat": "B377",
+        "committedAim": "PY77:25",
+        "committedAimBraced": "PY77:25",
+        "committedAimDefense": "PY77:25",
+        "committedAttackRanged": "PY77:26",
+        "committedDetermined": "MA99",
+        "committedRanged": "PY77:26",
+        "committedStrong": "MA99",
+        "deceptive": "B369",
+        "deceptiveDefense": "B369",
+        "defenseSide": "B390",
+        "defensive": "MA100",
+        "defensiveDefense": "MA100",
+        "dodgeAcrobatic": "B374",
+        "dodgeAcrobaticFail": "B374",
+        "dodgeAndDrop": "B377",
+        "dodgeRetreat": "B377",
+        "extraEffort": "B357",
+        "fencingRetreat": "B377",
+        "feverishDefense": "B357",
+        "heroicCharge": "MA131",
+        "mightyBlow": "MA131",
+        "moveAndAttack": "B365",
+        "parryRear": "B390",
+        "popup": "B390",
+        "rapidStrike": "B370",
+        "riposte": "MA124",
+        "shieldDB": "B374",
+        "telegraphic": "MA113"
+      }
+    }
+  },
+  "GURPS.aim": "Aim",
+  "GURPS.aiming": "Aiming",
+  "GURPS.allOutDefense": "All-Out Defense",
+  "GURPS.modifierAimAllOutAim": "to Aiming rolls (All-Out Aim)",
+  "GURPS.modifierAimAllOutAimBraced": "to Aiming rolls if braced (All-Out Aim)",
+  "GURPS.modifierAimCommittedAim": "to Aiming rolls (Committed Aim)",
+  "GURPS.modifierAimCommittedAimBraced": "to Aiming rolls if braced (Committed Aim)",
+  "GURPS.modifierAllOutAttackRanged": "to hit (All-Out Attack (Ranged))",
+  "GURPS.modifierBlockRetreat": "to Block/Parry (retreat)",
+  "GURPS.modifierCommittedAttackRanged": "to hit (Committed Attack (Ranged))",
+  "GURPS.modifierDeceptiveAttack": "to hit (Deceptive Attack)",
+  "GURPS.modifierDefDeceptiveAttack": "to defenses due to Deceptive attack",
+  "GURPS.modifierDefenseCommittedAim": "to defenses due to Committed Aim",
+  "GURPS.modifierDefenseCommittedAttackRanged": "to defenses due to Committed Attack (Ranged)",
+  "GURPS.modifierDeterminedAttack": "to hit (Determined Attack)",
+  "GURPS.modifierDodgeAcrobatic": "to Dodge (Acrobatics, success)",
+  "GURPS.modifierDodgeDive": "to Dodge (dodge and drop)",
+  "GURPS.modifierDodgeFailedAcro": "to Dodge (Acrobatics, failed)",
+  "GURPS.modifierDodgeRear": "to Dodge (attacked from rear)",
+  "GURPS.modifierDodgeRetreat": "to Dodge (retreat)",
+  "GURPS.modifierDodgeSide": "to Dodge (attacked from side)",
+  "GURPS.modifierExtraEffort": "Extra Effort",
+  "GURPS.modifierFeverishDef": "Feverish Defense",
+  "GURPS.modifierHeroicCharge": "Heroic Charge",
+  "GURPS.modifierMaintainConcentration": "to Will Check, to maintain concentration",
+  "GURPS.modifierMightyBlow": "damage (Mighty Blow)",
+  "GURPS.modifierMoveAttack": "to hit (Move and Attack)",
+  "GURPS.modifierShieldDB": "to Dodge (Shield DB)",
+  "GURPS.modifierStrongAttack": "damage (Strong Attack)",
+  "GURPS.modifierTelegraphicAttack": "to hit (Telegraphic Attack)",
+  "GURPS.modifierWillCheck": "WILL check to maintain Aim",
+
   "__Char Sheet__": "=========",
-  "GURPS.portrait": "Portrait",
-  "GURPS.personalTab": "Personal",
   "GURPS.resourcesModsTab": "Resources and Modifiers",
   "__Character Sheet Identity__": "=========",
-  "GURPS.identity": "Identity",
-  "GURPS.identityName": "Name",
-  "GURPS.identityPlayer": "Player",
-  "GURPS.identityTitle": "Title",
   "__Character Sheet Miscellaneous__": "=========",
-  "GURPS.miscellaneous": "Miscellaneous",
-  "GURPS.miscellaneousCreated": "Created",
-  "GURPS.miscellaneousModified": "Modified",
-  "GURPS.miscellaneousOptions": "Options",
   "__Character Description__": "=========",
   "GURPS.description": "Description",
   "GURPS.descriptionAge": "Age",
@@ -446,11 +566,6 @@
   "GURPS.modifierRangeMHExtremeDesc": "Rival difficult to even see; sniper range",
   "GURPS.modifierAddRangeRuler": "Bucket: Add Range Ruler modifier",
   "GURPS.modifierAddRangeRulerHint": "If checked, the system will automatically add the last measured Range modifier to the Modifier Bucket.",
-  "GURPS.modifierAimAllOutAim": "to Aiming rolls (All-Out Aim)",
-  "GURPS.modifierAimAllOutAimBraced": "to Aiming rolls if braced (All-Out Aim)",
-  "GURPS.modifierAimCommittedAim": "to Aiming rolls (Committed Aim)",
-  "GURPS.modifierAimCommittedAimBraced": "to Aiming rolls if braced (Committed Aim)",
-  "GURPS.modifierAllOutAttackRanged": "to hit (All-Out Attack (Ranged))",
   "GURPS.modifierAffliction": "Afflictions",
   "GURPS.modifierAfflictionCough": "-3 to DX checks (Coughing)",
   "GURPS.modifierAfflictionCoughIQ": "-1 to IQ checks (Coughing)",
@@ -473,9 +588,7 @@
   "GURPS.modifierAutomatic": "Automatic",
   "GURPS.modifierBlindAttack": "-10 to hit (Blind)",
   "GURPS.modifierBlindDefend": "-4 to dodge (Blind -- cannot see attacker)",
-  "GURPS.modifierBlockRetreat": "to Block/Parry (retreat)",
   "GURPS.modifierClickToAdd": "Click on modifiers above and to the right to add to your next roll.",
-  "GURPS.modifierCommittedAttackRanged": "to hit (Committed Attack (Ranged))",
   "GURPS.modifierCommon": "Common Modifiers",
   "GURPS.modifierCover": "Cover",
   "GURPS.modifierCoverBehindFigure": "-4 to hit (Behind same-sized figure)",
@@ -492,28 +605,13 @@
   "GURPS.modifierCurrentEffects": "Current Effects",
   "GURPS.modifierCurrentModifiers": "Current Modifiers",
   "GURPS.modifierDangerous": "Dangerous",
-  "GURPS.modifierDeceptiveAttack": "to hit (Deceptive Attack)",
-  "GURPS.modifierDeterminedAttack": "to hit (Determined Attack)",
-  "GURPS.modifierDodgeAcrobatic": "to Dodge (Acrobatics, success)",
-  "GURPS.modifierDodgeDive": "to Dodge (dodge and drop)",
-  "GURPS.modifierDodgeFailedAcro": "to Dodge (Acrobatics, failed)",
-  "GURPS.modifierDodgeRear": "to Dodge (attacked from rear)",
-  "GURPS.modifierDodgeRetreat": "to Dodge (retreat)",
-  "GURPS.modifierDodgeSide": "to Dodge (attacked from side)",
   "GURPS.modifierEasy": "Easy",
-  "GURPS.modifierExtraEffort": "Extra Effort",
   "GURPS.modifierFavorable": "Favorable",
-  "GURPS.modifierFeverishDef": "Feverish Defense",
-  "GURPS.modifierDefDeceptiveAttack": "to defenses due to Deceptive attack",
-  "GURPS.modifierDefenseCommittedAim": "to defenses due to Committed Aim",
-  "GURPS.modifierDefenseCommittedAttackRanged": "to defenses due to Committed Attack (Ranged)",
-  "GURPS.modifierMaintainConcentration": "to Will Check, to maintain concentration",
   "GURPS.modifierGrappling": "-4 to DX and DX-based skills (Grappled)",
   "GURPS.modifierGMBlessed": "GM blessed",
   "GURPS.modifierGMDontTry": "GM don't try it",
   "GURPS.modifierGMSaidSo": "GM said so",
   "GURPS.modifierHard": "Hard",
-  "GURPS.modifierHeroicCharge": "Heroic Charge",
   "GURPS.modifierHitLocation": "Hit Locations (if miss by 1, then *)",
   "GURPS.modifier3d6Image": "Bucket: Change 3d6 Image",
   "GURPS.modifier3d6ImageHint": "Select the image to display in the Modifier Bucket for the 3d6 button.",
@@ -532,8 +630,6 @@
   "GURPS.modifierLightStarlightClouds": "Starlight through clouds",
   "GURPS.modifierLightTwilight": "Twilight / gaslight / flashlight",
   "GURPS.modifierLightDeepTwilight": "Deep twilight / candlelight",
-  "GURPS.modifierMightyBlow": "damage (Mighty Blow)",
-  "GURPS.modifierMoveAttack": "to hit (Move and Attack)",
   "GURPS.modifierOthers": "Other Modifiers",
   "GURPS.modifierPosition": "Bucket: Change Position",
   "GURPS.modifierPositionHint": "Select the position of the Modifier Bucket.",
@@ -567,7 +663,6 @@
   "GURPS.modifierSelectJournalsHint": "Select the Journal entries to display in the Modifier Bucket.",
   "GURPS.modifierSelectJournalsTitle": "Select Modifier Bucket Journals",
   "GURPS.modifierSendTo": "Send Modifier Bucket to:",
-  "GURPS.modifierShieldDB": "to Dodge (Shield DB)",
   "GURPS.modifierShowOnMouseOver": "Bucket: Show on mouse over",
   "GURPS.modifierShowOnMouseOverHint": "If checked, the Modifier window displays like a tooltip: when the mouse hovers over the Modifier Bucket. If this is turned off, you can bring up the Tooltip by Left Clicking on the Modifier Bucket. You must restart Foundry for this setting to take effect.",
   "GURPS.modifierSize": "Size Modifier",
@@ -580,10 +675,8 @@
   "GURPS.modifierStatusShock3": "-3 to IQ/DX checks (Shock 3)",
   "GURPS.modifierStatusShock4": "-4 to IQ/DX checks (Shock 4)",
   "GURPS.modifierStatusStunned": "-4 to active defenses (Stunned)",
-  "GURPS.modifierStrongAttack": "damage (Strong Attack)",
   "GURPS.modifierTabAside": "Use System Settings to define Journal Entries to display here.",
   "GURPS.modifierTaskDifficulty": "Task Difficulty",
-  "GURPS.modifierTelegraphicAttack": "to hit (Telegraphic Attack)",
   "GURPS.modifierToHit": "to hit",
   "GURPS.modifierTrivial": "Trivial",
   "GURPS.modifierUnfavorable": "Unfavorable",
@@ -594,7 +687,6 @@
   "GURPS.modifierVeryUnfavorable": "Very Unfavorable",
   "GURPS.modifierViewScale": "Bucket: Scale Factor",
   "GURPS.modifierViewScaleHint": "Use this to scale up or down the size of the Modifier Bucket.",
-  "GURPS.modifierWillCheck": "WILL check to maintain Aim",
   "__PDF References__": "=========",
   "GURPS.pdfAllOutAim": "PY77:25",
   "GURPS.pdfAllOutAttackRanged": "PY77:26",
@@ -998,8 +1090,6 @@
   "GURPS.sortContentsAscending": "Sort Contents (Ascending)",
   "GURPS.sortContentsDescending": "Sort Contents (Descending)",
   "GURPS.sortDescending": "Sort Descending",
-  "GURPS.actions": "Actions",
-  "GURPS.aiming": "Aiming",
   "GURPS.addAdvantage": "Add an Advantage",
   "GURPS.addMeleeAttack": "Add a Melee Attack",
   "GURPS.addRangedAttack": "Add a Ranged Attack",
@@ -1008,10 +1098,8 @@
   "GURPS.addSpell": "Add a Spell",
   "GURPS.advantage": "Advantage",
   "GURPS.advantages": "Advantages",
-  "GURPS.advantagesTab": "Advantages and Disadvantages",
-  "GURPS.aim": "Aim",
+  "GURPS.advantagesTab": "Traits",
   "GURPS.allDamage": "ALL DAMAGE",
-  "GURPS.allOutDefense": "All-Out Defense",
   "GURPS.allTheDamage": "ALL THE DAMAGE!!",
   "GURPS.applyAllToTarget": "Apply All to {name}",
   "GURPS.basic": "Basic",

diff --git a/lang/fr.json b/lang/fr.json
@@ -1,23 +1,31 @@
 {
-  "GURPS.title": "GURPS",
-  "GURPS.changelog": "LISEZ-MOI",
-  "GURPS.DontShowAgain": "Ne plus montrer le Lisez-moi",
-  "GURPS.copyrightGURPS": "GURPS est une marque déposée de Steve Jackson Games, et ses règles et illustrations sont protégées par leurs droits d'auteur. Tous les droits sont réservés à Steve Jackson Games. Cette aide de jeu est la création originale de Chris Normand/Nose66 et est distribuée gratuitement et non revendable, avec la permission gracieuse de http://www.sjgames.com/general/online_policy.html",
-  "GURPS.copyrightGCS": "GCS is une marque déposée (1998-2020) par Richard A. Wilkes. Tous droits réservés",
+  "gurps": {
+    "copyright": "GURPS est une marque déposée de Steve Jackson Games, et ses règles et illustrations sont protégées par leurs droits d'auteur. Tous les droits sont réservés à Steve Jackson Games. Cette aide de jeu est la création originale de Chris Normand/Nose66 et est distribuée gratuitement et non revendable, avec la permission gracieuse de http://www.sjgames.com/general/online_policy.html",
+    "changelog": {
+      "readme": "LISEZ-MOI",
+      "dontShowAgain": "Ne plus montrer le Lisez-moi"
+    },
+    "sheet": {
+      "personal": {
+        "tab": "Personnel",
+        "identity": "Identité",
+        "name": "Nom",
+        "player": "Joueur",
+        "title": "Titre",
+        "miscellaneous": "Divers",
+        "created": "Créé",
+        "modified": "Modifié"
+      },
+      "gcs": {
+        "copyright": "GCS is une marque déposée (1998-2024) par Richard A. Wilkes. Tous droits réservés."
+      }
+    }
+  },
+
   "__Char Sheet__": "=========",
-  "GURPS.portrait": "Portrait",
-  "GURPS.personalTab": "Personnel",
   "GURPS.resourcesModsTab": "Ressources et Modificateurs",
   "__Character Sheet Identity__": "=========",
-  "GURPS.identity": "Identité",
-  "GURPS.identityName": "Nom",
-  "GURPS.identityPlayer": "Joueur",
-  "GURPS.identityTitle": "Titre",
   "__Character Sheet Miscellaneous__": "=========",
-  "GURPS.miscellaneous": "Divers",
-  "GURPS.miscellaneousCreated": "Créé",
-  "GURPS.miscellaneousModified": "Modifié",
-  "GURPS.miscellaneousOptions": "Options",
   "__Character Description__": "=========",
   "GURPS.description": "Description",
   "GURPS.descriptionAge": "Age",
@@ -1125,4 +1133,4 @@
   "GURPS.parentItemTooltip": "De {type}: {name}",
   "GURPS.cannotDropItemAlreadyExists": "Vous avez déjà cet objet.",
   "GURPS.droppingItemNotification": "{actorName} reçoit {itemName}"
-}
+}