asdf

roll20ChatParserMain.py

@@ -14,59 +14,86 @@ class MyForm(FlaskForm):
     chatTekst = TextAreaField('Chat tekst', validators=[InputRequired()]) 
     ac = IntegerField(label='Ac', validators=[InputRequired()])
     advantage = BooleanField(label='Har advantage')
+    critRange = IntegerField(label='Crit over :' , validators=[InputRequired()])
 
  
 
 class Action:
     def __init__(self) -> None:
         self.Dam=[]
-        self.curActionValue=0
-        self.actionCounter=0
         self.hit=[]
         self.targetAc=0
         self.advantage=0
+        self.failedHitValue=0
+        self.critAbove=20
+        self.crits=False
+        self.atkMod=0
     
-    def addActionValue(self,actionValue):
-        self.curActionValue=actionValue
 
-    def setActionTypeToDam(self,DamType):
+    def setActionTypeToDam(self,value,value2,DamType):
-        self.Dam.append([self.actionCounter,self.curActionValue,DamType])
+        self.Dam.append([value,value2,DamType])
-        
-    def setActionTypeToDam(self,value,DamType):
-        self.Dam.append([self.actionCounter,value,DamType])
 
-    def setActionTypeToHit(self,rul):
+    def setAtkMod(self, mod):
-        if(rul==1):
+        if(mod>0):
-            self.actionCounter=self.actionCounter+1
+            self.atkMod=mod
-        self.hit.append([self.actionCounter,rul,self.curActionValue])
 
-    def setActionTypeToHit(self,value,rul):
+    def setActionTypeToHit(self,hitArray):
-        self.hit.append([self.actionCounter,rul,value])
+        if(len(hitArray)>1):
+            self.hit=[hitArray[0][0],hitArray[0][1],hitArray[1][0],hitArray[1][1]]
+        else:
+            self.hit=[hitArray[0][0],hitArray[0][1],0,0]
 
     def setTargetAc(self,ac):
         self.targetAc=ac
-    def setWithAdvantage(self,advantage):
+    def setWithAdvantage(self):
-        self.advantage=advantage
+        self.advantage=self.advantage+1
+    def setWithDisAdvantage(self):
+        self.advantage=self.advantage-1
+    def setCritRange(self,crit):
+        self.critAbove=crit
 
     def getDamForHit(self):
         dam=dict()
         hits=False
-        if(self.advantage==False):
+        crit=False
-            if(self.hit[0][2]>self.targetAc): #actioncounter styre hvilket rul er tale om
+        if(self.advantage==0):
+            if((self.hit[0]+self.hit[1]) >self.targetAc and (self.hit[0]-self.atkMod)>1): # 0 (rul 1 value), 1 (rul 1 bonus), 2 (rul 2 value), 3(rul 2 bonus)
                 hits=1
-        if(self.advantage==True):
+                if(self.critAbove<(self.hit[0]-self.atkMod)):
-            if(self.hit[0][2]>self.targetAc or self.hit[1][2]>self.targetAc): #actioncounter styre hvilket rul er tale om
+                    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)): 
                 hits=1
+                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 and (self.hit[0]+self.hit[1]) >self.targetAc and (self.hit[0]-self.atkMod)>1)): 
+                hits=1
+                if((self.critAbove<self.hit[2]-self.atkMod) and (self.critAbove<self.hit[0]-self.atkMod)):
+                    self.crits=1
+
         if(hits==1):
-            for d in self.Dam:
+            for d in self.Dam: # Dam def: value,value2,DamType
-                if(dam.get(d[2])==None):
+                if(self.crits):
-                    dam[d[2]]=d[1]
+                    dam[d[2]]=d[0]+d[1]
                 else:
-                    dam[d[2]]=dam[d[2]]+d[1]
+                    dam[d[2]]=d[0]
         return dam
 
-            
+    def getFumble(self):
-
+        fumbles=True
+        if(self.advantage==0):
+            if((self.hit[0]-self.atkMod)>1): # 0 (rul 1 value), 1 (rul 1 bonus), 2 (rul 2 value), 3(rul 2 bonus)
+               fumbles=False
+        if(self.advantage==1):
+            if((self.hit[0]-self.atkMod)>1 or (self.hit[2]-self.atkMod)>1): 
+                fumbles=False
+        if(self.advantage==-1):
+            if((self.hit[0]-self.atkMod)>1 and (self.hit[2]-self.atkMod)>1):
+                fumbles=False
+        return fumbles
+    
 damTypes=["Slashing","Radiant","Great Weapon Master","Divine","Holy Weapon","Great Weapon Master/Radiant"]
 con=0
 def incContext():
@@ -83,13 +110,17 @@ def getContext():
     return con
 def isItTheRightContext(c,line):
     res=0
-
     return res
+
 def checkIfCounts(line):
     estCon=0
     if(re.match("(^_?[0-9]+){1}( \+ [0-9]+)?(  [0-9]+( \+ [0-9])*)?", line)):
         print("match : " + line)
         estCon=1  # attackroll eller dam
+    s=re.search('\([-|\+][0-9]+\)+', line)
+    if(s!=None):
+        print("match modifier: " + line)
+        estCon=3
     return estCon
 
 def getAllDamage(runder):
@@ -111,8 +142,9 @@ def getAllDamage(runder):
         
 
 
