alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Minor adjustments to world model refactor

Browse Source
This commit is contained in:
aerinon
2023-03-09 16:48:14 -07:00
parent 1a1c60f84a
commit affd7568cb
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Main.py
View File

@@ -241,7 +241,6 @@ def main(args, seed=None, fish=None):
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
set_rules(world, player) set_rules(world, player)
reg = world.get_region('Dark Desert', 1)
district_item_pool_config(world) district_item_pool_config(world)
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
if world.shopsanity[player]: if world.shopsanity[player]:

9
Rules.py
View File

@@ -246,6 +246,10 @@ def global_rules(world, player):
set_rule(world.get_entrance('Hammer Bridge Pegs (North)', player), lambda state: state.has('Hammer', player)) set_rule(world.get_entrance('Hammer Bridge Pegs (North)', player), lambda state: state.has('Hammer', player))
set_rule(world.get_entrance('Hammer Bridge Pegs (South)', player), lambda state: state.has('Hammer', player)) set_rule(world.get_entrance('Hammer Bridge Pegs (South)', player), lambda state: state.has('Hammer', player))
# this more like an ohko rule - dependent on bird being present too - so enemizer could turn this off?
set_rule(world.get_entrance('Bumper Cave Ledge Drop', player), lambda state: state.has_Pearl(player) and
(state.has('Cape', player) or state.has('Cane of Byrna', player) or state.has_sword(player)))
# entrance rules # entrance rules
# Caution: If king's grave is relaxed at all to account for reaching it via a two way cave's exit in insanity mode, then the bomb shop logic will need to be updated (that would involve create a small ledge-like Region for it) # Caution: If king's grave is relaxed at all to account for reaching it via a two way cave's exit in insanity mode, then the bomb shop logic will need to be updated (that would involve create a small ledge-like Region for it)
# TODO: Not sure if this ^ is true anymore since Kings Grave is its own region now # TODO: Not sure if this ^ is true anymore since Kings Grave is its own region now
@@ -900,11 +904,6 @@ def ow_inverted_rules(world, player):
or (state.can_reach('Light World', 'Region', player) and state.has_Mirror(player))) # Need LW access using Mirror or Portal or (state.can_reach('Light World', 'Region', player) and state.has_Mirror(player))) # Need LW access using Mirror or Portal
set_rule(world.get_entrance('Inverted Pyramid Hole', player), lambda state: world.open_pyramid[player] or world.goal[player] == 'trinity' or state.has('Beat Agahnim 2', player)) set_rule(world.get_entrance('Inverted Pyramid Hole', player), lambda state: world.open_pyramid[player] or world.goal[player] == 'trinity' or state.has('Beat Agahnim 2', player))
# todo: this needs a new home
# # this more like an ohko rule - dependent on bird being present too - so enemizer could turn this off?
# set_rule(world.get_entrance('Bumper Cave Ledge Drop', player), lambda state: state.has_Pearl(player) and
# (state.has('Cape', player) or state.has('Cane of Byrna', player) or state.has_sword(player)))
def ow_bunny_rules(world, player): def ow_bunny_rules(world, player):
# locations # locations

1
source/overworld/EntranceShuffle2.py
View File

@@ -976,7 +976,6 @@ def find_entrances_and_exits(avail_pool, entrance_pool):
inverted_sub_table = { inverted_sub_table = {
#TODO: Confirm this is correct
#'Ganons Tower': 'Agahnims Tower', #'Ganons Tower': 'Agahnims Tower',
#'Agahnims Tower': 'Ganons Tower', #'Agahnims Tower': 'Ganons Tower',
#'Links House': 'Big Bomb Shop', #'Links House': 'Big Bomb Shop',