From 67f6b458d7292c44a2a3870523d28868fbbb056c Mon Sep 17 00:00:00 2001
From: Aaron Wagener <mmmcheese158@gmail.com>
Date: Tue, 1 Oct 2024 14:08:13 -0500
Subject: [PATCH] Core: add race mode to multidata and datastore (#4017)

* add race mode to multidata and datastore

* have commonclient check race mode on connect and add it to the tooltip ui
---
 CommonClient.py | 2 ++
 Main.py         | 1 +
 MultiServer.py  | 2 ++
 kvui.py         | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/CommonClient.py b/CommonClient.py
index 1aedd518b4f8..8325227d5e5c 100644
--- a/CommonClient.py
+++ b/CommonClient.py
@@ -325,6 +325,7 @@ def __init__(self, server_address: typing.Optional[str] = None, password: typing
             "collect": "disabled",
             "remaining": "disabled",
         }
+        self.race_mode: int = 0
 
         # own state
         self.finished_game = False
@@ -454,6 +455,7 @@ async def send_connect(self, **kwargs: typing.Any) -> None:
         if kwargs:
             payload.update(kwargs)
         await self.send_msgs([payload])
+        await self.send_msgs([{"cmd": "Get", "keys": ["race_mode"]}])
 
     async def console_input(self) -> str:
         if self.ui:
diff --git a/Main.py b/Main.py
index 5a0f5c98bcc4..4008ca5e9017 100644
--- a/Main.py
+++ b/Main.py
@@ -338,6 +338,7 @@ def precollect_hint(location):
                     "seed_name": multiworld.seed_name,
                     "spheres": spheres,
                     "datapackage": data_package,
+                    "race_mode": int(multiworld.is_race),
                 }
                 AutoWorld.call_all(multiworld, "modify_multidata", multidata)
 
diff --git a/MultiServer.py b/MultiServer.py
index e0b137fd68ce..91f4eec61574 100644
--- a/MultiServer.py
+++ b/MultiServer.py
@@ -427,6 +427,8 @@ def _load(self, decoded_obj: dict, game_data_packages: typing.Dict[str, typing.A
               use_embedded_server_options: bool):
 
         self.read_data = {}
+        # there might be a better place to put this.
+        self.stored_data["race_mode"] = decoded_obj.get("race_mode", 0)
         mdata_ver = decoded_obj["minimum_versions"]["server"]
         if mdata_ver > version_tuple:
             raise RuntimeError(f"Supplied Multidata (.archipelago) requires a server of at least version {mdata_ver},"
diff --git a/kvui.py b/kvui.py
index 536dce12208e..d58af3ed0e78 100644
--- a/kvui.py
+++ b/kvui.py
@@ -243,6 +243,8 @@ def get_text(self):
                             f"\nYou currently have {ctx.hint_points} points."
                 elif ctx.hint_cost == 0:
                     text += "\n!hint is free to use."
+                if ctx.stored_data and "race_mode" in ctx.stored_data:
+                    text += "\nRace mode is enabled." if ctx.stored_data["race_mode"] else "\nRace mode is disabled."
             else:
                 text += f"\nYou are not authenticated yet."