Skip to content

Bugfix for Blue Fire Arrows not being taken into account for the logic when starting with them #2461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fenhl merged 5 commits into from
Sep 19, 2025
Merged

Bugfix for Blue Fire Arrows not being taken into account for the logic when starting with them #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7e1d6b
[#2172] Fix for Blue Fire Arrows not being taken into account for log…
Echopixel Sep 18, 2025
df308d5
Merge pull request #5 from OoTRandomizer/Dev
Echopixel Sep 18, 2025
2479022
Removing special attribute from StartingItems and replacing with simp…
Echopixel Sep 19, 2025
56ed09b
Merge branch 'bugfix/starting_blue_fire_arrows' of https://github.com…
Echopixel Sep 19, 2025
d8f81cd
fix indentation
Echopixel Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Plandomizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,15 +1267,14 @@ def reset(self) -> None:
for itemsetting in starting_items:
if itemsetting in StartingItems.everything:
item = StartingItems.everything[itemsetting]
if not item.special:
add_starting_item_with_ammo(data, item.item_name)
if self.settings.blue_fire_arrows and item.item_name == 'Ice Arrows':
add_starting_item_with_ammo(data, 'Blue Fire Arrows')
elif item.item_name == 'Rutos Letter' and self.settings.zora_fountain != 'open':
data['Rutos Letter'].count += 1
elif item.item_name in ('Bottle', 'Rutos Letter'):
data['Bottle'].count += 1
else:
if item.item_name == 'Rutos Letter' and self.settings.zora_fountain != 'open':
data['Rutos Letter'].count += 1
elif item.item_name in ('Bottle', 'Rutos Letter'):
data['Bottle'].count += 1
else:
raise KeyError("invalid special item: {}".format(item.item_name))
add_starting_item_with_ammo(data, item.item_name)
else:
raise KeyError("invalid starting item: {}".format(itemsetting))
self.settings.starting_equipment = []
Expand Down
10 changes: 5 additions & 5 deletions StartingItems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
from itertools import chain
from typing import Optional

Entry = namedtuple("Entry", ["setting_name", "item_name", "available", "gui_text", "special", "ammo", "i"])
Entry = namedtuple("Entry", ["setting_name", "item_name", "available", "gui_text", "ammo", "i"])


def _entry(setting_name: str, item_name: Optional[str] = None, available: int = 1, gui_text: Optional[str] = None,
special: bool = False, ammo: Optional[dict[str, tuple[int, ...]]] = None) -> list[tuple[str, Entry]]:
ammo: Optional[dict[str, tuple[int, ...]]] = None) -> list[tuple[str, Entry]]:
if item_name is None:
item_name = setting_name.capitalize()
if gui_text is None:
Expand All @@ -18,7 +18,7 @@ def _entry(setting_name: str, item_name: Optional[str] = None, available: int =
name = setting_name
else:
name = f"{setting_name}{i + 1}"
result.append((name, Entry(name, item_name, available, gui_text, special, ammo, i)))
result.append((name, Entry(name, item_name, available, gui_text, ammo, i)))
return result


Expand All @@ -42,8 +42,8 @@ def _entry(setting_name: str, item_name: Optional[str] = None, available: int =
_entry("megaton_hammer", "Megaton Hammer", gui_text="Megaton Hammer"),
_entry("light_arrow", "Light Arrows"),
_entry("nayrus_love", "Nayrus Love", gui_text="Nayru's Love"),
_entry("bottle", available=3, special=True),
_entry("letter", "Rutos Letter", gui_text="Ruto's Letter", special=True),
_entry("bottle", available=3),
_entry("letter", "Rutos Letter", gui_text="Ruto's Letter"),
_entry("pocket_egg", "Pocket Egg", gui_text="Pocket Egg"),
_entry("pocket_cucco", "Pocket Cucco", gui_text="Pocket Cucco"),
_entry("cojiro", "Cojiro", gui_text="Cojiro"),
Expand Down