Skip to content
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.

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

Add option to use Rupees as ammo #591

Merged
merged 6 commits into from
Dec 30, 2022
Merged

Conversation

CharadeNut
Copy link
Contributor

This is inspired by ALttP Randomizer's Retro game option, where the player uses rupees instead of arrows.
With this option, the player will use ammunition as normal, but once the ammo count is about to reach 0, rupees will be spent to bring it back to 1.
This applies to the bow and slingshot, but also bombs, bombchu, sticks, nuts and magic (magic's threshold is the cost to use Nayru's Love, to make sure every spell can be used with rupees).
Rupee costs are as follow:
• Bow: 4 rupees
• Slingshot: 2 rupees
• Bombs: 8 rupees
• Bombchu: 12 rupees
• Deku Nuts: 4 rupees
• Deku Stick: 15 rupees
• Magic: ~24 rupees to use Nayru's Love, 1 rupee for a charged spin attack

@Kewlan
Copy link
Collaborator

Kewlan commented Nov 23, 2022

What do you think about allowing ammo to go to 0, and then charge the rupees on the next item use? Would feel nicer and make more sense, I think.

@CharadeNut
Copy link
Contributor Author

What do you think about allowing ammo to go to 0, and then charge the rupees on the next item use? Would feel nicer and make more sense, I think.

While I agree that it would be less "hacky", there are a few obstacles to this:
• Either you'd have to find hooks for the various items, so that it directly resorts to rupees rather than decreasing ammo,
• or you'd have to find hooks to give ammo only when various buttons are pressed (which still begs the question of whether the game will correctly assume that the player has enough ammunition)

Either of those cases requires in-depth research and programming that I'm unable to do. If this is something you feel confident to delve into yourself, you've more than welcome to do so.
For all intents and purposes, to me this patch works exactly as intended, is relatively lightweight, and it affects all possible ammo uses.

@gymnast86 gymnast86 merged commit 4d35476 into gamestabled:main Dec 30, 2022
PhlexPlexico added a commit to PhlexPlexico/OoT3D_Randomizer that referenced this pull request Dec 31, 2022
* Fix flag for Granny's item (gamestabled#575)

