jerick/faction_war_dispatch_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poll interval in config file and cleanup

Browse Source
This commit is contained in:
jerick
2026-01-25 19:29:59 -05:00
parent 3e57c91b14
commit b693d386ca
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.py
View File

@@ -14,3 +14,7 @@ DISCORD_TOKEN = "MTQ0Mjg3NjU3NTUzMDg3NzAxMQ.GH7MGP.VdYH4QXmPL-9Zi9zhp-Ot6SmiCxWQ
POLL_INTERVAL = 30 POLL_INTERVAL = 30
HIT_CHECK_INTERVAL = 60 HIT_CHECK_INTERVAL = 60
REASSIGN_DELAY = 120 REASSIGN_DELAY = 120
# Bot Assignment Settings
ASSIGNMENT_TIMEOUT = 60 # Seconds before reassigning a target
ASSIGNMENT_REMINDER = 30 # Seconds before sending reminder message

BIN
services/__pycache__/bot_assignment.cpython-311.pyc
View File

Binary file not shown.

22
services/bot_assignment.py
View File

@@ -5,6 +5,7 @@ from pathlib import Path
from typing import Dict, Optional from typing import Dict, Optional
from datetime import datetime from datetime import datetime
from services.server_state import STATE from services.server_state import STATE
from config import ASSIGNMENT_TIMEOUT, ASSIGNMENT_REMINDER
class BotAssignmentManager: class BotAssignmentManager:
def __init__(self, bot): def __init__(self, bot):
@@ -40,13 +41,13 @@ class BotAssignmentManager:
async def start(self): async def start(self):
"""Start the bot assignment loop""" """Start the bot assignment loop"""
if self.running: if self.running:
print("⚠ Bot assignment already running") print("WARNING: Bot assignment already running")
return return
self.running = True self.running = True
self.task = asyncio.create_task(self.assignment_loop()) self.task = asyncio.create_task(self.assignment_loop())
print("✓ Bot assignment loop started") print("Bot assignment loop started")
print(f"✓ Loaded {len(self.discord_mapping)} Discord ID mappings") print(f"Loaded {len(self.discord_mapping)} Discord ID mappings")
async def stop(self): async def stop(self):
"""Stop the bot assignment loop""" """Stop the bot assignment loop"""
@@ -199,7 +200,7 @@ class BotAssignmentManager:
# Send Discord message # Send Discord message
enemy_link = f"https://www.torn.com/profiles.php?XID={enemy_id}" enemy_link = f"https://www.torn.com/profiles.php?XID={enemy_id}"
message = f"**New target for {discord_user.mention}!**\n\nAttack **{enemy.name}** (Level {enemy.level})\n{enemy_link}\n\n⏰ You have 60 seconds!" message = f"**New target for {discord_user.mention}!**\n\nAttack **{enemy.name}** (Level {enemy.level})\n{enemy_link}\n\nYou have {ASSIGNMENT_TIMEOUT} seconds!"
try: try:
await discord_user.send(message) await discord_user.send(message)
@@ -225,24 +226,25 @@ class BotAssignmentManager:
if friendly_id in STATE.friendly: if friendly_id in STATE.friendly:
# Increment hit count # Increment hit count
STATE.friendly[friendly_id].hits += 1 STATE.friendly[friendly_id].hits += 1
print(f"✓ {STATE.friendly[friendly_id].name} successfully hospitalized {enemy.name}") print(f"SUCCESS: {STATE.friendly[friendly_id].name} successfully hospitalized {enemy.name}")
# Remove from active targets # Remove from active targets
del self.active_targets[key] del self.active_targets[key]
continue continue
# Send reminder at 15 seconds # Send reminder
if elapsed >= 15 and not data["reminded"]: if elapsed >= ASSIGNMENT_REMINDER and not data["reminded"]:
discord_id = data["discord_id"] discord_id = data["discord_id"]
try: try:
discord_user = await self.bot.fetch_user(discord_id) discord_user = await self.bot.fetch_user(discord_id)
await discord_user.send(f"⏰ **Reminder:** Target {enemy.name} - 15 seconds left!") remaining = ASSIGNMENT_TIMEOUT - ASSIGNMENT_REMINDER
await discord_user.send(f"**Reminder:** Target {enemy.name} - {remaining} seconds left!")
data["reminded"] = True data["reminded"] = True
except: except:
pass pass
# Reassign after 60 seconds # Reassign after timeout
if elapsed >= 60: if elapsed >= ASSIGNMENT_TIMEOUT:
to_reassign.append((data["group_id"], enemy_id)) to_reassign.append((data["group_id"], enemy_id))
del self.active_targets[key] del self.active_targets[key]