LttP: fix percentage Triforce Pieces and missed cleanup from ArchipelagoMW#3160 (ArchipelagoMW#3178)

Author: Silvris

worlds/alttp/ItemPool.py

@@ -682,7 +682,7 @@ def place_item(loc, item):
             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
 

worlds/alttp/__init__.py

@@ -484,8 +484,8 @@ def collect_item(self, state: CollectionState, item: Item, remove=False):
                     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'