From f1ef782a0c7a74b76ea19dafdcf197321cb7c77a Mon Sep 17 00:00:00 2001
From: ironmonk88 <75920956+ironmonk88@users.noreply.github.com>
Date: Sat, 23 Jan 2021 14:11:29 -0800
Subject: [PATCH] Add files via upload

---
 alwayshp.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/alwayshp.js b/alwayshp.js
index 51d1276..34600f8 100644
--- a/alwayshp.js
+++ b/alwayshp.js
@@ -41,18 +41,20 @@ export class AlwaysHP {
                 let effect = a && status ? status : CONFIG.controlIcons.defeated;
                 const exists = (effect.icon == undefined ? (t.data.overlayEffect == effect) : (a.effects.find(e => e.getFlag("core", "statusId") === effect.id) != undefined));
                 if (exists != active)
-                    t.toggleEffect(effect, { overlay: true, active: active });
+                    t.toggleEffect(effect, { overlay: true, active: (active == 'toggle' ? !exists : active) });
             }
 
             log('applying damage', a, value);
-            if (game.system.id == "dnd5e") {
-                a.applyDamage(value).then(() => {
-                    AlwaysHP.refreshSelected();
-                });
-            } else {
-                AlwaysHP.applyDamage(a, value).then(() => {
-                    AlwaysHP.refreshSelected();
-                });
+            if (value != 0) {
+                if (game.system.id == "dnd5e") {
+                    a.applyDamage(value).then(() => {
+                        AlwaysHP.refreshSelected();
+                    });
+                } else {
+                    AlwaysHP.applyDamage(a, value).then(() => {
+                        AlwaysHP.refreshSelected();
+                    });
+                }
             }
         }));
     }
@@ -149,9 +151,13 @@ export class AlwaysHPApp extends Application {
 
         html.find('#alwayshp-btn-dead').click(ev => {
             ev.preventDefault();
-            log('set character to dead');
-            AlwaysHP.changeHP('zero', true);
-            this.clearInput();
+            if (ev.shiftKey == true)
+                AlwaysHP.changeHP(0, 'toggle');
+            else {
+                log('set character to dead');
+                AlwaysHP.changeHP('zero', true);
+                this.clearInput();
+            }
         }).contextmenu(ev => {
             ev.preventDefault();
             log('set character to hurt');