merge plsrge branch 'main' of https://github.com/makayla-moster/Hamme…

…rBot

cog_modules/random/cog.py

@@ -1,5 +1,6 @@
 import asyncio
 import os
+import pickle
 import random
 
 import discord
@@ -10,8 +11,6 @@
 from gizmopics import *
 from resources import gizmoResources
 
-import pickle
-
 load_dotenv()
 CATS = os.getenv("x-api-key")
 botDMs = int(os.getenv("DMChannel"))
@@ -44,7 +43,7 @@ async def gizmo(self, ctx: commands.Context):
         info = f"Gizmo #{num + 1} of {len(gizmoPics)}."
         pic = gizmoPics[num]
         gizmoResources[pic] += 1
-        with open('gizmoResources','wb') as f:
+        with open("gizmoResources", "wb") as f:
             pickle.dump(gizmoResources, f)
         most_common = gizmoResources.most_common(1)
         if pic == most_common[0][0]:

resources.py

@@ -1,5 +1,6 @@
-from collections import Counter
 import pickle
+from collections import Counter
+
 serverResources = {
     "quela": {"Food": "-1068", "Wood": "449", "Gold": "-826", "Stone": "12"},
     "bshammer": {"Food": "-1250", "Wood": "-622", "Gold": "-850", "Stone": "1942"},
@@ -8,7 +9,7 @@
     ".harristotle": {"Food": "-2241", "Wood": "560", "Gold": "-986", "Stone": "-706"},
 }
 try:
-    with open('gizmoResources','rb') as f:
+    with open("gizmoResources", "rb") as f:
         gizmoResources = pickle.load(f)
 except FileNotFoundError:
     gizmoResources = Counter()