From 31c3cc6694a66949f9f475c713b301a3e4d02c7a Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 29 Jul 2023 12:48:39 -0400 Subject: [PATCH 1/4] Notification updates --- src/languages/en.json | 2 +- src/languages/es.json | 2 +- src/languages/ja.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/en.json b/src/languages/en.json index 6abad49..7fa50ef 100644 --- a/src/languages/en.json +++ b/src/languages/en.json @@ -66,7 +66,7 @@ "SIMPLEFOG.autoVisNotes": "When enabled, Automatic Visibility will show/hide tokens based on fog opacity level at their location based on the threshold setting. Brush color changes to green/red to indicate whether a token would be visible.", - "SIMPLEFOG.versionNotification": "Simple Fog 0.3.1

This release includes:

To report problems:

", + "SIMPLEFOG.versionNotification": "Simple Fog 0.3.4

This release includes:

", "SIMPLEFOG.migration2Notification": "Simple Fog Data Migration

The Simple Fog data has been migrated to a format supporting v3. It is HIGHLY recommended to review all scenes and fog visibility, both from a GM and a Player view before showing the scene to players." } diff --git a/src/languages/es.json b/src/languages/es.json index 9c59829..2f19bbc 100644 --- a/src/languages/es.json +++ b/src/languages/es.json @@ -69,7 +69,7 @@ "SIMPLEFOG.autoVisNotes": "Cuando se activa, la visibilidad automática mostrará/ocultará los iconos en base al nivel de opacidad de la niebla en su localización y el umbral que se especifique. El color del pincel cambia a verde/rojo para indicar si el token es visible", - "SIMPLEFOG.versionNotification": "Simple Fog 0.3.1

Esta versión incluye:

Para informar problemas:

", + "SIMPLEFOG.versionNotification": "Simple Fog 0.3.4

Esta versión incluye:

", "SIMPLEFOG.migration2Notification": "Migración de datos de Simple Fog

Los datos de Simple Fog se han migrado a un formato compatible con v3. Se recomienda MUY revisar todas las escenas y la visibilidad de la niebla, tanto desde la vista del DJ como del jugador, antes de mostrar la escena a los jugadores." } diff --git a/src/languages/ja.json b/src/languages/ja.json index f8e410e..7ee2ed7 100644 --- a/src/languages/ja.json +++ b/src/languages/ja.json @@ -66,7 +66,7 @@ "SIMPLEFOG.autoVisNotes": "自動可視化を有効にすると、その場所のトークンの表示/非表示が、閾値として設定した霧の濃度に基づいて決定されるようになります。非表示となる濃度では、ブラシの色が緑から赤に変化してそれを知らせます。", - "SIMPLEFOG.versionNotification": "Simple Fog 0.3.1

このリリースには以下が含まれます:

問題を報告するには:

", + "SIMPLEFOG.versionNotification": "Simple Fog 0.3.4

このリリースには以下が含まれます:

", "SIMPLEFOG.migration2Notification": "Simple Fog データの移行

