closes #120, closes #118, closes #122, closes #119

Muttley · Jul 7, 2024 · 8ec5f05 · 8ec5f05
1 parent e1e0998
commit 8ec5f05
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/CHANGELOG.md b/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

diff --git a/system/src/documents/Combat2d20.mjs b/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;
 	}

diff --git a/system/system.json b/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",
@@ -89,12 +95,6 @@
 			"path": "i18n/es.json",
 			"flags": {}
 		},
-		{
-			"lang": "ca",
-			"name": "Català",
-			"path": "i18n/ca.json",
-			"flags": {}
-		},
 		{
 			"lang": "fr",
 			"name": "Français",

diff --git a/system/templates/app/momentum-tracker.hbs b/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>