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

bulk set locality for speed and recursion limit

This commit is contained in:
Fabian Dill 2020-07-09 16:19:52 +02:00
parent 57fe16ab60
commit 565a7deefa
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Rules.py
View File

@ -42,7 +42,6 @@ def set_rules(world, player):
fake_flipper_rules(world, player)
overworld_glitches_rules(world, player)
elif world.logic[player] == 'minorglitches':
logging.getLogger('').info('Minor Glitches may be buggy still. No guarantee for proper logic checks.')
no_glitches_rules(world, player)
fake_flipper_rules(world, player)
else:
@ -120,14 +119,21 @@ def add_lamp_requirement(spot, player):
add_rule(spot, lambda state: state.has('Lamp', player, state.world.lamps_needed_for_dark_rooms))
def forbid_item(location, item, player):
def forbid_item(location, item, player: int):
old_rule = location.item_rule
location.item_rule = lambda i: (i.name != item or i.player != player) and old_rule(i)
def forbid_items(location, items: set, player: int):
old_rule = location.item_rule
location.item_rule = lambda i: (i.player != player or i.name not in items) and old_rule(i)
def add_item_rule(location, rule):
old_rule = location.item_rule
location.item_rule = lambda item: rule(item) and old_rule(item)
def item_in_locations(state, item, player, locations):
for location in locations:
if item_name(state, location[0], location[1]) == (item, player):
@ -148,8 +154,7 @@ def locality_rules(world, player):
if world.local_items[player]:
for location in world.get_locations():
if location.player != player:
for item in world.local_items[player]:
forbid_item(location, item, player)
forbid_items(location, world.local_items[player], player)
def crossover_logic(world, player):