Merge pull request #874 from rsek/meter-migration-fixes

Meter migration fixes

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Next Release
 
+- 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))

src/module/actor/subtypes/character.ts

@@ -2,7 +2,6 @@ import { StatField } from '../../fields/StatField'
 import { ImpactField } from '../../fields/ImpactField'
 import type { IronswornActor } from '../actor'
 import { ProgressTicksField } from '../../fields/ProgressTicksField'
-import type { DataSchema } from '../../fields/utils'
 import type {
 	ConditionMeterSource,
 	MomentumSource
@@ -30,15 +29,13 @@ export class CharacterModel extends foundry.abstract.TypeDataModel<
 	async burnMomentum(this: CharacterModel) {
 		if (this.canBurnMomentum) {
 			await this.parent.update({
-				system: { 'momentum.value': this.parent.system.momentum.resetValue }
+				system: { 'momentum.value': this.parent.system.momentumReset }
 			})
 		}
 	}
 
 	get canBurnMomentum() {
-		return (
-			this.parent.system.momentum.value > this.parent.system.momentum.resetValue
-		)
+		return this.parent.system.momentum.value > this.parent.system.momentumReset
 	}
 
 	get #impactCount() {

src/module/fields/MeterField.ts

@@ -42,13 +42,19 @@ export abstract class MeterField<
 		super(schema, options)
 	}
 
-	migrateSource(sourceData: object, fieldData: any) {
-		if (typeof fieldData === 'number') {
-			fieldData = { value: fieldData }
-		}
+	override _cast(value: unknown): any {
+		// Cast numberish values to a meter-shaped object
+		return Number.isNumeric(value)
+			? { value: Number(value) }
+			: super._cast(value)
+	}
 
+	override migrateSource(sourceData: object, fieldData: any) {
+		// migrate legacy asset condition meters
 		IronswornActor._addDataFieldMigration(fieldData, 'current', 'value')
 
+		// the _cast method above handles migrations from simple number values
+
 		return super.migrateSource(sourceData, fieldData)
 	}
 }
@@ -81,6 +87,8 @@ export class MomentumField extends MeterField<MomentumSource> {
 				label: 'IRONSWORN.Momentum'
 			},
 			{
+				// it's for later use by ActiveEffect to model impact/debility behavior
+				// if you need to get at the resetValue, use the getter Actor.system.momentumReset instead. otherwise, it won't be sensitive to impacts.
 				resetValue: new fields.NumberField({
 					initial: MomentumField.INITIAL,
 					min: MomentumField.RESET_MIN,
@@ -90,25 +98,5 @@ export class MomentumField extends MeterField<MomentumSource> {
 			}
 		)
 	}
-
-	override migrateSource(
-		sourceData: CharacterDataSourceData,
-		fieldData: MomentumSource
-	): void {
-		super.migrateSource(sourceData, fieldData)
-		if (typeof sourceData?.momentum === 'number') {
-			console.log('Migrating sourceData, fieldData', sourceData, fieldData)
-			IronswornActor._addDataFieldMigration(
-				sourceData,
-				'momentumReset',
-				'momentum.resetValue'
-			)
-			IronswornActor._addDataFieldMigration(
-				sourceData,
-				'momentumMax',
-				'momentum.max'
-			)
-		}
-	}
 }
 export interface MomentumField extends MomentumSource {}

src/module/vue/components/impact/impact-checkbox.vue

@@ -62,15 +62,6 @@ async function input(value: boolean) {
 	}
 	await $actor?.update(data)
 	await nextTick()
-	const numDebilitiesMarked = Object.values(actor.value.system.debility).filter(
-		(x) => x === true
-	).length
-	await $actor?.update({
-		system: {
-			momentumMax: 10 - numDebilitiesMarked,
-			momentumReset: Math.max(0, 2 - numDebilitiesMarked)
-		}
-	})
 
 	if (props.global) {
 		await IronswornSettings.updateGlobalAttribute(data, [