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

Merging of pot shuffle

Browse Source
This commit is contained in:
aerinon
2020-11-24 12:57:11 -07:00
parent cd9b574e90 e6d9fc71a9
commit 5b9919153e
11 changed files with 443 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/classes/constants.py
View File

@@ -75,7 +75,6 @@ SETTINGSTOPROCESS = {
"entranceshuffle": "shuffle"
},
"enemizer": {
"potshuffle": "shufflepots",
"enemyshuffle": "shuffleenemies",
"bossshuffle": "shufflebosses",
"enemydamage": "enemy_damage",
@@ -89,6 +88,7 @@ SETTINGSTOPROCESS = {
"keydropshuffle": "keydropshuffle",
"dungeondoorshuffle": "door_shuffle",
"dungeonintensity": "intensity",
"potshuffle": "shufflepots",
"experimental": "experimental",
"dungeon_counters": "dungeon_counters",
"mixed_travel": "mixed_travel",

2
source/gui/bottom.py
View File

@@ -80,7 +80,7 @@ def bottom_frame(self, parent, args=None):
needEnemizer = False
if hasEnemizer:
falsey = ["none", "default", False, 0]
for enemizerOption in [ "shufflepots", "shuffleenemies", "enemy_damage", "shufflebosses", "enemy_health" ]:
for enemizerOption in ["shuffleenemies", "enemy_damage", "shufflebosses", "enemy_health"]:
if enemizerOption in argsDump:
if isinstance(argsDump[enemizerOption], dict):
for playerID,playerSetting in argsDump[enemizerOption].items():