From e090692c15cb9607f24b6a1e859bbaec6eb9b29a Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Sat, 10 Feb 2018 17:23:35 -0500 Subject: [PATCH] style/whitespace tweaks --- BaseClasses.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 98ad0fb9..c26eba3d 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -267,7 +267,7 @@ class World(object): marksequence(['standard', 'open', 'swordless'], self.mode) markbool(self.place_dungeon_items) marksequence(['ganon', 'pedestal', 'dungeons', 'triforcehunt', 'crystals'], self.goal) - marksequence(['vanilla', 'simple', 'restricted', 'full', 'full_cross_worlds','full_legacy', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'], self.shuffle) + marksequence(['vanilla', 'simple', 'restricted', 'full', 'full_cross_worlds', 'full_legacy', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'], self.shuffle) marksequence(['easy', 'normal', 'hard', 'expert', 'insane'], self.difficulty) marksequence(['none', 'display', 'timed', 'timed-ohko', 'timed-countdown', 'ohko'], self.timer) marksequence(['on', 'off', 'random'], self.progressive) @@ -406,11 +406,11 @@ class CollectionState(object): basemagic = 32 elif self.has('Half Magic'): basemagic = 16 - if self.world.difficulty == 'hard' and fullrefill == False: + if self.world.difficulty == 'hard' and not fullrefill: basemagic = basemagic + int(basemagic * 0.5 * self.bottle_count()) - elif self.world.difficulty == 'expert' and fullrefill == False: + elif self.world.difficulty == 'expert' and not fullrefill: basemagic = basemagic + int(basemagic * 0.25 * self.bottle_count()) - elif self.world.difficulty == 'insane' and fullrefill == False: + elif self.world.difficulty == 'insane' and not fullrefill: basemagic = basemagic else: basemagic = basemagic + basemagic * self.bottle_count()