Update plugins/safari.py

plugins/safari.py

@@ -1,273 +1,168 @@
 from telethon import events
 from asyncio import sleep as zzz
-from random import randint, random
+from random import randint
 import time
-from . import kanha_bot
+from . import *
 
 chat = "@HeXamonbot"
 infomers = "@teamkanha"
 informer = "@princeji211"
 
 hoenn = False
-hunt_attempts = 0
-hunt_lock = False
-hunt_delay = 3
-hunt_monitor_task = None
-last_hunt_time = 0
+hexa_speed = 3
 
 pokemon_list = [
-    "Mewtwo", "Ho-oh", "Lugia", "Rayquaza", "Deoxys", "Kyogre", "Jirachi", "Groudon", "Dialga", "Regigigas",
-    "Giratina", "Arceus", "Palkia", "Kyurem", "Zekrom", "Reshiram", "Latios", "Latias", "Virizion", "Cobalion",
-    "Terrakion", "Victini", "Genesect", "Meloetta", "Keldeo", "Diancie", "Zygarde", "Xerneas", "Yveltal",
-    "Volcanion", "Necrozma", "Solgaleo", "Lunala", "Buzzwole", "Cosmoem", "Kartana", "Cosmog", "Blacephalon",
-    "Pheromosa", "Guzzlord", "Magearna", "Marshadow", "Tapu", "Silvally", "Zacian", "Zamazenta", "Eternatus",
-    "Spectrier", "Glastrier", "Urshifu", "✨", "Entei", "Suicune", "Raikou", "Celebi", "Shaymin", "Heatran",
-    "Hoopa", "Naganadel", "Poipole", "Cresselia", "Nihilego", "Xurkitree", "Celesteela", "Melmetal", "Stakataka",
-    "Meltan", "Kubfu", "Regidrago", "Zarude", "Enamorus", "Beldum", "Metang", "Koraidon", "Miraidon", "Ting-Lu",
-    "Chien-Pao", "Wo-Chien", "Shu-Tao", "Walking Wake", "Aerodactyl", "Darumaka", "Abra", "Litwick", "Gardevoir",
-    "Gallade", "Froakie", "Slakoth", "Tauros", "Wurmple", "Jolteon", "Espeon", "Drakloak", "Cincinno", "Miltank",
-    "Vikavolt", "Cyndaquil", "Oranguru", "Heracross", "Mimikyu", "Drampa", "Rotom", "Lapras", "Druddigon",
-    "Bouffalant", "Durant", "Meowstic", "Hawlucha", "Morpeko", "Sirfetch'd", "Spiritomb"
+    "Mewtwo", "Ho-oh", "Lugia", "Rayquaza", "Deoxys", "Kyogre", "Jirachi", "Groudon", "Dialga", "Regigigas", "Giratina",
+    "Arceus", "Palkia", "Kyurem", "Zekrom", "Reshiram", "Latios", "Latias", "Virizion", "Cobalion", "Terrakion", "Victini",
+    "Genesect", "Meloetta", "Keldeo", "Diancie", "Zygarde", "Xerneas", "Yveltal", "Volcanion", "Necrozma", "Solgaleo",
+    "Lunala", "Buzzwole", "Cosmoem", "Kartana", "Cosmog", "Blacephalon", "Pheromosa", "Guzzlord", "Magearna", "Marshadow",
+    "Tapu", "Silvally", "Zacian", "Zamazenta", "Eternatus", "Spectrier", "Glastrier", "Urshifu", "✨", "Entei", "Suicune",
+    "Raikou", "Celebi", "Shaymin", "Heatran", "Hoopa", "Naganadel", "Poipole", "Cresselia", "Nihilego", "Xurkitree",
+    "Celesteela", "Melmetal", "Stakataka", "Meltan", "Kubfu", "Regidrago", "Zarude", "Enamorus", "Beldum", "Metang",
+    "Koraidon", "Miraidon", "Ting-Lu", "Chien-Pao", "Wo-Chien", "Shu-Tao", "Walking Wake", "Aerodactyl", "Darumaka",
+    "Abra", "Litwick", "Gardevoir", "Gallade", "Froakie", "Slakoth", "Tauros", "Wurmple", "Jolteon", "Espeon", "Drakloak",
+    "Cincinno", "Miltank", "Vikavolt", "Cyndaquil", "Oranguru", "Heracross", "Mimikyu", "Drampa", "Rotom", "Lapras",
+    "Druddigon", "Bouffalant", "Durant", "Meowstic", "Hawlucha", "Morpeko", "Sirfetch'd", "Morpeko", "Spiritomb"
 ]
