OpenRCT2: Implement New Game

.gitignore

@@ -200,3 +200,23 @@ minecraft_versions.json
 .LSOverride
 Thumbs.db
 [Dd]esktop.ini
+worlds/sm_map_rando.apworld
+worlds/marioland2.apworld
+worlds/mariomissing.apworld
+meta.yaml
+worlds/bfbb.apworld
+worlds/bloonstd6.apworld
+worlds/brotato.apworld
+worlds/manual_mk8d_rampantepsilon.apworld
+worlds/manual_rhythmpurgatory_fungus.apworld
+meta.yaml
+worlds/guardianlegend.apworld
+worlds/ff6wc.apworld
+worlds/ffxiitm.apworld
+enemizerDeleteLater.zip
+meta.yaml
+ubuntu.16.04-x64.zip
+worlds/subversion.apworld
+worlds/tww.apworld
+worlds/openrct2.apworld
+worlds/yachtdice.apworld

worlds/openrct2/Client.py

@@ -0,0 +1,117 @@
+
+import logging
+import sys
+import asyncio
+import typing
+from CommonClient import CommonContext, get_base_parser, server_loop
+import Utils
+import re
+from .OpenRCT2Socket import OpenRCT2Socket
+
+if __name__ == "__main__":
+    print("\n\n\n\n\n\n==================================\n")
+    Utils.init_logging("TextClient", exception_logger="Client")
+# without terminal, we have to use gui mode
+gui_enabled = not sys.stdout or "--nogui" not in sys.argv
+
+logger = logging.getLogger("Client")
+
+class OpenRCT2Context(CommonContext):
+    tags = {"DeathLink"}
+    game = "OpenRCT2"
+    items_handling = 0b111  # receive all items for /received
+    want_slot_data = True 
+
+    def __init__(self, server_address: typing.Optional[str], password: typing.Optional[str]) -> None:
+        super().__init__(server_address, password)
+        self.gamesock = OpenRCT2Socket(self)
+        self.game_connection_established = False
+        #kivy.set_title("OpenRCT2 Client")
+
+    async def server_auth(self, password_requested: bool = False):
+        if not self.game_connection_established:
+            logger.info('Awaiting connection to OpenRCT2')
+            await self.gamesock.connected_to_game.wait()
+
+
+        if password_requested and not self.password:
+            await super(OpenRCT2Context, self).server_auth(password_requested)
+
+
+        await self.get_username()
+        await self.send_connect()
+
+    def on_package(self, cmd: str, args: dict):
+        # if cmd == "Connected":
+        #     self.game = self.game#slot_info[self.slot].game
+        print("PACKAGE!!!")
+        if cmd == "PrintJSON":
+            for index, item in enumerate(args['data']):
+                match = re.search(r'\[color=[^\]]+\](.*?)\[/color\]', args['data'][index]['text'])
+                if match:
+                    args['data'][index]['text'] = match.group(1) 
+        print(args)
+        self.gamesock.sendobj(args)
+
+    # async def disconnect(self, allow_autoreconnect: bool = False):
+    #     # self.game = ""
+    #     await super().disconnect(allow_autoreconnect)
+
+    # async def shutdown(self):
+    #     await super().shutdown()
+
+
+    # DeathLink hooks
+    def on_deathlink(self, data: typing.Dict[str, typing.Any]) -> None:
+        """Gets dispatched when a new DeathLink is triggered by another linked player."""
+        super().on_deathlink(data)
+        self.gamesock.sendobj({'cmd': 'DeathLink'})
+
+    def run_gui(self): #Sets the title of the client
+        """Import kivy UI system and start running it as self.ui_task."""
+        from kvui import GameManager
+
+        class TextManager(GameManager):
+            logging_pairs = [
+                ("Client", "Archipelago")
+            ]
+            base_title = "OpenRCT2 Client"
+
+        self.ui = TextManager(self)
+        self.ui_task = asyncio.create_task(self.ui.async_run(), name="UI")
+
+# Replacing this with code from Serpent.ai to make a .apworld
+# async def main(args): 
+#     ctx = OpenRCT2Context(args.connect, args.password)
+#     ctx.auth = args.name
+#     ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
+
+#     if gui_enabled:
+#         ctx.run_gui()
+#     ctx.run_cli()
+
+#     await ctx.exit_event.wait()
+#     await ctx.shutdown()
+
+def main():
+    Utils.init_logging("OpenRCT2Client", exception_logger="Client")
+
+    async def _main():
+        ctx = OpenRCT2Context(None, None)
+        ctx.server_task = asyncio.create_task(server_loop(ctx), name="server loop")
+
+        if gui_enabled:
+            ctx.run_gui()
+
+        ctx.run_cli()
+
+        await ctx.exit_event.wait()
+        await ctx.shutdown()
+
+    import colorama
+
+    colorama.init()
+
+    asyncio.run(_main())
+
+    colorama.deinit()

