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

This commit is contained in:
compiling
2020-11-07 18:48:26 +11:00
11 changed files with 435 additions and 15 deletions

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():