diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb58104c..8af06a6b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,10 +19,21 @@ jobs: id: set-release-notes-github run: | echo "- Additions:" >> release_notes.txt - echo " - Toxic Shield: Adds the 3rd party Drakkenheim spell Toxic Shield" >> release_notes.txt + echo " - Rebuke the Damned: V12 compatability" >> release_notes.txt + echo " - Bloodied but Unbowed: V12 compatability" >> release_notes.txt + echo " - Jims Magic Missiles: Partial V12 compatability, may take a look at it again in the future" >> release_notes.txt + echo "- Updates:" >> release_notes.txt + echo " - Infestation: Made it better. Add in support for cprs new-ish twinned spell automation" >> release_notes.txt + echo " - Silvery Barbs: Add in the logic to support both homebrew settings for saving throws. Previously was only enabled for attack rolls (because I forgot)" >> release_notes.txt + echo " - Dissonant Whispers: Add in support for cprs new-ish twinned spell automation" >> release_notes.txt + echo " - Enemies Abound: Add in support for cprs new-ish twinned spell automation" >> release_notes.txt + echo " - Enervation: Add in support for cprs new-ish twinned spell automation" >> release_notes.txt + echo " - Fizbans Platinum Shield: Add in support for cprs new-ish twinned spell automation" >> release_notes.txt + echo " - Hideous Laughter: Add in support for cprs new-ish twinned spell automation" >> release_notes.txt + echo " - Vicious Mockery: Add in support for cprs new-ish twinned spell automation" >> release_notes.txt echo "- Bugfixes:" >> release_notes.txt - echo " - Confusion: Resolve bug not using the correct save DC on turn end. Clean up effect application" >> release_notes.txt - echo " - Cloud of Daggers: Resolve not correctly attributing number of dice on upcast" >> release_notes.txt + echo " - Opportunity Attack: Resolve dead tokens still generating OA with some settings" >> release_notes.txt + echo " - Origin and Cardinal Movement Helpers: Fixed 1/2/1 and 2/1/2 distances not being calculated correctly" >> release_notes.txt echo "release-notes-github<> $GITHUB_ENV cat release_notes.txt >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV diff --git a/assets/images/jimsmagicmissiles.webp b/assets/images/jimsmagicmissiles.webp new file mode 100644 index 00000000..c2d93762 Binary files /dev/null and b/assets/images/jimsmagicmissiles.webp differ diff --git a/packs/gps-3rd-party-features/001402.log b/packs/gps-3rd-party-features/001427.log similarity index 100% rename from packs/gps-3rd-party-features/001402.log rename to packs/gps-3rd-party-features/001427.log diff --git a/packs/gps-3rd-party-features/CURRENT b/packs/gps-3rd-party-features/CURRENT index b73b5de8..7ac01360 100644 --- a/packs/gps-3rd-party-features/CURRENT +++ b/packs/gps-3rd-party-features/CURRENT @@ -1 +1 @@ -MANIFEST-001400 +MANIFEST-001425 diff --git a/packs/gps-3rd-party-features/LOG b/packs/gps-3rd-party-features/LOG index 7dc5d8bd..7251cb59 100644 --- a/packs/gps-3rd-party-features/LOG +++ b/packs/gps-3rd-party-features/LOG @@ -1,15 +1,8 @@ -2024/10/03-19:07:58.904 8c7c Recovering log #1398 -2024/10/03-19:07:58.910 8c7c Delete type=0 #1398 -2024/10/03-19:07:58.910 8c7c Delete type=3 #1396 -2024/10/06-01:26:36.030 9264 Level-0 table #1403: started -2024/10/06-01:26:36.032 9264 Level-0 table #1403: 2982 bytes OK -2024/10/06-01:26:36.034 9264 Delete type=0 #1401 -2024/10/06-01:26:36.036 9264 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.036 9264 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at '!items!y6y7B3DSHbduxFDF' @ 70 : 1 -2024/10/06-01:26:36.036 9264 Compacting 1@1 + 1@2 files -2024/10/06-01:26:36.039 9264 Generated table #1404@1: 8 keys, 19422 bytes -2024/10/06-01:26:36.039 9264 Compacted 1@1 + 1@2 files => 19422 bytes -2024/10/06-01:26:36.041 9264 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/10/06-01:26:36.041 9264 Delete type=2 #1325 -2024/10/06-01:26:36.041 9264 Delete type=2 #1403 -2024/10/06-01:26:36.045 9264 Manual compaction at level-1 from '!items!y6y7B3DSHbduxFDF' @ 70 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.796 71d4 Recovering log #1423 +2024/10/11-14:37:22.801 71d4 Delete type=0 #1423 +2024/10/11-14:37:22.801 71d4 Delete type=3 #1421 +2024/10/12-22:58:46.898 9264 Level-0 table #1428: started +2024/10/12-22:58:46.898 9264 Level-0 table #1428: 0 bytes OK +2024/10/12-22:58:46.900 9264 Delete type=0 #1426 +2024/10/12-22:58:46.900 9264 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.905 9264 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 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 4fd1e890..87aa563d 100644 --- a/packs/gps-3rd-party-features/LOG.old +++ b/packs/gps-3rd-party-features/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.857 71d4 Recovering log #1394 -2024/10/03-12:53:26.861 71d4 Delete type=0 #1394 -2024/10/03-12:53:26.861 71d4 Delete type=3 #1392 -2024/10/03-14:00:08.815 9264 Level-0 table #1399: started -2024/10/03-14:00:08.816 9264 Level-0 table #1399: 0 bytes OK -2024/10/03-14:00:08.819 9264 Delete type=0 #1397 -2024/10/03-14:00:08.825 9264 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.825 9264 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.169 8c7c Recovering log #1419 +2024/10/11-00:30:42.175 8c7c Delete type=0 #1419 +2024/10/11-00:30:42.175 8c7c Delete type=3 #1417 +2024/10/11-14:34:42.253 9264 Level-0 table #1424: started +2024/10/11-14:34:42.253 9264 Level-0 table #1424: 0 bytes OK +2024/10/11-14:34:42.255 9264 Delete type=0 #1422 +2024/10/11-14:34:42.258 9264 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.258 9264 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) diff --git a/packs/gps-3rd-party-features/MANIFEST-001400 b/packs/gps-3rd-party-features/MANIFEST-001400 deleted file mode 100644 index 87ef03f0..00000000 Binary files a/packs/gps-3rd-party-features/MANIFEST-001400 and /dev/null differ diff --git a/packs/gps-3rd-party-features/MANIFEST-001425 b/packs/gps-3rd-party-features/MANIFEST-001425 new file mode 100644 index 00000000..0b4997fd Binary files /dev/null and b/packs/gps-3rd-party-features/MANIFEST-001425 differ diff --git a/packs/gps-3rd-party-items/001406.log b/packs/gps-3rd-party-items/001430.log similarity index 100% rename from packs/gps-3rd-party-items/001406.log rename to packs/gps-3rd-party-items/001430.log diff --git a/packs/gps-3rd-party-items/CURRENT b/packs/gps-3rd-party-items/CURRENT index 41c4c170..7a51e6c9 100644 --- a/packs/gps-3rd-party-items/CURRENT +++ b/packs/gps-3rd-party-items/CURRENT @@ -1 +1 @@ -MANIFEST-001404 +MANIFEST-001428 diff --git a/packs/gps-3rd-party-items/LOG b/packs/gps-3rd-party-items/LOG index 37e98202..558013d4 100644 --- a/packs/gps-3rd-party-items/LOG +++ b/packs/gps-3rd-party-items/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.981 7088 Recovering log #1402 -2024/10/03-19:07:58.989 7088 Delete type=0 #1402 -2024/10/03-19:07:58.989 7088 Delete type=3 #1400 -2024/10/06-01:26:36.090 9264 Level-0 table #1407: started -2024/10/06-01:26:36.090 9264 Level-0 table #1407: 0 bytes OK -2024/10/06-01:26:36.099 9264 Delete type=0 #1405 -2024/10/06-01:26:36.108 9264 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.108 9264 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.853 7088 Recovering log #1426 +2024/10/11-14:37:22.856 7088 Delete type=0 #1426 +2024/10/11-14:37:22.856 7088 Delete type=3 #1424 +2024/10/12-22:58:46.924 9264 Level-0 table #1431: started +2024/10/12-22:58:46.924 9264 Level-0 table #1431: 0 bytes OK +2024/10/12-22:58:46.926 9264 Delete type=0 #1429 +2024/10/12-22:58:46.931 9264 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.931 9264 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 05cb03f2..5612d384 100644 --- a/packs/gps-3rd-party-items/LOG.old +++ b/packs/gps-3rd-party-items/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.911 708c Recovering log #1398 -2024/10/03-12:53:26.915 708c Delete type=0 #1398 -2024/10/03-12:53:26.915 708c Delete type=3 #1396 -2024/10/03-14:00:08.837 9264 Level-0 table #1403: started -2024/10/03-14:00:08.837 9264 Level-0 table #1403: 0 bytes OK -2024/10/03-14:00:08.840 9264 Delete type=0 #1401 -2024/10/03-14:00:08.849 9264 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.849 9264 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.223 71d4 Recovering log #1422 +2024/10/11-00:30:42.226 71d4 Delete type=0 #1422 +2024/10/11-00:30:42.226 71d4 Delete type=3 #1420 +2024/10/11-14:34:42.270 9264 Level-0 table #1427: started +2024/10/11-14:34:42.270 9264 Level-0 table #1427: 0 bytes OK +2024/10/11-14:34:42.272 9264 Delete type=0 #1425 +2024/10/11-14:34:42.275 9264 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.276 9264 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-001404 b/packs/gps-3rd-party-items/MANIFEST-001428 similarity index 75% rename from packs/gps-3rd-party-items/MANIFEST-001404 rename to packs/gps-3rd-party-items/MANIFEST-001428 index eff002f3..a9d80f9e 100644 Binary files a/packs/gps-3rd-party-items/MANIFEST-001404 and b/packs/gps-3rd-party-items/MANIFEST-001428 differ diff --git a/packs/gps-3rd-party-spells/001422.log b/packs/gps-3rd-party-spells/001447.log similarity index 100% rename from packs/gps-3rd-party-spells/001422.log rename to packs/gps-3rd-party-spells/001447.log diff --git a/packs/gps-3rd-party-spells/CURRENT b/packs/gps-3rd-party-spells/CURRENT index f94ca561..69978499 100644 --- a/packs/gps-3rd-party-spells/CURRENT +++ b/packs/gps-3rd-party-spells/CURRENT @@ -1 +1 @@ -MANIFEST-001420 +MANIFEST-001445 diff --git a/packs/gps-3rd-party-spells/LOG b/packs/gps-3rd-party-spells/LOG index 3cf07182..d76419c9 100644 --- a/packs/gps-3rd-party-spells/LOG +++ b/packs/gps-3rd-party-spells/LOG @@ -1,15 +1,8 @@ -2024/10/03-19:07:58.995 8c7c Recovering log #1418 -2024/10/03-19:07:59.001 8c7c Delete type=0 #1418 -2024/10/03-19:07:59.002 8c7c Delete type=3 #1416 -2024/10/06-01:26:36.099 9264 Level-0 table #1423: started -2024/10/06-01:26:36.102 9264 Level-0 table #1423: 8385 bytes OK -2024/10/06-01:26:36.105 9264 Delete type=0 #1421 -2024/10/06-01:26:36.108 9264 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.108 9264 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at '!items.effects!SGSmveHI70IMirss.1qXUy5XyTuXH4e3T' @ 425 : 1 -2024/10/06-01:26:36.108 9264 Compacting 1@1 + 1@2 files -2024/10/06-01:26:36.112 9264 Generated table #1424@1: 36 keys, 83739 bytes -2024/10/06-01:26:36.112 9264 Compacted 1@1 + 1@2 files => 83739 bytes -2024/10/06-01:26:36.115 9264 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/10/06-01:26:36.115 9264 Delete type=2 #1415 -2024/10/06-01:26:36.115 9264 Delete type=2 #1423 -2024/10/06-01:26:36.119 9264 Manual compaction at level-1 from '!items.effects!SGSmveHI70IMirss.1qXUy5XyTuXH4e3T' @ 425 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.858 71d4 Recovering log #1443 +2024/10/11-14:37:22.862 71d4 Delete type=0 #1443 +2024/10/11-14:37:22.862 71d4 Delete type=3 #1441 +2024/10/12-22:58:46.926 9264 Level-0 table #1448: started +2024/10/12-22:58:46.926 9264 Level-0 table #1448: 0 bytes OK +2024/10/12-22:58:46.928 9264 Delete type=0 #1446 +2024/10/12-22:58:46.931 9264 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.931 9264 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 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 a5a8ce20..75944578 100644 --- a/packs/gps-3rd-party-spells/LOG.old +++ b/packs/gps-3rd-party-spells/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.918 71d4 Recovering log #1413 -2024/10/03-12:53:26.922 71d4 Delete type=0 #1413 -2024/10/03-12:53:26.922 71d4 Delete type=3 #1411 -2024/10/03-14:00:08.840 9264 Level-0 table #1419: started -2024/10/03-14:00:08.841 9264 Level-0 table #1419: 0 bytes OK -2024/10/03-14:00:08.843 9264 Delete type=0 #1417 -2024/10/03-14:00:08.849 9264 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.849 9264 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.229 8c7c Recovering log #1439 +2024/10/11-00:30:42.233 8c7c Delete type=0 #1439 +2024/10/11-00:30:42.233 8c7c Delete type=3 #1437 +2024/10/11-14:34:42.272 9264 Level-0 table #1444: started +2024/10/11-14:34:42.272 9264 Level-0 table #1444: 0 bytes OK +2024/10/11-14:34:42.274 9264 Delete type=0 #1442 +2024/10/11-14:34:42.276 9264 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.276 9264 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) diff --git a/packs/gps-3rd-party-spells/MANIFEST-001420 b/packs/gps-3rd-party-spells/MANIFEST-001420 deleted file mode 100644 index f3dc74d6..00000000 Binary files a/packs/gps-3rd-party-spells/MANIFEST-001420 and /dev/null differ diff --git a/packs/gps-3rd-party-spells/MANIFEST-001445 b/packs/gps-3rd-party-spells/MANIFEST-001445 new file mode 100644 index 00000000..68f6afb9 Binary files /dev/null and b/packs/gps-3rd-party-spells/MANIFEST-001445 differ diff --git a/packs/gps-actors/001869.log b/packs/gps-actors/001893.log similarity index 100% rename from packs/gps-actors/001869.log rename to packs/gps-actors/001893.log diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT index 9e60aadd..0ccce6f4 100644 --- a/packs/gps-actors/CURRENT +++ b/packs/gps-actors/CURRENT @@ -1 +1 @@ -MANIFEST-001867 +MANIFEST-001891 diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG index c562b4bd..d0d78f34 100644 --- a/packs/gps-actors/LOG +++ b/packs/gps-actors/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.970 708c Recovering log #1865 -2024/10/03-19:07:58.975 708c Delete type=0 #1865 -2024/10/03-19:07:58.976 708c Delete type=3 #1863 -2024/10/06-01:26:36.065 9264 Level-0 table #1870: started -2024/10/06-01:26:36.066 9264 Level-0 table #1870: 0 bytes OK -2024/10/06-01:26:36.089 9264 Delete type=0 #1868 -2024/10/06-01:26:36.107 9264 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.108 9264 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.844 8c7c Recovering log #1889 +2024/10/11-14:37:22.849 8c7c Delete type=0 #1889 +2024/10/11-14:37:22.849 8c7c Delete type=3 #1887 +2024/10/12-22:58:46.921 9264 Level-0 table #1894: started +2024/10/12-22:58:46.921 9264 Level-0 table #1894: 0 bytes OK +2024/10/12-22:58:46.922 9264 Delete type=0 #1892 +2024/10/12-22:58:46.922 9264 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.922 9264 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 759ecfbf..60fce683 100644 --- a/packs/gps-actors/LOG.old +++ b/packs/gps-actors/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.902 8c7c Recovering log #1861 -2024/10/03-12:53:26.907 8c7c Delete type=0 #1861 -2024/10/03-12:53:26.907 8c7c Delete type=3 #1859 -2024/10/03-14:00:08.829 9264 Level-0 table #1866: started -2024/10/03-14:00:08.829 9264 Level-0 table #1866: 0 bytes OK -2024/10/03-14:00:08.831 9264 Delete type=0 #1864 -2024/10/03-14:00:08.835 9264 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.835 9264 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.216 708c Recovering log #1885 +2024/10/11-00:30:42.220 708c Delete type=0 #1885 +2024/10/11-00:30:42.220 708c Delete type=3 #1883 +2024/10/11-14:34:42.264 9264 Level-0 table #1890: started +2024/10/11-14:34:42.264 9264 Level-0 table #1890: 0 bytes OK +2024/10/11-14:34:42.266 9264 Delete type=0 #1888 +2024/10/11-14:34:42.266 9264 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.266 9264 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-001867 b/packs/gps-actors/MANIFEST-001891 similarity index 70% rename from packs/gps-actors/MANIFEST-001867 rename to packs/gps-actors/MANIFEST-001891 index fcd14847..09a360a0 100644 Binary files a/packs/gps-actors/MANIFEST-001867 and b/packs/gps-actors/MANIFEST-001891 differ diff --git a/packs/gps-class-features/003086.log b/packs/gps-class-features/003110.log similarity index 100% rename from packs/gps-class-features/003086.log rename to packs/gps-class-features/003110.log diff --git a/packs/gps-class-features/003079.ldb b/packs/gps-class-features/003112.ldb similarity index 96% rename from packs/gps-class-features/003079.ldb rename to packs/gps-class-features/003112.ldb index 4e5a1f51..11a5027f 100644 Binary files a/packs/gps-class-features/003079.ldb and b/packs/gps-class-features/003112.ldb differ diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT index c07e209d..acbde8ea 100644 --- a/packs/gps-class-features/CURRENT +++ b/packs/gps-class-features/CURRENT @@ -1 +1 @@ -MANIFEST-003084 +MANIFEST-003108 diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG index 13abb452..5ef2bf4d 100644 --- a/packs/gps-class-features/LOG +++ b/packs/gps-class-features/LOG @@ -1,8 +1,15 @@ -2024/10/03-19:07:58.888 708c Recovering log #3082 -2024/10/03-19:07:58.893 708c Delete type=0 #3082 -2024/10/03-19:07:58.893 708c Delete type=3 #3080 -2024/10/06-01:26:36.025 9264 Level-0 table #3087: started -2024/10/06-01:26:36.025 9264 Level-0 table #3087: 0 bytes OK -2024/10/06-01:26:36.028 9264 Delete type=0 #3085 -2024/10/06-01:26:36.034 9264 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.036 9264 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.779 8c7c Recovering log #3106 +2024/10/11-14:37:22.783 8c7c Delete type=0 #3106 +2024/10/11-14:37:22.783 8c7c Delete type=3 #3104 +2024/10/12-22:58:46.883 9264 Level-0 table #3111: started +2024/10/12-22:58:46.884 9264 Level-0 table #3111: 12948 bytes OK +2024/10/12-22:58:46.886 9264 Delete type=0 #3109 +2024/10/12-22:58:46.886 9264 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.886 9264 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at '!items!ddIm1TJtpoiZuW23' @ 1012 : 1 +2024/10/12-22:58:46.886 9264 Compacting 1@1 + 1@2 files +2024/10/12-22:58:46.889 9264 Generated table #3112@1: 73 keys, 118249 bytes +2024/10/12-22:58:46.889 9264 Compacted 1@1 + 1@2 files => 118249 bytes +2024/10/12-22:58:46.891 9264 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/10/12-22:58:46.891 9264 Delete type=2 #3079 +2024/10/12-22:58:46.891 9264 Delete type=2 #3111 +2024/10/12-22:58:46.900 9264 Manual compaction at level-1 from '!items!ddIm1TJtpoiZuW23' @ 1012 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) diff --git a/packs/gps-class-features/LOG.old b/packs/gps-class-features/LOG.old index e86a35a9..00ff1e72 100644 --- a/packs/gps-class-features/LOG.old +++ b/packs/gps-class-features/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.843 8c7c Recovering log #3077 -2024/10/03-12:53:26.847 8c7c Delete type=0 #3077 -2024/10/03-12:53:26.847 8c7c Delete type=3 #3075 -2024/10/03-14:00:08.810 9264 Level-0 table #3083: started -2024/10/03-14:00:08.810 9264 Level-0 table #3083: 0 bytes OK -2024/10/03-14:00:08.812 9264 Delete type=0 #3081 -2024/10/03-14:00:08.814 9264 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.814 9264 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.149 708c Recovering log #3102 +2024/10/11-00:30:42.153 708c Delete type=0 #3102 +2024/10/11-00:30:42.153 708c Delete type=3 #3100 +2024/10/11-14:34:42.248 9264 Level-0 table #3107: started +2024/10/11-14:34:42.248 9264 Level-0 table #3107: 0 bytes OK +2024/10/11-14:34:42.250 9264 Delete type=0 #3105 +2024/10/11-14:34:42.250 9264 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.250 9264 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) diff --git a/packs/gps-class-features/MANIFEST-003084 b/packs/gps-class-features/MANIFEST-003084 deleted file mode 100644 index c01be20b..00000000 Binary files a/packs/gps-class-features/MANIFEST-003084 and /dev/null differ diff --git a/packs/gps-class-features/MANIFEST-003108 b/packs/gps-class-features/MANIFEST-003108 new file mode 100644 index 00000000..0aeac176 Binary files /dev/null and b/packs/gps-class-features/MANIFEST-003108 differ diff --git a/packs/gps-generic-features/003136.log b/packs/gps-generic-features/003160.log similarity index 100% rename from packs/gps-generic-features/003136.log rename to packs/gps-generic-features/003160.log diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT index 321be1d2..230b26f1 100644 --- a/packs/gps-generic-features/CURRENT +++ b/packs/gps-generic-features/CURRENT @@ -1 +1 @@ -MANIFEST-003134 +MANIFEST-003158 diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG index 027835a3..189ac764 100644 --- a/packs/gps-generic-features/LOG +++ b/packs/gps-generic-features/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.921 71d4 Recovering log #3132 -2024/10/03-19:07:58.926 71d4 Delete type=0 #3132 -2024/10/03-19:07:58.926 71d4 Delete type=3 #3130 -2024/10/06-01:26:36.041 9264 Level-0 table #3137: started -2024/10/06-01:26:36.041 9264 Level-0 table #3137: 0 bytes OK -2024/10/06-01:26:36.043 9264 Delete type=0 #3135 -2024/10/06-01:26:36.048 9264 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.061 9264 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.812 708c Recovering log #3156 +2024/10/11-14:37:22.816 708c Delete type=0 #3156 +2024/10/11-14:37:22.816 708c Delete type=3 #3154 +2024/10/12-22:58:46.908 9264 Level-0 table #3161: started +2024/10/12-22:58:46.908 9264 Level-0 table #3161: 0 bytes OK +2024/10/12-22:58:46.910 9264 Delete type=0 #3159 +2024/10/12-22:58:46.915 9264 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.915 9264 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 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 07270c59..e752bb45 100644 --- a/packs/gps-generic-features/LOG.old +++ b/packs/gps-generic-features/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.870 7088 Recovering log #3128 -2024/10/03-12:53:26.875 7088 Delete type=0 #3128 -2024/10/03-12:53:26.875 7088 Delete type=3 #3126 -2024/10/03-14:00:08.821 9264 Level-0 table #3133: started -2024/10/03-14:00:08.821 9264 Level-0 table #3133: 0 bytes OK -2024/10/03-14:00:08.823 9264 Delete type=0 #3131 -2024/10/03-14:00:08.825 9264 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.825 9264 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.190 7088 Recovering log #3152 +2024/10/11-00:30:42.194 7088 Delete type=0 #3152 +2024/10/11-00:30:42.194 7088 Delete type=3 #3150 +2024/10/11-14:34:42.255 9264 Level-0 table #3157: started +2024/10/11-14:34:42.255 9264 Level-0 table #3157: 0 bytes OK +2024/10/11-14:34:42.256 9264 Delete type=0 #3155 +2024/10/11-14:34:42.258 9264 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.258 9264 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) diff --git a/packs/gps-generic-features/MANIFEST-003134 b/packs/gps-generic-features/MANIFEST-003158 similarity index 81% rename from packs/gps-generic-features/MANIFEST-003134 rename to packs/gps-generic-features/MANIFEST-003158 index f45b06f0..8974c92a 100644 Binary files a/packs/gps-generic-features/MANIFEST-003134 and b/packs/gps-generic-features/MANIFEST-003158 differ diff --git a/packs/gps-homebrew-features/003036.log b/packs/gps-homebrew-features/003061.log similarity index 100% rename from packs/gps-homebrew-features/003036.log rename to packs/gps-homebrew-features/003061.log diff --git a/packs/gps-homebrew-features/002835.ldb b/packs/gps-homebrew-features/003063.ldb similarity index 71% rename from packs/gps-homebrew-features/002835.ldb rename to packs/gps-homebrew-features/003063.ldb index 2914c1cb..17939a27 100644 Binary files a/packs/gps-homebrew-features/002835.ldb and b/packs/gps-homebrew-features/003063.ldb differ diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT index 92ef323f..66eae2dc 100644 --- a/packs/gps-homebrew-features/CURRENT +++ b/packs/gps-homebrew-features/CURRENT @@ -1 +1 @@ -MANIFEST-003034 +MANIFEST-003059 diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG index 0e46a360..05eaf5aa 100644 --- a/packs/gps-homebrew-features/LOG +++ b/packs/gps-homebrew-features/LOG @@ -1,8 +1,15 @@ -2024/10/03-19:07:58.930 8c7c Recovering log #3032 -2024/10/03-19:07:58.935 8c7c Delete type=0 #3032 -2024/10/03-19:07:58.935 8c7c Delete type=3 #3030 -2024/10/06-01:26:36.043 9264 Level-0 table #3037: started -2024/10/06-01:26:36.043 9264 Level-0 table #3037: 0 bytes OK -2024/10/06-01:26:36.045 9264 Delete type=0 #3035 -2024/10/06-01:26:36.048 9264 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.061 9264 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.821 71d4 Recovering log #3057 +2024/10/11-14:37:22.827 71d4 Delete type=0 #3057 +2024/10/11-14:37:22.827 71d4 Delete type=3 #3055 +2024/10/12-22:58:46.910 9264 Level-0 table #3062: started +2024/10/12-22:58:46.912 9264 Level-0 table #3062: 21064 bytes OK +2024/10/12-22:58:46.913 9264 Delete type=0 #3060 +2024/10/12-22:58:46.915 9264 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.915 9264 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at '!items!6FSybwInhiibdD1O' @ 172 : 1 +2024/10/12-22:58:46.915 9264 Compacting 1@1 + 1@2 files +2024/10/12-22:58:46.917 9264 Generated table #3063@1: 19 keys, 37401 bytes +2024/10/12-22:58:46.917 9264 Compacted 1@1 + 1@2 files => 37401 bytes +2024/10/12-22:58:46.919 9264 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/10/12-22:58:46.919 9264 Delete type=2 #3050 +2024/10/12-22:58:46.919 9264 Delete type=2 #3062 +2024/10/12-22:58:46.922 9264 Manual compaction at level-1 from '!items!6FSybwInhiibdD1O' @ 172 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-features/LOG.old b/packs/gps-homebrew-features/LOG.old index f2d47094..9ff940a1 100644 --- a/packs/gps-homebrew-features/LOG.old +++ b/packs/gps-homebrew-features/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.878 71d4 Recovering log #3028 -2024/10/03-12:53:26.883 71d4 Delete type=0 #3028 -2024/10/03-12:53:26.883 71d4 Delete type=3 #3026 -2024/10/03-14:00:08.827 9264 Level-0 table #3033: started -2024/10/03-14:00:08.827 9264 Level-0 table #3033: 0 bytes OK -2024/10/03-14:00:08.828 9264 Delete type=0 #3031 -2024/10/03-14:00:08.835 9264 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.835 9264 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.197 8c7c Recovering log #3053 +2024/10/11-00:30:42.201 8c7c Delete type=0 #3053 +2024/10/11-00:30:42.201 8c7c Delete type=3 #3051 +2024/10/11-14:34:42.259 9264 Level-0 table #3058: started +2024/10/11-14:34:42.259 9264 Level-0 table #3058: 0 bytes OK +2024/10/11-14:34:42.261 9264 Delete type=0 #3056 +2024/10/11-14:34:42.266 9264 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.266 9264 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!fwJjg1xtQFZupjbV.vhj7xJmCiTIagALN' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-features/MANIFEST-003034 b/packs/gps-homebrew-features/MANIFEST-003034 deleted file mode 100644 index 899f0614..00000000 Binary files a/packs/gps-homebrew-features/MANIFEST-003034 and /dev/null differ diff --git a/packs/gps-homebrew-features/MANIFEST-003059 b/packs/gps-homebrew-features/MANIFEST-003059 new file mode 100644 index 00000000..e433222f Binary files /dev/null and b/packs/gps-homebrew-features/MANIFEST-003059 differ diff --git a/packs/gps-homebrew-items/003043.log b/packs/gps-homebrew-items/003067.log similarity index 100% rename from packs/gps-homebrew-items/003043.log rename to packs/gps-homebrew-items/003067.log diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT index c68ad409..1064d7f9 100644 --- a/packs/gps-homebrew-items/CURRENT +++ b/packs/gps-homebrew-items/CURRENT @@ -1 +1 @@ -MANIFEST-003041 +MANIFEST-003065 diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG index 5600f42a..63a1ca60 100644 --- a/packs/gps-homebrew-items/LOG +++ b/packs/gps-homebrew-items/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.944 7088 Recovering log #3039 -2024/10/03-19:07:58.950 7088 Delete type=0 #3039 -2024/10/03-19:07:58.950 7088 Delete type=3 #3037 -2024/10/06-01:26:36.045 9264 Level-0 table #3044: started -2024/10/06-01:26:36.045 9264 Level-0 table #3044: 0 bytes OK -2024/10/06-01:26:36.048 9264 Delete type=0 #3042 -2024/10/06-01:26:36.061 9264 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.061 9264 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.830 7088 Recovering log #3063 +2024/10/11-14:37:22.835 7088 Delete type=0 #3063 +2024/10/11-14:37:22.835 7088 Delete type=3 #3061 +2024/10/12-22:58:46.913 9264 Level-0 table #3068: started +2024/10/12-22:58:46.913 9264 Level-0 table #3068: 0 bytes OK +2024/10/12-22:58:46.915 9264 Delete type=0 #3066 +2024/10/12-22:58:46.919 9264 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.922 9264 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-items/LOG.old b/packs/gps-homebrew-items/LOG.old index 6319777a..409a6c0b 100644 --- a/packs/gps-homebrew-items/LOG.old +++ b/packs/gps-homebrew-items/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.886 708c Recovering log #3035 -2024/10/03-12:53:26.891 708c Delete type=0 #3035 -2024/10/03-12:53:26.891 708c Delete type=3 #3033 -2024/10/03-14:00:08.831 9264 Level-0 table #3040: started -2024/10/03-14:00:08.831 9264 Level-0 table #3040: 0 bytes OK -2024/10/03-14:00:08.833 9264 Delete type=0 #3038 -2024/10/03-14:00:08.835 9264 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.835 9264 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.204 71d4 Recovering log #3059 +2024/10/11-00:30:42.208 71d4 Delete type=0 #3059 +2024/10/11-00:30:42.208 71d4 Delete type=3 #3057 +2024/10/11-14:34:42.263 9264 Level-0 table #3064: started +2024/10/11-14:34:42.263 9264 Level-0 table #3064: 0 bytes OK +2024/10/11-14:34:42.264 9264 Delete type=0 #3062 +2024/10/11-14:34:42.266 9264 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.266 9264 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-items/MANIFEST-003041 b/packs/gps-homebrew-items/MANIFEST-003065 similarity index 75% rename from packs/gps-homebrew-items/MANIFEST-003041 rename to packs/gps-homebrew-items/MANIFEST-003065 index 0e9dedfa..e15fa9d5 100644 Binary files a/packs/gps-homebrew-items/MANIFEST-003041 and b/packs/gps-homebrew-items/MANIFEST-003065 differ diff --git a/packs/gps-homebrew-spells/002703.log b/packs/gps-homebrew-spells/002727.log similarity index 100% rename from packs/gps-homebrew-spells/002703.log rename to packs/gps-homebrew-spells/002727.log diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT index 79abab5f..576b7c1c 100644 --- a/packs/gps-homebrew-spells/CURRENT +++ b/packs/gps-homebrew-spells/CURRENT @@ -1 +1 @@ -MANIFEST-002701 +MANIFEST-002725 diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG index be072c28..793b3497 100644 --- a/packs/gps-homebrew-spells/LOG +++ b/packs/gps-homebrew-spells/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.959 71d4 Recovering log #2699 -2024/10/03-19:07:58.964 71d4 Delete type=0 #2699 -2024/10/03-19:07:58.964 71d4 Delete type=3 #2697 -2024/10/06-01:26:36.048 9264 Level-0 table #2704: started -2024/10/06-01:26:36.048 9264 Level-0 table #2704: 0 bytes OK -2024/10/06-01:26:36.060 9264 Delete type=0 #2702 -2024/10/06-01:26:36.061 9264 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.061 9264 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.838 708c Recovering log #2723 +2024/10/11-14:37:22.842 708c Delete type=0 #2723 +2024/10/11-14:37:22.842 708c Delete type=3 #2721 +2024/10/12-22:58:46.919 9264 Level-0 table #2728: started +2024/10/12-22:58:46.919 9264 Level-0 table #2728: 0 bytes OK +2024/10/12-22:58:46.921 9264 Delete type=0 #2726 +2024/10/12-22:58:46.922 9264 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.922 9264 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-spells/LOG.old b/packs/gps-homebrew-spells/LOG.old index 9b1e8d4f..0fda09fc 100644 --- a/packs/gps-homebrew-spells/LOG.old +++ b/packs/gps-homebrew-spells/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.894 7088 Recovering log #2695 -2024/10/03-12:53:26.899 7088 Delete type=0 #2695 -2024/10/03-12:53:26.900 7088 Delete type=3 #2693 -2024/10/03-14:00:08.833 9264 Level-0 table #2700: started -2024/10/03-14:00:08.833 9264 Level-0 table #2700: 0 bytes OK -2024/10/03-14:00:08.835 9264 Delete type=0 #2698 -2024/10/03-14:00:08.835 9264 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.836 9264 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.210 7088 Recovering log #2719 +2024/10/11-00:30:42.214 7088 Delete type=0 #2719 +2024/10/11-00:30:42.214 7088 Delete type=3 #2717 +2024/10/11-14:34:42.261 9264 Level-0 table #2724: started +2024/10/11-14:34:42.261 9264 Level-0 table #2724: 0 bytes OK +2024/10/11-14:34:42.263 9264 Delete type=0 #2722 +2024/10/11-14:34:42.266 9264 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.266 9264 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-spells/MANIFEST-002701 b/packs/gps-homebrew-spells/MANIFEST-002725 similarity index 56% rename from packs/gps-homebrew-spells/MANIFEST-002701 rename to packs/gps-homebrew-spells/MANIFEST-002725 index f373d7d9..86f20ab1 100644 Binary files a/packs/gps-homebrew-spells/MANIFEST-002701 and b/packs/gps-homebrew-spells/MANIFEST-002725 differ diff --git a/packs/gps-items/003042.log b/packs/gps-items/003066.log similarity index 100% rename from packs/gps-items/003042.log rename to packs/gps-items/003066.log diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT index 2b97d45f..585879af 100644 --- a/packs/gps-items/CURRENT +++ b/packs/gps-items/CURRENT @@ -1 +1 @@ -MANIFEST-003040 +MANIFEST-003064 diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG index 953df2b0..6aaac304 100644 --- a/packs/gps-items/LOG +++ b/packs/gps-items/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.897 7088 Recovering log #3038 -2024/10/03-19:07:58.901 7088 Delete type=0 #3038 -2024/10/03-19:07:58.901 7088 Delete type=3 #3036 -2024/10/06-01:26:36.028 9264 Level-0 table #3043: started -2024/10/06-01:26:36.028 9264 Level-0 table #3043: 0 bytes OK -2024/10/06-01:26:36.030 9264 Delete type=0 #3041 -2024/10/06-01:26:36.036 9264 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.036 9264 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.788 7088 Recovering log #3062 +2024/10/11-14:37:22.792 7088 Delete type=0 #3062 +2024/10/11-14:37:22.793 7088 Delete type=3 #3060 +2024/10/12-22:58:46.896 9264 Level-0 table #3067: started +2024/10/12-22:58:46.897 9264 Level-0 table #3067: 0 bytes OK +2024/10/12-22:58:46.898 9264 Delete type=0 #3065 +2024/10/12-22:58:46.900 9264 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.905 9264 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) diff --git a/packs/gps-items/LOG.old b/packs/gps-items/LOG.old index dcf386d6..64c87d72 100644 --- a/packs/gps-items/LOG.old +++ b/packs/gps-items/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.850 708c Recovering log #3034 -2024/10/03-12:53:26.855 708c Delete type=0 #3034 -2024/10/03-12:53:26.855 708c Delete type=3 #3032 -2024/10/03-14:00:08.819 9264 Level-0 table #3039: started -2024/10/03-14:00:08.819 9264 Level-0 table #3039: 0 bytes OK -2024/10/03-14:00:08.821 9264 Delete type=0 #3037 -2024/10/03-14:00:08.825 9264 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.825 9264 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.159 71d4 Recovering log #3058 +2024/10/11-00:30:42.163 71d4 Delete type=0 #3058 +2024/10/11-00:30:42.163 71d4 Delete type=3 #3056 +2024/10/11-14:34:42.251 9264 Level-0 table #3063: started +2024/10/11-14:34:42.251 9264 Level-0 table #3063: 0 bytes OK +2024/10/11-14:34:42.253 9264 Delete type=0 #3061 +2024/10/11-14:34:42.258 9264 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.258 9264 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) diff --git a/packs/gps-items/MANIFEST-003040 b/packs/gps-items/MANIFEST-003064 similarity index 63% rename from packs/gps-items/MANIFEST-003040 rename to packs/gps-items/MANIFEST-003064 index 4f31ced1..a6e33f3b 100644 Binary files a/packs/gps-items/MANIFEST-003040 and b/packs/gps-items/MANIFEST-003064 differ diff --git a/packs/gps-monster-features/003038.log b/packs/gps-monster-features/003062.log similarity index 100% rename from packs/gps-monster-features/003038.log rename to packs/gps-monster-features/003062.log diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT index 9d4cbe56..ae9b6455 100644 --- a/packs/gps-monster-features/CURRENT +++ b/packs/gps-monster-features/CURRENT @@ -1 +1 @@ -MANIFEST-003036 +MANIFEST-003060 diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG index cc73204c..41ca299c 100644 --- a/packs/gps-monster-features/LOG +++ b/packs/gps-monster-features/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:58.914 708c Recovering log #3034 -2024/10/03-19:07:58.918 708c Delete type=0 #3034 -2024/10/03-19:07:58.919 708c Delete type=3 #3032 -2024/10/06-01:26:36.034 9264 Level-0 table #3039: started -2024/10/06-01:26:36.034 9264 Level-0 table #3039: 0 bytes OK -2024/10/06-01:26:36.036 9264 Delete type=0 #3037 -2024/10/06-01:26:36.036 9264 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.041 9264 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.804 8c7c Recovering log #3058 +2024/10/11-14:37:22.809 8c7c Delete type=0 #3058 +2024/10/11-14:37:22.809 8c7c Delete type=3 #3056 +2024/10/12-22:58:46.905 9264 Level-0 table #3063: started +2024/10/12-22:58:46.905 9264 Level-0 table #3063: 0 bytes OK +2024/10/12-22:58:46.908 9264 Delete type=0 #3061 +2024/10/12-22:58:46.913 9264 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.915 9264 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 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 9c04061b..2551470a 100644 --- a/packs/gps-monster-features/LOG.old +++ b/packs/gps-monster-features/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.864 8c7c Recovering log #3030 -2024/10/03-12:53:26.867 8c7c Delete type=0 #3030 -2024/10/03-12:53:26.867 8c7c Delete type=3 #3028 -2024/10/03-14:00:08.823 9264 Level-0 table #3035: started -2024/10/03-14:00:08.823 9264 Level-0 table #3035: 0 bytes OK -2024/10/03-14:00:08.825 9264 Delete type=0 #3033 -2024/10/03-14:00:08.825 9264 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.825 9264 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.179 708c Recovering log #3054 +2024/10/11-00:30:42.184 708c Delete type=0 #3054 +2024/10/11-00:30:42.185 708c Delete type=3 #3052 +2024/10/11-14:34:42.257 9264 Level-0 table #3059: started +2024/10/11-14:34:42.257 9264 Level-0 table #3059: 0 bytes OK +2024/10/11-14:34:42.258 9264 Delete type=0 #3057 +2024/10/11-14:34:42.258 9264 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.258 9264 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) diff --git a/packs/gps-monster-features/MANIFEST-003036 b/packs/gps-monster-features/MANIFEST-003060 similarity index 66% rename from packs/gps-monster-features/MANIFEST-003036 rename to packs/gps-monster-features/MANIFEST-003060 index e4d66023..309f289a 100644 Binary files a/packs/gps-monster-features/MANIFEST-003036 and b/packs/gps-monster-features/MANIFEST-003060 differ diff --git a/packs/gps-race-features/000742.log b/packs/gps-race-features/000766.log similarity index 100% rename from packs/gps-race-features/000742.log rename to packs/gps-race-features/000766.log diff --git a/packs/gps-race-features/CURRENT b/packs/gps-race-features/CURRENT index 1937a691..ce965fe0 100644 --- a/packs/gps-race-features/CURRENT +++ b/packs/gps-race-features/CURRENT @@ -1 +1 @@ -MANIFEST-000740 +MANIFEST-000764 diff --git a/packs/gps-race-features/LOG b/packs/gps-race-features/LOG index 56f78da6..86a6a156 100644 --- a/packs/gps-race-features/LOG +++ b/packs/gps-race-features/LOG @@ -1,8 +1,8 @@ -2024/10/03-19:07:59.007 708c Recovering log #738 -2024/10/03-19:07:59.013 708c Delete type=0 #738 -2024/10/03-19:07:59.013 708c Delete type=3 #736 -2024/10/06-01:26:36.105 9264 Level-0 table #743: started -2024/10/06-01:26:36.105 9264 Level-0 table #743: 0 bytes OK -2024/10/06-01:26:36.107 9264 Delete type=0 #741 -2024/10/06-01:26:36.108 9264 Manual compaction at level-0 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.115 9264 Manual compaction at level-1 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.867 8c7c Recovering log #762 +2024/10/11-14:37:22.871 8c7c Delete type=0 #762 +2024/10/11-14:37:22.871 8c7c Delete type=3 #760 +2024/10/12-22:58:46.930 9264 Level-0 table #767: started +2024/10/12-22:58:46.930 9264 Level-0 table #767: 0 bytes OK +2024/10/12-22:58:46.931 9264 Delete type=0 #765 +2024/10/12-22:58:46.931 9264 Manual compaction at level-0 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.931 9264 Manual compaction at level-1 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) diff --git a/packs/gps-race-features/LOG.old b/packs/gps-race-features/LOG.old index 293a5ecc..4d3ec726 100644 --- a/packs/gps-race-features/LOG.old +++ b/packs/gps-race-features/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.927 8c7c Recovering log #734 -2024/10/03-12:53:26.931 8c7c Delete type=0 #734 -2024/10/03-12:53:26.931 8c7c Delete type=3 #732 -2024/10/03-14:00:08.843 9264 Level-0 table #739: started -2024/10/03-14:00:08.843 9264 Level-0 table #739: 0 bytes OK -2024/10/03-14:00:08.846 9264 Delete type=0 #737 -2024/10/03-14:00:08.849 9264 Manual compaction at level-0 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.849 9264 Manual compaction at level-1 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.235 708c Recovering log #758 +2024/10/11-00:30:42.239 708c Delete type=0 #758 +2024/10/11-00:30:42.240 708c Delete type=3 #756 +2024/10/11-14:34:42.267 9264 Level-0 table #763: started +2024/10/11-14:34:42.267 9264 Level-0 table #763: 0 bytes OK +2024/10/11-14:34:42.270 9264 Delete type=0 #761 +2024/10/11-14:34:42.275 9264 Manual compaction at level-0 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.276 9264 Manual compaction at level-1 from '!folders!62e2gLQ8cttarHZ8' @ 72057594037927935 : 1 .. '!items.effects!wNuwXPqCsshIcO2V.nGhKXGlzLbZGIsKu' @ 0 : 0; will stop at (end) diff --git a/packs/gps-race-features/MANIFEST-000740 b/packs/gps-race-features/MANIFEST-000764 similarity index 64% rename from packs/gps-race-features/MANIFEST-000740 rename to packs/gps-race-features/MANIFEST-000764 index fa9678f1..4a73d3ca 100644 Binary files a/packs/gps-race-features/MANIFEST-000740 and b/packs/gps-race-features/MANIFEST-000764 differ diff --git a/packs/gps-spells/003131.log b/packs/gps-spells/003157.log similarity index 100% rename from packs/gps-spells/003131.log rename to packs/gps-spells/003157.log diff --git a/packs/gps-spells/003133.ldb b/packs/gps-spells/003159.ldb similarity index 69% rename from packs/gps-spells/003133.ldb rename to packs/gps-spells/003159.ldb index 41cfe8c3..6524878e 100644 Binary files a/packs/gps-spells/003133.ldb and b/packs/gps-spells/003159.ldb differ diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT index ca4de286..6cd6158d 100644 --- a/packs/gps-spells/CURRENT +++ b/packs/gps-spells/CURRENT @@ -1 +1 @@ -MANIFEST-003129 +MANIFEST-003155 diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG index 2cf77070..c8456171 100644 --- a/packs/gps-spells/LOG +++ b/packs/gps-spells/LOG @@ -1,15 +1,15 @@ -2024/10/03-19:07:58.879 71d4 Recovering log #3127 -2024/10/03-19:07:58.884 71d4 Delete type=0 #3127 -2024/10/03-19:07:58.884 71d4 Delete type=3 #3125 -2024/10/06-01:26:36.005 9264 Level-0 table #3132: started -2024/10/06-01:26:36.009 9264 Level-0 table #3132: 70048 bytes OK -2024/10/06-01:26:36.011 9264 Delete type=0 #3130 -2024/10/06-01:26:36.016 9264 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) -2024/10/06-01:26:36.016 9264 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at '!items.effects!SGoFEo5oFEf8lkhe.ZhbfaYrtnhrdTaNL' @ 1789 : 1 -2024/10/06-01:26:36.016 9264 Compacting 1@1 + 1@2 files -2024/10/06-01:26:36.023 9264 Generated table #3133@1: 54 keys, 154036 bytes -2024/10/06-01:26:36.023 9264 Compacted 1@1 + 1@2 files => 154036 bytes -2024/10/06-01:26:36.024 9264 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/10/06-01:26:36.025 9264 Delete type=2 #3120 -2024/10/06-01:26:36.025 9264 Delete type=2 #3132 -2024/10/06-01:26:36.028 9264 Manual compaction at level-1 from '!items.effects!SGoFEo5oFEf8lkhe.ZhbfaYrtnhrdTaNL' @ 1789 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/10/11-14:37:22.772 708c Recovering log #3153 +2024/10/11-14:37:22.775 708c Delete type=0 #3153 +2024/10/11-14:37:22.776 708c Delete type=3 #3151 +2024/10/12-22:58:46.891 9264 Level-0 table #3158: started +2024/10/12-22:58:46.896 9264 Level-0 table #3158: 248346 bytes OK +2024/10/12-22:58:46.896 9264 Delete type=0 #3156 +2024/10/12-22:58:46.900 9264 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/10/12-22:58:46.900 9264 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at '!items.effects!MPscy2rdOlSVVepd.m2ELujtfE92t39Xl' @ 1821 : 1 +2024/10/12-22:58:46.900 9264 Compacting 1@1 + 1@2 files +2024/10/12-22:58:46.904 9264 Generated table #3159@1: 55 keys, 165320 bytes +2024/10/12-22:58:46.904 9264 Compacted 1@1 + 1@2 files => 165320 bytes +2024/10/12-22:58:46.905 9264 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/10/12-22:58:46.905 9264 Delete type=2 #3142 +2024/10/12-22:58:46.905 9264 Delete type=2 #3158 +2024/10/12-22:58:46.908 9264 Manual compaction at level-1 from '!items.effects!MPscy2rdOlSVVepd.m2ELujtfE92t39Xl' @ 1821 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) diff --git a/packs/gps-spells/LOG.old b/packs/gps-spells/LOG.old index 5a49e263..1522beab 100644 --- a/packs/gps-spells/LOG.old +++ b/packs/gps-spells/LOG.old @@ -1,8 +1,8 @@ -2024/10/03-12:53:26.837 7088 Recovering log #3123 -2024/10/03-12:53:26.841 7088 Delete type=0 #3123 -2024/10/03-12:53:26.841 7088 Delete type=3 #3121 -2024/10/03-14:00:08.812 9264 Level-0 table #3128: started -2024/10/03-14:00:08.812 9264 Level-0 table #3128: 0 bytes OK -2024/10/03-14:00:08.814 9264 Delete type=0 #3126 -2024/10/03-14:00:08.814 9264 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) -2024/10/03-14:00:08.814 9264 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/10/11-00:30:42.142 7088 Recovering log #3149 +2024/10/11-00:30:42.146 7088 Delete type=0 #3149 +2024/10/11-00:30:42.146 7088 Delete type=3 #3147 +2024/10/11-14:34:42.245 9264 Level-0 table #3154: started +2024/10/11-14:34:42.245 9264 Level-0 table #3154: 0 bytes OK +2024/10/11-14:34:42.246 9264 Delete type=0 #3152 +2024/10/11-14:34:42.250 9264 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/10/11-14:34:42.250 9264 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) diff --git a/packs/gps-spells/MANIFEST-003129 b/packs/gps-spells/MANIFEST-003129 deleted file mode 100644 index 702a0f2a..00000000 Binary files a/packs/gps-spells/MANIFEST-003129 and /dev/null differ diff --git a/packs/gps-spells/MANIFEST-003155 b/packs/gps-spells/MANIFEST-003155 new file mode 100644 index 00000000..731d9565 Binary files /dev/null and b/packs/gps-spells/MANIFEST-003155 differ diff --git a/scripts/helpers.js b/scripts/helpers.js index 4a2564e6..985e1479 100644 --- a/scripts/helpers.js +++ b/scripts/helpers.js @@ -11,29 +11,7 @@ export async function addReaction({ actorUuid }) { const hasEffectApplied = MidiQOL.hasUsedReaction(actor); if (!hasEffectApplied) { await MidiQOL.setReactionUsed(actor); - //await actor.setFlag("midi-qol", "actions.reactionCombatRound", game.combat?.round); - //await actor.setFlag("midi-qol", "actions.reaction", true); } - /*let effectData = [ - { - "icon": "modules/gambits-premades/assets/images/reaction.svg", - "origin": `${actorUuid}`, - "disabled": false, - "name": "Reaction", - "transfer": true, - "duration": { - "seconds": 6 - }, - "flags": { - "dae": { - "specialDuration": [ - "turnStart" - ] - } - } - } - ]; - await MidiQOL.socket().executeAsGM("createEffects", { actorUuid: actor.uuid, effects: effectData });*/ } } @@ -656,7 +634,6 @@ export async function process3rdPartyReactionDialog({ dialogTitle, dialogContent } export async function moveTokenByOriginPoint({ originX, originY, targetUuid, distance }) { - if (!targetUuid) return console.log("No valid target to move"); if (!distance || isNaN(distance)) return console.log("No valid distance to move"); if (!originX || !originY) return console.log("No valid origin x/y coordinate given, for a token object this value should be token.center.x/token.center.y"); @@ -666,91 +643,71 @@ export async function moveTokenByOriginPoint({ originX, originY, targetUuid, dis const gridDistance = canvas.scene.dimensions.distance; const pixelsPerFoot = canvas.scene.grid.size / gridDistance; - const moveDistancePixels = distance * pixelsPerFoot; + const gridDiagonals = game.settings.get("core", "gridDiagonals"); - let vectorX = target.center.x - originX; - let vectorY = target.center.y - originY; - let magnitude; + const ray = new Ray({ x: originX, y: originY }, { x: target.center.x, y: target.center.y }); + const rayAngle = ray.angle; - const gridDiagonals = game.settings.get("core", "gridDiagonals"); + let allowedDistance = distance; + let totalDistance = distance; + let measuredCost; + let finalX = target.center.x + Math.cos(rayAngle) * (allowedDistance * pixelsPerFoot); + let finalY = target.center.y + Math.sin(rayAngle) * (allowedDistance * pixelsPerFoot); - const initialX = target.x; - const initialY = target.y; + let collisionDetected = CONFIG.Canvas.polygonBackends.move.testCollision(target.center, new PIXI.Point(finalX, finalY), { type: "move", mode: "any" }); - switch (gridDiagonals) { - case 0: // Equidistant - magnitude = Math.max(Math.abs(vectorX), Math.abs(vectorY)); - break; - case 1: // Exact - magnitude = Math.sqrt(vectorX ** 2 + vectorY ** 2); - break; - case 2: // Approximate (1.5x cost for diagonals) - magnitude = Math.abs(vectorX) + Math.abs(vectorY); - let diagonals = Math.min(Math.abs(vectorX), Math.abs(vectorY)); - magnitude += (diagonals * 0.5) - diagonals; - break; - case 3: // Rectilinear (2x cost for diagonals) - magnitude = Math.abs(vectorX) + Math.abs(vectorY); - break; - case 4: // Alternating (1/2/1) - magnitude = Math.max(Math.abs(vectorX), Math.abs(vectorY)); - break; - case 5: // Alternating (2/1/2) - let steps = 0; - let dx = Math.abs(vectorX); - let dy = Math.abs(vectorY); - - while (dx > 0 || dy > 0) { - if (dx > 0 && dy > 0) { - steps += (steps % 2 === 0) ? 2 : 1; - dx -= 1; - dy -= 1; - } else if (dx > 0) { - steps += 1; - dx -= 1; - } else if (dy > 0) { - steps += 1; - dy -= 1; + if (!collisionDetected) { + if (canvas.scene.grid.type === 1) { + while (true) { + let intendedX = target.center.x + Math.cos(rayAngle) * (allowedDistance * pixelsPerFoot); + let intendedY = target.center.y + Math.sin(rayAngle) * (allowedDistance * pixelsPerFoot); + + if (canvas.scene.grid.type === 1) { + const snapped = canvas.scene.grid.getSnappedPoint({ x: intendedX, y: intendedY }, { mode: 0xFF0, resolution: 1 }); + intendedX = snapped.x; + intendedY = snapped.y; + } + + const path = [ + { x: target.center.x, y: target.center.y }, + { x: intendedX, y: intendedY } + ]; + + const measuredSegments = canvas.grid.measurePath(path); + measuredCost = measuredSegments.cost; + + if (measuredCost < totalDistance && gridDiagonals === 0) { + allowedDistance += gridDistance; + continue; + } + + else if (measuredCost <= totalDistance) { + break; + } + + allowedDistance -= gridDistance; + if (allowedDistance <= 0) { + allowedDistance = 0; + break; } } - magnitude = steps; - break; - case 6: // Illegal - magnitude = Infinity; - break; - default: // Default to Equidistant - console.error("Unknown gridDiagonals setting:", gridDiagonals); - magnitude = Math.max(Math.abs(vectorX), Math.abs(vectorY)); - break; - } - - vectorX /= magnitude; - vectorY /= magnitude; - - let moveX = vectorX * moveDistancePixels; - let moveY = vectorY * moveDistancePixels; - let finalX = target.x + moveX; - let finalY = target.y + moveY; + + finalX = target.center.x + Math.cos(rayAngle) * (allowedDistance * pixelsPerFoot); + finalY = target.center.y + Math.sin(rayAngle) * (allowedDistance * pixelsPerFoot); - if (canvas.scene.grid.type === 1) { - const snapped = canvas.scene.grid.getSnappedPoint({ x: finalX, y: finalY }, { mode: 0xFF0, resolution: 1 }); - finalX = snapped.x; - finalY = snapped.y; + const snapped = canvas.scene.grid.getSnappedPoint({ x: finalX, y: finalY }, { mode: 0xFF0, resolution: 1 }); + finalX = snapped.x; + finalY = snapped.y; + } } - - let endPoint = new PIXI.Point(finalX, finalY); - let collisionDetected = CONFIG.Canvas.polygonBackends.move.testCollision(target.center, endPoint, { type: "move", mode: "any" }); - - if (!collisionDetected) { - await target.document.update({ x: finalX, y: finalY }); - } else { + else { let stepDistance = canvas.scene.grid.size / 10; - let totalSteps = moveDistancePixels / stepDistance; + let totalSteps = (distance * pixelsPerFoot) / stepDistance; let stepCounter = 0; for (let step = 1; step <= totalSteps; step++) { - let nextX = target.x + vectorX * stepDistance * step; - let nextY = target.y + vectorY * stepDistance * step; + let nextX = target.x + Math.cos(rayAngle) * (stepDistance * step); + let nextY = target.y + Math.sin(rayAngle) * (stepDistance * step); if (canvas.scene.grid.type === 1) { const snapped = canvas.scene.grid.getSnappedPoint({ x: nextX, y: nextY }, { mode: 0xFF0, resolution: 1 }); nextX = snapped.x; @@ -766,8 +723,8 @@ export async function moveTokenByOriginPoint({ originX, originY, targetUuid, dis stepCounter = step; } - finalX = target.x + vectorX * stepDistance * stepCounter; - finalY = target.y + vectorY * stepDistance * stepCounter; + finalX = target.x + Math.cos(rayAngle) * (stepDistance * stepCounter); + finalY = target.y + Math.sin(rayAngle) * (stepDistance * stepCounter); if (stepCounter > 0) { if (canvas.scene.grid.type === 1) { @@ -775,41 +732,16 @@ export async function moveTokenByOriginPoint({ originX, originY, targetUuid, dis finalX = snapped.x; finalY = snapped.y; } - await target.document.update({ x: finalX, y: finalY }); } } - let totalDistanceMoved; - - const dx = Math.abs(finalX - initialX) / canvas.grid.size; - const dy = Math.abs(finalY - initialY) / canvas.grid.size; - const diagonalSteps = Math.min(dx, dy); - const straightSteps = Math.abs(dx - dy); - - switch (gridDiagonals) { - case 0: // Equidistant - totalDistanceMoved = (diagonalSteps + straightSteps) * gridDistance; - break; - case 1: // Exact - totalDistanceMoved = Math.hypot(finalX - initialX, finalY - initialY) / pixelsPerFoot; - break; - case 2: // 1.5x cost for diagonals - totalDistanceMoved = (diagonalSteps * 1.5 + straightSteps) * gridDistance; - break; - case 3: // 2x cost for diagonals - totalDistanceMoved = (diagonalSteps * 2 + straightSteps) * gridDistance; - break; - case 4: // Alternating (1/2/1) - totalDistanceMoved = ((diagonalSteps % 2 === 0 ? diagonalSteps * 1 : diagonalSteps * 2) + straightSteps) * gridDistance; - break; - case 5: // Alternating (2/1/2) - totalDistanceMoved = ((diagonalSteps % 2 === 0 ? diagonalSteps * 2 : diagonalSteps * 1) + straightSteps) * gridDistance; - break; - default: - totalDistanceMoved = (diagonalSteps + straightSteps) * gridDistance; - } - - return totalDistanceMoved; + const path = [ + { x: target.center.x, y: target.center.y }, + { x: finalX, y: finalY } + ]; + let finalDistance = canvas.grid.measurePath(path).cost; + await target.document.update({ x: finalX, y: finalY }); + return finalDistance; } export async function moveTokenByCardinal({ targetUuid, distance, direction }) { @@ -825,109 +757,95 @@ export async function moveTokenByCardinal({ targetUuid, distance, direction }) { const gridDistance = canvas.scene.dimensions.distance; const pixelsPerFoot = canvas.scene.grid.size / gridDistance; - const moveDistancePixels = distance * pixelsPerFoot; - const gridDiagonals = game.settings.get("core", "gridDiagonals"); - let moveX = 0; - let moveY = 0; - - const initialX = target.x; - const initialY = target.y; - + let angle = 0; switch (direction) { case "north": - moveY = -moveDistancePixels; + angle = -Math.PI / 2; break; case "south": - moveY = moveDistancePixels; + angle = Math.PI / 2; break; case "east": - moveX = moveDistancePixels; + angle = 0; break; case "west": - moveX = -moveDistancePixels; + angle = Math.PI; break; case "northwest": + angle = -3 * Math.PI / 4; + break; case "northeast": + angle = -Math.PI / 4; + break; case "southwest": + angle = 3 * Math.PI / 4; + break; case "southeast": - let dx = 1; - let dy = 1; - - if (direction.includes("north")) dy = -1; - if (direction.includes("south")) dy = 1; - if (direction.includes("east")) dx = 1; - if (direction.includes("west")) dx = -1; - - switch (gridDiagonals) { - case 0: // Equidistant - moveX = moveDistancePixels * dx; - moveY = moveDistancePixels * dy; - break; - case 1: // Exact - moveX = (moveDistancePixels / Math.hypot(dx, dy)) * dx; - moveY = (moveDistancePixels / Math.hypot(dx, dy)) * dy; - break; - case 2: // Approximate (1.5x cost for diagonals) - const diagonalSteps = Math.min(Math.abs(dx), Math.abs(dy)); - const straightSteps = Math.abs(dx - dy); - const magnitude = diagonalSteps * 1.5 + straightSteps; - moveX = (moveDistancePixels / magnitude) * dx; - moveY = (moveDistancePixels / magnitude) * dy; - break; - case 3: // Rectilinear (2x cost for diagonals) - moveX = moveDistancePixels * dx * 2; - moveY = moveDistancePixels * dy * 2; - break; - case 4: // Alternating (1/2/1) - const alternatingMagnitude1 = ((Math.abs(dx) + Math.abs(dy)) % 2 === 0) ? 1 : 2; - moveX = (moveDistancePixels / alternatingMagnitude1) * dx; - moveY = (moveDistancePixels / alternatingMagnitude1) * dy; - break; - case 5: // Alternating (2/1/2) - const alternatingMagnitude2 = ((Math.abs(dx) + Math.abs(dy)) % 2 === 0) ? 2 : 1; - moveX = (moveDistancePixels / alternatingMagnitude2) * dx; - moveY = (moveDistancePixels / alternatingMagnitude2) * dy; - break; - case 6: // Illegal - moveX = moveY = 0; - break; - default: // Default to Equidistant - console.error("Unknown gridDiagonals setting:", gridDiagonals); - moveX = moveDistancePixels * dx; - moveY = moveDistancePixels * dy; - break; - } + angle = Math.PI / 4; break; } - let finalX = target.x + moveX; - let finalY = target.y + moveY; - - if (canvas.scene.grid.type === 1) { - const snapped = canvas.scene.grid.getSnappedPoint({ x: finalX, y: finalY }, { mode: 0xFF0, resolution: 1 }); - finalX = snapped.x; - finalY = snapped.y; - } + let allowedDistance = distance; + let totalDistance = distance; + let measuredCost; + let finalX = target.center.x + Math.cos(angle) * (allowedDistance * pixelsPerFoot); + let finalY = target.center.y + Math.sin(angle) * (allowedDistance * pixelsPerFoot); - let endPoint = new PIXI.Point(finalX, finalY); - let collisionDetected = CONFIG.Canvas.polygonBackends.move.testCollision(target.center, endPoint, { type: "move", mode: "any" }); + let collisionDetected = CONFIG.Canvas.polygonBackends.move.testCollision(target.center, new PIXI.Point(finalX, finalY), { type: "move", mode: "any" }); if (!collisionDetected) { - await target.document.update({ x: finalX, y: finalY }); - } else { - let directionVector = { x: moveX, y: moveY }; - let magnitude = Math.hypot(directionVector.x, directionVector.y); - directionVector.x /= magnitude; - directionVector.y /= magnitude; + if (canvas.scene.grid.type === 1) { + while (true) { + let intendedX = target.center.x + Math.cos(angle) * (allowedDistance * pixelsPerFoot); + let intendedY = target.center.y + Math.sin(angle) * (allowedDistance * pixelsPerFoot); + + if (canvas.scene.grid.type === 1) { + const snapped = canvas.scene.grid.getSnappedPoint({ x: intendedX, y: intendedY }, { mode: 0xFF0, resolution: 1 }); + intendedX = snapped.x; + intendedY = snapped.y; + } + + const path = [ + { x: target.center.x, y: target.center.y }, + { x: intendedX, y: intendedY } + ]; + + const measuredSegments = canvas.grid.measurePath(path); + measuredCost = measuredSegments.cost; + + if (measuredCost < totalDistance && gridDiagonals === 0) { + allowedDistance += gridDistance; + continue; + } + + else if (measuredCost <= totalDistance) { + break; + } + + allowedDistance -= gridDistance; + if (allowedDistance <= 0) { + allowedDistance = 0; + break; + } + } + + finalX = target.center.x + Math.cos(angle) * (allowedDistance * pixelsPerFoot); + finalY = target.center.y + Math.sin(angle) * (allowedDistance * pixelsPerFoot); - let totalSteps = moveDistancePixels / (canvas.scene.grid.size / 10); + const snapped = canvas.scene.grid.getSnappedPoint({ x: finalX, y: finalY }, { mode: 0xFF0, resolution: 1 }); + finalX = snapped.x; + finalY = snapped.y; + } + } else { + let stepDistance = canvas.scene.grid.size / 10; + let totalSteps = (distance * pixelsPerFoot) / stepDistance; let stepCounter = 0; for (let step = 1; step <= totalSteps; step++) { - let nextX = target.x + directionVector.x * (canvas.scene.grid.size / 10) * step; - let nextY = target.y + directionVector.y * (canvas.scene.grid.size / 10) * step; + let nextX = target.x + Math.cos(angle) * (stepDistance * step); + let nextY = target.y + Math.sin(angle) * (stepDistance * step); if (canvas.scene.grid.type === 1) { const snapped = canvas.scene.grid.getSnappedPoint({ x: nextX, y: nextY }, { mode: 0xFF0, resolution: 1 }); nextX = snapped.x; @@ -943,8 +861,8 @@ export async function moveTokenByCardinal({ targetUuid, distance, direction }) { stepCounter = step; } - finalX = target.x + directionVector.x * (canvas.scene.grid.size / 10) * stepCounter; - finalY = target.y + directionVector.y * (canvas.scene.grid.size / 10) * stepCounter; + finalX = target.x + Math.cos(angle) * (stepDistance * stepCounter); + finalY = target.y + Math.sin(angle) * (stepDistance * stepCounter); if (stepCounter > 0) { if (canvas.scene.grid.type === 1) { @@ -952,41 +870,16 @@ export async function moveTokenByCardinal({ targetUuid, distance, direction }) { finalX = snapped.x; finalY = snapped.y; } - await target.document.update({ x: finalX, y: finalY }); } } - let totalDistanceMoved; - - const dx = Math.abs(finalX - initialX) / canvas.grid.size; - const dy = Math.abs(finalY - initialY) / canvas.grid.size; - const diagonalSteps = Math.min(dx, dy); - const straightSteps = Math.abs(dx - dy); - - switch (gridDiagonals) { - case 0: // Equidistant - totalDistanceMoved = (diagonalSteps + straightSteps) * gridDistance; - break; - case 1: // Exact - totalDistanceMoved = Math.hypot(finalX - initialX, finalY - initialY) / pixelsPerFoot; - break; - case 2: // 1.5x cost for diagonals - totalDistanceMoved = (diagonalSteps * 1.5 + straightSteps) * gridDistance; - break; - case 3: // 2x cost for diagonals - totalDistanceMoved = (diagonalSteps * 2 + straightSteps) * gridDistance; - break; - case 4: // Alternating (1/2/1) - totalDistanceMoved = ((diagonalSteps % 2 === 0 ? diagonalSteps * 1 : diagonalSteps * 2) + straightSteps) * gridDistance; - break; - case 5: // Alternating (2/1/2) - totalDistanceMoved = ((diagonalSteps % 2 === 0 ? diagonalSteps * 2 : diagonalSteps * 1) + straightSteps) * gridDistance; - break; - default: - totalDistanceMoved = (diagonalSteps + straightSteps) * gridDistance; - } - - return totalDistanceMoved; + const path = [ + { x: target.center.x, y: target.center.y }, + { x: finalX, y: finalY } + ]; + let finalDistance = canvas.grid.measurePath(path).cost; + await target.document.update({ x: finalX, y: finalY }); + return finalDistance; } export async function replaceChatCard({ actorUuid, itemUuid, chatContent, rollData }) { @@ -1190,4 +1083,10 @@ export function getPrimaryGM() { } return primaryGMId; - } \ No newline at end of file + } + +export async function gmDeleteItem({itemUuid}) { + if(!itemUuid) return; + let itemData = await fromUuid(itemUuid); + await itemData.delete(); +} \ No newline at end of file diff --git a/scripts/macros/opportunityAttack.js b/scripts/macros/opportunityAttack.js index 1814a86c..eeffa5f5 100644 --- a/scripts/macros/opportunityAttack.js +++ b/scripts/macros/opportunityAttack.js @@ -85,10 +85,6 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS if((exited || (!exited && !entered)) && !isTeleport) { if (token.regions.has(region)) return; - const effectNamesToken = ["Dissonant Whispers"]; - let hasEffectToken = token.actor.appliedEffects.some(effect => effectNamesToken.includes(effect.name)); - if (currentCombatant.id !== token.id && !hasEffectToken) return; - let dragonTurtleShield = effectOriginActor.items.getName("Dragon Turtle Dueling Shield"); if(dragonTurtleShield) await effectOriginActor.setFlag("gambits-premades", "dragonTurtleShieldOA", true); @@ -143,6 +139,11 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS return; } + if(!MidiQOL.isTargetable(token)) { + if(debugEnabled) console.error(`Opportunity Attack for ${effectOriginActor.name} failed at token is targetable`); + return; + } + // Check if same disposition token if(token.disposition === effectOriginToken.disposition) { if(debugEnabled) console.error(`Opportunity Attack for ${effectOriginActor.name} failed at token disposition check`); diff --git a/scripts/macros/silveryBarbs.js b/scripts/macros/silveryBarbs.js index 546592e9..0cec032f 100644 --- a/scripts/macros/silveryBarbs.js +++ b/scripts/macros/silveryBarbs.js @@ -10,6 +10,8 @@ export async function silveryBarbs({workflowData,workflowType,workflowCombat}) { let itemName = "Silvery Barbs"; let dialogId = gpsUuid; let gmUser = helpers.getPrimaryGM(); + let homebrewDisableNat20 = MidiQOL.safeGetGameSetting('gambits-premades', 'disableSilveryBarbsOnNat20'); + let homebrewEnableNat20 = MidiQOL.safeGetGameSetting('gambits-premades', 'enableSilveryBarbsOnNat20'); if(workflow.legendaryResistanceUsed) return; @@ -45,11 +47,15 @@ export async function silveryBarbs({workflowData,workflowType,workflowCombat}) { const optionBackground = (document.body.classList.contains("theme-dark")) ? 'black' : 'var(--color-bg)'; if(workflowType === "save") { + console.log(workflow, "silverybarbs workflow") let targets = Array.from(workflow.saves).filter(t => t.document.disposition !== validTokenPrimary.document.disposition && MidiQOL.canSee(validTokenPrimary, t) && MidiQOL.computeDistance(validTokenPrimary, t, true) <= 60); + if(homebrewDisableNat20) targets = targets.filter(t => workflow.saveRolls.find(roll => roll.data.actorUuid === t.actor.uuid && !roll.isCritical)); + if(homebrewEnableNat20) targets = targets.filter(t => workflow.saveRolls.find(roll => roll.data.actorUuid === t.actor.uuid && roll.isCritical)); + + if(targets.length === 0) return; const targetUuids = targets.map(t => t.document.uuid); const targetNames = targets.map(t => t.document.name); - if(targetUuids.length === 0) continue; targetUuids.map((uuid, index) => `` diff --git a/scripts/module.js b/scripts/module.js index 1cb1e2bb..6a02c3d0 100644 --- a/scripts/module.js +++ b/scripts/module.js @@ -23,7 +23,7 @@ import { biohazard } from './macros/biohazard.js'; import { restoreBalance } from './macros/restoreBalance.js'; import { legendaryResistance } from './macros/legendaryResistance.js'; import { enableOpportunityAttack, disableOpportunityAttack, opportunityAttackScenarios } from './macros/opportunityAttack.js'; -import { deleteChatMessage, gmIdentifyItem, closeDialogById, handleDialogPromises, rollAsUser, convertFromFeet, gmUpdateTemplateSize, findValidTokens, pauseDialogById, freeSpellUse, process3rdPartyReactionDialog, moveTokenByCardinal, moveTokenByOriginPoint, addReaction, gmUpdateDisposition, gmToggleStatus, replaceChatCard, validateRegionMovement, ritualSpellUse, getBrowserUser, getPrimaryGM } from './helpers.js'; +import { deleteChatMessage, gmIdentifyItem, closeDialogById, handleDialogPromises, rollAsUser, convertFromFeet, gmUpdateTemplateSize, findValidTokens, pauseDialogById, freeSpellUse, process3rdPartyReactionDialog, moveTokenByCardinal, moveTokenByOriginPoint, addReaction, gmUpdateDisposition, gmToggleStatus, replaceChatCard, validateRegionMovement, ritualSpellUse, getBrowserUser, getPrimaryGM, gmDeleteItem } from './helpers.js'; export let socket; Hooks.once('init', async function() { @@ -157,6 +157,7 @@ Hooks.once('socketlib.ready', async function() { socket.register("getBrowserUser", getBrowserUser); socket.register("restoreBalance", restoreBalance); socket.register("legendaryResistance", legendaryResistance); + socket.register("gmDeleteItem", gmDeleteItem); }) Hooks.once('ready', async function() { @@ -187,6 +188,7 @@ Hooks.once('ready', async function() { getPrimaryGM, replaceChatCard, getBrowserUser, + gmDeleteItem, socket };