Simple Fog データは、v3 をサポートする形式に移行されました。 プレーヤーにシーンを表示する前に、GM ビューとプレーヤー ビューの両方から、すべてのシーンと霧の可視性を確認することを強くお勧めします。" } From 42ee6c541fba24b8b776bac65f17fb29deecb203 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 30 Jul 2023 08:08:35 -0400 Subject: [PATCH 2/4] Update changelog --- changelog.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changelog.md b/changelog.md index 01ac11a..aea4c0c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,16 @@ # Simplefog Change Log +### 0.3.4: Bug Fixes +Jul 29, 2023 +* Fixes for v11 by @macskay in #110 +* Fixes for v11 by @mattd in #111 + +### 0.3.3: Bug Fixes +Jun 4, 2023 +* Prettier format by @cirrahn in #104 +* Avoid crash on initial load of history-less scene by @cirrahn in #105 +* Handle v10 changes in tooling by @cirrahn in #106 + ### 0.3.1: Bug Fixes Dec 17, 2022 * Fix Grid tool misaligned with the map's grid (Thanks cirrahn!) #95 From 53abe079b46de36435f7d37f7b044b73ce5e72c2 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 30 Jul 2023 08:09:07 -0400 Subject: [PATCH 3/4] Update version and contributors --- package.json | 2 +- src/module.json | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ba1d009..342f479 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "simplefog", "title": "Simplefog - Manual Fog of War", "description": "Simplefog allows you to draw fog of war manually, optionally automatically hiding and revealing tokens underneath based on opacity. It provides a number of tools to quickly draw and erase fog in various shapes - brush, rectangles, ellipses, polygons or to reveal tiles you click/drag on the grid.", - "version": "0.3.1", + "version": "0.3.4", "main": "main.js", "scripts": { "publish": "gulp publish --update", diff --git a/src/module.json b/src/module.json index c3e3b74..73b85ae 100644 --- a/src/module.json +++ b/src/module.json @@ -58,6 +58,28 @@ "ko-fi": "", "reddit": "", "email": "" + }, + { + "name": "macskay", + "url": "https://github.com/macskay", + "discord": "", + "twitter": "", + "patreon": "", + "github": "macskay", + "ko-fi": "", + "reddit": "", + "email": "" + }, + { + "name": "mattd", + "url": "https://github.com/mattd", + "discord": "", + "twitter": "", + "patreon": "", + "github": "mattd", + "ko-fi": "", + "reddit": "", + "email": "" } ], "type": "module", @@ -112,15 +134,15 @@ "styles": ["css/brush-controls.css"], "compatibility": { "minimum": 10, - "verified": 11.305, + "verified": 11.306, "maximum": 11 }, "manifestPlusVersion": "1.2.1", "url": "https://github.com/League-of-Foundry-Developers/simplefog", "manifest": "https://github.com/League-of-Foundry-Developers/simplefog/releases/latest/download/module.json", "download": "https://github.com/League-of-Foundry-Developers/simplefog/releases/latest/download/module.zip", - "readme": "https://github.com/League-of-Foundry-Developers/simplefog/blob/v0.3.1/README.md", - "changelog": "https://github.com/League-of-Foundry-Developers/simplefog/blob/v0.3.1/CHANGELOG.md", + "readme": "https://github.com/League-of-Foundry-Developers/simplefog/blob/v0.3.4/README.md", + "changelog": "https://github.com/League-of-Foundry-Developers/simplefog/blob/v0.3.4/CHANGELOG.md", "bugs": "https://github.com/League-of-Foundry-Developers/simplefog/issues", "allowBugReporter": true, "relationships": { From 342c3278c2bceed424f228d5356a3e8c6314ac84 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 30 Jul 2023 08:09:34 -0400 Subject: [PATCH 4/4] Adjust to support v10 and v11 concurrently --- src/classes/MaskLayer.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/classes/MaskLayer.js b/src/classes/MaskLayer.js index 5cd64ca..dbcb2d2 100644 --- a/src/classes/MaskLayer.js +++ b/src/classes/MaskLayer.js @@ -489,7 +489,7 @@ export default class MaskLayer extends InteractionLayer { * @param data {Object} PIXI Object to be used as brush */ composite(brush) { - if (isNewerVersion(game.version, "10.299")) { + if (isNewerVersion(game.version, "10.999")) { const opt = { renderTexture: this.maskTexture, clear: false, @@ -555,7 +555,11 @@ export default class MaskLayer extends InteractionLayer { activate() { simplefogLogDebug("MaskLayer.activate"); super.activate(); - this.eventMode = "static"; + if (isNewerVersion(game.version, "10.999")) { + this.eventMode = "static"; + } else { + this.interactive = true; + } } /** @@ -564,7 +568,11 @@ export default class MaskLayer extends InteractionLayer { deactivate() { simplefogLogDebug("MaskLayer.deactivate"); super.deactivate(); - this.eventMode = "passive"; + if (isNewerVersion(game.version, "10.999")) { + this.eventMode = "passive"; + } else { + this.interactive = false; + } } async draw() {