Merge branch 'main' into active-effects-impacts

ben · Sep 25, 2023 · 2dddf72 · 2dddf72
2 parents f5332f3 + a44ef5d
commit 2dddf72
Show file tree

Hide file tree

Showing 18 changed files with 784 additions and 552 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -41,38 +41,48 @@ module.exports = {
 		'no-undef': 'off',
 
 		// FIXME: part of standard-ts. not an awful idea, but it's not doable via autofix, so it's disabled for now
-		'@typescript-eslint/explicit-function-return-type': 'off',
+		'@typescript-eslint/explicit-function-return-type': 'off'
 
 		// prefer lodash-es to regular lodash, and FVTT-provided utilities to lodash utilities
-		'no-restricted-imports': [
-			'error',
-			{
-				paths: [
-					{
-						name: 'lodash',
-						message: 'Please use lodash-es instead.'
-					},
-					{
-						name: 'lodash-es',
-						importNames: ['clamp'],
-						message: 'Please use FVTT Math.clamped instead.'
-					},
-					{
-						name: 'lodash-es',
-						importNames: ['capitalize'],
-						message: 'Please use FVTT String#capitalize instead.'
-					},
+	},
+	overrides: [
+		{
+			files: '*.ts',
+			rules: {
+				// restrict imports that duplicate libraries provided by FVTT at run-time
+				'no-restricted-imports': [
+					'error',
 					{
-						name: 'lodash-es',
-						importNames: ['range'],
-						message:
-							'Please use FVTT Array#fromRange instead, where possible. Note that Array#fromRange orders its parameters differently, and its maximum is inclusive rather than exclusive.'
+						paths: [
+							{
+								name: 'marked',
+								message: 'Please use CONFIG.IRONSWORN.showdown instead.'
+							},
+							{
+								name: 'lodash',
+								message: 'Please use lodash-es instead.'
+							},
+							{
+								name: 'lodash-es',
+								importNames: ['clamp'],
+								message: 'Please use FVTT Math.clamped instead.'
+							},
+							{
+								name: 'lodash-es',
+								importNames: ['capitalize'],
+								message: 'Please use FVTT String#capitalize instead.'
+							},
+							{
+								name: 'lodash-es',
+								importNames: ['range'],
+								message:
+									'Please use FVTT Array#fromRange instead, where possible. Note that Array#fromRange orders its parameters differently, and its maximum is inclusive rather than exclusive.'
+							}
+						]
 					}
 				]
 			}
-		]
-	},
-	overrides: [
+		},
 		{
 			files: ['*.ts', '*.js', '*.cjs'],
 			parserOptions: { project: './tsconfig.json' }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,12 +9,31 @@
   - Plus some features standard to ActiveEffects, including token HUD integration
 - Impacts/debilities that prevent recovery of resources (e.g. wounded, shaken, unprepared) now 'lock' the condition meter in question (with a tooltip that identifies the culprit)
 - Make player condition meters and momentum available as bar displays on actor tokens
-  - Under the hood: all meter fields are now objects with `max` and `value` properties, rather than a single number value
-- Under the hood: Migrate all actor and item subclasses to DataModel API. This brings several benefits such as stricter run-time validation which improve the reliability of the data used in `foundry-ironsworn`, and near-instant data migrations. It also makes it _much_ easier to implement data migrations for new features in the future.
+
+## 1.22.3
+
+- Reinstated the template.json to fix installation errors
+
+## 1.22.2
+
+- Fixed a bug that sometimes caused health, supply, momentum, or spirit to reset when loading an older world ([#865](https://github.com/ben/foundry-ironsworn/issues/865))
+
+## 1.22.1
+
+- Fixed a bug where pronouns and callsign wouldn't save ([#870](https://github.com/ben/foundry-ironsworn/pull/870))
+
+## 1.22.0
+
+- Drop support for Foundry v10, we only support v11 and up now.
+- Add a hook that fires when custom oracle registration is ready ([#864](https://github.com/ben/foundry-ironsworn/pull/864))
 - Organize compendium packs into folders
 - Improve appearance of v11 compendium sidebar and popouts with the "Phosphor" theme
-- Under the hood: refactor all `RollTable`s and oracle rolls to use a single standardized pipeline (with `foundry-ironsworn`-style table roll messages) by default; certain kinds of results will fall back to FVTT-style messages instead.
 - Include most of Starforged's oracle icons in the `foundry-ironsworn/assets` directory -- use them as symbolic tokens, map pins, etc
+- Make player condition meters and momentum available as bar displays on actor tokens
+- Under the hood changes:
+  - All meter fields are now objects with `max` and `value` properties, rather than a single number value
+  - Migrate all actor and item subclasses to DataModel API. This brings several benefits such as stricter run-time validation which improve the reliability of the data used in `foundry-ironsworn`, and near-instant data migrations. It also makes it _much_ easier to implement data migrations for new features in the future.
+  - Refactor all `RollTable`s and oracle rolls to use a single standardized pipeline (with `foundry-ironsworn`-style table roll messages) by default; certain kinds of results will fall back to FVTT-style messages instead.
 
 ## 1.21.7