Kingdom Hearts: Implement New Game (ArchipelagoMW#3201)

* Added Final Ansem Goal * Update __init__.py * Update Rules.py * New EotW logic * Update __init__.py * Update __init__.py * Update Items.py * Update Rules.py * Rename Location to be more meaningful, logic fixes * Removed Aerith locations * Change to allow randomized keyblade stats * Fixed incorrect option description. Fixed victory locations for alternative win condition settings * Commit * Lots of changes * Fixes * Fixes * Update Rules.py * Update Rules.py * Update Rules.py * Update Rules.py * Fixes * Update Rules.py * Update Rules.py * Update Options.py * Old Book is not required * Added Jungle Slider * Add Cid Check * Add Wonderland Book Check * Add OC Green Trinity * Add Inferno Band Event * Add Kurt Zisa Zantetsuken and Unknown EXP Necklace checks * Update Locations.py * Fix Final Ansem Goal * Update __init__.py * Update __init__.py * Add options to exclude super bosses and 100 acre wood * Fix puppies trp, remove cid check * Fix 100 Acre Wood Option * Material to Empty Bottle * Fixed rules, location names, etc * Fix super bosses * Add item + location groups, level sanity * Fix location and item group names * Add Bad Starting Weapons Option * Logic Error for 100 Acre Wood * Update Rules.py * Update __init__.py * Fixes related to randomized keyblade stats and super bosses * Credits and Fixes * Logic fixes, location name group changes * Update Options.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Scipio Wright <[email protected]> * Update .gitignore * Update CODEOWNERS * Update docs/CODEOWNERS Co-authored-by: Scipio Wright <[email protected]> * Fixed Atlantica item group name * Update CODEOWNERS * Update Client.py * Update Items.py * Update __init__.py Co-authored-by: Scipio Wright <[email protected]> * Update Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright <[email protected]> * Fixed report group name * Fixes for PR * Update Options.py * Push changes for making the Final Rest Door appear, few option fixes * Update Rules.py * Website formatting, 0 min for reports, option description typo * Create KH1Client.py * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Scipio Wright <[email protected]> * Update Options.py * Update Options.py * Update Rules.py * Update Rules.py * Update Rules.py * Add Donald and Goofy Death Link * Add fight logic for optional bosses * Update __init__.py * Update Options.py * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright <[email protected]> * Update Client.py * Update kh1_en.md * Update __init__.py * Cleaning up for PR * Update Client.py * Added event locations for vanilla items * Add proper location groups and auto hint synth shop items when entering * so many changes * Update Rules.py * fixed oathkeeper and crabclaw logic * Update Rules.py * Update Rules.py * Update Rules.py * Update Rules.py * Update en_Kingdom Hearts.md * Update en_Kingdom Hearts.md * fixing text * Update kh1_en.md * Addition of new key items * Update Regions.py * Push for start item from pool test * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright <[email protected]> * Document update * Update Rules.py * Added starting world range and final rest goal option * Update kh1_en.md * Update en_Kingdom Hearts.md * Update __init__.py * Update __init__.py * Clean up options descriptions * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/Client.py Co-authored-by: Scipio Wright <[email protected]> * Fix grammar in document * Update __init__.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Removed return type * Update __init__.py * Update __init__.py * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Scipio Wright <[email protected]> * Update __init__.py * Fix missing i replacement, rework set rules to use "self" instead of a million arguments * Update KH1Client.py Co-authored-by: Doug Hoskisson <[email protected]> * Reformat rules, fix bug with exp mult, add to readme * Clean up regions, fix client * Fix item send prompt * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/en_Kingdom Hearts.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/docs/kh1_en.md Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/test/test_goal.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Items.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Locations.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Items.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Regions.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/__init__.py Co-authored-by: Doug Hoskisson <[email protected]> * Fix so many suggestions * removed junk in missable locations option * Update __init__.py * Change credits order * Update en_Kingdom Hearts.md * Standardize punctuation * Update en_Kingdom Hearts.md * Update en_Kingdom Hearts.md * Update Regions.py * Removed "disclude" options in generation fillers * Update Rules.py * Update __init__.py * Fix cemetery typo * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Add option groups and option presets * Update worlds/kh1/__init__.py That's a good idea! Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Options.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Presets.py Co-authored-by: Exempt-Medic <[email protected]> * fixed HB rule and formatting on a line in Items.py * Fix logic bug with Geppetto's House postcard * Update Rules.py * Update Options.py * Update __init__.py * Update __init__.py * Huge under-the-hood update for PR * More updates for PR * Update worlds/kh1/__init__.py Co-authored-by: Exempt-Medic <[email protected]> * Update worlds/kh1/Rules.py Co-authored-by: Exempt-Medic <[email protected]> * Update __init__.py --------- Co-authored-by: Scipio Wright <[email protected]> Co-authored-by: Doug Hoskisson <[email protected]> Co-authored-by: Exempt-Medic <[email protected]>
qwint · Aug 18, 2024 · 28a9709 · 28a9709
1 parent 49a5b52
commit 28a9709
Show file tree

Hide file tree

Showing 15 changed files with 4,940 additions and 0 deletions.
diff --git a/KH1Client.py b/KH1Client.py
@@ -0,0 +1,9 @@
+if __name__ == '__main__':
+    import ModuleUpdate
+    ModuleUpdate.update()
+
+    import Utils
+    Utils.init_logging("KH1Client", exception_logger="Client")
+
+    from worlds.kh1.Client import launch
+    launch()
diff --git a/README.md b/README.md
@@ -73,6 +73,7 @@ Currently, the following games are supported:
 * Yu-Gi-Oh! Ultimate Masters: World Championship Tournament 2006
 * A Hat in Time
 * Old School Runescape
+* Kingdom Hearts 1
 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
 Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
@@ -78,6 +78,9 @@
 # Kirby's Dream Land 3
 /worlds/kdl3/ @Silvris
 
+# Kingdom Hearts
+/worlds/kh1/ @gaithern
+
 # Kingdom Hearts 2
 /worlds/kh2/ @JaredWeakStrike
 

diff --git a/worlds/kh1/Client.py b/worlds/kh1/Client.py
@@ -0,0 +1,258 @@
+from __future__ import annotations
+import os
+import json
+import sys
+import asyncio
+import shutil
+import logging
+import re
+import time
+from calendar import timegm
+
+import ModuleUpdate
+ModuleUpdate.update()
+
+import Utils
+death_link = False
+item_num = 1
+
+logger = logging.getLogger("Client")
+
+if __name__ == "__main__":
+    Utils.init_logging("KH1Client", exception_logger="Client")
+
+from NetUtils import NetworkItem, ClientStatus
+from CommonClient import gui_enabled, logger, get_base_parser, ClientCommandProcessor, \
+    CommonContext, server_loop
+
+
+def check_stdin() -> None:
+    if Utils.is_windows and sys.stdin:
+        print("WARNING: Console input is not routed reliably on Windows, use the GUI instead.")
+
+class KH1ClientCommandProcessor(ClientCommandProcessor):
+    def _cmd_deathlink(self):
+        """Toggles Deathlink"""
+        global death_link
+        if death_link:
+            death_link = False
+            self.output(f"Death Link turned off")
+        else:
+            death_link = True
+            self.output(f"Death Link turned on")
+
+class KH1Context(CommonContext):
+    command_processor: int = KH1ClientCommandProcessor
+    game = "Kingdom Hearts"
+    items_handling = 0b111  # full remote
+
+    def __init__(self, server_address, password):
+        super(KH1Context, self).__init__(server_address, password)
+        self.send_index: int = 0
+        self.syncing = False
+        self.awaiting_bridge = False
+        # self.game_communication_path: files go in this path to pass data between us and the actual game
+        if "localappdata" in os.environ:
+            self.game_communication_path = os.path.expandvars(r"%localappdata%/KH1FM")
+        else:
+            self.game_communication_path = os.path.expandvars(r"$HOME/KH1FM")
+        if not os.path.exists(self.game_communication_path):
+            os.makedirs(self.game_communication_path)
+        for root, dirs, files in os.walk(self.game_communication_path):
+            for file in files:
+                if file.find("obtain") <= -1:
+                    os.remove(root+"/"+file)
+
+    async def server_auth(self, password_requested: bool = False):
+        if password_requested and not self.password:
+            await super(KH1Context, self).server_auth(password_requested)
+        await self.get_username()
+        await self.send_connect()
+
+    async def connection_closed(self):
+        await super(KH1Context, self).connection_closed()
+        for root, dirs, files in os.walk(self.game_communication_path):
+            for file in files:
+                if file.find("obtain") <= -1:
+                    os.remove(root + "/" + file)
+        global item_num
+        item_num = 1
+
+    @property
+    def endpoints(self):
+        if self.server:
+            return [self.server]
+        else:
+            return []
+
+    async def shutdown(self):
+        await super(KH1Context, self).shutdown()
+        for root, dirs, files in os.walk(self.game_communication_path):
+            for file in files:
+                if file.find("obtain") <= -1:
+                    os.remove(root+"/"+file)
+        global item_num
+        item_num = 1
+
+    def on_package(self, cmd: str, args: dict):
+        if cmd in {"Connected"}:
+            if not os.path.exists(self.game_communication_path):
+                os.makedirs(self.game_communication_path)
+            for ss in self.checked_locations:
+                filename = f"send{ss}"
+                with open(os.path.join(self.game_communication_path, filename), 'w') as f:
+                    f.close()
+
+            #Handle Slot Data
+            for key in list(args['slot_data'].keys()):
+                with open(os.path.join(self.game_communication_path, key + ".cfg"), 'w') as f:
+                    f.write(str(args['slot_data'][key]))
+                    f.close()
+
+            ###Support Legacy Games
+            if "Required Reports" in list(args['slot_data'].keys()) and "required_reports_eotw" not in list(args['slot_data'].keys()):
+                reports_required = args['slot_data']["Required Reports"]
+                with open(os.path.join(self.game_communication_path, "required_reports.cfg"), 'w') as f:
+                    f.write(str(reports_required))
+                    f.close()
+            ###End Support Legacy Games
+
+            #End Handle Slot Data
+
+        if cmd in {"ReceivedItems"}:
+            start_index = args["index"]
+            if start_index != len(self.items_received):
+                global item_num
+                for item in args['items']:
+                    found = False
+                    item_filename = f"AP_{str(item_num)}.item"
+                    for filename in os.listdir(self.game_communication_path):
+                        if filename == item_filename:
+                            found = True
+                    if not found:
+                        with open(os.path.join(self.game_communication_path, item_filename), 'w') as f:
+                            f.write(str(NetworkItem(*item).item) + "\n" + str(NetworkItem(*item).location) + "\n" + str(NetworkItem(*item).player))
+                            f.close()
+                            item_num = item_num + 1
+
+        if cmd in {"RoomUpdate"}:
+            if "checked_locations" in args:
+                for ss in self.checked_locations:
+                    filename = f"send{ss}"
+                    with open(os.path.join(self.game_communication_path, filename), 'w') as f:
+                        f.close()
+
+        if cmd in {"PrintJSON"} and "type" in args:
+            if args["type"] == "ItemSend":
+                item = args["item"]
+                networkItem = NetworkItem(*item)
+                recieverID = args["receiving"]
+                senderID = networkItem.player
+                locationID = networkItem.location
+                if recieverID != self.slot and senderID == self.slot:
+                    itemName = self.item_names.lookup_in_slot(networkItem.item, recieverID)
+                    itemCategory = networkItem.flags
+                    recieverName = self.player_names[recieverID]
+                    filename = "sent"
+                    with open(os.path.join(self.game_communication_path, filename), 'w') as f:
+                        f.write(
+                          re.sub('[^A-Za-z0-9 ]+', '',str(itemName))[:15] + "\n"
+                        + re.sub('[^A-Za-z0-9 ]+', '',str(recieverName))[:6] + "\n"
+                        + str(itemCategory) + "\n"
+                        + str(locationID))
+                        f.close()
+
+    def on_deathlink(self, data: dict[str, object]):
+        self.last_death_link = max(data["time"], self.last_death_link)
+        text = data.get("cause", "")
+        if text:
+            logger.info(f"DeathLink: {text}")
+        else:
+            logger.info(f"DeathLink: Received from {data['source']}")
+        with open(os.path.join(self.game_communication_path, 'dlreceive'), 'w') as f:
+            f.write(str(int(data["time"])))
+            f.close()
+
+    def run_gui(self):
+        """Import kivy UI system and start running it as self.ui_task."""
+        from kvui import GameManager
+
+        class KH1Manager(GameManager):
+            logging_pairs = [
+                ("Client", "Archipelago")
+            ]
+            base_title = "Archipelago KH1 Client"
+
+        self.ui = KH1Manager(self)
+        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
+
+
+async def game_watcher(ctx: KH1Context):
+    from .Locations import lookup_id_to_name
+    while not ctx.exit_event.is_set():
+        global death_link
+        if death_link and "DeathLink" not in ctx.tags:
+            await ctx.update_death_link(death_link)
+        if not death_link and "DeathLink" in ctx.tags:
+            await ctx.update_death_link(death_link)
+        if ctx.syncing == True:
+            sync_msg = [{'cmd': 'Sync'}]
+            if ctx.locations_checked:
+                sync_msg.append({"cmd": "LocationChecks", "locations": list(ctx.locations_checked)})
+            await ctx.send_msgs(sync_msg)
+            ctx.syncing = False
+        sending = []
+        victory = False
+        for root, dirs, files in os.walk(ctx.game_communication_path):
+            for file in files:
+                if file.find("send") > -1:
+                    st = file.split("send", -1)[1]
+                    if st != "nil":
+                        sending = sending+[(int(st))]
+                if file.find("victory") > -1:
+                    victory = True
+                if file.find("dlsend") > -1 and "DeathLink" in ctx.tags:
+                    st = file.split("dlsend", -1)[1]
+                    if st != "nil":
+                        if timegm(time.strptime(st, '%Y%m%d%H%M%S')) > ctx.last_death_link and int(time.time()) % int(timegm(time.strptime(st, '%Y%m%d%H%M%S'))) < 10:
+                            await ctx.send_death(death_text = "Sora was defeated!")
+                if file.find("insynthshop") > -1:
+                    await ctx.send_msgs([{
+                        "cmd": "LocationScouts",
+                        "locations": [2656401,2656402,2656403,2656404,2656405,2656406],
+                        "create_as_hint": 2
+                    }])
+        ctx.locations_checked = sending
+        message = [{"cmd": 'LocationChecks', "locations": sending}]
+        await ctx.send_msgs(message)
+        if not ctx.finished_game and victory:
+            await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+            ctx.finished_game = True
+        await asyncio.sleep(0.1)
+
+
+def launch():
+    async def main(args):
+        ctx = KH1Context(args.connect, args.password)
+        ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
+        if gui_enabled:
+            ctx.run_gui()
+        ctx.run_cli()
+        progression_watcher = asyncio.create_task(
+            game_watcher(ctx), name="KH1ProgressionWatcher")
+
+        await ctx.exit_event.wait()
+        ctx.server_address = None
+
+        await progression_watcher
+
+        await ctx.shutdown()
+
+    import colorama
+
+    parser = get_base_parser(description="KH1 Client, for text interfacing.")
+
+    args, rest = parser.parse_known_args()
+    colorama.init()
+    asyncio.run(main(args))
+    colorama.deinit()