From 62a265cc31cc1820f70f5c311d70928999f2a8d5 Mon Sep 17 00:00:00 2001 From: Alchav <59858495+Alchav@users.noreply.github.com> Date: Sun, 23 Apr 2023 16:17:03 -0400 Subject: [PATCH] =?UTF-8?q?Pok=C3=A9mon=20R/B:=20logic=20and=20location=20?= =?UTF-8?q?name=20fixes=20(#1752)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrects incorrect name listed for location in rules.py leading to logic rules failing to apply. Swaps location names for incorrectly-named trainersanity checks in Viridian Gym --- worlds/pokemon_rb/__init__.py | 2 +- worlds/pokemon_rb/locations.py | 4 ++-- worlds/pokemon_rb/rules.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/worlds/pokemon_rb/__init__.py b/worlds/pokemon_rb/__init__.py index b223568ff07d..753d35c735cd 100644 --- a/worlds/pokemon_rb/__init__.py +++ b/worlds/pokemon_rb/__init__.py @@ -40,7 +40,7 @@ class PokemonRedBlueWorld(World): game = "Pokemon Red and Blue" option_definitions = pokemon_rb_options - data_version = 7 + data_version = 8 required_client_version = (0, 3, 9) topology_present = False diff --git a/worlds/pokemon_rb/locations.py b/worlds/pokemon_rb/locations.py index a1b64e12e531..f942662c8e08 100644 --- a/worlds/pokemon_rb/locations.py +++ b/worlds/pokemon_rb/locations.py @@ -708,8 +708,8 @@ def __init__(self, flag): LocationData("Viridian Gym", "Cooltrainer M 2", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0_ITEM"], EventFlag(446), inclusion=trainersanity), LocationData("Viridian Gym", "Blackbelt 2", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1_ITEM"], EventFlag(445), inclusion=trainersanity), LocationData("Viridian Gym", "Tamer 2", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2_ITEM"], EventFlag(440), inclusion=trainersanity), - LocationData("Viridian Gym", "Cooltrainer M 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5_ITEM"], EventFlag(437), inclusion=trainersanity), - LocationData("Viridian Gym", "Blackbelt 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4_ITEM"], EventFlag(438), inclusion=trainersanity), + LocationData("Viridian Gym", "Blackbelt 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5_ITEM"], EventFlag(437), inclusion=trainersanity), + LocationData("Viridian Gym", "Cooltrainer M 3", None, rom_addresses["Trainersanity_EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4_ITEM"], EventFlag(438), inclusion=trainersanity), LocationData("Victory Road 1F", "Cooltrainer F", None, rom_addresses["Trainersanity_EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0_ITEM"], EventFlag(15), inclusion=trainersanity), LocationData("Victory Road 1F", "Cooltrainer M", None, rom_addresses["Trainersanity_EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1_ITEM"], EventFlag(14), inclusion=trainersanity), LocationData("Victory Road 2F", "Blackbelt", None, rom_addresses["Trainersanity_EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0_ITEM"], EventFlag(162), inclusion=trainersanity), diff --git a/worlds/pokemon_rb/rules.py b/worlds/pokemon_rb/rules.py index e9e64e218e99..33fe248a8c93 100644 --- a/worlds/pokemon_rb/rules.py +++ b/worlds/pokemon_rb/rules.py @@ -146,7 +146,7 @@ def prize_rule(i): "Silph Co 11F - Rocket 2 (Card Key)": lambda state: state.has("Card Key", player), "Silph Co 9F - Rocket 2 (Card Key)": lambda state: state.has("Card Key", player), "Silph Co 3F - Scientist (Card Key)": lambda state: state.has("Card Key", player), - "Route 10 North - Pokemaniac": lambda state: state.pokemon_rb_can_surf(player), + "Route 10 - Pokemaniac": lambda state: state.pokemon_rb_can_surf(player), "Rocket Hideout B1F - Rocket 5 (Lift Key)": lambda state: state.has("Lift Key", player), "Rocket Hideout B4F - Rocket 2 (Lift Key)": lambda state: state.has("Lift Key", player), "Rocket Hideout B4F - Rocket 3 (Lift Key)": lambda state: state.has("Lift Key", player),