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

Witness: APworld compatibility, but for real this time (#1896) 

* removed relative imports from outside the witness package

* Remove Witness from the apworld shame list
This commit is contained in:
NewSoupVi 2023-06-26 00:38:39 +02:00 committed by GitHub
parent 0934e5c711
commit dc46e96e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -85,7 +85,6 @@ non_apworlds: set = {
"Starcraft 2 Wings of Liberty", "Starcraft 2 Wings of Liberty",
"Sudoku", "Sudoku",
"Super Mario 64", "Super Mario 64",
"The Witness",
"VVVVVV", "VVVVVV",
"Wargroove", "Wargroove",
"Zillion", "Zillion",

2
worlds/witness/__init__.py
View File

@ -6,7 +6,7 @@ import typing
from BaseClasses import Region, Location, MultiWorld, Item, Entrance, Tutorial, ItemClassification from BaseClasses import Region, Location, MultiWorld, Item, Entrance, Tutorial, ItemClassification
from .hints import get_always_hint_locations, get_always_hint_items, get_priority_hint_locations, \ from .hints import get_always_hint_locations, get_always_hint_items, get_priority_hint_locations, \
get_priority_hint_items, make_hints, generate_joke_hints get_priority_hint_items, make_hints, generate_joke_hints
from ..AutoWorld import World, WebWorld from worlds.AutoWorld import World, WebWorld
from .player_logic import WitnessPlayerLogic from .player_logic import WitnessPlayerLogic
from .static_logic import StaticWitnessLogic from .static_logic import StaticWitnessLogic
from .locations import WitnessPlayerLocations, StaticWitnessLocations from .locations import WitnessPlayerLocations, StaticWitnessLocations

4
worlds/witness/rules.py
View File

@ -10,8 +10,8 @@ from .player_logic import WitnessPlayerLogic
from .Options import is_option_enabled, get_option_value from .Options import is_option_enabled, get_option_value
from .locations import WitnessPlayerLocations from .locations import WitnessPlayerLocations
from . import StaticWitnessLogic from . import StaticWitnessLogic
from ..AutoWorld import LogicMixin from worlds.AutoWorld import LogicMixin
from ..generic.Rules import set_rule from worlds.generic.Rules import set_rule
class WitnessLogic(LogicMixin): class WitnessLogic(LogicMixin):