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

Check if spread_crystal_access should be called when each new region is reached.

Browse Source
This commit is contained in:
compiling
2020-01-16 19:21:58 +11:00
parent ead7c117a8
commit 62e56bc9ee
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
BaseClasses.py
View File

@@ -1,5 +1,5 @@
import copy import copy
from enum import Enum, unique from enum import Enum, unique, Flag
import logging import logging
import json import json
from collections import OrderedDict, deque from collections import OrderedDict, deque
@@ -411,8 +411,21 @@ class CollectionState(object):
ccr[candidate] = CrystalBarrier.Orange ccr[candidate] = CrystalBarrier.Orange
if entrance.parent_region in ccr.keys(): if entrance.parent_region in ccr.keys():
color_type = ccr[entrance.parent_region] color_type = ccr[entrance.parent_region]
current_type = ccr[candidate] if candidate in ccr.keys() else None if door is not None and door.crystal != CrystalBarrier.Null:
ccr[candidate] = color_type if current_type is None or color_type == current_type else CrystalBarrier.Either color_type &= door.crystal
if candidate in ccr.keys():
color_type |= ccr[candidate]
ccr[candidate] = color_type
for ext in candidate.exits:
connect = ext.connected_region
if connect in rrp and connect in ccr:
door = self.world.check_for_door(ext.name, player)
if door is not None and not door.blocked:
color_type = ccr[candidate]
if door.crystal != CrystalBarrier.Null:
color_type &= door.crystal
if (ccr[connect] | color_type) != ccr[connect]:
self.spread_crystal_access(candidate, CrystalBarrier.Either, rrp, ccr, player)
new_regions = len(rrp) > reachable_regions_count new_regions = len(rrp) > reachable_regions_count
reachable_regions_count = len(rrp) reachable_regions_count = len(rrp)
@@ -1037,11 +1050,11 @@ pol_comp = {
@unique @unique
class CrystalBarrier(Enum): class CrystalBarrier(Flag):
Null = 1 # no special requirement Null = 0 # no special requirement
Blue = 2 # blue must be down and explore state set to Blue Blue = 1 # blue must be down and explore state set to Blue
Orange = 3 # orange must be down and explore state set to Orange Orange = 2 # orange must be down and explore state set to Orange
Either = 4 # you choose to leave this room in Either state Either = 3 # you choose to leave this room in Either state
class Door(object): class Door(object):