Merge branch 'Dev' into DoorDev

2019-09-06 14:22:42 -06:00
parent 1ec963f162 fe8b3e4252
commit 48f29b3aa5
7 changed files with 33 additions and 9 deletions
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -284,7 +284,7 @@ class World(object):

    def has_beaten_game(self, state, player=None):
        if player:
-            return state.has('Triforce', player) or (self.goal in ['triforcehunt'] and (state.item_count('Triforce Piece', player) + state.item_count('Power Star', player) > self.treasure_hunt_count))
+            return state.has('Triforce', player)
        else:
            return all((self.has_beaten_game(state, p) for p in range(1, self.players + 1)))