* Fix Various Grotto Return Issues (gamestabled#576)

* Add in overworld spawns, warp songs, and owl drops to ER

* Add support for one-way entrances and decoupled entrances in entrance tracker

* Restructure the entrance tracker to properly account for the GV -> Lake Hylia entrance

* Remove debugging statements

* Fix formatting in new logic areas

* Add descriptions for the new settings

* Allow users to choose which entrance types go into the mixed pool

* Add Ganon's Castle entrances to the entranceData table

* Adjust yellow color for color blindness

* Change 'Src' and 'Dst' to 'To' and 'From'

* Add new ER options to full chaos preset

* Change the condition for handling random grottos

* Properly clear grotto state and handle dynamic exit edge case

* add missing include

* Fix child B button glitch (gamestabled#581)

* add decoupled entrances to spoiler log output (gamestabled#580)

* Generalize grotto return fix (gamestabled#578)

* Fix glitched logic errors (gamestabled#582)

* Fix glitchled logic errors near world root

* remove adult rquirement from glitched logic forest gs

* Various logic fixes (gamestabled#583)

* MS shuffle logic fixes

* More logic fixes

* ZD OoB Jumpslash fix

* KF Deku Tree logic fix

* Deku Tree to KF logic fix

* Additional Mirror World settings (gamestabled#585)

* Random mirror world settings

* Make MW option U8

* Complete Italian translations (gamestabled#586)

* Complete Italian translations

Head of squashed commits: 0760138

* Remove obsolete overloads

* Change handling of lengthy shop item names

* Minor changes to English hints

End of squashed commits

* Support plural for item hints

* Add plural markers for Italian

+ minor fixes

* Misc. fixes

* Various Bug Fixes (gamestabled#588)

* Fix overworld spawn at grotto exit

* Fix crash at spoiler log generation

* Fix blue warps leading to grotto exits

* Curse traps fixes

- room/heat timers clearing the curses;
- FW depleting the curse timer;

* Fix description for Child Deadhand w/ Sticks trick

* Prevent picking up chests and Pedestal of Time

* Complete german translation (gamestabled#590)

* Cleanup formatting with clang-format. (gamestabled#558)

Bring in .clang-format file from zeldaret/mm.

Include other clang format changes.

Per review adjustments from @Kewlan and @HylianFreddy

Update clang format for short enums.

Update trickNameTable with custom formatting.

* Run automatic format script as code does not match clang format rules.

Developers please rebase to avoid merge conflicts!

* Fix some formatting errors (gamestabled#596)

* Fix glitchled logic errors near world root

* remove adult rquirement from glitched logic forest gs

* fix some formatting errors

* Run automatic format script as code does not match clang format rules.

Developers please rebase to avoid merge conflicts!

* Re-add locations that went missing from the clang formatter (gamestabled#597)

* Fix glitchled logic errors near world root

* remove adult rquirement from glitched logic forest gs

* fix some formatting errors

* the formatter also deleted some newer locations apparently, lol

* Run automatic format script as code does not match clang format rules.

Developers please rebase to avoid merge conflicts!

* Add boss entryways to area logic (gamestabled#598)

Preparations for boss room shuffle

* Prevent duped decoupled entrances in spoiler log (gamestabled#589)

* prevent duped decoupled entrances in spoiler log

* fix more clang-format merge conflicts

* Even more fixes and tweaks (gamestabled#595)

- Allow From/To toggle in All entrance tracker, fixing spoiling bug.
Also change code in Gfx_DrawButtonPrompts to use offset.
- Add rupees to shop items in location tracker.
- Always reveal LACS item location when Ganon's Boss Key is placed there.
- Add Megaton Hammer to ISG logic.
- Restore settings to default before loading a custom preset, properly resetting new options missing from that preset.
- Add new and adjust existing descriptions for clarity.
- Adjust code for custom info menu options to support optional options.
- Split some location tracker groups for easier scrolling/readability and to match entrance tracker.

* Settings string improvements (gamestabled#599)

These changes allows us to freely move around and indent settings without affecting future custom presets.
Also allows both the setting and the option to have a newline and text after/below.

* Add missing scenes to interior areas (gamestabled#601)

* Fix glitchled logic errors near world root

* remove adult rquirement from glitched logic forest gs

* fix some formatting errors

* the formatter also deleted some newer locations apparently, lol

* Add scenes to interiors where they were missed

* Run automatic format script as code does not match clang format rules.

Developers please rebase to avoid merge conflicts!

* really fix decoupled entrances in spoiler log and preserve playthrough sphere (gamestabled#600)

* Minor clang format fixes (gamestabled#602)

* Fix merge error

* Fix some weird formatting in C code

* Add manual trigger for clang-format

* Add SFX to junk hints (gamestabled#603)

* Add SFX to junk hints

Old implementation: 8b678b6

* Minor fix to Italian hint

* Fixes and tweak 4 (gamestabled#604)

* Fixes and tweak 4
- Make random cosmetics consistent using a separate generator
- Remove patch for brown boulder for multiplayer
- Update the item text of Ruto's pickup message in Jabu

* Improve Ruto pickup message

Co-authored-by: HylianFreddy <[email protected]>

Co-authored-by: HylianFreddy <[email protected]>

* Fix Saria's hints and external texture mods (gamestabled#605)

* Don't touch Link's model if custom tunics are off

* Register Saria's hints after talking to stone

* docs: highlight region restrictions (gamestabled#606)

* Guarantee Goron Pot Reward on First Try (gamestabled#607)

* fix entrance playthrough not showing in the spoiler log for vanilla logic (gamestabled#608)

* Fix excluded locations always receiving the same items (gamestabled#610)

* MS shuffle logic fixes

* More logic fixes

* ZD OoB Jumpslash fix

* KF Deku Tree logic fix

* Deku Tree to KF logic fix

* Shuffle item pool after generation

* Hide Exclude Locations options when certain settings are on (gamestabled#592)

* Properly Exclude Locations

* Indent fix

* Run automatic format script as code does not match clang format rules.

Developers please rebase to avoid merge conflicts!

* Add option to use Rupees as ammo (gamestabled#591)

* Use Rupees as Ammo

* Make magic a bit less expensive

* Allow arrows replenishing when using fire/ice/light bows

* Quick fix, missing parenthesis

* Further fix to magic count

Magic only gets spent when it's not being used, aside from Lens of Truth.

* Cosmetics: Apply custom Navi colors to target reticle (gamestabled#611)

* Rename fairy colors functions

* Fix case typo

* Apply custom Navi colors to target reticle

* Run automatic format script as code does not match clang format rules.

Developers please rebase to avoid merge conflicts!

* Improve build process (gamestabled#614)

* Attempt using a new image.

* Rebase + update versions for actions.

Co-authored-by: HylianFreddy <[email protected]>
Co-authored-by: gymnast86 <[email protected]>
Co-authored-by: Adam Bird <[email protected]>
Co-authored-by: Nessy <[email protected]>
Co-authored-by: Schicksal88 <[email protected]>
Co-authored-by: gymnast86 <[email protected]>
Co-authored-by: Colin E <[email protected]>
Co-authored-by: Jesse Stricker <[email protected]>
Co-authored-by: Charade <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants