From d84f5ce7f65c83e57f953ca1297510d4a2fd4512 Mon Sep 17 00:00:00 2001 From: Chris Schmalz Date: Sun, 2 Jun 2024 10:46:31 -0700 Subject: [PATCH] account for negative rolls + cryo dmg fixes --- module/actor/actor.js | 21 ++++++++++++++++----- packs/macros_triggered_1e.db | 4 ++-- packs/macros_triggered_1e/000005.ldb | Bin 27786 -> 0 bytes packs/macros_triggered_1e/000008.log | 0 packs/macros_triggered_1e/CURRENT | 1 - packs/macros_triggered_1e/LOCK | 0 packs/macros_triggered_1e/LOG | 8 -------- packs/macros_triggered_1e/LOG.old | 5 ----- packs/macros_triggered_1e/MANIFEST-000006 | Bin 139 -> 0 bytes 9 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 packs/macros_triggered_1e/000005.ldb delete mode 100644 packs/macros_triggered_1e/000008.log delete mode 100644 packs/macros_triggered_1e/CURRENT delete mode 100644 packs/macros_triggered_1e/LOCK delete mode 100644 packs/macros_triggered_1e/LOG delete mode 100644 packs/macros_triggered_1e/LOG.old delete mode 100644 packs/macros_triggered_1e/MANIFEST-000006 diff --git a/module/actor/actor.js b/module/actor/actor.js index bb3e506..87b0cbb 100644 --- a/module/actor/actor.js +++ b/module/actor/actor.js @@ -1071,27 +1071,38 @@ export class MothershipActor extends Actor { //change data point: change each 100 or 10 result to zero if (zeroBased) { //1d10 changes - if (rollString.substr(0,rollString.indexOf("[")).trim() === '1d10' || rollString === '1d10') { + if (rollString.substr(0,rollString.indexOf("[")).trim() === '1d10' || rollString === '1d10' || rollString.substr(0,rollString.indexOf("[")).trim() === '-1d10' || rollString === '-1d10') { //loop through dice enrichedRollResult.dice.forEach(function(roll){ //loop through each result roll.results.forEach(function(die) { //change any 10s to 0s - if (die.result === 10) {die.result = 0;} + if (die.result === 10 || die.result === -10) {die.result = 0;} }); }); //1d100 changes - } else if (rollString.substr(0,rollString.indexOf("[")).trim() === '1d100' || rollString === '1d100') { + } else if (rollString.substr(0,rollString.indexOf("[")).trim() === '1d100' || rollString === '1d100' || rollString.substr(0,rollString.indexOf("[")).trim() === '-1d100' || rollString === '-1d100') { //loop through dice enrichedRollResult.dice.forEach(function(roll){ //loop through each result roll.results.forEach(function(die) { //change any 100s to 0s - if (die.result === 100) {die.result = 0;} + if (die.result === 100 || die.result === -100) {die.result = 0;} }); }); } } + //update dice totals to negative for negative rolls + if (rollString.substr(0,1) === '-') { + //loop through dice + enrichedRollResult.dice.forEach(function(roll){ + //loop through each result + roll.results.forEach(function(die) { + //change any non-zero + die.result = die.result*-1; + }); + }); + } //pick a new winner if [-] or [+] if (rollString.includes("[")) { //if [-] pick a new worst number @@ -3379,7 +3390,7 @@ export class MothershipActor extends Actor { this.modifyActor('system.stats.body.value',parsedRollResult.total,null,false); //get flavor text let msgFlavor = this.getFlavorText('item','condition','cryo'); - let msgOutcome = `All stats and saves decreased by 1.`; + let msgOutcome = `All stats and saves decreased by ` + Math.abs(parsedRollResult.total).toString() + `.`; //create chat message text let messageContent = `
diff --git a/packs/macros_triggered_1e.db b/packs/macros_triggered_1e.db index e4049a9..daa15bb 100644 --- a/packs/macros_triggered_1e.db +++ b/packs/macros_triggered_1e.db @@ -126,8 +126,8 @@ {"_id":"XlfEeDblsp7fTzUx","name":"Strength Check -","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"game.mosh.initRollCheck('1d100 [-]','low','strength',null,null,null);","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} {"_id":"9X5WPlXiZn9EqF9f","name":"Strength Check +","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"game.mosh.initRollCheck('1d100 [+]','low','strength',null,null,null);","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} {"_id":"aur5HWqZJNspwdCd","name":"Take Bleeding Damage","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepBleedingDamage();\n\n//tell the actor to run the function\nasync function prepBleedingDamage() {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.takeBleedingDamage();\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.takeBleedingDamage();\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} -{"_id":"SeMStXQGIaeiLwvw","name":"-1d5 All Stats/Saves","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepCryoDamage();\n\n//tell the actor to run the function\nasync function prepCryoDamage(); {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.takeCryoDamage('-1d5');\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.takeCryoDamage('-1d5');\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} -{"_id":"2MuANcdgp2g8SDlF","name":"-1d10 All Stats/Saves","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepCryoDamage();\n\n//tell the actor to run the function\nasync function prepCryoDamage(); {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.takeCryoDamage('-1d10');\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.takeCryoDamage('-1d10');\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} +{"_id":"SeMStXQGIaeiLwvw","name":"-1d5 All Stats/Saves","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepCryoDamage();\n\n//tell the actor to run the function\nasync function prepCryoDamage() {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.takeCryoDamage('-1d5');\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.takeCryoDamage('-1d5');\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} +{"_id":"2MuANcdgp2g8SDlF","name":"-1d10 All Stats/Saves","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepCryoDamage();\n\n//tell the actor to run the function\nasync function prepCryoDamage() {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.takeCryoDamage('-1d10');\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noCharSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.takeCryoDamage('-1d10');\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} {"_id":"8euTBbjY9uDQR13K","name":"Maintenance Check","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepMaintenanceCheck();\n\n//tell the actor to run the function\nasync function prepMaintenanceCheck() {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character || !game.user.character.type === 'ship') {\n //warn player\n game.mosh.noShipSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.maintenanceCheck();\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noShipSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.maintenanceCheck();\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} {"_id":"C04VbNoj8LgfY8QK","name":"Maintenance Check [-]","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepMaintenanceCheck();\n\n//tell the actor to run the function\nasync function prepMaintenanceCheck() {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character || !game.user.character.type === 'ship') {\n //warn player\n game.mosh.noShipSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.rollTable(`maintenanceCheck`,`1d100 [-]`,`low`,null,null,null,null);\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noShipSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.rollTable(`maintenanceCheck`,`1d100 [-]`,`low`,null,null,null,null);\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} {"_id":"g5hyNqBioTNe5TGx","name":"Maintenance Check [+]","type":"script","scope":"global","img":"icons/svg/d10-grey.svg","command":"prepMaintenanceCheck();\n\n//tell the actor to run the function\nasync function prepMaintenanceCheck() {\n //determine who to run the macro for\n if (game.settings.get('mosh','macroTarget') === 'character') {\n //is there a selected character? warn if no\n if (!game.user.character || !game.user.character.type === 'ship') {\n //warn player\n game.mosh.noShipSelected();\n } else {\n //run the function for the player's 'Selected Character'\n game.user.character.rollTable(`maintenanceCheck`,`1d100 [+]`,`low`,null,null,null,null);\n }\n } else if (game.settings.get('mosh','macroTarget') === 'token') {\n //is there a selected character? warn if no\n if (!canvas.tokens.controlled.length) {\n //warn player\n game.mosh.noShipSelected();\n } else {\n //run the function for all selected tokens\n canvas.tokens.controlled.forEach(function(token){\n token.actor.rollTable(`maintenanceCheck`,`1d100 [+]`,`low`,null,null,null,null);\n });\n }\n }\n}","folder":null,"flags":{},"_stats":{"systemId":"mosh","systemVersion":"0.4.0","coreVersion":"11.308","createdTime":1685936572185,"modifiedTime":1693515520278,"lastModifiedBy":"6EeM38DJkcBWNAmw"}} diff --git a/packs/macros_triggered_1e/000005.ldb b/packs/macros_triggered_1e/000005.ldb deleted file mode 100644 index a217b29155931719fb4bee886cd19717423a27ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27786 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 KT$<_l)&Bvp74?_^ diff --git a/packs/macros_triggered_1e/000008.log b/packs/macros_triggered_1e/000008.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/macros_triggered_1e/CURRENT b/packs/macros_triggered_1e/CURRENT deleted file mode 100644 index f7753e2..0000000 --- a/packs/macros_triggered_1e/CURRENT +++ /dev/null @@ -1 +0,0 @@ -MANIFEST-000006 diff --git a/packs/macros_triggered_1e/LOCK b/packs/macros_triggered_1e/LOCK deleted file mode 100644 index e69de29..0000000 diff --git a/packs/macros_triggered_1e/LOG b/packs/macros_triggered_1e/LOG deleted file mode 100644 index d79c64f..0000000 --- a/packs/macros_triggered_1e/LOG +++ /dev/null @@ -1,8 +0,0 @@ -2024/05/31-17:17:38.526 5714 Recovering log #4 -2024/05/31-17:17:38.530 5714 Delete type=0 #4 -2024/05/31-17:17:38.531 5714 Delete type=3 #2 -2024/05/31-17:20:09.428 2734 Level-0 table #9: started -2024/05/31-17:20:09.428 2734 Level-0 table #9: 0 bytes OK -2024/05/31-17:20:09.432 2734 Delete type=0 #7 -2024/05/31-17:20:09.434 2734 Manual compaction at level-0 from '!macros!06NSvDYTtmkeUtLq' @ 72057594037927935 : 1 .. '!macros!zLRsweb35Lw0NMev' @ 0 : 0; will stop at (end) -2024/05/31-17:20:09.434 2734 Manual compaction at level-1 from '!macros!06NSvDYTtmkeUtLq' @ 72057594037927935 : 1 .. '!macros!zLRsweb35Lw0NMev' @ 0 : 0; will stop at (end) diff --git a/packs/macros_triggered_1e/LOG.old b/packs/macros_triggered_1e/LOG.old deleted file mode 100644 index 6f821e6..0000000 --- a/packs/macros_triggered_1e/LOG.old +++ /dev/null @@ -1,5 +0,0 @@ -2024/05/31-17:00:59.070 3e44 Delete type=3 #1 -2024/05/31-17:17:20.780 2734 Level-0 table #5: started -2024/05/31-17:17:20.793 2734 Level-0 table #5: 27786 bytes OK -2024/05/31-17:17:20.794 2734 Delete type=0 #3 -2024/05/31-17:17:20.826 2734 Manual compaction at level-0 from '!macros!06NSvDYTtmkeUtLq' @ 72057594037927935 : 1 .. '!macros!zLRsweb35Lw0NMev' @ 0 : 0; will stop at (end) diff --git a/packs/macros_triggered_1e/MANIFEST-000006 b/packs/macros_triggered_1e/MANIFEST-000006 deleted file mode 100644 index e7f8f146951c6c58a677f28773aca8e3c4947c30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmaEr%9WnNz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+I5prK`}QmxhTI_ z(ZI|vxXdLoq$D>xHMGR1kdcuA4B!f?e1eM0Q