Add LICENSE.md

LICENSE.md

@@ -0,0 +1,9 @@
+/*
+ * ------------------------------------------------------------
+ * "THE BEERWARE LICENSE" (Revision 42):
+ * DerGrubengräber / Carl Hinze wrote this code. As long as you retain this 
+ * notice, you can do whatever you want with this stuff. If we
+ * meet someday, and you think this stuff is worth it, you can
+ * buy me a beer in return.
+ * ------------------------------------------------------------
+ */

bot_instance.py

@@ -1,25 +0,0 @@
-from discord.ext import commands
-import discord
-import threading
-import os
-from dotenv import load_dotenv
-
-_started = False
-
-intents = discord.Intents.default()
-bot = commands.Bot(command_prefix="!", intents=intents)
-
-bot.tracked_games = []
-bot.tracked_games_lock = threading.Lock()
-
-
-async def start_bot():
-    global _started
-    if _started:
-        return
-    _started = True
-    load_dotenv()
-    TOKEN = os.getenv("TOKEN")
-    if not TOKEN:
-        raise ValueError("No token found")
-    await bot.start(TOKEN)

cogs/slash_commands.py

@@ -1,108 +0,0 @@
-import discord
-from discord import app_commands
-from discord.ext import commands
-from dom5game import Dom5game
-
-
-class SlashCommands(commands.Cog):
-    def __init__(self, bot: commands.Bot):
-        self.bot = bot
-
-    def game_autocomplete(self, current):
-        options = []
-        for game in self.bot.tracked_games:
-            options.append(game.name)
-        return [
-            app_commands.Choice(name=option, value=option)
-            for option in options
-            if option.lower().startswith(current.lower())
-        ][:25]
-
-    @app_commands.command(name="ping", description="Check bot latency")
-    async def ping(self, interaction: discord.Interaction):
-        await interaction.response.send_message(
-            f"Pong! {round(self.bot.latency * 1000)}ms"
-        )
-
-    @app_commands.command(
-        name="dom5-addgame",
-        description="Adds a game that is already running but not tracked by the bot yet.",
-    )
-    async def addgame(self, interaction: discord.Interaction, name: str):
-        try:
-            if any(game.name == name for game in self.bot.tracked_games):
-                await interaction.response.send_message("Game already tracked.")
-                return
-
-            game = Dom5game(name, interaction.channel_id, [], 0, {})
-            game.update_turn()
-            game.update_players()
-            game.to_json()
-            self.bot.tracked_games.append(game)
-            await interaction.response.send_message("Added the game.")
-        except:
-            await interaction.response.send_message(
-                "Something went wrong. Are you sure the name is correct and the game exists?"
-            )
-
-    @app_commands.command(name="dom5-creategame", description="Creates a new game.")
-    async def creategame(self, interaction: discord.Interaction, name: str, port: int):
-        print("a")
-
-    @app_commands.command(
-        name="domt5-pingme",
-        description="Signs you up to be pinged for a game. Run the command again to not get pinged anymore.",
-    )
-    async def pingme(self, interaction: discord.Interaction, name: str):
-        game = Dom5game.get_game_by_name(name, self.bot.tracked_games)
-        if game == None:
-            await interaction.response.send_message("Game does not exist.")
-            return
-        try:
-            if interaction.user.id in game.members:
-                game.members.remove(interaction.user.id)
-                await interaction.response.send_message(
-                    'You will no longer receive turn notifications for game: **"'
-                    + name
-                    + '"**.'
-                )
-            else:
-                game.members.append(interaction.user.id)
-                await interaction.response.send_message(
-                    'You will now receive turn notifications for game: **"'
-                    + name
-                    + '"**.'
-                )
-        except:
-            await interaction.response.send_message("Something went wrong.")
-
-    @pingme.autocomplete("name")
-    async def pingme_autocomplete(self, interaction: discord.Interaction, current: str):
-        return self.game_autocomplete(current)
-
-    @app_commands.command(
-        name="dom5-details", description="Shows the details of an ongoing game."
-    )
-    async def details(self, interaction: discord.Interaction, name: str):
-        game = Dom5game.get_game_by_name(name, self.bot.tracked_games)
-        if game == None:
-            await interaction.response.send_message("Game does not exist.")
-            return
-
-        embed = discord.Embed(title=name)
-
-        for player in game.players.keys():
-            if game.players[player] not in {"AI", "Eliminated"}:
-                embed.add_field(name=player, value=game.players[player])
-
-        await interaction.response.send_message(embed=embed)
-
-    @details.autocomplete("name")
-    async def details_autocomplete(
-        self, interaction: discord.Interaction, current: str
-    ):
-        return self.game_autocomplete(current)
-
-
-async def setup(bot: commands.Bot):
-    await bot.add_cog(SlashCommands(bot))

