Merge pull request #124 from Muttley/develop

Release 11.6.3

.github/workflows/npm-gulp.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,3 +1,19 @@
+## v11.6.3
+
+### Enhancement
+- [#120] Add support for the Catalan language
+
+### Bugfix
+- [#118] GM Threat "-" button not working
+- [#122] Issue adding combatants to combat tracker
+
+### Chores
+- [#119] Merge new Polish translation updates from Crowdin
+
+*Many thanks to **trombonecat** for contributing the Catalan language translations*
+
+---
+
 ## v11.6.2
 
 ### Bugfix

i18n/pl.yaml

@@ -247,20 +247,20 @@ AC2D20.TEMPLATES.Resistance: Odporność
 AC2D20.TEMPLATES.Resistances: Odporności
 AC2D20.TEMPLATES.RESISTANCES: ODPORNOŚCI
 AC2D20.TEMPLATES.Resources: Zasoby
-AC2D20.TEMPLATES.Restriction: Ograniczenia
+AC2D20.TEMPLATES.Restriction: Reglamentacja
 AC2D20.TEMPLATES.ritual_requirements: Wymagania
 AC2D20.TEMPLATES.ritual_resistance: Odporności
 AC2D20.TEMPLATES.ritual_steps: Tor postępu rytuału
 AC2D20.TEMPLATES.ritual_stress: Stres rytuału
 AC2D20.TEMPLATES.Ritual: Rytuał
 AC2D20.TEMPLATES.Roll_Formula: Formuła rzutu
-AC2D20.TEMPLATES.Salvo: Salwa
+AC2D20.TEMPLATES.Salvo: Seria
 AC2D20.TEMPLATES.SAVE: ZAPISZ
 AC2D20.TEMPLATES.scale: Skala
 AC2D20.TEMPLATES.Size: Wielkość
-AC2D20.TEMPLATES.SizeLevels.Major: Znaczący
+AC2D20.TEMPLATES.SizeLevels.Major: Duży
 AC2D20.TEMPLATES.SizeLevels.Minor: Mały
-AC2D20.TEMPLATES.SizeLevels.Trivial: Trywialny
+AC2D20.TEMPLATES.SizeLevels.Trivial: Drobny
 AC2D20.TEMPLATES.Skill_Focus: Fokus
 AC2D20.TEMPLATES.skill_focus: Umiejętność/Fokus
 AC2D20.TEMPLATES.Skill_Value: Poziom umiejętności
@@ -436,7 +436,7 @@ AC2D20.Warnings.OnEditOwnedItemActiveEffects: Zarządzanie aktywnymi efektami po
 AC2D20.WEAPONS.damageEffect.area: Obszarowe
 AC2D20.WEAPONS.damageEffect.backlash_x: Reperkusje
 AC2D20.WEAPONS.damageEffect.drain: Wyczerpanie
-AC2D20.WEAPONS.damageEffect.intense: Uporczywe
+AC2D20.WEAPONS.damageEffect.intense: Dotkliwe
 AC2D20.WEAPONS.damageEffect.persistent_x: Uporczywe
 AC2D20.WEAPONS.damageEffect.piercing_x: Przebicie
 AC2D20.WEAPONS.damageEffect.snare: Unieruchomienie

system/src/documents/Combat2d20.mjs

@@ -122,7 +122,7 @@ export default class Combat2d20 extends Combat {
 			return 0;
 		});
 
-		if ( this.turn !== null) this.turn = Math.clamped(this.turn, 0, turns.length-1);
+		if ( this.turn !== null) this.turn = Math.clamped(this.turn, 0, turns.length - 1);
 
 		// Update state tracking
 		let c = turns[this.turn];
@@ -133,6 +133,9 @@ export default class Combat2d20 extends Combat {
 			tokenId: c ? c.tokenId : null,
 		};
 
+		// One-time initialization of the previous state
+		if ( !this.previous ) this.previous = this.current;
+
 		// Return the array of prepared turns
 		return this.turns = turns;
 	}

system/system.json

@@ -2,7 +2,7 @@
 	"id": "ac2d20",
 	"title": "Achtung! Cthulhu 2d20",
 	"description": "An unofficial system for playing Achtung! Cthulhu 2d20 from Modiphius Entertainment Ltd.",
-	"version": "11.6.2",
+	"version": "11.6.3",
 	"compatibility": {
 		"minimum": "11",
 		"verified": "12"
@@ -77,6 +77,12 @@
 		}
 	],
 	"languages": [
+		{
+			"lang": "ca",
+			"name": "Català",
+			"path": "i18n/ca.json",
+			"flags": {}
+		},
 		{
 			"lang": "en",
 			"name": "English",

system/templates/app/momentum-tracker.hbs

@@ -7,7 +7,7 @@
 				</h4>
 			</div>
 			<div class="flexrow align-mid">
-				{{#if game.user.isGM}}
+				{{#if isGM}}
 					<a class="ap-btn ap-sub">
 						<i class="fa-solid fa-minus"></i>
 					</a>