brunogge 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

brunogge/__init__.py

@@ -3,4 +3,4 @@ from .ggs_stuff import ggs_login, keeping
 from .just_funcs import fakescanning, check_updates
 from .getconfig import getconfig
 __all__ = [ "ggs_ws", "ggs_login", "fakescanning", "getconfig", "keeping", "check_updates" ]
-__version__ = "0.1.6"
+__version__ = "0.1.8"

brunogge/getconfig.py

@@ -29,14 +29,6 @@ def getconfig(type:str ,savename:str ,created: str | None = "y") -> dict:
                 front_tool_ammount1 = config.getint(savename, "front_tool_ammount1")  # converted to int
                 front_id_2 = config.get(savename, "front_id_2")
                 front_tool_ammount2 = config.getint(savename, "front_tool_ammount2")  # converted to int
-                if kid == "g":
-                    kid = "0"
-                elif kid == "s":
-                    kid = "1"
-                elif kid == "c":
-                    kid = "2"
-                elif kid == "f":
-                    kid = "3"
                 # Return as a dictionary
                 result = {
                     "nick": nick,
@@ -60,13 +52,15 @@ def getconfig(type:str ,savename:str ,created: str | None = "y") -> dict:
                 # Convert to JSON string and return
                 return json.dumps(result, indent=4)  # Return a formatted JSON string
     if created == "n":
-        config_maker_barons(savename)
+        home_directory = os.path.expanduser("~")
+        configname = os.path.join(home_directory, type + "config.ini")
+        config_maker_barons(savename, configname)
     else:
         print("Invalid str as the created parameter. Use 'y' or 'n' - y if you have created the config already, 'n' if no.")
         exit()
 
 
-def config_maker_barons(savename, filename = "baronconfig.ini"):
+def config_maker_barons(savename, filename: str | None = None):
     config = ConfigParser()
     unit_options = {
         "1": ("Distance Samurai", '35'),
@@ -145,14 +139,17 @@ def config_maker_barons(savename, filename = "baronconfig.ini"):
             else:
                 print("Input cannot be empty.")
 
-
+    nick = input("Enter your nickname: ")
+    config.set(save_name, "nick", nick)
+    passwd = input("Enter your password (stored local): ")
+    config.set(save_name, "pwrd", passwd)
     kid = input("Kingdom Green = g, Kingdom Fire = f, Kingdom Sand = s, Kingdom Cold = c\nKingdom -> <-\b\b\b")
     config.set(save_name, "kid", kid)
 
     excluded_commanders = input_int_list("Enter excluded commanders (comma separated integers, e.g. 2,3,17. -1 if none): ")
     config.set(save_name, "excluded_commanders", excluded_commanders)
     
-    radius_option = input("Attacking in a circle (radius) or a square (square)?\n(c/s) -> <-\b\b\b")
+    radius_option = "c"
     config.set(save_name, "radius_option", radius_option)
 
     distance = input_int("Distance for attacks (not preicse): ")
@@ -222,3 +219,4 @@ def config_maker_barons(savename, filename = "baronconfig.ini"):
         config.write(f)
     
     print(f"\nConfiguration saved.")
+    exit()

brunogge/ggs_stuff.py

@@ -49,13 +49,21 @@ async def ggs_login(ws, nick: str, pwrd: str, server: str, kid: int | None = 0)
                 response = await asyncio.wait_for(ws.recv(), timeout=4)
                 response = response.decode('utf-8')
                 if "%xt%jaa%1%0%" in response:
-                    pattern = rf"\[{kid},(\d+),(\d+),(\d+),1"
-                    match = re.search(pattern, response)
-                    cid = match.group(1)
-                    global sx, sy
-                    sx = match.group(2)
-                    sy = match.group(3)
+                    sx_list = []
+                    sy_list = []
+                    cid_list = []
+                    for i in range(4):
+                        pattern = rf"\[{i},(\d+),(\d+),(\d+),1"
+                        match = re.search(pattern, response)
+                        cid = match.group(1)
+                        sx = match.group(2)
+                        sy = match.group(3)
+                        sx_list.append(sx)
+                        sy_list.append(sy)
+                        cid_list.append(cid)
+                        print(f"Coord {i} X: {sx}, Coord Y: {sy}")
                     break
+
             except asyncio.TimeoutError:
                 break
 
@@ -71,9 +79,7 @@ async def ggs_login(ws, nick: str, pwrd: str, server: str, kid: int | None = 0)
                 break
     else:
         print("Connection closed, stopping login")
-    sx = int(sx)
-    sy = int(sy)
-    return sx, sy, lids, cid
+    return sx_list, sy_list, lids, cid_list
 
 async def keeping(ws, server: str) -> None:
     """Keep the connection alive by sending periodic messages."""

brunogge/just_funcs.py

@@ -44,9 +44,9 @@ def getserver(server: str, option: str | None = "full") -> str:
         elif option == "ws":  
             return wsuri
         
-async def fakescanning(ws, server: str) -> None:
+async def fakescanning(ws, server: str, kid: str | None = "0") -> None:
     """
-    Fake scanning the map while doing other things (only on green map)
+    Fake scanning the map while doing other things
     
     """
     empireex = getserver(server, "ex")
@@ -54,12 +54,12 @@ async def fakescanning(ws, server: str) -> None:
     while ws.open:
         for delay in delays:
             print("Fake scanned...")
-            await ws.send(f"""%xt%{empireex}%gaa%1%{{"KID":0,"AX1":0,"AY1":0,"AX2":12,"AY2":12}}%""")
-            await ws.send(f"""%xt%{empireex}%gaa%1%{{"KID":0,"AX1":1274,"AY1":0,"AX2":1286,"AY2":12}}%""")
-            await ws.send(f"""%xt%{empireex}%gaa%1%{{"KID":0,"AX1":13,"AY1":0,"AX2":25,"AY2":12}}%""")
-            await ws.send(f"""%xt%{empireex}%gaa%1%{{"KID":0,"AX1":1274,"AY1":13,"AX2":1286,"AY2":25}}%""")
-            await ws.send(f"""%xt%{empireex}%gaa%1%{{"KID":0,"AX1":0,"AY1":13,"AX2":12,"AY2":25}}%""")
-            await ws.send(f"""%xt%{empireex}%gaa%1%{{"KID":0,"AX1":13,"AY1":13,"AX2":25,"AY2":25}}%""")
+            await ws.send(f"""%xt%{empireex}%gaa%1%{{"{kid}":0,"AX1":0,"AY1":0,"AX2":12,"AY2":12}}%""")
+            await ws.send(f"""%xt%{empireex}%gaa%1%{{"{kid}":0,"AX1":1274,"AY1":0,"AX2":1286,"AY2":12}}%""")
+            await ws.send(f"""%xt%{empireex}%gaa%1%{{"{kid}":0,"AX1":13,"AY1":0,"AX2":25,"AY2":12}}%""")
+            await ws.send(f"""%xt%{empireex}%gaa%1%{{"{kid}":0,"AX1":1274,"AY1":13,"AX2":1286,"AY2":25}}%""")
+            await ws.send(f"""%xt%{empireex}%gaa%1%{{"{kid}":0,"AX1":0,"AY1":13,"AX2":12,"AY2":25}}%""")
+            await ws.send(f"""%xt%{empireex}%gaa%1%{{"{kid}":0,"AX1":13,"AY1":13,"AX2":25,"AY2":25}}%""")
             await asyncio.sleep(delay * 60) 
 
 import subprocess

{brunogge-0.1.6.dist-info → brunogge-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brunogge
-Version: 0.1.6
+Version: 0.1.8
 Summary: Bilbioteka Python dla Goodgame Empire.
 Author-email: WojtS & ThunderStorm <wojts8@proton.me>
 Project-URL: Homepage, https://github.com/wojtsik/brunogge

brunogge-0.1.8.dist-info/RECORD

@@ -0,0 +1,11 @@
+brunogge/__init__.py,sha256=lxhk6fCOWa-8iQQW4UnBHc8d2ZxfrLl9dNj0a7jFxTM,275
+brunogge/barony.py,sha256=6Xm-i5AaXa8oVQ_kzX0_tDZucoBVplF7gYTGuad6djk,14891
+brunogge/get_ws.py,sha256=nPsvNReq4DzflvOItHOd3WgajAV7f3ckeZr8qRADYsI,709
+brunogge/getconfig.py,sha256=5vS0MY694E2wgJCxr3Phrfc5Gakru8u2EIherlkW-2k,9756
+brunogge/ggs_stuff.py,sha256=vfjB5shnOHsOgyuUfRrsKs4gOfXsIGvgf_7Gu_Q6yoQ,5080
+brunogge/just_funcs.py,sha256=H5cuxNYnWrs7hgr4XCM7RZRkcbFUuAiS306vIx_4nWI,3956
+brunogge/server_list.json,sha256=5hZrlPH7tbFY7m1bqMMgsKiyHkGiPTnVMAW2B9WLabc,5084
+brunogge-0.1.8.dist-info/METADATA,sha256=v3q6Ejx1v4jkosZRby0yhEd5xomyT0BOu-Qrf0ke1eU,328
+brunogge-0.1.8.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+brunogge-0.1.8.dist-info/top_level.txt,sha256=oTTOxi0gm7TPhnipjl1nIXsYLRrnWnDzKKLCfRVhAjw,9
+brunogge-0.1.8.dist-info/RECORD,,

brunogge-0.1.6.dist-info/RECORD

@@ -1,11 +0,0 @@
-brunogge/__init__.py,sha256=oN1NvcC60bbtO24YFFRSbnRmBIgK1LCsSDfx-lwZ2Q8,275
-brunogge/barony.py,sha256=6Xm-i5AaXa8oVQ_kzX0_tDZucoBVplF7gYTGuad6djk,14891
-brunogge/get_ws.py,sha256=nPsvNReq4DzflvOItHOd3WgajAV7f3ckeZr8qRADYsI,709
-brunogge/getconfig.py,sha256=fnFnuAAUdffK2ywjOsDtFCvKbzWSzoKYFw2lSo-zccI,9761
-brunogge/ggs_stuff.py,sha256=QCBgVxbzfkr_pz1IFD11SVtGxzbYb-lgYjuJJLZgkwU,4771
-brunogge/just_funcs.py,sha256=KDKzWU7zJlF1iGae2Lx3GaXABQRa99VRd2eOKkmbh9s,3941
-brunogge/server_list.json,sha256=5hZrlPH7tbFY7m1bqMMgsKiyHkGiPTnVMAW2B9WLabc,5084
-brunogge-0.1.6.dist-info/METADATA,sha256=ixxRYxskYkvsjFkS-r6-vbRFhzDer8n90ftfSZbxzyA,328
-brunogge-0.1.6.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-brunogge-0.1.6.dist-info/top_level.txt,sha256=oTTOxi0gm7TPhnipjl1nIXsYLRrnWnDzKKLCfRVhAjw,9
-brunogge-0.1.6.dist-info/RECORD,,