-from asyncio import create_task, sleep as zzz
-import time
 
-async def hunt_monitor_loop(client):
-    global hoenn, last_hunt_time, hunt_monitor_task, chat, hunt_delay
+@kanha_bot.on(events.NewMessage(outgoing=True, pattern='.safari'))
+async def autohexa(event):
+    client = event.client
+    i = True
+    await event.edit("safari is on the way")
+    if i:
+        for _ in range(5):
+            try:
+                async with client.conversation(chat) as conv:
+                    start = time.monotonic()
+                    await conv.send_message("/enter")
+                    await conv.get_response(timeout=10)
+                    end = time.monotonic()
+                    global hexa_speed
+                    hexa_speed = round(end - start)
+                    await zzz(hexa_speed + 3)
+                    break
+            except:
+                await zzz(2)
+        else:
+            await event.edit("Stopping safari due to no response in 5 tries")
+            return
 
+    global hoenn
+    hoenn = True
+    x = await client.send_message(chat, "/hunt")
     try:
-        print("[Monitor] Starting Safari monitor...")
-        await client.send_message(chat, "🟢 Safari monitor started...")
-
-        while hoenn:
-            print(f"[Monitor] Sleeping for {hunt_delay + 15} seconds before next check...")
-            await zzz(hunt_delay + 15)
-
-            if not hoenn:
-                print("[Monitor] hoenn is False, stopping monitor loop.")
-                break
-
-            time_diff = round(time.time() - last_hunt_time, 2)
-            log_msg = f"🔁 Monitor check... Time since last hunt: `{time_diff}`s"
-            print(f"[Monitor] {log_msg}")
-            await client.send_message(chat, log_msg)
-
-            if time_diff <= hunt_delay + 25:
-                wait_time = round((hunt_delay + 25) - time_diff, 2)
-                msg = f"⏳ Skipping `/hunt` — next run in `{wait_time}` seconds."
-                print(f"[Monitor] {msg}")
-                await client.send_message(chat, msg)
-                continue
+        async with client.conversation(chat) as conv:
+            await conv.get_response(x.id)
+    except:
+        await zzz(hexa_speed + 3)
+        await client.send_message(chat, "/hunt")
 
+@kanha_bot.on(events.NewMessage(chats=chat, incoming=True))
+async def hunt(event):
+    client = event.client
+    if hoenn:
+        text = event.message.text
+        message = await client.get_messages(chat, ids=event.message.id)
+        if "lund" in text:
+            await client.disconnect()
+        elif "TM" in text:
+            await zzz(randint(1, 3) + hexa_speed)
+            x = await client.send_message(chat, "/hunt")
             try:
