From 54d04f064298143e6a7cb04eba07567db506c347 Mon Sep 17 00:00:00 2001
From: supervj <64861570+supervj@users.noreply.github.com>
Date: Thu, 11 Feb 2021 07:04:13 -0500
Subject: [PATCH] Fix Long Rest to split force and tech powers

Updated  long rest functionality to handle the force tech split
---
 module/actor/entity.js | 6 ++++--
 module/migration.js    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/actor/entity.js b/module/actor/entity.js
index 4c24956a..ecfe04dd 100644
--- a/module/actor/entity.js
+++ b/module/actor/entity.js
@@ -1249,9 +1249,11 @@ export default class Actor5e extends Actor {
 
     // Recover power slots
     for ( let [k, v] of Object.entries(data.powers) ) {
-      updateData[`data.powers.${k}.value`] = Number.isNumeric(v.override) ? v.override : (v.max ?? 0);
+      updateData[`data.powers.${k}.fvalue`] = Number.isNumeric(v.foverride) ? v.foverride : (v.fmax ?? 0);
+    }
+    for ( let [k, v] of Object.entries(data.powers) ) {
+      updateData[`data.powers.${k}.tvalue`] = Number.isNumeric(v.toverride) ? v.toverride : (v.tmax ?? 0);
     }
-
     // Determine the number of hit dice which may be recovered
     let recoverHD = Math.max(Math.floor(data.details.level / 2), 1);
     let dhd = 0;
diff --git a/module/migration.js b/module/migration.js
index cf31ec6a..75fddb83 100644
--- a/module/migration.js
+++ b/module/migration.js
@@ -265,7 +265,7 @@ function _migrateActorPowers(actorData, updateData) {
   const ad = actorData.data;
 
   // If new Force & Tech data is not present, create it
-  const hasNewAttrib = ad?.attributes?.force?.level !== undefined;
+  let hasNewAttrib = ad?.attributes?.force?.level !== undefined;
   if ( !hasNewAttrib ) {
     updateData["data.attributes.force.known.value"] = 0;
     updateData["data.attributes.force.known.min"] = 0;
@@ -288,7 +288,7 @@ function _migrateActorPowers(actorData, updateData) {
   }
 
   // If new Power F/T split data is not present, create it
-  const hasNewBonus = ad?.powers?.power1?.fvalue !== undefined;
+  hasNewBonus = ad?.powers?.power1?.fvalue !== undefined;
   if ( !hasNewBonus ) {
     for (let i = 1; i <= 9; i++) { 
       // add new