diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b35d8af..61358e56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,10 +19,13 @@ jobs: id: set-release-notes-github run: | echo "- General:" >> release_notes.txt - echo " - Region Wrapper: Update to reduce the size of the token edge tested slightly to resolve gridded issues inadvertently triggering a region." >> release_notes.txt + echo " - Region Wrapper: Update to reduce the size of the token edge tested slightly to resolve gridded issue inadvertently triggering a region outside the regions range." >> release_notes.txt echo "- Updates:" >> release_notes.txt - echo " - Entropic Ward: Add mirrored dialog functionality when enabled." >> release_notes.txt - echo " - Opportunity Attack: Removed Sentinel movement modification for now." >> release_notes.txt + echo " - Opportunity Attack: On gridded scenes, regions are now deployed as a square." >> release_notes.txt + echo " - Ball Bearings: Resolve effect triggering when region first placed." >> release_notes.txt + echo " - Caltrops: Resolve effect triggering when region first placed." >> release_notes.txt + echo " - Cloud of Daggers: Resolve effect triggering when region first placed." >> release_notes.txt + echo " - Black Tentacles: Resolve effect triggering when region first placed." >> release_notes.txt echo "release-notes-github<> $GITHUB_ENV cat release_notes.txt >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV diff --git a/packs/gps-3rd-party-features/000996.log b/packs/gps-3rd-party-features/000999.log similarity index 100% rename from packs/gps-3rd-party-features/000996.log rename to packs/gps-3rd-party-features/000999.log diff --git a/packs/gps-3rd-party-features/CURRENT b/packs/gps-3rd-party-features/CURRENT index 80b0ffd9..95ce6638 100644 --- a/packs/gps-3rd-party-features/CURRENT +++ b/packs/gps-3rd-party-features/CURRENT @@ -1 +1 @@ -MANIFEST-000994 +MANIFEST-000998 diff --git a/packs/gps-3rd-party-features/LOG b/packs/gps-3rd-party-features/LOG index d4887365..a8eb71d3 100644 --- a/packs/gps-3rd-party-features/LOG +++ b/packs/gps-3rd-party-features/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.439 5754 Recovering log #992 -2024/07/29-15:53:29.444 5754 Delete type=0 #992 -2024/07/29-15:53:29.444 5754 Delete type=3 #990 -2024/07/30-01:19:39.392 2a384 Level-0 table #997: started -2024/07/30-01:19:39.392 2a384 Level-0 table #997: 0 bytes OK -2024/07/30-01:19:39.394 2a384 Delete type=0 #995 -2024/07/30-01:19:39.397 2a384 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.400 2a384 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.597 5754 Recovering log #996 +2024/07/30-09:16:32.601 5754 Delete type=0 #996 +2024/07/30-09:16:32.601 5754 Delete type=3 #994 diff --git a/packs/gps-3rd-party-features/LOG.old b/packs/gps-3rd-party-features/LOG.old index 6ef62bba..d4887365 100644 --- a/packs/gps-3rd-party-features/LOG.old +++ b/packs/gps-3rd-party-features/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.705 6664 Recovering log #988 -2024/07/29-01:57:28.709 6664 Delete type=0 #988 -2024/07/29-01:57:28.709 6664 Delete type=3 #986 -2024/07/29-15:44:10.307 2a384 Level-0 table #993: started -2024/07/29-15:44:10.307 2a384 Level-0 table #993: 0 bytes OK -2024/07/29-15:44:10.310 2a384 Delete type=0 #991 -2024/07/29-15:44:10.319 2a384 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.319 2a384 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.439 5754 Recovering log #992 +2024/07/29-15:53:29.444 5754 Delete type=0 #992 +2024/07/29-15:53:29.444 5754 Delete type=3 #990 +2024/07/30-01:19:39.392 2a384 Level-0 table #997: started +2024/07/30-01:19:39.392 2a384 Level-0 table #997: 0 bytes OK +2024/07/30-01:19:39.394 2a384 Delete type=0 #995 +2024/07/30-01:19:39.397 2a384 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.400 2a384 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-000994 b/packs/gps-3rd-party-features/MANIFEST-000998 similarity index 56% rename from packs/gps-3rd-party-features/MANIFEST-000994 rename to packs/gps-3rd-party-features/MANIFEST-000998 index 2a92f001..135a47af 100644 Binary files a/packs/gps-3rd-party-features/MANIFEST-000994 and b/packs/gps-3rd-party-features/MANIFEST-000998 differ diff --git a/packs/gps-3rd-party-items/000998.log b/packs/gps-3rd-party-items/001001.log similarity index 100% rename from packs/gps-3rd-party-items/000998.log rename to packs/gps-3rd-party-items/001001.log diff --git a/packs/gps-3rd-party-items/CURRENT b/packs/gps-3rd-party-items/CURRENT index c06385c7..2490a601 100644 --- a/packs/gps-3rd-party-items/CURRENT +++ b/packs/gps-3rd-party-items/CURRENT @@ -1 +1 @@ -MANIFEST-000996 +MANIFEST-001000 diff --git a/packs/gps-3rd-party-items/LOG b/packs/gps-3rd-party-items/LOG index c21dc88e..97b08bc8 100644 --- a/packs/gps-3rd-party-items/LOG +++ b/packs/gps-3rd-party-items/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.500 5e98 Recovering log #994 -2024/07/29-15:53:29.504 5e98 Delete type=0 #994 -2024/07/29-15:53:29.504 5e98 Delete type=3 #992 -2024/07/30-01:19:39.405 2a384 Level-0 table #999: started -2024/07/30-01:19:39.405 2a384 Level-0 table #999: 0 bytes OK -2024/07/30-01:19:39.407 2a384 Delete type=0 #997 -2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.412 2a384 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.648 6664 Recovering log #998 +2024/07/30-09:16:32.653 6664 Delete type=0 #998 +2024/07/30-09:16:32.653 6664 Delete type=3 #996 diff --git a/packs/gps-3rd-party-items/LOG.old b/packs/gps-3rd-party-items/LOG.old index 83e8327c..c21dc88e 100644 --- a/packs/gps-3rd-party-items/LOG.old +++ b/packs/gps-3rd-party-items/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.750 6068 Recovering log #990 -2024/07/29-01:57:28.754 6068 Delete type=0 #990 -2024/07/29-01:57:28.754 6068 Delete type=3 #988 -2024/07/29-15:44:10.328 2a384 Level-0 table #995: started -2024/07/29-15:44:10.328 2a384 Level-0 table #995: 0 bytes OK -2024/07/29-15:44:10.330 2a384 Delete type=0 #993 -2024/07/29-15:44:10.330 2a384 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.330 2a384 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.500 5e98 Recovering log #994 +2024/07/29-15:53:29.504 5e98 Delete type=0 #994 +2024/07/29-15:53:29.504 5e98 Delete type=3 #992 +2024/07/30-01:19:39.405 2a384 Level-0 table #999: started +2024/07/30-01:19:39.405 2a384 Level-0 table #999: 0 bytes OK +2024/07/30-01:19:39.407 2a384 Delete type=0 #997 +2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.412 2a384 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-000996 b/packs/gps-3rd-party-items/MANIFEST-001000 similarity index 67% rename from packs/gps-3rd-party-items/MANIFEST-000996 rename to packs/gps-3rd-party-items/MANIFEST-001000 index 2d050d58..2adb294d 100644 Binary files a/packs/gps-3rd-party-items/MANIFEST-000996 and b/packs/gps-3rd-party-items/MANIFEST-001000 differ diff --git a/packs/gps-3rd-party-spells/001008.log b/packs/gps-3rd-party-spells/001011.log similarity index 100% rename from packs/gps-3rd-party-spells/001008.log rename to packs/gps-3rd-party-spells/001011.log diff --git a/packs/gps-3rd-party-spells/CURRENT b/packs/gps-3rd-party-spells/CURRENT index ed0c8e26..a6821f6a 100644 --- a/packs/gps-3rd-party-spells/CURRENT +++ b/packs/gps-3rd-party-spells/CURRENT @@ -1 +1 @@ -MANIFEST-001006 +MANIFEST-001010 diff --git a/packs/gps-3rd-party-spells/LOG b/packs/gps-3rd-party-spells/LOG index b656281e..3350a74a 100644 --- a/packs/gps-3rd-party-spells/LOG +++ b/packs/gps-3rd-party-spells/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.508 6068 Recovering log #1004 -2024/07/29-15:53:29.512 6068 Delete type=0 #1004 -2024/07/29-15:53:29.512 6068 Delete type=3 #1002 -2024/07/30-01:19:39.422 2a384 Level-0 table #1009: started -2024/07/30-01:19:39.422 2a384 Level-0 table #1009: 0 bytes OK -2024/07/30-01:19:39.425 2a384 Delete type=0 #1007 -2024/07/30-01:19:39.425 2a384 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.426 2a384 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.660 5e98 Recovering log #1008 +2024/07/30-09:16:32.666 5e98 Delete type=0 #1008 +2024/07/30-09:16:32.666 5e98 Delete type=3 #1006 diff --git a/packs/gps-3rd-party-spells/LOG.old b/packs/gps-3rd-party-spells/LOG.old index ce638875..b656281e 100644 --- a/packs/gps-3rd-party-spells/LOG.old +++ b/packs/gps-3rd-party-spells/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.756 5754 Recovering log #1000 -2024/07/29-01:57:28.760 5754 Delete type=0 #1000 -2024/07/29-01:57:28.760 5754 Delete type=3 #998 -2024/07/29-15:44:10.336 2a384 Level-0 table #1005: started -2024/07/29-15:44:10.336 2a384 Level-0 table #1005: 0 bytes OK -2024/07/29-15:44:10.338 2a384 Delete type=0 #1003 -2024/07/29-15:44:10.341 2a384 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.341 2a384 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.508 6068 Recovering log #1004 +2024/07/29-15:53:29.512 6068 Delete type=0 #1004 +2024/07/29-15:53:29.512 6068 Delete type=3 #1002 +2024/07/30-01:19:39.422 2a384 Level-0 table #1009: started +2024/07/30-01:19:39.422 2a384 Level-0 table #1009: 0 bytes OK +2024/07/30-01:19:39.425 2a384 Delete type=0 #1007 +2024/07/30-01:19:39.425 2a384 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.426 2a384 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-001006 b/packs/gps-3rd-party-spells/MANIFEST-001010 similarity index 73% rename from packs/gps-3rd-party-spells/MANIFEST-001006 rename to packs/gps-3rd-party-spells/MANIFEST-001010 index 17f52933..c68b5cd0 100644 Binary files a/packs/gps-3rd-party-spells/MANIFEST-001006 and b/packs/gps-3rd-party-spells/MANIFEST-001010 differ diff --git a/packs/gps-actors/001465.log b/packs/gps-actors/001468.log similarity index 100% rename from packs/gps-actors/001465.log rename to packs/gps-actors/001468.log diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT index 2ebaba50..e62d5014 100644 --- a/packs/gps-actors/CURRENT +++ b/packs/gps-actors/CURRENT @@ -1 +1 @@ -MANIFEST-001463 +MANIFEST-001467 diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG index 70904e93..10ad6521 100644 --- a/packs/gps-actors/LOG +++ b/packs/gps-actors/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.487 5754 Recovering log #1461 -2024/07/29-15:53:29.492 5754 Delete type=0 #1461 -2024/07/29-15:53:29.492 5754 Delete type=3 #1459 -2024/07/30-01:19:39.407 2a384 Level-0 table #1466: started -2024/07/30-01:19:39.407 2a384 Level-0 table #1466: 0 bytes OK -2024/07/30-01:19:39.409 2a384 Delete type=0 #1464 -2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.412 2a384 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.634 5754 Recovering log #1465 +2024/07/30-09:16:32.638 5754 Delete type=0 #1465 +2024/07/30-09:16:32.638 5754 Delete type=3 #1463 diff --git a/packs/gps-actors/LOG.old b/packs/gps-actors/LOG.old index 771d63c4..70904e93 100644 --- a/packs/gps-actors/LOG.old +++ b/packs/gps-actors/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.744 6664 Recovering log #1457 -2024/07/29-01:57:28.748 6664 Delete type=0 #1457 -2024/07/29-01:57:28.748 6664 Delete type=3 #1455 -2024/07/29-15:44:10.325 2a384 Level-0 table #1462: started -2024/07/29-15:44:10.325 2a384 Level-0 table #1462: 0 bytes OK -2024/07/29-15:44:10.327 2a384 Delete type=0 #1460 -2024/07/29-15:44:10.330 2a384 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.330 2a384 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.487 5754 Recovering log #1461 +2024/07/29-15:53:29.492 5754 Delete type=0 #1461 +2024/07/29-15:53:29.492 5754 Delete type=3 #1459 +2024/07/30-01:19:39.407 2a384 Level-0 table #1466: started +2024/07/30-01:19:39.407 2a384 Level-0 table #1466: 0 bytes OK +2024/07/30-01:19:39.409 2a384 Delete type=0 #1464 +2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.412 2a384 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-001463 b/packs/gps-actors/MANIFEST-001467 similarity index 70% rename from packs/gps-actors/MANIFEST-001463 rename to packs/gps-actors/MANIFEST-001467 index 85199dd8..c8c6a084 100644 Binary files a/packs/gps-actors/MANIFEST-001463 and b/packs/gps-actors/MANIFEST-001467 differ diff --git a/packs/gps-class-features/002661.log b/packs/gps-class-features/002664.log similarity index 100% rename from packs/gps-class-features/002661.log rename to packs/gps-class-features/002664.log diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT index 1e7fd594..8c217013 100644 --- a/packs/gps-class-features/CURRENT +++ b/packs/gps-class-features/CURRENT @@ -1 +1 @@ -MANIFEST-002659 +MANIFEST-002663 diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG index 8d6f6559..8e9eb101 100644 --- a/packs/gps-class-features/LOG +++ b/packs/gps-class-features/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.425 5e98 Recovering log #2657 -2024/07/29-15:53:29.429 5e98 Delete type=0 #2657 -2024/07/29-15:53:29.429 5e98 Delete type=3 #2655 -2024/07/30-01:19:39.375 2a384 Level-0 table #2662: started -2024/07/30-01:19:39.375 2a384 Level-0 table #2662: 0 bytes OK -2024/07/30-01:19:39.378 2a384 Delete type=0 #2660 -2024/07/30-01:19:39.378 2a384 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.392 2a384 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.583 6664 Recovering log #2661 +2024/07/30-09:16:32.586 6664 Delete type=0 #2661 +2024/07/30-09:16:32.586 6664 Delete type=3 #2659 diff --git a/packs/gps-class-features/LOG.old b/packs/gps-class-features/LOG.old index 9ad4e5ab..8d6f6559 100644 --- a/packs/gps-class-features/LOG.old +++ b/packs/gps-class-features/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.692 6068 Recovering log #2652 -2024/07/29-01:57:28.696 6068 Delete type=0 #2652 -2024/07/29-01:57:28.696 6068 Delete type=3 #2650 -2024/07/29-15:44:10.297 2a384 Level-0 table #2658: started -2024/07/29-15:44:10.297 2a384 Level-0 table #2658: 0 bytes OK -2024/07/29-15:44:10.300 2a384 Delete type=0 #2656 -2024/07/29-15:44:10.305 2a384 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.305 2a384 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.425 5e98 Recovering log #2657 +2024/07/29-15:53:29.429 5e98 Delete type=0 #2657 +2024/07/29-15:53:29.429 5e98 Delete type=3 #2655 +2024/07/30-01:19:39.375 2a384 Level-0 table #2662: started +2024/07/30-01:19:39.375 2a384 Level-0 table #2662: 0 bytes OK +2024/07/30-01:19:39.378 2a384 Delete type=0 #2660 +2024/07/30-01:19:39.378 2a384 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.392 2a384 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-002659 b/packs/gps-class-features/MANIFEST-002663 similarity index 73% rename from packs/gps-class-features/MANIFEST-002659 rename to packs/gps-class-features/MANIFEST-002663 index f1faf3ca..d30a3f83 100644 Binary files a/packs/gps-class-features/MANIFEST-002659 and b/packs/gps-class-features/MANIFEST-002663 differ diff --git a/packs/gps-generic-features/002726.log b/packs/gps-generic-features/002729.log similarity index 100% rename from packs/gps-generic-features/002726.log rename to packs/gps-generic-features/002729.log diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT index 464242f3..844953af 100644 --- a/packs/gps-generic-features/CURRENT +++ b/packs/gps-generic-features/CURRENT @@ -1 +1 @@ -MANIFEST-002724 +MANIFEST-002728 diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG index f49af620..90047745 100644 --- a/packs/gps-generic-features/LOG +++ b/packs/gps-generic-features/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.454 6664 Recovering log #2722 -2024/07/29-15:53:29.458 6664 Delete type=0 #2722 -2024/07/29-15:53:29.458 6664 Delete type=3 #2720 -2024/07/30-01:19:39.397 2a384 Level-0 table #2727: started -2024/07/30-01:19:39.397 2a384 Level-0 table #2727: 0 bytes OK -2024/07/30-01:19:39.398 2a384 Delete type=0 #2725 -2024/07/30-01:19:39.400 2a384 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.400 2a384 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.609 6068 Recovering log #2726 +2024/07/30-09:16:32.613 6068 Delete type=0 #2726 +2024/07/30-09:16:32.613 6068 Delete type=3 #2724 diff --git a/packs/gps-generic-features/LOG.old b/packs/gps-generic-features/LOG.old index 8b935177..f49af620 100644 --- a/packs/gps-generic-features/LOG.old +++ b/packs/gps-generic-features/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.717 5e98 Recovering log #2718 -2024/07/29-01:57:28.721 5e98 Delete type=0 #2718 -2024/07/29-01:57:28.721 5e98 Delete type=3 #2716 -2024/07/29-15:44:10.313 2a384 Level-0 table #2723: started -2024/07/29-15:44:10.313 2a384 Level-0 table #2723: 0 bytes OK -2024/07/29-15:44:10.315 2a384 Delete type=0 #2721 -2024/07/29-15:44:10.319 2a384 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.319 2a384 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.454 6664 Recovering log #2722 +2024/07/29-15:53:29.458 6664 Delete type=0 #2722 +2024/07/29-15:53:29.458 6664 Delete type=3 #2720 +2024/07/30-01:19:39.397 2a384 Level-0 table #2727: started +2024/07/30-01:19:39.397 2a384 Level-0 table #2727: 0 bytes OK +2024/07/30-01:19:39.398 2a384 Delete type=0 #2725 +2024/07/30-01:19:39.400 2a384 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.400 2a384 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-002724 b/packs/gps-generic-features/MANIFEST-002728 similarity index 73% rename from packs/gps-generic-features/MANIFEST-002724 rename to packs/gps-generic-features/MANIFEST-002728 index 685675d9..87192f5c 100644 Binary files a/packs/gps-generic-features/MANIFEST-002724 and b/packs/gps-generic-features/MANIFEST-002728 differ diff --git a/packs/gps-homebrew-items/002633.log b/packs/gps-homebrew-features/002633.log similarity index 100% rename from packs/gps-homebrew-items/002633.log rename to packs/gps-homebrew-features/002633.log diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT index d58d223f..d61853a4 100644 --- a/packs/gps-homebrew-features/CURRENT +++ b/packs/gps-homebrew-features/CURRENT @@ -1 +1 @@ -MANIFEST-002628 +MANIFEST-002632 diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG index b6c20604..c5db394a 100644 --- a/packs/gps-homebrew-features/LOG +++ b/packs/gps-homebrew-features/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.462 5754 Recovering log #2626 -2024/07/29-15:53:29.468 5754 Delete type=0 #2626 -2024/07/29-15:53:29.468 5754 Delete type=3 #2624 -2024/07/30-01:19:39.398 2a384 Level-0 table #2631: started -2024/07/30-01:19:39.398 2a384 Level-0 table #2631: 0 bytes OK -2024/07/30-01:19:39.400 2a384 Delete type=0 #2629 -2024/07/30-01:19:39.400 2a384 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.400 2a384 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.615 5754 Recovering log #2630 +2024/07/30-09:16:32.619 5754 Delete type=0 #2630 +2024/07/30-09:16:32.619 5754 Delete type=3 #2628 diff --git a/packs/gps-homebrew-features/LOG.old b/packs/gps-homebrew-features/LOG.old index 91e298fe..b6c20604 100644 --- a/packs/gps-homebrew-features/LOG.old +++ b/packs/gps-homebrew-features/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.724 6664 Recovering log #2622 -2024/07/29-01:57:28.728 6664 Delete type=0 #2622 -2024/07/29-01:57:28.728 6664 Delete type=3 #2620 -2024/07/29-15:44:10.316 2a384 Level-0 table #2627: started -2024/07/29-15:44:10.316 2a384 Level-0 table #2627: 0 bytes OK -2024/07/29-15:44:10.318 2a384 Delete type=0 #2625 -2024/07/29-15:44:10.319 2a384 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.319 2a384 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.462 5754 Recovering log #2626 +2024/07/29-15:53:29.468 5754 Delete type=0 #2626 +2024/07/29-15:53:29.468 5754 Delete type=3 #2624 +2024/07/30-01:19:39.398 2a384 Level-0 table #2631: started +2024/07/30-01:19:39.398 2a384 Level-0 table #2631: 0 bytes OK +2024/07/30-01:19:39.400 2a384 Delete type=0 #2629 +2024/07/30-01:19:39.400 2a384 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.400 2a384 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-features/MANIFEST-002628 b/packs/gps-homebrew-features/MANIFEST-002632 similarity index 73% rename from packs/gps-homebrew-features/MANIFEST-002628 rename to packs/gps-homebrew-features/MANIFEST-002632 index 79373fdb..a81bb39e 100644 Binary files a/packs/gps-homebrew-features/MANIFEST-002628 and b/packs/gps-homebrew-features/MANIFEST-002632 differ diff --git a/packs/gps-homebrew-items/002637.log b/packs/gps-homebrew-items/002637.log new file mode 100644 index 00000000..e7dc7a55 Binary files /dev/null and b/packs/gps-homebrew-items/002637.log differ diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT index 69d292fc..878478e9 100644 --- a/packs/gps-homebrew-items/CURRENT +++ b/packs/gps-homebrew-items/CURRENT @@ -1 +1 @@ -MANIFEST-002631 +MANIFEST-002636 diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG index 96999415..d6401f7c 100644 --- a/packs/gps-homebrew-items/LOG +++ b/packs/gps-homebrew-items/LOG @@ -1,15 +1,3 @@ -2024/07/29-15:53:29.471 5e98 Recovering log #2629 -2024/07/29-15:53:29.475 5e98 Delete type=0 #2629 -2024/07/29-15:53:29.475 5e98 Delete type=3 #2627 -2024/07/30-01:19:39.409 2a384 Level-0 table #2634: started -2024/07/30-01:19:39.410 2a384 Level-0 table #2634: 4635 bytes OK -2024/07/30-01:19:39.412 2a384 Delete type=0 #2632 -2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.412 2a384 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at '!items!9VnDwZqxXEDSeElR' @ 498 : 1 -2024/07/30-01:19:39.412 2a384 Compacting 1@1 + 1@2 files -2024/07/30-01:19:39.416 2a384 Generated table #2635@1: 21 keys, 35855 bytes -2024/07/30-01:19:39.416 2a384 Compacted 1@1 + 1@2 files => 35855 bytes -2024/07/30-01:19:39.418 2a384 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/07/30-01:19:39.418 2a384 Delete type=2 #2522 -2024/07/30-01:19:39.418 2a384 Delete type=2 #2634 -2024/07/30-01:19:39.425 2a384 Manual compaction at level-1 from '!items!9VnDwZqxXEDSeElR' @ 498 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.621 6664 Recovering log #2633 +2024/07/30-09:16:32.625 6664 Delete type=0 #2633 +2024/07/30-09:16:32.625 6664 Delete type=3 #2631 diff --git a/packs/gps-homebrew-items/LOG.old b/packs/gps-homebrew-items/LOG.old index 2822726b..96999415 100644 --- a/packs/gps-homebrew-items/LOG.old +++ b/packs/gps-homebrew-items/LOG.old @@ -1,8 +1,15 @@ -2024/07/29-01:57:28.731 6068 Recovering log #2625 -2024/07/29-01:57:28.735 6068 Delete type=0 #2625 -2024/07/29-01:57:28.735 6068 Delete type=3 #2623 -2024/07/29-15:44:10.323 2a384 Level-0 table #2630: started -2024/07/29-15:44:10.323 2a384 Level-0 table #2630: 0 bytes OK -2024/07/29-15:44:10.325 2a384 Delete type=0 #2628 -2024/07/29-15:44:10.330 2a384 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.330 2a384 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.471 5e98 Recovering log #2629 +2024/07/29-15:53:29.475 5e98 Delete type=0 #2629 +2024/07/29-15:53:29.475 5e98 Delete type=3 #2627 +2024/07/30-01:19:39.409 2a384 Level-0 table #2634: started +2024/07/30-01:19:39.410 2a384 Level-0 table #2634: 4635 bytes OK +2024/07/30-01:19:39.412 2a384 Delete type=0 #2632 +2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.412 2a384 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at '!items!9VnDwZqxXEDSeElR' @ 498 : 1 +2024/07/30-01:19:39.412 2a384 Compacting 1@1 + 1@2 files +2024/07/30-01:19:39.416 2a384 Generated table #2635@1: 21 keys, 35855 bytes +2024/07/30-01:19:39.416 2a384 Compacted 1@1 + 1@2 files => 35855 bytes +2024/07/30-01:19:39.418 2a384 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/07/30-01:19:39.418 2a384 Delete type=2 #2522 +2024/07/30-01:19:39.418 2a384 Delete type=2 #2634 +2024/07/30-01:19:39.425 2a384 Manual compaction at level-1 from '!items!9VnDwZqxXEDSeElR' @ 498 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) diff --git a/packs/gps-homebrew-items/MANIFEST-002631 b/packs/gps-homebrew-items/MANIFEST-002631 deleted file mode 100644 index 45ac3a19..00000000 Binary files a/packs/gps-homebrew-items/MANIFEST-002631 and /dev/null differ diff --git a/packs/gps-homebrew-items/MANIFEST-002636 b/packs/gps-homebrew-items/MANIFEST-002636 new file mode 100644 index 00000000..c30d3f7e Binary files /dev/null and b/packs/gps-homebrew-items/MANIFEST-002636 differ diff --git a/packs/gps-homebrew-features/002630.log b/packs/gps-homebrew-spells/002302.log similarity index 100% rename from packs/gps-homebrew-features/002630.log rename to packs/gps-homebrew-spells/002302.log diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT index b0874a22..711107de 100644 --- a/packs/gps-homebrew-spells/CURRENT +++ b/packs/gps-homebrew-spells/CURRENT @@ -1 +1 @@ -MANIFEST-002297 +MANIFEST-002301 diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG index 26e7246a..bc7aef02 100644 --- a/packs/gps-homebrew-spells/LOG +++ b/packs/gps-homebrew-spells/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.478 6068 Recovering log #2295 -2024/07/29-15:53:29.482 6068 Delete type=0 #2295 -2024/07/29-15:53:29.482 6068 Delete type=3 #2293 -2024/07/30-01:19:39.402 2a384 Level-0 table #2300: started -2024/07/30-01:19:39.402 2a384 Level-0 table #2300: 0 bytes OK -2024/07/30-01:19:39.404 2a384 Delete type=0 #2298 -2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.412 2a384 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.628 5e98 Recovering log #2299 +2024/07/30-09:16:32.632 5e98 Delete type=0 #2299 +2024/07/30-09:16:32.632 5e98 Delete type=3 #2297 diff --git a/packs/gps-homebrew-spells/LOG.old b/packs/gps-homebrew-spells/LOG.old index cfd10094..26e7246a 100644 --- a/packs/gps-homebrew-spells/LOG.old +++ b/packs/gps-homebrew-spells/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.738 5754 Recovering log #2291 -2024/07/29-01:57:28.742 5754 Delete type=0 #2291 -2024/07/29-01:57:28.742 5754 Delete type=3 #2289 -2024/07/29-15:44:10.320 2a384 Level-0 table #2296: started -2024/07/29-15:44:10.320 2a384 Level-0 table #2296: 0 bytes OK -2024/07/29-15:44:10.323 2a384 Delete type=0 #2294 -2024/07/29-15:44:10.330 2a384 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.330 2a384 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.478 6068 Recovering log #2295 +2024/07/29-15:53:29.482 6068 Delete type=0 #2295 +2024/07/29-15:53:29.482 6068 Delete type=3 #2293 +2024/07/30-01:19:39.402 2a384 Level-0 table #2300: started +2024/07/30-01:19:39.402 2a384 Level-0 table #2300: 0 bytes OK +2024/07/30-01:19:39.404 2a384 Delete type=0 #2298 +2024/07/30-01:19:39.412 2a384 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.412 2a384 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-002297 b/packs/gps-homebrew-spells/MANIFEST-002301 similarity index 56% rename from packs/gps-homebrew-spells/MANIFEST-002297 rename to packs/gps-homebrew-spells/MANIFEST-002301 index f1239edf..6e7cca6f 100644 Binary files a/packs/gps-homebrew-spells/MANIFEST-002297 and b/packs/gps-homebrew-spells/MANIFEST-002301 differ diff --git a/packs/gps-items/002633.log b/packs/gps-items/002633.log new file mode 100644 index 00000000..ae39a0de Binary files /dev/null and b/packs/gps-items/002633.log differ diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT index 2e9209d1..d61853a4 100644 --- a/packs/gps-items/CURRENT +++ b/packs/gps-items/CURRENT @@ -1 +1 @@ -MANIFEST-002627 +MANIFEST-002632 diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG index 219ff511..dbe42fec 100644 --- a/packs/gps-items/LOG +++ b/packs/gps-items/LOG @@ -1,15 +1,3 @@ -2024/07/29-15:53:29.432 6664 Recovering log #2625 -2024/07/29-15:53:29.436 6664 Delete type=0 #2625 -2024/07/29-15:53:29.436 6664 Delete type=3 #2623 -2024/07/30-01:19:39.371 2a384 Level-0 table #2630: started -2024/07/30-01:19:39.373 2a384 Level-0 table #2630: 12020 bytes OK -2024/07/30-01:19:39.375 2a384 Delete type=0 #2628 -2024/07/30-01:19:39.378 2a384 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.387 2a384 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at '!items!cWm5r6tAvamfPlgn' @ 388 : 1 -2024/07/30-01:19:39.387 2a384 Compacting 1@1 + 1@2 files -2024/07/30-01:19:39.390 2a384 Generated table #2631@1: 27 keys, 67027 bytes -2024/07/30-01:19:39.390 2a384 Compacted 1@1 + 1@2 files => 67027 bytes -2024/07/30-01:19:39.392 2a384 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/07/30-01:19:39.392 2a384 Delete type=2 #2538 -2024/07/30-01:19:39.392 2a384 Delete type=2 #2630 -2024/07/30-01:19:39.394 2a384 Manual compaction at level-1 from '!items!cWm5r6tAvamfPlgn' @ 388 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.588 6068 Recovering log #2629 +2024/07/30-09:16:32.592 6068 Delete type=0 #2629 +2024/07/30-09:16:32.593 6068 Delete type=3 #2627 diff --git a/packs/gps-items/LOG.old b/packs/gps-items/LOG.old index 08bd9929..219ff511 100644 --- a/packs/gps-items/LOG.old +++ b/packs/gps-items/LOG.old @@ -1,8 +1,15 @@ -2024/07/29-01:57:28.698 5e98 Recovering log #2621 -2024/07/29-01:57:28.702 5e98 Delete type=0 #2621 -2024/07/29-01:57:28.702 5e98 Delete type=3 #2619 -2024/07/29-15:44:10.303 2a384 Level-0 table #2626: started -2024/07/29-15:44:10.303 2a384 Level-0 table #2626: 0 bytes OK -2024/07/29-15:44:10.305 2a384 Delete type=0 #2624 -2024/07/29-15:44:10.305 2a384 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.305 2a384 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.432 6664 Recovering log #2625 +2024/07/29-15:53:29.436 6664 Delete type=0 #2625 +2024/07/29-15:53:29.436 6664 Delete type=3 #2623 +2024/07/30-01:19:39.371 2a384 Level-0 table #2630: started +2024/07/30-01:19:39.373 2a384 Level-0 table #2630: 12020 bytes OK +2024/07/30-01:19:39.375 2a384 Delete type=0 #2628 +2024/07/30-01:19:39.378 2a384 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.387 2a384 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at '!items!cWm5r6tAvamfPlgn' @ 388 : 1 +2024/07/30-01:19:39.387 2a384 Compacting 1@1 + 1@2 files +2024/07/30-01:19:39.390 2a384 Generated table #2631@1: 27 keys, 67027 bytes +2024/07/30-01:19:39.390 2a384 Compacted 1@1 + 1@2 files => 67027 bytes +2024/07/30-01:19:39.392 2a384 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/07/30-01:19:39.392 2a384 Delete type=2 #2538 +2024/07/30-01:19:39.392 2a384 Delete type=2 #2630 +2024/07/30-01:19:39.394 2a384 Manual compaction at level-1 from '!items!cWm5r6tAvamfPlgn' @ 388 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) diff --git a/packs/gps-items/MANIFEST-002627 b/packs/gps-items/MANIFEST-002627 deleted file mode 100644 index 2bed1898..00000000 Binary files a/packs/gps-items/MANIFEST-002627 and /dev/null differ diff --git a/packs/gps-items/MANIFEST-002632 b/packs/gps-items/MANIFEST-002632 new file mode 100644 index 00000000..6593bcdb Binary files /dev/null and b/packs/gps-items/MANIFEST-002632 differ diff --git a/packs/gps-monster-features/002629.log b/packs/gps-monster-features/002629.log deleted file mode 100644 index e69de29b..00000000 diff --git a/packs/gps-homebrew-spells/002299.log b/packs/gps-monster-features/002632.log similarity index 100% rename from packs/gps-homebrew-spells/002299.log rename to packs/gps-monster-features/002632.log diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT index 2e9209d1..69d292fc 100644 --- a/packs/gps-monster-features/CURRENT +++ b/packs/gps-monster-features/CURRENT @@ -1 +1 @@ -MANIFEST-002627 +MANIFEST-002631 diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG index 670754d6..33a7b05a 100644 --- a/packs/gps-monster-features/LOG +++ b/packs/gps-monster-features/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.447 5e98 Recovering log #2625 -2024/07/29-15:53:29.451 5e98 Delete type=0 #2625 -2024/07/29-15:53:29.451 5e98 Delete type=3 #2623 -2024/07/30-01:19:39.394 2a384 Level-0 table #2630: started -2024/07/30-01:19:39.394 2a384 Level-0 table #2630: 0 bytes OK -2024/07/30-01:19:39.396 2a384 Delete type=0 #2628 -2024/07/30-01:19:39.400 2a384 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.400 2a384 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.603 6664 Recovering log #2629 +2024/07/30-09:16:32.607 6664 Delete type=0 #2629 +2024/07/30-09:16:32.607 6664 Delete type=3 #2627 diff --git a/packs/gps-monster-features/LOG.old b/packs/gps-monster-features/LOG.old index 2054327b..670754d6 100644 --- a/packs/gps-monster-features/LOG.old +++ b/packs/gps-monster-features/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.711 6068 Recovering log #2621 -2024/07/29-01:57:28.716 6068 Delete type=0 #2621 -2024/07/29-01:57:28.716 6068 Delete type=3 #2619 -2024/07/29-15:44:10.310 2a384 Level-0 table #2626: started -2024/07/29-15:44:10.310 2a384 Level-0 table #2626: 0 bytes OK -2024/07/29-15:44:10.312 2a384 Delete type=0 #2624 -2024/07/29-15:44:10.319 2a384 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.319 2a384 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.447 5e98 Recovering log #2625 +2024/07/29-15:53:29.451 5e98 Delete type=0 #2625 +2024/07/29-15:53:29.451 5e98 Delete type=3 #2623 +2024/07/30-01:19:39.394 2a384 Level-0 table #2630: started +2024/07/30-01:19:39.394 2a384 Level-0 table #2630: 0 bytes OK +2024/07/30-01:19:39.396 2a384 Delete type=0 #2628 +2024/07/30-01:19:39.400 2a384 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.400 2a384 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-002627 b/packs/gps-monster-features/MANIFEST-002631 similarity index 66% rename from packs/gps-monster-features/MANIFEST-002627 rename to packs/gps-monster-features/MANIFEST-002631 index f160106f..5cad531f 100644 Binary files a/packs/gps-monster-features/MANIFEST-002627 and b/packs/gps-monster-features/MANIFEST-002631 differ diff --git a/packs/gps-race-features/000334.log b/packs/gps-race-features/000334.log deleted file mode 100644 index e69de29b..00000000 diff --git a/packs/gps-items/002629.log b/packs/gps-race-features/000337.log similarity index 100% rename from packs/gps-items/002629.log rename to packs/gps-race-features/000337.log diff --git a/packs/gps-race-features/CURRENT b/packs/gps-race-features/CURRENT index 60e43974..26ca7add 100644 --- a/packs/gps-race-features/CURRENT +++ b/packs/gps-race-features/CURRENT @@ -1 +1 @@ -MANIFEST-000332 +MANIFEST-000336 diff --git a/packs/gps-race-features/LOG b/packs/gps-race-features/LOG index 211e078b..0ef4f205 100644 --- a/packs/gps-race-features/LOG +++ b/packs/gps-race-features/LOG @@ -1,8 +1,3 @@ -2024/07/29-15:53:29.517 6664 Recovering log #330 -2024/07/29-15:53:29.521 6664 Delete type=0 #330 -2024/07/29-15:53:29.521 6664 Delete type=3 #328 -2024/07/30-01:19:39.418 2a384 Level-0 table #335: started -2024/07/30-01:19:39.418 2a384 Level-0 table #335: 0 bytes OK -2024/07/30-01:19:39.420 2a384 Delete type=0 #333 -2024/07/30-01:19:39.425 2a384 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.425 2a384 Manual compaction at level-1 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.672 6068 Recovering log #334 +2024/07/30-09:16:32.679 6068 Delete type=0 #334 +2024/07/30-09:16:32.679 6068 Delete type=3 #332 diff --git a/packs/gps-race-features/LOG.old b/packs/gps-race-features/LOG.old index 194ea0c2..211e078b 100644 --- a/packs/gps-race-features/LOG.old +++ b/packs/gps-race-features/LOG.old @@ -1,8 +1,8 @@ -2024/07/29-01:57:28.763 5e98 Recovering log #326 -2024/07/29-01:57:28.767 5e98 Delete type=0 #326 -2024/07/29-01:57:28.767 5e98 Delete type=3 #324 -2024/07/29-15:44:10.332 2a384 Level-0 table #331: started -2024/07/29-15:44:10.332 2a384 Level-0 table #331: 0 bytes OK -2024/07/29-15:44:10.334 2a384 Delete type=0 #329 -2024/07/29-15:44:10.341 2a384 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.341 2a384 Manual compaction at level-1 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.517 6664 Recovering log #330 +2024/07/29-15:53:29.521 6664 Delete type=0 #330 +2024/07/29-15:53:29.521 6664 Delete type=3 #328 +2024/07/30-01:19:39.418 2a384 Level-0 table #335: started +2024/07/30-01:19:39.418 2a384 Level-0 table #335: 0 bytes OK +2024/07/30-01:19:39.420 2a384 Delete type=0 #333 +2024/07/30-01:19:39.425 2a384 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.425 2a384 Manual compaction at level-1 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) diff --git a/packs/gps-race-features/MANIFEST-000332 b/packs/gps-race-features/MANIFEST-000336 similarity index 57% rename from packs/gps-race-features/MANIFEST-000332 rename to packs/gps-race-features/MANIFEST-000336 index ce92fce9..06808a2b 100644 Binary files a/packs/gps-race-features/MANIFEST-000332 and b/packs/gps-race-features/MANIFEST-000336 differ diff --git a/packs/gps-spells/002699.log b/packs/gps-spells/002699.log deleted file mode 100644 index e69de29b..00000000 diff --git a/packs/gps-spells/002703.log b/packs/gps-spells/002703.log new file mode 100644 index 00000000..8cc93dd6 Binary files /dev/null and b/packs/gps-spells/002703.log differ diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT index 6d91565d..9abd9cf2 100644 --- a/packs/gps-spells/CURRENT +++ b/packs/gps-spells/CURRENT @@ -1 +1 @@ -MANIFEST-002697 +MANIFEST-002702 diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG index 67a64b52..92644c14 100644 --- a/packs/gps-spells/LOG +++ b/packs/gps-spells/LOG @@ -1,15 +1,3 @@ -2024/07/29-15:53:29.419 5754 Recovering log #2695 -2024/07/29-15:53:29.422 5754 Delete type=0 #2695 -2024/07/29-15:53:29.422 5754 Delete type=3 #2693 -2024/07/30-01:19:39.366 2a384 Level-0 table #2700: started -2024/07/30-01:19:39.368 2a384 Level-0 table #2700: 14021 bytes OK -2024/07/30-01:19:39.371 2a384 Delete type=0 #2698 -2024/07/30-01:19:39.378 2a384 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) -2024/07/30-01:19:39.378 2a384 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at '!items!yrtnryiILYkVKGEp' @ 1573 : 1 -2024/07/30-01:19:39.378 2a384 Compacting 1@1 + 1@2 files -2024/07/30-01:19:39.385 2a384 Generated table #2701@1: 50 keys, 148212 bytes -2024/07/30-01:19:39.385 2a384 Compacted 1@1 + 1@2 files => 148212 bytes -2024/07/30-01:19:39.387 2a384 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/07/30-01:19:39.387 2a384 Delete type=2 #2684 -2024/07/30-01:19:39.387 2a384 Delete type=2 #2700 -2024/07/30-01:19:39.394 2a384 Manual compaction at level-1 from '!items!yrtnryiILYkVKGEp' @ 1573 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/07/30-09:16:32.577 5754 Recovering log #2699 +2024/07/30-09:16:32.580 5754 Delete type=0 #2699 +2024/07/30-09:16:32.580 5754 Delete type=3 #2697 diff --git a/packs/gps-spells/LOG.old b/packs/gps-spells/LOG.old index aad31631..67a64b52 100644 --- a/packs/gps-spells/LOG.old +++ b/packs/gps-spells/LOG.old @@ -1,8 +1,15 @@ -2024/07/29-01:57:28.685 6664 Recovering log #2691 -2024/07/29-01:57:28.689 6664 Delete type=0 #2691 -2024/07/29-01:57:28.689 6664 Delete type=3 #2689 -2024/07/29-15:44:10.294 2a384 Level-0 table #2696: started -2024/07/29-15:44:10.294 2a384 Level-0 table #2696: 0 bytes OK -2024/07/29-15:44:10.297 2a384 Delete type=0 #2694 -2024/07/29-15:44:10.305 2a384 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) -2024/07/29-15:44:10.305 2a384 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/07/29-15:53:29.419 5754 Recovering log #2695 +2024/07/29-15:53:29.422 5754 Delete type=0 #2695 +2024/07/29-15:53:29.422 5754 Delete type=3 #2693 +2024/07/30-01:19:39.366 2a384 Level-0 table #2700: started +2024/07/30-01:19:39.368 2a384 Level-0 table #2700: 14021 bytes OK +2024/07/30-01:19:39.371 2a384 Delete type=0 #2698 +2024/07/30-01:19:39.378 2a384 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/07/30-01:19:39.378 2a384 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at '!items!yrtnryiILYkVKGEp' @ 1573 : 1 +2024/07/30-01:19:39.378 2a384 Compacting 1@1 + 1@2 files +2024/07/30-01:19:39.385 2a384 Generated table #2701@1: 50 keys, 148212 bytes +2024/07/30-01:19:39.385 2a384 Compacted 1@1 + 1@2 files => 148212 bytes +2024/07/30-01:19:39.387 2a384 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/07/30-01:19:39.387 2a384 Delete type=2 #2684 +2024/07/30-01:19:39.387 2a384 Delete type=2 #2700 +2024/07/30-01:19:39.394 2a384 Manual compaction at level-1 from '!items!yrtnryiILYkVKGEp' @ 1573 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) diff --git a/packs/gps-spells/MANIFEST-002697 b/packs/gps-spells/MANIFEST-002697 deleted file mode 100644 index d1286d9a..00000000 Binary files a/packs/gps-spells/MANIFEST-002697 and /dev/null differ diff --git a/packs/gps-spells/MANIFEST-002702 b/packs/gps-spells/MANIFEST-002702 new file mode 100644 index 00000000..6827fc97 Binary files /dev/null and b/packs/gps-spells/MANIFEST-002702 differ diff --git a/scripts/macros/ballBearings.js b/scripts/macros/ballBearings.js index 27fedb3a..230524af 100644 --- a/scripts/macros/ballBearings.js +++ b/scripts/macros/ballBearings.js @@ -1,19 +1,26 @@ const regionTokenStates = new Map(); -export async function ballBearings({tokenUuid, regionUuid, regionScenario, originX, originY}) { +export async function ballBearings({tokenUuid, regionUuid, regionScenario, originX, originY, regionStatus}) { async function wait(ms) { return new Promise(resolve => { setTimeout(resolve, ms); }); } const module = await import('../module.js'); const socket = module.socket; let region = await fromUuid(regionUuid); + + if(regionScenario === "onStatusChanged" && regionStatus) { + const tokenState = regionTokenStates.get(region.id) || new Set(); + regionTokenStates.set(region.id, tokenState); + regionTokenStates.set(`${region.id}-statuschanged`, true); + return; + } + else if(regionScenario === "onStatusChanged" && !regionStatus) return; + let tokenDocument = await fromUuid(tokenUuid); - let token = tokenDocument.object; + let token = tokenDocument?.object; if(!token || !region || !regionScenario) return; if (!MidiQOL.isTargetable(token)) return; if ((token.actor.type !== 'npc' && token.actor.type !== 'character')) return; - const effectOriginActor = await fromUuid(region.flags["region-attacher"].actorUuid); - let chosenItem = await fromUuid(region.flags["region-attacher"].itemUuid); let itemProperName = chosenItem.name; let dialogId = "ballbearings"; @@ -36,6 +43,12 @@ export async function ballBearings({tokenUuid, regionUuid, regionScenario, origi return; } else if(regionScenario === "onEnter") { + const statusChanged = regionTokenStates.get(`${region.id}-statuschanged`); + + if (statusChanged) { + regionTokenStates.delete(`${region.id}-statuschanged`); + return; + } const tokenState = regionTokenStates.get(region.id) || new Set(); tokenState.add(token.id); regionTokenStates.set(region.id, tokenState); @@ -54,6 +67,8 @@ export async function ballBearings({tokenUuid, regionUuid, regionScenario, origi } } + const effectOriginActor = await fromUuid(region.flags["region-attacher"].actorUuid); + let dialogContent = `
diff --git a/scripts/macros/blackTentacles.js b/scripts/macros/blackTentacles.js index dfd9e34c..3692bd79 100644 --- a/scripts/macros/blackTentacles.js +++ b/scripts/macros/blackTentacles.js @@ -1,19 +1,28 @@ const regionTokenStates = new Map(); -export async function blackTentacles({tokenUuid, regionUuid, regionScenario, originX, originY}) { +export async function blackTentacles({tokenUuid, regionUuid, regionScenario, originX, originY, regionStatus}) { async function wait(ms) { return new Promise(resolve => { setTimeout(resolve, ms); }); } const module = await import('../module.js'); const socket = module.socket; let region = await fromUuid(regionUuid); + + if(regionScenario === "onStatusChanged" && regionStatus) { + const tokenState = regionTokenStates.get(region.id) || new Set(); + regionTokenStates.set(region.id, tokenState); + regionTokenStates.set(`${region.id}-statuschanged`, true); + return; + } + else if(regionScenario === "onStatusChanged" && !regionStatus) return; + let tokenDocument = await fromUuid(tokenUuid); - let token = tokenDocument.object; + let token = tokenDocument?.object; if(!token || !region || !regionScenario) return; if (!MidiQOL.isTargetable(token)) return; if ((token.actor.type !== 'npc' && token.actor.type !== 'character')) return; let chosenItem = await fromUuid(region.flags["region-attacher"].itemUuid); - let itemProperName = chosenItem.name; + let itemProperName = chosenItem?.name; let dialogId = "blacktentacles"; let dialogTitlePrimary = `${token.actor.name} | ${itemProperName}`; @@ -21,7 +30,7 @@ export async function blackTentacles({tokenUuid, regionUuid, regionScenario, ori if (!browserUser.active) { browserUser = game.users?.activeGM; } - + if(regionScenario === "onExit") { const tokenState = regionTokenStates.get(region.id); if (tokenState) { @@ -32,6 +41,12 @@ export async function blackTentacles({tokenUuid, regionUuid, regionScenario, ori return; } else if(regionScenario === "onEnter") { + const statusChanged = regionTokenStates.get(`${region.id}-statuschanged`); + + if (statusChanged) { + regionTokenStates.delete(`${region.id}-statuschanged`); + return; + } const tokenState = regionTokenStates.get(region.id) || new Set(); tokenState.add(token.id); regionTokenStates.set(region.id, tokenState); diff --git a/scripts/macros/caltrops.js b/scripts/macros/caltrops.js index adf96c06..fdeba145 100644 --- a/scripts/macros/caltrops.js +++ b/scripts/macros/caltrops.js @@ -1,19 +1,26 @@ const regionTokenStates = new Map(); -export async function caltrops({tokenUuid, regionUuid, regionScenario, originX, originY}) { +export async function caltrops({tokenUuid, regionUuid, regionScenario, originX, originY, regionStatus}) { async function wait(ms) { return new Promise(resolve => { setTimeout(resolve, ms); }); } const module = await import('../module.js'); const socket = module.socket; let region = await fromUuid(regionUuid); + + if(regionScenario === "onStatusChanged" && regionStatus) { + const tokenState = regionTokenStates.get(region.id) || new Set(); + regionTokenStates.set(region.id, tokenState); + regionTokenStates.set(`${region.id}-statuschanged`, true); + return; + } + else if(regionScenario === "onStatusChanged" && !regionStatus) return; + let tokenDocument = await fromUuid(tokenUuid); - let token = tokenDocument.object; + let token = tokenDocument?.object; if(!token || !region || !regionScenario) return; if (!MidiQOL.isTargetable(token)) return; if ((token.actor.type !== 'npc' && token.actor.type !== 'character')) return; - const effectOriginActor = await fromUuid(region.flags["region-attacher"].actorUuid); - let chosenItem = await fromUuid(region.flags["region-attacher"].itemUuid); let itemProperName = chosenItem.name; let dialogId = "caltrops"; @@ -36,6 +43,12 @@ export async function caltrops({tokenUuid, regionUuid, regionScenario, originX, return; } else if(regionScenario === "onEnter") { + const statusChanged = regionTokenStates.get(`${region.id}-statuschanged`); + + if (statusChanged) { + regionTokenStates.delete(`${region.id}-statuschanged`); + return; + } const tokenState = regionTokenStates.get(region.id) || new Set(); tokenState.add(token.id); regionTokenStates.set(region.id, tokenState); @@ -54,6 +67,8 @@ export async function caltrops({tokenUuid, regionUuid, regionScenario, originX, } } + const effectOriginActor = await fromUuid(region.flags["region-attacher"].actorUuid); + let dialogContent = `
diff --git a/scripts/macros/caltropsFeyGlass.js b/scripts/macros/caltropsFeyGlass.js index 8d0e66df..b78a1b38 100644 --- a/scripts/macros/caltropsFeyGlass.js +++ b/scripts/macros/caltropsFeyGlass.js @@ -1,19 +1,26 @@ const regionTokenStates = new Map(); -export async function caltropsFeyGlass({tokenUuid, regionUuid, regionScenario, originX, originY}) { +export async function caltropsFeyGlass({tokenUuid, regionUuid, regionScenario, originX, originY, regionStatus}) { async function wait(ms) { return new Promise(resolve => { setTimeout(resolve, ms); }); } const module = await import('../module.js'); const socket = module.socket; let region = await fromUuid(regionUuid); + + if(regionScenario === "onStatusChanged" && regionStatus) { + const tokenState = regionTokenStates.get(region.id) || new Set(); + regionTokenStates.set(region.id, tokenState); + regionTokenStates.set(`${region.id}-statuschanged`, true); + return; + } + else if(regionScenario === "onStatusChanged" && !regionStatus) return; + let tokenDocument = await fromUuid(tokenUuid); - let token = tokenDocument.object; + let token = tokenDocument?.object; if(!token || !region || !regionScenario) return; if (!MidiQOL.isTargetable(token)) return; if ((token.actor.type !== 'npc' && token.actor.type !== 'character')) return; - const effectOriginActor = await fromUuid(region.flags["region-attacher"].actorUuid); - let chosenItem = await fromUuid(region.flags["region-attacher"].itemUuid); let itemProperName = chosenItem.name; let dialogId = "feyglasscaltrops"; @@ -36,6 +43,12 @@ export async function caltropsFeyGlass({tokenUuid, regionUuid, regionScenario, o return; } else if(regionScenario === "onEnter") { + const statusChanged = regionTokenStates.get(`${region.id}-statuschanged`); + + if (statusChanged) { + regionTokenStates.delete(`${region.id}-statuschanged`); + return; + } const tokenState = regionTokenStates.get(region.id) || new Set(); tokenState.add(token.id); regionTokenStates.set(region.id, tokenState); @@ -54,6 +67,8 @@ export async function caltropsFeyGlass({tokenUuid, regionUuid, regionScenario, o } } + const effectOriginActor = await fromUuid(region.flags["region-attacher"].actorUuid); + let dialogContent = `
diff --git a/scripts/macros/cloudOfDaggers.js b/scripts/macros/cloudOfDaggers.js index 4352db74..e1fcb486 100644 --- a/scripts/macros/cloudOfDaggers.js +++ b/scripts/macros/cloudOfDaggers.js @@ -1,11 +1,20 @@ const regionTokenStates = new Map(); -export async function cloudOfDaggers({tokenUuid, regionUuid, regionScenario}) { +export async function cloudOfDaggers({tokenUuid, regionUuid, regionScenario, regionStatus}) { async function wait(ms) { return new Promise(resolve => { setTimeout(resolve, ms); }); } let region = await fromUuid(regionUuid); + + if(regionScenario === "onStatusChanged" && regionStatus) { + const tokenState = regionTokenStates.get(region.id) || new Set(); + regionTokenStates.set(region.id, tokenState); + regionTokenStates.set(`${region.id}-statuschanged`, true); + return; + } + else if(regionScenario === "onStatusChanged" && !regionStatus) return; + let template = await fromUuid(region.flags["region-attacher"].attachedTemplate) let tokenDocument = await fromUuid(tokenUuid); - let token = tokenDocument.object; + let token = tokenDocument?.object; if(!token || !region || !regionScenario) return; if (!MidiQOL.isTargetable(token)) return; @@ -25,6 +34,12 @@ export async function cloudOfDaggers({tokenUuid, regionUuid, regionScenario}) { return; } else if(regionScenario === "onEnter") { + const statusChanged = regionTokenStates.get(`${region.id}-statuschanged`); + + if (statusChanged) { + regionTokenStates.delete(`${region.id}-statuschanged`); + return; + } const tokenState = regionTokenStates.get(region.id) || new Set(); tokenState.add(token.id); regionTokenStates.set(region.id, tokenState); diff --git a/scripts/macros/mageSlayer.js b/scripts/macros/mageSlayer.js index 3146dcd1..37ee2f2c 100644 --- a/scripts/macros/mageSlayer.js +++ b/scripts/macros/mageSlayer.js @@ -16,7 +16,6 @@ export async function mageSlayer({workflowData,workflowType,workflowCombat}) { let chosenItem = validTokenPrimary.actor.items.find(i => i.name === itemProperName); if(workflowType === "save") { - console.log("made it to save") let target = Array.from(workflow.targets).filter(t => t.document.uuid === validTokenPrimary.document.uuid); if(target.length === 0) continue; else { diff --git a/scripts/macros/opportunityAttack.js b/scripts/macros/opportunityAttack.js index 7436e278..9c9261c8 100644 --- a/scripts/macros/opportunityAttack.js +++ b/scripts/macros/opportunityAttack.js @@ -504,22 +504,40 @@ export async function enableOpportunityAttack(combat, combatEvent) { const tokenCenterX = token.x + token.object.w / 2; const tokenCenterY = token.y + token.object.h / 2; + const gridSize = canvas.scene.grid.size; + const gridDistance = canvas.scene.grid.distance; + const sideLength = (maxRange / gridDistance) * 2 * gridSize; + const topLeftX = tokenCenterX - (sideLength / 2); + const topLeftY = tokenCenterY - (sideLength / 2); + let regionShape; + + if (canvas.scene.grid.type === 0) { // Gridless + regionShape = { + type: "ellipse", + x: tokenCenterX, + y: tokenCenterY, + radiusX: maxRange * canvas.scene.grid.size / canvas.scene.dimensions.distance, + radiusY: maxRange * canvas.scene.grid.size / canvas.scene.dimensions.distance, + rotation: 0, + hole: false + }; + } else { + regionShape = { + type: "rectangle", + x: topLeftX, + y: topLeftY, + width: sideLength, + height: sideLength, + rotation: 0, + hole: false + }; + } const regionData = { name: `${actor.name} OA Region`, color: browserUser.color, elevation: { bottom: -maxRange, top: maxRange }, - shapes: [ - { - type: "ellipse", - x: tokenCenterX, - y: tokenCenterY, - radiusX: maxRange * canvas.scene.grid.size / canvas.scene.dimensions.distance, - radiusY: maxRange * canvas.scene.grid.size / canvas.scene.dimensions.distance, - rotation: 0, - hole: false - } - ], + shapes: [regionShape], behaviors: [ { type: "executeScript", diff --git a/scripts/module.js b/scripts/module.js index ca663caf..0141978f 100644 --- a/scripts/module.js +++ b/scripts/module.js @@ -211,7 +211,6 @@ Hooks.once('ready', async function() { }); Hooks.on("midi-qol.preWaitForSaves", async (workflow) => { - console.log(workflow) if(!workflow.item.hasSave) return; let workflowItemUuid = workflow.itemUuid; if (game.gpsSettings.mageSlayerEnabled) await executeWorkflow({ workflowItem: "mageSlayer", workflowData: workflowItemUuid, workflowType: "save", workflowCombat: true }); @@ -443,7 +442,7 @@ async function updateRegionPosition(tokenDocument) { const region = fromUuidSync(tokenDocument.actor.getFlag('gambits-premades', 'templateAttachedToken')); if (!region || !tokenDocument) return; let oaDisabled = region.getFlag("gambits-premades", "opportunityAttackDisabled"); - if(!oaDisabled) region.setFlag("gambits-premades", "opportunityAttackDisabled", true) + if (!oaDisabled) region.setFlag("gambits-premades", "opportunityAttackDisabled", true); let previousX1 = tokenDocument.object.center.x; let previousY1 = tokenDocument.object.center.y; @@ -461,15 +460,32 @@ async function updateRegionPosition(tokenDocument) { setTimeout(checkPosition, 25); } else if (previousX1 === previousX2 && previousY1 === previousY2) { + + const updatedShapes = region.shapes.map(shape => { + const sideLength = shape.width || (shape.radiusX * 2); + const topLeftX = currentX - (sideLength / 2); + const topLeftY = currentY - (sideLength / 2); + + if (shape.type === "ellipse") { + return { + ...shape, + x: currentX, + y: currentY + }; + } else { + return { + ...shape, + x: topLeftX, + y: topLeftY + }; + } + }); + region.update({ - shapes: region.shapes.map(shape => ({ - ...shape, - x: currentX, - y: currentY - })) + shapes: updatedShapes }); - if(!oaDisabled) region.unsetFlag("gambits-premades", "opportunityAttackDisabled") - + + if (!oaDisabled) region.unsetFlag("gambits-premades", "opportunityAttackDisabled"); return; } else { previousX2 = previousX1; @@ -478,7 +494,6 @@ async function updateRegionPosition(tokenDocument) { } }; - // Start the initial check checkPosition(); }