mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-17 12:23:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Setup: flip apworld list (#1882)

Browse Source 
* Setup: flip apworld list

* Update setup.py

Co-authored-by: kindasneaki <ryandj67@hotmail.com>

* Update setup.py

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

* setup: make TLoZ an apworld

This reverts commit fd026c5eb2.

---------

Co-authored-by: kindasneaki <ryandj67@hotmail.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
This commit is contained in:
Fabian Dill
2023-06-25 03:47:38 +02:00
committed by GitHub
parent a45e8730cb
commit aa8ffa247d
4 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/hk/__init__.py
View File

@@ -17,8 +17,8 @@ from .ExtractedData import locations, starts, multi_locations, location_to_regio
event_names, item_effects, connectors, one_ways, vanilla_shop_costs, vanilla_location_costs
from .Charms import names as charm_names
from BaseClasses import Region, Entrance, Location, MultiWorld, Item, LocationProgressType, Tutorial, ItemClassification
from ..AutoWorld import World, LogicMixin, WebWorld
from BaseClasses import Region, Location, MultiWorld, Item, LocationProgressType, Tutorial, ItemClassification
from worlds.AutoWorld import World, LogicMixin, WebWorld
path_of_pain_locations = {
"Soul_Totem-Path_of_Pain_Below_Thornskip",

14
worlds/oribf/Rules.py
View File

@@ -1,10 +1,16 @@
from typing import Set
from .RulesData import location_rules
from ..generic.Rules import set_rule
from BaseClasses import Location
from worlds.generic.Rules import set_rule
from BaseClasses import Location, CollectionState
# TODO: implement Mapstone counting, Open, OpenWorld, connection rules
def oribf_has_all(state: CollectionState, items: Set[str], player:int) -> bool:
return all(state.prog_items[item, player] if type(item) == str
else state.prog_items[item[0], player] >= item[1] for item in items)
def set_rules(world):
temp_base_rule(world.multiworld, world.player)
for logicset in world.logic_sets:
@@ -22,7 +28,7 @@ def add_or_rule_check_first(world, location: str, player: int, conditionsets):
location.access_rule = tautology
return
rule = lambda state, conditionsets=conditionsets: any(
state._oribf_has_all(conditionset, player) for conditionset in conditionsets)
oribf_has_all(state, conditionset, player) for conditionset in conditionsets)
if location.access_rule is Location.access_rule:
location.access_rule = rule
else:
@@ -31,7 +37,7 @@ def add_or_rule_check_first(world, location: str, player: int, conditionsets):
def temp_base_rule(world, player):
world.completion_condition[player] = lambda state: state._oribf_has_all(
world.completion_condition[player] = lambda state: oribf_has_all(state,
{"Bash", "ChargeFlame", "ChargeJump", "Climb", "Dash", "DoubleJump", "Glide", "Grenade", "Stomp", "WallJump"},
player)

6
worlds/oribf/__init__.py
View File

@@ -69,9 +69,3 @@ class OriBlindForest(World):
return Item(name,
ItemClassification.progression if not name.startswith("EX") else ItemClassification.filler,
item_table[name], self.player)
class OriBlindForestLogic(LogicMixin):
def _oribf_has_all(self, items: Set[str], player:int):
return all(self.prog_items[item, player] if type(item) == str
else self.prog_items[item[0], player] >= item[1] for item in items)