diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e6746299..4f423354 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,8 +16,12 @@ jobs:
       - name: Set Release Notes for Github
         id: set-release-notes-github
         run: |
+          echo "- Updates:" >> release_notes.txt        
+          echo "  - Opportunity Attack: Support for Walled Templates new per template hiding option. The OA template will now hide border/highlighting even if general Walled Templates settings have border/highlighting on." >> release_notes.txt
           echo "- Bugfixes:" >> release_notes.txt
-          echo "  - Identify: Actually deploy the updated Identify item" >> release_notes.txt
+          echo "  - Counterspell: Fix an invalid variable declaration. Re-wrote function handling to better account for GM dialog mirror promises." >> release_notes.txt
+          echo "  - Opportunity Attack: Fix additional lookup issue effecting Brace and Riposte. Fix Zephyr Strike looking at the origin token instead of the initiating token." >> release_notes.txt
+          echo "  - Reckless Attack: Removed Adv Reminder check" >> release_notes.txt
           echo "release-notes-github<<EOF" >> $GITHUB_ENV
           cat release_notes.txt >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
diff --git a/module.json b/module.json
index 8abbd2e3..36a48dee 100644
--- a/module.json
+++ b/module.json
@@ -7,7 +7,7 @@
 		"name": "Gambit"
 		}
 	],
