From 4ffed673db5526a8bd06a319c5336535eccb4be9 Mon Sep 17 00:00:00 2001
From: Mike Bloy <mike@bloy.org>
Date: Thu, 30 May 2024 15:29:39 -0500
Subject: [PATCH] shape change fix powers and skill issue

---
 src/module/powers/basePowers.js  | 5 ++++-
 src/module/powers/shapeChange.js | 7 ++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/module/powers/basePowers.js b/src/module/powers/basePowers.js
index 7da8799..63c6a36 100644
--- a/src/module/powers/basePowers.js
+++ b/src/module/powers/basePowers.js
@@ -802,8 +802,11 @@ export class ActorFolderEffect extends PowerEffect {
       adds[documentType] = [];
       updates[documentType] = [];
       for (const newDocKey in newDocs[documentType]) {
-        const newDoc = newDocs[documentType][newDocKey];
+        const newDoc = newDocs[documentType][newDocKey].toObject();
         const oldDoc = collection.find((doc) => this.#documentFinder(documentType, doc, newDoc));
+        if (newDoc.type === 'power' && newDoc?.system?.choiceSets?.length > 0) {
+          newDoc.system.choiceSets = [];
+        }
         if (oldDoc) {
           const _id = oldDoc.id;
           updates[documentType].push({ ...newDoc, _id });
diff --git a/src/module/powers/shapeChange.js b/src/module/powers/shapeChange.js
index 0f7bea5..79257ea 100644
--- a/src/module/powers/shapeChange.js
+++ b/src/module/powers/shapeChange.js
@@ -119,12 +119,9 @@ export class ShapeChangeEffect extends ActorFolderEffect {
     for (const item of this.target.actor.items.filter(
       (i) =>
         (i.type === 'skill' && ['smarts', 'spirit'].includes(i.system.attribute)) ||
-        ['edge', 'hindrance', 'action'].includes(i.type),
+        ['power', 'edge', 'hindrance', 'action'].includes(i.type),
     )) {
-      const doc = deepClone(await this.target.actor.getEmbeddedDocument('Item', item.id));
-      if (doc.type === 'power' && doc?.system?.choiceSets?.length > 0 && !doc.system.choiceSets[0].choice) {
-        doc.system.choiceSets[0].choice = 1;
-      }
+      const doc = await this.target.actor.getEmbeddedDocument('Item', item.id);
       this.data.embeddedUpdates.Item[item.name] = doc;
     }
   }