-                print("[Monitor] Sending /hunt command...")
-                async with client.conversation(chat, timeout=6) as conv:
-                    msg = await conv.send_message("/hunt")
-                    response = await conv.get_response(msg.id)
-
-                    resp_text = response.text.lower()
-                    print(f"[Monitor] /hunt response: {resp_text[:100]}")
-
-                    if "cannot hunt while battling" in resp_text:
-                        print("[Monitor] Detected battle is ongoing. Attempting to throw Pokéball...")
-
-                        msgs = await client.get_messages(chat, limit=5)
-                        target = msgs[2] if len(msgs) >= 3 else msgs[-1]
-
-                        if not target.buttons:
-                            print("[Monitor] ❌ No buttons found — cannot throw ball. Stopping.")
-                            hoenn = False
-                            await client.send_message(chat, "❌ No buttons found — Safari stopped.")
-                            return
-
-                        found_ball = False
-                        for row in target.buttons:
-                            for btn in row:
-                                btn_text = btn.text.lower()
-                                print(f"[Monitor] Checking button: {btn_text}")
-                                if any(x in btn_text for x in [
-                                    "throw ball", "net", "ultra", "great", "quick",
-                                    "poke ball", "level", "fast", "nest"
-                                ]):
-                                    print(f"[Monitor] 🎯 Clicking button: {btn.text}")
-                                    await target.click(text=btn.text)
-                                    await zzz(hunt_delay + 2)
-                                    await safe_hunt(client)
-                                    found_ball = True
-                                    break
-                            if found_ball:
+                async with client.conversation(chat) as conv:
+                    await conv.get_response(x.id)
+            except:
+                await zzz(hexa_speed + 3)
+                await client.send_message(chat, "/hunt")
+        elif any(item in text for item in pokemon_list) and event.message.buttons:
+            for row in event.message.buttons:
+                for button in row:
+                    if button.text in ["Engage", "Battle"]:
+                        for _ in range(5):
+                            old = event.message.text
+                            await message.click(text=button.text)
+                            await zzz(hexa_speed + 3)
+                            new_msg = await client.get_messages(chat, ids=event.message.id)
+                            if new_msg.text != old:
                                 break
+        elif "A wild" in text or "An expert" in text:
+            await zzz(randint(2, 5) + hexa_speed)
+            x = await client.send_message(chat, "/hunt")
+            try:
+                async with client.conversation(chat) as conv:
+                    await conv.get_response(x.id)
+            except:
+                await zzz(hexa_speed + 3)
+                await client.send_message(chat, "/hunt")
 
-                        if not found_ball:
-                            print("[Monitor] ❌ No valid Pokéball found. Stopping Safari.")
-                            hoenn = False
-                            await client.send_message(chat, "❌ Safari stopped — no valid Pokéball found.")
-                            return
-
-                    else:
-                        print("[Monitor] Not in battle. Calling safe_hunt...")
-                        await safe_hunt(client)
-
-            except Exception as e:
-                hoenn = False
-                error_msg = f"❌ Hunt monitor crashed:\n`{str(e)}`"
-                print(f"[Monitor Error] {e}")
-                await client.send_message(chat, error_msg)
-                return
-
-    finally:
-        hunt_monitor_task = None
-        print("[Monitor] Task cleaned up and stopped.")
-
-
-# ===== COMMANDS =====
-@kanha_bot.on(events.NewMessage(outgoing=True, pattern=r"\.safari"))
-async def safari_start(event):
-    global hoenn, hunt_attempts, hunt_lock, hunt_monitor_task
-    hoenn = False
-    hunt_attempts = 0
-    hunt_lock = False
-
-    await event.edit("🐾 Starting Safari...")
-    success = False
-
-    for _ in range(3):
-        try:
-            async with event.client.conversation(chat, timeout=5) as conv:
-                await conv.send_message("/enter")
-                await conv.get_response()
-            success = True
-            break
-        except:
-            await zzz(randint(3, 5))
-
-    if not success:
-        await event.edit("❌ Failed to enter Safari after 3 attempts.")
-        return
-
-    hoenn = True
-    await event.edit("✅ Safari entered! Starting hunts...")
-    hunt_monitor_task = create_task(hunt_monitor_loop(event.client))
-    await zzz(randint(3, 5))
-    await safe_hunt(event.client)
-
-async def process_fled_or_failed(event, message, text):
-    await zzz(hunt_delay + 2)
-    if message.buttons:
-        await message.click(text="Release")
-        await zzz(hunt_delay + 2)
-    await safe_hunt(event.client)
-
-async def safe_hunt(client):
-    global hunt_attempts, hoenn, hunt_lock, hunt_delay, last_hunt_time
-    if not hoenn or hunt_lock:
-        return
-
-    success = False
-    for _ in range(4):
-        try:
-            async with client.conversation(chat, timeout=6) as conv:
-                start_time = time.time()
-                msg = await conv.send_message("/hunt")
-                await conv.get_response(msg.id)
-                hunt_delay = round(time.time() - start_time, 2)
-                last_hunt_time = time.time()
-            hunt_attempts = 0
-            success = True
-            break
-        except:
-            hunt_attempts += 1
-            await zzz(hunt_delay + 2)
-
-    if not success:
-        hoenn = False
-        await client.send_message(chat, "❌ Failed to hunt after 4 attempts. Safari stopped.")
-
-async def click_with_retry(message, button_text, retries=3):
-    client = message.client
-    old_text = message.text
-    old_id = message.id
-
-    for _ in range(retries):
-        if message.buttons:
-            for row in message.buttons:
-                for btn in row:
-                    if button_text.lower() in btn.text.lower():
-                        await message.click(text=btn.text)
-                        await zzz(hunt_delay + 2)
-                        updated_msg = await client.get_messages(message.chat_id, ids=old_id)
-                        if updated_msg.text != old_text:
-                            return True
-                        latest_msg = await client.get_messages(message.chat_id, limit=1)
-                        if latest_msg and latest_msg[0].id != old_id:
-                            return True
-        else:
-            # If no buttons in old message, try latest
-            latest_msg = await client.get_messages(message.chat_id, limit=1)
-            if latest_msg and latest_msg[0].buttons:
-                message = latest_msg[0]
-                continue
-        await zzz(hunt_delay + 2)
-
-    return False
-
-# ===== AUTO RECOVERY LOOP =====
-@kanha_bot.on(events.NewMessage)
-async def auto_recovery(event):
-    global hoenn, last_hunt_time
-    if hoenn and time.time() - last_hunt_time > hunt_delay + 15:
-        await safe_hunt(event.client)
-
-# ===== NEW MESSAGE HANDLER =====
 @kanha_bot.on(events.NewMessage(chats=chat, incoming=True))
