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

Merge remote-tracking branch 'remotes/origin/DoorDevUnstable' into DoorDevUnstable

Browse Source
This commit is contained in:
compiling
2020-11-07 18:48:26 +11:00
parent fdcd179186 7c9e02b182
commit 078b5eeb85
11 changed files with 435 additions and 15 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():