Account for crayon losses

loggen.py

@@ -1,5 +1,20 @@
 import datetime,os
-import log,skel,tcgcore
+import log,skel,tcgcore,variables
+
+def crayonlog(colour,event):
+    crayonno = event["crayons"][colour]
+    if variables.british:
+        if colour == "gray":
+            crayonrend = "grey"
+        else:
+            crayonrend = colour
+    else:
+        crayonrend = colour
+    if crayonno > 0:
+        crayonstring = "+" + str(crayonno) + " " + crayonrend
+    else:
+        crayonstring = str(crayonno) + " " + crayonrend
+    return crayonstring
 
 def loggen():
     if not os.path.isdir("build/log"):
@@ -26,65 +41,51 @@ def loggen():
             pass
         try:
             if event["crayons"]:
-                crayontypes = len(event["crayons"])
+                content.write("Crayons: ")
-                content.write("Gained crayons: ")
                 try:
-                    redno = event["crayons"]["red"]
+                    content.write(crayonlog("red",event))
-                    content.write(str(redno) + " red")
                     if list(event["crayons"])[-1] != "red":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    orangeno = event["crayons"]["orange"]
+                    content.write(crayonlog("orange",event))
-                    content.write(str(orangeno) + " orange")
                     if list(event["crayons"])[-1] != "orange":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    yellowno = event["crayons"]["yellow"]
+                    content.write(crayonlog("yellow",event))
-                    content.write(str(yellowno) + " yellow")
                     if list(event["crayons"])[-1] != "yellow":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    greenno = event["crayons"]["green"]
+                    content.write(crayonlog("green",event))
-                    content.write(str(greenno) + " green")
                     if list(event["crayons"])[-1] != "green":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    blueno = event["crayons"]["blue"]
+                    content.write(crayonlog("blue",event))
-                    content.write(str(blueno) + " blue")
                     if list(event["crayons"])[-1] != "blue":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    purpleno = event["crayons"]["purple"]
+                    content.write(crayonlog("purple",event))
-                    content.write(str(purpleno) + " purple")
                     if list(event["crayons"])[-1] != "purple":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    brownno = event["crayons"]["brown"]
+                    content.write(crayonlog("brown",event))
-                    content.write(str(brownno) + " brown")
                     if list(event["crayons"])[-1] != "brown":
                         content.write(", ")
                 except:
                     pass
                 try:
-                    grayno = event["crayons"]["gray"]
+                    content.write(crayonlog("gray",event))
-                    if variables.british:
-                        content.write(str(grayno) + " grey")
-                    else:
-                        content.write(str(grayno) + " gray")
-                    if list(event["crayons"])[-1] != "gray":
-                        content.write(", ")
                 except:
                     pass
                 content.write(".")