diff --git a/modules/dark-stars-actor-sheet.js b/modules/dark-stars-actor-sheet.js index bcb292f..0638665 100644 --- a/modules/dark-stars-actor-sheet.js +++ b/modules/dark-stars-actor-sheet.js @@ -54,7 +54,7 @@ export class DarkStarsActorSheet extends ActorSheet { subActors: foundry.utils.duplicate(this.actor.getSubActors()), encCapacity: this.actor.getEncumbranceCapacity(), conditions: this.actor.getConditions(), - tasks: this.actor.getCumulativeTasks(), + extendedTests: this.actor.getExtendedTests(), config: game.system.darkstars.config, description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, {async: true}), @@ -151,12 +151,17 @@ export class DarkStarsActorSheet extends ActorSheet { const attrKey = $(event.currentTarget).data("attr-key") this.actor.rollAttribute(attrKey) }) - html.find('.start-cumulative-task').click((event) => { + html.find('.start-extended-test').click((event) => { const li = $(event.currentTarget).parents(".item") const skillId = li.data("item-id") this.actor.rollSkill(skillId, true) }) - + html.find('.roll-extended-test').click((event) => { + const li = $(event.currentTarget).parents(".item") + const testId = li.data("item-id") + this.actor.continueExtendedTest(testId) + }) + html.find('.roll-weapon').click((event) => { const li = $(event.currentTarget).parents(".item"); const skillId = li.data("item-id") diff --git a/modules/dark-stars-actor.js b/modules/dark-stars-actor.js index ed5b2cc..2cbb0f2 100644 --- a/modules/dark-stars-actor.js +++ b/modules/dark-stars-actor.js @@ -138,8 +138,8 @@ export class DarkStarsActor extends Actor { DarkStarsUtility.sortArrayObjectsByName(comp) return comp; } - getCumulativeTasks() { - let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'cumulativetask') || []); + getExtendedTests() { + let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'extendedtest') || []); DarkStarsUtility.sortArrayObjectsByName(comp) return comp; } @@ -266,7 +266,7 @@ export class DarkStarsActor extends Actor { /* -------------------------------------------- */ async equipItem(itemId) { let item = this.items.find(item => item.id == itemId) - if (item && item.system) { + if (item?.system) { if (item.type == "armor") { let armor = this.items.find(item => item.id != itemId && item.type == "armor" && item.system.equipped) if (armor) { @@ -634,16 +634,44 @@ export class DarkStarsActor extends Actor { rollData.title = "Attribute " + rollData.attr.label this.startRoll(rollData) } + /* -------------------------------------------- */ + continueExtendedTest(testId) { + let test = this.items.get(testId) + if (test) { + let skill = this.items.find(it => it.type == "skill" && it.name.toLowerCase() == test.system.skill.toLowerCase()) + if (skill) { + skill = foundry.utils.duplicate(skill) + this.updateSkill(skill) + let rollData = this.getCommonRollData() + rollData.mode = "extendedtest" + rollData.isExtended = true + rollData.extendedTest = test + rollData.title = "Extended test " + skill.name + rollData.skill = skill + rollData.img = skill.img + rollData.taskId = test.id + if (rollData.target) { + ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.") + return + } + this.startRoll(rollData) + } else { + console.log("Unable to find the relevant skill for extended test " + test.system.skill) + } + } else { + console.log("Unable to find the extended test") + } + } /* -------------------------------------------- */ - async rollSkill(skillId, isCumulative = false, taskId = undefined) { + async rollSkill(skillId, isExtended = false, taskId = undefined) { let skill = this.items.get(skillId) if (skill) { skill = foundry.utils.duplicate(skill) this.updateSkill(skill) let rollData = this.getCommonRollData() rollData.mode = "skill" - rollData.isCumulative = isCumulative + rollData.isExtended = isExtended rollData.title = "Skill " + skill.name rollData.skill = skill rollData.img = skill.img @@ -651,15 +679,15 @@ export class DarkStarsActor extends Actor { ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.") return } - if (isCumulative) { - rollData.title = "Cumulative Task " + skill.name + if (isExtended) { + rollData.title = "Extended Test " + skill.name if (!taskId) { - let cumulativeTask = await this.createEmbeddedDocuments("Item", [{name: "Cumulative task " + skill.name, type: "cumulativetask", + let extendedTest = await this.createEmbeddedDocuments("Item", [{name: "Extended test " + skill.name, type: "extendedtest", 'system.skill': skill.name}]) //console.log("Task", cumulativeTask) - rollData.taskId = cumulativeTask[0].id + rollData.taskId = extendedTest[0].id }else { - rollData.taskId = cumulativeTask[0].id + rollData.taskId = extendedTest[0].id } } this.startRoll(rollData) diff --git a/packs/aldebaran/000186.log b/packs/aldebaran/000210.log similarity index 100% rename from packs/aldebaran/000186.log rename to packs/aldebaran/000210.log diff --git a/packs/aldebaran/CURRENT b/packs/aldebaran/CURRENT index cce82a3..704e06e 100644 --- a/packs/aldebaran/CURRENT +++ b/packs/aldebaran/CURRENT @@ -1 +1 @@ -MANIFEST-000184 +MANIFEST-000208 diff --git a/packs/aldebaran/LOG b/packs/aldebaran/LOG index ed56bca..16ec393 100644 --- a/packs/aldebaran/LOG +++ b/packs/aldebaran/LOG @@ -1,7 +1,7 @@ -2024/06/09-22:14:13.855616 7f04234006c0 Recovering log #182 -2024/06/09-22:14:13.912791 7f04234006c0 Delete type=3 #180 -2024/06/09-22:14:13.912941 7f04234006c0 Delete type=0 #182 -2024/06/10-09:41:28.708545 7f041be006c0 Level-0 table #187: started -2024/06/10-09:41:28.708577 7f041be006c0 Level-0 table #187: 0 bytes OK -2024/06/10-09:41:28.715216 7f041be006c0 Delete type=0 #185 -2024/06/10-09:41:28.728576 7f041be006c0 Manual compaction at level-0 from '!folders!MA6uFJMVebGeayIk' @ 72057594037927935 : 1 .. '!items!zhjdppKgrON7wJn7' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.413261 7f3f0d6006c0 Recovering log #206 +2024/06/12-11:13:40.424230 7f3f0d6006c0 Delete type=3 #204 +2024/06/12-11:13:40.424287 7f3f0d6006c0 Delete type=0 #206 +2024/06/12-11:16:23.489560 7f3f060006c0 Level-0 table #211: started +2024/06/12-11:16:23.489605 7f3f060006c0 Level-0 table #211: 0 bytes OK +2024/06/12-11:16:23.520840 7f3f060006c0 Delete type=0 #209 +2024/06/12-11:16:23.590686 7f3f060006c0 Manual compaction at level-0 from '!folders!MA6uFJMVebGeayIk' @ 72057594037927935 : 1 .. '!items!zhjdppKgrON7wJn7' @ 0 : 0; will stop at (end) diff --git a/packs/aldebaran/LOG.old b/packs/aldebaran/LOG.old index c03e415..efbf698 100644 --- a/packs/aldebaran/LOG.old +++ b/packs/aldebaran/LOG.old @@ -1,7 +1,7 @@ -2024/06/09-15:12:48.633006 7f0422a006c0 Recovering log #178 -2024/06/09-15:12:48.642816 7f0422a006c0 Delete type=3 #176 -2024/06/09-15:12:48.642870 7f0422a006c0 Delete type=0 #178 -2024/06/09-22:14:10.275844 7f041be006c0 Level-0 table #183: started -2024/06/09-22:14:10.275910 7f041be006c0 Level-0 table #183: 0 bytes OK -2024/06/09-22:14:10.305783 7f041be006c0 Delete type=0 #181 -2024/06/09-22:14:10.338771 7f041be006c0 Manual compaction at level-0 from '!folders!MA6uFJMVebGeayIk' @ 72057594037927935 : 1 .. '!items!zhjdppKgrON7wJn7' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.247740 7f3f0ea006c0 Recovering log #202 +2024/06/12-11:13:16.258091 7f3f0ea006c0 Delete type=3 #200 +2024/06/12-11:13:16.258153 7f3f0ea006c0 Delete type=0 #202 +2024/06/12-11:13:34.719686 7f3f060006c0 Level-0 table #207: started +2024/06/12-11:13:34.719708 7f3f060006c0 Level-0 table #207: 0 bytes OK +2024/06/12-11:13:34.726803 7f3f060006c0 Delete type=0 #205 +2024/06/12-11:13:34.733250 7f3f060006c0 Manual compaction at level-0 from '!folders!MA6uFJMVebGeayIk' @ 72057594037927935 : 1 .. '!items!zhjdppKgrON7wJn7' @ 0 : 0; will stop at (end) diff --git a/packs/aldebaran/MANIFEST-000184 b/packs/aldebaran/MANIFEST-000208 similarity index 72% rename from packs/aldebaran/MANIFEST-000184 rename to packs/aldebaran/MANIFEST-000208 index f04d172..78d26c2 100644 Binary files a/packs/aldebaran/MANIFEST-000184 and b/packs/aldebaran/MANIFEST-000208 differ diff --git a/packs/beyondtheblacksea/000179.log b/packs/beyondtheblacksea/000203.log similarity index 100% rename from packs/beyondtheblacksea/000179.log rename to packs/beyondtheblacksea/000203.log diff --git a/packs/beyondtheblacksea/CURRENT b/packs/beyondtheblacksea/CURRENT index 0e27482..6d0c8e6 100644 --- a/packs/beyondtheblacksea/CURRENT +++ b/packs/beyondtheblacksea/CURRENT @@ -1 +1 @@ -MANIFEST-000177 +MANIFEST-000201 diff --git a/packs/beyondtheblacksea/LOG b/packs/beyondtheblacksea/LOG index 9c42b87..b5ba52e 100644 --- a/packs/beyondtheblacksea/LOG +++ b/packs/beyondtheblacksea/LOG @@ -1,7 +1,7 @@ -2024/06/09-22:14:13.916877 7f04220006c0 Recovering log #175 -2024/06/09-22:14:13.976920 7f04220006c0 Delete type=3 #173 -2024/06/09-22:14:13.977065 7f04220006c0 Delete type=0 #175 -2024/06/10-09:41:28.721432 7f041be006c0 Level-0 table #180: started -2024/06/10-09:41:28.721455 7f041be006c0 Level-0 table #180: 0 bytes OK -2024/06/10-09:41:28.728421 7f041be006c0 Delete type=0 #178 -2024/06/10-09:41:28.728621 7f041be006c0 Manual compaction at level-0 from '!folders!47aGmBuk1mHtbFFU' @ 72057594037927935 : 1 .. '!items!zwMpjsE84sk26eej' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.426654 7f3f0ea006c0 Recovering log #199 +2024/06/12-11:13:40.437435 7f3f0ea006c0 Delete type=3 #197 +2024/06/12-11:13:40.437506 7f3f0ea006c0 Delete type=0 #199 +2024/06/12-11:16:23.521086 7f3f060006c0 Level-0 table #204: started +2024/06/12-11:16:23.521151 7f3f060006c0 Level-0 table #204: 0 bytes OK +2024/06/12-11:16:23.553911 7f3f060006c0 Delete type=0 #202 +2024/06/12-11:16:23.590700 7f3f060006c0 Manual compaction at level-0 from '!folders!47aGmBuk1mHtbFFU' @ 72057594037927935 : 1 .. '!items!zwMpjsE84sk26eej' @ 0 : 0; will stop at (end) diff --git a/packs/beyondtheblacksea/LOG.old b/packs/beyondtheblacksea/LOG.old index f346ab1..53f87bb 100644 --- a/packs/beyondtheblacksea/LOG.old +++ b/packs/beyondtheblacksea/LOG.old @@ -1,7 +1,7 @@ -2024/06/09-15:12:48.646030 7f04220006c0 Recovering log #171 -2024/06/09-15:12:48.657289 7f04220006c0 Delete type=3 #169 -2024/06/09-15:12:48.657351 7f04220006c0 Delete type=0 #171 -2024/06/09-22:14:10.305922 7f041be006c0 Level-0 table #176: started -2024/06/09-22:14:10.305944 7f041be006c0 Level-0 table #176: 0 bytes OK -2024/06/09-22:14:10.338591 7f041be006c0 Delete type=0 #174 -2024/06/09-22:14:10.376968 7f041be006c0 Manual compaction at level-0 from '!folders!47aGmBuk1mHtbFFU' @ 72057594037927935 : 1 .. '!items!zwMpjsE84sk26eej' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.262812 7f3f0d6006c0 Recovering log #195 +2024/06/12-11:13:16.272606 7f3f0d6006c0 Delete type=3 #193 +2024/06/12-11:13:16.272662 7f3f0d6006c0 Delete type=0 #195 +2024/06/12-11:13:34.727044 7f3f060006c0 Level-0 table #200: started +2024/06/12-11:13:34.727098 7f3f060006c0 Level-0 table #200: 0 bytes OK +2024/06/12-11:13:34.733076 7f3f060006c0 Delete type=0 #198 +2024/06/12-11:13:34.733265 7f3f060006c0 Manual compaction at level-0 from '!folders!47aGmBuk1mHtbFFU' @ 72057594037927935 : 1 .. '!items!zwMpjsE84sk26eej' @ 0 : 0; will stop at (end) diff --git a/packs/beyondtheblacksea/MANIFEST-000177 b/packs/beyondtheblacksea/MANIFEST-000201 similarity index 72% rename from packs/beyondtheblacksea/MANIFEST-000177 rename to packs/beyondtheblacksea/MANIFEST-000201 index 77cf669..81f909f 100644 Binary files a/packs/beyondtheblacksea/MANIFEST-000177 and b/packs/beyondtheblacksea/MANIFEST-000201 differ diff --git a/packs/conditions/000232.log b/packs/conditions/000256.log similarity index 100% rename from packs/conditions/000232.log rename to packs/conditions/000256.log diff --git a/packs/conditions/CURRENT b/packs/conditions/CURRENT index 7a8f695..13813b8 100644 --- a/packs/conditions/CURRENT +++ b/packs/conditions/CURRENT @@ -1 +1 @@ -MANIFEST-000230 +MANIFEST-000254 diff --git a/packs/conditions/LOG b/packs/conditions/LOG index 1d739dc..7b0b0ef 100644 --- a/packs/conditions/LOG +++ b/packs/conditions/LOG @@ -1,7 +1,7 @@ -2024/06/09-22:14:13.629087 7f04234006c0 Recovering log #228 -2024/06/09-22:14:13.682604 7f04234006c0 Delete type=3 #226 -2024/06/09-22:14:13.682717 7f04234006c0 Delete type=0 #228 -2024/06/10-09:41:28.681612 7f041be006c0 Level-0 table #233: started -2024/06/10-09:41:28.681700 7f041be006c0 Level-0 table #233: 0 bytes OK -2024/06/10-09:41:28.688115 7f041be006c0 Delete type=0 #231 -2024/06/10-09:41:28.708370 7f041be006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.356313 7f3f0d6006c0 Recovering log #252 +2024/06/12-11:13:40.366003 7f3f0d6006c0 Delete type=3 #250 +2024/06/12-11:13:40.366126 7f3f0d6006c0 Delete type=0 #252 +2024/06/12-11:16:23.317811 7f3f060006c0 Level-0 table #257: started +2024/06/12-11:16:23.317841 7f3f060006c0 Level-0 table #257: 0 bytes OK +2024/06/12-11:16:23.355645 7f3f060006c0 Delete type=0 #255 +2024/06/12-11:16:23.460439 7f3f060006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/LOG.old b/packs/conditions/LOG.old index 6b0dcbf..1b4ad4d 100644 --- a/packs/conditions/LOG.old +++ b/packs/conditions/LOG.old @@ -1,7 +1,7 @@ -2024/06/09-15:12:48.575130 7f0422a006c0 Recovering log #224 -2024/06/09-15:12:48.586449 7f0422a006c0 Delete type=3 #222 -2024/06/09-15:12:48.586519 7f0422a006c0 Delete type=0 #224 -2024/06/09-22:14:10.136453 7f041be006c0 Level-0 table #229: started -2024/06/09-22:14:10.136510 7f041be006c0 Level-0 table #229: 0 bytes OK -2024/06/09-22:14:10.178843 7f041be006c0 Delete type=0 #227 -2024/06/09-22:14:10.237058 7f041be006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.189039 7f3f0ea006c0 Recovering log #248 +2024/06/12-11:13:16.200829 7f3f0ea006c0 Delete type=3 #246 +2024/06/12-11:13:16.200927 7f3f0ea006c0 Delete type=0 #248 +2024/06/12-11:13:34.657802 7f3f060006c0 Level-0 table #253: started +2024/06/12-11:13:34.657837 7f3f060006c0 Level-0 table #253: 0 bytes OK +2024/06/12-11:13:34.663971 7f3f060006c0 Delete type=0 #251 +2024/06/12-11:13:34.681143 7f3f060006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/MANIFEST-000230 b/packs/conditions/MANIFEST-000230 deleted file mode 100644 index fdea4d9..0000000 Binary files a/packs/conditions/MANIFEST-000230 and /dev/null differ diff --git a/packs/conditions/MANIFEST-000254 b/packs/conditions/MANIFEST-000254 new file mode 100644 index 0000000..0881b19 Binary files /dev/null and b/packs/conditions/MANIFEST-000254 differ diff --git a/packs/currency/000232.log b/packs/currency/000256.log similarity index 100% rename from packs/currency/000232.log rename to packs/currency/000256.log diff --git a/packs/currency/CURRENT b/packs/currency/CURRENT index 7a8f695..13813b8 100644 --- a/packs/currency/CURRENT +++ b/packs/currency/CURRENT @@ -1 +1 @@ -MANIFEST-000230 +MANIFEST-000254 diff --git a/packs/currency/LOG b/packs/currency/LOG index 437dacd..15829f6 100644 --- a/packs/currency/LOG +++ b/packs/currency/LOG @@ -1,7 +1,7 @@ -2024/06/09-22:14:13.684410 7f04220006c0 Recovering log #228 -2024/06/09-22:14:13.738438 7f04220006c0 Delete type=3 #226 -2024/06/09-22:14:13.738501 7f04220006c0 Delete type=0 #228 -2024/06/10-09:41:28.695535 7f041be006c0 Level-0 table #233: started -2024/06/10-09:41:28.695561 7f041be006c0 Level-0 table #233: 0 bytes OK -2024/06/10-09:41:28.701707 7f041be006c0 Delete type=0 #231 -2024/06/10-09:41:28.708395 7f041be006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.368093 7f3f0ea006c0 Recovering log #252 +2024/06/12-11:13:40.379978 7f3f0ea006c0 Delete type=3 #250 +2024/06/12-11:13:40.380078 7f3f0ea006c0 Delete type=0 #252 +2024/06/12-11:16:23.408873 7f3f060006c0 Level-0 table #257: started +2024/06/12-11:16:23.408929 7f3f060006c0 Level-0 table #257: 0 bytes OK +2024/06/12-11:16:23.460072 7f3f060006c0 Delete type=0 #255 +2024/06/12-11:16:23.460493 7f3f060006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/currency/LOG.old b/packs/currency/LOG.old index 8eae9d9..365386e 100644 --- a/packs/currency/LOG.old +++ b/packs/currency/LOG.old @@ -1,7 +1,7 @@ -2024/06/09-15:12:48.588970 7f04220006c0 Recovering log #224 -2024/06/09-15:12:48.599090 7f04220006c0 Delete type=3 #222 -2024/06/09-15:12:48.599210 7f04220006c0 Delete type=0 #224 -2024/06/09-22:14:10.179007 7f041be006c0 Level-0 table #229: started -2024/06/09-22:14:10.179038 7f041be006c0 Level-0 table #229: 0 bytes OK -2024/06/09-22:14:10.207646 7f041be006c0 Delete type=0 #227 -2024/06/09-22:14:10.275783 7f041be006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.204139 7f3f0d6006c0 Recovering log #248 +2024/06/12-11:13:16.215399 7f3f0d6006c0 Delete type=3 #246 +2024/06/12-11:13:16.215490 7f3f0d6006c0 Delete type=0 #248 +2024/06/12-11:13:34.692534 7f3f060006c0 Level-0 table #253: started +2024/06/12-11:13:34.692577 7f3f060006c0 Level-0 table #253: 0 bytes OK +2024/06/12-11:13:34.698872 7f3f060006c0 Delete type=0 #251 +2024/06/12-11:13:34.713306 7f3f060006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/currency/MANIFEST-000230 b/packs/currency/MANIFEST-000230 deleted file mode 100644 index fdea4d9..0000000 Binary files a/packs/currency/MANIFEST-000230 and /dev/null differ diff --git a/packs/currency/MANIFEST-000254 b/packs/currency/MANIFEST-000254 new file mode 100644 index 0000000..0881b19 Binary files /dev/null and b/packs/currency/MANIFEST-000254 differ diff --git a/packs/darkstars-sf/000044.log b/packs/darkstars-sf/000068.log similarity index 100% rename from packs/darkstars-sf/000044.log rename to packs/darkstars-sf/000068.log diff --git a/packs/darkstars-sf/CURRENT b/packs/darkstars-sf/CURRENT index 8e0a062..7873dc6 100644 --- a/packs/darkstars-sf/CURRENT +++ b/packs/darkstars-sf/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000066 diff --git a/packs/darkstars-sf/LOG b/packs/darkstars-sf/LOG index c2a6780..7901d3d 100644 --- a/packs/darkstars-sf/LOG +++ b/packs/darkstars-sf/LOG @@ -1,8 +1,8 @@ -2024/06/09-22:14:13.796638 7f04234006c0 Recovering log #40 -2024/06/09-22:14:13.848675 7f04234006c0 Delete type=3 #38 -2024/06/09-22:14:13.848823 7f04234006c0 Delete type=0 #40 -2024/06/10-09:41:28.701835 7f041be006c0 Level-0 table #45: started -2024/06/10-09:41:28.701863 7f041be006c0 Level-0 table #45: 0 bytes OK -2024/06/10-09:41:28.708242 7f041be006c0 Delete type=0 #43 -2024/06/10-09:41:28.708405 7f041be006c0 Manual compaction at level-0 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) -2024/06/10-09:41:28.708427 7f041be006c0 Manual compaction at level-1 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.398008 7f3f0d6006c0 Recovering log #64 +2024/06/12-11:13:40.408278 7f3f0d6006c0 Delete type=3 #62 +2024/06/12-11:13:40.408353 7f3f0d6006c0 Delete type=0 #64 +2024/06/12-11:16:23.554104 7f3f060006c0 Level-0 table #69: started +2024/06/12-11:16:23.554144 7f3f060006c0 Level-0 table #69: 0 bytes OK +2024/06/12-11:16:23.590465 7f3f060006c0 Delete type=0 #67 +2024/06/12-11:16:23.590737 7f3f060006c0 Manual compaction at level-0 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:16:23.590756 7f3f060006c0 Manual compaction at level-1 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) diff --git a/packs/darkstars-sf/LOG.old b/packs/darkstars-sf/LOG.old index 3b0e455..813bc47 100644 --- a/packs/darkstars-sf/LOG.old +++ b/packs/darkstars-sf/LOG.old @@ -1,8 +1,8 @@ -2024/06/09-15:12:48.617616 7f0422a006c0 Recovering log #36 -2024/06/09-15:12:48.628378 7f0422a006c0 Delete type=3 #34 -2024/06/09-15:12:48.628495 7f0422a006c0 Delete type=0 #36 -2024/06/09-22:14:10.237082 7f041be006c0 Level-0 table #41: started -2024/06/09-22:14:10.237123 7f041be006c0 Level-0 table #41: 0 bytes OK -2024/06/09-22:14:10.275511 7f041be006c0 Delete type=0 #39 -2024/06/09-22:14:10.305901 7f041be006c0 Manual compaction at level-0 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) -2024/06/09-22:14:10.338791 7f041be006c0 Manual compaction at level-1 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.233304 7f3f0ea006c0 Recovering log #60 +2024/06/12-11:13:16.243341 7f3f0ea006c0 Delete type=3 #58 +2024/06/12-11:13:16.243395 7f3f0ea006c0 Delete type=0 #60 +2024/06/12-11:13:34.713340 7f3f060006c0 Level-0 table #65: started +2024/06/12-11:13:34.713379 7f3f060006c0 Level-0 table #65: 0 bytes OK +2024/06/12-11:13:34.719558 7f3f060006c0 Delete type=0 #63 +2024/06/12-11:13:34.733213 7f3f060006c0 Manual compaction at level-0 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:13:34.733290 7f3f060006c0 Manual compaction at level-1 from '!folders!La3YsNYFddQnmsba' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) diff --git a/packs/darkstars-sf/MANIFEST-000042 b/packs/darkstars-sf/MANIFEST-000042 deleted file mode 100644 index 68e1f90..0000000 Binary files a/packs/darkstars-sf/MANIFEST-000042 and /dev/null differ diff --git a/packs/darkstars-sf/MANIFEST-000066 b/packs/darkstars-sf/MANIFEST-000066 new file mode 100644 index 0000000..afb2811 Binary files /dev/null and b/packs/darkstars-sf/MANIFEST-000066 differ diff --git a/packs/nightborough/000199.log b/packs/nightborough/000223.log similarity index 100% rename from packs/nightborough/000199.log rename to packs/nightborough/000223.log diff --git a/packs/nightborough/CURRENT b/packs/nightborough/CURRENT index edcd2de..2582555 100644 --- a/packs/nightborough/CURRENT +++ b/packs/nightborough/CURRENT @@ -1 +1 @@ -MANIFEST-000197 +MANIFEST-000221 diff --git a/packs/nightborough/LOG b/packs/nightborough/LOG index 50ef0a4..36af6ee 100644 --- a/packs/nightborough/LOG +++ b/packs/nightborough/LOG @@ -1,7 +1,7 @@ -2024/06/09-22:14:13.982525 7f04234006c0 Recovering log #195 -2024/06/09-22:14:14.045462 7f04234006c0 Delete type=3 #193 -2024/06/09-22:14:14.045536 7f04234006c0 Delete type=0 #195 -2024/06/10-09:41:28.715334 7f041be006c0 Level-0 table #200: started -2024/06/10-09:41:28.715357 7f041be006c0 Level-0 table #200: 0 bytes OK -2024/06/10-09:41:28.721312 7f041be006c0 Delete type=0 #198 -2024/06/10-09:41:28.728591 7f041be006c0 Manual compaction at level-0 from '!folders!2iZtDz80npHPIwkS' @ 72057594037927935 : 1 .. '!items!zyFR9C1jBTeFzbxg' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.440639 7f3f0d6006c0 Recovering log #219 +2024/06/12-11:13:40.450523 7f3f0d6006c0 Delete type=3 #217 +2024/06/12-11:13:40.450593 7f3f0d6006c0 Delete type=0 #219 +2024/06/12-11:16:23.645974 7f3f060006c0 Level-0 table #224: started +2024/06/12-11:16:23.646004 7f3f060006c0 Level-0 table #224: 0 bytes OK +2024/06/12-11:16:23.683161 7f3f060006c0 Delete type=0 #222 +2024/06/12-11:16:23.683408 7f3f060006c0 Manual compaction at level-0 from '!folders!2iZtDz80npHPIwkS' @ 72057594037927935 : 1 .. '!items!zyFR9C1jBTeFzbxg' @ 0 : 0; will stop at (end) diff --git a/packs/nightborough/LOG.old b/packs/nightborough/LOG.old index f78e9ea..cec45ef 100644 --- a/packs/nightborough/LOG.old +++ b/packs/nightborough/LOG.old @@ -1,7 +1,7 @@ -2024/06/09-15:12:48.661428 7f0422a006c0 Recovering log #191 -2024/06/09-15:12:48.671794 7f0422a006c0 Delete type=3 #189 -2024/06/09-15:12:48.671874 7f0422a006c0 Delete type=0 #191 -2024/06/09-22:14:10.338805 7f041be006c0 Level-0 table #196: started -2024/06/09-22:14:10.338838 7f041be006c0 Level-0 table #196: 0 bytes OK -2024/06/09-22:14:10.376746 7f041be006c0 Delete type=0 #194 -2024/06/09-22:14:10.376994 7f041be006c0 Manual compaction at level-0 from '!folders!2iZtDz80npHPIwkS' @ 72057594037927935 : 1 .. '!items!zyFR9C1jBTeFzbxg' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.276335 7f3f0ea006c0 Recovering log #215 +2024/06/12-11:13:16.287074 7f3f0ea006c0 Delete type=3 #213 +2024/06/12-11:13:16.287130 7f3f0ea006c0 Delete type=0 #215 +2024/06/12-11:13:34.733411 7f3f060006c0 Level-0 table #220: started +2024/06/12-11:13:34.733492 7f3f060006c0 Level-0 table #220: 0 bytes OK +2024/06/12-11:13:34.741601 7f3f060006c0 Delete type=0 #218 +2024/06/12-11:13:34.741825 7f3f060006c0 Manual compaction at level-0 from '!folders!2iZtDz80npHPIwkS' @ 72057594037927935 : 1 .. '!items!zyFR9C1jBTeFzbxg' @ 0 : 0; will stop at (end) diff --git a/packs/nightborough/MANIFEST-000197 b/packs/nightborough/MANIFEST-000221 similarity index 71% rename from packs/nightborough/MANIFEST-000197 rename to packs/nightborough/MANIFEST-000221 index 76242f2..70713ad 100644 Binary files a/packs/nightborough/MANIFEST-000197 and b/packs/nightborough/MANIFEST-000221 differ diff --git a/packs/sprawl/000036.log b/packs/sprawl/000060.log similarity index 100% rename from packs/sprawl/000036.log rename to packs/sprawl/000060.log diff --git a/packs/sprawl/CURRENT b/packs/sprawl/CURRENT index eea9b0f..717cf9a 100644 --- a/packs/sprawl/CURRENT +++ b/packs/sprawl/CURRENT @@ -1 +1 @@ -MANIFEST-000034 +MANIFEST-000058 diff --git a/packs/sprawl/LOG b/packs/sprawl/LOG index 950889e..f862222 100644 --- a/packs/sprawl/LOG +++ b/packs/sprawl/LOG @@ -1,8 +1,8 @@ -2024/06/09-22:14:13.740220 7f04234006c0 Recovering log #32 -2024/06/09-22:14:13.790228 7f04234006c0 Delete type=3 #30 -2024/06/09-22:14:13.790339 7f04234006c0 Delete type=0 #32 -2024/06/10-09:41:28.688322 7f041be006c0 Level-0 table #37: started -2024/06/10-09:41:28.688366 7f041be006c0 Level-0 table #37: 0 bytes OK -2024/06/10-09:41:28.695417 7f041be006c0 Delete type=0 #35 -2024/06/10-09:41:28.708385 7f041be006c0 Manual compaction at level-0 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) -2024/06/10-09:41:28.708412 7f041be006c0 Manual compaction at level-1 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:13:40.382275 7f3f0d6006c0 Recovering log #56 +2024/06/12-11:13:40.392775 7f3f0d6006c0 Delete type=3 #54 +2024/06/12-11:13:40.392833 7f3f0d6006c0 Delete type=0 #56 +2024/06/12-11:16:23.460642 7f3f060006c0 Level-0 table #61: started +2024/06/12-11:16:23.460722 7f3f060006c0 Level-0 table #61: 0 bytes OK +2024/06/12-11:16:23.489273 7f3f060006c0 Delete type=0 #59 +2024/06/12-11:16:23.590665 7f3f060006c0 Manual compaction at level-0 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:16:23.590714 7f3f060006c0 Manual compaction at level-1 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) diff --git a/packs/sprawl/LOG.old b/packs/sprawl/LOG.old index e9f2cc6..81d0184 100644 --- a/packs/sprawl/LOG.old +++ b/packs/sprawl/LOG.old @@ -1,8 +1,8 @@ -2024/06/09-15:12:48.601801 7f0422a006c0 Recovering log #28 -2024/06/09-15:12:48.612089 7f0422a006c0 Delete type=3 #26 -2024/06/09-15:12:48.612161 7f0422a006c0 Delete type=0 #28 -2024/06/09-22:14:10.207782 7f041be006c0 Level-0 table #33: started -2024/06/09-22:14:10.207808 7f041be006c0 Level-0 table #33: 0 bytes OK -2024/06/09-22:14:10.236857 7f041be006c0 Delete type=0 #31 -2024/06/09-22:14:10.275812 7f041be006c0 Manual compaction at level-0 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) -2024/06/09-22:14:10.305912 7f041be006c0 Manual compaction at level-1 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:13:16.217842 7f3f0ea006c0 Recovering log #52 +2024/06/12-11:13:16.227586 7f3f0ea006c0 Delete type=3 #50 +2024/06/12-11:13:16.227643 7f3f0ea006c0 Delete type=0 #52 +2024/06/12-11:13:34.706400 7f3f060006c0 Level-0 table #57: started +2024/06/12-11:13:34.706452 7f3f060006c0 Level-0 table #57: 0 bytes OK +2024/06/12-11:13:34.713151 7f3f060006c0 Delete type=0 #55 +2024/06/12-11:13:34.719676 7f3f060006c0 Manual compaction at level-0 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) +2024/06/12-11:13:34.733233 7f3f060006c0 Manual compaction at level-1 from '!folders!0XjcJyQMCVYU611t' @ 72057594037927935 : 1 .. '!items!zzDfuUJpQzzz262R' @ 0 : 0; will stop at (end) diff --git a/packs/sprawl/MANIFEST-000034 b/packs/sprawl/MANIFEST-000034 deleted file mode 100644 index 2dff9c2..0000000 Binary files a/packs/sprawl/MANIFEST-000034 and /dev/null differ diff --git a/packs/sprawl/MANIFEST-000058 b/packs/sprawl/MANIFEST-000058 new file mode 100644 index 0000000..b5bcbac Binary files /dev/null and b/packs/sprawl/MANIFEST-000058 differ diff --git a/packs/tables/000004.log b/packs/tables/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/tables/000005.ldb b/packs/tables/000005.ldb new file mode 100644 index 0000000..afbc0f4 Binary files /dev/null and b/packs/tables/000005.ldb differ diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/tables/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/tables/LOCK b/packs/tables/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/tables/LOG b/packs/tables/LOG new file mode 100644 index 0000000..af49811 --- /dev/null +++ b/packs/tables/LOG @@ -0,0 +1,5 @@ +2024/06/12-11:13:40.470344 7f3f0cc006c0 Delete type=3 #1 +2024/06/12-11:16:23.590854 7f3f060006c0 Level-0 table #5: started +2024/06/12-11:16:23.609006 7f3f060006c0 Level-0 table #5: 2739 bytes OK +2024/06/12-11:16:23.645817 7f3f060006c0 Delete type=0 #3 +2024/06/12-11:16:23.683365 7f3f060006c0 Manual compaction at level-0 from '!tables!8kvF6sVAF7iLt0Kg' @ 72057594037927935 : 1 .. '!tables.results!rnt5wvIIwHrTIs0y.wIvaW5jjuw7mp7s3' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000002 b/packs/tables/MANIFEST-000002 new file mode 100644 index 0000000..b05ffc2 Binary files /dev/null and b/packs/tables/MANIFEST-000002 differ diff --git a/system.json b/system.json index e008a47..e66ba13 100644 --- a/system.json +++ b/system.json @@ -9,8 +9,10 @@ "esmodules": [ "modules/dark-stars-main.js" ], - "gridDistance": 5, - "gridUnits": "m", + "gid": { + "distance": 5, + "units": "m" + }, "languages": [ { "lang": "en", @@ -83,6 +85,15 @@ "system": "fvtt-dark-stars", "private": false, "flags": {} + }, + { + "type": "RollTable", + "label": "Tables", + "name": "tables", + "path": "packs/tables", + "system": "fvtt-dark-stars", + "private": false, + "flags": {} } ], "primaryTokenAttribute": "secondary.hp", @@ -91,14 +102,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.21", + "version": "12.0.0", "compatibility": { "minimum": "11", - "verified": "11" + "verified": "12" }, "title": "Dark Stars RPG", "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/raw/branch/main/system.json", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.21.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v12.0.0.zip", "url": "https://www.uberwald.me/gitea/uberwald/", "background": "images/ui/dark_stars_welcome_page.webp", "id": "fvtt-dark-stars", diff --git a/template.json b/template.json index 3974dce..fc6bc63 100644 --- a/template.json +++ b/template.json @@ -278,7 +278,7 @@ "Item": { "types": [ "skill", - "cumulativetask", + "extendedtest", "perk", "ability", "armor", @@ -306,7 +306,7 @@ "signs": 0, "cherisheditems": 0 }, - "cumulativetask": { + "extendedtest": { "cumulated": 0, "nbrolls": 0, "skill": "", diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index f33cef5..f1e6520 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -134,7 +134,7 @@ {{skill.system.bonus}} {{skill.total}}% - +
@@ -160,14 +160,14 @@ - {{#each tasks as |task key|}} -
  • - + {{#each extendedTests as |test key|}} +
  • + - {{task.name}} - {{task.system.skill}} - {{task.system.nbrolls}} - {{task.system.cumulated}} + {{test.name}} + {{test.system.skill}} + {{test.system.nbrolls}} + {{test.system.cumulated}}
     
    diff --git a/templates/apps/roll-dialog-generic.hbs b/templates/apps/roll-dialog-generic.hbs index 8022d18..7052ba5 100644 --- a/templates/apps/roll-dialog-generic.hbs +++ b/templates/apps/roll-dialog-generic.hbs @@ -20,7 +20,7 @@
    {{/if}} - + {{#if skill}}
    Skill : diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index bce8a4c..daca330 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -41,16 +41,8 @@
  • Target Number: {{percentValue}}%
  • Result: {{diceResult}}
    • -
  • - Degrees: {{degrees}} - - - - - - -
    • - +
  • Degrees: {{degrees}}
    • + {{#if taskId}}
  • Task : {{taskName}}
  • Nb rolls : {{taskNbrolls}}
    • @@ -89,9 +81,23 @@
  • Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}
    • {{/if}} - {{#if (and (not isSuccess) rerolls)}} - - {{/if}} +
  • + + + + + + +   + {{#if (and (not isSuccess) rerolls)}} + + + + + + + {{/if}} +
    • diff --git a/templates/items/item-cumulativetask-sheet.hbs b/templates/items/item-extendedtest-sheet.hbs similarity index 100% rename from templates/items/item-cumulativetask-sheet.hbs rename to templates/items/item-extendedtest-sheet.hbs