From 575966ce320a3891541980ed2b0ec592523878e3 Mon Sep 17 00:00:00 2001 From: ScootyPuffJr1 <77215594+ScootyPuffJr1@users.noreply.github.com> Date: Sat, 9 Jan 2021 19:25:19 -0500 Subject: [PATCH 1/2] Update Text.py Change to wording for tavern man --- Text.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Text.py b/Text.py index a2fd674c..a925c0e0 100644 --- a/Text.py +++ b/Text.py @@ -222,7 +222,7 @@ TavernMan_texts = [ "Helmasaur is\nthrowing a\nparty.\nI hope it's\na masquerade!", "I'd like to\nknow Arrghus\nbetter.\nBut he won't\ncome out of\nhis shell!", "Mothula didn't\nhave much fun\nat the party.\nHe's immune to\nspiked punch!", - "Don't set me\nup with that\nchick from\nSteve's Town.\n\n\nI'm not\ninterested in\na Blind date!", + "Don't set me\nup with that\nlady from\nSteve's Town.\n\n\nI'm not\ninterested in\na Blind date!", "Kholdstare is\nafraid to go\nto the circus.\nHungry kids\nthought he was\ncotton candy!", "I asked who\nVitreous' best\nfriends are.\nHe said,\n'Me, Myself,\nand Eye!'", "Trinexx can be\na hothead or\nhe can be an\nice guy. In\nthe end, he's\na solid\nindividual!", From 233e9e62083740b9b37bc0e249ef2ed6f90e78b2 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sun, 10 Jan 2021 12:52:23 +0100 Subject: [PATCH 2/2] expand forfeit to forfeit out anything that is in multidata, so forfeits works with not yet implemented locations --- MultiServer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MultiServer.py b/MultiServer.py index e9d55490..6fa1785c 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -475,6 +475,8 @@ def send_new_items(ctx: Context): def forfeit_player(ctx: Context, team: int, slot: int): all_locations = {values[0] for values in Regions.location_table.values() if type(values[0]) is int} all_locations.update({values[1] for values in Regions.key_drop_data.values()}) + # register any unknown locations, such as from future versions to be forfeited too + all_locations.update(location for location, location_slot in ctx.locations if location_slot == slot) ctx.notify_all("%s (Team #%d) has forfeited" % (ctx.player_names[(team, slot)], team + 1)) register_location_checks(ctx, team, slot, all_locations)