diff --git a/CHANGELOG.md b/CHANGELOG.md index a7acf83..a10a0ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## 2.1.0 + +### Changed + +- Changed the Summon Ally power effect macro to handle Mirror Self a little + cleaner +- Changed the power effect macro to consider swids in addition to the item + name. +- Updates to documentation + ## 2.0.0 ### Changed diff --git a/module.json b/module.json index 21e6ec9..636b2b5 100644 --- a/module.json +++ b/module.json @@ -2,7 +2,7 @@ "id": "swade-mb-helpers", "title": "SWADE Helpers (MB)", "description": "Mike's collection of swade helpers", - "version": "2.0.0", + "version": "2.1.0", "authors": [ { "name": "Mike" diff --git a/packs/common-actions/000160.ldb b/packs/common-actions/000160.ldb deleted file mode 100644 index 22a2fc2..0000000 Binary files a/packs/common-actions/000160.ldb and /dev/null differ diff --git a/packs/common-actions/000169.ldb b/packs/common-actions/000169.ldb new file mode 100644 index 0000000..7d7fc35 Binary files /dev/null and b/packs/common-actions/000169.ldb differ diff --git a/packs/common-actions/CURRENT b/packs/common-actions/CURRENT index c16f179..301747a 100644 --- a/packs/common-actions/CURRENT +++ b/packs/common-actions/CURRENT @@ -1 +1 @@ -MANIFEST-000156 +MANIFEST-000170 diff --git a/packs/common-actions/LOG b/packs/common-actions/LOG index 1b4cffd..a5697e4 100644 --- a/packs/common-actions/LOG +++ b/packs/common-actions/LOG @@ -1,15 +1,8 @@ -2023/10/01-12:11:47.448916 7fd28affd700 Recovering log #154 -2023/10/01-12:11:47.471451 7fd28affd700 Delete type=0 #154 -2023/10/01-12:11:47.471476 7fd28affd700 Delete type=3 #152 -2023/10/01-20:43:28.145021 7fd28916a700 Level-0 table #159: started -2023/10/01-20:43:28.148538 7fd28916a700 Level-0 table #159: 938 bytes OK -2023/10/01-20:43:28.151749 7fd28916a700 Delete type=0 #157 -2023/10/01-20:43:28.158378 7fd28916a700 Manual compaction at level-0 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) -2023/10/01-20:43:28.162862 7fd28916a700 Manual compaction at level-1 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at '!items!TteEFvR0yPWKNbI5' @ 200 : 1 -2023/10/01-20:43:28.162870 7fd28916a700 Compacting 1@1 + 1@2 files -2023/10/01-20:43:28.165511 7fd28916a700 Generated table #160@1: 20 keys, 8917 bytes -2023/10/01-20:43:28.165520 7fd28916a700 Compacted 1@1 + 1@2 files => 8917 bytes -2023/10/01-20:43:28.168246 7fd28916a700 compacted to: files[ 0 0 1 0 0 0 0 ] -2023/10/01-20:43:28.168314 7fd28916a700 Delete type=2 #159 -2023/10/01-20:43:28.168359 7fd28916a700 Delete type=2 #151 -2023/10/01-20:43:28.168489 7fd28916a700 Manual compaction at level-1 from '!items!TteEFvR0yPWKNbI5' @ 200 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) +2023/11/07-23:29:20.343335 7f46667fc640 Recovering log #167 +2023/11/07-23:29:20.345329 7f46667fc640 Delete type=0 #167 +2023/11/07-23:29:20.345336 7f46667fc640 Delete type=3 #165 +2023/11/07-23:29:29.393563 7f46649f4640 Level-0 table #173: started +2023/11/07-23:29:29.393574 7f46649f4640 Level-0 table #173: 0 bytes OK +2023/11/07-23:29:29.394638 7f46649f4640 Delete type=0 #171 +2023/11/07-23:29:29.396575 7f46649f4640 Manual compaction at level-0 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) +2023/11/07-23:29:29.396609 7f46649f4640 Manual compaction at level-1 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) diff --git a/packs/common-actions/LOG.old b/packs/common-actions/LOG.old index 3be795c..de1ee9f 100644 --- a/packs/common-actions/LOG.old +++ b/packs/common-actions/LOG.old @@ -1,8 +1,15 @@ -2023/10/01-11:42:33.323354 7fd28affd700 Recovering log #149 -2023/10/01-11:42:33.330873 7fd28affd700 Delete type=0 #149 -2023/10/01-11:42:33.330892 7fd28affd700 Delete type=3 #147 -2023/10/01-12:06:41.807421 7fd28916a700 Level-0 table #155: started -2023/10/01-12:06:41.807442 7fd28916a700 Level-0 table #155: 0 bytes OK -2023/10/01-12:06:41.819030 7fd28916a700 Delete type=0 #153 -2023/10/01-12:06:41.840054 7fd28916a700 Manual compaction at level-0 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) -2023/10/01-12:06:41.840105 7fd28916a700 Manual compaction at level-1 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) +2023/11/07-17:50:41.783626 7f4666ffd640 Recovering log #163 +2023/11/07-17:50:41.785537 7f4666ffd640 Delete type=0 #163 +2023/11/07-17:50:41.785550 7f4666ffd640 Delete type=3 #161 +2023/11/07-23:29:14.520879 7f46649f4640 Level-0 table #168: started +2023/11/07-23:29:14.522237 7f46649f4640 Level-0 table #168: 19378 bytes OK +2023/11/07-23:29:14.523105 7f46649f4640 Delete type=0 #166 +2023/11/07-23:29:14.524999 7f46649f4640 Manual compaction at level-0 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) +2023/11/07-23:29:14.526907 7f46649f4640 Manual compaction at level-1 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at '!items!xA7qKMmugJv7z6j1' @ 219 : 1 +2023/11/07-23:29:14.526908 7f46649f4640 Compacting 1@1 + 1@2 files +2023/11/07-23:29:14.527704 7f46649f4640 Generated table #169@1: 21 keys, 9211 bytes +2023/11/07-23:29:14.527711 7f46649f4640 Compacted 1@1 + 1@2 files => 9211 bytes +2023/11/07-23:29:14.528471 7f46649f4640 compacted to: files[ 0 0 1 0 0 0 0 ] +2023/11/07-23:29:14.528489 7f46649f4640 Delete type=2 #168 +2023/11/07-23:29:14.528516 7f46649f4640 Delete type=2 #160 +2023/11/07-23:29:14.541956 7f46649f4640 Manual compaction at level-1 from '!items!xA7qKMmugJv7z6j1' @ 219 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end) diff --git a/packs/common-actions/MANIFEST-000156 b/packs/common-actions/MANIFEST-000156 deleted file mode 100644 index b5de2fb..0000000 Binary files a/packs/common-actions/MANIFEST-000156 and /dev/null differ diff --git a/packs/common-actions/MANIFEST-000170 b/packs/common-actions/MANIFEST-000170 new file mode 100644 index 0000000..02e3785 Binary files /dev/null and b/packs/common-actions/MANIFEST-000170 differ diff --git a/packs/helper-actors/000005.ldb b/packs/helper-actors/000068.ldb similarity index 79% rename from packs/helper-actors/000005.ldb rename to packs/helper-actors/000068.ldb index 3fcf79e..c47173c 100644 Binary files a/packs/helper-actors/000005.ldb and b/packs/helper-actors/000068.ldb differ diff --git a/packs/helper-actors/CURRENT b/packs/helper-actors/CURRENT index 80d9de0..5893b8f 100644 --- a/packs/helper-actors/CURRENT +++ b/packs/helper-actors/CURRENT @@ -1 +1 @@ -MANIFEST-000056 +MANIFEST-000069 diff --git a/packs/helper-actors/LOG b/packs/helper-actors/LOG index d2fd3b9..6e054fa 100644 --- a/packs/helper-actors/LOG +++ b/packs/helper-actors/LOG @@ -1,8 +1,8 @@ -2023/10/01-12:11:47.473471 7fd289ffb700 Recovering log #54 -2023/10/01-12:11:47.496469 7fd289ffb700 Delete type=3 #52 -2023/10/01-12:11:47.496492 7fd289ffb700 Delete type=0 #54 -2023/10/01-20:43:28.151822 7fd28916a700 Level-0 table #59: started -2023/10/01-20:43:28.151850 7fd28916a700 Level-0 table #59: 0 bytes OK -2023/10/01-20:43:28.155380 7fd28916a700 Delete type=0 #57 -2023/10/01-20:43:28.162797 7fd28916a700 Manual compaction at level-0 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) -2023/10/01-20:43:28.168435 7fd28916a700 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) +2023/11/07-23:29:20.346979 7f4665ffb640 Recovering log #66 +2023/11/07-23:29:20.349569 7f4665ffb640 Delete type=3 #64 +2023/11/07-23:29:20.349612 7f4665ffb640 Delete type=0 #66 +2023/11/07-23:29:29.395544 7f46649f4640 Level-0 table #72: started +2023/11/07-23:29:29.395555 7f46649f4640 Level-0 table #72: 0 bytes OK +2023/11/07-23:29:29.396547 7f46649f4640 Delete type=0 #70 +2023/11/07-23:29:29.396590 7f46649f4640 Manual compaction at level-0 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) +2023/11/07-23:29:29.396624 7f46649f4640 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) diff --git a/packs/helper-actors/LOG.old b/packs/helper-actors/LOG.old index 82c386d..3c2f3b8 100644 --- a/packs/helper-actors/LOG.old +++ b/packs/helper-actors/LOG.old @@ -1,8 +1,15 @@ -2023/10/01-11:42:33.332759 7fd28b7fe700 Recovering log #50 -2023/10/01-11:42:33.339786 7fd28b7fe700 Delete type=0 #50 -2023/10/01-11:42:33.339801 7fd28b7fe700 Delete type=3 #48 -2023/10/01-12:06:41.819080 7fd28916a700 Level-0 table #55: started -2023/10/01-12:06:41.819102 7fd28916a700 Level-0 table #55: 0 bytes OK -2023/10/01-12:06:41.829523 7fd28916a700 Delete type=0 #53 -2023/10/01-12:06:41.840082 7fd28916a700 Manual compaction at level-0 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) -2023/10/01-12:06:41.840124 7fd28916a700 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) +2023/11/07-17:50:41.786664 7f4665ffb640 Recovering log #62 +2023/11/07-17:50:41.788546 7f4665ffb640 Delete type=0 #62 +2023/11/07-17:50:41.788559 7f4665ffb640 Delete type=3 #60 +2023/11/07-23:29:14.523160 7f46649f4640 Level-0 table #67: started +2023/11/07-23:29:14.524102 7f46649f4640 Level-0 table #67: 1737 bytes OK +2023/11/07-23:29:14.524964 7f46649f4640 Delete type=0 #65 +2023/11/07-23:29:14.525003 7f46649f4640 Manual compaction at level-0 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) +2023/11/07-23:29:14.525014 7f46649f4640 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at '!actors!U5v4gFHquo0Y1SAq' @ 2 : 1 +2023/11/07-23:29:14.525016 7f46649f4640 Compacting 1@1 + 1@2 files +2023/11/07-23:29:14.526092 7f46649f4640 Generated table #68@1: 1 keys, 1737 bytes +2023/11/07-23:29:14.526097 7f46649f4640 Compacted 1@1 + 1@2 files => 1737 bytes +2023/11/07-23:29:14.526856 7f46649f4640 compacted to: files[ 0 0 1 0 0 0 0 ] +2023/11/07-23:29:14.526872 7f46649f4640 Delete type=2 #5 +2023/11/07-23:29:14.526891 7f46649f4640 Delete type=2 #67 +2023/11/07-23:29:14.541950 7f46649f4640 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 2 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end) diff --git a/packs/helper-actors/MANIFEST-000056 b/packs/helper-actors/MANIFEST-000056 deleted file mode 100644 index ff54f51..0000000 Binary files a/packs/helper-actors/MANIFEST-000056 and /dev/null differ diff --git a/packs/helper-actors/MANIFEST-000069 b/packs/helper-actors/MANIFEST-000069 new file mode 100644 index 0000000..c33b28b Binary files /dev/null and b/packs/helper-actors/MANIFEST-000069 differ diff --git a/packs/helper-macros/CURRENT b/packs/helper-macros/CURRENT index 627283a..d0dd497 100644 --- a/packs/helper-macros/CURRENT +++ b/packs/helper-macros/CURRENT @@ -1 +1 @@ -MANIFEST-000186 +MANIFEST-000199 diff --git a/packs/helper-macros/LOG b/packs/helper-macros/LOG index 16ef171..8a775cc 100644 --- a/packs/helper-macros/LOG +++ b/packs/helper-macros/LOG @@ -1,15 +1,8 @@ -2023/10/01-12:11:47.424454 7fd289ffb700 Recovering log #183 -2023/10/01-12:11:47.447452 7fd289ffb700 Delete type=3 #181 -2023/10/01-12:11:47.447476 7fd289ffb700 Delete type=0 #183 -2023/10/01-20:43:28.125761 7fd28916a700 Level-0 table #189: started -2023/10/01-20:43:28.129385 7fd28916a700 Level-0 table #189: 4766 bytes OK -2023/10/01-20:43:28.132402 7fd28916a700 Delete type=0 #187 -2023/10/01-20:43:28.139282 7fd28916a700 Manual compaction at level-0 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) -2023/10/01-20:43:28.139387 7fd28916a700 Manual compaction at level-1 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at '!macros!wU2mAUnw3RW9qMT8' @ 73 : 1 -2023/10/01-20:43:28.139394 7fd28916a700 Compacting 1@1 + 1@2 files -2023/10/01-20:43:28.141794 7fd28916a700 Generated table #190@1: 24 keys, 5951 bytes -2023/10/01-20:43:28.141803 7fd28916a700 Compacted 1@1 + 1@2 files => 5951 bytes -2023/10/01-20:43:28.144771 7fd28916a700 compacted to: files[ 0 0 1 0 0 0 0 ] -2023/10/01-20:43:28.144875 7fd28916a700 Delete type=2 #185 -2023/10/01-20:43:28.144921 7fd28916a700 Delete type=2 #189 -2023/10/01-20:43:28.151797 7fd28916a700 Manual compaction at level-1 from '!macros!wU2mAUnw3RW9qMT8' @ 73 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) +2023/11/07-23:29:20.340266 7f4665ffb640 Recovering log #197 +2023/11/07-23:29:20.342378 7f4665ffb640 Delete type=0 #197 +2023/11/07-23:29:20.342408 7f4665ffb640 Delete type=3 #195 +2023/11/07-23:29:29.392493 7f46649f4640 Level-0 table #202: started +2023/11/07-23:29:29.392505 7f46649f4640 Level-0 table #202: 0 bytes OK +2023/11/07-23:29:29.393529 7f46649f4640 Delete type=0 #200 +2023/11/07-23:29:29.394661 7f46649f4640 Manual compaction at level-0 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) +2023/11/07-23:29:29.396569 7f46649f4640 Manual compaction at level-1 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) diff --git a/packs/helper-macros/LOG.old b/packs/helper-macros/LOG.old index f825712..0d7870b 100644 --- a/packs/helper-macros/LOG.old +++ b/packs/helper-macros/LOG.old @@ -1,15 +1,8 @@ -2023/10/01-11:42:33.315112 7fd28b7fe700 Recovering log #179 -2023/10/01-11:42:33.322456 7fd28b7fe700 Delete type=3 #177 -2023/10/01-11:42:33.322475 7fd28b7fe700 Delete type=0 #179 -2023/10/01-12:06:41.769629 7fd28916a700 Level-0 table #184: started -2023/10/01-12:06:41.777478 7fd28916a700 Level-0 table #184: 4857 bytes OK -2023/10/01-12:06:41.787785 7fd28916a700 Delete type=0 #182 -2023/10/01-12:06:41.787963 7fd28916a700 Manual compaction at level-0 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) -2023/10/01-12:06:41.788081 7fd28916a700 Manual compaction at level-1 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at '!macros!wU2mAUnw3RW9qMT8' @ 58 : 1 -2023/10/01-12:06:41.788084 7fd28916a700 Compacting 1@1 + 1@2 files -2023/10/01-12:06:41.797036 7fd28916a700 Generated table #185@1: 22 keys, 5730 bytes -2023/10/01-12:06:41.797046 7fd28916a700 Compacted 1@1 + 1@2 files => 5730 bytes -2023/10/01-12:06:41.807269 7fd28916a700 compacted to: files[ 0 0 1 0 0 0 0 ] -2023/10/01-12:06:41.807323 7fd28916a700 Delete type=2 #184 -2023/10/01-12:06:41.807373 7fd28916a700 Delete type=2 #176 -2023/10/01-12:06:41.840022 7fd28916a700 Manual compaction at level-1 from '!macros!wU2mAUnw3RW9qMT8' @ 58 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) +2023/11/07-17:50:41.780718 7f4665ffb640 Recovering log #193 +2023/11/07-17:50:41.782723 7f4665ffb640 Delete type=3 #191 +2023/11/07-17:50:41.782737 7f4665ffb640 Delete type=0 #193 +2023/11/07-23:29:14.517951 7f46649f4640 Level-0 table #198: started +2023/11/07-23:29:14.517966 7f46649f4640 Level-0 table #198: 0 bytes OK +2023/11/07-23:29:14.518928 7f46649f4640 Delete type=0 #196 +2023/11/07-23:29:14.520867 7f46649f4640 Manual compaction at level-0 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) +2023/11/07-23:29:14.524993 7f46649f4640 Manual compaction at level-1 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end) diff --git a/packs/helper-macros/MANIFEST-000186 b/packs/helper-macros/MANIFEST-000186 deleted file mode 100644 index 42f0ed9..0000000 Binary files a/packs/helper-macros/MANIFEST-000186 and /dev/null differ diff --git a/packs/helper-macros/MANIFEST-000199 b/packs/helper-macros/MANIFEST-000199 new file mode 100644 index 0000000..e1dd246 Binary files /dev/null and b/packs/helper-macros/MANIFEST-000199 differ diff --git a/packs/module-docs/000167.ldb b/packs/module-docs/000167.ldb deleted file mode 100644 index 96da6ce..0000000 Binary files a/packs/module-docs/000167.ldb and /dev/null differ diff --git a/packs/module-docs/000196.ldb b/packs/module-docs/000196.ldb new file mode 100644 index 0000000..8fa59a9 Binary files /dev/null and b/packs/module-docs/000196.ldb differ diff --git a/packs/module-docs/CURRENT b/packs/module-docs/CURRENT index cce82a3..edcd2de 100644 --- a/packs/module-docs/CURRENT +++ b/packs/module-docs/CURRENT @@ -1 +1 @@ -MANIFEST-000184 +MANIFEST-000197 diff --git a/packs/module-docs/LOG b/packs/module-docs/LOG index 7e800db..240cfe4 100644 --- a/packs/module-docs/LOG +++ b/packs/module-docs/LOG @@ -1,8 +1,8 @@ -2023/10/01-12:11:47.399453 7fd28affd700 Recovering log #182 -2023/10/01-12:11:47.422711 7fd28affd700 Delete type=3 #180 -2023/10/01-12:11:47.422738 7fd28affd700 Delete type=0 #182 -2023/10/01-20:43:28.122368 7fd28916a700 Level-0 table #187: started -2023/10/01-20:43:28.122497 7fd28916a700 Level-0 table #187: 0 bytes OK -2023/10/01-20:43:28.125721 7fd28916a700 Delete type=0 #185 -2023/10/01-20:43:28.139254 7fd28916a700 Manual compaction at level-0 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) -2023/10/01-20:43:28.139359 7fd28916a700 Manual compaction at level-1 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) +2023/11/07-23:29:20.336710 7f46667fc640 Recovering log #194 +2023/11/07-23:29:20.338673 7f46667fc640 Delete type=0 #194 +2023/11/07-23:29:20.338682 7f46667fc640 Delete type=3 #192 +2023/11/07-23:29:29.390257 7f46649f4640 Level-0 table #200: started +2023/11/07-23:29:29.390274 7f46649f4640 Level-0 table #200: 0 bytes OK +2023/11/07-23:29:29.391163 7f46649f4640 Delete type=0 #198 +2023/11/07-23:29:29.392479 7f46649f4640 Manual compaction at level-0 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) +2023/11/07-23:29:29.393557 7f46649f4640 Manual compaction at level-1 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) diff --git a/packs/module-docs/LOG.old b/packs/module-docs/LOG.old index 9e738e5..0224ebe 100644 --- a/packs/module-docs/LOG.old +++ b/packs/module-docs/LOG.old @@ -1,8 +1,15 @@ -2023/10/01-11:42:33.305447 7fd28affd700 Recovering log #178 -2023/10/01-11:42:33.313480 7fd28affd700 Delete type=3 #176 -2023/10/01-11:42:33.313506 7fd28affd700 Delete type=0 #178 -2023/10/01-12:06:41.759034 7fd28916a700 Level-0 table #183: started -2023/10/01-12:06:41.759058 7fd28916a700 Level-0 table #183: 0 bytes OK -2023/10/01-12:06:41.769582 7fd28916a700 Delete type=0 #181 -2023/10/01-12:06:41.787931 7fd28916a700 Manual compaction at level-0 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) -2023/10/01-12:06:41.788066 7fd28916a700 Manual compaction at level-1 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) +2023/11/07-17:50:41.777838 7f4666ffd640 Recovering log #190 +2023/11/07-17:50:41.779631 7f4666ffd640 Delete type=0 #190 +2023/11/07-17:50:41.779649 7f4666ffd640 Delete type=3 #188 +2023/11/07-23:29:14.515315 7f46649f4640 Level-0 table #195: started +2023/11/07-23:29:14.516677 7f46649f4640 Level-0 table #195: 9634 bytes OK +2023/11/07-23:29:14.517872 7f46649f4640 Delete type=0 #193 +2023/11/07-23:29:14.518953 7f46649f4640 Manual compaction at level-0 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) +2023/11/07-23:29:14.518974 7f46649f4640 Manual compaction at level-1 from '!journal!HbtPlHNFO1L6RVj0' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 98 : 1 +2023/11/07-23:29:14.518976 7f46649f4640 Compacting 1@1 + 1@2 files +2023/11/07-23:29:14.519779 7f46649f4640 Generated table #196@1: 6 keys, 4503 bytes +2023/11/07-23:29:14.519792 7f46649f4640 Compacted 1@1 + 1@2 files => 4503 bytes +2023/11/07-23:29:14.520666 7f46649f4640 compacted to: files[ 0 0 1 0 0 0 0 ] +2023/11/07-23:29:14.520737 7f46649f4640 Delete type=2 #167 +2023/11/07-23:29:14.520824 7f46649f4640 Delete type=2 #195 +2023/11/07-23:29:14.524986 7f46649f4640 Manual compaction at level-1 from '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 98 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.lhULHNp4gz9IjOR3' @ 0 : 0; will stop at (end) diff --git a/packs/module-docs/MANIFEST-000184 b/packs/module-docs/MANIFEST-000184 deleted file mode 100644 index 86f03eb..0000000 Binary files a/packs/module-docs/MANIFEST-000184 and /dev/null differ diff --git a/packs/module-docs/MANIFEST-000197 b/packs/module-docs/MANIFEST-000197 new file mode 100644 index 0000000..4460a83 Binary files /dev/null and b/packs/module-docs/MANIFEST-000197 differ diff --git a/scripts/powerEffects.js b/scripts/powerEffects.js index 7e3b11c..96e4ca9 100644 --- a/scripts/powerEffects.js +++ b/scripts/powerEffects.js @@ -1134,10 +1134,10 @@ class SummonEffect extends PowerEffect { async applyResult () { await this.prepAdditional() + await shim.warpgateSpawn(this.protoDoc, this.spawnMutation, {}, this.spawnOptions) log('protoDoc', this.protoDoc) log('spawnOptions', this.spawnOptions) log('spawnMutation', this.spawnMutation) - await shim.warpgateSpawn(this.protoDoc, this.spawnMutation, {}, this.spawnOptions) } } @@ -1146,10 +1146,6 @@ class SummonAllyEffect extends SummonEffect { return 'Summon Ally' } - get mirrorFolder () { - return `${this.actorFolderBase}/Mirror Selves` - } - async prepMenu () { await super.prepMenu() this.menuData.inputs = this.menuData.inputs.concat([ @@ -1255,44 +1251,44 @@ class SummonAllyEffect extends SummonEffect { if (this.actor.name !== 'Mirror Self') { return } - const actorFolder = shim.getActorFolderByPath(this.mirrorFolder) - const oldActor = actorFolder.contents.find(a => a.name === `Mirror ${this.token.name}`) - if (oldActor) { - await oldActor.delete() - } - const actorDoc = this.token.actor.clone({ - type: 'npc', - name: `Mirror ${this.token.actor.name}`, - folder: actorFolder.id, - 'system.wildcard': false, - 'system.fatigue.value': 0, - 'system.wounds.value': 0, - 'system.wounds.max': 0, - 'system.bennies.max': 0, - 'system.bennies.value': 0, - 'prototypeToken.actorLink': false, - 'prototypeToken.name': `Mirror ${this.token.name}`, - 'prototypeToken.texture.scaleX': this.token.document.texture.scaleX * -1 + const mirrorActor = this.token.actor + this.icon = mirrorActor.prototypeToken.texture.src + this.spawnMutation.actor.system = mirrorActor.system.clone({ + wildcard: false, + 'fatigue.value': 0, + 'wounds.value': 0, + 'wounds.max': 0, + 'bennies.max': 0, + 'bennies.value': 0 }) - const mirrorActor = this.actor - this.actor = await shim.Actor.create(actorDoc) - this.actorId = this.actor.id - this.icon = this.actor.prototypeToken.texture.src - this.protoDoc = await this.actor.getTokenDocument() - this.spawnOptions.crosshairs.icon = this.icon - for (const mirrorItem of mirrorActor.items) { - this.spawnMutation.embedded.Item[mirrorItem.name] = - await mirrorActor.getEmbeddedDocument('Item', mirrorItem.id) + this.spawnMutation.actor.name = `Mirror ${mirrorActor.name}` + this.spawnMutation.actor.img = mirrorActor.img + this.spawnMutation.token.name = `Mirror ${this.token.name}` + this.spawnMutation.token.texture = { + src: this.token.document.texture.src, + scaleX: this.token.document.texture.scaleX * -1, + scaleY: this.token.document.texture.scaleY } - this.spawnMutation.embedded.Item['Summon Ally'] = CONST.WARPGATE.DELETE + this.spawnOptions.crosshairs.icon = this.icon const effectChanges = [] - for (const item of this.token.actor.items.filter(i => i.type === 'skill')) { - effectChanges.push({ - key: `@Skill{${item.name}}[system.die.sides]`, - mode: CONST.FOUNDRY.ACTIVE_EFFECT_MODES.ADD, - value: '-2', - priority: 0 - }) + for (const mirrorItem of mirrorActor.items) { + if (mirrorItem.type === 'power' && + (mirrorItem.system?.swid === 'summon-ally' || mirrorItem.name === 'Summon Ally')) { + continue + } + if (['weapon', 'armor', 'consumable', 'gear'].includes(mirrorItem.type)) { + continue + } + this.spawnMutation.embedded.Item[mirrorItem.name] = await mirrorActor.getEmbeddedDocument( + 'Item', mirrorItem.id) + if (mirrorItem.type === 'skill') { + effectChanges.push({ + key: `@Skill{${mirrorItem.name}}[system.die.sides]`, + mode: CONST.FOUNDRY.ACTIVE_EFFECT_MODES.ADD, + value: '-2', + priority: 0 + }) + } } this.spawnMutation.embedded.ActiveEffect['Mirror Self'] = shim.createEffectDocument(this.ICON, 'Mirror Self', @@ -1332,36 +1328,51 @@ class SummonUndeadEffect extends SummonEffect { const PowerClasses = { 'arcane protection': ArcaneProtectionEffect, + 'arcane-protection': ArcaneProtectionEffect, blast: BlastEffect, blind: BlindEffect, bolt: BoltEffect, 'boost/lower trait': BoostLowerTraitEffect, + 'boostlower-trait': BoostLowerTraitEffect, 'boost trait': BoostLowerTraitEffect, + 'boost-trait': BoostLowerTraitEffect, burrow: BurrowEffect, burst: BurstEffect, 'conceal arcana': DetectConcealArcanaEffect, + 'conceal-arcana': DetectConcealArcanaEffect, confusion: ConfusionEffect, darksight: DarksightEffect, deflection: DeflectionEffect, 'detect arcana': DetectConcealArcanaEffect, + 'detect-arcana': DetectConcealArcanaEffect, 'detect/conceal aracana': DetectConcealArcanaEffect, + 'detectconceal-aracana': DetectConcealArcanaEffect, disguise: DisguiseEffect, entangle: EntangleEffect, intangibility: IntangibilityEffect, invisibility: InvisibilityEffect, 'lower trait': BoostLowerTraitEffect, + 'lower-trait': BoostLowerTraitEffect, protection: ProtectionEffect, 'shape change': ShapeChangeEffect, + 'shape-change': ShapeChangeEffect, sloth: SlothSpeedEffect, 'sloth/speed': SlothSpeedEffect, + slothspeed: SlothSpeedEffect, smite: SmiteEffect, speed: SlothSpeedEffect, 'summon ally': SummonAllyEffect, + 'summon-ally': SummonAllyEffect, 'summon animal': SummonAnimalEffect, + 'summon-animal': SummonAnimalEffect, 'summon monster': SummonMonsterEffect, + 'summon-monster': SummonMonsterEffect, "summon nature's ally": SummonNaturesAllyEffect, + 'summon-natures-ally': SummonNaturesAllyEffect, 'summon planar ally': SummonPlanarAllyEffect, + 'summon-planar-ally': SummonPlanarAllyEffect, 'summon undead': SummonUndeadEffect, + 'summon-undead': SummonUndeadEffect, zombie: SummonUndeadEffect } @@ -1374,7 +1385,7 @@ export async function powerEffects (options = {}) { const targets = 'targets' in options ? Array.from(options.targets) : [] const item = 'item' in options ? options.item : null - const name = 'name' in options ? options.name : (item !== null ? item.name : null) + const name = options?.name || item?.system?.swid || item?.name || null const lcName = name.toLowerCase() for (const name in PowerClasses) {