Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 27 additions & 1 deletion schemas/Manual.regions.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,32 @@
"type":"boolean",
"default": false
},
"exit_requires": {
"description": "(Optional) Additional requirements to use a specific connection out of this region.",
"type": "object",
"patternProperties": {
"^[^$].*$": {
"type": ["string", "array"],
"items": {
"$ref": "#/definitions/Require"
}
}
},
"uniqueItems": true
},
"entrance_requires": {
"description": "(Optional) Additional requirements to use a specific connection into this region. This is the same as exit_requires, but from the other side.",
"type": "object",
"patternProperties": {
"^[^$].*$": {
"type": ["string", "array"],
"items": {
"$ref": "#/definitions/Require"
}
}
},
"uniqueItems": true
},
"_comment": {"$ref": "#/definitions/comment"}
}
}
Expand Down Expand Up @@ -69,4 +95,4 @@
}
}
}
}
}
12 changes: 10 additions & 2 deletions src/Rules.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from typing import TYPE_CHECKING, Optional
from worlds.generic.Rules import set_rule
from worlds.generic.Rules import set_rule, add_rule
from .Regions import regionMap
from .hooks import Rules
from BaseClasses import MultiWorld, CollectionState
Expand Down Expand Up @@ -234,7 +234,15 @@ def fullLocationOrRegionCheck(state: CollectionState, area: dict):
def fullRegionCheck(state: CollectionState, region=regionMap[region]):
return fullLocationOrRegionCheck(state, region)

set_rule(multiworld.get_entrance(exitRegion.name, player), fullRegionCheck)
add_rule(world.get_entrance(exitRegion.name), fullRegionCheck)
entrance_rules = regionMap[region].get("entrance_requires", {})
for e in entrance_rules:
entrance = world.get_entrance(f'{e}To{region}')
add_rule(entrance, lambda state, rule={"requires": entrance_rules[e]}: fullLocationOrRegionCheck(state, rule))
exit_rules = regionMap[region].get("exit_requires", {})
for e in exit_rules:
exit = world.get_entrance(f'{region}To{e}')
add_rule(exit, lambda state, rule={"requires": exit_rules[e]}: fullLocationOrRegionCheck(state, rule))

# Location access rules
for location in world.location_table:
Expand Down
8 changes: 7 additions & 1 deletion src/data/regions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
},
"Second Region": {
"requires": "|@Characters:1|",
"connects_to": ["Third Region"],
"exit_requires": {
"Third Region": "|@Characters:5|"
}
},
"Third Region": {
"connects_to": []
}
}
}