diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27c3d9f6..f018c315 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,8 +20,11 @@ jobs: run: | echo "- General: Updated manifest link to not prompt a new url each update part 2.x." >> release_notes.txt echo "- Additions:" >> release_notes.txt - echo " - Foresight: Automates the 9th level spell Foresight" >> release_notes.txt - echo " - Thought Shield: Automates the Warlocks Thought Shield feature" >> release_notes.txt + echo " - Electric Eels: V12 Compatability" >> release_notes.txt + echo " - Dimension Door: Automates the Dimension Door spell, allowing selection of an ally within 5 feet to teleport as well" >> release_notes.txt + echo "- Bugfixes:" >> release_notes.txt + echo " - Identify Restriction: Identify Restriction message fixed. Text is saved to the form field properly on save, and no longer requires a reload to apply." >> release_notes.txt + echo " - Opportunity Attack: Fix issue causing dialog popup on token entry in some cases. Add proper teleport handling to prevent OA when a teleport occurs, dependent on proper teleport implementation in an upcoming Sequencer release" >> 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/001097.log b/packs/gps-3rd-party-features/001121.log similarity index 100% rename from packs/gps-3rd-party-features/001097.log rename to packs/gps-3rd-party-features/001121.log diff --git a/packs/gps-3rd-party-features/CURRENT b/packs/gps-3rd-party-features/CURRENT index 46e082c0..21746257 100644 --- a/packs/gps-3rd-party-features/CURRENT +++ b/packs/gps-3rd-party-features/CURRENT @@ -1 +1 @@ -MANIFEST-001095 +MANIFEST-001119 diff --git a/packs/gps-3rd-party-features/LOG b/packs/gps-3rd-party-features/LOG index 186bfc7b..71d01963 100644 --- a/packs/gps-3rd-party-features/LOG +++ b/packs/gps-3rd-party-features/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.489 2da70 Recovering log #1093 -2024/08/14-21:37:52.494 2da70 Delete type=0 #1093 -2024/08/14-21:37:52.494 2da70 Delete type=3 #1091 -2024/08/15-00:50:53.864 34e44 Level-0 table #1098: started -2024/08/15-00:50:53.865 34e44 Level-0 table #1098: 0 bytes OK -2024/08/15-00:50:53.868 34e44 Delete type=0 #1096 -2024/08/15-00:50:53.875 34e44 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.875 34e44 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.707 87024 Recovering log #1117 +2024/08/18-16:57:04.711 87024 Delete type=0 #1117 +2024/08/18-16:57:04.711 87024 Delete type=3 #1115 +2024/08/18-20:03:04.131 a8ba4 Level-0 table #1122: started +2024/08/18-20:03:04.131 a8ba4 Level-0 table #1122: 0 bytes OK +2024/08/18-20:03:04.133 a8ba4 Delete type=0 #1120 +2024/08/18-20:03:04.136 a8ba4 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.136 a8ba4 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 1324bbef..571f818f 100644 --- a/packs/gps-3rd-party-features/LOG.old +++ b/packs/gps-3rd-party-features/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.758 7c4 Recovering log #1089 -2024/08/14-18:26:28.762 7c4 Delete type=0 #1089 -2024/08/14-18:26:28.762 7c4 Delete type=3 #1087 -2024/08/14-18:53:31.131 34e44 Level-0 table #1094: started -2024/08/14-18:53:31.131 34e44 Level-0 table #1094: 0 bytes OK -2024/08/14-18:53:31.133 34e44 Delete type=0 #1092 -2024/08/14-18:53:31.136 34e44 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.136 34e44 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/08/17-22:44:29.983 87020 Recovering log #1113 +2024/08/17-22:44:29.987 87020 Delete type=0 #1113 +2024/08/17-22:44:29.987 87020 Delete type=3 #1111 +2024/08/18-16:55:05.194 a8ba4 Level-0 table #1118: started +2024/08/18-16:55:05.194 a8ba4 Level-0 table #1118: 0 bytes OK +2024/08/18-16:55:05.196 a8ba4 Delete type=0 #1116 +2024/08/18-16:55:05.199 a8ba4 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.199 a8ba4 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-001095 b/packs/gps-3rd-party-features/MANIFEST-001119 similarity index 57% rename from packs/gps-3rd-party-features/MANIFEST-001095 rename to packs/gps-3rd-party-features/MANIFEST-001119 index 5634a895..ba36e44c 100644 Binary files a/packs/gps-3rd-party-features/MANIFEST-001095 and b/packs/gps-3rd-party-features/MANIFEST-001119 differ diff --git a/packs/gps-3rd-party-items/001099.log b/packs/gps-3rd-party-items/001123.log similarity index 100% rename from packs/gps-3rd-party-items/001099.log rename to packs/gps-3rd-party-items/001123.log diff --git a/packs/gps-3rd-party-items/CURRENT b/packs/gps-3rd-party-items/CURRENT index d04ee51e..0e39ef37 100644 --- a/packs/gps-3rd-party-items/CURRENT +++ b/packs/gps-3rd-party-items/CURRENT @@ -1 +1 @@ -MANIFEST-001097 +MANIFEST-001121 diff --git a/packs/gps-3rd-party-items/LOG b/packs/gps-3rd-party-items/LOG index 36a85089..5464c713 100644 --- a/packs/gps-3rd-party-items/LOG +++ b/packs/gps-3rd-party-items/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.552 7c4 Recovering log #1095 -2024/08/14-21:37:52.556 7c4 Delete type=0 #1095 -2024/08/14-21:37:52.556 7c4 Delete type=3 #1093 -2024/08/15-00:50:53.914 34e44 Level-0 table #1100: started -2024/08/15-00:50:53.914 34e44 Level-0 table #1100: 0 bytes OK -2024/08/15-00:50:53.916 34e44 Delete type=0 #1098 -2024/08/15-00:50:53.916 34e44 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.917 34e44 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.750 87020 Recovering log #1119 +2024/08/18-16:57:04.754 87020 Delete type=0 #1119 +2024/08/18-16:57:04.754 87020 Delete type=3 #1117 +2024/08/18-20:03:04.145 a8ba4 Level-0 table #1124: started +2024/08/18-20:03:04.145 a8ba4 Level-0 table #1124: 0 bytes OK +2024/08/18-20:03:04.147 a8ba4 Delete type=0 #1122 +2024/08/18-20:03:04.147 a8ba4 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.148 a8ba4 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 eb338a03..a4b33079 100644 --- a/packs/gps-3rd-party-items/LOG.old +++ b/packs/gps-3rd-party-items/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.804 30a54 Recovering log #1091 -2024/08/14-18:26:28.809 30a54 Delete type=0 #1091 -2024/08/14-18:26:28.809 30a54 Delete type=3 #1089 -2024/08/14-18:53:31.152 34e44 Level-0 table #1096: started -2024/08/14-18:53:31.152 34e44 Level-0 table #1096: 0 bytes OK -2024/08/14-18:53:31.154 34e44 Delete type=0 #1094 -2024/08/14-18:53:31.162 34e44 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.162 34e44 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.031 8701c Recovering log #1115 +2024/08/17-22:44:30.035 8701c Delete type=0 #1115 +2024/08/17-22:44:30.035 8701c Delete type=3 #1113 +2024/08/18-16:55:05.215 a8ba4 Level-0 table #1120: started +2024/08/18-16:55:05.215 a8ba4 Level-0 table #1120: 0 bytes OK +2024/08/18-16:55:05.217 a8ba4 Delete type=0 #1118 +2024/08/18-16:55:05.223 a8ba4 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.228 a8ba4 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-001097 b/packs/gps-3rd-party-items/MANIFEST-001121 similarity index 67% rename from packs/gps-3rd-party-items/MANIFEST-001097 rename to packs/gps-3rd-party-items/MANIFEST-001121 index 0a27e6cc..54cf8c00 100644 Binary files a/packs/gps-3rd-party-items/MANIFEST-001097 and b/packs/gps-3rd-party-items/MANIFEST-001121 differ diff --git a/packs/gps-3rd-party-spells/001108.log b/packs/gps-3rd-party-spells/001134.log similarity index 100% rename from packs/gps-3rd-party-spells/001108.log rename to packs/gps-3rd-party-spells/001134.log diff --git a/packs/gps-3rd-party-spells/000841.ldb b/packs/gps-3rd-party-spells/001136.ldb similarity index 74% rename from packs/gps-3rd-party-spells/000841.ldb rename to packs/gps-3rd-party-spells/001136.ldb index 8d0b3fc7..37a68821 100644 Binary files a/packs/gps-3rd-party-spells/000841.ldb and b/packs/gps-3rd-party-spells/001136.ldb differ diff --git a/packs/gps-3rd-party-spells/CURRENT b/packs/gps-3rd-party-spells/CURRENT index 94d3a06a..ad21d285 100644 --- a/packs/gps-3rd-party-spells/CURRENT +++ b/packs/gps-3rd-party-spells/CURRENT @@ -1 +1 @@ -MANIFEST-001106 +MANIFEST-001132 diff --git a/packs/gps-3rd-party-spells/LOG b/packs/gps-3rd-party-spells/LOG index 5d826519..d9220524 100644 --- a/packs/gps-3rd-party-spells/LOG +++ b/packs/gps-3rd-party-spells/LOG @@ -1,8 +1,15 @@ -2024/08/14-21:37:52.559 30a54 Recovering log #1104 -2024/08/14-21:37:52.564 30a54 Delete type=0 #1104 -2024/08/14-21:37:52.564 30a54 Delete type=3 #1102 -2024/08/15-00:50:53.911 34e44 Level-0 table #1109: started -2024/08/15-00:50:53.911 34e44 Level-0 table #1109: 0 bytes OK -2024/08/15-00:50:53.914 34e44 Delete type=0 #1107 -2024/08/15-00:50:53.916 34e44 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.917 34e44 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.757 8701c Recovering log #1129 +2024/08/18-16:57:04.761 8701c Delete type=0 #1129 +2024/08/18-16:57:04.761 8701c Delete type=3 #1127 +2024/08/18-20:03:04.152 a8ba4 Level-0 table #1135: started +2024/08/18-20:03:04.155 a8ba4 Level-0 table #1135: 20327 bytes OK +2024/08/18-20:03:04.157 a8ba4 Delete type=0 #1133 +2024/08/18-20:03:04.161 a8ba4 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.161 a8ba4 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at '!items.effects!HbzrINiUD1Xrd7h5.1aZUiRZIU4tPRa8I' @ 359 : 1 +2024/08/18-20:03:04.161 a8ba4 Compacting 1@1 + 1@2 files +2024/08/18-20:03:04.165 a8ba4 Generated table #1136@1: 28 keys, 63501 bytes +2024/08/18-20:03:04.165 a8ba4 Compacted 1@1 + 1@2 files => 63501 bytes +2024/08/18-20:03:04.167 a8ba4 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/08/18-20:03:04.167 a8ba4 Delete type=2 #1131 +2024/08/18-20:03:04.167 a8ba4 Delete type=2 #1135 +2024/08/18-20:03:04.170 a8ba4 Manual compaction at level-1 from '!items.effects!HbzrINiUD1Xrd7h5.1aZUiRZIU4tPRa8I' @ 359 : 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 06ed1862..65467a6d 100644 --- a/packs/gps-3rd-party-spells/LOG.old +++ b/packs/gps-3rd-party-spells/LOG.old @@ -1,8 +1,15 @@ -2024/08/14-18:26:28.810 2da70 Recovering log #1100 -2024/08/14-18:26:28.814 2da70 Delete type=0 #1100 -2024/08/14-18:26:28.815 2da70 Delete type=3 #1098 -2024/08/14-18:53:31.155 34e44 Level-0 table #1105: started -2024/08/14-18:53:31.155 34e44 Level-0 table #1105: 0 bytes OK -2024/08/14-18:53:31.157 34e44 Delete type=0 #1103 -2024/08/14-18:53:31.162 34e44 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.162 34e44 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.038 87034 Recovering log #1125 +2024/08/17-22:44:30.042 87034 Delete type=0 #1125 +2024/08/17-22:44:30.042 87034 Delete type=3 #1123 +2024/08/18-16:55:05.219 a8ba4 Level-0 table #1130: started +2024/08/18-16:55:05.221 a8ba4 Level-0 table #1130: 10803 bytes OK +2024/08/18-16:55:05.223 a8ba4 Delete type=0 #1128 +2024/08/18-16:55:05.223 a8ba4 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.223 a8ba4 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at '!items.effects!AXpxQqPCDFZilrmb.ndzAaBnWczGEKgP1' @ 356 : 0 +2024/08/18-16:55:05.223 a8ba4 Compacting 1@1 + 1@2 files +2024/08/18-16:55:05.226 a8ba4 Generated table #1131@1: 28 keys, 63478 bytes +2024/08/18-16:55:05.226 a8ba4 Compacted 1@1 + 1@2 files => 63478 bytes +2024/08/18-16:55:05.228 a8ba4 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/08/18-16:55:05.228 a8ba4 Delete type=2 #1118 +2024/08/18-16:55:05.228 a8ba4 Delete type=2 #1130 +2024/08/18-16:55:05.232 a8ba4 Manual compaction at level-1 from '!items.effects!AXpxQqPCDFZilrmb.ndzAaBnWczGEKgP1' @ 356 : 0 .. '!items.effects!qBnx0VU4WBSLrGeK.zhzkM83QyjS4pBGp' @ 0 : 0; will stop at (end) diff --git a/packs/gps-3rd-party-spells/MANIFEST-001106 b/packs/gps-3rd-party-spells/MANIFEST-001106 deleted file mode 100644 index d109c722..00000000 Binary files a/packs/gps-3rd-party-spells/MANIFEST-001106 and /dev/null differ diff --git a/packs/gps-3rd-party-spells/MANIFEST-001132 b/packs/gps-3rd-party-spells/MANIFEST-001132 new file mode 100644 index 00000000..49355f00 Binary files /dev/null and b/packs/gps-3rd-party-spells/MANIFEST-001132 differ diff --git a/packs/gps-actors/001565.log b/packs/gps-actors/001589.log similarity index 100% rename from packs/gps-actors/001565.log rename to packs/gps-actors/001589.log diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT index bcbce89b..e710f22b 100644 --- a/packs/gps-actors/CURRENT +++ b/packs/gps-actors/CURRENT @@ -1 +1 @@ -MANIFEST-001563 +MANIFEST-001587 diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG index aafd00f3..9d6d085f 100644 --- a/packs/gps-actors/LOG +++ b/packs/gps-actors/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.544 2da70 Recovering log #1561 -2024/08/14-21:37:52.549 2da70 Delete type=0 #1561 -2024/08/14-21:37:52.549 2da70 Delete type=3 #1559 -2024/08/15-00:50:53.907 34e44 Level-0 table #1566: started -2024/08/15-00:50:53.908 34e44 Level-0 table #1566: 0 bytes OK -2024/08/15-00:50:53.911 34e44 Delete type=0 #1564 -2024/08/15-00:50:53.916 34e44 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.916 34e44 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.745 87024 Recovering log #1585 +2024/08/18-16:57:04.749 87024 Delete type=0 #1585 +2024/08/18-16:57:04.749 87024 Delete type=3 #1583 +2024/08/18-20:03:04.143 a8ba4 Level-0 table #1590: started +2024/08/18-20:03:04.144 a8ba4 Level-0 table #1590: 0 bytes OK +2024/08/18-20:03:04.145 a8ba4 Delete type=0 #1588 +2024/08/18-20:03:04.147 a8ba4 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.148 a8ba4 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 476ad54e..8b3e2e69 100644 --- a/packs/gps-actors/LOG.old +++ b/packs/gps-actors/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.794 7c4 Recovering log #1557 -2024/08/14-18:26:28.799 7c4 Delete type=0 #1557 -2024/08/14-18:26:28.799 7c4 Delete type=3 #1555 -2024/08/14-18:53:31.147 34e44 Level-0 table #1562: started -2024/08/14-18:53:31.148 34e44 Level-0 table #1562: 0 bytes OK -2024/08/14-18:53:31.150 34e44 Delete type=0 #1560 -2024/08/14-18:53:31.150 34e44 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.150 34e44 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.024 87020 Recovering log #1581 +2024/08/17-22:44:30.029 87020 Delete type=0 #1581 +2024/08/17-22:44:30.029 87020 Delete type=3 #1579 +2024/08/18-16:55:05.212 a8ba4 Level-0 table #1586: started +2024/08/18-16:55:05.212 a8ba4 Level-0 table #1586: 0 bytes OK +2024/08/18-16:55:05.215 a8ba4 Delete type=0 #1584 +2024/08/18-16:55:05.223 a8ba4 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.223 a8ba4 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-001563 b/packs/gps-actors/MANIFEST-001587 similarity index 70% rename from packs/gps-actors/MANIFEST-001563 rename to packs/gps-actors/MANIFEST-001587 index 3d531b99..57e70d36 100644 Binary files a/packs/gps-actors/MANIFEST-001563 and b/packs/gps-actors/MANIFEST-001587 differ diff --git a/packs/gps-class-features/002761.ldb b/packs/gps-class-features/002786.ldb similarity index 96% rename from packs/gps-class-features/002761.ldb rename to packs/gps-class-features/002786.ldb index 05ed25f7..8af14e75 100644 Binary files a/packs/gps-class-features/002761.ldb and b/packs/gps-class-features/002786.ldb differ diff --git a/packs/gps-class-features/002768.log b/packs/gps-class-features/002793.log similarity index 100% rename from packs/gps-class-features/002768.log rename to packs/gps-class-features/002793.log diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT index e2ec74ee..f37eaba4 100644 --- a/packs/gps-class-features/CURRENT +++ b/packs/gps-class-features/CURRENT @@ -1 +1 @@ -MANIFEST-002766 +MANIFEST-002791 diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG index 926b650e..091a190a 100644 --- a/packs/gps-class-features/LOG +++ b/packs/gps-class-features/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.431 30d58 Recovering log #2764 -2024/08/14-21:37:52.438 30d58 Delete type=0 #2764 -2024/08/14-21:37:52.439 30d58 Delete type=3 #2762 -2024/08/15-00:50:53.862 34e44 Level-0 table #2769: started -2024/08/15-00:50:53.862 34e44 Level-0 table #2769: 0 bytes OK -2024/08/15-00:50:53.864 34e44 Delete type=0 #2767 -2024/08/15-00:50:53.875 34e44 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.875 34e44 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.695 87034 Recovering log #2789 +2024/08/18-16:57:04.699 87034 Delete type=0 #2789 +2024/08/18-16:57:04.699 87034 Delete type=3 #2787 +2024/08/18-20:03:04.117 a8ba4 Level-0 table #2794: started +2024/08/18-20:03:04.117 a8ba4 Level-0 table #2794: 0 bytes OK +2024/08/18-20:03:04.119 a8ba4 Delete type=0 #2792 +2024/08/18-20:03:04.122 a8ba4 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.128 a8ba4 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/LOG.old b/packs/gps-class-features/LOG.old index 940dca8b..203d8678 100644 --- a/packs/gps-class-features/LOG.old +++ b/packs/gps-class-features/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.747 30d58 Recovering log #2758 -2024/08/14-18:26:28.750 30d58 Delete type=0 #2758 -2024/08/14-18:26:28.750 30d58 Delete type=3 #2755 -2024/08/14-18:53:31.109 34e44 Level-0 table #2765: started -2024/08/14-18:53:31.110 34e44 Level-0 table #2765: 0 bytes OK -2024/08/14-18:53:31.113 34e44 Delete type=0 #2763 -2024/08/14-18:53:31.123 34e44 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.123 34e44 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/08/17-22:44:29.971 87024 Recovering log #2784 +2024/08/17-22:44:29.975 87024 Delete type=0 #2784 +2024/08/17-22:44:29.975 87024 Delete type=3 #2782 +2024/08/18-16:55:05.189 a8ba4 Level-0 table #2790: started +2024/08/18-16:55:05.189 a8ba4 Level-0 table #2790: 0 bytes OK +2024/08/18-16:55:05.192 a8ba4 Delete type=0 #2788 +2024/08/18-16:55:05.199 a8ba4 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!ugNmjDFbPNnpG0CG.Z6aK5JHacSpklffP' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.199 a8ba4 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-002766 b/packs/gps-class-features/MANIFEST-002766 deleted file mode 100644 index 99e11394..00000000 Binary files a/packs/gps-class-features/MANIFEST-002766 and /dev/null differ diff --git a/packs/gps-class-features/MANIFEST-002791 b/packs/gps-class-features/MANIFEST-002791 new file mode 100644 index 00000000..d79e077d Binary files /dev/null and b/packs/gps-class-features/MANIFEST-002791 differ diff --git a/packs/gps-generic-features/002826.log b/packs/gps-generic-features/002850.log similarity index 100% rename from packs/gps-generic-features/002826.log rename to packs/gps-generic-features/002850.log diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT index 5b9ee747..292e86ce 100644 --- a/packs/gps-generic-features/CURRENT +++ b/packs/gps-generic-features/CURRENT @@ -1 +1 @@ -MANIFEST-002824 +MANIFEST-002848 diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG index 4bc228e0..7cda3749 100644 --- a/packs/gps-generic-features/LOG +++ b/packs/gps-generic-features/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.508 30a54 Recovering log #2822 -2024/08/14-21:37:52.512 30a54 Delete type=0 #2822 -2024/08/14-21:37:52.512 30a54 Delete type=3 #2820 -2024/08/15-00:50:53.892 34e44 Level-0 table #2827: started -2024/08/15-00:50:53.892 34e44 Level-0 table #2827: 0 bytes OK -2024/08/15-00:50:53.895 34e44 Delete type=0 #2825 -2024/08/15-00:50:53.899 34e44 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.900 34e44 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.719 8701c Recovering log #2846 +2024/08/18-16:57:04.723 8701c Delete type=0 #2846 +2024/08/18-16:57:04.723 8701c Delete type=3 #2844 +2024/08/18-20:03:04.137 a8ba4 Level-0 table #2851: started +2024/08/18-20:03:04.137 a8ba4 Level-0 table #2851: 0 bytes OK +2024/08/18-20:03:04.142 a8ba4 Delete type=0 #2849 +2024/08/18-20:03:04.147 a8ba4 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.147 a8ba4 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 de3db85e..b88984b6 100644 --- a/packs/gps-generic-features/LOG.old +++ b/packs/gps-generic-features/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.770 2da70 Recovering log #2818 -2024/08/14-18:26:28.775 2da70 Delete type=0 #2818 -2024/08/14-18:26:28.775 2da70 Delete type=3 #2816 -2024/08/14-18:53:31.134 34e44 Level-0 table #2823: started -2024/08/14-18:53:31.134 34e44 Level-0 table #2823: 0 bytes OK -2024/08/14-18:53:31.136 34e44 Delete type=0 #2821 -2024/08/14-18:53:31.136 34e44 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.137 34e44 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/08/17-22:44:29.997 87034 Recovering log #2842 +2024/08/17-22:44:30.001 87034 Delete type=0 #2842 +2024/08/17-22:44:30.001 87034 Delete type=3 #2840 +2024/08/18-16:55:05.200 a8ba4 Level-0 table #2847: started +2024/08/18-16:55:05.200 a8ba4 Level-0 table #2847: 0 bytes OK +2024/08/18-16:55:05.204 a8ba4 Delete type=0 #2845 +2024/08/18-16:55:05.210 a8ba4 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.210 a8ba4 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-002824 b/packs/gps-generic-features/MANIFEST-002848 similarity index 75% rename from packs/gps-generic-features/MANIFEST-002824 rename to packs/gps-generic-features/MANIFEST-002848 index 2fcbdba6..f7909c0e 100644 Binary files a/packs/gps-generic-features/MANIFEST-002824 and b/packs/gps-generic-features/MANIFEST-002848 differ diff --git a/packs/gps-homebrew-features/002730.log b/packs/gps-homebrew-features/002754.log similarity index 100% rename from packs/gps-homebrew-features/002730.log rename to packs/gps-homebrew-features/002754.log diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT index 844953af..866d05bd 100644 --- a/packs/gps-homebrew-features/CURRENT +++ b/packs/gps-homebrew-features/CURRENT @@ -1 +1 @@ -MANIFEST-002728 +MANIFEST-002752 diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG index e93c07ff..fd296f61 100644 --- a/packs/gps-homebrew-features/LOG +++ b/packs/gps-homebrew-features/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.517 2da70 Recovering log #2726 -2024/08/14-21:37:52.522 2da70 Delete type=0 #2726 -2024/08/14-21:37:52.523 2da70 Delete type=3 #2724 -2024/08/15-00:50:53.896 34e44 Level-0 table #2731: started -2024/08/15-00:50:53.896 34e44 Level-0 table #2731: 0 bytes OK -2024/08/15-00:50:53.899 34e44 Delete type=0 #2729 -2024/08/15-00:50:53.899 34e44 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.900 34e44 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.725 87024 Recovering log #2750 +2024/08/18-16:57:04.728 87024 Delete type=0 #2750 +2024/08/18-16:57:04.728 87024 Delete type=3 #2748 +2024/08/18-20:03:04.142 a8ba4 Level-0 table #2755: started +2024/08/18-20:03:04.142 a8ba4 Level-0 table #2755: 0 bytes OK +2024/08/18-20:03:04.143 a8ba4 Delete type=0 #2753 +2024/08/18-20:03:04.147 a8ba4 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.148 a8ba4 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/LOG.old b/packs/gps-homebrew-features/LOG.old index 87a3b4ee..3817cc6c 100644 --- a/packs/gps-homebrew-features/LOG.old +++ b/packs/gps-homebrew-features/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.776 7c4 Recovering log #2722 -2024/08/14-18:26:28.780 7c4 Delete type=0 #2722 -2024/08/14-18:26:28.781 7c4 Delete type=3 #2720 -2024/08/14-18:53:31.139 34e44 Level-0 table #2727: started -2024/08/14-18:53:31.139 34e44 Level-0 table #2727: 0 bytes OK -2024/08/14-18:53:31.142 34e44 Delete type=0 #2725 -2024/08/14-18:53:31.150 34e44 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.150 34e44 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.004 87020 Recovering log #2746 +2024/08/17-22:44:30.008 87020 Delete type=0 #2746 +2024/08/17-22:44:30.008 87020 Delete type=3 #2744 +2024/08/18-16:55:05.208 a8ba4 Level-0 table #2751: started +2024/08/18-16:55:05.208 a8ba4 Level-0 table #2751: 0 bytes OK +2024/08/18-16:55:05.210 a8ba4 Delete type=0 #2749 +2024/08/18-16:55:05.210 a8ba4 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.210 a8ba4 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-002728 b/packs/gps-homebrew-features/MANIFEST-002752 similarity index 73% rename from packs/gps-homebrew-features/MANIFEST-002728 rename to packs/gps-homebrew-features/MANIFEST-002752 index 702a0327..e9a91cda 100644 Binary files a/packs/gps-homebrew-features/MANIFEST-002728 and b/packs/gps-homebrew-features/MANIFEST-002752 differ diff --git a/packs/gps-homebrew-items/002735.log b/packs/gps-homebrew-items/002759.log similarity index 100% rename from packs/gps-homebrew-items/002735.log rename to packs/gps-homebrew-items/002759.log diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT index ee603c85..d5fa7375 100644 --- a/packs/gps-homebrew-items/CURRENT +++ b/packs/gps-homebrew-items/CURRENT @@ -1 +1 @@ -MANIFEST-002733 +MANIFEST-002757 diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG index b9a72d1c..acd1178d 100644 --- a/packs/gps-homebrew-items/LOG +++ b/packs/gps-homebrew-items/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.527 30d58 Recovering log #2731 -2024/08/14-21:37:52.532 30d58 Delete type=0 #2731 -2024/08/14-21:37:52.532 30d58 Delete type=3 #2729 -2024/08/15-00:50:53.901 34e44 Level-0 table #2736: started -2024/08/15-00:50:53.902 34e44 Level-0 table #2736: 0 bytes OK -2024/08/15-00:50:53.906 34e44 Delete type=0 #2734 -2024/08/15-00:50:53.916 34e44 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.916 34e44 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.730 87034 Recovering log #2755 +2024/08/18-16:57:04.734 87034 Delete type=0 #2755 +2024/08/18-16:57:04.734 87034 Delete type=3 #2753 +2024/08/18-20:03:04.134 a8ba4 Level-0 table #2760: started +2024/08/18-20:03:04.135 a8ba4 Level-0 table #2760: 0 bytes OK +2024/08/18-20:03:04.136 a8ba4 Delete type=0 #2758 +2024/08/18-20:03:04.136 a8ba4 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.137 a8ba4 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 75452b79..5b345292 100644 --- a/packs/gps-homebrew-items/LOG.old +++ b/packs/gps-homebrew-items/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.782 30d58 Recovering log #2727 -2024/08/14-18:26:28.786 30d58 Delete type=0 #2727 -2024/08/14-18:26:28.786 30d58 Delete type=3 #2725 -2024/08/14-18:53:31.145 34e44 Level-0 table #2732: started -2024/08/14-18:53:31.145 34e44 Level-0 table #2732: 0 bytes OK -2024/08/14-18:53:31.147 34e44 Delete type=0 #2730 -2024/08/14-18:53:31.150 34e44 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.150 34e44 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.011 87024 Recovering log #2751 +2024/08/17-22:44:30.015 87024 Delete type=0 #2751 +2024/08/17-22:44:30.015 87024 Delete type=3 #2749 +2024/08/18-16:55:05.204 a8ba4 Level-0 table #2756: started +2024/08/18-16:55:05.204 a8ba4 Level-0 table #2756: 0 bytes OK +2024/08/18-16:55:05.206 a8ba4 Delete type=0 #2754 +2024/08/18-16:55:05.210 a8ba4 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.v3j3orDGcbQyk7ZI' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.210 a8ba4 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-002733 b/packs/gps-homebrew-items/MANIFEST-002757 similarity index 81% rename from packs/gps-homebrew-items/MANIFEST-002733 rename to packs/gps-homebrew-items/MANIFEST-002757 index 40fa65ba..dfc43ec6 100644 Binary files a/packs/gps-homebrew-items/MANIFEST-002733 and b/packs/gps-homebrew-items/MANIFEST-002757 differ diff --git a/packs/gps-homebrew-spells/002399.log b/packs/gps-homebrew-spells/002423.log similarity index 100% rename from packs/gps-homebrew-spells/002399.log rename to packs/gps-homebrew-spells/002423.log diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT index b2453ace..03e4b6b2 100644 --- a/packs/gps-homebrew-spells/CURRENT +++ b/packs/gps-homebrew-spells/CURRENT @@ -1 +1 @@ -MANIFEST-002397 +MANIFEST-002421 diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG index c2ba8d11..383bfb35 100644 --- a/packs/gps-homebrew-spells/LOG +++ b/packs/gps-homebrew-spells/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.536 30a54 Recovering log #2395 -2024/08/14-21:37:52.540 30a54 Delete type=0 #2395 -2024/08/14-21:37:52.541 30a54 Delete type=3 #2393 -2024/08/15-00:50:53.889 34e44 Level-0 table #2400: started -2024/08/15-00:50:53.889 34e44 Level-0 table #2400: 0 bytes OK -2024/08/15-00:50:53.891 34e44 Delete type=0 #2398 -2024/08/15-00:50:53.899 34e44 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.900 34e44 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.737 8701c Recovering log #2419 +2024/08/18-16:57:04.741 8701c Delete type=0 #2419 +2024/08/18-16:57:04.741 8701c Delete type=3 #2417 +2024/08/18-20:03:04.148 a8ba4 Level-0 table #2424: started +2024/08/18-20:03:04.149 a8ba4 Level-0 table #2424: 0 bytes OK +2024/08/18-20:03:04.152 a8ba4 Delete type=0 #2422 +2024/08/18-20:03:04.161 a8ba4 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.161 a8ba4 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 e855d970..69a917ee 100644 --- a/packs/gps-homebrew-spells/LOG.old +++ b/packs/gps-homebrew-spells/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.788 2da70 Recovering log #2391 -2024/08/14-18:26:28.792 2da70 Delete type=0 #2391 -2024/08/14-18:26:28.792 2da70 Delete type=3 #2389 -2024/08/14-18:53:31.143 34e44 Level-0 table #2396: started -2024/08/14-18:53:31.143 34e44 Level-0 table #2396: 0 bytes OK -2024/08/14-18:53:31.145 34e44 Delete type=0 #2394 -2024/08/14-18:53:31.150 34e44 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.150 34e44 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.017 87034 Recovering log #2415 +2024/08/17-22:44:30.022 87034 Delete type=0 #2415 +2024/08/17-22:44:30.022 87034 Delete type=3 #2413 +2024/08/18-16:55:05.206 a8ba4 Level-0 table #2420: started +2024/08/18-16:55:05.206 a8ba4 Level-0 table #2420: 0 bytes OK +2024/08/18-16:55:05.208 a8ba4 Delete type=0 #2418 +2024/08/18-16:55:05.210 a8ba4 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.Ka4crf96KPf0p7Uc' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.210 a8ba4 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-002397 b/packs/gps-homebrew-spells/MANIFEST-002421 similarity index 56% rename from packs/gps-homebrew-spells/MANIFEST-002397 rename to packs/gps-homebrew-spells/MANIFEST-002421 index 81b7dc72..2a3dec9b 100644 Binary files a/packs/gps-homebrew-spells/MANIFEST-002397 and b/packs/gps-homebrew-spells/MANIFEST-002421 differ diff --git a/packs/gps-items/002731.log b/packs/gps-items/002755.log similarity index 100% rename from packs/gps-items/002731.log rename to packs/gps-items/002755.log diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT index 219712b7..7b7bc065 100644 --- a/packs/gps-items/CURRENT +++ b/packs/gps-items/CURRENT @@ -1 +1 @@ -MANIFEST-002729 +MANIFEST-002753 diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG index 72e6bceb..8b179173 100644 --- a/packs/gps-items/LOG +++ b/packs/gps-items/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.475 7c4 Recovering log #2727 -2024/08/14-21:37:52.484 7c4 Delete type=0 #2727 -2024/08/14-21:37:52.484 7c4 Delete type=3 #2725 -2024/08/15-00:50:53.859 34e44 Level-0 table #2732: started -2024/08/15-00:50:53.859 34e44 Level-0 table #2732: 0 bytes OK -2024/08/15-00:50:53.862 34e44 Delete type=0 #2730 -2024/08/15-00:50:53.875 34e44 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.875 34e44 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.701 87020 Recovering log #2751 +2024/08/18-16:57:04.705 87020 Delete type=0 #2751 +2024/08/18-16:57:04.705 87020 Delete type=3 #2749 +2024/08/18-20:03:04.128 a8ba4 Level-0 table #2756: started +2024/08/18-20:03:04.128 a8ba4 Level-0 table #2756: 0 bytes OK +2024/08/18-20:03:04.131 a8ba4 Delete type=0 #2754 +2024/08/18-20:03:04.134 a8ba4 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.136 a8ba4 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 7fc581f5..94c723af 100644 --- a/packs/gps-items/LOG.old +++ b/packs/gps-items/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.753 30a54 Recovering log #2723 -2024/08/14-18:26:28.756 30a54 Delete type=0 #2723 -2024/08/14-18:26:28.756 30a54 Delete type=3 #2721 -2024/08/14-18:53:31.124 34e44 Level-0 table #2728: started -2024/08/14-18:53:31.124 34e44 Level-0 table #2728: 0 bytes OK -2024/08/14-18:53:31.128 34e44 Delete type=0 #2726 -2024/08/14-18:53:31.136 34e44 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.136 34e44 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/08/17-22:44:29.977 8701c Recovering log #2747 +2024/08/17-22:44:29.981 8701c Delete type=0 #2747 +2024/08/17-22:44:29.981 8701c Delete type=3 #2745 +2024/08/18-16:55:05.192 a8ba4 Level-0 table #2752: started +2024/08/18-16:55:05.192 a8ba4 Level-0 table #2752: 0 bytes OK +2024/08/18-16:55:05.194 a8ba4 Delete type=0 #2750 +2024/08/18-16:55:05.199 a8ba4 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.199 a8ba4 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-002729 b/packs/gps-items/MANIFEST-002753 similarity index 63% rename from packs/gps-items/MANIFEST-002729 rename to packs/gps-items/MANIFEST-002753 index e544f647..31c95468 100644 Binary files a/packs/gps-items/MANIFEST-002729 and b/packs/gps-items/MANIFEST-002753 differ diff --git a/packs/gps-monster-features/002729.log b/packs/gps-monster-features/002754.log similarity index 100% rename from packs/gps-monster-features/002729.log rename to packs/gps-monster-features/002754.log diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT index 529b6be9..866d05bd 100644 --- a/packs/gps-monster-features/CURRENT +++ b/packs/gps-monster-features/CURRENT @@ -1 +1 @@ -MANIFEST-002727 +MANIFEST-002752 diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG index 54883862..d30d1ff7 100644 --- a/packs/gps-monster-features/LOG +++ b/packs/gps-monster-features/LOG @@ -1,15 +1,8 @@ -2024/08/14-21:37:52.497 30d58 Recovering log #2725 -2024/08/14-21:37:52.504 30d58 Delete type=0 #2725 -2024/08/14-21:37:52.504 30d58 Delete type=3 #2723 -2024/08/15-00:50:53.868 34e44 Level-0 table #2730: started -2024/08/15-00:50:53.873 34e44 Level-0 table #2730: 7659 bytes OK -2024/08/15-00:50:53.875 34e44 Delete type=0 #2728 -2024/08/15-00:50:53.875 34e44 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.875 34e44 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at '!items.effects!QeLgLOxgvzWnTi0u.6jnYPhSayj00RsaB' @ 458 : 1 -2024/08/15-00:50:53.875 34e44 Compacting 1@1 + 1@2 files -2024/08/15-00:50:53.886 34e44 Generated table #2731@1: 47 keys, 51137 bytes -2024/08/15-00:50:53.886 34e44 Compacted 1@1 + 1@2 files => 51137 bytes -2024/08/15-00:50:53.887 34e44 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/08/15-00:50:53.888 34e44 Delete type=2 #2474 -2024/08/15-00:50:53.888 34e44 Delete type=2 #2730 -2024/08/15-00:50:53.899 34e44 Manual compaction at level-1 from '!items.effects!QeLgLOxgvzWnTi0u.6jnYPhSayj00RsaB' @ 458 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.713 87034 Recovering log #2750 +2024/08/18-16:57:04.717 87034 Delete type=0 #2750 +2024/08/18-16:57:04.717 87034 Delete type=3 #2748 +2024/08/18-20:03:04.133 a8ba4 Level-0 table #2755: started +2024/08/18-20:03:04.133 a8ba4 Level-0 table #2755: 0 bytes OK +2024/08/18-20:03:04.134 a8ba4 Delete type=0 #2753 +2024/08/18-20:03:04.136 a8ba4 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.136 a8ba4 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 2aee7b55..4040b711 100644 --- a/packs/gps-monster-features/LOG.old +++ b/packs/gps-monster-features/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.764 30d58 Recovering log #2721 -2024/08/14-18:26:28.769 30d58 Delete type=0 #2721 -2024/08/14-18:26:28.769 30d58 Delete type=3 #2719 -2024/08/14-18:53:31.128 34e44 Level-0 table #2726: started -2024/08/14-18:53:31.128 34e44 Level-0 table #2726: 0 bytes OK -2024/08/14-18:53:31.131 34e44 Delete type=0 #2724 -2024/08/14-18:53:31.136 34e44 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.136 34e44 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/08/17-22:44:29.992 87024 Recovering log #2746 +2024/08/17-22:44:29.996 87024 Delete type=0 #2746 +2024/08/17-22:44:29.996 87024 Delete type=3 #2744 +2024/08/18-16:55:05.196 a8ba4 Level-0 table #2751: started +2024/08/18-16:55:05.196 a8ba4 Level-0 table #2751: 0 bytes OK +2024/08/18-16:55:05.199 a8ba4 Delete type=0 #2749 +2024/08/18-16:55:05.199 a8ba4 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.199 a8ba4 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-002727 b/packs/gps-monster-features/MANIFEST-002727 deleted file mode 100644 index b81f9be0..00000000 Binary files a/packs/gps-monster-features/MANIFEST-002727 and /dev/null differ diff --git a/packs/gps-monster-features/MANIFEST-002752 b/packs/gps-monster-features/MANIFEST-002752 new file mode 100644 index 00000000..6bec7059 Binary files /dev/null and b/packs/gps-monster-features/MANIFEST-002752 differ diff --git a/packs/gps-race-features/000434.log b/packs/gps-race-features/000458.log similarity index 100% rename from packs/gps-race-features/000434.log rename to packs/gps-race-features/000458.log diff --git a/packs/gps-race-features/CURRENT b/packs/gps-race-features/CURRENT index a793e907..ce3e56b7 100644 --- a/packs/gps-race-features/CURRENT +++ b/packs/gps-race-features/CURRENT @@ -1 +1 @@ -MANIFEST-000432 +MANIFEST-000456 diff --git a/packs/gps-race-features/LOG b/packs/gps-race-features/LOG index 43fef55c..a9cd8967 100644 --- a/packs/gps-race-features/LOG +++ b/packs/gps-race-features/LOG @@ -1,8 +1,8 @@ -2024/08/14-21:37:52.566 2da70 Recovering log #430 -2024/08/14-21:37:52.570 2da70 Delete type=0 #430 -2024/08/14-21:37:52.570 2da70 Delete type=3 #428 -2024/08/15-00:50:53.926 34e44 Level-0 table #435: started -2024/08/15-00:50:53.926 34e44 Level-0 table #435: 0 bytes OK -2024/08/15-00:50:53.928 34e44 Delete type=0 #433 -2024/08/15-00:50:53.935 34e44 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.935 34e44 Manual compaction at level-1 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.763 87034 Recovering log #454 +2024/08/18-16:57:04.767 87034 Delete type=0 #454 +2024/08/18-16:57:04.767 87034 Delete type=3 #452 +2024/08/18-20:03:04.159 a8ba4 Level-0 table #459: started +2024/08/18-20:03:04.159 a8ba4 Level-0 table #459: 0 bytes OK +2024/08/18-20:03:04.161 a8ba4 Delete type=0 #457 +2024/08/18-20:03:04.161 a8ba4 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.168 a8ba4 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/LOG.old b/packs/gps-race-features/LOG.old index 493da83a..fa045032 100644 --- a/packs/gps-race-features/LOG.old +++ b/packs/gps-race-features/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.816 7c4 Recovering log #426 -2024/08/14-18:26:28.821 7c4 Delete type=0 #426 -2024/08/14-18:26:28.821 7c4 Delete type=3 #424 -2024/08/14-18:53:31.157 34e44 Level-0 table #431: started -2024/08/14-18:53:31.157 34e44 Level-0 table #431: 0 bytes OK -2024/08/14-18:53:31.159 34e44 Delete type=0 #429 -2024/08/14-18:53:31.162 34e44 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.162 34e44 Manual compaction at level-1 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/08/17-22:44:30.047 87020 Recovering log #450 +2024/08/17-22:44:30.051 87020 Delete type=0 #450 +2024/08/17-22:44:30.052 87020 Delete type=3 #448 +2024/08/18-16:55:05.217 a8ba4 Level-0 table #455: started +2024/08/18-16:55:05.217 a8ba4 Level-0 table #455: 0 bytes OK +2024/08/18-16:55:05.219 a8ba4 Delete type=0 #453 +2024/08/18-16:55:05.223 a8ba4 Manual compaction at level-0 from '!folders!x2qNtSUAAl9PvB3g' @ 72057594037927935 : 1 .. '!items.effects!q6X0joVOtZNM2cRO.5ZnPYNdlzPTAmN6J' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.223 a8ba4 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-000432 b/packs/gps-race-features/MANIFEST-000456 similarity index 57% rename from packs/gps-race-features/MANIFEST-000432 rename to packs/gps-race-features/MANIFEST-000456 index bc02974b..8fd950ff 100644 Binary files a/packs/gps-race-features/MANIFEST-000432 and b/packs/gps-race-features/MANIFEST-000456 differ diff --git a/packs/gps-spells/002804.log b/packs/gps-spells/002829.log similarity index 100% rename from packs/gps-spells/002804.log rename to packs/gps-spells/002829.log diff --git a/packs/gps-spells/002781.ldb b/packs/gps-spells/002831.ldb similarity index 91% rename from packs/gps-spells/002781.ldb rename to packs/gps-spells/002831.ldb index 616b18f9..64c2eb74 100644 Binary files a/packs/gps-spells/002781.ldb and b/packs/gps-spells/002831.ldb differ diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT index 76bbdc33..15f1de98 100644 --- a/packs/gps-spells/CURRENT +++ b/packs/gps-spells/CURRENT @@ -1 +1 @@ -MANIFEST-002802 +MANIFEST-002827 diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG index c9aa5cf7..4a27dbe7 100644 --- a/packs/gps-spells/LOG +++ b/packs/gps-spells/LOG @@ -1,8 +1,15 @@ -2024/08/14-21:37:52.420 30a54 Recovering log #2800 -2024/08/14-21:37:52.426 30a54 Delete type=0 #2800 -2024/08/14-21:37:52.426 30a54 Delete type=3 #2798 -2024/08/15-00:50:53.856 34e44 Level-0 table #2805: started -2024/08/15-00:50:53.856 34e44 Level-0 table #2805: 0 bytes OK -2024/08/15-00:50:53.858 34e44 Delete type=0 #2803 -2024/08/15-00:50:53.858 34e44 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) -2024/08/15-00:50:53.858 34e44 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/08/18-16:57:04.688 87024 Recovering log #2825 +2024/08/18-16:57:04.692 87024 Delete type=0 #2825 +2024/08/18-16:57:04.692 87024 Delete type=3 #2823 +2024/08/18-20:03:04.114 a8ba4 Level-0 table #2830: started +2024/08/18-20:03:04.115 a8ba4 Level-0 table #2830: 12781 bytes OK +2024/08/18-20:03:04.117 a8ba4 Delete type=0 #2828 +2024/08/18-20:03:04.122 a8ba4 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/08/18-20:03:04.122 a8ba4 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at '!items!4srAdZPiDJCuWcoG' @ 1635 : 1 +2024/08/18-20:03:04.122 a8ba4 Compacting 1@1 + 1@2 files +2024/08/18-20:03:04.126 a8ba4 Generated table #2831@1: 53 keys, 154364 bytes +2024/08/18-20:03:04.126 a8ba4 Compacted 1@1 + 1@2 files => 154364 bytes +2024/08/18-20:03:04.128 a8ba4 compacted to: files[ 0 0 1 0 0 0 0 ] +2024/08/18-20:03:04.128 a8ba4 Delete type=2 #2814 +2024/08/18-20:03:04.128 a8ba4 Delete type=2 #2830 +2024/08/18-20:03:04.131 a8ba4 Manual compaction at level-1 from '!items!4srAdZPiDJCuWcoG' @ 1635 : 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 a8a31fe0..21a7d9be 100644 --- a/packs/gps-spells/LOG.old +++ b/packs/gps-spells/LOG.old @@ -1,8 +1,8 @@ -2024/08/14-18:26:28.741 2da70 Recovering log #2796 -2024/08/14-18:26:28.745 2da70 Delete type=0 #2796 -2024/08/14-18:26:28.745 2da70 Delete type=3 #2794 -2024/08/14-18:53:31.114 34e44 Level-0 table #2801: started -2024/08/14-18:53:31.114 34e44 Level-0 table #2801: 0 bytes OK -2024/08/14-18:53:31.117 34e44 Delete type=0 #2799 -2024/08/14-18:53:31.123 34e44 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) -2024/08/14-18:53:31.123 34e44 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/08/17-22:44:29.965 87034 Recovering log #2821 +2024/08/17-22:44:29.969 87034 Delete type=0 #2821 +2024/08/17-22:44:29.969 87034 Delete type=3 #2819 +2024/08/18-16:55:05.185 a8ba4 Level-0 table #2826: started +2024/08/18-16:55:05.185 a8ba4 Level-0 table #2826: 0 bytes OK +2024/08/18-16:55:05.187 a8ba4 Delete type=0 #2824 +2024/08/18-16:55:05.187 a8ba4 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!zb0bHX95fRFILazJ.2TVoFB98ZtniR8Z7' @ 0 : 0; will stop at (end) +2024/08/18-16:55:05.188 a8ba4 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-002802 b/packs/gps-spells/MANIFEST-002802 deleted file mode 100644 index 7cd6a118..00000000 Binary files a/packs/gps-spells/MANIFEST-002802 and /dev/null differ diff --git a/packs/gps-spells/MANIFEST-002827 b/packs/gps-spells/MANIFEST-002827 new file mode 100644 index 00000000..0c8449e7 Binary files /dev/null and b/packs/gps-spells/MANIFEST-002827 differ diff --git a/scripts/helpers.js b/scripts/helpers.js index e79df09c..1ffecc10 100644 --- a/scripts/helpers.js +++ b/scripts/helpers.js @@ -314,14 +314,13 @@ export function findValidTokens({initiatingToken, targetedToken, itemName, itemT else if(itemType === "feature") { const itemNames = itemChecked.map(item => item.toLowerCase()); - let resourceExistsWithValue = [t.actor.system.resources.primary, t.actor.system.resources.secondary, t.actor.system.resources.tertiary].some(resource => - itemNames.includes(resource?.label.toLowerCase()) && resource.value !== 0); + let resourceExistsWithValue = [t.actor.system.resources.primary, t.actor.system.resources.secondary, t.actor.system.resources.tertiary].some(resource => itemNames.includes(resource?.label.toLowerCase()) && resource.value !== 0); let itemExistsWithValue; if (!resourceExistsWithValue) { itemExistsWithValue = t.actor.items.some(i => itemNames.includes(i.name.toLowerCase()) && i.system.uses?.value !== 0); } -console.log(resourceExistsWithValue, itemExistsWithValue, "resource/item check") + if (!resourceExistsWithValue && !itemExistsWithValue) { if(debugEnabled) console.error(`${itemName} for ${t.actor.name} failed at check valid feature item/resource uses`); return; diff --git a/scripts/macros/opportunityAttack.js b/scripts/macros/opportunityAttack.js index 3ba29fdf..4b7eee52 100644 --- a/scripts/macros/opportunityAttack.js +++ b/scripts/macros/opportunityAttack.js @@ -1,6 +1,6 @@ const regionTokenStates = new Map(); -export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionScenario, originX, originY}) { +export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionScenario, originX, originY, isTeleport}) { if(!game.user.isGM) return; const module = await import('../module.js'); const helpers = await import('../helpers.js'); @@ -12,7 +12,7 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS if ((token.actor.type !== 'npc' && token.actor.type !== 'character')) return; - let oaDisabled = await region.getFlag("gambits-premades", "opportunityAttackDisabled"); + let oaDisabled = await region.getFlag("gambits-premades", "regionDisabled"); if(oaDisabled) return; let currentCombatant = canvas.tokens.get(game.combat?.current.tokenId); @@ -52,15 +52,7 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS } regionTokenStates.set(`${region.id}-${token.id}-exited`, true); - 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); - - dialogTitle = "Opportunity Attack"; - dialogId = "opportunityattack"; + return; } else if(regionScenario === "tokenEnter") { const tokenState = regionTokenStates.get(region.id) || new Set(); @@ -68,32 +60,7 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS regionTokenStates.set(region.id, tokenState); regionTokenStates.set(`${region.id}-${token.id}-entered`, true); - if (hasPolearmReaction) { - let weaponNames = ["glaive","halberd","pike","quarterstaff","spear"]; - let hasPolearmWeapon = effectOriginActor.items.some(item => item.system?.type?.baseItem && weaponNames.includes(item.system?.type?.baseItem.toLowerCase()) && item.system.equipped === true); - if(!hasPolearmWeapon) return; - dialogTitle = "Polearm Opportunity Attack"; - dialogId = "polearmopportunityattack"; - } - else if(effectOriginActor.classes?.fighter && effectOriginActor.classes?.fighter?.subclass?.name === "Battle Master") { - let braceItem = effectOriginActor.items.getName("Maneuvers: Brace"); - if(!braceItem) return; - const superiorityNames = ["superiority dice", "superiority die"]; - let resourceExistsWithValue = [effectOriginActor.system.resources.primary, effectOriginActor.system.resources.secondary, effectOriginActor.system.resources.tertiary].some(resource => superiorityNames.includes(resource?.label.toLowerCase()) && resource.value !== 0); - let itemExistsWithValue; - if (!resourceExistsWithValue) itemExistsWithValue = !!effectOriginActor.items.find(i => superiorityNames.includes(i.name.toLowerCase()) && i.system.uses.value !== 0); - if (!resourceExistsWithValue && !itemExistsWithValue) return; - braceItemUuid = braceItem.uuid; - dialogTitle = "Maneuvers: Brace Opportunity Attack"; - dialogId = "maneuversbraceopportunityattack"; - } - else if (hasDeadlyReachReaction) { - dialogTitle = "Deadly Reach Opportunity Attack"; - dialogId = "deadlyreachopportunityattack"; - } - else { - return; - } + return; } else if(regionScenario === "tokenPostMove") { const entered = regionTokenStates.get(`${region.id}-${token.id}-entered`); @@ -107,25 +74,60 @@ export async function opportunityAttackScenarios({tokenUuid, regionUuid, regionS await token.update({ x: originX, y: originY }, { animate: false }); }*/ - if (entered || exited) { + /*if (entered || exited) { regionTokenStates.delete(`${region.id}-${token.id}-entered`); regionTokenStates.delete(`${region.id}-${token.id}-exited`); return; - } + }*/ + regionTokenStates.delete(`${region.id}-${token.id}-exited`); + regionTokenStates.delete(`${region.id}-${token.id}-entered`); if (token.regions.has(region)) return; //if(hasSentinel && (sentinelUsed || sentinelDeclined)) 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); - - dialogTitle = "Opportunity Attack"; - dialogId = "opportunityattack"; + if((exited || (!exited && !entered)) && !isTeleport) { + 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); + + dialogTitle = "Opportunity Attack"; + dialogId = "opportunityattack"; + } + else if(entered && !isTeleport) { + if (hasPolearmReaction) { + let weaponNames = ["glaive","halberd","pike","quarterstaff","spear"]; + let hasPolearmWeapon = effectOriginActor.items.some(item => item.system?.type?.baseItem && weaponNames.includes(item.system?.type?.baseItem.toLowerCase()) && item.system.equipped === true); + if(!hasPolearmWeapon) return; + dialogTitle = "Polearm Opportunity Attack"; + dialogId = "polearmopportunityattack"; + } + else if(effectOriginActor.classes?.fighter && effectOriginActor.classes?.fighter?.subclass?.name === "Battle Master") { + let braceItem = effectOriginActor.items.getName("Maneuvers: Brace"); + if(!braceItem) return; + const superiorityNames = ["superiority dice", "superiority die"]; + let resourceExistsWithValue = [effectOriginActor.system.resources.primary, effectOriginActor.system.resources.secondary, effectOriginActor.system.resources.tertiary].some(resource => superiorityNames.includes(resource?.label.toLowerCase()) && resource.value !== 0); + let itemExistsWithValue; + if (!resourceExistsWithValue) itemExistsWithValue = !!effectOriginActor.items.find(i => superiorityNames.includes(i.name.toLowerCase()) && i.system.uses.value !== 0); + if (!resourceExistsWithValue && !itemExistsWithValue) return; + braceItemUuid = braceItem.uuid; + dialogTitle = "Maneuvers: Brace Opportunity Attack"; + dialogId = "maneuversbraceopportunityattack"; + } + else if (hasDeadlyReachReaction) { + dialogTitle = "Deadly Reach Opportunity Attack"; + dialogId = "deadlyreachopportunityattack"; + } + else { + return; + } + } + else { + return; + } } const initialTimeLeft = Number(MidiQOL.safeGetGameSetting('gambits-premades', `Opportunity Attack Timeout`)); @@ -545,7 +547,7 @@ export async function enableOpportunityAttack(combat, combatEvent) { name: "onExit", disabled: false, system: { - source: `let oaDisabled = await region.getFlag("gambits-premades", "opportunityAttackDisabled"); if(oaDisabled) return; if(region.flags["gambits-premades"].actorUuid === event.data.token.actor.uuid) return; if(event.data.teleport === true) return; await game.gps.opportunityAttackScenarios({tokenUuid: event.data.token.uuid, regionUuid: region.uuid, regionScenario: "tokenExit"});`, + source: `let oaDisabled = await region.getFlag("gambits-premades", "regionDisabled"); if(oaDisabled) return; if(region.flags["gambits-premades"].actorUuid === event.data.token.actor.uuid) return; await game.gps.opportunityAttackScenarios({tokenUuid: event.data.token.uuid, regionUuid: region.uuid, regionScenario: "tokenExit", isTeleport: event.data.teleport});`, events: ['tokenExit'] } }, @@ -554,8 +556,8 @@ export async function enableOpportunityAttack(combat, combatEvent) { name: "onEnter", disabled: false, system: { - source: `let oaDisabled = await region.getFlag("gambits-premades", "opportunityAttackDisabled"); if(oaDisabled) return; if(region.flags["gambits-premades"].actorUuid === event.data.token.actor.uuid) return; if(event.data.teleport === true) return; await game.gps.opportunityAttackScenarios({tokenUuid: event.data.token.uuid, regionUuid: region.uuid, regionScenario: "tokenEnter"});`, - events: ['tokenEnter'] + source: `let oaDisabled = await region.getFlag("gambits-premades", "regionDisabled"); if(oaDisabled) return; if(region.flags["gambits-premades"].actorUuid === event.data.token.actor.uuid) return; await game.gps.opportunityAttackScenarios({tokenUuid: event.data.token.uuid, regionUuid: region.uuid, regionScenario: "tokenEnter", isTeleport: event.data.teleport});`, + events: ['tokenMoveIn'] } }, { @@ -563,7 +565,7 @@ export async function enableOpportunityAttack(combat, combatEvent) { name: "onPostMove", disabled: false, system: { - source: `let oaDisabled = await region.getFlag("gambits-premades", "opportunityAttackDisabled"); if(oaDisabled) return; if(region.flags["gambits-premades"].actorUuid === event.data.token.actor.uuid) return; if(event.data.teleport === true) return; await game.gps.opportunityAttackScenarios({tokenUuid: event.data.token.uuid, regionUuid: region.uuid, regionScenario: "tokenPostMove", originX: event.data.segments[0].to.x, originY: event.data.segments[0].to.y});`, + source: `let oaDisabled = await region.getFlag("gambits-premades", "regionDisabled"); if(oaDisabled) return; if(region.flags["gambits-premades"].actorUuid === event.data.token.actor.uuid) return; await game.gps.opportunityAttackScenarios({tokenUuid: event.data.token.uuid, regionUuid: region.uuid, regionScenario: "tokenPostMove", originX: event.data.segments[0].to.x, originY: event.data.segments[0].to.y, isTeleport: event.data.teleport});`, events: ['tokenMove'] } }, @@ -579,27 +581,54 @@ export async function enableOpportunityAttack(combat, combatEvent) { let tokenSize = Math.max(token.width, token.height); let validWeapons = actor.items.filter(item => (item.system.actionType === "mwak" && item.system.equipped) || (item.system?.type?.value === "monster" && item?.type === "feat" && (item.system?.actionType === "mwak" || item.system?.actionType === "msak")) || (item?.type === "weapon" && item.system?.actionType === "msak")); - recalculate = await checkAndSetFlag("opportunityAttackTemplateValidWeapons", validWeapons) || recalculate; - recalculate = await checkAndSetFlag("opportunityAttackTemplateTokenSize", tokenSize) || recalculate; + recalculate = await checkAndSetFlag("opportunityAttackRegionValidWeapons", validWeapons) || recalculate; + recalculate = await checkAndSetFlag("opportunityAttackRegionTokenSize", tokenSize) || recalculate; recalculate = await handleMWAKRange() || recalculate; if (!recalculate) return; - const validSpells = actor.flags["midi-qol"].opportunityAttackTemplateValidSpells; + const validSpells = actor.flags["midi-qol"].opportunityAttackRegionValidSpells; let maxRange = calculateMaxRange(validWeapons, validSpells, tokenSize); if(maxRange === false) return; - await actor.setFlag("midi-qol", "opportunityAttackTemplateValidOptions", validWeapons?.length > 0 || validSpells?.length > 0); + await actor.setFlag("midi-qol", "opportunityAttackRegionValidOptions", validWeapons?.length > 0 || validSpells?.length > 0); 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 + }; + } region.update({ elevation: { bottom: -maxRange, top: maxRange }, shapes: region.shapes.map(shape => ({ ...shape, - radiusX: maxRange * canvas.scene.grid.size / canvas.scene.dimensions.distance, - radiusY: maxRange * canvas.scene.grid.size / canvas.scene.dimensions.distance + ...regionShape, })) }); @@ -623,7 +652,7 @@ export async function enableOpportunityAttack(combat, combatEvent) { }, 0); let mwakRange = actor.flags["midi-qol"].range.mwak - mwakExpire; - return await checkAndSetFlag("opportunityAttackTemplateMwakRange", mwakRange); + return await checkAndSetFlag("opportunityAttackRegionMwakRange", mwakRange); } function calculateMaxRange(validWeapons, validSpells, tokenSize) { @@ -676,7 +705,7 @@ export async function enableOpportunityAttack(combat, combatEvent) { maxRange = (maxRange * conversionFactor) + tokenSizeOffset; if (actor.flags["midi-qol"]?.range?.mwak) { - maxRange += (actor.flags["midi-qol"].opportunityAttackTemplateMwakRange * conversionFactor); + maxRange += (actor.flags["midi-qol"].opportunityAttackRegionMwakRange * conversionFactor); } return maxRange; }`, @@ -686,15 +715,14 @@ export async function enableOpportunityAttack(combat, combatEvent) { ], flags: { "gambits-premades": { - "templateHiddenOA": true, 'actorUuid': actor.uuid, 'tokenUuid': token.uuid, 'opportunityAttackSet': true, - 'opportunityAttackTemplateValidWeapons': validWeapons, - 'opportunityAttackTemplateValidSpells': validSpells, - 'opportunityAttackTemplateMwakRange': mwakRange, - 'opportunityAttackTemplateTokenSize': Math.max(token.width, token.height), - 'opportunityAttackTemplateConFac': conversionFactor + 'opportunityAttackRegionValidWeapons': validWeapons, + 'opportunityAttackRegionValidSpells': validSpells, + 'opportunityAttackRegionMwakRange': mwakRange, + 'opportunityAttackRegionTokenSize': Math.max(token.width, token.height), + 'opportunityAttackRegionConFac': conversionFactor } } }; @@ -703,11 +731,12 @@ export async function enableOpportunityAttack(combat, combatEvent) { const firstRegion = createdRegions[0]; try { - await actor.setFlag("gambits-premades", "templateAttachedToken", firstRegion.uuid); - await actor.setFlag("gambits-premades", "tokenAttachedTemplate", token.id); - await actor.setFlag("gambits-premades", "opportunityAttackTemplate", firstRegion.uuid); + let attachedRegions = actor.getFlag('gambits-premades', 'attachedRegions') || []; + attachedRegions.push(firstRegion.uuid); + await actor.setFlag('gambits-premades', 'attachedRegions', attachedRegions); + await actor.setFlag("gambits-premades", "opportunityAttackRegion", firstRegion.uuid); if (firstRegion.object && firstRegion.object.tooltip) firstRegion.object.tooltip.visible = false; - if (oaDisabled) await firstRegion.setFlag("gambits-premades", "opportunityAttackDisabled", true); + if (oaDisabled) await firstRegion.setFlag("gambits-premades", "regionDisabled", true); } catch (error) { console.error('Error during region attachment:', error); } @@ -732,13 +761,21 @@ export async function disableOpportunityAttack(combat, combatEvent) { async function processCombatant(combatant) { const { actor } = combatant; - let templateFlag = await actor.getFlag("gambits-premades", "opportunityAttackTemplate"); - let templateAttachmentFlag = await actor.getFlag("gambits-premades", "templateAttachedToken"); + let regionFlag = await actor.getFlag("gambits-premades", "opportunityAttackRegion"); + let attachedRegions = actor.getFlag('gambits-premades', 'attachedRegions') || []; + if (attachedRegions.length !== 0) { + attachedRegions = attachedRegions.filter(uuid => uuid !== regionFlag); + await actor.setFlag('gambits-premades', 'attachedRegions', attachedRegions); + } + else { + await actor.unsetFlag('gambits-premades', 'attachedRegions'); + } + let dragonTurtleFlag = await actor.getFlag("gambits-premades", "dragonTurtleShieldOA"); //let sentinelUsed = actor.getFlag("gambits-premades", "sentinelUsed"); //let sentinelDeclined = actor.getFlag("gambits-premades", "sentinelDeclined"); - let templateData = templateFlag ? await fromUuid(templateFlag) : null; + let regionData = regionFlag ? await fromUuid(regionFlag) : null; /*let effectNames = ["Opportunity Attack Reaction", "Maneuvers: Brace Opportunity Attack"]; let effectIdsToDelete = actor.effects @@ -749,9 +786,8 @@ export async function disableOpportunityAttack(combat, combatEvent) { await actor.deleteEmbeddedDocuments("ActiveEffect", effectIdsToDelete); }*/ - if (templateData) await templateData.delete(); - if (templateFlag) await actor.unsetFlag("gambits-premades", "opportunityAttackTemplate"); - if (templateAttachmentFlag) await actor.unsetFlag("gambits-premades", "templateAttachedToken"); + if (regionData) await regionData.delete(); + if (regionFlag) await actor.unsetFlag("gambits-premades", "opportunityAttackRegion"); if (dragonTurtleFlag) await actor.unsetFlag("gambits-premades", "dragonTurtleShieldOA"); //if(sentinelUsed) await actor.unsetFlag("gambits-premades", "sentinelUsed"); //if(sentinelDeclined) await actor.unsetFlag("gambits-premades", "sentinelDeclined"); diff --git a/scripts/module.js b/scripts/module.js index 2aae1262..2713bf50 100644 --- a/scripts/module.js +++ b/scripts/module.js @@ -270,7 +270,7 @@ Hooks.once('ready', async function() { Hooks.on("preUpdateItem", (item, update) => { if (!game.user.isGM && ("identified" in (update.system ?? {})) && game.gpsSettings.identifyRestrictionEnabled) { - ui.notifications.error(`${game.settings.get('gambits-premades', 'Identify Restriction Message')}`); + ui.notifications.error(`${game.gpsSettings.identifyRestrictionMessage}`); return false; } }); @@ -479,14 +479,12 @@ function setupTemplateCreationUpdateHooks() { }); } -// Handle OA Movement Stuff -async function updateRegionPosition(tokenDocument) { +async function updateRegionPosition(region, tokenDocument) { if (!game.user.isGM) return; - - 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); + + let regionDisabled = region.getFlag("gambits-premades", "regionDisabled"); + if (!regionDisabled) region.setFlag("gambits-premades", "regionDisabled", true); let previousX1 = tokenDocument.object.center.x; let previousY1 = tokenDocument.object.center.y; @@ -504,7 +502,6 @@ 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); @@ -516,12 +513,18 @@ async function updateRegionPosition(tokenDocument) { x: currentX, y: currentY }; - } else { + } else if(shape.type === "rectangle") { return { ...shape, x: topLeftX, y: topLeftY }; + } else { + return { + ...shape, + x: currentX, + y: currentY + }; } }); @@ -529,7 +532,7 @@ async function updateRegionPosition(tokenDocument) { shapes: updatedShapes }); - if (!oaDisabled) region.unsetFlag("gambits-premades", "opportunityAttackDisabled"); + if (!regionDisabled) region.unsetFlag("gambits-premades", "regionDisabled"); return; } else { previousX2 = previousX1; @@ -542,25 +545,14 @@ async function updateRegionPosition(tokenDocument) { } Hooks.on('updateToken', async (tokenDocument, updateData, options, userId) => { - if (!game.combat) return; if (!game.user.isGM) return; - const tokenId = tokenDocument.actor.getFlag('gambits-premades', 'tokenAttachedTemplate'); - if (tokenId && tokenDocument.id === tokenId) { - await updateRegionPosition(tokenDocument); - } -}); + const regions = tokenDocument.actor.getFlag('gambits-premades', 'attachedRegions') || []; -//Handle lack of dfreds effects with midi native reaction handling -/*Hooks.on('deleteActiveEffect', async (activeEffect, options, userId) => { - if (activeEffect.name === "Reaction") { - const actor = activeEffect.parent; - - const hasEffectApplied = MidiQOL.hasUsedReaction(actor); - if (hasEffectApplied) { - await actor?.unsetFlag("midi-qol", "actions.reactionCombatRound"); - return actor?.setFlag("midi-qol", "actions.reaction", false); - } - } - return; - });*/ \ No newline at end of file + for (const regionUuid of regions) { + const region = fromUuidSync(regionUuid); + if (region) { + await updateRegionPosition(region, tokenDocument); + } + } +}); \ No newline at end of file diff --git a/templates/generalSettingsMenu.html b/templates/generalSettingsMenu.html index 682852a1..102b9fa9 100644 --- a/templates/generalSettingsMenu.html +++ b/templates/generalSettingsMenu.html @@ -145,7 +145,7 @@ - +