Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 11.6.3 #124

Merged
merged 11 commits into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/npm-gulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
491 changes: 491 additions & 0 deletions i18n/ca.yaml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions i18n/pl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion system/src/documents/Combat2d20.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand All @@ -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;
}
Expand Down
8 changes: 7 additions & 1 deletion system/system.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -77,6 +77,12 @@
}
],
"languages": [
{
"lang": "ca",
"name": "Català",
"path": "i18n/ca.json",
"flags": {}
},
{
"lang": "en",
"name": "English",
Expand Down
2 changes: 1 addition & 1 deletion system/templates/app/momentum-tracker.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading