Merge branch 'develop' into shape-change

This commit is contained in:
Mike Bloy 2023-09-22 11:33:07 -05:00
commit 46ddf41cc0
32 changed files with 158 additions and 64 deletions

View File

@ -27,17 +27,6 @@
"ASSISTANT": "OWNER" "ASSISTANT": "OWNER"
} }
}, },
{
"name": "effect-macros",
"label": "SWADE MB Effect Macros",
"path": "packs/effect-macros",
"type": "Macro",
"system": "swade",
"ownership": {
"PLAYER": "OBSERVER",
"ASSISTANT": "OWNER"
}
},
{ {
"name": "helper-macros", "name": "helper-macros",
"label": "SWADE MB Helper Macros", "label": "SWADE MB Helper Macros",
@ -59,6 +48,17 @@
"PLAYER": "OBSERVER", "PLAYER": "OBSERVER",
"ASSISTANT": "OWNER" "ASSISTANT": "OWNER"
} }
},
{
"name": "helper-actors",
"label": "SWADE MB Helper Actors",
"path": "packs/helper-actors",
"type": "Actor",
"ownership": {
"PLAYER": "OBSERVER",
"ASSISTANT": "OWNER"
},
"system": "swade"
} }
], ],
"packFolders": [ "packFolders": [
@ -69,8 +69,8 @@
"folders": [], "folders": [],
"packs": [ "packs": [
"module-docs", "module-docs",
"effect-macros",
"helper-macros", "helper-macros",
"helper-actors",
"Common Actions" "Common Actions"
] ]
} }
@ -104,7 +104,8 @@
}, },
{ {
"id": "torch", "id": "torch",
"type": "module" "type": "module",
"compatibility": {}
} }
] ]
}, },

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
MANIFEST-000103 MANIFEST-000028

View File

@ -1,8 +1,8 @@
2023/09/10-23:06:22.613628 7febd9214700 Recovering log #102 2023/09/20-18:33:11.649325 7f35b1afa640 Recovering log #26
2023/09/10-23:06:22.626850 7febd9214700 Delete type=0 #102 2023/09/20-18:33:11.651970 7f35b1afa640 Delete type=0 #26
2023/09/10-23:06:22.626874 7febd9214700 Delete type=3 #101 2023/09/20-18:33:11.651984 7f35b1afa640 Delete type=3 #24
2023/09/10-23:07:07.251557 7febcb05d700 Level-0 table #106: started 2023/09/20-18:35:02.787239 7f35aac16640 Level-0 table #31: started
2023/09/10-23:07:07.251576 7febcb05d700 Level-0 table #106: 0 bytes OK 2023/09/20-18:35:02.787256 7f35aac16640 Level-0 table #31: 0 bytes OK
2023/09/10-23:07:07.254523 7febcb05d700 Delete type=0 #104 2023/09/20-18:35:02.788228 7f35aac16640 Delete type=0 #29
2023/09/10-23:07:07.257493 7febcb05d700 Manual compaction at level-0 from '!items!2jAOeH9QKQqjugAt' @ 72057594037927935 : 1 .. '!items!nQHHXfEN7Ey2iWIM' @ 0 : 0; will stop at (end) 2023/09/20-18:35:02.790809 7f35aac16640 Manual compaction at level-0 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end)
2023/09/10-23:07:07.257579 7febcb05d700 Manual compaction at level-1 from '!items!2jAOeH9QKQqjugAt' @ 72057594037927935 : 1 .. '!items!nQHHXfEN7Ey2iWIM' @ 0 : 0; will stop at (end) 2023/09/20-18:35:02.790825 7f35aac16640 Manual compaction at level-1 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end)

View File

@ -1,3 +1,8 @@
2023/09/10-23:05:53.772370 7f36d57fa700 Recovering log #99 2023/09/20-18:32:47.289541 7f35abfff640 Recovering log #22
2023/09/10-23:05:53.784345 7f36d57fa700 Delete type=0 #99 2023/09/20-18:32:47.292747 7f35abfff640 Delete type=3 #20
2023/09/10-23:05:53.784375 7f36d57fa700 Delete type=3 #97 2023/09/20-18:32:47.292767 7f35abfff640 Delete type=0 #22
2023/09/20-18:32:55.178475 7f35aac16640 Level-0 table #27: started
2023/09/20-18:32:55.178505 7f35aac16640 Level-0 table #27: 0 bytes OK
2023/09/20-18:32:55.179492 7f35aac16640 Delete type=0 #25
2023/09/20-18:32:55.179677 7f35aac16640 Manual compaction at level-0 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end)
2023/09/20-18:32:55.181986 7f35aac16640 Manual compaction at level-1 from '!folders!0nDRFmMBs5DBJU9M' @ 72057594037927935 : 1 .. '!items!xA7qKMmugJv7z6j1' @ 0 : 0; will stop at (end)

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +0,0 @@
MANIFEST-000104

View File

@ -1,8 +0,0 @@
2023/09/10-23:06:22.599116 7febd9214700 Recovering log #103
2023/09/10-23:06:22.611701 7febd9214700 Delete type=0 #103
2023/09/10-23:06:22.611728 7febd9214700 Delete type=3 #102
2023/09/10-23:07:07.248454 7febcb05d700 Level-0 table #107: started
2023/09/10-23:07:07.248477 7febcb05d700 Level-0 table #107: 0 bytes OK
2023/09/10-23:07:07.251508 7febcb05d700 Delete type=0 #105
2023/09/10-23:07:07.257465 7febcb05d700 Manual compaction at level-0 from '!folders!xeSN3oIIO3p9MUtF' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end)
2023/09/10-23:07:07.257570 7febcb05d700 Manual compaction at level-1 from '!folders!xeSN3oIIO3p9MUtF' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end)

View File

@ -1,3 +0,0 @@
2023/09/10-23:05:53.762234 7f36d67fc700 Recovering log #100
2023/09/10-23:05:53.770717 7f36d67fc700 Delete type=0 #100
2023/09/10-23:05:53.770733 7f36d67fc700 Delete type=3 #98

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000014

8
packs/helper-actors/LOG Normal file
View File

@ -0,0 +1,8 @@
2023/09/20-18:33:11.652467 7f35b1afa640 Recovering log #12
2023/09/20-18:33:11.655548 7f35b1afa640 Delete type=3 #10
2023/09/20-18:33:11.655561 7f35b1afa640 Delete type=0 #12
2023/09/20-18:35:02.789988 7f35aac16640 Level-0 table #17: started
2023/09/20-18:35:02.789998 7f35aac16640 Level-0 table #17: 0 bytes OK
2023/09/20-18:35:02.790789 7f35aac16640 Delete type=0 #15
2023/09/20-18:35:02.791851 7f35aac16640 Manual compaction at level-0 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end)
2023/09/20-18:35:02.793928 7f35aac16640 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,8 @@
2023/09/20-18:32:47.293080 7f35abfff640 Recovering log #8
2023/09/20-18:32:47.295939 7f35abfff640 Delete type=3 #6
2023/09/20-18:32:47.295950 7f35abfff640 Delete type=0 #8
2023/09/20-18:32:55.179689 7f35aac16640 Level-0 table #13: started
2023/09/20-18:32:55.179702 7f35aac16640 Level-0 table #13: 0 bytes OK
2023/09/20-18:32:55.180872 7f35aac16640 Delete type=0 #11
2023/09/20-18:32:55.182876 7f35aac16640 Manual compaction at level-0 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end)
2023/09/20-18:32:55.183765 7f35aac16640 Manual compaction at level-1 from '!actors!U5v4gFHquo0Y1SAq' @ 72057594037927935 : 1 .. '!actors!U5v4gFHquo0Y1SAq' @ 0 : 0; will stop at (end)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
MANIFEST-000102 MANIFEST-000141

View File

@ -1,8 +1,8 @@
2023/09/10-23:06:22.600245 7febcbfff700 Recovering log #101 2023/09/20-18:33:11.648902 7f35b12f9640 Recovering log #139
2023/09/10-23:06:22.613671 7febcbfff700 Delete type=3 #100 2023/09/20-18:33:11.651508 7f35b12f9640 Delete type=3 #137
2023/09/10-23:06:22.613760 7febcbfff700 Delete type=0 #101 2023/09/20-18:33:11.651529 7f35b12f9640 Delete type=0 #139
2023/09/10-23:07:07.244680 7febcb05d700 Level-0 table #105: started 2023/09/20-18:35:02.786339 7f35aac16640 Level-0 table #144: started
2023/09/10-23:07:07.244692 7febcb05d700 Level-0 table #105: 0 bytes OK 2023/09/20-18:35:02.786350 7f35aac16640 Level-0 table #144: 0 bytes OK
2023/09/10-23:07:07.248349 7febcb05d700 Delete type=0 #103 2023/09/20-18:35:02.787177 7f35aac16640 Delete type=0 #142
2023/09/10-23:07:07.254566 7febcb05d700 Manual compaction at level-0 from '!macros!AjuA11hQ48UJNwlH' @ 72057594037927935 : 1 .. '!macros!QMnx9cuyw81kRS2o' @ 0 : 0; will stop at (end) 2023/09/20-18:35:02.787211 7f35aac16640 Manual compaction at level-0 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end)
2023/09/10-23:07:07.257519 7febcb05d700 Manual compaction at level-1 from '!macros!AjuA11hQ48UJNwlH' @ 72057594037927935 : 1 .. '!macros!QMnx9cuyw81kRS2o' @ 0 : 0; will stop at (end) 2023/09/20-18:35:02.787227 7f35aac16640 Manual compaction at level-1 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end)

