morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Pokemon Emerald: Clean up dexsanity spoiler and hints (#3832)

Browse Source 
* Pokemon Emerald: Clean up dexsanity spoiler and hints

* Pokemon Emerald: Add +, do less hacks

* Pokemon Emerald: Update changelog

* Pokemon Emerald: Replace arrow with word in changelog

* Pokemon Emerald: Fix changelog
This commit is contained in:
Bryce Wilson
2024-12-02 17:52:20 -08:00
committed by GitHub
parent 81b9a53a37
commit 18e8d50768
3 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
worlds/pokemon_emerald/__init__.py
View File

@@ -629,21 +629,34 @@ class PokemonEmeraldWorld(World):
spoiler_handle.write(f"\n\nWild Pokemon ({self.player_name}):\n\n")
slot_to_rod_suffix = {
0: " (Old Rod)",
1: " (Old Rod)",
2: " (Good Rod)",
3: " (Good Rod)",
4: " (Good Rod)",
5: " (Super Rod)",
6: " (Super Rod)",
7: " (Super Rod)",
8: " (Super Rod)",
9: " (Super Rod)",
}
species_maps = defaultdict(set)
for map in self.modified_maps.values():
if map.land_encounters is not None:
for encounter in map.land_encounters.slots:
species_maps[encounter].add(map.name[4:])
species_maps[encounter].add(map.label + " (Land)")
if map.water_encounters is not None:
for encounter in map.water_encounters.slots:
species_maps[encounter].add(map.name[4:])
species_maps[encounter].add(map.label + " (Water)")
if map.fishing_encounters is not None:
for encounter in map.fishing_encounters.slots:
species_maps[encounter].add(map.name[4:])
for slot, encounter in enumerate(map.fishing_encounters.slots):
species_maps[encounter].add(map.label + slot_to_rod_suffix[slot])
lines = [f"{emerald_data.species[species].label}: {', '.join(maps)}\n"
lines = [f"{emerald_data.species[species].label}: {', '.join(sorted(maps))}\n"
for species, maps in species_maps.items()]
lines.sort()
for line in lines:
@@ -655,35 +668,35 @@ class PokemonEmeraldWorld(World):
if self.options.dexsanity:
from collections import defaultdict
slot_to_rod = {
0: "_OLD_ROD",
1: "_OLD_ROD",
2: "_GOOD_ROD",
3: "_GOOD_ROD",
4: "_GOOD_ROD",
5: "_SUPER_ROD",
6: "_SUPER_ROD",
7: "_SUPER_ROD",
8: "_SUPER_ROD",
9: "_SUPER_ROD",
slot_to_rod_suffix = {
0: " (Old Rod)",
1: " (Old Rod)",
2: " (Good Rod)",
3: " (Good Rod)",
4: " (Good Rod)",
5: " (Super Rod)",
6: " (Super Rod)",
7: " (Super Rod)",
8: " (Super Rod)",
9: " (Super Rod)",
}
species_maps = defaultdict(set)
for map in self.modified_maps.values():
if map.land_encounters is not None:
for encounter in map.land_encounters.slots:
species_maps[encounter].add(map.name[4:] + "_GRASS")
species_maps[encounter].add(map.label + " (Land)")
if map.water_encounters is not None:
for encounter in map.water_encounters.slots:
species_maps[encounter].add(map.name[4:] + "_WATER")
species_maps[encounter].add(map.label + " (Water)")
if map.fishing_encounters is not None:
for slot, encounter in enumerate(map.fishing_encounters.slots):
species_maps[encounter].add(map.name[4:] + slot_to_rod[slot])
species_maps[encounter].add(map.label + slot_to_rod_suffix[slot])
hint_data[self.player] = {
self.location_name_to_id[f"Pokedex - {emerald_data.species[species].label}"]: ", ".join(maps)
self.location_name_to_id[f"Pokedex - {emerald_data.species[species].label}"]: ", ".join(sorted(maps))
for species, maps in species_maps.items()
}