-  "version": "0.1.12",
+  "version": "0.1.13",
 	"compatibility": {
 	"minimum": "11",
 	"verified": "11",
diff --git a/packs/gps-3rd-party-features/000044.log b/packs/gps-3rd-party-features/000056.log
similarity index 100%
rename from packs/gps-3rd-party-features/000044.log
rename to packs/gps-3rd-party-features/000056.log
diff --git a/packs/gps-3rd-party-features/CURRENT b/packs/gps-3rd-party-features/CURRENT
index 8e0a0622..17608f2e 100644
--- a/packs/gps-3rd-party-features/CURRENT
+++ b/packs/gps-3rd-party-features/CURRENT
@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000054
diff --git a/packs/gps-3rd-party-features/LOG b/packs/gps-3rd-party-features/LOG
index 7654518c..b1652810 100644
--- a/packs/gps-3rd-party-features/LOG
+++ b/packs/gps-3rd-party-features/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:31.059 7568 Recovering log #40
-2024/04/03-16:29:31.067 7568 Delete type=0 #40
-2024/04/03-16:29:31.067 7568 Delete type=3 #38
-2024/04/03-16:37:38.738 1624 Level-0 table #45: started
-2024/04/03-16:37:38.738 1624 Level-0 table #45: 0 bytes OK
-2024/04/03-16:37:38.743 1624 Delete type=0 #43
-2024/04/03-16:37:38.748 1624 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.749 1624 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.327 756c Recovering log #52
+2024/04/06-18:59:33.333 756c Delete type=0 #52
+2024/04/06-18:59:33.333 756c Delete type=3 #50
+2024/04/07-03:11:30.970 1624 Level-0 table #57: started
+2024/04/07-03:11:30.970 1624 Level-0 table #57: 0 bytes OK
+2024/04/07-03:11:30.974 1624 Delete type=0 #55
+2024/04/07-03:11:30.975 1624 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.975 1624 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-features/LOG.old b/packs/gps-3rd-party-features/LOG.old
index ac7300d6..f577e3f3 100644
--- a/packs/gps-3rd-party-features/LOG.old
+++ b/packs/gps-3rd-party-features/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.968 756c Recovering log #36
-2024/04/03-11:51:24.979 756c Delete type=0 #36
-2024/04/03-11:51:24.979 756c Delete type=3 #34
-2024/04/03-12:48:18.080 1624 Level-0 table #41: started
-2024/04/03-12:48:18.081 1624 Level-0 table #41: 0 bytes OK
-2024/04/03-12:48:18.086 1624 Delete type=0 #39
-2024/04/03-12:48:18.094 1624 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.094 1624 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.323 7564 Recovering log #48
+2024/04/04-16:32:14.329 7564 Delete type=0 #48
+2024/04/04-16:32:14.329 7564 Delete type=3 #46
+2024/04/06-18:59:01.962 1624 Level-0 table #53: started
+2024/04/06-18:59:01.962 1624 Level-0 table #53: 0 bytes OK
+2024/04/06-18:59:01.964 1624 Delete type=0 #51
+2024/04/06-18:59:01.967 1624 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.967 1624 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!F4WlBlrL1aHesheL.d9dBh3emP8HLgrMk' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-features/MANIFEST-000042 b/packs/gps-3rd-party-features/MANIFEST-000054
similarity index 79%
rename from packs/gps-3rd-party-features/MANIFEST-000042
rename to packs/gps-3rd-party-features/MANIFEST-000054
index 196f731a..e1bbef13 100644
Binary files a/packs/gps-3rd-party-features/MANIFEST-000042 and b/packs/gps-3rd-party-features/MANIFEST-000054 differ
diff --git a/packs/gps-3rd-party-items/000044.log b/packs/gps-3rd-party-items/000056.log
similarity index 100%
rename from packs/gps-3rd-party-items/000044.log
rename to packs/gps-3rd-party-items/000056.log
diff --git a/packs/gps-3rd-party-items/CURRENT b/packs/gps-3rd-party-items/CURRENT
index 8e0a0622..17608f2e 100644
--- a/packs/gps-3rd-party-items/CURRENT
+++ b/packs/gps-3rd-party-items/CURRENT
@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000054
diff --git a/packs/gps-3rd-party-items/LOG b/packs/gps-3rd-party-items/LOG
index 966c9ac6..a59296dc 100644
--- a/packs/gps-3rd-party-items/LOG
+++ b/packs/gps-3rd-party-items/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:31.073 7564 Recovering log #40
-2024/04/03-16:29:31.080 7564 Delete type=0 #40
-2024/04/03-16:29:31.080 7564 Delete type=3 #38
-2024/04/03-16:37:38.752 1624 Level-0 table #45: started
-2024/04/03-16:37:38.753 1624 Level-0 table #45: 0 bytes OK
-2024/04/03-16:37:38.756 1624 Delete type=0 #43
-2024/04/03-16:37:38.771 1624 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.771 1624 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.343 7568 Recovering log #52
+2024/04/06-18:59:33.350 7568 Delete type=0 #52
+2024/04/06-18:59:33.350 7568 Delete type=3 #50
+2024/04/07-03:11:30.966 1624 Level-0 table #57: started
+2024/04/07-03:11:30.966 1624 Level-0 table #57: 0 bytes OK
+2024/04/07-03:11:30.970 1624 Delete type=0 #55
+2024/04/07-03:11:30.975 1624 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.975 1624 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-items/LOG.old b/packs/gps-3rd-party-items/LOG.old
index dcd78d8d..ccf006d2 100644
--- a/packs/gps-3rd-party-items/LOG.old
+++ b/packs/gps-3rd-party-items/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:25.012 7564 Recovering log #36
-2024/04/03-11:51:25.020 7564 Delete type=0 #36
-2024/04/03-11:51:25.020 7564 Delete type=3 #34
-2024/04/03-12:48:18.049 1624 Level-0 table #41: started
-2024/04/03-12:48:18.049 1624 Level-0 table #41: 0 bytes OK
-2024/04/03-12:48:18.055 1624 Delete type=0 #39
-2024/04/03-12:48:18.063 1624 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.064 1624 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.339 7568 Recovering log #48
+2024/04/04-16:32:14.345 7568 Delete type=0 #48
+2024/04/04-16:32:14.346 7568 Delete type=3 #46
+2024/04/06-18:59:01.968 1624 Level-0 table #53: started
+2024/04/06-18:59:01.968 1624 Level-0 table #53: 0 bytes OK
+2024/04/06-18:59:01.972 1624 Delete type=0 #51
+2024/04/06-18:59:01.980 1624 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.980 1624 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-items/MANIFEST-000042 b/packs/gps-3rd-party-items/MANIFEST-000054
similarity index 80%
rename from packs/gps-3rd-party-items/MANIFEST-000042
rename to packs/gps-3rd-party-items/MANIFEST-000054
index 1a8b2ee7..d8d6ff7a 100644
Binary files a/packs/gps-3rd-party-items/MANIFEST-000042 and b/packs/gps-3rd-party-items/MANIFEST-000054 differ
diff --git a/packs/gps-3rd-party-spells/000044.log b/packs/gps-3rd-party-spells/000056.log
similarity index 100%
rename from packs/gps-3rd-party-spells/000044.log
rename to packs/gps-3rd-party-spells/000056.log
diff --git a/packs/gps-3rd-party-spells/CURRENT b/packs/gps-3rd-party-spells/CURRENT
index 8e0a0622..17608f2e 100644
--- a/packs/gps-3rd-party-spells/CURRENT
+++ b/packs/gps-3rd-party-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000054
diff --git a/packs/gps-3rd-party-spells/LOG b/packs/gps-3rd-party-spells/LOG
index 3a2e8f60..960a38a8 100644
--- a/packs/gps-3rd-party-spells/LOG
+++ b/packs/gps-3rd-party-spells/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:31.102 7568 Recovering log #40
-2024/04/03-16:29:31.116 7568 Delete type=0 #40
-2024/04/03-16:29:31.117 7568 Delete type=3 #38
-2024/04/03-16:37:38.743 1624 Level-0 table #45: started
-2024/04/03-16:37:38.744 1624 Level-0 table #45: 0 bytes OK
-2024/04/03-16:37:38.747 1624 Delete type=0 #43
-2024/04/03-16:37:38.748 1624 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.749 1624 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.359 756c Recovering log #52
+2024/04/06-18:59:33.366 756c Delete type=0 #52
+2024/04/06-18:59:33.366 756c Delete type=3 #50
+2024/04/07-03:11:30.978 1624 Level-0 table #57: started
+2024/04/07-03:11:30.979 1624 Level-0 table #57: 0 bytes OK
+2024/04/07-03:11:30.982 1624 Delete type=0 #55
+2024/04/07-03:11:30.995 1624 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.996 1624 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-spells/LOG.old b/packs/gps-3rd-party-spells/LOG.old
index 683256cb..6daec5e1 100644
--- a/packs/gps-3rd-party-spells/LOG.old
+++ b/packs/gps-3rd-party-spells/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:25.047 756c Recovering log #36
-2024/04/03-11:51:25.055 756c Delete type=0 #36
-2024/04/03-11:51:25.055 756c Delete type=3 #34
-2024/04/03-12:48:18.097 1624 Level-0 table #41: started
-2024/04/03-12:48:18.097 1624 Level-0 table #41: 0 bytes OK
-2024/04/03-12:48:18.108 1624 Delete type=0 #39
-2024/04/03-12:48:18.128 1624 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.128 1624 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.353 7564 Recovering log #48
+2024/04/04-16:32:14.359 7564 Delete type=0 #48
+2024/04/04-16:32:14.359 7564 Delete type=3 #46
+2024/04/06-18:59:01.977 1624 Level-0 table #53: started
+2024/04/06-18:59:01.977 1624 Level-0 table #53: 0 bytes OK
+2024/04/06-18:59:01.980 1624 Delete type=0 #51
+2024/04/06-18:59:01.980 1624 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.980 1624 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!naJb6xUQcmh6w3CM.aTdVZ7BfVtRpnHyR' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-spells/MANIFEST-000042 b/packs/gps-3rd-party-spells/MANIFEST-000054
similarity index 77%
rename from packs/gps-3rd-party-spells/MANIFEST-000042
rename to packs/gps-3rd-party-spells/MANIFEST-000054
index 6d6b8bac..d34e3e86 100644
Binary files a/packs/gps-3rd-party-spells/MANIFEST-000042 and b/packs/gps-3rd-party-spells/MANIFEST-000054 differ
diff --git a/packs/gps-actors/000517.log b/packs/gps-actors/000529.log
similarity index 100%
rename from packs/gps-actors/000517.log
rename to packs/gps-actors/000529.log
diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT
index 27dc2f15..e20a3afd 100644
--- a/packs/gps-actors/CURRENT
+++ b/packs/gps-actors/CURRENT
@@ -1 +1 @@
-MANIFEST-000515
+MANIFEST-000527
diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG
index 25523d4b..f81bff89 100644
--- a/packs/gps-actors/LOG
+++ b/packs/gps-actors/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:31.033 7564 Recovering log #513
-2024/04/03-16:29:31.041 7564 Delete type=0 #513
-2024/04/03-16:29:31.041 7564 Delete type=3 #511
-2024/04/03-16:37:38.734 1624 Level-0 table #518: started
-2024/04/03-16:37:38.734 1624 Level-0 table #518: 0 bytes OK
-2024/04/03-16:37:38.738 1624 Delete type=0 #516
-2024/04/03-16:37:38.748 1624 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.749 1624 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.309 7564 Recovering log #525
+2024/04/06-18:59:33.316 7564 Delete type=0 #525
+2024/04/06-18:59:33.316 7564 Delete type=3 #523
+2024/04/07-03:11:30.962 1624 Level-0 table #530: started
+2024/04/07-03:11:30.962 1624 Level-0 table #530: 0 bytes OK
+2024/04/07-03:11:30.966 1624 Delete type=0 #528
+2024/04/07-03:11:30.975 1624 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.975 1624 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-actors/LOG.old b/packs/gps-actors/LOG.old
index 7bfd3471..287bc485 100644
--- a/packs/gps-actors/LOG.old
+++ b/packs/gps-actors/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.921 7564 Recovering log #509
-2024/04/03-11:51:24.929 7564 Delete type=0 #509
-2024/04/03-11:51:24.929 7564 Delete type=3 #507
-2024/04/03-12:48:18.067 1624 Level-0 table #514: started
-2024/04/03-12:48:18.067 1624 Level-0 table #514: 0 bytes OK
-2024/04/03-12:48:18.073 1624 Delete type=0 #512
-2024/04/03-12:48:18.094 1624 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.094 1624 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.299 7568 Recovering log #521
+2024/04/04-16:32:14.306 7568 Delete type=0 #521
+2024/04/04-16:32:14.306 7568 Delete type=3 #519
+2024/04/06-18:59:01.964 1624 Level-0 table #526: started
+2024/04/06-18:59:01.964 1624 Level-0 table #526: 0 bytes OK
+2024/04/06-18:59:01.967 1624 Delete type=0 #524
+2024/04/06-18:59:01.967 1624 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.967 1624 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-actors/MANIFEST-000515 b/packs/gps-actors/MANIFEST-000527
similarity index 70%
rename from packs/gps-actors/MANIFEST-000515
rename to packs/gps-actors/MANIFEST-000527
index 5cf597e2..50d46402 100644
Binary files a/packs/gps-actors/MANIFEST-000515 and b/packs/gps-actors/MANIFEST-000527 differ
diff --git a/packs/gps-spells/001691.log b/packs/gps-class-features/001691.log
similarity index 100%
rename from packs/gps-spells/001691.log
rename to packs/gps-class-features/001691.log
diff --git a/packs/gps-class-features/001672.ldb b/packs/gps-class-features/001693.ldb
similarity index 91%
rename from packs/gps-class-features/001672.ldb
rename to packs/gps-class-features/001693.ldb
index 07a2393e..10a5344b 100644
Binary files a/packs/gps-class-features/001672.ldb and b/packs/gps-class-features/001693.ldb differ
diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT
index c7935bd9..82f6f310 100644
--- a/packs/gps-class-features/CURRENT
+++ b/packs/gps-class-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001677
+MANIFEST-001689
diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG
index 901f9801..607cdc90 100644
--- a/packs/gps-class-features/LOG
+++ b/packs/gps-class-features/LOG
@@ -1,8 +1,15 @@
-2024/04/03-16:29:30.835 7564 Recovering log #1675
-2024/04/03-16:29:30.843 7564 Delete type=0 #1675
-2024/04/03-16:29:30.844 7564 Delete type=3 #1673
-2024/04/03-16:37:38.687 1624 Level-0 table #1680: started
-2024/04/03-16:37:38.687 1624 Level-0 table #1680: 0 bytes OK
-2024/04/03-16:37:38.690 1624 Delete type=0 #1678
-2024/04/03-16:37:38.699 1624 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.699 1624 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.125 7568 Recovering log #1687
+2024/04/06-18:59:33.131 7568 Delete type=0 #1687
+2024/04/06-18:59:33.131 7568 Delete type=3 #1685
+2024/04/07-03:11:30.883 1624 Level-0 table #1692: started
+2024/04/07-03:11:30.887 1624 Level-0 table #1692: 6542 bytes OK
+2024/04/07-03:11:30.889 1624 Delete type=0 #1690
+2024/04/07-03:11:30.890 1624 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.890 1624 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at '!items!2WNpSp86SurkqJ5E' @ 190 : 1
+2024/04/07-03:11:30.890 1624 Compacting 1@1 + 1@2 files
+2024/04/07-03:11:30.907 1624 Generated table #1693@1: 38 keys, 65545 bytes
+2024/04/07-03:11:30.907 1624 Compacted 1@1 + 1@2 files => 65545 bytes
+2024/04/07-03:11:30.912 1624 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/07-03:11:30.912 1624 Delete type=2 #1672
+2024/04/07-03:11:30.913 1624 Delete type=2 #1692
+2024/04/07-03:11:30.934 1624 Manual compaction at level-1 from '!items!2WNpSp86SurkqJ5E' @ 190 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-class-features/LOG.old b/packs/gps-class-features/LOG.old
index a3ba94fa..5c90a660 100644
--- a/packs/gps-class-features/LOG.old
+++ b/packs/gps-class-features/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.641 7568 Recovering log #1670
-2024/04/03-11:51:24.648 7568 Delete type=0 #1670
-2024/04/03-11:51:24.648 7568 Delete type=3 #1668
-2024/04/03-12:48:18.021 1624 Level-0 table #1676: started
-2024/04/03-12:48:18.021 1624 Level-0 table #1676: 0 bytes OK
-2024/04/03-12:48:18.028 1624 Delete type=0 #1674
-2024/04/03-12:48:18.033 1624 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.033 1624 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.100 7568 Recovering log #1683
+2024/04/04-16:32:14.108 7568 Delete type=0 #1683
+2024/04/04-16:32:14.108 7568 Delete type=3 #1681
+2024/04/06-18:59:01.913 1624 Level-0 table #1688: started
+2024/04/06-18:59:01.913 1624 Level-0 table #1688: 0 bytes OK
+2024/04/06-18:59:01.918 1624 Delete type=0 #1686
+2024/04/06-18:59:01.923 1624 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.924 1624 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-class-features/MANIFEST-001677 b/packs/gps-class-features/MANIFEST-001677
deleted file mode 100644
index babeb254..00000000
Binary files a/packs/gps-class-features/MANIFEST-001677 and /dev/null differ
diff --git a/packs/gps-class-features/MANIFEST-001689 b/packs/gps-class-features/MANIFEST-001689
new file mode 100644
index 00000000..b15c7132
Binary files /dev/null and b/packs/gps-class-features/MANIFEST-001689 differ
diff --git a/packs/gps-generic-features/001718.ldb b/packs/gps-generic-features/001718.ldb
deleted file mode 100644
index 6bc47118..00000000
Binary files a/packs/gps-generic-features/001718.ldb and /dev/null differ
diff --git a/packs/gps-class-features/001679.log b/packs/gps-generic-features/001738.log
similarity index 100%
rename from packs/gps-class-features/001679.log
rename to packs/gps-generic-features/001738.log
diff --git a/packs/gps-generic-features/001740.ldb b/packs/gps-generic-features/001740.ldb
new file mode 100644
index 00000000..74145039
Binary files /dev/null and b/packs/gps-generic-features/001740.ldb differ
diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT
index 0cda79fd..438257d4 100644
--- a/packs/gps-generic-features/CURRENT
+++ b/packs/gps-generic-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001723
+MANIFEST-001736
diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG
index 58313cb7..eba8c967 100644
--- a/packs/gps-generic-features/LOG
+++ b/packs/gps-generic-features/LOG
@@ -1,8 +1,15 @@
-2024/04/03-16:29:30.910 7568 Recovering log #1721
-2024/04/03-16:29:30.919 7568 Delete type=0 #1721
-2024/04/03-16:29:30.920 7568 Delete type=3 #1719
-2024/04/03-16:37:38.704 1624 Level-0 table #1726: started
-2024/04/03-16:37:38.704 1624 Level-0 table #1726: 0 bytes OK
-2024/04/03-16:37:38.708 1624 Delete type=0 #1724
-2024/04/03-16:37:38.725 1624 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.725 1624 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.198 756c Recovering log #1733
+2024/04/06-18:59:33.205 756c Delete type=0 #1733
+2024/04/06-18:59:33.205 756c Delete type=3 #1731
+2024/04/07-03:11:30.920 1624 Level-0 table #1739: started
+2024/04/07-03:11:30.929 1624 Level-0 table #1739: 110410 bytes OK
+2024/04/07-03:11:30.934 1624 Delete type=0 #1737
+2024/04/07-03:11:30.934 1624 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.935 1624 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items!eUTU3JSbo7X98INw' @ 357 : 1
+2024/04/07-03:11:30.935 1624 Compacting 1@1 + 1@2 files
+2024/04/07-03:11:30.940 1624 Generated table #1740@1: 7 keys, 22139 bytes
+2024/04/07-03:11:30.940 1624 Compacted 1@1 + 1@2 files => 22139 bytes
+2024/04/07-03:11:30.943 1624 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/07-03:11:30.943 1624 Delete type=2 #1735
+2024/04/07-03:11:30.943 1624 Delete type=2 #1739
+2024/04/07-03:11:30.952 1624 Manual compaction at level-1 from '!items!eUTU3JSbo7X98INw' @ 357 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-generic-features/LOG.old b/packs/gps-generic-features/LOG.old
index fa2f682b..8625ae7f 100644
--- a/packs/gps-generic-features/LOG.old
+++ b/packs/gps-generic-features/LOG.old
@@ -1,8 +1,15 @@
-2024/04/03-11:51:24.754 7570 Recovering log #1716
-2024/04/03-11:51:24.761 7570 Delete type=0 #1716
-2024/04/03-11:51:24.762 7570 Delete type=3 #1714
-2024/04/03-12:48:18.005 1624 Level-0 table #1722: started
-2024/04/03-12:48:18.005 1624 Level-0 table #1722: 0 bytes OK
-2024/04/03-12:48:18.013 1624 Delete type=0 #1720
-2024/04/03-12:48:18.033 1624 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.033 1624 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.209 7564 Recovering log #1729
+2024/04/04-16:32:14.222 7564 Delete type=0 #1729
+2024/04/04-16:32:14.223 7564 Delete type=3 #1727
+2024/04/06-18:59:01.927 1624 Level-0 table #1734: started
+2024/04/06-18:59:01.933 1624 Level-0 table #1734: 78970 bytes OK
+2024/04/06-18:59:01.935 1624 Delete type=0 #1732
+2024/04/06-18:59:01.944 1624 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.945 1624 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items!eUTU3JSbo7X98INw' @ 352 : 1
+2024/04/06-18:59:01.946 1624 Compacting 1@1 + 1@2 files
+2024/04/06-18:59:01.952 1624 Generated table #1735@1: 7 keys, 22071 bytes
+2024/04/06-18:59:01.952 1624 Compacted 1@1 + 1@2 files => 22071 bytes
+2024/04/06-18:59:01.958 1624 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/04/06-18:59:01.958 1624 Delete type=2 #1718
+2024/04/06-18:59:01.958 1624 Delete type=2 #1734
+2024/04/06-18:59:01.967 1624 Manual compaction at level-1 from '!items!eUTU3JSbo7X98INw' @ 352 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-generic-features/MANIFEST-001723 b/packs/gps-generic-features/MANIFEST-001723
deleted file mode 100644
index 302c704f..00000000
Binary files a/packs/gps-generic-features/MANIFEST-001723 and /dev/null differ
diff --git a/packs/gps-generic-features/MANIFEST-001736 b/packs/gps-generic-features/MANIFEST-001736
new file mode 100644
index 00000000..bf25ca18
Binary files /dev/null and b/packs/gps-generic-features/MANIFEST-001736 differ
diff --git a/packs/gps-generic-features/001725.log b/packs/gps-homebrew-features/001684.log
similarity index 100%
rename from packs/gps-generic-features/001725.log
rename to packs/gps-homebrew-features/001684.log
diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT
index 2bf6833f..73519710 100644
--- a/packs/gps-homebrew-features/CURRENT
+++ b/packs/gps-homebrew-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001670
+MANIFEST-001682
diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG
index af8eaeea..8869f05b 100644
--- a/packs/gps-homebrew-features/LOG
+++ b/packs/gps-homebrew-features/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:30.937 7564 Recovering log #1668
-2024/04/03-16:29:30.945 7564 Delete type=0 #1668
-2024/04/03-16:29:30.945 7564 Delete type=3 #1666
-2024/04/03-16:37:38.708 1624 Level-0 table #1673: started
-2024/04/03-16:37:38.708 1624 Level-0 table #1673: 0 bytes OK
-2024/04/03-16:37:38.712 1624 Delete type=0 #1671
-2024/04/03-16:37:38.725 1624 Manual compaction at level-0 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.725 1624 Manual compaction at level-1 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.215 7564 Recovering log #1680
+2024/04/06-18:59:33.220 7564 Delete type=0 #1680
+2024/04/06-18:59:33.221 7564 Delete type=3 #1678
+2024/04/07-03:11:30.943 1624 Level-0 table #1685: started
+2024/04/07-03:11:30.943 1624 Level-0 table #1685: 0 bytes OK
+2024/04/07-03:11:30.946 1624 Delete type=0 #1683
+2024/04/07-03:11:30.952 1624 Manual compaction at level-0 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.952 1624 Manual compaction at level-1 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-features/LOG.old b/packs/gps-homebrew-features/LOG.old
index 9fd59799..3843518c 100644
--- a/packs/gps-homebrew-features/LOG.old
+++ b/packs/gps-homebrew-features/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.793 7564 Recovering log #1664
-2024/04/03-11:51:24.799 7564 Delete type=0 #1664
-2024/04/03-11:51:24.799 7564 Delete type=3 #1662
-2024/04/03-12:48:18.036 1624 Level-0 table #1669: started
-2024/04/03-12:48:18.037 1624 Level-0 table #1669: 0 bytes OK
-2024/04/03-12:48:18.041 1624 Delete type=0 #1667
-2024/04/03-12:48:18.063 1624 Manual compaction at level-0 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.064 1624 Manual compaction at level-1 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.235 7568 Recovering log #1676
+2024/04/04-16:32:14.242 7568 Delete type=0 #1676
+2024/04/04-16:32:14.242 7568 Delete type=3 #1674
+2024/04/06-18:59:01.935 1624 Level-0 table #1681: started
+2024/04/06-18:59:01.935 1624 Level-0 table #1681: 0 bytes OK
+2024/04/06-18:59:01.938 1624 Delete type=0 #1679
+2024/04/06-18:59:01.944 1624 Manual compaction at level-0 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.944 1624 Manual compaction at level-1 from '!items!Ftq2EZtyz3mv7C7Q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-features/MANIFEST-001670 b/packs/gps-homebrew-features/MANIFEST-001682
similarity index 67%
rename from packs/gps-homebrew-features/MANIFEST-001670
rename to packs/gps-homebrew-features/MANIFEST-001682
index 913d6437..835c6601 100644
Binary files a/packs/gps-homebrew-features/MANIFEST-001670 and b/packs/gps-homebrew-features/MANIFEST-001682 differ
diff --git a/packs/gps-homebrew-features/001672.log b/packs/gps-homebrew-items/001691.log
similarity index 100%
rename from packs/gps-homebrew-features/001672.log
rename to packs/gps-homebrew-items/001691.log
diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT
index c7935bd9..82f6f310 100644
--- a/packs/gps-homebrew-items/CURRENT
+++ b/packs/gps-homebrew-items/CURRENT
@@ -1 +1 @@
-MANIFEST-001677
+MANIFEST-001689
diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG
index a5a547ba..4df816d8 100644
--- a/packs/gps-homebrew-items/LOG
+++ b/packs/gps-homebrew-items/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:30.963 7568 Recovering log #1675
-2024/04/03-16:29:30.974 7568 Delete type=0 #1675
-2024/04/03-16:29:30.974 7568 Delete type=3 #1673
-2024/04/03-16:37:38.714 1624 Level-0 table #1680: started
-2024/04/03-16:37:38.714 1624 Level-0 table #1680: 0 bytes OK
-2024/04/03-16:37:38.718 1624 Delete type=0 #1678
-2024/04/03-16:37:38.725 1624 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.725 1624 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.224 756c Recovering log #1687
+2024/04/06-18:59:33.230 756c Delete type=0 #1687
+2024/04/06-18:59:33.230 756c Delete type=3 #1685
+2024/04/07-03:11:30.950 1624 Level-0 table #1692: started
+2024/04/07-03:11:30.950 1624 Level-0 table #1692: 0 bytes OK
+2024/04/07-03:11:30.952 1624 Delete type=0 #1690
+2024/04/07-03:11:30.952 1624 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.953 1624 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-items/LOG.old b/packs/gps-homebrew-items/LOG.old
index f54eba02..414f6150 100644
--- a/packs/gps-homebrew-items/LOG.old
+++ b/packs/gps-homebrew-items/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.826 7570 Recovering log #1671
-2024/04/03-11:51:24.833 7570 Delete type=0 #1671
-2024/04/03-11:51:24.833 7570 Delete type=3 #1669
-2024/04/03-12:48:18.028 1624 Level-0 table #1676: started
-2024/04/03-12:48:18.028 1624 Level-0 table #1676: 0 bytes OK
-2024/04/03-12:48:18.032 1624 Delete type=0 #1674
-2024/04/03-12:48:18.033 1624 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.033 1624 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.248 7564 Recovering log #1683
+2024/04/04-16:32:14.255 7564 Delete type=0 #1683
+2024/04/04-16:32:14.255 7564 Delete type=3 #1681
+2024/04/06-18:59:01.941 1624 Level-0 table #1688: started
+2024/04/06-18:59:01.941 1624 Level-0 table #1688: 0 bytes OK
+2024/04/06-18:59:01.944 1624 Delete type=0 #1686
+2024/04/06-18:59:01.944 1624 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.944 1624 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-items/MANIFEST-001677 b/packs/gps-homebrew-items/MANIFEST-001689
similarity index 75%
rename from packs/gps-homebrew-items/MANIFEST-001677
rename to packs/gps-homebrew-items/MANIFEST-001689
index 8a0f1f95..177bf1db 100644
Binary files a/packs/gps-homebrew-items/MANIFEST-001677 and b/packs/gps-homebrew-items/MANIFEST-001689 differ
diff --git a/packs/gps-homebrew-items/001679.log b/packs/gps-homebrew-spells/001362.log
similarity index 100%
rename from packs/gps-homebrew-items/001679.log
rename to packs/gps-homebrew-spells/001362.log
diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT
index 105d6b3a..20ae6d31 100644
--- a/packs/gps-homebrew-spells/CURRENT
+++ b/packs/gps-homebrew-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-001348
+MANIFEST-001360
diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG
index d61d4482..b2e50b2d 100644
--- a/packs/gps-homebrew-spells/LOG
+++ b/packs/gps-homebrew-spells/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:30.981 7564 Recovering log #1346
-2024/04/03-16:29:30.988 7564 Delete type=0 #1346
-2024/04/03-16:29:30.988 7564 Delete type=3 #1344
-2024/04/03-16:37:38.719 1624 Level-0 table #1351: started
-2024/04/03-16:37:38.719 1624 Level-0 table #1351: 0 bytes OK
-2024/04/03-16:37:38.724 1624 Delete type=0 #1349
-2024/04/03-16:37:38.725 1624 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.725 1624 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.242 7564 Recovering log #1358
+2024/04/06-18:59:33.251 7564 Delete type=0 #1358
+2024/04/06-18:59:33.251 7564 Delete type=3 #1356
+2024/04/07-03:11:30.946 1624 Level-0 table #1363: started
+2024/04/07-03:11:30.946 1624 Level-0 table #1363: 0 bytes OK
+2024/04/07-03:11:30.949 1624 Delete type=0 #1361
+2024/04/07-03:11:30.952 1624 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.953 1624 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-spells/LOG.old b/packs/gps-homebrew-spells/LOG.old
index 2d31fdca..3bf85c55 100644
--- a/packs/gps-homebrew-spells/LOG.old
+++ b/packs/gps-homebrew-spells/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.849 7564 Recovering log #1342
-2024/04/03-11:51:24.854 7564 Delete type=0 #1342
-2024/04/03-11:51:24.854 7564 Delete type=3 #1340
-2024/04/03-12:48:18.042 1624 Level-0 table #1347: started
-2024/04/03-12:48:18.042 1624 Level-0 table #1347: 0 bytes OK
-2024/04/03-12:48:18.048 1624 Delete type=0 #1345
-2024/04/03-12:48:18.063 1624 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.064 1624 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.262 7568 Recovering log #1354
+2024/04/04-16:32:14.269 7568 Delete type=0 #1354
+2024/04/04-16:32:14.269 7568 Delete type=3 #1352
+2024/04/06-18:59:01.938 1624 Level-0 table #1359: started
+2024/04/06-18:59:01.939 1624 Level-0 table #1359: 0 bytes OK
+2024/04/06-18:59:01.941 1624 Delete type=0 #1357
+2024/04/06-18:59:01.944 1624 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.944 1624 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-spells/MANIFEST-001348 b/packs/gps-homebrew-spells/MANIFEST-001360
similarity index 73%
rename from packs/gps-homebrew-spells/MANIFEST-001348
rename to packs/gps-homebrew-spells/MANIFEST-001360
index 3fd087e8..bad3fec9 100644
Binary files a/packs/gps-homebrew-spells/MANIFEST-001348 and b/packs/gps-homebrew-spells/MANIFEST-001360 differ
diff --git a/packs/gps-homebrew-spells/001350.log b/packs/gps-items/001682.log
similarity index 100%
rename from packs/gps-homebrew-spells/001350.log
rename to packs/gps-items/001682.log
diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT
index abfa1834..543234f6 100644
--- a/packs/gps-items/CURRENT
+++ b/packs/gps-items/CURRENT
@@ -1 +1 @@
-MANIFEST-001668
+MANIFEST-001680
diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG
index 5988b0a6..39b9720e 100644
--- a/packs/gps-items/LOG
+++ b/packs/gps-items/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:30.869 7568 Recovering log #1666
-2024/04/03-16:29:30.876 7568 Delete type=0 #1666
-2024/04/03-16:29:30.876 7568 Delete type=3 #1664
-2024/04/03-16:37:38.690 1624 Level-0 table #1671: started
-2024/04/03-16:37:38.690 1624 Level-0 table #1671: 0 bytes OK
-2024/04/03-16:37:38.694 1624 Delete type=0 #1669
-2024/04/03-16:37:38.699 1624 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.699 1624 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.147 756c Recovering log #1678
+2024/04/06-18:59:33.153 756c Delete type=0 #1678
+2024/04/06-18:59:33.153 756c Delete type=3 #1676
+2024/04/07-03:11:30.916 1624 Level-0 table #1683: started
+2024/04/07-03:11:30.916 1624 Level-0 table #1683: 0 bytes OK
+2024/04/07-03:11:30.920 1624 Delete type=0 #1681
+2024/04/07-03:11:30.934 1624 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.935 1624 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-items/LOG.old b/packs/gps-items/LOG.old
index 8f1c1d2b..2ce0e8b2 100644
--- a/packs/gps-items/LOG.old
+++ b/packs/gps-items/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.657 7570 Recovering log #1662
-2024/04/03-11:51:24.666 7570 Delete type=0 #1662
-2024/04/03-11:51:24.666 7570 Delete type=3 #1660
-2024/04/03-12:48:18.013 1624 Level-0 table #1667: started
-2024/04/03-12:48:18.013 1624 Level-0 table #1667: 0 bytes OK
-2024/04/03-12:48:18.019 1624 Delete type=0 #1665
-2024/04/03-12:48:18.033 1624 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.033 1624 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.135 7564 Recovering log #1674
+2024/04/04-16:32:14.143 7564 Delete type=0 #1674
+2024/04/04-16:32:14.145 7564 Delete type=3 #1672
+2024/04/06-18:59:01.918 1624 Level-0 table #1679: started
+2024/04/06-18:59:01.919 1624 Level-0 table #1679: 0 bytes OK
+2024/04/06-18:59:01.922 1624 Delete type=0 #1677
+2024/04/06-18:59:01.923 1624 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.924 1624 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-items/MANIFEST-001668 b/packs/gps-items/MANIFEST-001680
similarity index 57%
rename from packs/gps-items/MANIFEST-001668
rename to packs/gps-items/MANIFEST-001680
index 641f2143..0006c154 100644
Binary files a/packs/gps-items/MANIFEST-001668 and b/packs/gps-items/MANIFEST-001680 differ
diff --git a/packs/gps-items/001670.log b/packs/gps-monster-features/001676.log
similarity index 100%
rename from packs/gps-items/001670.log
rename to packs/gps-monster-features/001676.log
diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT
index 42fe103f..c8fbc2cb 100644
--- a/packs/gps-monster-features/CURRENT
+++ b/packs/gps-monster-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001662
+MANIFEST-001674
diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG
index de3a7d8f..bdfa68c4 100644
--- a/packs/gps-monster-features/LOG
+++ b/packs/gps-monster-features/LOG
@@ -1,8 +1,8 @@
-2024/04/03-16:29:30.880 7564 Recovering log #1660
-2024/04/03-16:29:30.889 7564 Delete type=0 #1660
-2024/04/03-16:29:30.890 7564 Delete type=3 #1658
-2024/04/03-16:37:38.695 1624 Level-0 table #1665: started
-2024/04/03-16:37:38.695 1624 Level-0 table #1665: 0 bytes OK
-2024/04/03-16:37:38.698 1624 Delete type=0 #1663
-2024/04/03-16:37:38.699 1624 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.700 1624 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.172 7564 Recovering log #1672
+2024/04/06-18:59:33.179 7564 Delete type=0 #1672
+2024/04/06-18:59:33.179 7564 Delete type=3 #1670
+2024/04/07-03:11:30.913 1624 Level-0 table #1677: started
+2024/04/07-03:11:30.913 1624 Level-0 table #1677: 0 bytes OK
+2024/04/07-03:11:30.916 1624 Delete type=0 #1675
+2024/04/07-03:11:30.934 1624 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.935 1624 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-monster-features/LOG.old b/packs/gps-monster-features/LOG.old
index 56523802..b2cb4557 100644
--- a/packs/gps-monster-features/LOG.old
+++ b/packs/gps-monster-features/LOG.old
@@ -1,8 +1,8 @@
-2024/04/03-11:51:24.709 7568 Recovering log #1656
-2024/04/03-11:51:24.719 7568 Delete type=0 #1656
-2024/04/03-11:51:24.720 7568 Delete type=3 #1654
-2024/04/03-12:48:17.997 1624 Level-0 table #1661: started
-2024/04/03-12:48:17.997 1624 Level-0 table #1661: 0 bytes OK
-2024/04/03-12:48:18.001 1624 Delete type=0 #1659
-2024/04/03-12:48:18.001 1624 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:18.002 1624 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.168 7568 Recovering log #1668
+2024/04/04-16:32:14.175 7568 Delete type=0 #1668
+2024/04/04-16:32:14.175 7568 Delete type=3 #1666
+2024/04/06-18:59:01.910 1624 Level-0 table #1673: started
+2024/04/06-18:59:01.910 1624 Level-0 table #1673: 0 bytes OK
+2024/04/06-18:59:01.913 1624 Delete type=0 #1671
+2024/04/06-18:59:01.923 1624 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.924 1624 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-monster-features/MANIFEST-001662 b/packs/gps-monster-features/MANIFEST-001674
similarity index 57%
rename from packs/gps-monster-features/MANIFEST-001662
rename to packs/gps-monster-features/MANIFEST-001674
index caa13867..0b90110e 100644
Binary files a/packs/gps-monster-features/MANIFEST-001662 and b/packs/gps-monster-features/MANIFEST-001674 differ
diff --git a/packs/gps-monster-features/001664.log b/packs/gps-spells/001704.log
similarity index 100%
rename from packs/gps-monster-features/001664.log
rename to packs/gps-spells/001704.log
diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT
index 82f6f310..34d4090b 100644
--- a/packs/gps-spells/CURRENT
+++ b/packs/gps-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-001689
+MANIFEST-001702
diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG
index 3663bcac..13fdfc0d 100644
--- a/packs/gps-spells/LOG
+++ b/packs/gps-spells/LOG
@@ -1,15 +1,8 @@
-2024/04/03-16:29:30.808 756c Recovering log #1686
-2024/04/03-16:29:30.815 756c Delete type=0 #1686
-2024/04/03-16:29:30.815 756c Delete type=3 #1684
-2024/04/03-16:37:38.641 1624 Level-0 table #1692: started
-2024/04/03-16:37:38.644 1624 Level-0 table #1692: 14519 bytes OK
-2024/04/03-16:37:38.647 1624 Delete type=0 #1690
-2024/04/03-16:37:38.647 1624 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
-2024/04/03-16:37:38.647 1624 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at '!items!hQnFC6oL9kMPapxG' @ 540 : 1
-2024/04/03-16:37:38.649 1624 Compacting 1@1 + 1@2 files
-2024/04/03-16:37:38.681 1624 Generated table #1693@1: 41 keys, 142944 bytes
-2024/04/03-16:37:38.681 1624 Compacted 1@1 + 1@2 files => 142944 bytes
-2024/04/03-16:37:38.685 1624 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/04/03-16:37:38.686 1624 Delete type=2 #1688
-2024/04/03-16:37:38.686 1624 Delete type=2 #1692
-2024/04/03-16:37:38.699 1624 Manual compaction at level-1 from '!items!hQnFC6oL9kMPapxG' @ 540 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:33.082 756c Recovering log #1700
+2024/04/06-18:59:33.089 756c Delete type=0 #1700
+2024/04/06-18:59:33.089 756c Delete type=3 #1698
+2024/04/07-03:11:30.877 1624 Level-0 table #1705: started
+2024/04/07-03:11:30.878 1624 Level-0 table #1705: 0 bytes OK
+2024/04/07-03:11:30.881 1624 Delete type=0 #1703
+2024/04/07-03:11:30.890 1624 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/04/07-03:11:30.890 1624 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-spells/LOG.old b/packs/gps-spells/LOG.old
index bf1a4fa1..dd91c18e 100644
--- a/packs/gps-spells/LOG.old
+++ b/packs/gps-spells/LOG.old
@@ -1,15 +1,8 @@
-2024/04/03-11:51:24.622 7570 Recovering log #1681
-2024/04/03-11:51:24.628 7570 Delete type=0 #1681
-2024/04/03-11:51:24.628 7570 Delete type=3 #1679
-2024/04/03-12:48:17.952 1624 Level-0 table #1687: started
-2024/04/03-12:48:17.959 1624 Level-0 table #1687: 32399 bytes OK
-2024/04/03-12:48:17.965 1624 Delete type=0 #1685
-2024/04/03-12:48:17.967 1624 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
-2024/04/03-12:48:17.967 1624 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at '!items.effects!PWv5WUv3wfTKwfkj.2O1Z97CBnFFlGd79' @ 535 : 1
-2024/04/03-12:48:17.967 1624 Compacting 1@1 + 1@2 files
-2024/04/03-12:48:17.984 1624 Generated table #1688@1: 41 keys, 142919 bytes
-2024/04/03-12:48:17.984 1624 Compacted 1@1 + 1@2 files => 142919 bytes
-2024/04/03-12:48:17.988 1624 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/04/03-12:48:17.988 1624 Delete type=2 #1683
-2024/04/03-12:48:17.989 1624 Delete type=2 #1687
-2024/04/03-12:48:18.001 1624 Manual compaction at level-1 from '!items.effects!PWv5WUv3wfTKwfkj.2O1Z97CBnFFlGd79' @ 535 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/04/04-16:32:14.069 7564 Recovering log #1696
+2024/04/04-16:32:14.075 7564 Delete type=0 #1696
+2024/04/04-16:32:14.075 7564 Delete type=3 #1694
+2024/04/06-18:59:01.904 1624 Level-0 table #1701: started
+2024/04/06-18:59:01.905 1624 Level-0 table #1701: 0 bytes OK
+2024/04/06-18:59:01.910 1624 Delete type=0 #1699
+2024/04/06-18:59:01.923 1624 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/04/06-18:59:01.924 1624 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-spells/MANIFEST-001689 b/packs/gps-spells/MANIFEST-001689
deleted file mode 100644
index 3394fab4..00000000
Binary files a/packs/gps-spells/MANIFEST-001689 and /dev/null differ
diff --git a/packs/gps-spells/MANIFEST-001702 b/packs/gps-spells/MANIFEST-001702
new file mode 100644
index 00000000..867854c6
Binary files /dev/null and b/packs/gps-spells/MANIFEST-001702 differ
diff --git a/scripts/helpers.js b/scripts/helpers.js
index 6e5ec769..a12b479e 100644
--- a/scripts/helpers.js
+++ b/scripts/helpers.js
@@ -33,13 +33,12 @@ export async function handleDialogPromises(userDialogPromise, gmDialogPromise) {
         let anyDialogInteracted = false;
 
         const checkAndResolve = () => {
-            // If either dialog has been interacted with by a user, resolve.
             if (anyDialogInteracted) {
                 resolve(anyDialogInteracted);
             }
-            // If both dialogs resolved without user interaction, resolve or reject based on your logic.
+
             else if (userResolved && gmResolved) {
-                resolve({programmaticallyClosed: true}); // or use reject based on your needs
+                resolve({programmaticallyClosed: true});
             }
         };
 
diff --git a/scripts/macros/counterspell.js b/scripts/macros/counterspell.js
index 0865bfe4..3276f931 100644
--- a/scripts/macros/counterspell.js
+++ b/scripts/macros/counterspell.js
@@ -74,72 +74,89 @@ export async function counterspell({ workflowData }) {
     return validTokens;
     }
 
-    let validTokenSecondary;
-    let selectedToken;
-    (!validTokenSecondary) ? selectedToken = workflow.token : selectedToken = validTokenSecondary;
-
-    let findCounterspellTokensPrimary = findCounterspellTokens(selectedToken, (checkedToken, initiatingToken) => {
-        return checkedToken.id === initiatingToken.id || checkedToken.document.disposition === initiatingToken.document.disposition;
-    });
-    
+    let selectedToken = workflow.token;
     let castLevel = false;
     let browserUser;
+
+    await initialCounterspellProcess(workflow, lastMessage, castLevel, selectedToken);
     
-    for (const validTokenPrimary of findCounterspellTokensPrimary) {
-        if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [game.users.find((u) => u.isGM && u.active).id] });
-
-        let workflowStatus = workflow.aborted;
-        if(workflowStatus === true) return;
-        let actorUuidPrimary = validTokenPrimary.actor.uuid;
-        const dialogTitlePrimary = `${validTokenPrimary.actor.name} | Counterspell`;
-        const dialogTitleGM = `Waiting for ${validTokenPrimary.actor.name}'s selection | Counterspell`;
-        castLevel = !castLevel ? workflow.castData.castLevel : castLevel;
-        let originTokenUuidPrimary = workflow.token.document.uuid;
-        browserUser = MidiQOL.playerForActor(validTokenPrimary.actor);
-        if (!browserUser.active) {
-            browserUser = game.users?.activeGM;
-        }
+    async function initialCounterspellProcess(workflow, lastMessage, castLevel, selectedToken) {
+        let findCounterspellTokensPrimary = findCounterspellTokens(selectedToken, (checkedToken, initiatingToken) => {
+            return checkedToken.id === initiatingToken.id || checkedToken.document.disposition === initiatingToken.document.disposition;
+        });
 
-        let content = `<img src="${validTokenPrimary.actor.img}" style="width: 25px; height: auto;" /> ${validTokenPrimary.actor.name} has a reaction available for a spell triggering Counterspell.`
-        let chatData = {
-        user: game.users.find(u => u.isGM).id,
-        content: content,
-        whisper: game.users.find(u => u.isGM).id
-        };
-        let notificationMessage = await MidiQOL.socket().executeAsGM("createChatMessage", { chatData });
+        if(findCounterspellTokensPrimary.length === 0 || !findCounterspellTokensPrimary) return;
+
+        for (const validTokenPrimary of findCounterspellTokensPrimary) {
+            if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [game.users.find((u) => u.isGM && u.active).id] });
+            let workflowStatus = workflow.aborted;
+            if(workflowStatus === true) return;
+            let actorUuidPrimary = validTokenPrimary.actor.uuid;
+            const dialogTitlePrimary = `${validTokenPrimary.actor.name} | Counterspell`;
+            const dialogTitleGM = `Waiting for ${validTokenPrimary.actor.name}'s selection | Counterspell`;
+            castLevel = !castLevel ? workflow.castData.castLevel : castLevel;
+            let originTokenUuidPrimary = workflow.token.document.uuid;
+            browserUser = MidiQOL.playerForActor(validTokenPrimary.actor);
+            if (!browserUser.active) {
+                browserUser = game.users?.activeGM;
+            }
 
-        let result;
+            const currentIndex = findCounterspellTokensPrimary.indexOf(validTokenPrimary);
+            const isLastToken = currentIndex === findCounterspellTokensPrimary.length - 1;
 
-        if (game.settings.get('gambits-premades', 'Mirror 3rd Party Dialog for GMs') && browserUser.id !== game.users?.activeGM.id) {
-            let userDialogPromise = socket.executeAsUser("showCounterspellDialog", browserUser.id, originTokenUuidPrimary, actorUuidPrimary, validTokenPrimary.document.uuid, castLevel, dialogTitlePrimary, `counterspell_${browserUser.id}`, 'user').then(res => ({...res, source: "user"}));
-            let gmDialogPromise = socket.executeAsGM("showCounterspellDialog", originTokenUuidPrimary, actorUuidPrimary, validTokenPrimary.document.uuid, castLevel, dialogTitleGM, `counterspell_${game.users?.activeGM.id}`, 'gm').then(res => ({...res, source: "gm"}));
-    
-            result = await socket.executeAsGM("handleDialogPromises", userDialogPromise, gmDialogPromise);
-        } else {
-            result = await socket.executeAsUser("showCounterspellDialog", browserUser.id, originTokenUuidPrimary, actorUuidPrimary, validTokenPrimary.document.uuid, castLevel, dialogTitlePrimary);
-        }
-        
-        let { counterspellSuccess, counterspellLevel, source, programmaticallyClosed } = result;
+            let content = `<img src="${validTokenPrimary.actor.img}" style="width: 25px; height: auto;" /> ${validTokenPrimary.actor.name} has a reaction available for a spell triggering Counterspell.`
+            let chatData = {
+            user: game.users.find(u => u.isGM).id,
+            content: content,
+            whisper: game.users.find(u => u.isGM).id
+            };
+            let notificationMessage = await MidiQOL.socket().executeAsGM("createChatMessage", { chatData });
+
+            let result;
+
+            if (game.settings.get('gambits-premades', 'Mirror 3rd Party Dialog for GMs') && browserUser.id !== game.users?.activeGM.id) {
+                let userDialogPromise = socket.executeAsUser("showCounterspellDialog", browserUser.id, originTokenUuidPrimary, actorUuidPrimary, validTokenPrimary.document.uuid, castLevel, dialogTitlePrimary, `counterspell_${browserUser.id}`, 'user').then(res => ({...res, source: "user"}));
+                let gmDialogPromise = socket.executeAsGM("showCounterspellDialog", originTokenUuidPrimary, actorUuidPrimary, validTokenPrimary.document.uuid, castLevel, dialogTitleGM, `counterspell_${game.users?.activeGM.id}`, 'gm').then(res => ({...res, source: "gm"}));
         
-        if ((counterspellSuccess === false || !counterspellSuccess) && programmaticallyClosed === false) {
-            if(source && source === "user") await socket.executeAsGM("closeDialogById", { dialogId: `counterspell_${game.users?.activeGM.id}` });
-            if(source && source === "gm") await socket.executeAsUser("closeDialogById", browserUser.id, { dialogId: `counterspell_${browserUser.id}` });
-            if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
-            await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessage._id });
-            continue;
-        }
-        if (counterspellSuccess === true && programmaticallyClosed === false) {
-            if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
-            await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessage._id });
-            castLevel = counterspellLevel;
+                result = await socket.executeAsGM("handleDialogPromises", userDialogPromise, gmDialogPromise);
+            } else {
+                result = await socket.executeAsUser("showCounterspellDialog", browserUser.id, originTokenUuidPrimary, actorUuidPrimary, validTokenPrimary.document.uuid, castLevel, dialogTitlePrimary);
+            }
+            
+            let { counterspellSuccess, counterspellLevel, source, programmaticallyClosed } = result;
             
