From 5e362001b9b19055725b53f082c2f7ed0c76ce64 Mon Sep 17 00:00:00 2001
From: NikolajDanger <nikolajgade@live.dk>
Date: Sun, 22 Mar 2020 16:18:38 +0100
Subject: [PATCH] Character Template

---
 __pycache__/swchar.cpython-36.pyc | Bin 1909 -> 3188 bytes
 __pycache__/swroll.cpython-36.pyc | Bin 4189 -> 4744 bytes
 characters.json                   |  52 +++++++++++++++-
 skills.json                       |   3 +-
 swchar.py                         |  98 ++++++++++++++++++++++++++----
 swroll.py                         |  26 ++++++--
 testing.py                        |   2 +-
 7 files changed, 160 insertions(+), 21 deletions(-)

diff --git a/__pycache__/swchar.cpython-36.pyc b/__pycache__/swchar.cpython-36.pyc
index 9066cd2172ec365d5eb22b053b1cf67a72730a3e..ac9b0c12011b02b1a8b76bfc0d55452842fdc94f 100644
GIT binary patch
literal 3188
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

literal 1909
zcmbtUOK&4Z5boEE$ByF!h~gv!F~DjgUvhwz5UYp<B@zduNF<69EVI(AyElGJW@fwF
zacqqxBriwA{($`h{H3{a%9#tw0a4YH#L*&7%&4oos`^p=^;h-9@^bA@Ieu=cg#1As
zd>)Lyfo9G?NFr%W+GS7MR58ikQpu%wE!tcO>4E0U3TU2OQ9?18QGLs0O)kCm+P+*x
z3)t#lTb2#5RU|zot@o~BcXHUGg%}y7yA)OUI5dce>_anqAS^^6*_{2hI-`~jSWf43
z#!exkAIK3oBRR?0(AQ6LmXl2)`6f9A+cEgz6md9R>GmQWb*<87cVN<_pt=x;(S>U9
zLZq2W3gOHmP9xdkn!%X`eOU+@+30toYoOme*?-zOfiO+yus=-WXwW%OW@yu_W4gMZ
zS=0G$tP+{VlcZzDc;aq0DJtj6;z<JUg8L9!r)w;rb*Af}!R2}PLf+pUk@umwyZ;OW
z3pat=QtStGj$<b2j9<O5%yL9xP7laWM>CNN$=2caL$1$q@Z<up5KUqQ-~!`0Z4&7<
z$(LltUp@ZM8UEdjQ<8JQuX0$BYkZPxgk{Q}hBvfY&|1qYMBF#F@Gqlyq)g%IC^=UJ
zj{#3^tZsRF8CDcxs3u0Q;n3I0jAC2RD~D+*me5l*%ARBg{jS9|W)%dXfD#q-eUP8B
zM^t|ZHr)ULPlWs^IPC1s=wf{MVSi7Z7oY$P1gP;m2hfI0Zva&&(&K6yEDXs4Rv?ZP
zlKcYtjJ?`AC6jH08)wdG&Jc2>R!;XEtti1?dbb4g4_#0i>3c)NYwV{hr#el}LnKgW
zCz(Q$yS@xvZ^I-P`ny2*aheWKvJLQ?br6UG{H#G&DT5XOB0kk2cy5`x*y|pK0K6YS
zb1b@qfF5KJcNxUtQeu%omJfu>Du62&L;nrc2{H)t$!R_7m0Agk^@qV5qW=cq5Wvh<
z9(p1B*dUN%PNfHsdO5Sz+ykwI*tfOC?A*)!IiFQv|H_==zWT5Hez(0cavySkeTI=Q
z!AdSGGWeBKvWQ<+%N=EHlK{(?n($anc;>uvOp;z1CERIkaW2Mqr~SWEWF1apcv>Rl
zvXhNlYOMUb_GqMNNtlmtglsA3_!<jDi?;oKB2{9i!F~_3NroC7Q@&%usR(TvPM__k
zqgW<8Hhc+lL)(k2quFlwtybYA9ff9eH^@{R!ybJbc2liY*T$1))31JnIWol^deNl{
zqwu~w?uO{=MoD-P4ON&XDjfH1FZ`q|Xsx=&`lPWy=?aL#hdl2m=k1^yW#d#!qd!Ko
zkdVkOUklG<ao=jBvLh|{Mi*Hta7A`OU5%7=S>5&%HU3^rTo0wOT`x1@$d!(F(<Q*z
z4<O4P!+P^Mh_b-eSdBL5I;6`grVd+Ubtofsx<xmb55Bt7x1g~2Oz*&|7A;H5Z5Nc6
v{0uz0i2{qYeuTo6p%6#7?m<9U-nFY{!QMqGN3r@EU)Pm=m%`P?(puvmm6nyi

diff --git a/__pycache__/swroll.cpython-36.pyc b/__pycache__/swroll.cpython-36.pyc
index 346a5a2f7fb1d8f0a81a9366299589ed87ce31d0..6a19d7a3c4d5fa91416aa8d009d3a39ef16c0a1d 100644
GIT binary patch
delta 2267
zcmZWq&2Jk;6rb5$@2=PJM;yl=O`2|;w8iuzEv<w~i>PRjdI(ioqXsOsu=PxnP3(0#
zJN-zskt?~C5Ep`$3sMhU;eZ6Kgv1FD5*O}Bix3AuDt`b%;sS4Gjq8|<=C||Syx*Jm
zo+od9w%<KCcPgE>9&X*e{z3_%U(wKC4%X*k`rmypce2|y8b;e}m>AI{QHj=5-p@5G
zs;;M~)x(Xk6-4l5bOpVMNQI_{2QeNQ#3acFiAIKIiS-DR6d8M<HFA9^O)?;j(>%$-
zUXF}|G(oeln}4K`2~q(0a)IoVsv@XLqzuj`39h5s)E^?`OEoPrRw=*av}t5E*BrL!
za3{*N+|@PiJ2xo10J<o3+o$ZJ;|t;Qe-0_(f?BSy3^-s}fJkT5zun>yzV``Y`@^fM
zYaRf74YR4o->X@CK-7ed3z!g45Kt757cd$Asm-S=u#8mahF?ptsqj!@CO0iM_YYtu
zd?Rrd&xgB-FZI}A__{ui^C8m@;fe4gz(V*nXePto^*LM&lg2zQhsTXsTnd*BdtSJz
zsccFdl%Va-x*KUC=RIe9XuOIKKmO5BG0ufQnKf*LiR3ai!>h?~R>TM%o)a-06!5<g
zE$bzGEPTy6<H*w#c3hY(2pGx)L|OMmw@Gh;;41(KvlD<!<W`G`k=ksNrrZSO7)(*`
z3o!jp)$kYVR#zcv1@$o3H}qZ1rnv!F<Ys_~!L{{7(BChip0cA2Ylyj_uy3Vhk|zW3
zA#D=gbYG_rTUSuL%dH?0Xl1b8(RnJ+x<LXQ8+<I#dw3PY*AU+lf`c`J9x8&kqj(yz
z>c~4W?2^pLkeBx8QX2{+aFL|zh-B($7jJ#Fi|>8G(>xO>J>0{Kpu6_*ju|L{Nwjho
zRS-#Rs6cwBuM!%l3CT)VpYiN7{d$gM2?X53flAbK;Of>WD<@gMjj(b9mbRDG?H@J{
zG=-H%XyXG~{v7h2J_|$!I3YPpBb<o=M+eT65l%sJ?hiO3f5@sZAWZ`4{s^fkNlyl(
zm{S~ZO2Anf;gluk=?JGh;8cJE>2{ydL{a5$g5nabpcUj<7>Pml)e#>TMXw-0O=4c6
zE^$&~Nn!;qw6T-q`5+0`%;FQ`a_*!8D@ei*t+Mxm6qza^UI^4)7p@wa24PYd!+O71
z$5bKL(U9?oEnG3!uN}Cwt=LEY#x}$7f5i*|vb~tF+BWJNZmZ?n4Qpx86Ss4s5jssy
zS=aTs+w|@2({FWd+oa<i=JuL%huV%UdggIksGE*wx19}YcRXs}b@`e->)#cPC(^Gt
z-YO-Lx$L$&-1SzsPcFK|-U3pa0;?MD+sEvS)VZ@&wL5G`2N8K|yt;j6FXumBz*=rO
z9_0?}GlzESn@*EfW&e%va@>q-kZ^=AFnG}rdtQKS*+;}mw(O&!oq4gKuv0>F8lYBW
zvtnHh-_9(oB*an`pb3}*h}5?0MXJvki~D<vg6MiYG8o-#K@3d16l`9A=yU9tfWrW_
zvAB1h41dVfjx>^@U`zB4Z8cKP4Y%d;Ezvz2*-h5D={8;JHKl@0hks?}x+Bdtx#=*U
zUg@-2F1Yru10Y<)V=ye31tqT(u#U@09@f(eXqBp>gRX!z1qRsWVcPvU1K&MUsRCP5
zPADb}3m-kNuvbM6Mtq;-%@X%1zGG4x06dej<rmpLVId28Cj2HlbuF%=C~Ks3HlcF(
zW~8+`4q<17<tqYY`Cb+)Swm4duz_nCS5m$xB9x)$N7iO0T*%Gj%8)7~T*;I(#Y`cm
F{tFUm?2!Nf

delta 1732
zcmZ`(%WGU!7(d^+?>nzMk7Q<&m`<BX>}}G<B2ubB#1=O~s2wCFpfKiKbsl;2%q@N0
zFpKHJg<$Lz-2~SWTnIr#km}OE;fgB}6kND)B`*BFGi97k<2{_;e6Qbmd~?3<gT<d~
z3(sdV?&n*#-##ib_6r;PJd|I-+57I}g^PV)fh9Dd5BNvkrX6T)C$I;w>25FqZ?Nm^
z1{2jFH9mxOXbD?54~)%pkP+@7h?Gb_&^NP>wT#H3mJ2+QL!T$|sO5tUdJBhK6h#U3
zf|ya3m1#7UMFkft3TQBY_IEn!y3Z5qy&zm~ZU>3I^?p-cZHCR`IxO*v7W$=4;1IY3
zDS|XX1|czJ(7V+Q6S(sQle6)Ctz|!hb{}N*_zx`yr?M29BghjJ2ucK$99fKKjC!Vw
zVxl$Q>G_7N#;+Um-V8ZsM=%%PHC}=<@z=&T=5WDSnsxBv&&(yr$Bz&T@vmqp#;&yh
zrTBtXhv~RsorbCSmQ}0MQobguw2={P@3vcsPIrA`k8iD4Ve$AMO9RM0bbK)4bIvs|
z<NHp0nvRGIEYXn`2%b9Os{0}=$8GoWoZ5`b6$(2~Fn*Em-OBk3WTboe!>B~t+7??J
z4fIj2DPdP|_I~5Bp1Rowp;g%cLbGGaPeLnV!V2}a5k0n-*?{ls2XObR1GsY(+MyHi
z0Sw?OJAk)7-8Uj08A7kHDicOWlSgAZt}E;gmw$%tf7W&ipPezlH6l%DYpj2BlHzpu
z0m%9U$r+LKHTD$8Rh%0W9CyS?oxn*ePXEIRQhG!(PatI!>4ynUX2i*!z{x4jUlW|%
zkkiLBcqfqZNaFJB1Svn-s6d=?FC}#NSCD6eZLl2|7!6TuurN*Ot};YjVM?J{?UO01
z6i;CRUxT%8hMCA5z`hk`BYYkEc4S3nN5doi7}=s!W??SU22f^V3T2OCQJyAw$RxeN
z{y(<C1p58*o9p*@ZTWAgNx(-b4FXk%CQA3LMyJ*7_G+r66Sy|4?`P4Kz!f<~!Dk6n
z7w}0^UEo~&Q|^+Tm#4^5i<i9Bmo*ZH-Jl!nBwA}HOe`7fb(>p(q`o505KyJaWr9Tn
z-x-$LYW$^#1vT?9ztA76IE+Y~y{7C1*LS<!7OK715Ex8D8i$Ls#0$It6|SSrgA&Z+
z?}?MwzyzH?$88)gtZ=!8EBV$iBPutP5sAGX@kzjzs7k&hE96wSegUOKZ})b060>((
zH6(R6%0r^>?qLq#-9+#1Hif)Itjh$Hh(zm!a+nRu0mih@pmKuUrOed9#u|@G$XvWx
TnD;zRH=e6zE7|F6$<zJ?f^<@i

diff --git a/characters.json b/characters.json
index c6f7c2d..060ddd1 100644
--- a/characters.json
+++ b/characters.json
@@ -20,8 +20,54 @@
             "Willpower": 0,
             "Presence": 0
         },
-        "Skills" : {
-            
-        }
+        "Skills": {
+            "Astrogation": 0,
+            "Computers": 0,
+            "Cool": 0,
+            "Vigilance": 0,
+            "Mechanics": 0,
+            "Melee": 0,
+            "Perception": 0,
+            "Piloting - Space": 0,
+            "Ranged - Heavy": 0,
+            "Ranged - Light": 0,
+            "Athletics": 0,
+            "Coercion": 0,
+            "Coordination": 0,
+            "Charm": 0,
+            "Medicine": 0,
+            "Negotiation": 0,
+            "Piloting - Planetary": 0,
+            "Stealth": 0,
+            "Skullduggery": 0,
+            "Brawl": 0,
+            "Discipline": 0,
+            "Gunnery": 0,
+            "Core Worlds": 0,
+            "Outer Rim": 0,
+            "Underworld": 0,
+            "Leadership": 0,
+            "Lore": 0,
+            "Resilience": 0,
+            "Streetwise": 0,
+            "Survival": 0,
+            "Xenology": 0,
+            "Lightsaber": 0
+        },
+        "Lightsaber Characteristic": "Brawn",
+        "Obligations": {},
+        "Morality": {
+            "Emotional Weakness": "",
+            "Emotional Strength": "",
+            "Conflict": "",
+            "Morality": ""
+        },
+        "Credits": 0,
+        "Equipment": [],
+        "Armor": "",
+        "Critical Injuries": {},
+        "Weapons": {},
+        "Talents": {},
+        "Force Powers": {}
     }
 }
\ No newline at end of file
diff --git a/skills.json b/skills.json
index 5339172..e975711 100644
--- a/skills.json
+++ b/skills.json
@@ -29,5 +29,6 @@
     "Resilience" : "Brawn",
     "Streetwise" : "Cunning",
     "Survival" : "Cunning",
-    "Xenology" : "Intellect"
+    "Xenology" : "Intellect",
+    "Lightsaber" : "Brawn"
 }
\ No newline at end of file
diff --git a/swchar.py b/swchar.py
index 4b8613e..37b1928 100644
--- a/swchar.py
+++ b/swchar.py
@@ -11,20 +11,54 @@ def getName(user : str):
         return user
 
 def setUpDict(cmd : dict):
-    keys = list(cmd)
-    values = list(cmd.values())
-    result = ""
-    for x in range(len(keys)):
-        if x%3 != 2:
-            result += keys[x] + ": " + str(values[x]) + "\t"
+    if bool(dict):
+        keys = list(cmd)
+        values = list(cmd.values())
+        result = ""
+        if type(values[0]) is dict:
+            return ", ".join(values)
         else:
-            result += keys[x] + ": " + str(values[x]) + "\n"
-    return result
+            for x in range(len(keys)):
+                if x%3 != 2:
+                    result += keys[x] + ": " + str(values[x]) + "\t"
+                else:
+                    result += keys[x] + ": " + str(values[x]) + "\n"
+            return result
+    else:
+        return "There doesn't seem to be anything here..."
 
 def lookUp(data : dict, key : str, cmd : str = ""):
+    if cmd == " ":
+        cmd = ""
+    elif cmd != "":
+        while cmd[0] == " ":
+            cmd = cmd[1:]
+            if cmd == "":
+                break
+
     if key in data:
         if cmd == "":
-            return data[key]
+            if type(data[key]) is dict:
+                return setUpDict(data[key])
+            else:
+                return data[key]
+        elif cmd[0] == '+':
+            try:
+                cmd = cmd[1:]
+                while cmd[0] == ' ':
+                    cmd = cmd[1:]
+            except:
+                return "Can't do that"
+
+            if type(data[key]) is int:
+                try:
+                    newValue = data[key] + int(cmd)
+                    data[key] = newValue
+                    return data
+                except:
+                    return "Can't add that"
+            else:
+                return "Can't add that"
         else:
             while cmd[0] == ' ':
                 cmd = cmd[1:]
@@ -34,12 +68,22 @@ def lookUp(data : dict, key : str, cmd : str = ""):
                 return data
             except:
                 return "Wrong data type"
+    else:
+        return key + " doesn't exist"
 
-def charData(user : str, key : str,cmd : str = ""):
+def charData(user : str,cmd : str):
     with open("characters.json", "r") as f:
         data = json.load(f)
 
-    key = string.capwords(key)
+    key = string.capwords(cmd.split(" ")[0])
+    cmd = cmd[len(key):]
+    if cmd == " ":
+        cmd = ""
+    elif cmd != "":
+        while cmd[0] == " ":
+            cmd = cmd[1:]
+            if cmd == "":
+                break
 
     if user in data:
         if key in data[user]:
@@ -47,7 +91,7 @@ def charData(user : str, key : str,cmd : str = ""):
                 if cmd == "":
                     return setUpDict(data[user][key])
                 else:
-                    newKey = cmd.split(" ")[0]
+                    newKey = string.capwords(cmd.split(" ")[0])
                     newcmd = cmd[len(newKey):]
 
                     lookUpResult = lookUp(data[user][key],newKey,newcmd)
@@ -62,6 +106,22 @@ def charData(user : str, key : str,cmd : str = ""):
             else:
                 if cmd == "":
                     return data[user][key]
+                elif cmd[0] == '+':
+                    try:
+                        cmd = cmd[1:]
+                        while cmd[0] == ' ':
+                            cmd = cmd[1:]
+                    except:
+                        return "Can't do that"
+
+                    if type(data[user][key]) is int:
+                        try:
+                            data[user][key] += int(cmd)
+                            return "Added " + cmd + " to " + user + "'s " + key
+                        except:
+                            return "Can't add that"
+                    else:
+                        return "Can't add that"
                 else:
                     data[user][key] = cmd
                     with open("characters.json", "w") as f:
@@ -71,3 +131,17 @@ def charData(user : str, key : str,cmd : str = ""):
             return "Couldn't find that data. Are you sure you spelled it correctly?"
     else:
         return "You don't have a character. You can make one with !swchar"
+
+def lightsaberChar(user : str):
+    with open("characters.json", "r") as f:
+        data = json.load(f)
+
+    if user in data:
+        return data[user]["Lightsaber Characteristic"]
+
+def userHasChar(user : str):
+    with open("characters.json", "r") as f:
+        data = json.load(f)
+
+    return user in data
+
diff --git a/swroll.py b/swroll.py
index 807bcb7..b0df393 100644
--- a/swroll.py
+++ b/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)):
diff --git a/testing.py b/testing.py
index 1396edf..fc1c33c 100644
--- a/testing.py
+++ b/testing.py
@@ -1,4 +1,4 @@
 from swchar import charData
 from swroll import parseRoll
 
-print(charData("Template","Name","Jo Jo"))
\ No newline at end of file
+print(charData("Template","characteristics    "))
\ No newline at end of file