main.py

@@ -1,33 +1,30 @@
 import discord
 import os
-from discord.ext import tasks
+from discord.ext import tasks, commands
+from dotenv import load_dotenv
 from dom5game import Dom5game
-from webui import create_ui
-from bot_instance import bot, start_bot
-from nicegui import ui
-import asyncio
+from servermanager import create_server
+
+intents = discord.Intents.default()
+bot = commands.Bot(command_prefix="!", intents=intents)
+load_dotenv()
+TOKEN = os.getenv("TOKEN")
+
+bot.tracked_games = []
 
 
 def reload_games():
-    with bot.tracked_games_lock:
-        bot.tracked_games = []
-        for _, _, files in os.walk("games"):
-            for name in files:
-                if name.endswith("json"):
-                    bot.tracked_games.append(
-                        Dom5game.load_json("games/" + name[:-5] + "/" + name)
-                    )
+    bot.tracked_games = []
+    for _, _, files in os.walk("games"):
+        for name in files:
+            if name.endswith("json"):
+                bot.tracked_games.append(
+                    Dom5game.load_json("games/" + name[:-5] + "/" + name)
+                )
 
 
-def main():
-    create_ui()
-    loop = asyncio.get_event_loop()
-    loop.create_task(start_bot())
-    ui.run(reload=False)
-
-
-if __name__ == "__main__":
-    main()
+create_server("Amogus", 7777, 831955362646851617)
+reload_games()
 
 
 @bot.event
@@ -36,11 +33,10 @@ async def on_ready():
     await bot.load_extension("cogs.slash_commands")
     # await bot.tree.sync()
     reload_games()
-    if not task_loop.is_running():
-        task_loop.start()
+    task_loop.start()
 
 
-@tasks.loop(seconds=5)
+@tasks.loop(seconds=2)
 async def task_loop():
     await bot.change_presence(
         activity=discord.Activity(
@@ -50,11 +46,8 @@ async def task_loop():
     )
     for game in bot.tracked_games:
         channel = bot.get_channel(game.channelId)
-        if channel is None:
-            continue
         # handle turn ticks
-        new_turn = game.get_turn()
-        if new_turn != game.turn and new_turn.isdigit():
+        if game.get_turn() != game.turn and game.get_turn().isdigit():
             game.update_turn()
             pingstr = ""
             if game.members:
@@ -98,3 +91,6 @@ async def task_loop():
                     )
                 game.update_players()
                 game.to_json()
+
+
+bot.run(TOKEN)

requirements.txt

@@ -1,56 +1,18 @@
-aiofiles==25.1.0
 aiohappyeyeballs==2.6.1
 aiohttp==3.13.5
 aiosignal==1.4.0
-annotated-doc==0.0.4
-annotated-types==0.7.0
-anyio==4.13.0
 attrs==26.1.0
 audioop-lts==0.2.2
-bidict==0.23.1
-certifi==2026.2.25
-click==8.3.2
 discord==2.3.2
 discord.py==2.7.1
-docutils==0.22.4
 dotenv==0.9.9
-fastapi==0.135.3
 frozenlist==1.8.0
-h11==0.16.0
-httpcore==1.0.9
-httptools==0.7.1
-httpx==0.28.1
 idna==3.11
-ifaddr==0.2.0
-itsdangerous==2.2.0
-Jinja2==3.1.6
-lxml==6.0.2
-lxml_html_clean==0.4.4
-markdown2==2.5.5
-MarkupSafe==3.0.3
 multidict==6.7.1
-nicegui==3.10.0
 numpy==2.4.4
-orjson==3.11.8
 pandas==3.0.2
 propcache==0.4.1
-pydantic==2.12.5
-pydantic_core==2.41.5
-Pygments==2.20.0
 python-dateutil==2.9.0.post0
 python-dotenv==1.2.2
-python-engineio==4.13.1
-python-multipart==0.0.24
-python-socketio==5.16.1
-PyYAML==6.0.3
-simple-websocket==1.1.0
 six==1.17.0
-starlette==1.0.0
-typing-inspection==0.4.2
-typing_extensions==4.15.0
-uvicorn==0.44.0
-uvloop==0.22.1
-watchfiles==1.1.1
-websockets==16.0
-wsproto==1.3.2
 yarl==1.23.0

servermanager.py