+            if (!counterspellSuccess && !programmaticallyClosed) {
+                if(source && source === "user") await socket.executeAsGM("closeDialogById", { dialogId: `counterspell_${game.users?.activeGM.id}` });
+                if(source && source === "gm") await socket.executeAsUser("closeDialogById", browserUser.id, { dialogId: `counterspell_${browserUser.id}` });
+                if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
+                await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessage._id });
+                continue;
+            }
+            else if (!counterspellSuccess && isLastToken && !programmaticallyClosed) {
+                if(source && source === "user") await socket.executeAsGM("closeDialogById", { dialogId: `counterspell_${game.users?.activeGM.id}` });
+                if(source && source === "gm") await socket.executeAsUser("closeDialogById", browserUser.id, { dialogId: `counterspell_${browserUser.id}` });
+                if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
+                await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessageSecondary._id });
+                return workflow.aborted = false;
+            }
+            else if (counterspellSuccess === true && !programmaticallyClosed) {
+                if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
+                await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessage._id });
+                castLevel = counterspellLevel;
+                await secondaryCounterspellProcess(workflow, lastMessage, castLevel, validTokenPrimary);
+                break;
+            }
+        }
+    }
+
+    async function secondaryCounterspellProcess(workflow, lastMessage, castLevel, validTokenPrimary) {        
             let findCounterspellTokensSecondary = findCounterspellTokens(validTokenPrimary, (checkedToken, initiatingToken) => {
                 return checkedToken.document.disposition === initiatingToken.document.disposition;
             });
 
-            if(findCounterspellTokensSecondary.length === 0) return workflow.aborted = true;
+            if(findCounterspellTokensSecondary.length === 0 || !findCounterspellTokensSecondary) return workflow.aborted = true;
 
-            for (validTokenSecondary of findCounterspellTokensSecondary) {
+            for (const validTokenSecondary of findCounterspellTokensSecondary) {
                 let actorUuidSecondary = validTokenSecondary.actor.uuid;
                 const dialogTitleSecondary = `${validTokenSecondary.actor.name} | Counterspell`;
                 const dialogTitleGMSecondary = `Waiting for ${validTokenSecondary.actor.name}'s selection | Counterspell`;
@@ -173,20 +190,21 @@ export async function counterspell({ workflowData }) {
 
                 let { counterspellSuccess, counterspellLevel, source, programmaticallyClosed } = result;
 
-                if (counterspellSuccess === true && programmaticallyClosed) {
+                if (counterspellSuccess === true && !programmaticallyClosed) {
                     if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
                     await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessageSecondary._id });
                     castLevel = counterspellLevel;
+                    await initialCounterspellProcess(workflow, lastMessage, castLevel, validTokenSecondary);
                     break;
                 }
-                if (!counterspellSuccess && isLastToken && !programmaticallyClosed) {
+                else if (!counterspellSuccess && isLastToken && !programmaticallyClosed) {
                     if(source && source === "user") await socket.executeAsGM("closeDialogById", { dialogId: `counterspell_${game.users?.activeGM.id}` });
                     if(source && source === "gm") await socket.executeAsUser("closeDialogById", browserUser.id, { dialogId: `counterspell_${browserUser.id}` });
                     if(lastMessage && validTokenPrimary.actor.type === "character") lastMessage.update({ whisper: [] });
                     await socket.executeAsGM("deleteChatMessage", { chatId: notificationMessageSecondary._id });
                     return workflow.aborted = true;
                 }
-                if (!counterspellSuccess && !programmaticallyClosed) {
+                else if (!counterspellSuccess && !programmaticallyClosed) {
                     if(source && source === "user") await socket.executeAsGM("closeDialogById", { dialogId: `counterspell_${game.users?.activeGM.id}` });
                     if(source && source === "gm") await socket.executeAsUser("closeDialogById", browserUser.id, { dialogId: `counterspell_${browserUser.id}` });
                     if(lastMessage) lastMessage.update({ whisper: [] });
@@ -196,7 +214,6 @@ export async function counterspell({ workflowData }) {
             }
         }
     }
-}
 
 export async function showCounterspellDialog(originTokenUuid, actorUuid, tokenUuid, castLevel, dialogTitle, dialogId, source) {
     const module = await import('../module.js');
@@ -229,13 +246,13 @@ export async function showCounterspellDialog(originTokenUuid, actorUuid, tokenUu
                     callback: async () => {
                         dialog.dialogState.interacted = true;
                         dialog.dialogState.decision = "yes";
+                        let actor = await fromUuid(actorUuid);
+                        let browserUser = MidiQOL.playerForActor(actor);
                         if(source && source === "user") await socket.executeAsGM("closeDialogById", { dialogId: `counterspell_${game.users?.activeGM.id}` });
                         if(source && source === "gm") await socket.executeAsUser("closeDialogById", browserUser.id, { dialogId: `counterspell_${browserUser.id}` });
-                        let actor = await fromUuid(actorUuid);
                         let uuid = actor.uuid;
                         let token = await fromUuid(tokenUuid);
                         let originToken = await fromUuid(originTokenUuid);
-                        let browserUser = MidiQOL.playerForActor(actor);
 
                         let chosenSpell = actor.items.find(i => i.name.toLowerCase().includes("counterspell"));