-async def hunt_handler(event):
-    global hoenn
-    if not hoenn:
-        return
+async def hoenn(event):
+    client = event.client
+    if hoenn and event.message.text.startswith("Wild"):
+        message = await client.get_messages(chat, ids=event.message.id)
+        await zzz(hexa_speed + 3)
+        if event.message.buttons:
+            for row in event.message.buttons:
+                for button in row:
+                    if button.text == "Throw ball":
+                        for _ in range(5):
+                            old = event.message.text
+                            await message.click(text="Throw ball")
+                            await zzz(hexa_speed + 3)
+                            new_msg = await client.get_messages(chat, ids=event.message.id)
+                            if new_msg.text != old:
+                                break
 
-    text = event.text
-    message = await event.client.get_messages(chat, ids=event.id)
-    if message.buttons:
-        for row in message.buttons:
-            for btn in row:
-                if btn.text.lower() == "poke balls":
-                    await click_with_retry(message, "Poke Balls")
-                    await zzz(hunt_delay + 2)
-    if "lund" in text:
-        await event.client.disconnect()
-    elif "TM" in text:
-        await zzz(hunt_delay + 2)
-        await safe_hunt(event.client)
-    elif any(p in text for p in pokemon_list):
-        if message.buttons:
-            for row in message.buttons:
-                for btn in row:
-                    if btn.text in ["Engage", "Battle"]:
-                        await click_with_retry(message, btn.text)
-    elif any(x in text for x in ["A wild", "An expert"]):
-        await zzz(hunt_delay + 2)
-        await safe_hunt(event.client)
-    if "Wild" in text:
-        await zzz(hunt_delay + 2)
-        await click_with_retry(message, "Throw ball")
-        return
+    elif event.message.text.startswith("Battle begins!") and event.message.buttons:
+        message = await client.get_messages(chat, ids=event.message.id)
+        await zzz(hexa_speed + 3)
+        for row in event.message.buttons:
+            for button in row:
+                if button.text == "Poke Balls":
+                    for _ in range(5):
+                        old = event.message.text
+                        await message.click(text="Poke Balls")
+                        await zzz(hexa_speed + 3)
+                        new_msg = await client.get_messages(chat, ids=event.message.id)
+                        if new_msg.text != old:
+                            break
 
