monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pokemon R/B: Version 3 final touches (#1542) 

* Pokémon R/B: Dexsanity balls

* Pokémon R/B: Early Parcel improvement

* Pokémon R/B: Early Parcel dexsanity stuff only when dexsanity
This commit is contained in:
Alchav 2023-03-14 13:36:17 -04:00 committed by GitHub
parent 37499b40a1
commit 4b7033fce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worlds/pokemon_rb/__init__.py
View File

@ -287,8 +287,12 @@ class PokemonRedBlueWorld(World):
else: else:
break break
if self.multiworld.old_man[self.player].value == 1: if self.multiworld.old_man[self.player] == "early_parcel":
self.multiworld.local_early_items[self.player]["Oak's Parcel"] = 1 self.multiworld.local_early_items[self.player]["Oak's Parcel"] = 1
if self.multiworld.dexsanity[self.player]:
for location in [self.multiworld.get_location(f"Pokedex - {mon}", self.player)
for mon in poke_data.pokemon_data.keys()]:
add_item_rule(location, lambda item: item.name != "Oak's Parcel" or item.player != self.player)
if not self.multiworld.badgesanity[self.player].value: if not self.multiworld.badgesanity[self.player].value:
self.multiworld.non_local_items[self.player].value -= self.item_name_groups["Badges"] self.multiworld.non_local_items[self.player].value -= self.item_name_groups["Badges"]

5
worlds/pokemon_rb/locations.py
View File

@ -753,8 +753,9 @@ location_data = [
LocationData("Celadon Game Corner", "Hidden Item at End of Horizontal Machine Row (Coin Case)", "20 Coins", rom_addresses["Hidden_Item_Game_Corner_10"], Hidden(63), inclusion=hidden_items), LocationData("Celadon Game Corner", "Hidden Item at End of Horizontal Machine Row (Coin Case)", "20 Coins", rom_addresses["Hidden_Item_Game_Corner_10"], Hidden(63), inclusion=hidden_items),
LocationData("Celadon Game Corner", "Hidden Item in Front of Horizontal Machine Row (Coin Case)", "100 Coins", rom_addresses["Hidden_Item_Game_Corner_11"], Hidden(64), inclusion=hidden_items), LocationData("Celadon Game Corner", "Hidden Item in Front of Horizontal Machine Row (Coin Case)", "100 Coins", rom_addresses["Hidden_Item_Game_Corner_11"], Hidden(64), inclusion=hidden_items),
*[LocationData("Pokedex", mon, None, rom_addresses["Dexsanity_Items"] + i, DexSanityFlag(i), *[LocationData("Pokedex", mon, ball, rom_addresses["Dexsanity_Items"] + i, DexSanityFlag(i), type="Item",
type="Item", inclusion=dexsanity) for (mon, i) in zip(pokemon_data.keys(), range(0, 152))], inclusion=dexsanity) for (mon, i, ball) in zip(pokemon_data.keys(), range(0, 152),
["Poke Ball", "Great Ball", "Ultra Ball"]* 51)],
LocationData("Indigo Plateau", "Become Champion", "Become Champion", event=True), LocationData("Indigo Plateau", "Become Champion", "Become Champion", event=True),
LocationData("Pokemon Tower 7F", "Fuji Saved", "Fuji Saved", event=True), LocationData("Pokemon Tower 7F", "Fuji Saved", "Fuji Saved", event=True),