testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
#pragma once
|
|
|
|
|
#include <string_view>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
|
|
using string_view = std::string_view;
|
|
|
|
|
|
|
|
|
|
extern string_view openRandomize;
|
|
|
|
|
extern string_view worldRandomize;
|
|
|
|
|
extern string_view shuffleRandomize;
|
|
|
|
|
extern string_view dungeonRandomize;
|
|
|
|
|
|
|
|
|
|
extern string_view logicGlitchless;
|
|
|
|
|
extern string_view logicGlitched;
|
|
|
|
|
extern string_view logicNoLogic;
|
|
|
|
|
extern string_view logicVanilla;
|
|
|
|
|
|
|
|
|
|
extern string_view forestOpen;
|
|
|
|
|
extern string_view forestClosed;
|
|
|
|
|
extern string_view forestClosedDeku;
|
|
|
|
|
|
|
|
|
|
extern string_view kakGateOpen;
|
|
|
|
|
extern string_view kakGateClosed;
|
|
|
|
|
|
|
|
|
|
extern string_view doorOfTimeOpen;
|
2022-11-28 17:49:21 -05:00
|
|
|
extern string_view doorOfTimeSongOnly;
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
extern string_view doorOfTimeClosed;
|
|
|
|
|
|
|
|
|
|
extern string_view fountainNormal;
|
|
|
|
|
extern string_view fountainAdult;
|
|
|
|
|
extern string_view fountainOpen;
|
|
|
|
|
|
|
|
|
|
extern string_view gerudoNormal;
|
|
|
|
|
extern string_view gerudoFast;
|
|
|
|
|
extern string_view gerudoOpen;
|
|
|
|
|
|
|
|
|
|
extern string_view bridgeOpen;
|
|
|
|
|
extern string_view bridgeVanilla;
|
|
|
|
|
extern string_view bridgeStones;
|
|
|
|
|
extern string_view bridgeMedallions;
|
|
|
|
|
extern string_view bridgeRewards;
|
|
|
|
|
extern string_view bridgeDungeons;
|
|
|
|
|
extern string_view bridgeTokens;
|
|
|
|
|
|
|
|
|
|
extern string_view bridgeStoneCountDesc;
|
|
|
|
|
extern string_view bridgeMedallionCountDesc;
|
|
|
|
|
extern string_view bridgeRewardCountDesc;
|
|
|
|
|
extern string_view bridgeDungeonCountDesc;
|
|
|
|
|
extern string_view bridgeTokenCountDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view randomGanonsTrialsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ganonsTrialCountDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ageDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view shuffleEntrancesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view dungeonEntrancesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view overworldEntrancesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view grottoEntrancesDesc;
|
|
|
|
|
|
2022-12-06 18:37:50 -05:00
|
|
|
extern string_view owlDropsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view warpSongsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view overworldSpawnsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view mixedPoolsDesc;
|
|
|
|
|
extern string_view mixDungeonsDesc;
|
|
|
|
|
extern string_view mixOverworldDesc;
|
|
|
|
|
extern string_view mixInteriorsDesc;
|
|
|
|
|
extern string_view mixGrottosDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view decoupledEntrancesDesc;
|
|
|
|
|
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
extern string_view interiorEntrancesOff;
|
|
|
|
|
extern string_view interiorEntrancesSimple;
|
|
|
|
|
extern string_view interiorEntrancesAll;
|
|
|
|
|
|
|
|
|
|
extern string_view bombchuLogicDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view defaultAmmoDropsDesc;
|
|
|
|
|
extern string_view bombchuDropsDesc;
|
|
|
|
|
extern string_view noAmmoDropsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view defaultHeartDropsDesc;
|
|
|
|
|
extern string_view noHeartDropsDesc;
|
|
|
|
|
extern string_view noHeartRefillDesc;
|
|
|
|
|
extern string_view scarceHeartsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view mqDungeonCountDesc;
|
|
|
|
|
extern string_view setDungeonTypesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view shuffleRewardsEndOfDungeon;
|
|
|
|
|
extern string_view shuffleRewardsAnyDungeon;
|
|
|
|
|
extern string_view shuffleRewardsOverworld;
|
|
|
|
|
extern string_view shuffleRewardsAnywhere;
|
|
|
|
|
|
|
|
|
|
extern string_view linksPocketDungeonReward;
|
|
|
|
|
extern string_view linksPocketAdvancement;
|
|
|
|
|
extern string_view linksPocketAnything;
|
|
|
|
|
extern string_view linksPocketNothing;
|
|
|
|
|
|
|
|
|
|
extern string_view songsSongLocations;
|
|
|
|
|
extern string_view songsDungeonRewards;
|
|
|
|
|
extern string_view songsAllLocations;
|
|
|
|
|
|
|
|
|
|
extern string_view shopsOff;
|
|
|
|
|
extern string_view shopsZero;
|
|
|
|
|
extern string_view shopsOne;
|
|
|
|
|
extern string_view shopsTwo;
|
|
|
|
|
extern string_view shopsThree;
|
|
|
|
|
extern string_view shopsFour;
|
|
|
|
|
extern string_view shopsRandom;
|
|
|
|
|
|
|
|
|
|
extern string_view tokensOff;
|
|
|
|
|
extern string_view tokensDungeon;
|
|
|
|
|
extern string_view tokensOverworld;
|
|
|
|
|
extern string_view tokensAllTokens;
|
|
|
|
|
|
|
|
|
|
extern string_view scrubsOff;
|
|
|
|
|
extern string_view scrubsAffordable;
|
|
|
|
|
extern string_view scrubsExpensive;
|
|
|
|
|
extern string_view scrubsRandomPrices;
|
|
|
|
|
|
|
|
|
|
extern string_view shuffleCowsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view kokiriSwordDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ocarinasDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view weirdEggDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view gerudoTokenDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view magicBeansDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view merchantsDesc;
|
|
|
|
|
extern string_view merchantsHintsDesc;
|
|
|
|
|
|
Randomizer v2 (#1065)
* Revert changes to GetItemFromGet
* Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
* Enum + combo box
* Add obtainability checks correctly
* combobox title rename + no number tracking
* Fix repeatable purchases and bottles rendering incorrectly
* Move shopsanity option in GUI
* Struct instead of ImVec + basic comportment for all case
* Attempt to fix odd build issue
* Cast randoGet for ganons boss key
* Remove redundancy in KD room
* Update logic Cvar names
* Fix Ganons Trials coming from old save files. Fixes #1365
* Fixes crash when entering Ganon's Castle lobby on linux.
* Makes `Item_Give` safe to use with a NULL globalCtx.
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
* Converts Song from Impa to use `Item_Give`
* Adds more options for Link's starting item.
* Removes unneeded `GiveLinkItem` functions.
* and make it build
* bring back new rando dropdown
* gSaveContext access in GameMenuBar.cpp
* Implement Skip Scarecrow's Song
* Reimplement progressive Bombchus
* Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes #1390
* Fixes Link starting with BGS
* Persist item tracker notes
* Adjust Hooks include
* Use SohImGui::RequestCvarSaveOnNextTick
* Fix issues from LUS refactor
* Fix for overriding deku scrub messages
* Fix mistake from merge
oops
* Restore checkboxes to enhancements menu
These got lost in the merge
* Update location access logic
Including MQ locations in Spirit and GC now
* Implement rando bombchu drops
* Missing break
* Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
* Update settings.cpp
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Clean up bool
* Update logic Cvar name
* Fixed capacity on ammmo tracking
* Fix for beans obtainability
* Hook into file delete and clear notes
* Incorporate magic arrows in rando settings
* Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
* Update tooltip
* Add line break in tooltip
* Tooltip wording + line break
* tweak on main logic
* All color logic for all types
* Fix: changes to please new LUS
* Ensure itemTrackerNotes vector is not fully empty
* Implement's Tycoon Wallet.
* Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
* small tweaks and rename
* always display XX/YY when in ammo/capacity mode
* Move all merchant messages to be generated on file load
* added hovertext for the number display
* Swap german and french translations for shop messages
* Set key colors to be on by default
* Add another flag to skip mask shop
* Fix Sold Out bug
* Fix gerudo keys, add disabled checkbox
* tooltip line break
* Add trials required and merchant prices to save file instead of loading from active spoiler log
* Remove trialsRequired persisting in save manager
* Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
* Fix issue when merchantPrices is empty
* Fix for a single zeroed merchantPrice entry
* Fix #1417
* Implements items selling out and fixes issues with purchasing some items.
* Fixes order of operations so Rupees will be spent.
* Fixes sold out items not getting overwritten by the randomized info.
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Clarify var names and comments
* Rename randomizerMerchantPrices to merchantPrices
* Handle shop items in SaveManager
* Fix merge mistake
* Base whats in the bazaar shop on entranceIndex instead of age
* Tidy up chain platform cutscene check
* Fix merge error
Didn't mean to have Zhora changes in here yet
* Use 3drando item table for parsing spoiler names
* Use another nested method instead of one at the top level to fetch the table
* Add missing newline
* Remove log
* Respect custom draw functions
* Fix issues with rendering songs
* Fix localized item names for shopsanity
* Implements a larger array of Sprites for the Icon Hash.
* Uses the hash instead of seed for spoilerfile name and icons.
* Removes some unused functions and variables in `spoiler_log.cpp`
* Prevents leading 0s added to hash from being in file name
* Changes filename format to icon indexes separated by dashes
* Hopefully makes Jenkins happy
* Hopefully makes Jenkins happy
* [Rando] Child Gerudo Fortress 37th Heartpiece randomized
Fixes #1071
* Add descriptions to save editor flags editor, and added randomizer flags (#1386)
* Add descriptions to save editor flags editor, and added randomizer flags
* Hide randomizer flags when not on a randomizer save
* Move flag descriptions to header file
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Fix merge error
* crash on pause menu on linux (only in appimage)
Fixes #1437
* Applies fix to Song from Impa as well.
* Allow buying tunics as child when shopsanity is on
* Fix for custom draw methods overriding sold out sign
* Simplify logic around shopsanity and fix some issues
* Fix dungeon reward stone rotation and add particles
* Fix some issues with ice traps
* Fix adult wallet having its own max capacity
* Fix amount of keys given for BotW
* format
* Use EnGirlAShopItem enum instead of raw hex values
* [#1434] Renders non-warp songs more consistently with warp songs
* A few changes around merchant messages
* Various changes from PR feedback
* Rando: Junk Hint missing french translation
* Typo
* Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM
* Replace magic numbers in message handler
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Fix BGS softlock for shopsanity
* Support tycoon wallet on tracker
* Revert "Fix BGS softlock for shopsanity"
This reverts commit 5fdb961ea460fb9a035cf0bb6ae77bfeedc1de0f.
* [#1053] Resolves an issue with shop items and bombchu bowling where BGS would display two message boxes
* Implements some necessary plumbing and resolves several Ice Trap Softlocks.
Adds a way for an item entry to tell what type of check it came from (NPC vs Chest vs Freestanding, etc.)
Sets this value from chests and item00 actors.
Relocates pendingIceTraps to save context so it can persist through cutscenes and get stored on save init for Link's Pocket and Song from Impa.
Restructures pendingIceTraps into a counter rather than a true or false, so that we can be frozen multiple times in a row if applicable (atm that should only be at the start of a run if Link's Pocket and Song from Impa were both Ice Traps).
Adds a textbox for Ice Traps and a special case of holding up nothing in the get item process. This fixes all the cases where Ice Traps would softlock due to the actor giving the item expecting a closing textbox. After holding the item above his head Link increments the pendingIceTraps counter by one and sets whatever flag he has pending.
None of the above plumbing applies to Ice Traps from chests, those work exactly the same as before, as do freestanding item00 ice traps (thanks to the additional check for ITEM_FROM_FREESTANDING.
OoT and Ruto's Letter count as NPC's, so they get the FOWL text box and set a pending ice trap rather than immediately freezing, since Link weill be in the water. Link will get frozen the next time he touches land, which in the case of OoT is after the fade to white and right before the Song of Time check.
Fixes all the other softlocks I'm aware of, including Fishing, Bombchu Bowling, Skull Kid, and losing the second Gerudo Archery check.
* fix bgs check in player
* move bgs logic for tokensanity into MOD_NONE check
* set bgs flag before `Item_Give`ing
* move bgs flag into `MOD_NONE` check in girla
* use existing check in `z_player`
* Adds comment explaining the decision to default ITEM_FROM_NPC.
* Rename pendingIceTraps to pendingIceTrapCount
* Adds some RANDOTODO comments about cleaning up a couple things.
* Merge branch 'develop-zhora' into ztornn
* manually restore changes to `z_player.c`
* Fix after some ice trap prepwork from earlier
* Actual fix
* Woops
* More rupee names
* Actually fix it
* Add back comment
* Fix Skip Scarecrow Song
* Fix ruto's letter and LH sun stick rendering
* Also fixes it for treasure chest game
* Tweak: Rando French Wallet
* ADD: French Tycoon
* Hide dungeon items/notes by default
* [#1301] Fix issue with UI not restoring after getting an item from biggoron
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Fix random crash that only affected one person for some reason
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Sarge-117 <adam_branston@outlook.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: lil David <1337lilDavid@gmail.com>
Co-authored-by: Sarge-117 <108380086+Sarge-117@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2022-09-21 00:50:22 -04:00
|
|
|
extern string_view frogSongRupeesDesc;
|
|
|
|
|
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
extern string_view adultTradeDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view chestMinigameDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view mapCompassStartWith;
|
|
|
|
|
extern string_view mapCompassVanilla;
|
|
|
|
|
extern string_view mapCompassOwnDungeon;
|
|
|
|
|
extern string_view mapCompassAnyDungeon;
|
|
|
|
|
extern string_view mapCompassOverworld;
|
|
|
|
|
extern string_view mapCompassAnywhere;
|
|
|
|
|
|
|
|
|
|
extern string_view smallKeyStartWith;
|
|
|
|
|
extern string_view smallKeyVanilla;
|
|
|
|
|
extern string_view smallKeyOwnDungeon;
|
|
|
|
|
extern string_view smallKeyAnyDungeon;
|
|
|
|
|
extern string_view smallKeyOverworld;
|
|
|
|
|
extern string_view smallKeyAnywhere;
|
|
|
|
|
|
|
|
|
|
extern string_view gerudoKeysVanilla;
|
|
|
|
|
extern string_view gerudoKeysAnyDungeon;
|
|
|
|
|
extern string_view gerudoKeysOverworld;
|
|
|
|
|
extern string_view gerudoKeysAnywhere;
|
|
|
|
|
|
|
|
|
|
extern string_view keyRingDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view bossKeyStartWith;
|
|
|
|
|
extern string_view bossKeyVanilla;
|
|
|
|
|
extern string_view bossKeyOwnDungeon;
|
|
|
|
|
extern string_view bossKeyAnyDungeon;
|
|
|
|
|
extern string_view bossKeyOverworld;
|
|
|
|
|
extern string_view bossKeyAnywhere;
|
|
|
|
|
|
|
|
|
|
extern string_view ganonKeyStartWith;
|
|
|
|
|
extern string_view ganonKeyVanilla;
|
|
|
|
|
extern string_view ganonKeyOwnDungeon;
|
|
|
|
|
extern string_view ganonKeyAnyDungeon;
|
|
|
|
|
extern string_view ganonKeyOverworld;
|
|
|
|
|
extern string_view ganonKeyAnywhere;
|
|
|
|
|
extern string_view ganonKeyLACS;
|
|
|
|
|
|
|
|
|
|
extern string_view lacsMedallionCountDesc;
|
|
|
|
|
extern string_view lacsStoneCountDesc;
|
|
|
|
|
extern string_view lacsRewardCountDesc;
|
|
|
|
|
extern string_view lacsDungeonCountDesc;
|
|
|
|
|
extern string_view lacsTokenCountDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view childStealthDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view skipTowerEscapeDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view skipEponaRaceDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view skipMinigamePhasesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view freeScarecrowDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view fourPoesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view lakeHyliaOwlDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view bigPoeTargetCountDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view numRequiredCuccosDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view kingZoraSpeedFast;
|
|
|
|
|
extern string_view kingZoraSpeedVanilla;
|
|
|
|
|
extern string_view kingZoraSpeedRandom;
|
|
|
|
|
|
|
|
|
|
extern string_view completeMaskDesc;
|
|
|
|
|
|
Randomizer v2 (#1065)
* Revert changes to GetItemFromGet
* Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
* Enum + combo box
* Add obtainability checks correctly
* combobox title rename + no number tracking
* Fix repeatable purchases and bottles rendering incorrectly
* Move shopsanity option in GUI
* Struct instead of ImVec + basic comportment for all case
* Attempt to fix odd build issue
* Cast randoGet for ganons boss key
* Remove redundancy in KD room
* Update logic Cvar names
* Fix Ganons Trials coming from old save files. Fixes #1365
* Fixes crash when entering Ganon's Castle lobby on linux.
* Makes `Item_Give` safe to use with a NULL globalCtx.
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
* Converts Song from Impa to use `Item_Give`
* Adds more options for Link's starting item.
* Removes unneeded `GiveLinkItem` functions.
* and make it build
* bring back new rando dropdown
* gSaveContext access in GameMenuBar.cpp
* Implement Skip Scarecrow's Song
* Reimplement progressive Bombchus
* Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes #1390
* Fixes Link starting with BGS
* Persist item tracker notes
* Adjust Hooks include
* Use SohImGui::RequestCvarSaveOnNextTick
* Fix issues from LUS refactor
* Fix for overriding deku scrub messages
* Fix mistake from merge
oops
* Restore checkboxes to enhancements menu
These got lost in the merge
* Update location access logic
Including MQ locations in Spirit and GC now
* Implement rando bombchu drops
* Missing break
* Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
* Update settings.cpp
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Clean up bool
* Update logic Cvar name
* Fixed capacity on ammmo tracking
* Fix for beans obtainability
* Hook into file delete and clear notes
* Incorporate magic arrows in rando settings
* Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
* Update tooltip
* Add line break in tooltip
* Tooltip wording + line break
* tweak on main logic
* All color logic for all types
* Fix: changes to please new LUS
* Ensure itemTrackerNotes vector is not fully empty
* Implement's Tycoon Wallet.
* Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
* small tweaks and rename
* always display XX/YY when in ammo/capacity mode
* Move all merchant messages to be generated on file load
* added hovertext for the number display
* Swap german and french translations for shop messages
* Set key colors to be on by default
* Add another flag to skip mask shop
* Fix Sold Out bug
* Fix gerudo keys, add disabled checkbox
* tooltip line break
* Add trials required and merchant prices to save file instead of loading from active spoiler log
* Remove trialsRequired persisting in save manager
* Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
* Fix issue when merchantPrices is empty
* Fix for a single zeroed merchantPrice entry
* Fix #1417
* Implements items selling out and fixes issues with purchasing some items.
* Fixes order of operations so Rupees will be spent.
* Fixes sold out items not getting overwritten by the randomized info.
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Clarify var names and comments
* Rename randomizerMerchantPrices to merchantPrices
* Handle shop items in SaveManager
* Fix merge mistake
* Base whats in the bazaar shop on entranceIndex instead of age
* Tidy up chain platform cutscene check
* Fix merge error
Didn't mean to have Zhora changes in here yet
* Use 3drando item table for parsing spoiler names
* Use another nested method instead of one at the top level to fetch the table
* Add missing newline
* Remove log
* Respect custom draw functions
* Fix issues with rendering songs
* Fix localized item names for shopsanity
* Implements a larger array of Sprites for the Icon Hash.
* Uses the hash instead of seed for spoilerfile name and icons.
* Removes some unused functions and variables in `spoiler_log.cpp`
* Prevents leading 0s added to hash from being in file name
* Changes filename format to icon indexes separated by dashes
* Hopefully makes Jenkins happy
* Hopefully makes Jenkins happy
* [Rando] Child Gerudo Fortress 37th Heartpiece randomized
Fixes #1071
* Add descriptions to save editor flags editor, and added randomizer flags (#1386)
* Add descriptions to save editor flags editor, and added randomizer flags
* Hide randomizer flags when not on a randomizer save
* Move flag descriptions to header file
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Fix merge error
* crash on pause menu on linux (only in appimage)
Fixes #1437
* Applies fix to Song from Impa as well.
* Allow buying tunics as child when shopsanity is on
* Fix for custom draw methods overriding sold out sign
* Simplify logic around shopsanity and fix some issues
* Fix dungeon reward stone rotation and add particles
* Fix some issues with ice traps
* Fix adult wallet having its own max capacity
* Fix amount of keys given for BotW
* format
* Use EnGirlAShopItem enum instead of raw hex values
* [#1434] Renders non-warp songs more consistently with warp songs
* A few changes around merchant messages
* Various changes from PR feedback
* Rando: Junk Hint missing french translation
* Typo
* Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM
* Replace magic numbers in message handler
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Fix BGS softlock for shopsanity
* Support tycoon wallet on tracker
* Revert "Fix BGS softlock for shopsanity"
This reverts commit 5fdb961ea460fb9a035cf0bb6ae77bfeedc1de0f.
* [#1053] Resolves an issue with shop items and bombchu bowling where BGS would display two message boxes
* Implements some necessary plumbing and resolves several Ice Trap Softlocks.
Adds a way for an item entry to tell what type of check it came from (NPC vs Chest vs Freestanding, etc.)
Sets this value from chests and item00 actors.
Relocates pendingIceTraps to save context so it can persist through cutscenes and get stored on save init for Link's Pocket and Song from Impa.
Restructures pendingIceTraps into a counter rather than a true or false, so that we can be frozen multiple times in a row if applicable (atm that should only be at the start of a run if Link's Pocket and Song from Impa were both Ice Traps).
Adds a textbox for Ice Traps and a special case of holding up nothing in the get item process. This fixes all the cases where Ice Traps would softlock due to the actor giving the item expecting a closing textbox. After holding the item above his head Link increments the pendingIceTraps counter by one and sets whatever flag he has pending.
None of the above plumbing applies to Ice Traps from chests, those work exactly the same as before, as do freestanding item00 ice traps (thanks to the additional check for ITEM_FROM_FREESTANDING.
OoT and Ruto's Letter count as NPC's, so they get the FOWL text box and set a pending ice trap rather than immediately freezing, since Link weill be in the water. Link will get frozen the next time he touches land, which in the case of OoT is after the fade to white and right before the Song of Time check.
Fixes all the other softlocks I'm aware of, including Fishing, Bombchu Bowling, Skull Kid, and losing the second Gerudo Archery check.
* fix bgs check in player
* move bgs logic for tokensanity into MOD_NONE check
* set bgs flag before `Item_Give`ing
* move bgs flag into `MOD_NONE` check in girla
* use existing check in `z_player`
* Adds comment explaining the decision to default ITEM_FROM_NPC.
* Rename pendingIceTraps to pendingIceTrapCount
* Adds some RANDOTODO comments about cleaning up a couple things.
* Merge branch 'develop-zhora' into ztornn
* manually restore changes to `z_player.c`
* Fix after some ice trap prepwork from earlier
* Actual fix
* Woops
* More rupee names
* Actually fix it
* Add back comment
* Fix Skip Scarecrow Song
* Fix ruto's letter and LH sun stick rendering
* Also fixes it for treasure chest game
* Tweak: Rando French Wallet
* ADD: French Tycoon
* Hide dungeon items/notes by default
* [#1301] Fix issue with UI not restoring after getting an item from biggoron
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Fix random crash that only affected one person for some reason
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Sarge-117 <adam_branston@outlook.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: lil David <1337lilDavid@gmail.com>
Co-authored-by: Sarge-117 <108380086+Sarge-117@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2022-09-21 00:50:22 -04:00
|
|
|
extern string_view glitchCutscenesDesc;
|
|
|
|
|
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
extern string_view quickTextDesc0;
|
|
|
|
|
extern string_view quickTextDesc1;
|
|
|
|
|
extern string_view quickTextDesc2;
|
|
|
|
|
extern string_view quickTextDesc3;
|
|
|
|
|
extern string_view skipSongReplaysDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view keepFWWarpPointDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view fastBunnyHoodDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view gossipStonesHintsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view obscureHintsDesc;
|
|
|
|
|
extern string_view ambiguousHintsDesc;
|
|
|
|
|
extern string_view clearHintsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view uselessHintsDesc;
|
|
|
|
|
extern string_view balancedHintsDesc;
|
|
|
|
|
extern string_view strongHintsDesc;
|
|
|
|
|
extern string_view veryStrongHintsDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view compassesShowRewardsDesc;
|
|
|
|
|
extern string_view compassesShowWotHDesc;
|
|
|
|
|
extern string_view mapsShowDungeonModesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view damageMultiDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view startingTimeDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view locationsReachableDesc;
|
|
|
|
|
extern string_view nightGSDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view chestAnimDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view chestSizeDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ingameSpoilersShowDesc;
|
|
|
|
|
extern string_view ingameSpoilersHideDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view menuButtonDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view startWithConsumablesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view startWithMaxRupeesDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view itemPoolPlentiful;
|
|
|
|
|
extern string_view itemPoolBalanced;
|
|
|
|
|
extern string_view itemPoolScarce;
|
|
|
|
|
extern string_view itemPoolMinimal;
|
|
|
|
|
|
|
|
|
|
extern string_view iceTrapsOff;
|
|
|
|
|
extern string_view iceTrapsNormal;
|
|
|
|
|
extern string_view iceTrapsExtra;
|
|
|
|
|
extern string_view iceTrapsMayhem;
|
|
|
|
|
extern string_view iceTrapsOnslaught;
|
|
|
|
|
|
|
|
|
|
extern string_view removeDDDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view progGoronSword;
|
|
|
|
|
|
|
|
|
|
extern string_view faroresWindAnywhereDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ageRestrictionsDesc;
|
|
|
|
|
extern string_view adultStickDesc;
|
|
|
|
|
extern string_view adultBoomerangDesc;
|
|
|
|
|
extern string_view childHammerDesc;
|
|
|
|
|
extern string_view adultSlingshotDesc;
|
|
|
|
|
extern string_view childBowDesc;
|
|
|
|
|
extern string_view childHookshotDesc;
|
|
|
|
|
extern string_view childIronBootsDesc;
|
|
|
|
|
extern string_view childHoverBootsDesc;
|
|
|
|
|
extern string_view adultMasksDesc;
|
|
|
|
|
extern string_view adultKokiriSwordDesc;
|
|
|
|
|
extern string_view childMasterSwordDesc;
|
|
|
|
|
extern string_view childBiggoronSwordDesc;
|
|
|
|
|
extern string_view adultDekuShieldDesc;
|
|
|
|
|
extern string_view childMirrorShieldDesc;
|
|
|
|
|
extern string_view childGoronTunicDesc;
|
|
|
|
|
extern string_view childZoraTunicDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view gkDurabilityVanilla;
|
|
|
|
|
extern string_view gkDurabilityRandomRisk;
|
|
|
|
|
extern string_view gkDurabilityRandomSafe;
|
|
|
|
|
|
Randomizer v2 (#1065)
* Revert changes to GetItemFromGet
* Fixes Ganon's Boss Key shuffled while regular boss Keys aren't.
* Enum + combo box
* Add obtainability checks correctly
* combobox title rename + no number tracking
* Fix repeatable purchases and bottles rendering incorrectly
* Move shopsanity option in GUI
* Struct instead of ImVec + basic comportment for all case
* Attempt to fix odd build issue
* Cast randoGet for ganons boss key
* Remove redundancy in KD room
* Update logic Cvar names
* Fix Ganons Trials coming from old save files. Fixes #1365
* Fixes crash when entering Ganon's Castle lobby on linux.
* Makes `Item_Give` safe to use with a NULL globalCtx.
This should allow it's use for giving items to Link's Pocket
during rando save initialization.
* Converts Song from Impa to use `Item_Give`
* Adds more options for Link's starting item.
* Removes unneeded `GiveLinkItem` functions.
* and make it build
* bring back new rando dropdown
* gSaveContext access in GameMenuBar.cpp
* Implement Skip Scarecrow's Song
* Reimplement progressive Bombchus
* Rando-next: Deku Nut and Seed ammo gives a blue rupee
Fixes #1390
* Fixes Link starting with BGS
* Persist item tracker notes
* Adjust Hooks include
* Use SohImGui::RequestCvarSaveOnNextTick
* Fix issues from LUS refactor
* Fix for overriding deku scrub messages
* Fix mistake from merge
oops
* Restore checkboxes to enhancements menu
These got lost in the merge
* Update location access logic
Including MQ locations in Spirit and GC now
* Implement rando bombchu drops
* Missing break
* Simplify mudwall collision check
There was no need to have a second collider specifically for Ice Arrow hits
* Update settings.cpp
* Simplify mudwall collision check
* Restore checkboxes in menu
Accidentally lost these during merge
* Clean up bool
* Update logic Cvar name
* Fixed capacity on ammmo tracking
* Fix for beans obtainability
* Hook into file delete and clear notes
* Incorporate magic arrows in rando settings
* Update tooltip
To inform the player that they might have to reload the room if they're enabling this for the first time.
* Update tooltip
* Add line break in tooltip
* Tooltip wording + line break
* tweak on main logic
* All color logic for all types
* Fix: changes to please new LUS
* Ensure itemTrackerNotes vector is not fully empty
* Implement's Tycoon Wallet.
* Refactor DrawItemCount and Use EnhancementCombobox for tracker capacity options
* small tweaks and rename
* always display XX/YY when in ammo/capacity mode
* Move all merchant messages to be generated on file load
* added hovertext for the number display
* Swap german and french translations for shop messages
* Set key colors to be on by default
* Add another flag to skip mask shop
* Fix Sold Out bug
* Fix gerudo keys, add disabled checkbox
* tooltip line break
* Add trials required and merchant prices to save file instead of loading from active spoiler log
* Remove trialsRequired persisting in save manager
* Adds slotIndex to girla (shop item actor) and uses that for IdentifyShopItem.
* Fix issue when merchantPrices is empty
* Fix for a single zeroed merchantPrice entry
* Fix #1417
* Implements items selling out and fixes issues with purchasing some items.
* Fixes order of operations so Rupees will be spent.
* Fixes sold out items not getting overwritten by the randomized info.
* Clarify var names and comments
Also preserve chain platform cutscene in spirit based on Link's position
* Remove !=0 from cvar check
* Clarify var names and comments
* Rename randomizerMerchantPrices to merchantPrices
* Handle shop items in SaveManager
* Fix merge mistake
* Base whats in the bazaar shop on entranceIndex instead of age
* Tidy up chain platform cutscene check
* Fix merge error
Didn't mean to have Zhora changes in here yet
* Use 3drando item table for parsing spoiler names
* Use another nested method instead of one at the top level to fetch the table
* Add missing newline
* Remove log
* Respect custom draw functions
* Fix issues with rendering songs
* Fix localized item names for shopsanity
* Implements a larger array of Sprites for the Icon Hash.
* Uses the hash instead of seed for spoilerfile name and icons.
* Removes some unused functions and variables in `spoiler_log.cpp`
* Prevents leading 0s added to hash from being in file name
* Changes filename format to icon indexes separated by dashes
* Hopefully makes Jenkins happy
* Hopefully makes Jenkins happy
* [Rando] Child Gerudo Fortress 37th Heartpiece randomized
Fixes #1071
* Add descriptions to save editor flags editor, and added randomizer flags (#1386)
* Add descriptions to save editor flags editor, and added randomizer flags
* Hide randomizer flags when not on a randomizer save
* Move flag descriptions to header file
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Update soh/soh/Enhancements/debugger/debugSaveEditor.h
* Fix merge error
* crash on pause menu on linux (only in appimage)
Fixes #1437
* Applies fix to Song from Impa as well.
* Allow buying tunics as child when shopsanity is on
* Fix for custom draw methods overriding sold out sign
* Simplify logic around shopsanity and fix some issues
* Fix dungeon reward stone rotation and add particles
* Fix some issues with ice traps
* Fix adult wallet having its own max capacity
* Fix amount of keys given for BotW
* format
* Use EnGirlAShopItem enum instead of raw hex values
* [#1434] Renders non-warp songs more consistently with warp songs
* A few changes around merchant messages
* Various changes from PR feedback
* Rando: Junk Hint missing french translation
* Typo
* Fix free scrub being at 0 instead of TEXT_SCRUB_RANDOM
* Replace magic numbers in message handler
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Update soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
* Fix BGS softlock for shopsanity
* Support tycoon wallet on tracker
* Revert "Fix BGS softlock for shopsanity"
This reverts commit 5fdb961ea460fb9a035cf0bb6ae77bfeedc1de0f.
* [#1053] Resolves an issue with shop items and bombchu bowling where BGS would display two message boxes
* Implements some necessary plumbing and resolves several Ice Trap Softlocks.
Adds a way for an item entry to tell what type of check it came from (NPC vs Chest vs Freestanding, etc.)
Sets this value from chests and item00 actors.
Relocates pendingIceTraps to save context so it can persist through cutscenes and get stored on save init for Link's Pocket and Song from Impa.
Restructures pendingIceTraps into a counter rather than a true or false, so that we can be frozen multiple times in a row if applicable (atm that should only be at the start of a run if Link's Pocket and Song from Impa were both Ice Traps).
Adds a textbox for Ice Traps and a special case of holding up nothing in the get item process. This fixes all the cases where Ice Traps would softlock due to the actor giving the item expecting a closing textbox. After holding the item above his head Link increments the pendingIceTraps counter by one and sets whatever flag he has pending.
None of the above plumbing applies to Ice Traps from chests, those work exactly the same as before, as do freestanding item00 ice traps (thanks to the additional check for ITEM_FROM_FREESTANDING.
OoT and Ruto's Letter count as NPC's, so they get the FOWL text box and set a pending ice trap rather than immediately freezing, since Link weill be in the water. Link will get frozen the next time he touches land, which in the case of OoT is after the fade to white and right before the Song of Time check.
Fixes all the other softlocks I'm aware of, including Fishing, Bombchu Bowling, Skull Kid, and losing the second Gerudo Archery check.
* fix bgs check in player
* move bgs logic for tokensanity into MOD_NONE check
* set bgs flag before `Item_Give`ing
* move bgs flag into `MOD_NONE` check in girla
* use existing check in `z_player`
* Adds comment explaining the decision to default ITEM_FROM_NPC.
* Rename pendingIceTraps to pendingIceTrapCount
* Adds some RANDOTODO comments about cleaning up a couple things.
* Merge branch 'develop-zhora' into ztornn
* manually restore changes to `z_player.c`
* Fix after some ice trap prepwork from earlier
* Actual fix
* Woops
* More rupee names
* Actually fix it
* Add back comment
* Fix Skip Scarecrow Song
* Fix ruto's letter and LH sun stick rendering
* Also fixes it for treasure chest game
* Tweak: Rando French Wallet
* ADD: French Tycoon
* Hide dungeon items/notes by default
* [#1301] Fix issue with UI not restoring after getting an item from biggoron
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Update soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
* Fix random crash that only affected one person for some reason
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Sarge-117 <adam_branston@outlook.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: lil David <1337lilDavid@gmail.com>
Co-authored-by: Sarge-117 <108380086+Sarge-117@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2022-09-21 00:50:22 -04:00
|
|
|
extern string_view blueFireArrowsDesc;
|
|
|
|
|
extern string_view sunlightArrowsDesc;
|
|
|
|
|
|
testing out item replacement (#416)
* skip learning song of storms
* don't set flag when getting goron tunic as child
* Initiates prelude check when master sword unloads.
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
* Stops Shadow Temple lore prompts from appearing in rando.
* Skips cutscene of royal tomb explosion in rando.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
* Improves visual of exploding gravestone.
* Adds some comments explaining the rando differences
* Skip ruto text box in jabu blue warp
For rando
* skip intro cutscene in dodongo's cavern
* load spoiler files on boot, fix spoilerfile existing check when making new saves
* name entry dropped spoiler logic
* make sure to actually init the cvar
* no chime on load
* uncomment
* Skip ganondrof cutscene
Skip to scream part of the death animation, skipping the text boxes etc. For rando
* Update z_boss_ganondrof.c
* skip owl flight cutscenes in rando
* Fixes skipped text so it only applies to shadow temple.
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
* Adds a default to the switch case statements that leaves the randoSkipText variable unchanged, just in case.
* TEST: Text for item
* Adding ganon flavor text
* ADD: AMMO Count
* format ganon text/hint text
* Autoskip the tower cutscene if settings call for tower collapse.
* ganon hint text logic
* Improved prelude after time travel fix
* swapped the sizes between ganon hint text and ganon text, as they were set to the wrong things.
* this is all i did
* not the cleanest code ever but it's working
* ADD: GS Count
* ADD: Wallter (crash for now)
* TWEAK: Wallet check
* FIX: Use DrawItem instread of DrawUpgrade... b-baka!
* Fixes some vanilla bugs introduced by rando code.
* Added cutscene skip for zelda escaping
Using the debug cutscene skipping function. Also added a conditional so the bridge doesn't spawn closed when cutscene is ready to trigger
* ADD: X Spacing + Placeholders for song
* ADD: default case for items
* TWEAK: Spacing
* FIX: Light Arrow
* ADD: Ammo Option
* use groups instead
* ADD: More spacing logic
* songs and names
* TWEAK: Color on wallet
* colors
* Added flags cutscene before nabooru fight
* ADD: ChromaKey text
* First attempt skip cs after nabooru defeat
* Better implementation for specific rando cutscene skips
* use pulseaudio defaults
* spaces/tabs
* move color push/pop to stop crash
* make the colors work again
* the real bottle fix
* pulseaudio values tuned for n64 audio at 44.1khz
* update tlength
* remove one hardcoded samplerate
* Cleaned up and fixed zelda escape skip
The if statement is a freaking monster, but unless we want to skip more cutscenes in the same way later, this is the most compact way of doing it that I know of.
* Revert one line to match original
nothing functional
* another hint line that breaks autonewline logic
* don't autospawn epona if we don't have the song/ocarina
* Trying to use iron knuckle death effects
not working yet
* Streamlined OoT cutscene skip for future additions
Also cleaned up if statement in general
* Made if statement more readable
Also added clarity for what cutscene was skipped
* Fixed typo in comment
* Janky nabooru defeat cs skip
* altar text formatting (gonna need help shortening some of the french ones)
* more altar text formatting
* english altar text formatting complete
* make gtg blocking guard check for card not bridge
* FIX: Typo!
* FIX: Uppercases
* FIX: Typo
* TWEAK: Alter + some names
* TWEAK: More caps!
* ADD: Missing string
TWEAK more uppercases and namefixe
s
* Hide nabooru death by covering her in flames
* bandaid fix for death crash issue
* Twinrova defeat cs skip
Skips the animation and manually calls the function to show the "beam" around the sisters
* fix crash
* fix caps to match
* fix great fairy reward mashing/shielding issue
* TWEAK : Typo clé to Clé
* TWEAK: Some Altar hints
TWEAK: Some capitals
* TWEAK: Unmatching text + some cap again
* TWEAK: More tweaks
* fix build
* remove extra json.hpp, add hint
* Update randomizer_item_tracker.cpp
* TWEAK: Double Defense with RedParticles instead of white
* make sure we don't optimize out the check to ensure a spoilerfile exists
* vanilla ganon boss key hint formatting
* TWEAK: FR- better way of the hero text
* fix
* and again
* Initializes dungeonsDone items in gSaveContext to 0.
* Replaces sizeof calculation with a NUM_DUNGEONS constant.
* Fixes Saria's Gift on the LW Bridge from getting killed when holding shield.
* More airtight fix for Saria's Gift on the Bridge.
* Lifts one of the conditions in the if statement a little higher to prevent unnecessary lookups of getItemId.
* Invalidate text box icon before drawing
* Fixes the case where Saria's gift is an Ice Trap.
We still get the Ice Trap once, but never again. This does mean you can now hold R while walking in to avoid the ice trap, but everything else seems to work fine.
* Initial commit
Might need changing when we change the settings in the future
* Fixes Door of Time opening cutscene after warping with prelude.
* Initial waterfall skip
Very rudimentary way of doing things but it seems to work so :shrug:
* inital rework
* fixed default rotation for 2D sprites
* fix tab/space issues
* 3d drops rando merge fix again
* Allows Impa to appear in the Lullaby check post drawbridge escape.
* Changes Ganon's Trials Count setting to a checkbox
The checkbox is whether or not to skip all of them. Leaving the box unchecked will mean doing all of them. Eventually this will be switched back to a slider once we implement the logic for which trials start out completed.
* Sets all Ganon's Trials to incomplete in new saves.
Fixes https://github.com/briaguya-ai/rando-issue-tracker/issues/131
* fix castle guards when oot throw cutscene has already played in rando
* Properly removes the beams when trials are cleared.
* Removes Question Mark from Skip Ganon's Trials UI.
* Adds a todo comment about when to change back to slider.
* make deku seeds check for bullet bag
* Various tweaks
TWEAK: Altar Text
TWEAK: Hint names
TWEAK: Replace more problematic œ to oe
* upgrade ocarina on both child and adult equips
* FIX: Jabu Item
* update equipped hookshot/longshot when obtained as other age
* add hint
* don't give the bgs check without the claim check
* Skips Darunia Cutscene in Fire Temple
* Added a TODO note about not skipping the cutscene.
There is a setting we will want to have eventually that will require this cutscene to not be skipped since it is used during a glitch.
* remove todo
* restore fast ocarina option in imgui that was lost in merge
* Fixes grey screen issue + tooltip for 2 handed shield
* update to use dg instead of g for textures in item tracker
* TWEAK: Default color for cosmetic RAND button was not the corect one
* fix texture crash, remove unused item tracker code
* don't open mask shop until we get zelda's letter
* Update README.md
* Prevents "correct" chime under incorrect conditions.
* Fixes typo in conditional and adds "bonk" sound effect.
"Bonk" sound is NA_SE_SY_OCARINA_ERROR and it plays when conditions for the Door of Time have not been met after playing Song of Time. This is only possible in rando's "Intended" Door of Time option, in which the Ocarina of Time and all 3 spritual stones are required to open the door, instead of the vanilla requirements of just having the song of time.
* remove modify dpad equips toggle, replace with checks for dpad menu
* remove extra check
* add ability to hold c-up to assign to dpad when dpad menuing is enabled
* disable d-pad navigation on item menu when holding c-up to equip
* dpad+c-up stuff for equipment menu
* ADD: Checbox for songs colors
* TWEAK: RandoColors for normal songs
* kind of quick and dirty but it works
* TWEAK: Clarity of the tooltip
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Co-authored-by: Dog <5172592+Dog@users.noreply.github.com>
Co-authored-by: Vague Rant <vaguerant@users.noreply.github.com>
Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: Ada <60364512+GreatArgorath@users.noreply.github.com>
2022-07-11 20:11:07 -04:00
|
|
|
extern string_view mp_EnabledDesc;
|
|
|
|
|
extern string_view mp_SharedProgressDesc;
|
|
|
|
|
extern string_view mp_SyncIdDesc;
|
|
|
|
|
extern string_view mp_SharedHealthDesc;
|
|
|
|
|
extern string_view mp_SharedRupeesDesc;
|
|
|
|
|
extern string_view mp_SharedAmmoDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view zTargetingDesc;
|
|
|
|
|
extern string_view cameraControlDesc;
|
|
|
|
|
extern string_view motionControlDesc;
|
|
|
|
|
extern string_view togglePlayMusicDesc;
|
|
|
|
|
extern string_view togglePlaySFXDesc;
|
|
|
|
|
extern string_view silenceNaviDesc;
|
|
|
|
|
extern string_view ignoreMaskReactionDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view naviColorsDesc;
|
|
|
|
|
extern string_view necessarySimpleModeDesc;
|
|
|
|
|
extern string_view alwaysSimpleModeDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view coloredKeysDesc;
|
|
|
|
|
extern string_view coloredBossKeysDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view mirrorWorldDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view musicRandoDesc;
|
|
|
|
|
extern string_view shuffleBGMDesc;
|
|
|
|
|
extern string_view fanfaresOffDesc;
|
|
|
|
|
extern string_view onlyFanfaresDesc;
|
|
|
|
|
extern string_view fanfaresOcarinaDesc;
|
|
|
|
|
extern string_view shuffleOcaMusicDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view shuffleSFXOff;
|
|
|
|
|
extern string_view shuffleSFXAll;
|
|
|
|
|
extern string_view shuffleSFXSceneSpecific;
|
|
|
|
|
extern string_view shuffleSFXChaos;
|
|
|
|
|
extern string_view shuffleSFXCategorically;
|
|
|
|
|
|
|
|
|
|
extern string_view randomTrapDmgDesc;
|
|
|
|
|
extern string_view basicTrapDmgDesc;
|
|
|
|
|
extern string_view advancedTrapDmgDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ToggleAllTricksDesc;
|
|
|
|
|
|
|
|
|
|
extern string_view ToggleLogicNoneDesc;
|
|
|
|
|
extern string_view ToggleLogicNoviceDesc;
|
|
|
|
|
extern string_view ToggleLogicIntermediateDesc;
|
|
|
|
|
extern string_view ToggleLogicExpertDesc;
|
|
|
|
|
extern string_view LogicGrottosWithoutAgonyDesc;
|
|
|
|
|
extern string_view LogicVisibleCollisionDesc;
|
|
|
|
|
extern string_view LogicFewerTunicRequirementsDesc;
|
|
|
|
|
extern string_view LogicLostWoodsGSBeanDesc;
|
|
|
|
|
extern string_view LogicLabDivingDesc;
|
|
|
|
|
extern string_view LogicLabWallGSDesc;
|
|
|
|
|
extern string_view LogicGraveyardPoHDesc;
|
|
|
|
|
extern string_view LogicChildDampeRacePoHDesc;
|
|
|
|
|
extern string_view LogicGVHammerChestDesc;
|
|
|
|
|
extern string_view LogicGerudoKitchenDesc;
|
|
|
|
|
extern string_view LogicLensWastelandDesc;
|
|
|
|
|
extern string_view LogicReverseWastelandDesc;
|
|
|
|
|
extern string_view LogicColossusGSDesc;
|
|
|
|
|
extern string_view LogicOutsideGanonsGSDesc;
|
|
|
|
|
extern string_view LogicManOnRoofDesc;
|
|
|
|
|
extern string_view LogicWindmillPoHHookshotDesc;
|
|
|
|
|
extern string_view LogicDMTBombableDesc;
|
|
|
|
|
extern string_view LogicDMTSoilGSDesc;
|
|
|
|
|
extern string_view LogicDMTSummitHoverDesc;
|
|
|
|
|
extern string_view LogicLinkGoronDinsDesc;
|
|
|
|
|
extern string_view LogicGoronCityLeftMostDesc;
|
|
|
|
|
extern string_view LogicGoronCityPotDesc;
|
|
|
|
|
extern string_view LogicGoronCityPotWithStrengthDesc;
|
|
|
|
|
extern string_view LogicChildRollingWithStrengthDesc;
|
|
|
|
|
extern string_view LogicCraterUpperToLowerDesc;
|
|
|
|
|
extern string_view LogicCraterBeanPoHWithHoversDesc;
|
|
|
|
|
extern string_view LogicBiggoronBoleroDesc;
|
|
|
|
|
extern string_view LogicZoraRiverLowerDesc;
|
|
|
|
|
extern string_view LogicZoraRiverUpperDesc;
|
|
|
|
|
extern string_view LogicZFGreatFairyDesc;
|
|
|
|
|
extern string_view LogicDekuB1WebsWithBowDesc;
|
|
|
|
|
extern string_view LogicDekuB1SkipDesc;
|
|
|
|
|
extern string_view LogicDekuBasementGSDesc;
|
|
|
|
|
extern string_view LogicDCStaircaseDesc;
|
|
|
|
|
extern string_view LogicDCJumpDesc;
|
|
|
|
|
extern string_view LogicDCSlingshotSkipDesc;
|
|
|
|
|
extern string_view LogicDCScarecrowGSDesc;
|
|
|
|
|
extern string_view LogicJabuBossGSAdultDesc;
|
|
|
|
|
extern string_view LogicJabuScrubJumpDiveDesc;
|
|
|
|
|
extern string_view LogicForestOutsideBackdoorDesc;
|
|
|
|
|
extern string_view LogicForestDoorFrameDesc;
|
|
|
|
|
extern string_view LogicForestOutdoorEastGSDesc;
|
|
|
|
|
extern string_view LogicFireBossDoorJumpDesc;
|
|
|
|
|
extern string_view LogicFireStrengthDesc;
|
|
|
|
|
extern string_view LogicFireScarecrowDesc;
|
|
|
|
|
extern string_view LogicFireFlameMazeDesc;
|
|
|
|
|
extern string_view LogicFireSongOfTimeDesc;
|
|
|
|
|
extern string_view LogicWaterTempleTorchLongshotDesc;
|
|
|
|
|
extern string_view LogicWaterTempleUpperBoostDesc;
|
|
|
|
|
extern string_view LogicWaterCentralBowDesc;
|
|
|
|
|
extern string_view LogicWaterCentralGSFWDesc;
|
|
|
|
|
extern string_view LogicWaterCrackedWallNothingDesc;
|
|
|
|
|
extern string_view LogicWaterCrackedWallHoversDesc;
|
|
|
|
|
extern string_view LogicWaterBossKeyRegionDesc;
|
|
|
|
|
extern string_view LogicWaterBKJumpDiveDesc;
|
|
|
|
|
extern string_view LogicWaterNorthBasementLedgeJumpDesc;
|
|
|
|
|
extern string_view LogicWaterDragonAdultDesc;
|
|
|
|
|
extern string_view LogicWaterDragonJumpDiveDesc;
|
|
|
|
|
extern string_view LogicWaterRiverGSDesc;
|
|
|
|
|
extern string_view LogicWaterFallingPlatformGSDesc;
|
|
|
|
|
extern string_view LogicSpiritLowerAdultSwitchDesc;
|
|
|
|
|
extern string_view LogicSpiritChildBombchuDesc;
|
|
|
|
|
extern string_view LogicSpiritWallDesc;
|
|
|
|
|
extern string_view LogicSpiritLobbyGSDesc;
|
|
|
|
|
extern string_view LogicSpiritMapChestDesc;
|
|
|
|
|
extern string_view LogicSpiritSunChestDesc;
|
|
|
|
|
extern string_view LogicShadowFireArrowEntryDesc;
|
|
|
|
|
extern string_view LogicShadowUmbrellaDesc;
|
|
|
|
|
extern string_view LogicShadowFreestandingKeyDesc;
|
|
|
|
|
extern string_view LogicShadowStatueDesc;
|
|
|
|
|
extern string_view LogicChildDeadhandDesc;
|
|
|
|
|
extern string_view LogicGtgWithoutHookshotDesc;
|
|
|
|
|
extern string_view LogicGtgFakeWallDesc;
|
|
|
|
|
extern string_view LogicLensSpiritDesc;
|
|
|
|
|
extern string_view LogicLensShadowDesc;
|
|
|
|
|
extern string_view LogicLensShadowBackDesc;
|
|
|
|
|
extern string_view LogicLensBotwDesc;
|
|
|
|
|
extern string_view LogicLensGtgDesc;
|
|
|
|
|
extern string_view LogicLensCastleDesc;
|
|
|
|
|
extern string_view LogicLensJabuMQDesc;
|
|
|
|
|
extern string_view LogicLensSpiritMQDesc;
|
|
|
|
|
extern string_view LogicLensShadowMQDesc;
|
|
|
|
|
extern string_view LogicLensShadowMQBackDesc;
|
|
|
|
|
extern string_view LogicLensBotwMQDesc;
|
|
|
|
|
extern string_view LogicLensGtgMQDesc;
|
|
|
|
|
extern string_view LogicLensCastleMQDesc;
|
|
|
|
|
extern string_view LogicSpiritTrialHookshotDesc;
|
|
|
|
|
extern string_view LogicFlamingChestsDesc;
|
|
|
|
|
|
|
|
|
|
extern const std::vector<string_view> GlitchDifficulties;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchRestrictedItemsDescDisabled;
|
|
|
|
|
extern string_view GlitchRestrictedItemsDescNovice;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchSuperStabDescDisabled;
|
|
|
|
|
extern string_view GlitchSuperStabDescNovice;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchISGDescDisabled;
|
|
|
|
|
extern string_view GlitchISGDescNovice;
|
|
|
|
|
extern string_view GlitchISGDescIntermediate;
|
|
|
|
|
extern string_view GlitchISGDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchHoverDescDisabled;
|
|
|
|
|
extern string_view GlitchHoverDescNovice;
|
|
|
|
|
extern string_view GlitchHoverDescIntermediate;
|
|
|
|
|
extern string_view GlitchHoverDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchBombOIDescDisabled;
|
|
|
|
|
extern string_view GlitchBombOIDescNovice;
|
|
|
|
|
extern string_view GlitchBombOIDescIntermediate;
|
|
|
|
|
extern string_view GlitchBombOIDescAdvanced;
|
|
|
|
|
extern string_view GlitchBombOIDescExpert;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchHoverBoostDescDisabled;
|
|
|
|
|
extern string_view GlitchHoverBoostDescNovice;
|
|
|
|
|
extern string_view GlitchHoverBoostDescIntermediate;
|
|
|
|
|
extern string_view GlitchHoverBoostDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchSuperSlideDescDisabled;
|
|
|
|
|
extern string_view GlitchSuperSlideDescNovice;
|
|
|
|
|
extern string_view GlitchSuperSlideDescIntermediate;
|
|
|
|
|
extern string_view GlitchSuperSlideDescAdvanced;
|
|
|
|
|
extern string_view GlitchSuperSlideDescExpert;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchMegaflipDescDisabled;
|
|
|
|
|
extern string_view GlitchMegaflipDescNovice;
|
|
|
|
|
extern string_view GlitchMegaflipDescIntermediate;
|
|
|
|
|
extern string_view GlitchMegaflipDescAdvanced;
|
|
|
|
|
extern string_view GlitchMegaflipDescExpert;
|
|
|
|
|
extern string_view GlitchMegaflipDescHero;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchASlideDescDisabled;
|
|
|
|
|
extern string_view GlitchASlideDescNovice;
|
|
|
|
|
extern string_view GlitchASlideDescIntermediate;
|
|
|
|
|
extern string_view GlitchASlideDescAdvanced;
|
|
|
|
|
extern string_view GlitchASlideDescExpert;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchHammerSlideDescDisabled;
|
|
|
|
|
extern string_view GlitchHammerSlideDescNovice;
|
|
|
|
|
extern string_view GlitchHammerSlideDescIntermediate;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchLedgeCancelDescDisabled;
|
|
|
|
|
extern string_view GlitchLedgeCancelDescNovice;
|
|
|
|
|
extern string_view GlitchLedgeCancelDescIntermediate;
|
|
|
|
|
extern string_view GlitchLedgeCancelDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchActionSwapDescDisabled;
|
|
|
|
|
extern string_view GlitchActionSwapDescNovice;
|
|
|
|
|
extern string_view GlitchActionSwapDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchQPADescDisabled;
|
|
|
|
|
extern string_view GlitchQPADescNovice;
|
|
|
|
|
extern string_view GlitchQPADescIntermediate;
|
|
|
|
|
extern string_view GlitchQPADescAdvanced;
|
|
|
|
|
extern string_view GlitchQPADescExpert;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchHookshotClipDescDisabled;
|
|
|
|
|
extern string_view GlitchHookshotClipDescNovice;
|
|
|
|
|
extern string_view GlitchHookshotClipDescIntermediate;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchHookshotJump_BonkDescDisabled;
|
|
|
|
|
extern string_view GlitchHookshotJump_BonkDescNovice;
|
|
|
|
|
extern string_view GlitchHookshotJump_BonkDescIntermediate;
|
|
|
|
|
extern string_view GlitchHookshotJump_BonkDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchHookshotJump_BootsDescDisabled;
|
|
|
|
|
extern string_view GlitchHookshotJump_BootsDescNovice;
|
|
|
|
|
extern string_view GlitchHookshotJump_BootsDescIntermediate;
|
|
|
|
|
extern string_view GlitchHookshotJump_BootsDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchCutsceneDiveDescDisabled;
|
|
|
|
|
extern string_view GlitchCutsceneDiveDescNovice;
|
|
|
|
|
extern string_view GlitchCutsceneDiveDescIntermediate;
|
|
|
|
|
extern string_view GlitchCutsceneDiveDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchNaviDive_StickDescDisabled;
|
|
|
|
|
extern string_view GlitchNaviDive_StickDescNovice;
|
|
|
|
|
extern string_view GlitchNaviDive_StickDescIntermediate;
|
|
|
|
|
extern string_view GlitchNaviDive_StickDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchTripleSlashClipDescDisabled;
|
|
|
|
|
extern string_view GlitchTripleSlashClipDescNovice;
|
|
|
|
|
extern string_view GlitchTripleSlashClipDescIntermediate;
|
|
|
|
|
extern string_view GlitchTripleSlashClipDescAdvanced;
|
|
|
|
|
extern string_view GlitchTripleSlashClipDescExpert;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchLedgeClipDescDisabled;
|
|
|
|
|
extern string_view GlitchLedgeClipDescNovice;
|
|
|
|
|
extern string_view GlitchLedgeClipDescIntermediate;
|
|
|
|
|
extern string_view GlitchLedgeClipDescAdvanced;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchSeamWalkDescDisabled;
|
|
|
|
|
extern string_view GlitchSeamWalkDescNovice;
|
|
|
|
|
extern string_view GlitchSeamWalkDescIntermediate;
|
|
|
|
|
extern string_view GlitchSeamWalkDescAdvanced;
|
|
|
|
|
extern string_view GlitchSeamWalkDescExpert;
|
|
|
|
|
extern string_view GlitchSeamWalkDescHero;
|
|
|
|
|
|
|
|
|
|
extern string_view GlitchWWTEscapeDesc;
|
|
|
|
|
extern string_view GlitchGVTentAsChildDesc;
|
|
|
|
|
extern string_view GlitchGFGuardSneakDesc;
|
|
|
|
|
extern string_view GlitchItemlessWastelandDesc;
|
|
|
|
|
extern string_view GlitchOccamsStatueDesc;
|
|
|
|
|
extern string_view GlitchZDOoBJumpSlashDesc;
|
|
|
|
|
extern string_view GlitchJabuStickRecoilDesc;
|
|
|
|
|
extern string_view GlitchJabuAdultDesc;
|
|
|
|
|
extern string_view GlitchBlueFireWallDesc;
|
|
|
|
|
extern string_view GlitchClassicHalfieDesc;
|
|
|
|
|
extern string_view GlitchModernHalfieDesc;
|
|
|
|
|
extern string_view GlitchJabuSwitchDesc;
|
|
|
|
|
extern string_view GlitchForestBKSkipDesc;
|
|
|
|
|
extern string_view GlitchFireGrunzClipDesc;
|