diff --git a/module/actor/actor.js b/module/actor/actor.js index 99c4b99..bb65b2a 100644 --- a/module/actor/actor.js +++ b/module/actor/actor.js @@ -2278,8 +2278,8 @@ export class MothershipActor extends Actor { modifyDifference = modifyNew - modifyCurrent; //measure any surplus if we exceeded min/max modifySurplus = modifyChange - modifyDifference; - //if health hits zero, reset to next hp bar ------------------------------come back here when implementing 0e-------------------------------- - if (fieldId === 'health' && modifyNew === 0) { + //if health hits zero, reset to next hp bar + if (firstEdition && fieldId === 'health' && modifyNew === 0) { //set marker for later getWound = true; //reset hp @@ -2304,7 +2304,7 @@ export class MothershipActor extends Actor { msgImgPath = this.getFlavorText('attribute',fieldId,'decreaseImg'); } //detect if half damage has been taken - if (!firstEdition && modifyChange > (modifyMaximum/2)) { + if (!firstEdition && (-1 * modifyChange) > (modifyMaximum/2)) { halfDamage = true; } //get modification description @@ -2401,8 +2401,8 @@ export class MothershipActor extends Actor { modifyDifference = modifyNew - modifyCurrent; //measure any surplus if we exceeded min/max modifySurplus = modifyChange - modifyDifference; - //if health hits zero, reset to next hp bar ------------------------------come back here when implementing 0e-------------------------------- - if (fieldId === 'health' && modifyNew === 0) { + //if health hits zero, reset to next hp bar + if (firstEdition && fieldId === 'health' && modifyNew === 0) { //set marker for later getWound = true; //reset hp @@ -2429,7 +2429,7 @@ export class MothershipActor extends Actor { msgImgPath = this.getFlavorText('attribute',fieldId,'decreaseImg'); } //detect if half damage has been taken - if (!firstEdition && modifyChange > (modifyMaximum/2)) { + if (!firstEdition && (-1 * modifyChange) > (modifyMaximum/2)) { halfDamage = true; } //get modification description diff --git a/templates/chat/modifyActor.html b/templates/chat/modifyActor.html index ad05630..25c56a9 100644 --- a/templates/chat/modifyActor.html +++ b/templates/chat/modifyActor.html @@ -15,7 +15,7 @@ {{/if}} {{{msgOutcome}}} {{#if halfDamage}} -

@UUID[Compendium.mosh.macros_hotbar_0e.Macro.IgWvaabVqzKDzLL4]{Make a Panic Check} +

@UUID[Compendium.mosh.macros_hotbar_0e.Macro.eyGvbBi1BhWSgfUP]{Make a Panic Check} {{/if}}