Skip to content

Add location groups and fix some inconsistencies in location names #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wolicodes wants to merge 1 commit into
base: melee
Choose a base branch
from
Open

Add location groups and fix some inconsistencies in location names #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions worlds/melee/Locations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@ def get_locations(world: "SSBMWorld") -> List[LocationData]:

if world.options.enable_annoying_multiman_checks:
location_table += [
LocationData("Multi-Man Melee", "15 Minute Melee Clear", 0x1A0),
LocationData("Multi-Man Melee", "Cruel Melee 5 KO's", 0x1A2)]
LocationData("Multi-Man Melee", "Multi Man Melee - 15 Minute Melee Clear", 0x1A0),
LocationData("Multi-Man Melee", "Multi Man Melee - Cruel Melee 5 KO's", 0x1A2)]


if world.options.bonus_checks:
Expand Down Expand Up @@ -638,7 +638,7 @@ def get_locations(world: "SSBMWorld") -> List[LocationData]:
LocationData("Any Melee", "Bonus - Center Stage", 0x72),
LocationData("Any Melee", "Bonus - Star KO", 0x73),
LocationData("Any Melee", "Bonus - Wimpy KO", 0x74),
LocationData("Any Melee", "Bonus - Bull's-eye KO", 0x75),
LocationData("Any Melee", "Bonus - Bull's-Eye KO", 0x75),
LocationData("Any Melee", "Bonus - Pacifist", 0x76),
LocationData("Any Melee", "Bonus - Moment of Silence", 0x77),
LocationData("Any Melee", "Bonus - Impervious", 0x78),
Expand Down Expand Up @@ -681,7 +681,7 @@ def get_locations(world: "SSBMWorld") -> List[LocationData]:
LocationData("Any Melee", "Bonus - Ground Pounded", 0x9C),
LocationData("Any Melee", "Bonus - Tiny KO", 0x9D),
LocationData("Any Melee", "Bonus - Invisible KO", 0x9E),
LocationData("Any Melee", "Bonus - Bunny-hood Blast", 0x9F),
LocationData("Any Melee", "Bonus - Bunny-Hood Blast", 0x9F),
LocationData("Any Melee", "Bonus - Vegetarian", 0xA0),
LocationData("Any Melee", "Bonus - Heartthrob", 0xA1),
LocationData("Any Melee", "Bonus - Invincible Finish", 0xA2),
Expand Down Expand Up @@ -797,7 +797,7 @@ def get_locations(world: "SSBMWorld") -> List[LocationData]:

if world.options.hard_modes_clear:
location_table += [
LocationData("Any Main 1-P", "Bonus - Very Hard Clear", 0xF1),
LocationData("Any Main 1-P", "Bonus - Very-Hard Clear", 0xF1),
]

return location_table
1 change: 1 addition & 0 deletions worlds/melee/Rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from worlds.generic.Rules import set_rule
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from . import SSBMWorld

Expand Down
3 changes: 2 additions & 1 deletion worlds/melee/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from .Options import SSBMOptions, ssbm_option_groups
from .Rules import set_location_rules
from .Rom import apply_patch, MeleePlayerContainer
from .static_location_data import location_ids
from .static_location_data import location_ids, location_name_groups
from .setup_game import setup_gamevars, place_static_items, calculate_trophy_based_locations
from .in_game_data import global_trophy_table
from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch_subprocess, icon_paths
Expand Down Expand Up @@ -66,6 +66,7 @@ class SSBMWorld(World):
item_name_to_id = {item: item_table[item].code for item in item_table}
location_name_to_id = location_ids
item_name_groups = get_item_names_per_category()
location_name_groups = location_name_groups

web = SSBMWeb()
# topology_present = True
Expand Down
Loading