worlds/openrct2/Items.py

@@ -0,0 +1,87 @@
+from BaseClasses import Item
+import typing
+import copy
+from .Constants import item_info, Scenario_Items
+from .Options import *
+
+
+class OpenRCT2Item(Item):
+    game: str = "OpenRCT2"
+
+
+
+def set_openRCT2_items(world):
+    # print("\nThis is the selected scenario:")
+    # print(scenario)
+    # print("And these items will be randomized:")
+    # print(Scenario_Items[scenario])
+    openRCT2_items = copy.deepcopy(Scenario_Items[world.options.scenario.value])
+    rules = [world.options.difficult_guest_generation.value,
+                 world.options.difficult_park_rating.value,
+                 world.options.forbid_high_construction.value,
+                 world.options.forbid_landscape_changes.value,
+                 world.options.forbid_marketing_campaigns.value,
+                 world.options.forbid_tree_removal.value]
+
+    if world.options.include_atm:
+        if "Cash Machine" not in openRCT2_items:
+            openRCT2_items.append("Cash Machine")
+
+    if world.options.include_first_aid:
+        if "First Aid" not in openRCT2_items:
+            openRCT2_items.append("First Aid")
+
+    if world.options.monopoly_mode.value:
+        for each in range(20):
+            openRCT2_items.append("Land Discount")
+            openRCT2_items.append("Construction Rights Discount")
+
+    if world.options.include_gamespeed_items.value:
+        for each in range(4):
+            openRCT2_items.append("Progressive Speed")
+
+    for each in range(world.options.furry_convention_traps.value):
+        openRCT2_items.append("Furry Convention Trap")
+
+    for each in range(world.options.spam_traps.value):
+        openRCT2_items.append("Spam Trap")
+    for each in range(world.options.bathroom_traps.value):
+        openRCT2_items.append("Bathroom Trap")
+    for each in range(world.options.skips.value):
+        openRCT2_items.append("Skip")
+
+    for number, rule in enumerate(item_info["park_rules"]):  # Check every rule type
+        if rules[number] == 1:  # If it's enabled and can be disabled
+            openRCT2_items.append(rule)  # Add an item to disable
+
+    filler = world.options.filler.value
+
+    filler_count = len(openRCT2_items) * (filler * .01) - 1
+    count = 0
+    while count < filler_count:
+        rarity = world.random.random()
+        if rarity < .6:
+            openRCT2_items.append(world.random.choice(item_info["filler_common"]))
+        elif rarity < .9:
+            openRCT2_items.append(world.random.choice(item_info["filler_uncommon"]))
+        else:
+            openRCT2_items.append(world.random.choice(item_info["filler_rare"]))
+        count += 1
+
+    openRCT2_items.append("Beauty Contest")
+
+    # print(openRCT2_items)
+
+    # handles the starting ride
+    found_starter = False
+    while not found_starter:
+        candidate_list = [item for item in openRCT2_items if item in item_info["rides"] and item not in item_info["non_starters"]]  
+        candidate = world.random.choice(candidate_list)  
+        starting_ride = candidate
+        openRCT2_items.remove(candidate)
+        found_starter = True
+
+    # print("Here's the starting ride!")
+    # print(starting_ride)
+
+    return openRCT2_items, starting_ride