Character Template

swroll.py

@@ -3,7 +3,7 @@ import re
 import string
 import json
 
-from swchar import getName, charData
+from swchar import getName, charData, lightsaberChar, userHasChar
 
 with open("skills.json", "r") as f:
     skillData = json.load(f)
@@ -112,9 +112,27 @@ def parseRoll(user : str,cmd : str = ""):
     else:
         rollParameters = [0,0,0,0,0,0,0]
 
-    if string.capwords(cmd[0]) in skillData:
-        skillLevel = charData(user,"Skills " + string.capwords(cmd[0]))
-        charLevel = charData(user,"Characteristics " + string.capwords(skillData[cmd[0]]))
+    if string.capwords(commands[0]) in skillData:
+        if userHasChar:
+            skillLevel = charData(user,"Skills " + string.capwords(commands[0]))
+
+            if string.capwords(commands[0]) == "Lightsaber":
+                charLevel = charData(user,"Characteristics " + lightsaberChar(user))
+            else:
+                charLevel = charData(user,"Characteristics " + skillData[string.capwords(commands[0])])
+
+            abilityDice = abs(charLevel-skillLevel)
+            proficiencyDice = min(skillLevel,charLevel)
+
+            commands = [str(abilityDice)] + [str(proficiencyDice)] + commands[1:]
+        else:
+            return "You don't have a user. You can make one with !swchar"
+
+    elif string.capwords(commands[0]) in ["Ranged","Piloting"]:
+        if string.capwords(commands[0]) == "Ranged":
+            return "Did you mean \"Ranged - Heavy\" or \"Ranged - Light\""
+        else:
+            return "Did you mean \"Piloting - Planetary\" or \"Piloting - Space\""
 
     try:
         for x in range(len(commands)):