Merge pull request #1 from Alchav/The-Legend-of-Zelda-AP

Some fixes

Author: t3hf1gm3nt

worlds/tloz/Items.py

@@ -73,7 +73,7 @@ class ItemData(typing.NamedTuple):
     "Triforce Fragment": 8,
     "Small Key": 45,
     "Bomb": 24,
-    "Five Rupees": 18,
+    "Five Rupees": 19,
     "Silver Arrow": 2,
     "Rupee": 0,
     "Fairy": 6,

worlds/tloz/__init__.py

@@ -13,6 +13,7 @@
 from worlds.AutoWorld import World, WebWorld
 from worlds.generic.Rules import add_rule, set_rule, forbid_item
 
+
 class TLoZWeb(WebWorld):
     theme = "stone"
     setup = Tutorial(
@@ -74,7 +75,7 @@ def __init__(self, world: MultiWorld, player: int):
         self.levels = None
 
     def create_item(self, name: str):
-        return TLoZItem(name, ItemClassification.progression, self.item_name_to_id[name], self.player)
+        return TLoZItem(name, item_table[name].classification, self.item_name_to_id[name], self.player)
 
     def create_event(self, event: str):
         return TLoZItem(event, ItemClassification.progression, None, self.player)
@@ -165,9 +166,10 @@ def create_items(self):
                 if item_name == starting_weapon:  # To remove the extra Sword if that's our weapon
                     item_amounts[item_name] -= 1
                 if self.multiworld.TriforceLocations[self.player] > 0 or item_name != "Triforce Fragment":
-                    i = 0
                     for i in range(0, item_amounts[item_name]):
                         self.multiworld.itempool.append(self.create_item(item_name))
+                    if item_name == "Bomb":
+                        self.multiworld.itempool[-1].classification = ItemClassification.progression
                 else:
                     level = 1
                     for i in range(0, item_amounts[item_name]):
@@ -177,7 +179,8 @@ def create_items(self):
                         ).place_locked_item(self.multiworld.create_item(item_name, self.player))
                         level = level + 1
             else:
-                self.multiworld.itempool.append(self.create_item(item_name))
+                if item_name != starting_weapon:
+                    self.multiworld.itempool.append(self.create_item(item_name))
 
     def set_rules(self):
         # Boss events for a nicer spoiler log playthrough
@@ -341,10 +344,6 @@ def set_rules(self):
                  lambda state: state.has_group("candles", self.player) or
                                state.has("Bomb", self.player))
 
-
-        set_rule(self.multiworld.get_region("Menu", self.player), lambda state: True)
-        set_rule(self.multiworld.get_region("Overworld", self.player), lambda state: True)
-
     def generate_basic(self):
         ganon = self.multiworld.get_location("Ganon", self.player)
         ganon.place_locked_item(self.create_event("Triforce of Power"))
@@ -356,6 +355,7 @@ def generate_basic(self):
 
         self.multiworld.completion_condition[self.player] = lambda state: state.has("Rescued Zelda!", self.player)
 
+
     def apply_base_patch(self, rom_data):
         # Remove Triforce check for recorder so you can always warp.
         rom_data[0x60CC:0x60CF] = bytearray([0xA9, 0xFF, 0xEA])
@@ -498,6 +498,9 @@ def modify_multidata(self, multidata: dict):
             new_name = base64.b64encode(bytes(self.rom_name)).decode()
             multidata["connect_names"][new_name] = multidata["connect_names"][self.multiworld.player_name[self.player]]
 
+    def get_filler_item_name(self) -> str:
+        filler_items = [item for item in item_table if item_table[item].classification == ItemClassification.filler]
+        return self.multiworld.random.choice(filler_items)
 
 class TLoZItem(Item):
     game = 'The Legend of Zelda'