-# ===== EDIT MESSAGE HANDLER =====
 @kanha_bot.on(events.MessageEdited(chats=chat, incoming=True))
-async def edited_handler_battle(event):
+async def cacther(event):
+    client = event.client
     global hoenn
     if not hoenn:
         return
 
-    message = event.message
-    text = message.text or ""
+    message = await client.get_messages(chat, ids=event.message.id)
 
-    if text.startswith("Your Safari"):
-        await zzz(hunt_delay + 2)
-        await click_with_retry(message, "Throw ball")
+    try:
+        buttons = (await message.get_buttons())[0]
+        if any(btn.text == "Poke Balls" for btn in buttons):
+            for _ in range(5):
+                old = event.message.text
+                await message.click(text="Poke Balls")
+                await zzz(hexa_speed + 3)
+                new_msg = await client.get_messages(chat, ids=event.message.id)
+                if new_msg.text != old:
+                    break
+    except:
+        pass
+
+    elif event.message.text.startswith("Your Safari"):
+        await zzz(hexa_speed + 3)
+        for _ in range(5):
+            old = event.message.text
+            await message.click(text="Throw ball")
+            await zzz(hexa_speed + 3)
+            new_msg = await client.get_messages(chat, ids=event.message.id)
+            if new_msg.text != old:
+                break
 
-    if text.startswith("Wild") and "Lv." in text:
+    elif event.message.text.startswith("Wild") and "Lv." in event.message.text:
         try:
+            text = event.message.text
             lines = text.splitlines()
             enemy_line = lines[0]
             level_line = lines[1]
@@ -278,86 +173,104 @@ async def edited_handler_battle(event):
             wild_level = int(level_line.split("Lv.")[1].split("•")[0].strip())
             player_level = int(player_line.split("Lv.")[1].split("•")[0].strip()) if "Lv." in player_line else 50
 
+            clicked = False
+
             if any(t in enemy_type for t in ["bug", "water"]):
-                await click_with_retry(message, "Net")
-            if any(name in enemy_name.lower() for name in ["electrode", "jolteon", "ninjask", "crobat", "greninja", "magnemite", "grimer", "tangela"]):
-                await click_with_retry(message, "Fast")
+                clicked = await click_with_retry(client, message, "Net")
 
-            ratio = player_level / wild_level if wild_level else 1
-            if ratio >= 4:
-                await click_with_retry(message, "Level")
-            elif wild_level <= 15:
-                await click_with_retry(message, "Nest")
+            if any(name in enemy_name.lower() for name in [
+                "electrode", "jolteon", "ninjask", "crobat", "greninja", "magnemite", "grimer", "tangela"
+            ]):
+                clicked = await click_with_retry(client, message, "Fast")
 
-            for ball in ["Repeat", "Safari", "Ultra", "Great", "Quick"]:
-                if await click_with_retry(message, ball):
-                    break
+            ratio = player_level / wild_level if wild_level else 1
+            if not clicked and ratio >= 4:
+                clicked = await click_with_retry(client, message, "Level")
+            elif not clicked and wild_level <= 15:
+                clicked = await click_with_retry(client, message, "Nest")
+
+            if not clicked:
+                for ball in ["Repeat", "Safari", "Ultra", "Great", "Quick"]:
+                    clicked = await click_with_retry(client, message, ball)
+                    if clicked:
+                        break
+
+            if not clicked:
+                await client.send_message(informer, "hut bc pokeball hi koni \n\nbuy krle bakchod")
+                hoenn = False
 
         except Exception as e:
-            await event.client.send_message(informer, f"❌ Error parsing battle: {e}")
+            await client.send_message(informer, f"❌ Error parsing battle: {e}")
             hoenn = False
 
