From 8021ec744fd861772af59965e8d6cf2818cf9d8e Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:10:10 -0500
Subject: [PATCH] LttP: fix percentage Triforce Pieces and missed cleanup from
 #3160 (#3178)

---
 worlds/alttp/ItemPool.py | 2 +-
 worlds/alttp/__init__.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/alttp/ItemPool.py b/worlds/alttp/ItemPool.py
index af35d00f..69ecadc7 100644
--- a/worlds/alttp/ItemPool.py
+++ b/worlds/alttp/ItemPool.py
@@ -682,7 +682,7 @@ def get_pool_core(world, player: int):
             triforce_pieces = world.triforce_pieces_available[player].value + world.triforce_pieces_extra[player].value
         elif world.triforce_pieces_mode[player].value == TriforcePiecesMode.option_percentage:
             percentage = float(world.triforce_pieces_percentage[player].value) / 100
-            triforce_pieces = round(world.triforce_pieces_required[player].value * percentage, 0)
+            triforce_pieces = int(round(world.triforce_pieces_required[player].value * percentage, 0))
         else:  # available
             triforce_pieces = world.triforce_pieces_available[player].value
 
diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py
index f84c28be..f4a374ce 100644
--- a/worlds/alttp/__init__.py
+++ b/worlds/alttp/__init__.py
@@ -484,8 +484,8 @@ class ALTTPWorld(World):
                     if state.has('Silver Bow', item.player):
                         return
                     elif state.has('Bow', item.player) and (self.difficulty_requirements.progressive_bow_limit >= 2
-                                                            or self.glitches_required == 'no_glitches'
-                                                            or self.swordless):  # modes where silver bow is always required for ganon
+                                                            or self.multiworld.glitches_required[self.player] == 'no_glitches'
+                                                            or self.multiworld.swordless[self.player]):  # modes where silver bow is always required for ganon
                         return 'Silver Bow'
                     elif self.difficulty_requirements.progressive_bow_limit >= 1:
                         return 'Bow'