Compare commits

..

No commits in common. "d2f490a9cf65b21f4550f2954c3909f951fa3606" and "31c08a3864595575b6a976cef5e452c564aa5603" have entirely different histories.

2 changed files with 5 additions and 5 deletions

File diff suppressed because one or more lines are too long

View File

@ -57,18 +57,18 @@ class Action:
hits=False hits=False
crit=False crit=False
if(self.advantage==0): 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 hits=1
if(self.critAbove<(self.hit[0]-self.atkMod)): if(self.critAbove<(self.hit[0]-self.atkMod)):
self.crits=1 self.crits=1
if(self.advantage==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 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 self.crits=1
if(self.advantage==-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 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 self.crits=1
@ -94,7 +94,7 @@ class Action:
fumbles=False fumbles=False
return fumbles return fumbles
damTypes=["Slashing","Radiant","Great Weapon Master","Divine","Holy Weapon","Great Weapon Master/Radiant", "Bludgeoning"] damTypes=["Slashing","Radiant","Great Weapon Master","Divine","Holy Weapon","Great Weapon Master/Radiant"]
con=0 con=0
def incContext(): def incContext():
res=0 res=0