From 8f2e8505d1235746d24f549453690ef45df97fba Mon Sep 17 00:00:00 2001 From: LLCoolDave Date: Fri, 23 Jun 2017 22:32:29 +0200 Subject: [PATCH] Set restrictive algorithm to default and add flag for beatable only setting to seed hash. --- BaseClasses.py | 3 ++- Main.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 98c03b0e..3e1b8584 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -201,7 +201,8 @@ class World(object): shuffle = ['vanilla', 'simple', 'restricted', 'full', 'madness', 'insanity', 'dungeonsfull', 'dungeonssimple'].index(self.shuffle) difficulty = ['normal', 'timed', 'timed-ohko', 'timed-countdown'].index(self.difficulty) algorithm = ['freshness', 'flood', 'vt21', 'vt22', 'restrictive'].index(self.algorithm) - return logic | (mode << 1) | (dungeonitems << 2) | (goal << 3) | (shuffle << 6) | (difficulty << 10) | (algorithm << 12) + beatableonly = 1 if self.check_beatable_only else 0 + return logic | (mode << 1) | (dungeonitems << 2) | (goal << 3) | (shuffle << 6) | (difficulty << 10) | (algorithm << 12) | (beatableonly << 15) class CollectionState(object): diff --git a/Main.py b/Main.py index e49fc8f3..75bbe963 100644 --- a/Main.py +++ b/Main.py @@ -614,7 +614,7 @@ if __name__ == '__main__': 'Timed starts with clock at zero. Green Clocks subtract 4 minutes (Total: 20), Blue Clocks subtract 2 minutes (Total: 10), Red Clocks add 2 minutes (Total: 10). Winner is player with lowest time at the end.\n' 'Timed OHKO starts clock at 10 minutes. Green Clocks add 5 minutes (Total: 25). As long as clock is at 0, Link will die in one hit.\n' 'Timed Countdown starts with clock at 40 minutes. Same clocks as Timed mode. If time runs out, you lose (but can still keep playing).') - parser.add_argument('--algorithm', default='freshness', const='freshness', nargs='?', choices=['freshness', 'flood', 'vt21', 'vt22', 'restrictive'], + parser.add_argument('--algorithm', default='restrictive', const='freshness', nargs='?', choices=['freshness', 'flood', 'vt21', 'vt22', 'restrictive'], help='Select item filling algorithm. vt21 is unbiased in its selection, but has tendency to put Ice Rod in Turtle Rock.\n' 'vt22 drops off stale locations after 1/3 of progress items were placed to try to circumvent vt21\'s shortcomings.\n' 'freshness keeps track of stale locations (ones that cannot be reached yet) and decreases likeliness of selecting them the more often they were found unreachable.\n'