View File

@ -1,3 +1,8 @@
2023/09/10-23:05:53.762243 7f36d57fa700 Recovering log #98 2023/09/20-18:32:47.289270 7f35b12f9640 Recovering log #135
2023/09/10-23:05:53.770714 7f36d57fa700 Delete type=3 #96 2023/09/20-18:32:47.292331 7f35b12f9640 Delete type=0 #135
2023/09/10-23:05:53.770736 7f36d57fa700 Delete type=0 #98 2023/09/20-18:32:47.292340 7f35b12f9640 Delete type=3 #133
2023/09/20-18:32:55.177108 7f35aac16640 Level-0 table #140: started
2023/09/20-18:32:55.177118 7f35aac16640 Level-0 table #140: 0 bytes OK
2023/09/20-18:32:55.178381 7f35aac16640 Delete type=0 #138
2023/09/20-18:32:55.179534 7f35aac16640 Manual compaction at level-0 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end)
2023/09/20-18:32:55.179687 7f35aac16640 Manual compaction at level-1 from '!folders!hIbrWxg1nDutCSwt' @ 72057594037927935 : 1 .. '!macros!wU2mAUnw3RW9qMT8' @ 0 : 0; will stop at (end)

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
MANIFEST-000103 MANIFEST-000141

View File

@ -1,8 +1,8 @@
2023/09/10-23:06:22.585546 7febd9214700 Recovering log #102 2023/09/20-18:33:11.644631 7f35b12f9640 Recovering log #139
2023/09/10-23:06:22.598553 7febd9214700 Delete type=0 #102 2023/09/20-18:33:11.647218 7f35b12f9640 Delete type=3 #137
2023/09/10-23:06:22.598574 7febd9214700 Delete type=3 #101 2023/09/20-18:33:11.647235 7f35b12f9640 Delete type=0 #139
2023/09/10-23:07:07.241420 7febcb05d700 Level-0 table #106: started 2023/09/20-18:35:02.785518 7f35aac16640 Level-0 table #144: started
2023/09/10-23:07:07.241437 7febcb05d700 Level-0 table #106: 0 bytes OK 2023/09/20-18:35:02.785531 7f35aac16640 Level-0 table #144: 0 bytes OK
2023/09/10-23:07:07.244507 7febcb05d700 Delete type=0 #104 2023/09/20-18:35:02.786320 7f35aac16640 Delete type=0 #142
2023/09/10-23:07:07.244613 7febcb05d700 Manual compaction at level-0 from '!journal!Mw1g2Fx5dp4SoqVP' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.i31qmsZnIGhjvA2K' @ 0 : 0; will stop at (end) 2023/09/20-18:35:02.787206 7f35aac16640 Manual compaction at level-0 from '!journal!Mw1g2Fx5dp4SoqVP' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.i31qmsZnIGhjvA2K' @ 0 : 0; will stop at (end)
2023/09/10-23:07:07.248425 7febcb05d700 Manual compaction at level-1 from '!journal!Mw1g2Fx5dp4SoqVP' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.i31qmsZnIGhjvA2K' @ 0 : 0; will stop at (end) 2023/09/20-18:35:02.787222 7f35aac16640 Manual compaction at level-1 from '!journal!Mw1g2Fx5dp4SoqVP' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.i31qmsZnIGhjvA2K' @ 0 : 0; will stop at (end)

View File