@@ -10,98 +10,32 @@ SERVER_PATH = os.getenv("SERVERPATH")
 def create_server(name, port, channel):
     if is_port_in_use(port):
         return "ERROR_PORT_IN_USE"
-    os.mkdir("games/" + name)
+    # os.mkdir("games/" + name)
     # print(SERVER_PATH)
     # print(server_command_builder(name, port, channel))
-    game = Dom5game(name, channel, [], 0, {})
-    game.to_json()
     try:
-        p = subprocess.Popen(
-            server_command_builder(name, port),
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.STDOUT,
+        subprocess.Popen(
+            server_command_builder(name, port, channel),
+            stdin=None,
+            stdout=None,
+            stderr=None,
         )
     except Exception as e:
         return "EXCEPTION OCCURED: " + str(e)
-    return "SUCCESS"
-    p.wait()
 
 
-# This is terrible.
-def server_command_builder(
-    name: str,
-    port: int,
-    era: int,
-    closed_slots: list[int] = [],
-    ai_slots: list[tuple[int, int]] = [],
-    client_start: bool = True,
-    teams: list[tuple[int, int, int]] = [],
-    clustered_start: bool = False,
-    team_game: bool = False,
-    mapfile: str = "",
-    random_map: int = 0,
-    research_difficulty: int = 2,
-    random_start_research: bool = True,
-    hof_size: int = 10,
-    global_slots: int = 5,
-    inde_strength: int = 5,
-    magic_sites: int = 40,
-    event_rarity: int = 1,
-    richness: int = 100,
-    resources: int = 100,
-    recruitment: int = 100,
-    supplies: int = 100,
-    masterpass: str = "",
-    start_prov: int = 1,
-    renaming: bool = True,
-    score_graphs: bool = False,
-    no_nation_info: bool = False,
-    no_cheat_det: bool = False,
-    no_artifact_rest: bool = False,
-    story_events: int = 1,
-    new_ai_lvl: int = 2,
-    no_new_ai: bool = False,
-    conq_all: bool = False,
-    thrones: tuple[int, int, int] = (1, 1, 1),
-    required_apoints: int = 0,
-    cataclysm: int = 0,
-):
-    if not ((random_map == 0) ^ (mapfile == "")):
-        return "ERROR_MAP"
-
-    if not (0 < era < 4):
-        return "ERROR_ERA"
-
-    ai_indexes = [t[1] for t in ai_slots]
-    if not (len(ai_indexes) == len(set(ai_indexes))):
-        return "ERROR_AIS"
-
-    if bool(set(closed_slots) & set(ai_indexes)):
-        return "ERROR_CLOSED_AIS"
-
-    if required_apoints == 0:
-        required_apoints = thrones[0] + (2 * thrones[1]) + (3 * thrones[2]) - 1
-
+def server_command_builder(name, port, channel):
     command = [
         SERVER_PATH,
-        " -TS ",
+        "-TS",
         name,
-        " --port ",
+        "--port",
         str(port),
-        " --statuspage ",
+        "--statuspage",
         os.getcwd() + "/games/" + name + "/turnstats.html",
-        " --era ",
-        era,
     ]
-    if team_game:
-
-    if not client_start:
-        command.append(" --noclientstart ")
-    if cataclysm > 0:
-        command.append(" --cataclysm " + str(cataclysm))
-    if conq_all:
-        command.append(" --conqall")
-
+    game = Dom5game(name, channel, [], 0, {})
+    game.to_json()
     return command
 
 

webui.py

@@ -1,31 +0,0 @@
-from nicegui import ui
-from bot_instance import bot
-from dom5game import Dom5game
-
-
-def create_ui():
-    pages = ui.sub_pages()
-    rows = []
-    for game in bot.tracked_games:
-        pages.add(f"/{game.name}", lambda name=game.name: sub_page(name))
-        rows.append({"Name": game.name, "Turn": game.turn})
-
-    pages.add("/", lambda: main_page(rows))
-
-    ui.run(reload=False)
-
-
-def main_page(rows):
-    game_table = ui.table(rows=rows, title="Currently Running Games")
-    with game_table.add_slot("body-cell-Name"):
-        with game_table.cell("Name"):
-            ui.link().props(":href=props.value :innerHTML=props.value")
-
-
-def sub_page(game_name: str):
-    rows = []
-    game = Dom5game.get_game_by_name(game_name, bot.tracked_games)
-    for player in game.players.keys():
-        if game.players[player] not in {"AI", "Eliminated"}:
-            rows.append({"Player": player, "Status": game.players[player]})
-    ui.table(rows=rows, title=game_name)