From 346273f73794086986558e200cb59a34a649f408 Mon Sep 17 00:00:00 2001
From: Dennis <Dennis>
Date: Thu, 22 Feb 2024 20:26:27 +0100
Subject: [PATCH] sdf

---
 .gitignore              |  1 +
 input.txt               |  1 -
 roll20ChatParserMain.py | 13 +++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..06c798b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+input.txt
diff --git a/input.txt b/input.txt
index 9cad444..e69de29 100644
--- a/input.txt
+++ b/input.txt
@@ -1 +0,0 @@
-Jonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  23Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hpOn a crit:Heals a nearby ally for 25 hpOn kill:Embrace of Darkness on wielder52 + 22Slashing  44 + 58RadiantJonas:38  39Sword of Eternal Sunshine (+22)On a hit:Heals wielder for 25 hp
\ No newline at end of file
diff --git a/roll20ChatParserMain.py b/roll20ChatParserMain.py
index 0d05548..097a731 100644
--- a/roll20ChatParserMain.py
+++ b/roll20ChatParserMain.py
@@ -57,20 +57,20 @@ class Action:
         hits=False
         crit=False
         if(self.advantage==0):
-            if(((self.hit[0]+self.hit[1]) >=self.targetAc and (self.hit[0]-self.atkMod)>1) or self.critAbove<(self.hit[0]-self.atkMod)): # 0 (rul 1 value), 1 (rul 1 bonus), 2 (rul 2 value), 3(rul 2 bonus)
+            if(((self.hit[0]+self.hit[1]) >=self.targetAc and (self.hit[0]-self.atkMod)>1) or self.critAbove<=(self.hit[0]-self.atkMod)): # 0 (rul 1 value), 1 (rul 1 bonus), 2 (rul 2 value), 3(rul 2 bonus)
                 hits=1
-                if(self.critAbove<(self.hit[0]-self.atkMod)):
+                if(self.critAbove<=(self.hit[0]-self.atkMod)):
                     self.crits=1
         if(self.advantage==1):
-            if(((self.hit[2]+self.hit[3]) >=self.targetAc and (self.hit[2]-self.atkMod)>1 or (self.hit[0]+self.hit[1]) >=self.targetAc and (self.hit[0]-self.atkMod)>1) or (self.critAbove<self.hit[2]-self.atkMod) or (self.critAbove<self.hit[0]-self.atkMod)): 
+            if(((self.hit[2]+self.hit[3]) >=self.targetAc and (self.hit[2]-self.atkMod)>1 or (self.hit[0]+self.hit[1]) >=self.targetAc and (self.hit[0]-self.atkMod)>1) or (self.critAbove<=self.hit[2]-self.atkMod) or (self.critAbove<=self.hit[0]-self.atkMod)): 
                 hits=1
-                if((self.critAbove<self.hit[2]-self.atkMod) or (self.critAbove<self.hit[0]-self.atkMod)):
+                if((self.critAbove<=self.hit[2]-self.atkMod) or (self.critAbove<=self.hit[0]-self.atkMod)):
                     self.crits=1
 
         if(self.advantage==-1):
-            if((((self.hit[2]+self.hit[3]) >=self.targetAc and (self.hit[2]-self.atkMod)>1) or ((self.critAbove<self.hit[2]-self.atkMod))) and (((self.hit[0]+self.hit[1]) >=self.targetAc and (self.hit[0]-self.atkMod)>1) or (self.critAbove<self.hit[0]-self.atkMod))): 
+            if((((self.hit[2]+self.hit[3]) >=self.targetAc and (self.hit[2]-self.atkMod)>1) or ((self.critAbove<=self.hit[2]-self.atkMod))) and (((self.hit[0]+self.hit[1]) >=self.targetAc and (self.hit[0]-self.atkMod)>1) or (self.critAbove<=self.hit[0]-self.atkMod))): 
                 hits=1
-                if((self.critAbove<self.hit[2]-self.atkMod) and (self.critAbove<self.hit[0]-self.atkMod)):
+                if((self.critAbove<=self.hit[2]-self.atkMod) and (self.critAbove<=self.hit[0]-self.atkMod)):
                     self.crits=1
 
         if(hits==1):
@@ -117,6 +117,7 @@ def checkIfCounts(line):
     if(re.match("(^_?[0-9]+){1}( \+ [0-9]+)?(  [0-9]+( \+ [0-9])*)?", line)):
         print("match : " + line)
         estCon=1  # attackroll eller dam
+        s=re.search('\\', line)
     s=re.search('\([-|\+][0-9]+\)+', line)
     if(s!=None):
         print("match modifier: " + line)