@ -1,3 +1,8 @@
2023/09/10-23:05:53.751263 7f36d57fa700 Recovering log #99 2023/09/20-18:32:47.285951 7f35abfff640 Recovering log #135
2023/09/10-23:05:53.759524 7f36d57fa700 Delete type=0 #99 2023/09/20-18:32:47.288584 7f35abfff640 Delete type=0 #135
2023/09/10-23:05:53.759553 7f36d57fa700 Delete type=3 #97 2023/09/20-18:32:47.288602 7f35abfff640 Delete type=3 #133
2023/09/20-18:32:55.176080 7f35aac16640 Level-0 table #140: started
2023/09/20-18:32:55.176086 7f35aac16640 Level-0 table #140: 0 bytes OK
2023/09/20-18:32:55.177093 7f35aac16640 Delete type=0 #138
2023/09/20-18:32:55.179521 7f35aac16640 Manual compaction at level-0 from '!journal!Mw1g2Fx5dp4SoqVP' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.i31qmsZnIGhjvA2K' @ 0 : 0; will stop at (end)
2023/09/20-18:32:55.179551 7f35aac16640 Manual compaction at level-1 from '!journal!Mw1g2Fx5dp4SoqVP' @ 72057594037927935 : 1 .. '!journal.pages!Mw1g2Fx5dp4SoqVP.i31qmsZnIGhjvA2K' @ 0 : 0; will stop at (end)

View File

@ -141,6 +141,63 @@ class TargetedPowerEffect extends PowerEffect {
} }
} }
class LingeringDamagePowerEffect extends TargetedPowerEffect {
get baseDurationRounds () {
return 1
}
async prepMenu () {
this.menuData.inputs.splice(this.menuData.inputs.length - 1, 0, {
type: 'checkbox', label: 'Lingering Damage (+2)'
})
}
globalModifierEffects () {
super.globalModifierEffects()
this.inputIndex += 1
if (this.inputs[7]) { // lingering damage
const doc = shim.createEffectDocument(
'icons/magic/death/skull-poison-green.webp',
`Lingering Damage (${this.name})`,
1
)
doc.flags.swade.expiration = CONST.SWADE.STATUS_EFFECT_EXPIRATION.StartOfTurnPrompt
this.effectDocs.push(doc)
}
}
}
class ArcaneProtectionEffect extends TargetedPowerEffect {
get name () {
return 'Arcane Protection'
}
get baseDurationRounds () {
return 5
}
async prepMenu () {
this.menuData.inputs.push(
{ type: 'checkbox', label: 'Greater', options: false })
}
async prepResult () {
const greater = !!this.inputs[this.inputIndex]
const raise = this.buttons === 'raise'
const amount = (raise ? -4 : -2) + (greater ? -2 : 0)
const icon = 'icons/magic/defensive/shield-barrier-flaming-pentagon-blue.webp'
const name = `${greater ? 'Greater ' : ''}Arcane Protection (${raise ? 'major, ' : ''}${amount})`
this.effectDocs.push(
shim.createEffectDocument(icon, name, this.durationRounds, []))
}
}
class BlastEffect extends LingeringDamagePowerEffect {
get name () {
return 'Blast'
}
}
class BlindEffect extends TargetedPowerEffect { class BlindEffect extends TargetedPowerEffect {
async prepMenu (token, targets) { async prepMenu (token, targets) {
this.menuData.inputs.push({ this.menuData.inputs.push({
@ -184,6 +241,12 @@ class BlindEffect extends TargetedPowerEffect {
} }
} }
class BoltEffect extends LingeringDamagePowerEffect {
get name () {
return 'Bolt'
}
}
class BoostLowerTraitEffect extends TargetedPowerEffect { class BoostLowerTraitEffect extends TargetedPowerEffect {
get name () { get name () {
return 'Boost/Lower Trait' return 'Boost/Lower Trait'
@ -279,6 +342,12 @@ class BoostLowerTraitEffect extends TargetedPowerEffect {
} }
} }
class BurstEffect extends LingeringDamagePowerEffect {
get name () {
return 'Burst'
}
}
class ConfusionEffect extends TargetedPowerEffect { class ConfusionEffect extends TargetedPowerEffect {
get name () { get name () {
return 'Confusion' return 'Confusion'
@ -997,9 +1066,13 @@ class SummonUndeadEffect extends SummonEffect {
} }
const PowerClasses = { const PowerClasses = {
'arcane protection': ArcaneProtectionEffect,
blast: BlastEffect,
blind: BlindEffect, blind: BlindEffect,
bolt: BoltEffect,
'boost/lower trait': BoostLowerTraitEffect, 'boost/lower trait': BoostLowerTraitEffect,
'boost trait': BoostLowerTraitEffect, 'boost trait': BoostLowerTraitEffect,
burst: BurstEffect,
confusion: ConfusionEffect, confusion: ConfusionEffect,
deflection: DeflectionEffect, deflection: DeflectionEffect,
entangle: EntangleEffect, entangle: EntangleEffect,