mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-22 07:35:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

update pokemon and messenger

Browse Source
This commit is contained in:
alwaysintreble
2023-04-06 03:13:52 -05:00
parent e3ba50aa02
commit 0f6d72eb0b
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -233,7 +233,7 @@ class MultiWorld():
def set_options(self, args: Namespace) -> None:
for option_key in Options.common_options:
setattr(self, option_key, getattr(args, option_key, {}))
setattr(self, option_key, getattr(args, option_key, ))
for option_key in Options.per_game_common_options:
setattr(self, option_key, getattr(args, option_key, {}))

10
worlds/messenger/Options.py
View File

@@ -1,10 +1,10 @@
from Options import DefaultOnToggle, DeathLink, Range, Accessibility, Choice
from Options import DefaultOnToggle, DeathLink, Range, ItemsAccessibility, Choice
class MessengerAccessibility(Accessibility):
default = Accessibility.option_locations
# defaulting to locations accessibility since items makes certain items self-locking
__doc__ = Accessibility.__doc__.replace(f"default {Accessibility.default}", f"default {default}")
class MessengerAccessibility(ItemsAccessibility):
default = ItemsAccessibility.option_full
# defaulting to full accessibility since items makes certain items self-locking
__doc__ = ItemsAccessibility.__doc__.replace(f"default {ItemsAccessibility.default}", f"default {default}")
class Logic(Choice):

2
worlds/messenger/Rules.py
View File

@@ -112,7 +112,7 @@ class MessengerRules:
lambda state: state.has("Shop Chest", self.player))
multiworld.completion_condition[self.player] = lambda state: state.has("Rescue Phantom", self.player)
if multiworld.accessibility[self.player] > MessengerAccessibility.option_locations:
if multiworld.accessibility[self.player] > MessengerAccessibility.option_full:
set_self_locking_items(multiworld, self.player)

3
worlds/pokemon_rb/options.py
View File

@@ -1,5 +1,5 @@
from Options import Toggle, Choice, Range, SpecialRange, TextChoice, DeathLink
from Options import Toggle, Choice, Range, SpecialRange, TextChoice, DeathLink, ItemsAccessibility
class GameVersion(Choice):
@@ -646,6 +646,7 @@ class RandomizePokemonPalettes(Choice):
pokemon_rb_options = {
"accessibility": ItemsAccessibility,
"game_version": GameVersion,
"trainer_name": TrainerName,
"rival_name": RivalName,

2
worlds/pokemon_rb/rules.py
View File

@@ -16,7 +16,7 @@ def set_rules(world, player):
item_rules["Celadon Prize Corner - Item Prize 2"] = prize_rule
item_rules["Celadon Prize Corner - Item Prize 3"] = prize_rule
if world.accessibility[player] != "locations":
if world.accessibility[player] != "full":
world.get_location("Cerulean City - Bicycle Shop", player).always_allow = (lambda state, item:
item.name == "Bike Voucher"
and item.player == player)