From fddb06b2fe118065c3e9ce75d71672fd2b0bd7de Mon Sep 17 00:00:00 2001
From: Cal Corum <calcorum@users.noreply.github.com>
Date: Tue, 24 Dec 2024 16:10:44 -0600
Subject: [PATCH] Mege cleanup

---
 cogs/admins.py        | 1 -
 cogs/gameplay.py      | 2 --
 gauntlets.py          | 1 -
 utilities/dropdown.py | 1 +
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cogs/admins.py b/cogs/admins.py
index 1f605d1..45db7cc 100644
--- a/cogs/admins.py
+++ b/cogs/admins.py
@@ -4,7 +4,6 @@ import json
 import db_calls_gameplay
 from gauntlets import evolve_pokemon
 from helpers import *
-from db_calls import *
 from discord import Member
 from discord.ext import commands, tasks
 from discord import app_commands
diff --git a/cogs/gameplay.py b/cogs/gameplay.py
index 65bd98e..a3e0f2f 100644
--- a/cogs/gameplay.py
+++ b/cogs/gameplay.py
@@ -438,7 +438,6 @@ class Gameplay(commands.Cog):
                 content=f'Creating this game for {t_role.mention}:\n{this_game}'
             )
 
-
     @commands.command(name='force-endgame', help='Mod: Force a game to end without stats')
     async def force_end_game_command(self, ctx: commands.Context):
         with Session(engine) as session:
@@ -570,7 +569,6 @@ class Gameplay(commands.Cog):
             bat_view = sub_batter_dropdown_view(session, this_game, owner_team, this_order)
             await interaction.edit_original_response(content=f'### {owner_team.lname} Substitution', view=bat_view)
 
-
     group_log = app_commands.Group(name='log', description='Log a play in this channel\'s game')
 
     @group_log.command(name='flyball', description='Flyballs: a, b, ballpark, bq, c')
diff --git a/gauntlets.py b/gauntlets.py
index 82bd8ad..dbe0c64 100644
--- a/gauntlets.py
+++ b/gauntlets.py
@@ -14,7 +14,6 @@ from helpers import RARITY, get_or_create_role, send_to_channel, get_channel
 from api_calls import db_get, db_post, db_delete, db_patch
 from in_game.gameplay_models import Team
 from in_game.gameplay_queries import get_team_or_none
-from db_calls import db_get, db_post, db_delete, db_patch
 from utilities.dropdown import DropdownView, SelectPokemonEvolution
 
 
diff --git a/utilities/dropdown.py b/utilities/dropdown.py
index e2de0cd..f8cf9f2 100644
--- a/utilities/dropdown.py
+++ b/utilities/dropdown.py
@@ -8,6 +8,7 @@ from discord import SelectOption
 from discord.utils import MISSING
 from sqlmodel import Session
 
+from api_calls import db_delete, db_get, db_post
 from exceptions import CardNotFoundException, PlayNotFoundException, log_exception
 from helpers import get_card_embeds
 from in_game.game_helpers import legal_check