-@kanha_bot.on(events.MessageEdited(chats=chat, incoming=True))
-async def edited_handler_priority(event):
-    global hoenn
-    if not hoenn:
-        return
-
-    message = event.message
-    text = message.text or ""
-
-    if any(keyword in text.lower() for keyword in ["fled", "caught"]):
-        await process_fled_or_failed(event, message, text)
-        return
-
-    if message.buttons:
-        for row in message.buttons:
-            for btn in row:
-                if btn.text.lower() == "poke balls":
-                    await click_with_retry(message, "Poke Balls")
-                    await zzz(hunt_delay + 2)
+    elif any(k in event.message.text.lower() for k in ['fled', 'caught']):
+        await zzz(hexa_speed + 3)
+        try:
+            await event.click(text="Release")
+        except:
+            pass
+        await zzz(randint(4, 5) + hexa_speed)
+        x = await client.send_message(chat, "/hunt")
+        try:
+            async with client.conversation(chat) as conv:
+                await conv.get_response(x.id)
+        except:
+            await zzz(hexa_speed + 3)
+            await client.send_message(chat, "/hunt")
 
-    if "Choose your next pokemon." in text:
-        await zzz(hunt_delay + 2)
+    elif "Choose your next pokemon." in event.message.text and event.message.buttons:
+        await zzz(hexa_speed + 3)
         try:
-            for x in range(3):
-                for y in range(2):
-                    if event.buttons[x][y].text.strip():
+            for x in range(len(event.buttons)):
+                for y in range(len(event.buttons[x])):
+                    button_text = event.buttons[x][y].text if event.buttons[x][y].text else ""
+                    if button_text.strip():
                         await event.click(x, y)
                         return
         except:
             pass
 
-# ===== STOP =====
-@kanha_bot.on(events.NewMessage(outgoing=True, pattern=r".stop"))
+async def click_with_retry(client, message, button_text):
+    for _ in range(5):
+        old = message.text
+        try:
+            await message.click(text=button_text)
+            await zzz(hexa_speed + 3)
+            new_msg = await client.get_messages(chat, ids=message.id)
+            if new_msg.text != old:
+                return True
+        except:
+            pass
+    return False
+
+@kanha_bot.on(events.NewMessage(outgoing=True, pattern='.stop'))
 async def stop(event):
+    await event.edit("Stopping.....")
+    global hoenn
+    hoenn = False
+
+@kanha_bot.on(events.NewMessage(chats=chat, func=lambda e: (
+    "You have run out of Safari Balls and are now exiting the Hoenn Safari Zone" in e.text or
+    "The Safari Game has finished and you were kicked out" in e.text)))
+async def stoppp(event):
     global hoenn
     hoenn = False
-    await event.edit("Stopped manually")
-    if hunt_monitor_task:
-        hunt_monitor_task.cancel()
-        hunt_monitor_task = None
-# ===== AUTO STOP =====
-@kanha_bot.on(events.NewMessage(chats=chat))
-@kanha_bot.on(events.MessageEdited(chats=chat))
-async def auto_stop_detector(event):
-    global hoenn, hunt_lock
-    if ("run out of Safari Balls" in event.text or "Safari Game has finished" in event.text):
-        if random() < 0.5:
-            hoenn = False
-            hunt_lock = True
-            if hunt_monitor_task:
-                hunt_monitor_task.cancel()
-                hunt_monitor_task = None
 
-# ===== INFORMERS =====
-@kanha_bot.on(events.NewMessage(chats=chat))
-async def informers(event):
+@kanha_bot.on(events.MessageEdited(chats=chat, func=lambda e: (
+    "You have run out of Safari Balls and are now exiting the Hoenn Safari Zone" in e.text or
+    "The Safari Game has finished and you were kicked out" in e.text)))
+async def stoppp(event):
+    global hoenn
+    hoenn = False
+
+@kanha_bot.on(events.NewMessage(chats=chat, incoming=True))
+async def infom(event):
+    client = event.client
     if hoenn:
-        text = event.text
+        text = event.message.text
         if "✨" in text:
-            await event.client.forward_messages(infomers, event.message)
-            await zzz(hunt_delay + 2)
-            await event.client.forward_messages(informer, event.message)
+            await client.forward_messages(infomers, event.message)
+            await zzz(hexa_speed + 3)
+            await client.forward_messages(informer, event.message)
         if "want to release" in text:
-            await event.client.forward_messages(informer, event.message)
+            await client.forward_messages(informer, event.message)