closes #968

Muttley · Dec 4, 2024 · 094326e · 094326e
1 parent 2682cb2
commit 094326e
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 38 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,10 @@
+# v3.2.2
+
+## Chores
+* [#968] Update Shadowdarklings import process to support Wands and Scrolls
+
+---
+
 # v3.2.1
 
 ## Bugs

diff --git a/system/src/apps/ShadowdarklingImporterSD.mjs b/system/src/apps/ShadowdarklingImporterSD.mjs
@@ -44,6 +44,17 @@ export default class ShadowdarklingImporterSD extends FormApplication {
 		html.on("paste", ".SDImporterJson", this._onPaste.bind(this));
 	}
 
+	/** @override */
+	async getData(options) {
+		const data = {
+			actor: this.importedActor,
+			errors: this.errors,
+			gear: this.gear,
+		};
+
+		return data;
+	}
+
 	/** @inheritdoc */
 	_onSubmit(event) {
 		event.preventDefault();
@@ -56,17 +67,6 @@ export default class ShadowdarklingImporterSD extends FormApplication {
 		// required method
 	}
 
-	/** @override */
-	async getData(options) {
-		const data = {
-			actor: this.importedActor,
-			errors: this.errors,
-			gear: this.gear,
-		};
-
-		return data;
-	}
-
 	/**
 	 * Handles pasting of json data
 	 */
@@ -88,6 +88,22 @@ export default class ShadowdarklingImporterSD extends FormApplication {
 		}
 	}
 
+	async _createSpellScroll(item) {
+		const spell = await this._getSpellFromItem(item);
+
+		if (spell) {
+			return await shadowdark.utils.createItemFromSpell("Scroll", spell);
+		}
+	}
+
+	async _createSpellWand(item) {
+		const spell = await this._getSpellFromItem(item);
+
+		if (spell) {
+			return await shadowdark.utils.createItemFromSpell("Wand", spell);
+		}
+	}
+
 	/**
 	 * finds matching items by category
 	 */
@@ -132,7 +148,7 @@ export default class ShadowdarklingImporterSD extends FormApplication {
 				c.name.toLowerCase() === spell.sourceName.toLowerCase()
 			);
 
-			const itemIndex = pack.index.find( s => (
+			const itemIndex = pack.index.find(s => (
 				(s.name.toLowerCase() === spell.bonusName.toLowerCase())
 				&& (s.type === "Spell")
 				&& (s.system.class.includes(classObj?.uuid))
@@ -224,6 +240,32 @@ export default class ShadowdarklingImporterSD extends FormApplication {
 		}
 	}
 
+	async _getSpellFromItem(item) {
+		const [spellName, spellClass] = this._getSpellNameAndClassFromItem(item);
+
+		if (!spellName || !spellClass) return;
+
+		const classUuid = (await shadowdark.compendiums.classes()).find(
+			i => i.name === spellClass
+		).uuid;
+
+		const spell = (await shadowdark.compendiums.spells()).find(spell => {
+			return spellName.slugify() === spell.name.slugify()
+				&& spell.system.class.includes(classUuid);
+		});
+
+		return spell;
+	}
+
+	_getSpellNameAndClassFromItem(item) {
+		const {spellName, spellClass} =
+			/^(?<spellName>[\w\s]+)\s+\(Tier\s+\d+,\s+(?<spellClass>\w+)\)/
+				.exec(item.spellDesc ?? "")
+				?.groups ?? [undefined, undefined];
+
+		return [spellName, spellClass];
+	}
+
 	/**
 	 * Parses JSON data from shadowdarklings and tries to create an Player actor from it.
 	 * @param {JSON} json - JSON Data from the Shadowdarklings.net site
@@ -400,10 +442,23 @@ export default class ShadowdarklingImporterSD extends FormApplication {
 
 		// magic items (not implemented)
 		for (const item of json.magicItems) {
-			this.errors.push({
-				type: "Magic Item",
-				name: item.name,
-			});
+			let newItem = undefined;
+			if (item.magicItemType === "magicSpellScroll") {
+				newItem = await this._createSpellScroll(item);
+			}
+			else if (item.magicItemType === "magicSpellWand") {
+				newItem = await this._createSpellWand(item);
+			}
+
+			if (newItem) {
+				this.gear.push(newItem);
+			}
+			else {
+				this.errors.push({
+					type: "Magic Item",
+					name: item.name,
+				});
+			}
 		}
 
 		// Load Bonuses / talents & Spells

diff --git a/system/src/sheets/PlayerSheetSD.mjs b/system/src/sheets/PlayerSheetSD.mjs
@@ -388,28 +388,7 @@ export default class PlayerSheetSD extends ActorSheetSD {
 	}
 
 	async _createItemFromSpell(spell, type) {
-		const name = (type !== "Spell")
-			? game.i18n.format(
-				`SHADOWDARK.item.name_from_spell.${type}`,
-				{spellName: spell.name}
-			)
-			: spell.name;
-
-		const itemData = {
-			type,
-			name,
-			system: spell.system,
-		};
-
-		if (type === "Spell") {
-			itemData.img = spell.img;
-		}
-		else {
-			delete itemData.system.lost;
-			itemData.system.magicItem = true;
-			itemData.system.spellImg = spell.img;
-			itemData.system.spellName = spell.name;
-		}
+		const itemData = await shadowdark.utils.createItemFromSpell(type, spell);
 
 		super._onDropItemCreate(itemData);
 	}

diff --git a/system/src/utils/UtilitySD.mjs b/system/src/utils/UtilitySD.mjs
@@ -70,6 +70,33 @@ export default class UtilitySD {
 	}
 
 
+	static async createItemFromSpell(type, spell) {
+		const name = (type !== "Spell")
+			? game.i18n.format(
+				`SHADOWDARK.item.name_from_spell.${type}`,
+				{ spellName: spell.name }
+			)
+			: spell.name;
+
+		const itemData = {
+			type,
+			name,
+			system: spell.system,
+		};
+
+		if (type === "Spell") {
+			itemData.img = spell.img;
+		}
+		else {
+			delete itemData.system.lost;
+			itemData.system.magicItem = true;
+			itemData.system.spellImg = spell.img;
+			itemData.system.spellName = spell.name;
+		}
+		return itemData;
+	}
+
+
 	static diceSound() {
 		const sounds = [CONFIG.sounds.dice];
 		const src = sounds[0];