-def parseText(runder,lines,ac,advantage):
+def parseText(runder,lines,ac,advantage,critRange):
     line=None
+    attMod=0
     for nextLine in lines:
         nextLine=nextLine.strip()
         if(line==None):
@@ -122,50 +154,69 @@ def parseText(runder,lines,ac,advantage):
         print(line)
         c=checkIfCounts(line)
         
+        if(c==3): # attack modifier
+            s=re.search('\([-|\+][0-9]+\)+', line)
+            v=re.search('[0-9]+', s.group(0))
+            if(s.group(0)[1]=='+'):
+                curAction.setAtkMod(int(v.group(0)))
+            else:
+                curAction.setAtkMod(0-int(v.group(0)))
         if(c==1):
             if(nextLine in damTypes):
                 c=2 # damage
             else:
                 c=1 # to hit
-        if(c==1):
+        if(c==1): # Hit
+            lastActionFumble=False
+            if(len(runder)>0): 
+                lastActionFumble=curAction.getFumble()
             curAction=Action()
             curAction.setTargetAc(ac)
-            curAction.setWithAdvantage(advantage)
+            if(critRange!=20 and critRange!=None): curAction.setCritRange(critRange)
+            if(advantage): curAction.setWithAdvantage()
+            if(lastActionFumble): curAction.setWithDisAdvantage()
             h=line.split("  ")
+            HitArray=[]
             if(h[0].rfind("+")>-1 or h[0].rfind("-")>-1):
                 if(h[0].rfind("+")>-1):
-                    curAction.setActionTypeToHit(int(h[0].split("+")[0])+int(h[0].split("+")[1]),1)
+                    HitArray.append([int(h[0].split("+")[0]),int(h[0].split("+")[1].strip())])
                 else:
-                    curAction.setActionTypeToHit(int(h[0].split("-")[0])-int(h[0].split("-")[1]),1)
+                    HitArray.append([int(h[0].split("+")[0]),0-int(h[0].split("+")[1].strip())])
             else:
-                curAction.setActionTypeToHit(h[0])
+                HitArray.append([int(h[0].strip()),0])
-            if(h[1].rfind("+")>-1 or h[1].rfind("-")>-1):
+            if(len(h)>1):
-                if(h[1].rfind("+")>-1):
+                if((h[1].rfind("+")>-1 or h[1].rfind("-")>-1)):
-                    curAction.setActionTypeToHit(int(h[1].split("+")[0])+int(h[1].split("+")[1]),2)
+                    if(h[1].rfind("+")>-1):
+                        HitArray.append([int(h[1].split("+")[0]),int(h[1].split("+")[1].strip())])
+                    else:
+                        HitArray.append([int(h[1].split("-")[0]),0-int(h[1].split("-")[1].strip())])
                 else:
-                    curAction.setActionTypeToHit(int(h[1].split("-")[0])-int(h[1].split("-")[1]),2)
+                    HitArray.append([int(h[1].strip()),0])
-            else:
+            curAction.setActionTypeToHit(HitArray)
-                curAction.setActionTypeToHit(h[1],2)
             runder.append(curAction)
-        if(c==2):
+        if(c==2): # Skade
             if(len(runder)==0):
                 continue
             curAction=runder[len(runder)-1]
             if(line.rfind("+")>-1 or line.rfind("-")>-1):
                 if(line.rfind("+")>-1):
-                    curAction.setActionTypeToDam(int(line.split("+")[0])+int(line.split("+")[1]),nextLine)
+                    curAction.setActionTypeToDam(int(line.split("+")[0]),int(line.split("+")[1].strip()),nextLine)
                 else:
-                    curAction.setActionTypeToDam(int(line.split("-")[0])+int(line.split("-")[1]),nextLine)
+                    curAction.setActionTypeToDam(int(line.split("-")[0]),0-int(line.split("-")[1].strip()),nextLine)
             else:
-                curAction.setActionTypeToDam(int(line),nextLine)
+                curAction.setActionTypeToDam(int(line.strip()),0,nextLine)
         line=nextLine
-
+file1 = open("input.txt", "w") 
 @app.route('/', methods=['GET', 'POST']) 
 def main():
     form = MyForm() 
     runder: List[Action] = list()
     if form.validate_on_submit():
-        parseText(runder,form.chatTekst.data.splitlines(),form.ac.data, form.advantage.data)
+        for a in form.chatTekst.data.splitlines():
+            file1.writelines(form.chatTekst.data.splitlines())
+        parseText(runder,form.chatTekst.data.splitlines(),form.ac.data, form.advantage.data, form.critRange.data)
+        
+
     dam=getAllDamage(runder)
     return render_template('index.html', dam=dam, form=form)
 if __name__ == '__main__':

templates/index.html

@@ -7,6 +7,7 @@
     <form method="post" action="/" enctype="multipart/form-data"> 
         {{ form.csrf_token }}
         <p>{{ form.ac.label }} {{ form.ac() }}</p>
+        <p>{{ form.critRange.label }} {{ form.critRange() }}</p>
         <p>{{ form.advantage.label }} {{ form.advantage }}</p>
         <p>{{ form.chatTekst.label }} {{ form.chatTekst(rows='40',cols='60') }}</p> 
         <p><input type="submit" value="Submit"></p>