From 50ad6617967646f7e8214842722c8b45b09d2435 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 9 Aug 2021 10:05:45 +0200 Subject: [PATCH] Put in support for old Progressive item key I will probably regret this. --- playerSettings.yaml | 2 +- worlds/alttp/Options.py | 3 ++- worlds/factorio/Options.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/playerSettings.yaml b/playerSettings.yaml index bacf12a0..bcc56980 100644 --- a/playerSettings.yaml +++ b/playerSettings.yaml @@ -448,7 +448,7 @@ A Link to the Past: enemy_damage: default: 50 # Vanilla enemy damage shuffled: 0 # Enemies deal 0 to 4 hearts and armor helps - random: 0 # Enemies deal 0 to 8 hearts and armor just reshuffles the damage + chaos: 0 # Enemies deal 0 to 8 hearts and armor just reshuffles the damage enemy_health: default: 50 # Vanilla enemy HP easy: 0 # Enemies have reduced health diff --git a/worlds/alttp/Options.py b/worlds/alttp/Options.py index 1ead4010..fdbdb65e 100644 --- a/worlds/alttp/Options.py +++ b/worlds/alttp/Options.py @@ -79,9 +79,10 @@ class Progressive(Choice): alias_false = 0 alias_true = 2 default = 2 + alias_random = 1 def want_progressives(self, random): - return random.choice([True, False]) if self.value == self.option_grouped_random else int(self.value) + return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value) class Palette(Choice): option_default = 0 diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py index 6f42deb2..f4b51ca1 100644 --- a/worlds/factorio/Options.py +++ b/worlds/factorio/Options.py @@ -108,9 +108,10 @@ class Progressive(Choice): alias_false = 0 alias_true = 2 default = 2 + alias_random = 1 def want_progressives(self, random): - return random.choice([True, False]) if self.value == self.option_grouped_random else int(self.value) + return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value) class RecipeIngredients(Choice):