diff --git a/packs/abilities/000545.ldb b/packs/abilities/000545.ldb
deleted file mode 100644
index 12de92c0a..000000000
Binary files a/packs/abilities/000545.ldb and /dev/null differ
diff --git a/packs/abilities/000603.ldb b/packs/abilities/000603.ldb
new file mode 100644
index 000000000..ac7f70336
Binary files /dev/null and b/packs/abilities/000603.ldb differ
diff --git a/packs/abilities/000597.log b/packs/abilities/000621.log
similarity index 100%
rename from packs/abilities/000597.log
rename to packs/abilities/000621.log
diff --git a/packs/abilities/CURRENT b/packs/abilities/CURRENT
index 23755cb30..ebca9bff5 100644
--- a/packs/abilities/CURRENT
+++ b/packs/abilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000595
+MANIFEST-000620
diff --git a/packs/abilities/LOG b/packs/abilities/LOG
index a0d656d3d..333f7f2a8 100644
--- a/packs/abilities/LOG
+++ b/packs/abilities/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.317 6d34 Recovering log #593
-2023/11/06-12:17:57.322 6d34 Delete type=0 #593
-2023/11/06-12:17:57.322 6d34 Delete type=3 #591
-2023/11/06-12:19:30.527 6d70 Level-0 table #598: started
-2023/11/06-12:19:30.527 6d70 Level-0 table #598: 0 bytes OK
-2023/11/06-12:19:30.529 6d70 Delete type=0 #596
-2023/11/06-12:19:30.533 6d70 Manual compaction at level-0 from '!folders!rAhydZslb0d4Cvio' @ 72057594037927935 : 1 .. '!items!ztjoTjB46kPDTEfV' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:57.150 95c8 Recovering log #618
+2023/11/11-17:59:57.154 95c8 Delete type=0 #618
+2023/11/11-17:59:57.154 95c8 Delete type=3 #616
diff --git a/packs/abilities/LOG.old b/packs/abilities/LOG.old
index 7a23bb04a..8fc1736e3 100644
--- a/packs/abilities/LOG.old
+++ b/packs/abilities/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.669 5940 Recovering log #589
-2023/11/06-11:44:25.673 5940 Delete type=0 #589
-2023/11/06-11:44:25.673 5940 Delete type=3 #587
-2023/11/06-12:14:26.843 378c Level-0 table #594: started
-2023/11/06-12:14:26.843 378c Level-0 table #594: 0 bytes OK
-2023/11/06-12:14:26.845 378c Delete type=0 #592
-2023/11/06-12:14:26.845 378c Manual compaction at level-0 from '!folders!rAhydZslb0d4Cvio' @ 72057594037927935 : 1 .. '!items!ztjoTjB46kPDTEfV' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.366 5d04 Recovering log #615
+2023/11/11-17:55:50.370 5d04 Delete type=0 #615
+2023/11/11-17:55:50.371 5d04 Delete type=3 #614
+2023/11/11-17:59:45.396 2e84 Level-0 table #619: started
+2023/11/11-17:59:45.396 2e84 Level-0 table #619: 0 bytes OK
+2023/11/11-17:59:45.398 2e84 Delete type=0 #617
+2023/11/11-17:59:45.406 2e84 Manual compaction at level-0 from '!folders!rAhydZslb0d4Cvio' @ 72057594037927935 : 1 .. '!items!ztjoTjB46kPDTEfV' @ 0 : 0; will stop at (end)
diff --git a/packs/abilities/MANIFEST-000595 b/packs/abilities/MANIFEST-000595
deleted file mode 100644
index fed7218ab..000000000
Binary files a/packs/abilities/MANIFEST-000595 and /dev/null differ
diff --git a/packs/abilities/MANIFEST-000620 b/packs/abilities/MANIFEST-000620
new file mode 100644
index 000000000..a69f54141
Binary files /dev/null and b/packs/abilities/MANIFEST-000620 differ
diff --git a/packs/feats/000615.log b/packs/capabilities/000615.log
similarity index 100%
rename from packs/feats/000615.log
rename to packs/capabilities/000615.log
diff --git a/packs/capabilities/CURRENT b/packs/capabilities/CURRENT
index 9c7b9eaf8..1b7986b1b 100644
--- a/packs/capabilities/CURRENT
+++ b/packs/capabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000589
+MANIFEST-000614
diff --git a/packs/capabilities/LOG b/packs/capabilities/LOG
index d07797099..b93de2152 100644
--- a/packs/capabilities/LOG
+++ b/packs/capabilities/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.370 6d34 Recovering log #587
-2023/11/06-12:17:57.376 6d34 Delete type=0 #587
-2023/11/06-12:17:57.376 6d34 Delete type=3 #585
-2023/11/06-12:19:30.539 6d70 Level-0 table #592: started
-2023/11/06-12:19:30.539 6d70 Level-0 table #592: 0 bytes OK
-2023/11/06-12:19:30.540 6d70 Delete type=0 #590
-2023/11/06-12:19:30.543 6d70 Manual compaction at level-0 from '!folders!4yLFZsM42OJ7FDLn' @ 72057594037927935 : 1 .. '!items!zzJWpOj40dLelBm5' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:57.501 350 Recovering log #612
+2023/11/11-17:59:57.507 350 Delete type=0 #612
+2023/11/11-17:59:57.507 350 Delete type=3 #610
diff --git a/packs/capabilities/LOG.old b/packs/capabilities/LOG.old
index 93c1eb384..2e21700f4 100644
--- a/packs/capabilities/LOG.old
+++ b/packs/capabilities/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.719 5940 Recovering log #583
-2023/11/06-11:44:25.723 5940 Delete type=0 #583
-2023/11/06-11:44:25.723 5940 Delete type=3 #581
-2023/11/06-12:14:26.881 378c Level-0 table #588: started
-2023/11/06-12:14:26.881 378c Level-0 table #588: 0 bytes OK
-2023/11/06-12:14:26.883 378c Delete type=0 #586
-2023/11/06-12:14:26.885 378c Manual compaction at level-0 from '!folders!4yLFZsM42OJ7FDLn' @ 72057594037927935 : 1 .. '!items!zzJWpOj40dLelBm5' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.419 5d04 Recovering log #609
+2023/11/11-17:55:50.424 5d04 Delete type=0 #609
+2023/11/11-17:55:50.424 5d04 Delete type=3 #608
+2023/11/11-17:59:45.429 2e84 Level-0 table #613: started
+2023/11/11-17:59:45.429 2e84 Level-0 table #613: 0 bytes OK
+2023/11/11-17:59:45.431 2e84 Delete type=0 #611
+2023/11/11-17:59:45.434 2e84 Manual compaction at level-0 from '!folders!4yLFZsM42OJ7FDLn' @ 72057594037927935 : 1 .. '!items!zzJWpOj40dLelBm5' @ 0 : 0; will stop at (end)
diff --git a/packs/capabilities/MANIFEST-000589 b/packs/capabilities/MANIFEST-000614
similarity index 71%
rename from packs/capabilities/MANIFEST-000589
rename to packs/capabilities/MANIFEST-000614
index a6b26abd0..0aa66fb9f 100644
Binary files a/packs/capabilities/MANIFEST-000589 and b/packs/capabilities/MANIFEST-000614 differ
diff --git a/packs/capabilities/000591.log b/packs/dex-entries/000528.log
similarity index 100%
rename from packs/capabilities/000591.log
rename to packs/dex-entries/000528.log
diff --git a/packs/dex-entries/CURRENT b/packs/dex-entries/CURRENT
index 0329ab5d7..5e983ebeb 100644
--- a/packs/dex-entries/CURRENT
+++ b/packs/dex-entries/CURRENT
@@ -1 +1 @@
-MANIFEST-000509
+MANIFEST-000526
diff --git a/packs/dex-entries/LOG b/packs/dex-entries/LOG
index 7dc60ea62..b37696813 100644
--- a/packs/dex-entries/LOG
+++ b/packs/dex-entries/LOG
@@ -1,7 +1,8 @@
-2023/11/06-12:17:57.342 85dc Recovering log #507
-2023/11/06-12:17:57.346 85dc Delete type=0 #507
-2023/11/06-12:17:57.346 85dc Delete type=3 #505
-2023/11/06-12:19:30.535 6d70 Level-0 table #512: started
-2023/11/06-12:19:30.535 6d70 Level-0 table #512: 0 bytes OK
-2023/11/06-12:19:30.537 6d70 Delete type=0 #510
-2023/11/06-12:19:30.540 6d70 Manual compaction at level-0 from '!items!00NxeCghePCTFezd' @ 72057594037927935 : 1 .. '!items!zskGVWQJ7ih85MQp' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.392 6964 Recovering log #525
+2023/11/11-17:55:50.396 6964 Delete type=0 #525
+2023/11/11-17:55:50.396 6964 Delete type=3 #517
+2023/11/11-17:55:50.396 6964 Delete type=3 #523
+2023/11/11-17:59:45.417 2e84 Level-0 table #529: started
+2023/11/11-17:59:45.417 2e84 Level-0 table #529: 0 bytes OK
+2023/11/11-17:59:45.418 2e84 Delete type=0 #527
+2023/11/11-17:59:45.427 2e84 Manual compaction at level-0 from '!items!00NxeCghePCTFezd' @ 72057594037927935 : 1 .. '!items!zskGVWQJ7ih85MQp' @ 0 : 0; will stop at (end)
diff --git a/packs/dex-entries/LOG.old b/packs/dex-entries/LOG.old
index 85d68a9ba..f124239de 100644
--- a/packs/dex-entries/LOG.old
+++ b/packs/dex-entries/LOG.old
@@ -1,7 +1,5 @@
-2023/11/06-11:44:25.693 85b4 Recovering log #503
-2023/11/06-11:44:25.697 85b4 Delete type=0 #503
-2023/11/06-11:44:25.697 85b4 Delete type=3 #501
-2023/11/06-12:14:26.850 378c Level-0 table #508: started
-2023/11/06-12:14:26.850 378c Level-0 table #508: 0 bytes OK
-2023/11/06-12:14:26.852 378c Delete type=0 #506
-2023/11/06-12:14:26.867 378c Manual compaction at level-0 from '!items!00NxeCghePCTFezd' @ 72057594037927935 : 1 .. '!items!zskGVWQJ7ih85MQp' @ 0 : 0; will stop at (end)
+2023/11/11-17:50:04.471 89f4 Recovering log #515
+2023/11/11-17:50:04.471 89f4 Recovering log #524
+2023/11/11-17:50:04.476 89f4 Delete type=0 #515
+2023/11/11-17:50:04.476 89f4 Delete type=0 #524
+2023/11/11-17:50:04.476 89f4 Delete type=3 #513
diff --git a/packs/dex-entries/MANIFEST-000509 b/packs/dex-entries/MANIFEST-000526
similarity index 73%
rename from packs/dex-entries/MANIFEST-000509
rename to packs/dex-entries/MANIFEST-000526
index 70789e5f6..e42d3ef75 100644
Binary files a/packs/dex-entries/MANIFEST-000509 and b/packs/dex-entries/MANIFEST-000526 differ
diff --git a/packs/dex-entries/000511.log b/packs/edges/000624.log
similarity index 100%
rename from packs/dex-entries/000511.log
rename to packs/edges/000624.log
diff --git a/packs/edges/CURRENT b/packs/edges/CURRENT
index 5f5d53473..563345b17 100644
--- a/packs/edges/CURRENT
+++ b/packs/edges/CURRENT
@@ -1 +1 @@
-MANIFEST-000598
+MANIFEST-000623
diff --git a/packs/edges/LOG b/packs/edges/LOG
index b6776e92d..7feb72d3b 100644
--- a/packs/edges/LOG
+++ b/packs/edges/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.352 85dc Recovering log #596
-2023/11/06-12:17:57.356 85dc Delete type=0 #596
-2023/11/06-12:17:57.356 85dc Delete type=3 #594
-2023/11/06-12:19:30.533 6d70 Level-0 table #601: started
-2023/11/06-12:19:30.533 6d70 Level-0 table #601: 0 bytes OK
-2023/11/06-12:19:30.535 6d70 Delete type=0 #599
-2023/11/06-12:19:30.537 6d70 Manual compaction at level-0 from '!folders!KvpdGqvbgL2nQUcL' @ 72057594037927935 : 1 .. '!items!zixXV4XTysXtm8vK' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:57.689 7ddc Recovering log #621
+2023/11/11-17:59:57.694 7ddc Delete type=0 #621
+2023/11/11-17:59:57.694 7ddc Delete type=3 #619
diff --git a/packs/edges/LOG.old b/packs/edges/LOG.old
index 18b9dc876..53081dda4 100644
--- a/packs/edges/LOG.old
+++ b/packs/edges/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.704 76b8 Recovering log #592
-2023/11/06-11:44:25.708 76b8 Delete type=0 #592
-2023/11/06-11:44:25.708 76b8 Delete type=3 #590
-2023/11/06-12:14:26.852 378c Level-0 table #597: started
-2023/11/06-12:14:26.852 378c Level-0 table #597: 0 bytes OK
-2023/11/06-12:14:26.853 378c Delete type=0 #595
-2023/11/06-12:14:26.867 378c Manual compaction at level-0 from '!folders!KvpdGqvbgL2nQUcL' @ 72057594037927935 : 1 .. '!items!zixXV4XTysXtm8vK' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.403 6964 Recovering log #618
+2023/11/11-17:55:50.408 6964 Delete type=0 #618
+2023/11/11-17:55:50.408 6964 Delete type=3 #617
+2023/11/11-17:59:45.423 2e84 Level-0 table #622: started
+2023/11/11-17:59:45.423 2e84 Level-0 table #622: 0 bytes OK
+2023/11/11-17:59:45.427 2e84 Delete type=0 #620
+2023/11/11-17:59:45.429 2e84 Manual compaction at level-0 from '!folders!KvpdGqvbgL2nQUcL' @ 72057594037927935 : 1 .. '!items!zixXV4XTysXtm8vK' @ 0 : 0; will stop at (end)
diff --git a/packs/edges/MANIFEST-000598 b/packs/edges/MANIFEST-000623
similarity index 71%
rename from packs/edges/MANIFEST-000598
rename to packs/edges/MANIFEST-000623
index d15941fe0..dfe9f86e6 100644
Binary files a/packs/edges/MANIFEST-000598 and b/packs/edges/MANIFEST-000623 differ
diff --git a/packs/edges/000600.log b/packs/effects/000621.log
similarity index 100%
rename from packs/edges/000600.log
rename to packs/effects/000621.log
diff --git a/packs/effects/CURRENT b/packs/effects/CURRENT
index 23755cb30..ebca9bff5 100644
--- a/packs/effects/CURRENT
+++ b/packs/effects/CURRENT
@@ -1 +1 @@
-MANIFEST-000595
+MANIFEST-000620
diff --git a/packs/effects/LOG b/packs/effects/LOG
index 5c2bd5a80..318b6fd10 100644
--- a/packs/effects/LOG
+++ b/packs/effects/LOG
@@ -1,8 +1,3 @@
-2023/11/06-12:17:57.401 6d34 Recovering log #592
-2023/11/06-12:17:57.406 6d34 Delete type=0 #592
-2023/11/06-12:17:57.406 6d34 Delete type=3 #590
-2023/11/06-12:19:30.545 6d70 Level-0 table #598: started
-2023/11/06-12:19:30.545 6d70 Level-0 table #598: 0 bytes OK
-2023/11/06-12:19:30.546 6d70 Delete type=0 #596
-2023/11/06-12:19:30.551 6d70 Manual compaction at level-0 from '!folders!845I85D1jrVh7RBM' @ 72057594037927935 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at (end)
-2023/11/06-12:19:30.553 6d70 Manual compaction at level-1 from '!folders!845I85D1jrVh7RBM' @ 72057594037927935 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:57.856 9120 Recovering log #618
+2023/11/11-17:59:57.860 9120 Delete type=0 #618
+2023/11/11-17:59:57.860 9120 Delete type=3 #616
diff --git a/packs/effects/LOG.old b/packs/effects/LOG.old
index 874764737..5d798da93 100644
--- a/packs/effects/LOG.old
+++ b/packs/effects/LOG.old
@@ -1,15 +1,8 @@
-2023/11/06-11:44:25.741 5940 Recovering log #588
-2023/11/06-11:44:25.744 5940 Delete type=0 #588
-2023/11/06-11:44:25.744 5940 Delete type=3 #586
-2023/11/06-12:14:26.887 378c Level-0 table #593: started
-2023/11/06-12:14:26.890 378c Level-0 table #593: 1902 bytes OK
-2023/11/06-12:14:26.892 378c Delete type=0 #591
-2023/11/06-12:14:26.901 378c Manual compaction at level-0 from '!folders!845I85D1jrVh7RBM' @ 72057594037927935 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at (end)
-2023/11/06-12:14:26.905 378c Manual compaction at level-1 from '!folders!845I85D1jrVh7RBM' @ 72057594037927935 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at '!items!gsePGwVgjU3VgjIK' @ 702 : 1
-2023/11/06-12:14:26.905 378c Compacting 1@1 + 1@2 files
-2023/11/06-12:14:26.909 378c Generated table #594@1: 145 keys, 78904 bytes
-2023/11/06-12:14:26.909 378c Compacted 1@1 + 1@2 files => 78904 bytes
-2023/11/06-12:14:26.912 378c compacted to: files[ 0 0 1 0 0 0 0 ]
-2023/11/06-12:14:26.912 378c Delete type=2 #585
-2023/11/06-12:14:26.912 378c Delete type=2 #593
-2023/11/06-12:14:26.919 378c Manual compaction at level-1 from '!items!gsePGwVgjU3VgjIK' @ 702 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.452 5d04 Recovering log #615
+2023/11/11-17:55:50.457 5d04 Delete type=0 #615
+2023/11/11-17:55:50.457 5d04 Delete type=3 #614
+2023/11/11-17:59:45.436 2e84 Level-0 table #619: started
+2023/11/11-17:59:45.436 2e84 Level-0 table #619: 0 bytes OK
+2023/11/11-17:59:45.438 2e84 Delete type=0 #617
+2023/11/11-17:59:45.442 2e84 Manual compaction at level-0 from '!folders!845I85D1jrVh7RBM' @ 72057594037927935 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:45.442 2e84 Manual compaction at level-1 from '!folders!845I85D1jrVh7RBM' @ 72057594037927935 : 1 .. '!items!znvgEviVbL2WnCGJ' @ 0 : 0; will stop at (end)
diff --git a/packs/effects/MANIFEST-000595 b/packs/effects/MANIFEST-000620
similarity index 60%
rename from packs/effects/MANIFEST-000595
rename to packs/effects/MANIFEST-000620
index 793e33170..f7988bc01 100644
Binary files a/packs/effects/MANIFEST-000595 and b/packs/effects/MANIFEST-000620 differ
diff --git a/packs/feats/000612.ldb b/packs/feats/000621.ldb
similarity index 92%
rename from packs/feats/000612.ldb
rename to packs/feats/000621.ldb
index 14a1bb179..e3ea3164e 100644
Binary files a/packs/feats/000612.ldb and b/packs/feats/000621.ldb differ
diff --git a/packs/effects/000597.log b/packs/feats/000639.log
similarity index 100%
rename from packs/effects/000597.log
rename to packs/feats/000639.log
diff --git a/packs/feats/CURRENT b/packs/feats/CURRENT
index 25a646369..a86ca2536 100644
--- a/packs/feats/CURRENT
+++ b/packs/feats/CURRENT
@@ -1 +1 @@
-MANIFEST-000613
+MANIFEST-000638
diff --git a/packs/feats/LOG b/packs/feats/LOG
index 22dfada41..d71cb79b8 100644
--- a/packs/feats/LOG
+++ b/packs/feats/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.333 85dc Recovering log #610
-2023/11/06-12:17:57.337 85dc Delete type=0 #610
-2023/11/06-12:17:57.337 85dc Delete type=3 #608
-2023/11/06-12:19:30.531 6d70 Level-0 table #616: started
-2023/11/06-12:19:30.531 6d70 Level-0 table #616: 0 bytes OK
-2023/11/06-12:19:30.533 6d70 Delete type=0 #614
-2023/11/06-12:19:30.535 6d70 Manual compaction at level-0 from '!folders!NlEB7XJnDWyGbZnQ' @ 72057594037927935 : 1 .. '!items!zy3F5IZmiosjU2HJ' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:58.040 1880 Recovering log #636
+2023/11/11-17:59:58.045 1880 Delete type=0 #636
+2023/11/11-17:59:58.046 1880 Delete type=3 #634
diff --git a/packs/feats/LOG.old b/packs/feats/LOG.old
index 17f4297f8..a4aba7a2a 100644
--- a/packs/feats/LOG.old
+++ b/packs/feats/LOG.old
@@ -1,14 +1,7 @@
-2023/11/06-11:44:25.685 76b8 Recovering log #606
-2023/11/06-11:44:25.689 76b8 Delete type=0 #606
-2023/11/06-11:44:25.689 76b8 Delete type=3 #604
-2023/11/06-12:14:26.854 378c Level-0 table #611: started
-2023/11/06-12:14:26.855 378c Level-0 table #611: 7091 bytes OK
-2023/11/06-12:14:26.857 378c Delete type=0 #609
-2023/11/06-12:14:26.867 378c Manual compaction at level-0 from '!folders!NlEB7XJnDWyGbZnQ' @ 72057594037927935 : 1 .. '!items!zy3F5IZmiosjU2HJ' @ 0 : 0; will stop at '!items!xdpnroki9dAARIRb' @ 7334 : 1
-2023/11/06-12:14:26.867 378c Compacting 1@0 + 1@1 files
-2023/11/06-12:14:26.877 378c Generated table #612@0: 718 keys, 466273 bytes
-2023/11/06-12:14:26.877 378c Compacted 1@0 + 1@1 files => 466273 bytes
-2023/11/06-12:14:26.878 378c compacted to: files[ 0 1 0 0 0 0 0 ]
-2023/11/06-12:14:26.878 378c Delete type=2 #563
-2023/11/06-12:14:26.879 378c Delete type=2 #611
-2023/11/06-12:14:26.883 378c Manual compaction at level-0 from '!items!xdpnroki9dAARIRb' @ 7334 : 1 .. '!items!zy3F5IZmiosjU2HJ' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.383 6964 Recovering log #633
+2023/11/11-17:55:50.387 6964 Delete type=0 #633
+2023/11/11-17:55:50.387 6964 Delete type=3 #632
+2023/11/11-17:59:45.404 2e84 Level-0 table #637: started
+2023/11/11-17:59:45.404 2e84 Level-0 table #637: 0 bytes OK
+2023/11/11-17:59:45.406 2e84 Delete type=0 #635
+2023/11/11-17:59:45.417 2e84 Manual compaction at level-0 from '!folders!NlEB7XJnDWyGbZnQ' @ 72057594037927935 : 1 .. '!items!zy3F5IZmiosjU2HJ' @ 0 : 0; will stop at (end)
diff --git a/packs/feats/MANIFEST-000613 b/packs/feats/MANIFEST-000613
deleted file mode 100644
index e896dc04e..000000000
Binary files a/packs/feats/MANIFEST-000613 and /dev/null differ
diff --git a/packs/feats/MANIFEST-000638 b/packs/feats/MANIFEST-000638
new file mode 100644
index 000000000..317cf3888
Binary files /dev/null and b/packs/feats/MANIFEST-000638 differ
diff --git a/packs/habitats/000580.log b/packs/habitats/000604.log
similarity index 100%
rename from packs/habitats/000580.log
rename to packs/habitats/000604.log
diff --git a/packs/habitats/CURRENT b/packs/habitats/CURRENT
index fc730a2c9..5882c5f3a 100644
--- a/packs/habitats/CURRENT
+++ b/packs/habitats/CURRENT
@@ -1 +1 @@
-MANIFEST-000578
+MANIFEST-000603
diff --git a/packs/habitats/LOG b/packs/habitats/LOG
index 0d6578447..b9be28a12 100644
--- a/packs/habitats/LOG
+++ b/packs/habitats/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.384 6d34 Recovering log #576
-2023/11/06-12:17:57.388 6d34 Delete type=0 #576
-2023/11/06-12:17:57.388 6d34 Delete type=3 #574
-2023/11/06-12:19:30.543 6d70 Level-0 table #581: started
-2023/11/06-12:19:30.543 6d70 Level-0 table #581: 0 bytes OK
-2023/11/06-12:19:30.544 6d70 Delete type=0 #579
-2023/11/06-12:19:30.550 6d70 Manual compaction at level-0 from '!tables!0DJQye8xDvA2tYYY' @ 72057594037927935 : 1 .. '!tables.results!yedzrd0JurrPv9Me.zKvMuUG3hHYIyZQp' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:58.445 9134 Recovering log #601
+2023/11/11-17:59:58.449 9134 Delete type=0 #601
+2023/11/11-17:59:58.449 9134 Delete type=3 #599
diff --git a/packs/habitats/LOG.old b/packs/habitats/LOG.old
index 4aa565117..3d860eb7a 100644
--- a/packs/habitats/LOG.old
+++ b/packs/habitats/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.731 5940 Recovering log #572
-2023/11/06-11:44:25.734 5940 Delete type=0 #572
-2023/11/06-11:44:25.735 5940 Delete type=3 #570
-2023/11/06-12:14:26.885 378c Level-0 table #577: started
-2023/11/06-12:14:26.885 378c Level-0 table #577: 0 bytes OK
-2023/11/06-12:14:26.887 378c Delete type=0 #575
-2023/11/06-12:14:26.894 378c Manual compaction at level-0 from '!tables!0DJQye8xDvA2tYYY' @ 72057594037927935 : 1 .. '!tables.results!yedzrd0JurrPv9Me.zKvMuUG3hHYIyZQp' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.432 5d04 Recovering log #598
+2023/11/11-17:55:50.437 5d04 Delete type=0 #598
+2023/11/11-17:55:50.438 5d04 Delete type=3 #597
+2023/11/11-17:59:45.433 2e84 Level-0 table #602: started
+2023/11/11-17:59:45.433 2e84 Level-0 table #602: 0 bytes OK
+2023/11/11-17:59:45.434 2e84 Delete type=0 #600
+2023/11/11-17:59:45.436 2e84 Manual compaction at level-0 from '!tables!0DJQye8xDvA2tYYY' @ 72057594037927935 : 1 .. '!tables.results!yedzrd0JurrPv9Me.zKvMuUG3hHYIyZQp' @ 0 : 0; will stop at (end)
diff --git a/packs/habitats/MANIFEST-000578 b/packs/habitats/MANIFEST-000603
similarity index 83%
rename from packs/habitats/MANIFEST-000578
rename to packs/habitats/MANIFEST-000603
index 298bc179e..067ce5154 100644
Binary files a/packs/habitats/MANIFEST-000578 and b/packs/habitats/MANIFEST-000603 differ
diff --git a/packs/items/000589.log b/packs/items/000613.log
similarity index 100%
rename from packs/items/000589.log
rename to packs/items/000613.log
diff --git a/packs/items/CURRENT b/packs/items/CURRENT
index 474021af3..c116b3847 100644
--- a/packs/items/CURRENT
+++ b/packs/items/CURRENT
@@ -1 +1 @@
-MANIFEST-000587
+MANIFEST-000612
diff --git a/packs/items/LOG b/packs/items/LOG
index 53a0d32f8..6df91968d 100644
--- a/packs/items/LOG
+++ b/packs/items/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.358 6d34 Recovering log #585
-2023/11/06-12:17:57.366 6d34 Delete type=0 #585
-2023/11/06-12:17:57.366 6d34 Delete type=3 #583
-2023/11/06-12:19:30.537 6d70 Level-0 table #590: started
-2023/11/06-12:19:30.537 6d70 Level-0 table #590: 0 bytes OK
-2023/11/06-12:19:30.538 6d70 Delete type=0 #588
-2023/11/06-12:19:30.543 6d70 Manual compaction at level-0 from '!folders!IT5MlkeTVPcxSRHe' @ 72057594037927935 : 1 .. '!items!zyrvCDXykruLOC8Y' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:59.113 1e6c Recovering log #610
+2023/11/11-17:59:59.118 1e6c Delete type=0 #610
+2023/11/11-17:59:59.119 1e6c Delete type=3 #608
diff --git a/packs/items/LOG.old b/packs/items/LOG.old
index 43b4f0540..93708a2ea 100644
--- a/packs/items/LOG.old
+++ b/packs/items/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.709 5940 Recovering log #581
-2023/11/06-11:44:25.714 5940 Delete type=0 #581
-2023/11/06-11:44:25.714 5940 Delete type=3 #579
-2023/11/06-12:14:26.879 378c Level-0 table #586: started
-2023/11/06-12:14:26.879 378c Level-0 table #586: 0 bytes OK
-2023/11/06-12:14:26.881 378c Delete type=0 #584
-2023/11/06-12:14:26.885 378c Manual compaction at level-0 from '!folders!IT5MlkeTVPcxSRHe' @ 72057594037927935 : 1 .. '!items!zyrvCDXykruLOC8Y' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.410 5d04 Recovering log #607
+2023/11/11-17:55:50.414 5d04 Delete type=0 #607
+2023/11/11-17:55:50.415 5d04 Delete type=3 #606
+2023/11/11-17:59:45.427 2e84 Level-0 table #611: started
+2023/11/11-17:59:45.427 2e84 Level-0 table #611: 0 bytes OK
+2023/11/11-17:59:45.429 2e84 Delete type=0 #609
+2023/11/11-17:59:45.431 2e84 Manual compaction at level-0 from '!folders!IT5MlkeTVPcxSRHe' @ 72057594037927935 : 1 .. '!items!zyrvCDXykruLOC8Y' @ 0 : 0; will stop at (end)
diff --git a/packs/items/MANIFEST-000587 b/packs/items/MANIFEST-000612
similarity index 71%
rename from packs/items/MANIFEST-000587
rename to packs/items/MANIFEST-000612
index 2bbe39c20..383a61349 100644
Binary files a/packs/items/MANIFEST-000587 and b/packs/items/MANIFEST-000612 differ
diff --git a/packs/macros/000368.log b/packs/macros/000392.log
similarity index 100%
rename from packs/macros/000368.log
rename to packs/macros/000392.log
diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT
index 13b386c93..02a5c3e5a 100644
--- a/packs/macros/CURRENT
+++ b/packs/macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000366
+MANIFEST-000391
diff --git a/packs/macros/LOG b/packs/macros/LOG
index 30dd21218..2283a2767 100644
--- a/packs/macros/LOG
+++ b/packs/macros/LOG
@@ -1,8 +1,3 @@
-2023/11/06-12:17:57.436 6d34 Recovering log #363
-2023/11/06-12:17:57.440 6d34 Delete type=0 #363
-2023/11/06-12:17:57.440 6d34 Delete type=3 #361
-2023/11/06-12:19:30.552 6d70 Level-0 table #369: started
-2023/11/06-12:19:30.552 6d70 Level-0 table #369: 0 bytes OK
-2023/11/06-12:19:30.553 6d70 Delete type=0 #367
-2023/11/06-12:19:30.558 6d70 Manual compaction at level-0 from '!macros!1RNSAw20k8gBHhUd' @ 72057594037927935 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at (end)
-2023/11/06-12:19:30.562 6d70 Manual compaction at level-1 from '!macros!1RNSAw20k8gBHhUd' @ 72057594037927935 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:59.552 1870 Recovering log #389
+2023/11/11-17:59:59.557 1870 Delete type=0 #389
+2023/11/11-17:59:59.557 1870 Delete type=3 #387
diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old
index 1b8736d3f..3cab670c0 100644
--- a/packs/macros/LOG.old
+++ b/packs/macros/LOG.old
@@ -1,17 +1,8 @@
-2023/11/06-11:44:25.775 5940 Recovering log #359
-2023/11/06-11:44:25.779 5940 Delete type=0 #359
-2023/11/06-11:44:25.779 5940 Delete type=3 #357
-2023/11/06-12:14:26.894 378c Level-0 table #364: started
-2023/11/06-12:14:26.898 378c Level-0 table #364: 5978 bytes OK
-2023/11/06-12:14:26.900 378c Delete type=0 #362
-2023/11/06-12:14:26.905 378c Manual compaction at level-0 from '!macros!1RNSAw20k8gBHhUd' @ 72057594037927935 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at (end)
-2023/11/06-12:14:26.914 378c Manual compaction at level-1 from '!macros!1RNSAw20k8gBHhUd' @ 72057594037927935 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at '!macros!sYZbyUkyC8f4nCek' @ 17 : 1
-2023/11/06-12:14:26.914 378c Compacting 1@1 + 3@2 files
-2023/11/06-12:14:26.917 378c Generated table #365@1: 6 keys, 3555 bytes
-2023/11/06-12:14:26.917 378c Compacted 1@1 + 3@2 files => 3555 bytes
-2023/11/06-12:14:26.919 378c compacted to: files[ 0 0 1 0 0 0 0 ]
-2023/11/06-12:14:26.919 378c Delete type=2 #163
-2023/11/06-12:14:26.919 378c Delete type=2 #168
-2023/11/06-12:14:26.919 378c Delete type=2 #352
-2023/11/06-12:14:26.919 378c Delete type=2 #364
-2023/11/06-12:14:26.920 378c Manual compaction at level-1 from '!macros!sYZbyUkyC8f4nCek' @ 17 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.489 5d04 Recovering log #386
+2023/11/11-17:55:50.493 5d04 Delete type=0 #386
+2023/11/11-17:55:50.493 5d04 Delete type=3 #385
+2023/11/11-17:59:45.448 2e84 Level-0 table #390: started
+2023/11/11-17:59:45.448 2e84 Level-0 table #390: 0 bytes OK
+2023/11/11-17:59:45.452 2e84 Delete type=0 #388
+2023/11/11-17:59:45.452 2e84 Manual compaction at level-0 from '!macros!1RNSAw20k8gBHhUd' @ 72057594037927935 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:45.452 2e84 Manual compaction at level-1 from '!macros!1RNSAw20k8gBHhUd' @ 72057594037927935 : 1 .. '!macros!sYZbyUkyC8f4nCek' @ 0 : 0; will stop at (end)
diff --git a/packs/macros/MANIFEST-000366 b/packs/macros/MANIFEST-000391
similarity index 60%
rename from packs/macros/MANIFEST-000366
rename to packs/macros/MANIFEST-000391
index 0c69779de..dfebc23ed 100644
Binary files a/packs/macros/MANIFEST-000366 and b/packs/macros/MANIFEST-000391 differ
diff --git a/packs/moves/000593.ldb b/packs/moves/000593.ldb
deleted file mode 100644
index 873b07641..000000000
Binary files a/packs/moves/000593.ldb and /dev/null differ
diff --git a/packs/moves/000619.ldb b/packs/moves/000619.ldb
new file mode 100644
index 000000000..9ff5c6d43
Binary files /dev/null and b/packs/moves/000619.ldb differ
diff --git a/packs/moves/000596.log b/packs/moves/000621.log
similarity index 100%
rename from packs/moves/000596.log
rename to packs/moves/000621.log
diff --git a/packs/moves/CURRENT b/packs/moves/CURRENT
index 2eef8aa5d..ebca9bff5 100644
--- a/packs/moves/CURRENT
+++ b/packs/moves/CURRENT
@@ -1 +1 @@
-MANIFEST-000594
+MANIFEST-000620
diff --git a/packs/moves/LOG b/packs/moves/LOG
index 26ccca0af..4dede5143 100644
--- a/packs/moves/LOG
+++ b/packs/moves/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.325 85dc Recovering log #591
-2023/11/06-12:17:57.329 85dc Delete type=0 #591
-2023/11/06-12:17:57.329 85dc Delete type=3 #589
-2023/11/06-12:19:30.529 6d70 Level-0 table #597: started
-2023/11/06-12:19:30.529 6d70 Level-0 table #597: 0 bytes OK
-2023/11/06-12:19:30.531 6d70 Delete type=0 #595
-2023/11/06-12:19:30.535 6d70 Manual compaction at level-0 from '!folders!3AhTAywjx4AYtRjv' @ 72057594037927935 : 1 .. '!items!zxUzqjCE0wNYL1er' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:59.694 4068 Recovering log #617
+2023/11/11-17:59:59.698 4068 Delete type=0 #617
+2023/11/11-17:59:59.698 4068 Delete type=3 #615
diff --git a/packs/moves/LOG.old b/packs/moves/LOG.old
index 24afe52dc..bb9ced222 100644
--- a/packs/moves/LOG.old
+++ b/packs/moves/LOG.old
@@ -1,14 +1,14 @@
-2023/11/06-11:44:25.676 76b8 Recovering log #587
-2023/11/06-11:44:25.680 76b8 Delete type=0 #587
-2023/11/06-11:44:25.680 76b8 Delete type=3 #585
-2023/11/06-12:14:26.846 378c Level-0 table #592: started
-2023/11/06-12:14:26.848 378c Level-0 table #592: 7499 bytes OK
-2023/11/06-12:14:26.850 378c Delete type=0 #590
-2023/11/06-12:14:26.857 378c Manual compaction at level-0 from '!folders!3AhTAywjx4AYtRjv' @ 72057594037927935 : 1 .. '!items!zxUzqjCE0wNYL1er' @ 0 : 0; will stop at '!items!z5hgetbLhLvsd800' @ 7387 : 1
-2023/11/06-12:14:26.857 378c Compacting 1@0 + 1@1 files
-2023/11/06-12:14:26.865 378c Generated table #593@0: 1099 keys, 463730 bytes
-2023/11/06-12:14:26.865 378c Compacted 1@0 + 1@1 files => 463730 bytes
-2023/11/06-12:14:26.867 378c compacted to: files[ 0 1 0 0 0 0 0 ]
-2023/11/06-12:14:26.867 378c Delete type=2 #543
-2023/11/06-12:14:26.867 378c Delete type=2 #592
-2023/11/06-12:14:26.879 378c Manual compaction at level-0 from '!items!z5hgetbLhLvsd800' @ 7387 : 1 .. '!items!zxUzqjCE0wNYL1er' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.374 6964 Recovering log #614
+2023/11/11-17:55:50.378 6964 Delete type=0 #614
+2023/11/11-17:55:50.379 6964 Delete type=3 #613
+2023/11/11-17:59:45.398 2e84 Level-0 table #618: started
+2023/11/11-17:59:45.400 2e84 Level-0 table #618: 1031 bytes OK
+2023/11/11-17:59:45.401 2e84 Delete type=0 #616
+2023/11/11-17:59:45.406 2e84 Manual compaction at level-0 from '!folders!3AhTAywjx4AYtRjv' @ 72057594037927935 : 1 .. '!items!zxUzqjCE0wNYL1er' @ 0 : 0; will stop at '!items!RyKdS3yRZjvCBXPz' @ 7539 : 1
+2023/11/11-17:59:45.406 2e84 Compacting 1@0 + 1@1 files
+2023/11/11-17:59:45.415 2e84 Generated table #619@0: 1111 keys, 474350 bytes
+2023/11/11-17:59:45.415 2e84 Compacted 1@0 + 1@1 files => 474350 bytes
+2023/11/11-17:59:45.416 2e84 compacted to: files[ 0 1 0 0 0 0 0 ]
+2023/11/11-17:59:45.416 2e84 Delete type=2 #602
+2023/11/11-17:59:45.417 2e84 Delete type=2 #618
+2023/11/11-17:59:45.419 2e84 Manual compaction at level-0 from '!items!RyKdS3yRZjvCBXPz' @ 7539 : 1 .. '!items!zxUzqjCE0wNYL1er' @ 0 : 0; will stop at (end)
diff --git a/packs/moves/MANIFEST-000594 b/packs/moves/MANIFEST-000594
deleted file mode 100644
index 49ea2498b..000000000
Binary files a/packs/moves/MANIFEST-000594 and /dev/null differ
diff --git a/packs/moves/MANIFEST-000620 b/packs/moves/MANIFEST-000620
new file mode 100644
index 000000000..c9b473531
Binary files /dev/null and b/packs/moves/MANIFEST-000620 differ
diff --git a/packs/poke-edges/000595.log b/packs/poke-edges/000619.log
similarity index 100%
rename from packs/poke-edges/000595.log
rename to packs/poke-edges/000619.log
diff --git a/packs/poke-edges/CURRENT b/packs/poke-edges/CURRENT
index c4c83ef46..bb61cf205 100644
--- a/packs/poke-edges/CURRENT
+++ b/packs/poke-edges/CURRENT
@@ -1 +1 @@
-MANIFEST-000593
+MANIFEST-000618
diff --git a/packs/poke-edges/LOG b/packs/poke-edges/LOG
index 7386aef1e..731f6062b 100644
--- a/packs/poke-edges/LOG
+++ b/packs/poke-edges/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.378 85dc Recovering log #591
-2023/11/06-12:17:57.382 85dc Delete type=0 #591
-2023/11/06-12:17:57.382 85dc Delete type=3 #589
-2023/11/06-12:19:30.540 6d70 Level-0 table #596: started
-2023/11/06-12:19:30.540 6d70 Level-0 table #596: 0 bytes OK
-2023/11/06-12:19:30.542 6d70 Delete type=0 #594
-2023/11/06-12:19:30.544 6d70 Manual compaction at level-0 from '!items!04UCY4s8EF3iZnCN' @ 72057594037927935 : 1 .. '!items!ybZJ0nAa5nVWBokc' @ 0 : 0; will stop at (end)
+2023/11/11-18:00:00.223 9348 Recovering log #616
+2023/11/11-18:00:00.229 9348 Delete type=0 #616
+2023/11/11-18:00:00.229 9348 Delete type=3 #614
diff --git a/packs/poke-edges/LOG.old b/packs/poke-edges/LOG.old
index 22bf241cf..f796cef80 100644
--- a/packs/poke-edges/LOG.old
+++ b/packs/poke-edges/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.725 85b4 Recovering log #587
-2023/11/06-11:44:25.729 85b4 Delete type=0 #587
-2023/11/06-11:44:25.729 85b4 Delete type=3 #585
-2023/11/06-12:14:26.883 378c Level-0 table #592: started
-2023/11/06-12:14:26.883 378c Level-0 table #592: 0 bytes OK
-2023/11/06-12:14:26.884 378c Delete type=0 #590
-2023/11/06-12:14:26.887 378c Manual compaction at level-0 from '!items!04UCY4s8EF3iZnCN' @ 72057594037927935 : 1 .. '!items!ybZJ0nAa5nVWBokc' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.426 6964 Recovering log #613
+2023/11/11-17:55:50.431 6964 Delete type=0 #613
+2023/11/11-17:55:50.431 6964 Delete type=3 #612
+2023/11/11-17:59:45.431 2e84 Level-0 table #617: started
+2023/11/11-17:59:45.431 2e84 Level-0 table #617: 0 bytes OK
+2023/11/11-17:59:45.432 2e84 Delete type=0 #615
+2023/11/11-17:59:45.436 2e84 Manual compaction at level-0 from '!items!04UCY4s8EF3iZnCN' @ 72057594037927935 : 1 .. '!items!ybZJ0nAa5nVWBokc' @ 0 : 0; will stop at (end)
diff --git a/packs/poke-edges/MANIFEST-000593 b/packs/poke-edges/MANIFEST-000618
similarity index 73%
rename from packs/poke-edges/MANIFEST-000593
rename to packs/poke-edges/MANIFEST-000618
index 1198bfa44..a1ed657ea 100644
Binary files a/packs/poke-edges/MANIFEST-000593 and b/packs/poke-edges/MANIFEST-000618 differ
diff --git a/packs/references/000321.log b/packs/references/000345.log
similarity index 100%
rename from packs/references/000321.log
rename to packs/references/000345.log
diff --git a/packs/references/CURRENT b/packs/references/CURRENT
index 8b1ad216d..0f173089e 100644
--- a/packs/references/CURRENT
+++ b/packs/references/CURRENT
@@ -1 +1 @@
-MANIFEST-000319
+MANIFEST-000344
diff --git a/packs/references/LOG b/packs/references/LOG
index 0034f5c35..37dcd0f42 100644
--- a/packs/references/LOG
+++ b/packs/references/LOG
@@ -1,8 +1,3 @@
-2023/11/06-12:17:57.442 85dc Recovering log #317
-2023/11/06-12:17:57.446 85dc Delete type=0 #317
-2023/11/06-12:17:57.447 85dc Delete type=3 #315
-2023/11/06-12:19:30.558 6d70 Level-0 table #322: started
-2023/11/06-12:19:30.558 6d70 Level-0 table #322: 0 bytes OK
-2023/11/06-12:19:30.560 6d70 Delete type=0 #320
-2023/11/06-12:19:30.562 6d70 Manual compaction at level-0 from '!items!0EVKSbyPCs2XLT8d' @ 72057594037927935 : 1 .. '!items!zFN2psnsbSBIeGrm' @ 0 : 0; will stop at (end)
-2023/11/06-12:19:30.562 6d70 Manual compaction at level-1 from '!items!0EVKSbyPCs2XLT8d' @ 72057594037927935 : 1 .. '!items!zFN2psnsbSBIeGrm' @ 0 : 0; will stop at (end)
+2023/11/11-18:00:00.378 5a9c Recovering log #342
+2023/11/11-18:00:00.382 5a9c Delete type=0 #342
+2023/11/11-18:00:00.382 5a9c Delete type=3 #340
diff --git a/packs/references/LOG.old b/packs/references/LOG.old
index 6f748953b..96666f63e 100644
--- a/packs/references/LOG.old
+++ b/packs/references/LOG.old
@@ -1,8 +1,8 @@
-2023/11/06-11:44:25.781 85b4 Recovering log #313
-2023/11/06-11:44:25.785 85b4 Delete type=0 #313
-2023/11/06-11:44:25.785 85b4 Delete type=3 #311
-2023/11/06-12:14:26.901 378c Level-0 table #318: started
-2023/11/06-12:14:26.901 378c Level-0 table #318: 0 bytes OK
-2023/11/06-12:14:26.904 378c Delete type=0 #316
-2023/11/06-12:14:26.914 378c Manual compaction at level-0 from '!items!0EVKSbyPCs2XLT8d' @ 72057594037927935 : 1 .. '!items!zFN2psnsbSBIeGrm' @ 0 : 0; will stop at (end)
-2023/11/06-12:14:26.920 378c Manual compaction at level-1 from '!items!0EVKSbyPCs2XLT8d' @ 72057594037927935 : 1 .. '!items!zFN2psnsbSBIeGrm' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.495 6964 Recovering log #339
+2023/11/11-17:55:50.499 6964 Delete type=0 #339
+2023/11/11-17:55:50.499 6964 Delete type=3 #338
+2023/11/11-17:59:45.438 2e84 Level-0 table #343: started
+2023/11/11-17:59:45.438 2e84 Level-0 table #343: 0 bytes OK
+2023/11/11-17:59:45.440 2e84 Delete type=0 #341
+2023/11/11-17:59:45.442 2e84 Manual compaction at level-0 from '!items!0EVKSbyPCs2XLT8d' @ 72057594037927935 : 1 .. '!items!zFN2psnsbSBIeGrm' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:45.442 2e84 Manual compaction at level-1 from '!items!0EVKSbyPCs2XLT8d' @ 72057594037927935 : 1 .. '!items!zFN2psnsbSBIeGrm' @ 0 : 0; will stop at (end)
diff --git a/packs/references/MANIFEST-000319 b/packs/references/MANIFEST-000344
similarity index 74%
rename from packs/references/MANIFEST-000319
rename to packs/references/MANIFEST-000344
index af4f868a2..37435ccb5 100644
Binary files a/packs/references/MANIFEST-000319 and b/packs/references/MANIFEST-000344 differ
diff --git a/packs/rolltables/000008.log b/packs/rolltables/000026.log
similarity index 100%
rename from packs/rolltables/000008.log
rename to packs/rolltables/000026.log
diff --git a/packs/rolltables/CURRENT b/packs/rolltables/CURRENT
index f7753e22a..1e21b78cb 100644
--- a/packs/rolltables/CURRENT
+++ b/packs/rolltables/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000024
diff --git a/packs/rolltables/LOG b/packs/rolltables/LOG
index 46cdac730..2a0da5e43 100644
--- a/packs/rolltables/LOG
+++ b/packs/rolltables/LOG
@@ -1,15 +1,9 @@
-2023/11/06-12:17:57.394 6d34 Recovering log #4
-2023/11/06-12:17:57.398 6d34 Delete type=0 #4
-2023/11/06-12:17:57.398 6d34 Delete type=3 #2
-2023/11/06-12:19:30.546 6d70 Level-0 table #9: started
-2023/11/06-12:19:30.548 6d70 Level-0 table #9: 4743 bytes OK
-2023/11/06-12:19:30.550 6d70 Delete type=0 #7
-2023/11/06-12:19:30.551 6d70 Manual compaction at level-0 from '!folders!KdbYHm255fVoO8XG' @ 72057594037927935 : 1 .. '!tables.results!wdOETkq5aY7M7hJg.rSBY0YfY0tm73sIu' @ 0 : 0; will stop at (end)
-2023/11/06-12:19:30.553 6d70 Manual compaction at level-1 from '!folders!KdbYHm255fVoO8XG' @ 72057594037927935 : 1 .. '!tables.results!wdOETkq5aY7M7hJg.rSBY0YfY0tm73sIu' @ 0 : 0; will stop at '!tables.results!s0b5aT318cnMx8fX.yw9U1CNF3SMJxpZu' @ 587 : 0
-2023/11/06-12:19:30.553 6d70 Compacting 1@1 + 1@2 files
-2023/11/06-12:19:30.556 6d70 Generated table #10@1: 583 keys, 68998 bytes
-2023/11/06-12:19:30.556 6d70 Compacted 1@1 + 1@2 files => 68998 bytes
-2023/11/06-12:19:30.558 6d70 compacted to: files[ 0 0 1 0 0 0 0 ]
-2023/11/06-12:19:30.558 6d70 Delete type=2 #5
-2023/11/06-12:19:30.558 6d70 Delete type=2 #9
-2023/11/06-12:19:30.562 6d70 Manual compaction at level-1 from '!tables.results!s0b5aT318cnMx8fX.yw9U1CNF3SMJxpZu' @ 587 : 0 .. '!tables.results!wdOETkq5aY7M7hJg.rSBY0YfY0tm73sIu' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.444 5d04 Recovering log #23
+2023/11/11-17:55:50.448 5d04 Delete type=0 #23
+2023/11/11-17:55:50.448 5d04 Delete type=3 #15
+2023/11/11-17:55:50.448 5d04 Delete type=3 #21
+2023/11/11-17:59:45.434 2e84 Level-0 table #27: started
+2023/11/11-17:59:45.434 2e84 Level-0 table #27: 0 bytes OK
+2023/11/11-17:59:45.436 2e84 Delete type=0 #25
+2023/11/11-17:59:45.438 2e84 Manual compaction at level-0 from '!folders!KdbYHm255fVoO8XG' @ 72057594037927935 : 1 .. '!tables.results!wdOETkq5aY7M7hJg.rSBY0YfY0tm73sIu' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:45.442 2e84 Manual compaction at level-1 from '!folders!KdbYHm255fVoO8XG' @ 72057594037927935 : 1 .. '!tables.results!wdOETkq5aY7M7hJg.rSBY0YfY0tm73sIu' @ 0 : 0; will stop at (end)
diff --git a/packs/rolltables/LOG.old b/packs/rolltables/LOG.old
index 321d74589..8ab60f8f4 100644
--- a/packs/rolltables/LOG.old
+++ b/packs/rolltables/LOG.old
@@ -1,5 +1,5 @@
-2023/11/06-11:14:10.125577 7faaed672640 Delete type=3 #1
-2023/11/06-11:14:19.396729 7faaeac6e640 Level-0 table #5: started
-2023/11/06-11:14:19.398473 7faaeac6e640 Level-0 table #5: 68952 bytes OK
-2023/11/06-11:14:19.398936 7faaeac6e640 Delete type=0 #3
-2023/11/06-11:14:19.399080 7faaeac6e640 Manual compaction at level-0 from '!folders!KdbYHm255fVoO8XG' @ 72057594037927935 : 1 .. '!tables.results!wdOETkq5aY7M7hJg.rSBY0YfY0tm73sIu' @ 0 : 0; will stop at (end)
+2023/11/11-17:50:04.526 1f8c Recovering log #13
+2023/11/11-17:50:04.527 1f8c Recovering log #22
+2023/11/11-17:50:04.531 1f8c Delete type=0 #13
+2023/11/11-17:50:04.531 1f8c Delete type=0 #22
+2023/11/11-17:50:04.531 1f8c Delete type=3 #11
diff --git a/packs/rolltables/MANIFEST-000006 b/packs/rolltables/MANIFEST-000006
deleted file mode 100644
index e4e83f0f7..000000000
Binary files a/packs/rolltables/MANIFEST-000006 and /dev/null differ
diff --git a/packs/rolltables/MANIFEST-000024 b/packs/rolltables/MANIFEST-000024
new file mode 100644
index 000000000..4dbecb355
Binary files /dev/null and b/packs/rolltables/MANIFEST-000024 differ
diff --git a/packs/species/000663.ldb b/packs/species/000738.ldb
similarity index 91%
rename from packs/species/000663.ldb
rename to packs/species/000738.ldb
index 6539fcb41..d87ee1292 100644
Binary files a/packs/species/000663.ldb and b/packs/species/000738.ldb differ
diff --git a/packs/species/000664.ldb b/packs/species/000739.ldb
similarity index 92%
rename from packs/species/000664.ldb
rename to packs/species/000739.ldb
index e2ea1b46c..39de0f600 100644
Binary files a/packs/species/000664.ldb and b/packs/species/000739.ldb differ
diff --git a/packs/species/000665.ldb b/packs/species/000740.ldb
similarity index 92%
rename from packs/species/000665.ldb
rename to packs/species/000740.ldb
index c31730457..6c5d7bb69 100644
Binary files a/packs/species/000665.ldb and b/packs/species/000740.ldb differ
diff --git a/packs/species/000666.ldb b/packs/species/000741.ldb
similarity index 90%
rename from packs/species/000666.ldb
rename to packs/species/000741.ldb
index 6df794158..1a90ae06c 100644
Binary files a/packs/species/000666.ldb and b/packs/species/000741.ldb differ
diff --git a/packs/species/000714.log b/packs/species/000751.log
similarity index 100%
rename from packs/species/000714.log
rename to packs/species/000751.log
diff --git a/packs/species/CURRENT b/packs/species/CURRENT
index 08a716f56..f386aa185 100644
--- a/packs/species/CURRENT
+++ b/packs/species/CURRENT
@@ -1 +1 @@
-MANIFEST-000712
+MANIFEST-000750
diff --git a/packs/species/LOG b/packs/species/LOG
index 3e19473ab..4a4e2be08 100644
--- a/packs/species/LOG
+++ b/packs/species/LOG
@@ -1,7 +1,3 @@
-2023/11/06-12:17:57.409 85dc Recovering log #710
-2023/11/06-12:17:57.413 85dc Delete type=0 #710
-2023/11/06-12:17:57.413 85dc Delete type=3 #708
-2023/11/06-12:19:30.550 6d70 Level-0 table #715: started
-2023/11/06-12:19:30.550 6d70 Level-0 table #715: 0 bytes OK
-2023/11/06-12:19:30.551 6d70 Delete type=0 #713
-2023/11/06-12:19:30.553 6d70 Manual compaction at level-0 from '!folders!CMymFngAhNsaPlS5' @ 72057594037927935 : 1 .. '!items!zyXhWVwTmu553jFn' @ 0 : 0; will stop at (end)
+2023/11/11-18:00:00.622 8b98 Recovering log #748
+2023/11/11-18:00:00.627 8b98 Delete type=0 #748
+2023/11/11-18:00:00.627 8b98 Delete type=3 #746
diff --git a/packs/species/LOG.old b/packs/species/LOG.old
index d520d9ee0..d907f0027 100644
--- a/packs/species/LOG.old
+++ b/packs/species/LOG.old
@@ -1,7 +1,7 @@
-2023/11/06-11:44:25.747 85b4 Recovering log #706
-2023/11/06-11:44:25.751 85b4 Delete type=0 #706
-2023/11/06-11:44:25.752 85b4 Delete type=3 #704
-2023/11/06-12:14:26.892 378c Level-0 table #711: started
-2023/11/06-12:14:26.892 378c Level-0 table #711: 0 bytes OK
-2023/11/06-12:14:26.894 378c Delete type=0 #709
-2023/11/06-12:14:26.901 378c Manual compaction at level-0 from '!folders!CMymFngAhNsaPlS5' @ 72057594037927935 : 1 .. '!items!zyXhWVwTmu553jFn' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.460 6964 Recovering log #745
+2023/11/11-17:55:50.464 6964 Delete type=0 #745
+2023/11/11-17:55:50.464 6964 Delete type=3 #744
+2023/11/11-17:59:45.440 2e84 Level-0 table #749: started
+2023/11/11-17:59:45.440 2e84 Level-0 table #749: 0 bytes OK
+2023/11/11-17:59:45.441 2e84 Delete type=0 #747
+2023/11/11-17:59:45.442 2e84 Manual compaction at level-0 from '!folders!CMymFngAhNsaPlS5' @ 72057594037927935 : 1 .. '!items!zyXhWVwTmu553jFn' @ 0 : 0; will stop at (end)
diff --git a/packs/species/MANIFEST-000712 b/packs/species/MANIFEST-000712
deleted file mode 100644
index dbe92c11b..000000000
Binary files a/packs/species/MANIFEST-000712 and /dev/null differ
diff --git a/packs/species/MANIFEST-000750 b/packs/species/MANIFEST-000750
new file mode 100644
index 000000000..29770c205
Binary files /dev/null and b/packs/species/MANIFEST-000750 differ
diff --git a/packs/spirit-actions/000251.log b/packs/spirit-actions/000275.log
similarity index 100%
rename from packs/spirit-actions/000251.log
rename to packs/spirit-actions/000275.log
diff --git a/packs/spirit-actions/CURRENT b/packs/spirit-actions/CURRENT
index 7ad179778..14e0280ee 100644
--- a/packs/spirit-actions/CURRENT
+++ b/packs/spirit-actions/CURRENT
@@ -1 +1 @@
-MANIFEST-000249
+MANIFEST-000274
diff --git a/packs/spirit-actions/LOG b/packs/spirit-actions/LOG
index ac0b05bdb..7b53a8f53 100644
--- a/packs/spirit-actions/LOG
+++ b/packs/spirit-actions/LOG
@@ -1,8 +1,3 @@
-2023/11/06-12:17:57.449 6d34 Recovering log #247
-2023/11/06-12:17:57.453 6d34 Delete type=0 #247
-2023/11/06-12:17:57.453 6d34 Delete type=3 #245
-2023/11/06-12:19:30.560 6d70 Level-0 table #252: started
-2023/11/06-12:19:30.560 6d70 Level-0 table #252: 0 bytes OK
-2023/11/06-12:19:30.561 6d70 Delete type=0 #250
-2023/11/06-12:19:30.562 6d70 Manual compaction at level-0 from '!folders!DIBPjL86EbMDaAMi' @ 72057594037927935 : 1 .. '!items!zW8DWXGrCPQAtxWZ' @ 0 : 0; will stop at (end)
-2023/11/06-12:19:30.562 6d70 Manual compaction at level-1 from '!folders!DIBPjL86EbMDaAMi' @ 72057594037927935 : 1 .. '!items!zW8DWXGrCPQAtxWZ' @ 0 : 0; will stop at (end)
+2023/11/11-18:00:01.643 429c Recovering log #272
+2023/11/11-18:00:01.647 429c Delete type=0 #272
+2023/11/11-18:00:01.647 429c Delete type=3 #270
diff --git a/packs/spirit-actions/LOG.old b/packs/spirit-actions/LOG.old
index f3a88f6e6..3ebfae80c 100644
--- a/packs/spirit-actions/LOG.old
+++ b/packs/spirit-actions/LOG.old
@@ -1,8 +1,8 @@
-2023/11/06-11:44:25.788 5940 Recovering log #243
-2023/11/06-11:44:25.792 5940 Delete type=0 #243
-2023/11/06-11:44:25.792 5940 Delete type=3 #241
-2023/11/06-12:14:26.912 378c Level-0 table #248: started
-2023/11/06-12:14:26.912 378c Level-0 table #248: 0 bytes OK
-2023/11/06-12:14:26.914 378c Delete type=0 #246
-2023/11/06-12:14:26.920 378c Manual compaction at level-0 from '!folders!DIBPjL86EbMDaAMi' @ 72057594037927935 : 1 .. '!items!zW8DWXGrCPQAtxWZ' @ 0 : 0; will stop at (end)
-2023/11/06-12:14:26.920 378c Manual compaction at level-1 from '!folders!DIBPjL86EbMDaAMi' @ 72057594037927935 : 1 .. '!items!zW8DWXGrCPQAtxWZ' @ 0 : 0; will stop at (end)
+2023/11/11-17:55:50.503 5d04 Recovering log #269
+2023/11/11-17:55:50.507 5d04 Delete type=0 #269
+2023/11/11-17:55:50.507 5d04 Delete type=3 #268
+2023/11/11-17:59:45.444 2e84 Level-0 table #273: started
+2023/11/11-17:59:45.444 2e84 Level-0 table #273: 0 bytes OK
+2023/11/11-17:59:45.448 2e84 Delete type=0 #271
+2023/11/11-17:59:45.452 2e84 Manual compaction at level-0 from '!folders!DIBPjL86EbMDaAMi' @ 72057594037927935 : 1 .. '!items!zW8DWXGrCPQAtxWZ' @ 0 : 0; will stop at (end)
+2023/11/11-17:59:45.452 2e84 Manual compaction at level-1 from '!folders!DIBPjL86EbMDaAMi' @ 72057594037927935 : 1 .. '!items!zW8DWXGrCPQAtxWZ' @ 0 : 0; will stop at (end)
diff --git a/packs/spirit-actions/MANIFEST-000249 b/packs/spirit-actions/MANIFEST-000274
similarity index 71%
rename from packs/spirit-actions/MANIFEST-000249
rename to packs/spirit-actions/MANIFEST-000274
index 5d2e5c35a..200f921a1 100644
Binary files a/packs/spirit-actions/MANIFEST-000249 and b/packs/spirit-actions/MANIFEST-000274 differ
diff --git a/src/module/actor/base.js b/src/module/actor/base.js
index ebc8bc5c6..171e82db9 100644
--- a/src/module/actor/base.js
+++ b/src/module/actor/base.js
@@ -1432,6 +1432,9 @@ class PTUActor extends Actor {
if (itemOptions.includes("move:target:sky") && targetRollOptions.includes("target:location:sky")) {
options["ignore+Z"] = true;
}
+ if (itemOptions.some(option => option.startsWith("move:range:burst"))) {
+ options["burst"] = true;
+ }
const isFlanked = targetToken.isFlanked();
if (isFlanked && !targetRollOptions.includes("target:immune:flanked")) {
diff --git a/src/module/actor/pokemon/document.js b/src/module/actor/pokemon/document.js
index 2cb1183d6..3e5dd07d6 100644
--- a/src/module/actor/pokemon/document.js
+++ b/src/module/actor/pokemon/document.js
@@ -22,7 +22,7 @@ class PTUPokemonActor extends PTUActor {
}
get allowedItemTypes() {
- return ["species", "pokeedge", "move", "contestmove", "ability", "capability", "effect", "condition", "spiritaction"]
+ return ["species", "pokeedge", "move", "contestmove", "ability", "capability", "effect", "condition", "spiritaction", "item"]
}
get nature() {
diff --git a/src/module/actor/pokemon/sheet.js b/src/module/actor/pokemon/sheet.js
index 1d22e1fa4..aa50fac5e 100644
--- a/src/module/actor/pokemon/sheet.js
+++ b/src/module/actor/pokemon/sheet.js
@@ -109,6 +109,7 @@ export class PTUPokemonSheet extends PTUActorSheet {
// Initialize containers.
const abilities = [];
const capabilities = [];
+ const items = [];
const edges = [];
const effects = [];
const conditions = this.actor.conditions;
@@ -139,6 +140,9 @@ export class PTUPokemonSheet extends PTUActorSheet {
case 'spiritaction':
spiritactions.push(i);
break;
+ case 'item':
+ items.push(i);
+ break;
}
}
@@ -150,6 +154,7 @@ export class PTUPokemonSheet extends PTUActorSheet {
sheetData.conditions = conditions;
sheetData.contestmoves = contestmoves;
sheetData.spiritactions = spiritactions;
+ sheetData.items = items;
sheetData.actions = await (async () => {
const moves = [];
diff --git a/src/module/apps/species-mass-generator/document.js b/src/module/apps/species-mass-generator/document.js
index d8d013228..a046da0bd 100644
--- a/src/module/apps/species-mass-generator/document.js
+++ b/src/module/apps/species-mass-generator/document.js
@@ -13,9 +13,9 @@ export class SpeciesGeneratorData {
this.tableSelect = {
value: undefined,
updated: false,
- options: game.tables.map(t => ({label: t.name, uuid: t.uuid}))
+ options: game.tables.map(t => ({ label: t.name, uuid: t.uuid }))
}
- if(this.tableSelect.options?.length > 0) {
+ if (this.tableSelect.options?.length > 0) {
this.tableSelect.value = this.tableSelect.options[0].uuid;
this.tableSelect.updated = true;
}
@@ -36,20 +36,26 @@ export class SpeciesGeneratorData {
}
async refresh() {
- if(this.speciesField.updated) {
- if(this.speciesField.value.includes("Item.")) {
+ if (this.speciesField.updated) {
+ if (this.speciesField.value.includes("Item.")) {
this.species = await fromUuid(this.speciesField.value);
}
- else if(!isNaN(Number(this.speciesField.value))) {
+ else if (!isNaN(Number(this.speciesField.value))) {
this.species = (await querySpeciesCompendium((species) => species.system.number == Number(this.speciesField.value))).find(s => !s.system.form);
}
else {
- this.species = await findItemInCompendium({type: "species", name: this.speciesField.value})
+ this.species = await (async () => {
+ const compendiums = Object.entries(game.settings.get("ptu", "compendiumBrowserPacks")?.species ?? { "ptu.species": { load: true } }).filter(([k, v]) => v.load).map(([k, v]) => k);
+ for (const compendium of compendiums) {
+ const result = await findItemInCompendium({ type: "species", name: this.speciesField.value, compendium });
+ if (result) return result;
+ }
+ })()
}
this.speciesField.updated = false;
}
- if(this.tableSelect.updated) {
- if(!isNaN(Number(this.tableSelect.value))) {
+ if (this.tableSelect.updated) {
+ if (!isNaN(Number(this.tableSelect.value))) {
this.table = game.tables.get(this.tableSelect.value);
}
else if (this.tableSelect.value.includes("RollTable.")) {
@@ -57,12 +63,12 @@ export class SpeciesGeneratorData {
}
this.tableSelect.updated = false;
}
- if(this.folderField.updated) {
- if(this.folderField.value.includes("Item.")) {
+ if (this.folderField.updated) {
+ if (this.folderField.value.includes("Item.")) {
const result = await fromUuid(this.folderField.value);
this.folder = result ? result.type == "Actor" ? result : "invalid" : undefined;
}
- else if(!isNaN(Number(this.folderField.value))) {
+ else if (!isNaN(Number(this.folderField.value))) {
const result = game.folders.get(this.folderField.value);
this.folder = result ? result.type == "Actor" ? result : "invalid" : undefined;
}
@@ -72,37 +78,37 @@ export class SpeciesGeneratorData {
this.folderField.updated = false;
}
- if(this.tableSelect.options?.length == 0) {
+ if (this.tableSelect.options?.length == 0) {
await game.packs.get("ptu.habitats").importAll()
- this.tableSelect.options = game.tables.map(t => ({label: t.name, uuid: t.uuid}))
- if(this.tableSelect.options?.length > 0) {
+ this.tableSelect.options = game.tables.map(t => ({ label: t.name, uuid: t.uuid }))
+ if (this.tableSelect.options?.length > 0) {
this.tableSelect.value = this.tableSelect.options[0].uuid;
this.tableSelect.updated = true;
}
}
-
- if(this.species) {
+
+ if (this.species) {
this.helpText.species = `${game.i18n.localize("PTU.MassGenerator.FoundSpecies")} @UUID[${this.species.uuid}]`
}
- else if(this.speciesField.value) {
- this.helpText.species = `${game.i18n.format("PTU.MassGenerator.CouldNotFindSpecies", {species: this.speciesField.value})}`
+ else if (this.speciesField.value) {
+ this.helpText.species = `${game.i18n.format("PTU.MassGenerator.CouldNotFindSpecies", { species: this.speciesField.value })}`
}
- if(this.table) {
+ if (this.table) {
this.helpText.table = `${game.i18n.localize("PTU.MassGenerator.FoundTable")} @UUID[${this.table.uuid}]`
}
- else if(this.tableSelect.value) {
- this.helpText.table = `${game.i18n.format("PTU.MassGenerator.CouldNotFindTable", {table: this.tableSelect.value})}`
+ else if (this.tableSelect.value) {
+ this.helpText.table = `${game.i18n.format("PTU.MassGenerator.CouldNotFindTable", { table: this.tableSelect.value })}`
}
- if(this.folder == "invalid") {
+ if (this.folder == "invalid") {
this.helpText.folder = `${game.i18n.localize("PTU.MassGenerator.InvalidFolder")}`
}
- else if(this.folder) {
+ else if (this.folder) {
this.helpText.folder = `${game.i18n.localize("PTU.MassGenerator.FoundFolder")} @UUID[${this.folder.uuid}]`
}
- else if(this.folderField.value) {
- this.helpText.folder = `${game.i18n.format("PTU.MassGenerator.CouldNotFindFolder", {folder: this.folderField.value})}`
+ else if (this.folderField.value) {
+ this.helpText.folder = `${game.i18n.format("PTU.MassGenerator.CouldNotFindFolder", { folder: this.folderField.value })}`
}
}
@@ -113,7 +119,7 @@ export class SpeciesGeneratorData {
amount: this.amount,
}
- if(this.speciesTab == "species") {
+ if (this.speciesTab == "species") {
data.species = this.species;
}
else {
diff --git a/src/module/canvas/helpers.js b/src/module/canvas/helpers.js
index a78623467..409a2a555 100644
--- a/src/module/canvas/helpers.js
+++ b/src/module/canvas/helpers.js
@@ -138,6 +138,11 @@ function measureDistanceOnGrid(segment, options = {}) {
straight: sortedDistance[2] - sortedDistance[1],
};
+ // If a move has a burst range it should ignore doubling diagonals
+ if(options.burst) {
+ return (squares.doubleDiagonal + squares.diagonal + squares.straight) * gridDistance;
+ }
+
// Diagonals in PTU pretty much count as 1.5 times a straight
// for diagonals across the x, y, and z axis count it as 1.75 as a best guess
const distance = Math.floor(squares.doubleDiagonal * 1.75 + squares.diagonal * 1.5 + squares.straight);
diff --git a/src/module/canvas/token/base.js b/src/module/canvas/token/base.js
index a42a3d61c..0d13eda67 100644
--- a/src/module/canvas/token/base.js
+++ b/src/module/canvas/token/base.js
@@ -336,7 +336,7 @@ class PTUToken extends Token {
const selfElevation = this.document.elevation;
const targetElevation = target.document.elevation;
if (selfElevation === targetElevation || !this.actor || !target.actor) {
- return measureDistanceCuboid(this.bounds, target.bounds, options);
+ return measureDistanceCuboid(this.bounds, target.bounds, {}, options);
}
return measureDistanceCuboid(this.bounds, target.bounds, {
diff --git a/src/module/item/species/sheet.js b/src/module/item/species/sheet.js
index d83983095..0c8ff0530 100644
--- a/src/module/item/species/sheet.js
+++ b/src/module/item/species/sheet.js
@@ -151,14 +151,15 @@ class PTUSpeciesSheet extends PTUItemSheet {
/** @override */
_onDragStart(event) {
const li = event.currentTarget;
- const { itemUuid, itemSlug, itemType, itemSubtype, itemIndex } = li.dataset;
+ const { itemUuid, itemSlug, itemType, itemSubtype, itemIndex, itemLevel } = li.dataset;
event.dataTransfer.setData('text/plain', JSON.stringify({
uuid: itemUuid,
slug: itemSlug,
type: itemType,
subtype: itemSubtype,
- index: itemIndex
+ index: itemIndex,
+ level: itemLevel
}));
}
@@ -222,7 +223,7 @@ class PTUSpeciesSheet extends PTUItemSheet {
this.dragMove = null;
return;
}
- moves.level.unshift({uuid: item.uuid, slug: item.slug, level: 1});
+ moves.level.unshift({uuid: item.uuid, slug: item.slug, level: Number(data.level) || 1});
}
return this.item.update({"system.moves": moves});
@@ -295,6 +296,22 @@ class PTUSpeciesSheet extends PTUItemSheet {
const {itemType, itemIndex, zone, subZone} = event.currentTarget.dataset;
let { itemSubtype } = event.currentTarget.dataset;
+ const localItem = this.item.system.moves[subtype][index];
+ const realItem = await fromUuid(data.uuid);
+ if(localItem?.slug != realItem?.slug) {
+ if(!realItem || realItem.type != "move") return;
+
+ const moves = this.item.system.moves;
+ if(itemSubtype == "level") {
+ moves[itemSubtype].unshift({slug: realItem.slug, uuid: realItem.uuid, level: Number(data.level) || 1});
+ moves[itemSubtype] = moves[itemSubtype].sort((a, b) => a.level - b.level);
+ }
+ else {
+ moves[itemSubtype].push({slug: realItem.slug, uuid: realItem.uuid});
+ }
+ return this.item.update({"system.moves": moves});
+ }
+
if(itemType != "move") {
if(zone != "move") return;
diff --git a/src/module/rules/rule-element/flat-modifier.js b/src/module/rules/rule-element/flat-modifier.js
index 783f87a0e..1619913a2 100644
--- a/src/module/rules/rule-element/flat-modifier.js
+++ b/src/module/rules/rule-element/flat-modifier.js
@@ -38,7 +38,7 @@ class FlatModifierRuleElement extends RuleElementPTU {
for(const selector of selectors) {
const construct = (options = {}) => {
- if(this.ignored) return null;
+ // if(this.ignored) return null;
const resolvedValue = Number(this.resolveValue(this.value, 0, options)) || 0;
const finalValue = Math.clamped(resolvedValue, this.min ?? resolvedValue, this.max ?? resolvedValue);
diff --git a/src/util/misc.js b/src/util/misc.js
index 4fd48342e..a0967472d 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -51,9 +51,10 @@ export function sluggify(text, { camel } = { camel: null }) {
throw new Error(`I'm pretty sure that's not a real camel: ${camel}`);
}
-export async function findItemInCompendium({ type, name }) {
- if(!type || !name) return undefined;
+export async function findItemInCompendium({ type, name, compendium }) {
+ if (!type || !name) return undefined;
const pack = (() => {
+ if (game.packs.get(compendium)) return game.packs.get(compendium);
switch (type) {
case "move": return game.packs.get("ptu.moves");
case "ability": return game.packs.get("ptu.abilities");
@@ -105,7 +106,7 @@ export function isTokenUUID(uuid) {
return typeof uuid === "string" && /^Scene\.[A-Za-z0-9]{16}\.Token\.[A-Za-z0-9]{16}$/.test(uuid);
}
-export function sortStringRecord(record){
+export function sortStringRecord(record) {
return Object.fromEntries(
Object.entries(record)
.map((entry) => {
@@ -122,16 +123,16 @@ export function sortStringRecord(record){
* @param type The type of the item required for name search
* @param item Original item to derrive search params from
*/
-export async function getItemFromCompendium({uuid, name, type, item}) {
+export async function getItemFromCompendium({ uuid, name, type, item }) {
let found = null;
if (uuid) {
found = await fromUuid(uuid);
}
- if(!found && name && type) {
- found = await findItemInCompendium({name, type});
+ if (!found && name && type) {
+ found = await findItemInCompendium({ name, type });
}
- if(!found && item) {
- found = await getItemFromCompendium({uuid: item.flags?.core?.sourceId, name: item.name, type: item.type});
+ if (!found && item) {
+ found = await getItemFromCompendium({ uuid: item.flags?.core?.sourceId, name: item.name, type: item.type });
}
return found;
}
\ No newline at end of file
diff --git a/static/lang/en.json b/static/lang/en.json
index f6ef82c50..e6e0f649e 100644
--- a/static/lang/en.json
+++ b/static/lang/en.json
@@ -63,7 +63,8 @@
"TypeSpiritActionPlural": "Spirit Actions",
"Modifier": "Modifier",
"ShowInTokenPanel": "Show in Token Panel",
- "Dice": "Base Dice"
+ "Dice": "Base Dice",
+ "Snippet": "Effect Snippet"
},
"SPECIES.Height": "Height",
@@ -155,7 +156,7 @@
"pokemonEd": "Pokémon Education",
"techEd": "Technology Education"
},
- "Title": "Pokémon Tabletop United",
+ "Title": "Pokémon Tabletop Reunited",
"TabsSkills": "Skills",
"TabsInventory": "Inventory",
@@ -236,6 +237,7 @@
"SaveCheckAction": "Make Save",
"ItemEffect": "Item Effect",
+ "HeldItems": "Held Items",
"FoodBuff": "Food Buff",
"HpGuidelines": "HP Guidelines",
"16th": "1/16th",
diff --git a/static/templates/actor/pokemon-sheet-compact.hbs b/static/templates/actor/pokemon-sheet-compact.hbs
index fc1e611c9..b45e9c973 100644
--- a/static/templates/actor/pokemon-sheet-compact.hbs
+++ b/static/templates/actor/pokemon-sheet-compact.hbs
@@ -749,6 +749,18 @@
{{/if}}
+
+
+
+
+
+ {{> "systems/ptu/static/templates/partials/item-display-partial.hbs" title=(localize
+ "ITEM.TypeItemPlural") type="item" items=items ballStyle=ballStyle}}
+
+
+
+
+
diff --git a/static/templates/item/capability-sheet.hbs b/static/templates/item/capability-sheet.hbs
index 4042ca91f..a2743562d 100644
--- a/static/templates/item/capability-sheet.hbs
+++ b/static/templates/item/capability-sheet.hbs
@@ -49,6 +49,10 @@
+
+
+
+
{{~> systems/ptu/static/templates/partials/rules/rule-partial.hbs item=item}}
diff --git a/static/templates/item/condition-sheet.hbs b/static/templates/item/condition-sheet.hbs
index 4042ca91f..a2743562d 100644
--- a/static/templates/item/condition-sheet.hbs
+++ b/static/templates/item/condition-sheet.hbs
@@ -49,6 +49,10 @@
+
+
+
+
{{~> systems/ptu/static/templates/partials/rules/rule-partial.hbs item=item}}
diff --git a/static/templates/item/edge-sheet.hbs b/static/templates/item/edge-sheet.hbs
index 29deff2f2..eed1b7340 100644
--- a/static/templates/item/edge-sheet.hbs
+++ b/static/templates/item/edge-sheet.hbs
@@ -100,6 +100,10 @@
+
+
+
+
diff --git a/static/templates/item/effect-sheet.hbs b/static/templates/item/effect-sheet.hbs
index 4042ca91f..a2743562d 100644
--- a/static/templates/item/effect-sheet.hbs
+++ b/static/templates/item/effect-sheet.hbs
@@ -49,6 +49,10 @@
+
+
+
+
{{~> systems/ptu/static/templates/partials/rules/rule-partial.hbs item=item}}
diff --git a/static/templates/item/feat-sheet.hbs b/static/templates/item/feat-sheet.hbs
index 99f1a03b7..c4e3c45d7 100644
--- a/static/templates/item/feat-sheet.hbs
+++ b/static/templates/item/feat-sheet.hbs
@@ -119,6 +119,10 @@
+
+
+
+
diff --git a/static/templates/item/item-sheet.hbs b/static/templates/item/item-sheet.hbs
index 63b2d7232..31d74dc13 100644
--- a/static/templates/item/item-sheet.hbs
+++ b/static/templates/item/item-sheet.hbs
@@ -126,6 +126,10 @@
+
+
+
+
diff --git a/static/templates/item/move-sheet.hbs b/static/templates/item/move-sheet.hbs
index 3238634a0..e8e2b75a0 100644
--- a/static/templates/item/move-sheet.hbs
+++ b/static/templates/item/move-sheet.hbs
@@ -181,6 +181,10 @@
+
+
+
+
diff --git a/static/templates/item/pokeedge-sheet.hbs b/static/templates/item/pokeedge-sheet.hbs
index 1189a805e..ec9967cd0 100644
--- a/static/templates/item/pokeedge-sheet.hbs
+++ b/static/templates/item/pokeedge-sheet.hbs
@@ -72,6 +72,10 @@
+
+
+
+
{{~> systems/ptu/static/templates/partials/rules/rule-partial.hbs item=item}}
diff --git a/static/templates/partials/species-item-partial.hbs b/static/templates/partials/species-item-partial.hbs
index 45ce1ae20..5363bd3b6 100644
--- a/static/templates/partials/species-item-partial.hbs
+++ b/static/templates/partials/species-item-partial.hbs
@@ -19,7 +19,7 @@
{{#each items as | item |}}
- -
+
-
{{formatSlug item.slug}}
diff --git a/system.json b/system.json
index 17e265359..6e65104cd 100644
--- a/system.json
+++ b/system.json
@@ -7,7 +7,7 @@
"verified": "11.314",
"maximum": 11
},
- "version": "4.0.1.1",
+ "version": "4.0.2",
"templateVersion": 2,
"authors": [
{