morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rip_compat' into Archipelago_Main

Browse Source 
# Conflicts:
#	MultiServer.py
This commit is contained in:
Fabian Dill
2021-10-18 08:18:28 +02:00
parent 833de94ab0 f56bf0db73
commit 66e198cbb6
4 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/__init__.py
View File

@@ -27,10 +27,6 @@ for world_name, world in AutoWorldRegister.world_types.items():
lookup_any_location_id_to_name.update(world.location_id_to_name)
network_data_package = {
# Remove with 0.2.0
"lookup_any_location_id_to_name": lookup_any_location_id_to_name, # legacy, to be removed
"lookup_any_item_id_to_name": lookup_any_item_id_to_name, # legacy, to be removed
"version": sum(world.data_version for world in AutoWorldRegister.world_types.values()),
"games": games,
}

7
worlds/alttp/Options.py
View File

@@ -231,13 +231,6 @@ class HeartColor(Choice):
option_green = 2
option_yellow = 3
@classmethod
def from_text(cls, text: str) -> Choice:
# remove when this becomes a base Choice feature
if text == "random":
return cls(random.randint(0, 3))
return super(HeartColor, cls).from_text(text)
class QuickSwap(DefaultOnToggle):
displayname = "L/R Quickswapping"