mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-04-28 13:17:58 +03:00
Compare commits
24 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
fbbfc07ff1 | ||
|
|
52a3058926 | ||
|
|
14907a24b0 | ||
|
|
1b6dc13491 | ||
|
|
02ef33393a | ||
|
|
5ae8ce4eac | ||
|
|
5e399fe7a2 | ||
|
|
46b40b0220 | ||
|
|
1416b2490a | ||
|
|
f304de2eb1 | ||
|
|
fc0cbbe9e7 | ||
|
|
824c203b97 | ||
|
|
f0f2157a4c | ||
|
|
698fca8862 | ||
|
|
86e1e8e3aa | ||
|
|
05e96f310d | ||
|
|
a93917bb4a | ||
|
|
9783f918d2 | ||
|
|
1791a0c52c | ||
|
|
7e78694aee | ||
|
|
f37c3aa228 | ||
|
|
2deea6e105 | ||
|
|
ef8fa17e7c | ||
|
|
1e51f1e162 |
78 changed files with 2203 additions and 1922 deletions
|
|
@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
|
|||
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
|
||||
|
||||
project(Ship VERSION 9.0.1 LANGUAGES C CXX)
|
||||
project(Ship VERSION 9.0.2 LANGUAGES C CXX)
|
||||
include(CMake/soh-cvars.cmake)
|
||||
include(CMake/lus-cvars.cmake)
|
||||
|
||||
|
|
|
|||
|
|
@ -37,12 +37,13 @@ if (-not (Test-Path $clangFormatFilePath) -or ($currentVersion -ne $requiredVers
|
|||
$basePath = (Resolve-Path .).Path
|
||||
$files = Get-ChildItem -Path $basePath\soh -Recurse -File `
|
||||
| Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or `
|
||||
($_.Extension -eq '.h' -and `
|
||||
(($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and `
|
||||
(-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*")))) -and `
|
||||
(-not ($_.FullName -like "*\soh\assets\*")) }
|
||||
|
||||
foreach ($file in $files) {
|
||||
for ($i = 0; $i -lt $files.Length; $i++) {
|
||||
$file = $files[$i]
|
||||
$relativePath = $file.FullName.Substring($basePath.Length + 1)
|
||||
Write-Host "Formatting $relativePath"
|
||||
Write-Host "Formatting [$($i+1)/$($files.Length)] $relativePath"
|
||||
.\clang-format.exe -i $file.FullName
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,20 +10,20 @@
|
|||
# -name "*.c" -o -name "*.cpp"
|
||||
# find all .c and .cpp files
|
||||
#
|
||||
# -name "*.h" ! -path "soh/src/**.h" ! -path "soh/include/**.h"
|
||||
# find all .h files that aren't in soh/src or soh/include
|
||||
# ( -name "*.h" -o -name "*.hpp" ) ! -path "soh/src/**.h" ! -path "soh/include/**.h"
|
||||
# find all .h and .hpp files that aren't in soh/src or soh/include
|
||||
# this is because zret decomp only runs clang-format on c files
|
||||
# https://github.com/zeldaret/mm/blob/b7e5468ca16315a7e322055eff3d97fe980bbc25/format.py#L182
|
||||
#
|
||||
# ! -path "soh/assets/*"
|
||||
# asset headers are autogenerated, don't fight them
|
||||
#
|
||||
# | sed 's| |\\ |g'
|
||||
# pipe the result of find into sed to
|
||||
# ensure all the paths returned by find have spaces escaped
|
||||
# -print0
|
||||
# separate paths with NUL bytes, avoiding issues with spaces in paths
|
||||
#
|
||||
# | xargs clang-format-14 -i
|
||||
# | xargs -0 clang-format-14 -i -verbose
|
||||
# use xargs to take each path we've found
|
||||
# and pass it as an argument to clang-format
|
||||
# verbose to print files being formatted and X out of Y status
|
||||
|
||||
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( -name "*.h" ! -path "soh/src/**.h" ! -path "soh/include/**.h" \) \) ! -path "soh/assets/*" | sed 's| |\\ |g' | xargs clang-format-14 -i
|
||||
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@
|
|||
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
|
||||
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
|
||||
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
|
||||
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
|
||||
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
|
||||
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
|
||||
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ const std::vector<PresetEntry> vanillaPlusPresetEntries = {
|
|||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixZoraHintDialogue"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixVineFall"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), 1),
|
||||
|
|
@ -125,7 +125,7 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
|
|||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixZoraHintDialogue"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixVineFall"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), 1),
|
||||
|
|
@ -251,7 +251,7 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
|
|||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1),
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ AudioCollection::AudioCollection() {
|
|||
SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2, "End Credits II", "NA_BGM_STAFF_2", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere?
|
||||
SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3, "End Credits III", "NA_BGM_STAFF_3", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere?
|
||||
SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4, "End Credits IV", "NA_BGM_STAFF_4", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere?
|
||||
|
||||
|
||||
// SEQ_INSTRUMENT
|
||||
SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT, true, true),
|
||||
SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT, true, true),
|
||||
|
|
@ -304,7 +304,7 @@ AudioCollection::AudioCollection() {
|
|||
//SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV", SEQ_VOICE, true, false),
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)", "NA_SE_VO_LI_GROAN_KID", SEQ_VOICE, true, false),
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID", SEQ_VOICE, true, false),
|
||||
|
||||
|
||||
// Following group of Dummies are all duplicate entries for Navi saying Look/Hey/Watchout
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45, "NA_SE_VO_DUMMY_0x45", "NA_SE_VO_DUMMY_0x45", SEQ_VOICE, true, false),
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46, "NA_SE_VO_DUMMY_0x46", "NA_SE_VO_DUMMY_0x46", SEQ_VOICE, true, false),
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ void InputViewer::DrawElement() {
|
|||
}
|
||||
|
||||
ImVec2 mainPos = ImGui::GetWindowPos();
|
||||
ImVec2 size = ImGui::GetContentRegionAvail();
|
||||
ImVec2 size = ImGui::GetMainViewport()->WorkSize;
|
||||
|
||||
#ifdef __WIIU__
|
||||
const float scale = CVarGetFloat(CVAR_INPUT_VIEWER("Scale"), 1.0f) * 2.0f;
|
||||
|
|
|
|||
|
|
@ -2376,10 +2376,12 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
.Step(0.01f)
|
||||
.Size(ImVec2(300.0f, 0.0f))
|
||||
.Color(THEME_COLOR));
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::CVarCheckbox("Randomize All on New Scene", CVAR_COSMETIC("RandomizeAllOnNewScene"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
.Color(THEME_COLOR)
|
||||
.Tooltip("Enables randomizing all unlocked cosmetics when you enter a new scene."));
|
||||
ImGui::EndDisabled();
|
||||
UIWidgets::CVarCheckbox(
|
||||
"Advanced Mode", CVAR_COSMETIC("AdvancedMode"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
|
|
@ -2408,13 +2410,15 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
}
|
||||
}
|
||||
}
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
if (UIWidgets::Button("Randomize All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
CosmeticsEditor_RandomizeAll();
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
ImGui::SameLine();
|
||||
if (UIWidgets::Button("Reset All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
CVarClearBlock("gCosmetics");
|
||||
ApplyOrResetCustomGfxPatches();
|
||||
CosmeticsEditor_ResetAll();
|
||||
}
|
||||
if (UIWidgets::Button("Lock All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
for (auto& [id, cosmeticOption] : cosmeticOptions) {
|
||||
|
|
@ -2432,6 +2436,7 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
}
|
||||
}
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
if (UIWidgets::Button("Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
for (auto& [id, cosmeticOption] : cosmeticOptions) {
|
||||
if (!CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
|
||||
|
|
@ -2441,6 +2446,8 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
}
|
||||
}
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
ImGui::SameLine();
|
||||
if (UIWidgets::Button("Un-Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
for (auto& [id, cosmeticOption] : cosmeticOptions) {
|
||||
|
|
@ -2470,6 +2477,7 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
|
||||
if (ImGui::BeginTabItem("Keys")) {
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::Separator(true, true, 2.0f, 2.0f);
|
||||
|
||||
if (UIWidgets::Button("Give all keys dungeon-specific colors",
|
||||
|
|
@ -2483,6 +2491,7 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
DrawCosmeticGroup(COSMETICS_GROUP_SMALL_KEYS);
|
||||
DrawCosmeticGroup(COSMETICS_GROUP_BOSS_KEYS);
|
||||
|
||||
ImGui::EndDisabled();
|
||||
ImGui::EndTabItem();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -469,6 +469,27 @@ size_t CustomMessage::FindNEWLINE(std::string& str, size_t lastNewline) const {
|
|||
return newLine;
|
||||
}
|
||||
|
||||
bool CustomMessage::AddBreakString(std::string& str, size_t pos, std::string breakString) const {
|
||||
if (str[pos] == ' ' || str[pos] == '&') {
|
||||
str.replace(pos, 1, breakString);
|
||||
return false;
|
||||
} else {
|
||||
if (pos <= str.size() - 1) {
|
||||
// If the next char is a new textbox, it has priority, ignore whatever we are replacing it with
|
||||
if (str[pos + 1] == '^') {
|
||||
return false;
|
||||
// otherwise, if it is a line break or space, replace it
|
||||
} else if (str[pos + 1] == ' ' || str[pos + 1] == '&') {
|
||||
str.replace(pos + 1, 1, breakString);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// otherwise insert after it
|
||||
str.insert(pos + 1, breakString);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void CustomMessage::AutoFormatString(std::string& str) const {
|
||||
ReplaceAltarIcons(str);
|
||||
ReplaceColors(str);
|
||||
|
|
@ -481,7 +502,6 @@ void CustomMessage::AutoFormatString(std::string& str) const {
|
|||
while (lastNewline + lineLength < str.length() || yesNo != std::string::npos) {
|
||||
const size_t carrot = str.find('^', lastNewline);
|
||||
const size_t ampersand = str.find('&', lastNewline);
|
||||
const size_t lastSpace = str.rfind(' ', lastNewline + lineLength);
|
||||
size_t waitForInput = str.find(WAIT_FOR_INPUT()[0], lastNewline);
|
||||
size_t newLine = FindNEWLINE(str, lastNewline);
|
||||
if (carrot < waitForInput) {
|
||||
|
|
@ -513,13 +533,25 @@ void CustomMessage::AutoFormatString(std::string& str) const {
|
|||
lastNewline = waitForInput + 1;
|
||||
lineCount = 0;
|
||||
// some lines need to be split but don't have spaces, look for periods instead
|
||||
} else if (lastSpace == std::string::npos) {
|
||||
const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
|
||||
str.replace(lastPeriod, 1, ".&");
|
||||
lastNewline = lastPeriod + 2;
|
||||
} else {
|
||||
str.replace(lastSpace, 1, "&");
|
||||
lastNewline = lastSpace + 1;
|
||||
const size_t lastBreak =
|
||||
str.find_last_of(static_cast<std::string>(".,!?- "), lastNewline + lineLength);
|
||||
// if none exist or we go backwards, we look forward for a something and allow the overflow
|
||||
if (lastBreak == std::string::npos || lastBreak < lastNewline) {
|
||||
const size_t nextBreak = str.find_first_of(static_cast<std::string>(".,!?- &^"), lastNewline);
|
||||
if (str[nextBreak] == '^') {
|
||||
lastNewline = nextBreak + 1;
|
||||
lineCount = 0; // increments to 1 at the end
|
||||
} else if (str[nextBreak] == '&') {
|
||||
lastNewline = nextBreak + 1;
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, nextBreak, "&");
|
||||
lastNewline = nextBreak + 1 + isAdded;
|
||||
}
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, lastBreak, "&");
|
||||
lastNewline = lastBreak + 1 + isAdded;
|
||||
}
|
||||
}
|
||||
lineCount += 1;
|
||||
} else {
|
||||
|
|
@ -536,14 +568,23 @@ void CustomMessage::AutoFormatString(std::string& str) const {
|
|||
// or move the lastNewline cursor to the next line if a '^' is encountered.
|
||||
} else if (carrot < lastNewline + lineLength) {
|
||||
lastNewline = carrot + 1;
|
||||
// some lines need to be split but don't have spaces, look for periods instead
|
||||
} else if (lastSpace == std::string::npos) {
|
||||
const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
|
||||
str.replace(lastPeriod, 1, ".^" + colorText);
|
||||
lastNewline = lastPeriod + 2;
|
||||
// some lines need to be split but don't have spaces, look for punctuation instead
|
||||
} else {
|
||||
str.replace(lastSpace, 1, "^" + colorText);
|
||||
lastNewline = lastSpace + 1;
|
||||
const size_t lastBreak =
|
||||
str.find_last_of(static_cast<std::string>(".,!?- &"), lastNewline + lineLength);
|
||||
// if none exist or we go backwards, we look forward for a something and allow the overflow
|
||||
if (lastBreak == std::string::npos || lastBreak < lastNewline) {
|
||||
const size_t nextBreak = str.find_first_of(static_cast<std::string>(".,!?- &^"), lastNewline);
|
||||
if (str[nextBreak] == '^') {
|
||||
lastNewline = nextBreak + 1;
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, nextBreak, "^" + colorText);
|
||||
lastNewline = nextBreak + 1 + isAdded;
|
||||
}
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, lastBreak, "^" + colorText);
|
||||
lastNewline = lastBreak + 1 + isAdded;
|
||||
}
|
||||
}
|
||||
lineCount = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,6 +190,17 @@ class CustomMessage {
|
|||
*/
|
||||
size_t FindNEWLINE(std::string& str, size_t lastNewline) const;
|
||||
|
||||
/**
|
||||
* @brief Inserts a string into another string, following the rules
|
||||
* of auto-format inserting new lines: spaces and & are replaced while
|
||||
* other chars are appended to.
|
||||
*
|
||||
* @param str the string we are inserting into
|
||||
* @param pos the position in the string to insert
|
||||
* @param breakString the string we are inserting
|
||||
*/
|
||||
bool AddBreakString(std::string& str, size_t pos, std::string breakString) const;
|
||||
|
||||
/**
|
||||
* @brief formats the string specifically to fit in OoT's
|
||||
* textboxes, and use it's formatting.
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ void MessageViewer::InitElement() {
|
|||
}
|
||||
|
||||
void MessageViewer::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
ImGui::Text("Table ID");
|
||||
ImGui::SameLine();
|
||||
PushStyleInput(THEME_COLOR);
|
||||
|
|
@ -78,6 +79,7 @@ void MessageViewer::DrawElement() {
|
|||
mDisplayCustomMessageClicked = true;
|
||||
}
|
||||
PopStyleButton();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void MessageViewer::UpdateElement() {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ void SohConsoleWindow::UpdateElement() {
|
|||
}
|
||||
|
||||
void SohConsoleWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::PushStyleInput(THEME_COLOR);
|
||||
// Small font (13) to match hardcoded width values in the LUS window.. set large font after below TODO addressed
|
||||
ImGui::PushFont(OTRGlobals::Instance->fontMonoSmall);
|
||||
|
|
@ -27,4 +28,5 @@ void SohConsoleWindow::DrawElement() {
|
|||
|
||||
ImGui::PopFont();
|
||||
UIWidgets::PopStyleInput();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,9 @@ void SohGfxDebuggerWindow::UpdateElement() {
|
|||
}
|
||||
|
||||
void SohGfxDebuggerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
|
||||
GfxDebuggerWindow::DrawElement();
|
||||
ImGui::PopFont();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -849,6 +849,7 @@ void ActorViewer_AddTagForAllActors() {
|
|||
}
|
||||
|
||||
void ActorViewerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
static Actor* display;
|
||||
static Actor empty{};
|
||||
static Actor* fetch = NULL;
|
||||
|
|
@ -1186,6 +1187,7 @@ void ActorViewerWindow::DrawElement() {
|
|||
actors.clear();
|
||||
}
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void ActorViewerWindow::InitElement() {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ using namespace UIWidgets;
|
|||
|
||||
// Draws the ImGui window for the collision viewer
|
||||
void ColViewerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
CheckboxOptions checkOpt = CheckboxOptions().Color(THEME_COLOR);
|
||||
ComboboxOptions comboOpt = ComboboxOptions().Color(THEME_COLOR);
|
||||
CVarCheckbox("Enabled", CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), checkOpt);
|
||||
|
|
@ -139,6 +140,7 @@ void ColViewerWindow::DrawElement() {
|
|||
UIWidgets::Tooltip(colorHelpText.c_str());
|
||||
}
|
||||
PopStyleHeader();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
// Calculates the normal for a triangle at the 3 specified points
|
||||
|
|
|
|||
|
|
@ -1665,6 +1665,7 @@ void ResetBaseOptions() {
|
|||
void SaveEditorWindow::DrawElement() {
|
||||
PushStyleTabs(THEME_COLOR);
|
||||
ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
|
||||
if (ImGui::BeginTabBar("SaveContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
|
||||
ResetBaseOptions();
|
||||
|
|
@ -1706,6 +1707,7 @@ void SaveEditorWindow::DrawElement() {
|
|||
ImGui::EndTabBar();
|
||||
}
|
||||
|
||||
ImGui::EndDisabled();
|
||||
ImGui::PopFont();
|
||||
PopStyleTabs();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ void PerformDisplayListSearch() {
|
|||
}
|
||||
|
||||
void DLViewerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
// Debounce the search field as listing otr files is expensive
|
||||
UIWidgets::PushStyleInput(THEME_COLOR);
|
||||
ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
|
||||
|
|
@ -122,6 +123,7 @@ void DLViewerWindow::DrawElement() {
|
|||
|
||||
if (activeDisplayList == "") {
|
||||
ImGui::PopFont();
|
||||
ImGui::EndDisabled();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -131,6 +133,8 @@ void DLViewerWindow::DrawElement() {
|
|||
|
||||
if (res->GetInitData()->Type != static_cast<uint32_t>(Fast::ResourceType::DisplayList)) {
|
||||
ImGui::Text("Resource type is not a Display List. Please choose another.");
|
||||
ImGui::PopFont();
|
||||
ImGui::EndDisabled();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -325,13 +329,10 @@ void DLViewerWindow::DrawElement() {
|
|||
}
|
||||
ImGui::EndGroup();
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
ImGui::Text("Error displaying DL instructions.");
|
||||
ImGui::PopFont();
|
||||
return;
|
||||
}
|
||||
} catch (const std::exception& e) { ImGui::Text("Error displaying DL instructions."); }
|
||||
|
||||
ImGui::PopFont();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void DLViewerWindow::InitElement() {
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ void DrawHookRegisteringInfos(const char* hookName) {
|
|||
}
|
||||
|
||||
void HookDebuggerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
#ifndef __cpp_lib_source_location
|
||||
ImGui::TextColored(yellow, "Some features of the Hook Debugger are unavailable because SoH was compiled "
|
||||
"without \"<source_location>\" support "
|
||||
|
|
@ -93,6 +94,7 @@ void HookDebuggerWindow::DrawElement() {
|
|||
}
|
||||
|
||||
ImGui::PopFont();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void HookDebuggerWindow::InitElement() {
|
||||
|
|
|
|||
|
|
@ -154,6 +154,7 @@ void RegisterValueViewerHooks() {
|
|||
RegisterShipInitFunc initFunc(RegisterValueViewerHooks, { CVAR_NAME });
|
||||
|
||||
void ValueViewerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::CVarCheckbox("Enable Printing", CVAR_NAME, UIWidgets::CheckboxOptions().Color(THEME_COLOR));
|
||||
|
||||
ImGui::BeginGroup();
|
||||
|
|
@ -275,6 +276,7 @@ void ValueViewerWindow::DrawElement() {
|
|||
}
|
||||
ImGui::EndGroup();
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void ValueViewerWindow::InitElement() {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ DEFINE_HOOK(OnItemReceive, (GetItemEntry itemEntry));
|
|||
DEFINE_HOOK(OnSaleEnd, (GetItemEntry itemEntry));
|
||||
DEFINE_HOOK(OnTransitionEnd, (int16_t sceneNum));
|
||||
DEFINE_HOOK(OnSceneInit, (int16_t sceneNum));
|
||||
DEFINE_HOOK(AfterSceneCommands, (int16_t sceneNum));
|
||||
DEFINE_HOOK(OnSceneFlagSet, (int16_t sceneNum, int16_t flagType, int16_t flag));
|
||||
DEFINE_HOOK(OnSceneFlagUnset, (int16_t sceneNum, int16_t flagType, int16_t flag));
|
||||
DEFINE_HOOK(OnFlagSet, (int16_t flagType, int16_t flag));
|
||||
|
|
|
|||
|
|
@ -45,12 +45,18 @@ void GameInteractor_ExecuteOnTransitionEndHooks(int16_t sceneNum) {
|
|||
GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnTransitionEnd>(sceneNum);
|
||||
}
|
||||
|
||||
void GameInteractor_ExecuteOnSceneInitHooks(int16_t sceneNum) {
|
||||
void GameInteractor_ExecuteOnSceneInit(int16_t sceneNum) {
|
||||
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(sceneNum);
|
||||
GameInteractor::Instance->ExecuteHooksForID<GameInteractor::OnSceneInit>(sceneNum, sceneNum);
|
||||
GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneInit>(sceneNum);
|
||||
}
|
||||
|
||||
void GameInteractor_ExecuteAfterSceneCommands(int16_t sceneNum) {
|
||||
GameInteractor::Instance->ExecuteHooks<GameInteractor::AfterSceneCommands>(sceneNum);
|
||||
GameInteractor::Instance->ExecuteHooksForID<GameInteractor::AfterSceneCommands>(sceneNum, sceneNum);
|
||||
GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::AfterSceneCommands>(sceneNum);
|
||||
}
|
||||
|
||||
void GameInteractor_ExecuteOnSceneFlagSet(int16_t sceneNum, int16_t flagType, int16_t flag) {
|
||||
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneFlagSet>(sceneNum, flagType, flag);
|
||||
GameInteractor::Instance->ExecuteHooksForFilter<GameInteractor::OnSceneFlagSet>(sceneNum, flagType, flag);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ void GameInteractor_ExecuteOnItemReceiveHooks(GetItemEntry itemEntry);
|
|||
void GameInteractor_ExecuteOnSaleEndHooks(GetItemEntry itemEntry);
|
||||
void GameInteractor_ExecuteOnTransitionEndHooks(int16_t sceneNum);
|
||||
void GameInteractor_ExecuteOnSceneInit(int16_t sceneNum);
|
||||
void GameInteractor_ExecuteAfterSceneCommands(int16_t sceneNum);
|
||||
void GameInteractor_ExecuteOnSceneFlagSet(int16_t sceneNum, int16_t flagType, int16_t flag);
|
||||
void GameInteractor_ExecuteOnSceneFlagUnset(int16_t sceneNum, int16_t flagType, int16_t flag);
|
||||
void GameInteractor_ExecuteOnFlagSet(int16_t flagType, int16_t flag);
|
||||
|
|
|
|||
|
|
@ -951,7 +951,7 @@ typedef enum {
|
|||
// false
|
||||
// ```
|
||||
// #### `args`
|
||||
// - '*Fishing' (&this)
|
||||
// - '*Fishing'
|
||||
VB_GIVE_RANDO_GLITCH_FISHING_PRIZE,
|
||||
|
||||
// #### `result`
|
||||
|
|
|
|||
|
|
@ -6,28 +6,28 @@
|
|||
#include "text.hpp"
|
||||
|
||||
namespace CustomMessages {
|
||||
std::string MESSAGE_END();
|
||||
std::string WAIT_FOR_INPUT();
|
||||
std::string HORIZONTAL_SPACE(uint8_t x);
|
||||
std::string GO_TO(uint16_t x);
|
||||
std::string INSTANT_TEXT_ON();
|
||||
std::string INSTANT_TEXT_OFF();
|
||||
std::string SHOP_MESSAGE_BOX();
|
||||
std::string EVENT_TRIGGER();
|
||||
std::string DELAY_FRAMES(uint8_t x);
|
||||
std::string CLOSE_AFTER(uint8_t x);
|
||||
std::string PLAYER_NAME();
|
||||
std::string PLAY_OCARINA();
|
||||
std::string ITEM_OBTAINED(uint8_t x);
|
||||
std::string SET_SPEED(uint8_t x);
|
||||
std::string SKULLTULAS_DESTROYED();
|
||||
std::string CURRENT_TIME();
|
||||
std::string UNSKIPPABLE();
|
||||
std::string TWO_WAY_CHOICE();
|
||||
std::string NEWLINE();
|
||||
std::string COLOR(std::string x);
|
||||
std::string CENTER_TEXT();
|
||||
std::string IF_NOT_MQ();
|
||||
std::string MQ_ELSE();
|
||||
std::string MQ_END();
|
||||
}
|
||||
std::string MESSAGE_END();
|
||||
std::string WAIT_FOR_INPUT();
|
||||
std::string HORIZONTAL_SPACE(uint8_t x);
|
||||
std::string GO_TO(uint16_t x);
|
||||
std::string INSTANT_TEXT_ON();
|
||||
std::string INSTANT_TEXT_OFF();
|
||||
std::string SHOP_MESSAGE_BOX();
|
||||
std::string EVENT_TRIGGER();
|
||||
std::string DELAY_FRAMES(uint8_t x);
|
||||
std::string CLOSE_AFTER(uint8_t x);
|
||||
std::string PLAYER_NAME();
|
||||
std::string PLAY_OCARINA();
|
||||
std::string ITEM_OBTAINED(uint8_t x);
|
||||
std::string SET_SPEED(uint8_t x);
|
||||
std::string SKULLTULAS_DESTROYED();
|
||||
std::string CURRENT_TIME();
|
||||
std::string UNSKIPPABLE();
|
||||
std::string TWO_WAY_CHOICE();
|
||||
std::string NEWLINE();
|
||||
std::string COLOR(std::string x);
|
||||
std::string CENTER_TEXT();
|
||||
std::string IF_NOT_MQ();
|
||||
std::string MQ_ELSE();
|
||||
std::string MQ_END();
|
||||
} // namespace CustomMessages
|
||||
|
|
|
|||
|
|
@ -7,52 +7,52 @@
|
|||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
//RANDOTODO merge into Logic once Logic is a class passed to logic funtions
|
||||
// RANDOTODO merge into Logic once Logic is a class passed to logic funtions
|
||||
struct GetAccessibleLocationsStruct {
|
||||
std::vector<RandomizerCheck> accessibleLocations;
|
||||
std::vector<RandomizerRegion> regionPool;
|
||||
//Variables for playthrough
|
||||
int gsCount;
|
||||
int maxGsCount;
|
||||
std::vector<LogicVal> buyIgnores;
|
||||
std::vector<RandomizerCheck> accessibleLocations;
|
||||
std::vector<RandomizerRegion> regionPool;
|
||||
// Variables for playthrough
|
||||
int gsCount;
|
||||
int maxGsCount;
|
||||
std::vector<LogicVal> buyIgnores;
|
||||
|
||||
//Variables for search
|
||||
std::vector<Rando::ItemLocation*> newItemLocations;
|
||||
bool logicUpdated;
|
||||
bool resetSphere;
|
||||
// Variables for search
|
||||
std::vector<Rando::ItemLocation*> newItemLocations;
|
||||
bool logicUpdated;
|
||||
bool resetSphere;
|
||||
|
||||
//Variables For Validating Entrences
|
||||
bool haveTimeAccess;
|
||||
bool foundTempleOfTime;
|
||||
bool validatedStartingRegion;
|
||||
bool sphereZeroComplete;
|
||||
bool timePassChildDay;
|
||||
bool timePassChildNight;
|
||||
bool timePassAdultDay;
|
||||
bool timePassAdultNight;
|
||||
// Variables For Validating Entrences
|
||||
bool haveTimeAccess;
|
||||
bool foundTempleOfTime;
|
||||
bool validatedStartingRegion;
|
||||
bool sphereZeroComplete;
|
||||
bool timePassChildDay;
|
||||
bool timePassChildNight;
|
||||
bool timePassAdultDay;
|
||||
bool timePassAdultNight;
|
||||
|
||||
std::vector<RandomizerCheck> itemSphere;
|
||||
std::list<Rando::Entrance*> entranceSphere;
|
||||
std::vector<RandomizerCheck> itemSphere;
|
||||
std::list<Rando::Entrance*> entranceSphere;
|
||||
|
||||
bool calculatingAvailableChecks = false;
|
||||
bool calculatingAvailableChecks = false;
|
||||
|
||||
GetAccessibleLocationsStruct(int _maxGsCount){
|
||||
regionPool = {RR_ROOT};
|
||||
gsCount = 0;
|
||||
maxGsCount = _maxGsCount;
|
||||
logicUpdated = false;
|
||||
resetSphere = false;
|
||||
}
|
||||
|
||||
void InitLoop(){
|
||||
logicUpdated = false;
|
||||
for (Rando::ItemLocation* location : newItemLocations) {
|
||||
location->ApplyPlacedItemEffect();
|
||||
GetAccessibleLocationsStruct(int _maxGsCount) {
|
||||
regionPool = { RR_ROOT };
|
||||
gsCount = 0;
|
||||
maxGsCount = _maxGsCount;
|
||||
logicUpdated = false;
|
||||
resetSphere = false;
|
||||
}
|
||||
|
||||
void InitLoop() {
|
||||
logicUpdated = false;
|
||||
for (Rando::ItemLocation* location : newItemLocations) {
|
||||
location->ApplyPlacedItemEffect();
|
||||
}
|
||||
newItemLocations.clear();
|
||||
itemSphere.clear();
|
||||
entranceSphere.clear();
|
||||
}
|
||||
newItemLocations.clear();
|
||||
itemSphere.clear();
|
||||
entranceSphere.clear();
|
||||
}
|
||||
};
|
||||
|
||||
void ClearProgress();
|
||||
|
|
@ -61,13 +61,15 @@ int Fill();
|
|||
|
||||
std::vector<RandomizerCheck> GetEmptyLocations(std::vector<RandomizerCheck> allowedLocations);
|
||||
|
||||
void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE,
|
||||
void ProcessRegion(Region* region, GetAccessibleLocationsStruct& gals, RandomizerGet ignore = RG_NONE,
|
||||
bool stopOnBeatable = false, bool addToPlaythrough = false);
|
||||
|
||||
std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations, RandomizerGet ignore=RG_NONE, bool calculatingAvailableChecks=false);
|
||||
std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerCheck>& allowedLocations,
|
||||
RandomizerGet ignore = RG_NONE,
|
||||
bool calculatingAvailableChecks = false);
|
||||
|
||||
void GeneratePlaythrough();
|
||||
|
||||
bool CheckBeatable(RandomizerGet ignore=RG_NONE);
|
||||
bool CheckBeatable(RandomizerGet ignore = RG_NONE);
|
||||
|
||||
void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);
|
||||
|
|
@ -953,7 +953,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "Verlorene Wälder",
|
||||
/*french*/ "les Bois Perdus"));
|
||||
// /*spanish*/el Bosque Perdido
|
||||
|
||||
|
||||
hintTextTable[RHT_SACRED_FOREST_MEADOW] = HintText(CustomMessage("Sacred Forest Meadow",
|
||||
/*german*/ "Heilige Lichtung",
|
||||
/*french*/ "le Bosquet Sacré"));
|
||||
|
|
@ -998,12 +998,12 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "Zitadelle der Zeit",
|
||||
/*french*/ "le Temple du Temps"));
|
||||
// /*spanish*/el Templo del Tiempo
|
||||
|
||||
|
||||
hintTextTable[RHT_CASTLE_GROUNDS] = HintText(CustomMessage("the Castle Grounds",
|
||||
/*german*/ "Anlage von Schloß Hyrule",
|
||||
/*french*/ "le Château d'Hyrule"));
|
||||
// /*spanish*/
|
||||
|
||||
|
||||
hintTextTable[RHT_HYRULE_CASTLE] = HintText(CustomMessage("Hyrule Castle",
|
||||
/*german*/ "Schloß Hyrule",
|
||||
/*french*/ "le Château d'Hyrule"));
|
||||
|
|
@ -1018,7 +1018,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "Anlage von Schloß Hyrule",
|
||||
/*french*/ "le Château d'Hyrule"));
|
||||
// /*spanish*/
|
||||
|
||||
|
||||
hintTextTable[RHT_KAKARIKO_VILLAGE] = HintText(CustomMessage("Kakariko Village",
|
||||
/*german*/ "Kakariko",
|
||||
/*french*/ "le Village Cocorico"));
|
||||
|
|
@ -1058,7 +1058,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "Zoras Quelle",
|
||||
/*french*/ "la Fontaine Zora"));
|
||||
// /*spanish*/la Fuente Zora
|
||||
|
||||
|
||||
hintTextTable[RHT_LON_LON_RANCH] = HintText(CustomMessage("Lon Lon Ranch",
|
||||
/*german*/ "Lon Lon-Farm",
|
||||
/*french*/ "le Ranch Lon Lon"));
|
||||
|
|
@ -1077,7 +1077,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "Midos Haus",
|
||||
/*french*/ "la Cabane du Grand Mido"));
|
||||
// /*spanish*/la casa de Mido
|
||||
|
||||
|
||||
hintTextTable[RHT_KF_SARIAS_HOUSE] = HintText(CustomMessage("Saria's House",
|
||||
/*german*/ "Salias Haus",
|
||||
/*french*/ "la Cabane de Saria"));
|
||||
|
|
@ -1097,7 +1097,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "der #Kokiri-Laden#",
|
||||
/*french*/ "le #Magasin Kokiri#"));
|
||||
// /*spanish*/la tienda kokiri
|
||||
|
||||
|
||||
hintTextTable[RHT_LH_LAB] = HintText(CustomMessage("the #Lakeside Laboratory#",
|
||||
/*german*/ "das #Laboratorium des Sees#",
|
||||
/*french*/ "le #Laboratoire du Lac#"));
|
||||
|
|
@ -1292,7 +1292,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "eine solitäre #Kuh#",
|
||||
/*french*/ "la #grotte avec une vache#"));
|
||||
// /*spanish*/una #vaca# solitaria
|
||||
|
||||
|
||||
hintTextTable[RHT_HC_STORMS_GROTTO] = HintText(CustomMessage("a sandy grotto with #fragile walls#",
|
||||
/*german*/ "eine sandige Grotte mit #fragilen Wänden#",
|
||||
/*french*/ "la #grotte avec des murs fragiles#"));
|
||||
|
|
@ -1337,7 +1337,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "eine #generische Grotte#",
|
||||
/*french*/ "une #grotte avec un trésor#"));
|
||||
// /*spanish*/una #cueva genérica#
|
||||
|
||||
|
||||
hintTextTable[RHT_DMC_UPPER_GROTTO] = HintText(CustomMessage("a #generic grotto#",
|
||||
/*german*/ "eine #generische Grotte#",
|
||||
/*french*/ "une #grotte avec un trésor#"));
|
||||
|
|
@ -1362,7 +1362,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "eine #generische Grotte#",
|
||||
/*french*/ "une #grotte avec un trésor#"));
|
||||
// /*spanish*/una #cueva genérica#
|
||||
|
||||
|
||||
hintTextTable[RHT_HF_SOUTHEAST_GROTTO] = HintText(CustomMessage("a #generic grotto#",
|
||||
/*german*/ "eine #generische Grotte#",
|
||||
/*french*/ "une #grotte avec un trésor#"));
|
||||
|
|
@ -1458,257 +1458,258 @@ void StaticData::HintTable_Init() {
|
|||
---------------------------*/
|
||||
|
||||
hintTextTable[RHT_JUNK01] = HintText(CustomMessage("They say you must read the names of \"Special Deal\" shop items carefully.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass man die \"Sonderangebote\" im Laden sorgfältig lesen sollte!",
|
||||
/*french*/ "Selon moi, les \"Offres spéciales\" sont parfois trompeuses... Lisez les attentivement!"));
|
||||
|
||||
hintTextTable[RHT_JUNK02] = HintText(CustomMessage("They say that Zelda is a poor leader.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Zelda eine schlechte Anführerin ist.",
|
||||
/*french*/ "Selon moi, Zelda ne ferait pas un bon monarque."));
|
||||
|
||||
hintTextTable[RHT_JUNK03] = HintText(CustomMessage("These hints can be quite useful. This is an exception.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Die Hinweise können sehr nützlich sein. Dies ist eine Ausnahme.",
|
||||
/*french*/ "Ces indices sont très utiles, à l'exception de celui-ci."));
|
||||
|
||||
hintTextTable[RHT_JUNK04] = HintText(CustomMessage("They say that the Lizalfos in Dodongo's Cavern like to play in lava.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass die Echsalfos in Dodongo's Cavern gerne in der Lava spielen.",
|
||||
/*french*/ "Selon moi, les Lézalfos de la Caverne Dodongo aiment patauger dans la lave."));
|
||||
|
||||
hintTextTable[RHT_JUNK05] = HintText(CustomMessage("They say that all the Zora drowned in Wind Waker.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass alle Zoras in Wind Waker ertrunken sind.",
|
||||
/*french*/ "Selon moi, les Zoras se sont noyés dans Wind Waker."));
|
||||
|
||||
hintTextTable[RHT_JUNK06] = HintText(CustomMessage("If Gorons eat rocks, does that mean I'm in danger?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Goronen essen doch Steine… heißt das, ich sollte mir Sorgen machen?",
|
||||
/*french*/ "Ne dis pas au Gorons que je suis ici. Ils mangent des roches, tu sais!"));
|
||||
|
||||
hintTextTable[RHT_JUNK07] = HintText(CustomMessage("'Member when Ganon was a blue pig?^I 'member.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Erinnert ihr euch noch, als Ganon ein blauer Schwein war?^Ich erinnere mich!“",
|
||||
/*french*/ "Dans mon temps, Ganon était un cochon bleu...^Pff! Les jeunes de nos jours, et leur Ganondorf!"));
|
||||
|
||||
hintTextTable[RHT_JUNK08] = HintText(CustomMessage("One who does not have Triforce can't go in.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Jemand, der nicht im Besitz der Triforce ist, kann nicht eintreten!",
|
||||
/*french*/ "Ceux sans Triforce doivent rebrousser chemin."));
|
||||
|
||||
hintTextTable[RHT_JUNK09] = HintText(CustomMessage("Save your future, end the Happy Mask Salesman.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass der Maskenverkäufer aufgehalten werden muss, wenn man eine sichere Zukunft will.",
|
||||
/*french*/ "Selon moi, tu t'éviteras des jours de malheur si tu vaincs le vendeur de masques..."));
|
||||
|
||||
hintTextTable[RHT_JUNK10] = HintText(CustomMessage("Glitches are a pathway to many abilities some consider to be... Unnatural.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Glitches sind ein Weg zu vielen Fähigkeiten, die manche als... unnatürlich betrachten.",
|
||||
/*french*/ "Les glitchs sont un moyen d'acquérir de nombreuses facultés considérées par certains comme... contraire "));
|
||||
|
||||
hintTextTable[RHT_JUNK11] = HintText(CustomMessage("I'm stoned. Get it?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*french*/ "Allez, roche, papier, ciseau...&Roche."));
|
||||
/*german*/ "Ich bin stoned. Verstehst du?",
|
||||
/*french*/ "J'ai été pétrifié.&Tu as compris?"));
|
||||
|
||||
hintTextTable[RHT_JUNK12] = HintText(CustomMessage("Hoot! Hoot! Would you like me to repeat that?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Sei willkommen! Soll ich meine Worte wiederholen?",
|
||||
/*french*/ "Hou hou! Veux-tu que je répète tout ça?"));
|
||||
|
||||
hintTextTable[RHT_JUNK13] = HintText(CustomMessage("Gorons are stupid. They eat rocks.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Goronen sind dumm. Sie essen Felsen.",
|
||||
/*french*/ "Les Gorons sont des vraies têtes dures."));
|
||||
|
||||
hintTextTable[RHT_JUNK14] = HintText(CustomMessage("They say that Lon Lon Ranch prospered under Ingo.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Ingo der Lon-Lon-Farm zu neuem Glanz verholfen hat.",
|
||||
/*french*/ "Selon moi, le Ranch Lon Lon était plus prospère sous Ingo."));
|
||||
|
||||
hintTextTable[RHT_JUNK15] = HintText(CustomMessage("They say without the Lens of Truth, the Treasure Chest Mini-Game is a 1 out of 32 chance.^Good luck!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*french*/ "Gagner la Chasse-aux-Trésors est 1 chance sur 32.^Bonne chance!"));
|
||||
/*german*/ "Man erzählt sich, dass du ohne das Auge der Wahrheit beim Schatzkisten-Minispiel nur eine 1-zu-32-Chance hast.^Na dann, viel Glück.",
|
||||
/*french*/ "Selon moi, les chances de gagner la Chasse-aux-Trésors sans Monocle de Vérité est de 1 chance sur 32.^Bonne chance!"));
|
||||
|
||||
hintTextTable[RHT_JUNK16] = HintText(CustomMessage("Use bombs wisely.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Setze Bomben mit Bedacht ein.",
|
||||
/*french*/ "Utilise les bombes avec précaution."));
|
||||
|
||||
hintTextTable[RHT_JUNK17] = HintText(CustomMessage("They say that players who select the \"ON\" option for \"MOTION CONTROL\" are the real \"Zelda players!\"",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Spieler, die die Option ‚BEWEGUNGSSTEUERUNG‘ auf ‚EIN‘ stellen, die wahren ‚Zelda-Spieler‘ sind.",
|
||||
/*french*/ "Selon moi, ceux qui utilisent les contrôles gyroscopiques sont les VRAIS joueurs."));
|
||||
|
||||
hintTextTable[RHT_JUNK18] = HintText(CustomMessage("L2P @.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Lern zu spielen, @.",
|
||||
/*french*/ "Arrête de lire les indices et joue comme un grand, @."));
|
||||
|
||||
hintTextTable[RHT_JUNK19] = HintText(CustomMessage("I bet you'd like to have more bombs.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ich wette, du würdest jetzt gerne mehr Bomben haben.",
|
||||
/*french*/ "Je parie que tu veux plus de bombes."));
|
||||
|
||||
hintTextTable[RHT_JUNK20] = HintText(CustomMessage("When all else fails, use Fire.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Wenn alles andere scheitert, benutze Feuer.",
|
||||
/*french*/ "Quand rien ne marche, utilise le feu."));
|
||||
|
||||
hintTextTable[RHT_JUNK21] = HintText(CustomMessage("Here's a hint, @. Don't be bad.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Hier ein Tipp, @: Sei nicht so schlecht.",
|
||||
/*french*/ "Selon moi, la #Triforce# n'est pas dans le jeu... Duh!"));
|
||||
|
||||
hintTextTable[RHT_JUNK22] = HintText(CustomMessage("Game Over. Return of Ganon.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Game Over. Die Rückkehr von Ganon.",
|
||||
/*french*/ "Partie terminée. RETour de Ganon."));
|
||||
|
||||
hintTextTable[RHT_JUNK23] = HintText(CustomMessage("May the way of the Hero lead to the Triforce.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Möge der Weg des Helden zur Triforce führen.",
|
||||
/*french*/ "Que le chemin du héros te mène à la Triforce."));
|
||||
|
||||
hintTextTable[RHT_JUNK24] = HintText(CustomMessage("Can't find an item? Scan an Amiibo.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Du kannst einen Gegenstand nicht finden? Scanne einen Amiibo.",
|
||||
/*french*/ "Tu cherches de quoi? Utilise un Amiibo!"));
|
||||
|
||||
hintTextTable[RHT_JUNK25] = HintText(CustomMessage("They say this game has just a few glitches.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass dieses Spiel nur ein paar Glitches hat.",
|
||||
/*french*/ "Selon moi, ce jeu est complètement exempt de glitchs."));
|
||||
|
||||
hintTextTable[RHT_JUNK26] = HintText(CustomMessage("BRRING BRRING This is Ulrira. Wrong number?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "BRRING BRRING, hier ist Ulrira. Falsche Nummer.",
|
||||
/*french*/ "DRING DRING!! Pépé le Ramollo à l'appareil... Quoi? Faux numéro?"));
|
||||
|
||||
hintTextTable[RHT_JUNK27] = HintText(CustomMessage("Tingle Tingle Kooloo Limpah!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Tingle Tingle Kuuluu-Limpah!",
|
||||
/*french*/ "Tingle! Tingle! Kooloolin... Pah!"));
|
||||
|
||||
hintTextTable[RHT_JUNK28] = HintText(CustomMessage("L is real 2401",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "L is real 2401",
|
||||
/*french*/ "L is real 2401"));
|
||||
|
||||
hintTextTable[RHT_JUNK29] = HintText(CustomMessage("They say that Ganondorf will appear in the next Mario Tennis.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Ganondorf im nächsten Mario Tennis erscheinen wird.",
|
||||
/*french*/ "Selon moi, Ganondorf sera la nouvelle recrue dans Mario Tennis."));
|
||||
|
||||
hintTextTable[RHT_JUNK30] = HintText(CustomMessage("They say Medigoron sells the earliest Breath of the Wild demo.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Medigoron die früheste Breath of the Wild-Demo verkauft.",
|
||||
/*french*/ "Selon moi, Medigoron vend une démo de #Breath of the Wild#."));
|
||||
|
||||
hintTextTable[RHT_JUNK31] = HintText(CustomMessage("Can you move me? I don't get great service here.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Kannst du mich bewegen? Der Service hier ist nicht gerade gut.",
|
||||
/*french*/ "Peux-tu me déplacer? J'ai pas une bonne réception ici."));
|
||||
|
||||
hintTextTable[RHT_JUNK32] = HintText(CustomMessage("They say if you use Strength on the truck, you can find Mew.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass man mit Stärke am Truck Mew finden kann.",
|
||||
/*french*/ "Selon moi, #Mew# se trouve dessous le camion... Duh!"));
|
||||
|
||||
hintTextTable[RHT_JUNK33] = HintText(CustomMessage("I'm a helpful hint Gossip Stone!^See, I'm helping.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ich bin ein hilfreicher Stein!^Siehst du, ich helfe.",
|
||||
/*french*/ "Salut! Je suis une pierre de bons conseils!^Tiens, tu vois? J'aide bien, hein?"));
|
||||
|
||||
hintTextTable[RHT_JUNK34] = HintText(CustomMessage("Dear @, please come to the castle. I've baked a cake for you.&Yours truly, Princess Zelda.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Lieber @, bitte komm ins Schloss. Ich habe einen Kuchen für dich gebacken. Mit freundlichen Grüßen,^Prinzessin Zelda.",
|
||||
/*french*/ "Mon très cher @:&Viens vite au château, je t'ai préparé&un délicieux gâteau...^À bientôt, Princesse Zelda"));
|
||||
|
||||
hintTextTable[RHT_JUNK35] = HintText(CustomMessage("They say all toasters toast toast.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass alle Toaster Toast toasten.",
|
||||
/*french*/ "Selon moi, les grille-pains grillent du pain."));
|
||||
|
||||
hintTextTable[RHT_JUNK36] = HintText(CustomMessage("You thought it would be a useful hint, but it was me, junk hint!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Du dachtest, es wäre ein nützlicher Hinweis, aber es war ich, der Müll-Hinweis.",
|
||||
/*french*/ "Tu t'attendais à un bon indice... Mais c'était moi, un mauvais indice!"));
|
||||
|
||||
hintTextTable[RHT_JUNK37] = HintText(CustomMessage("They say that quest guidance can be found at a talking rock.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass man Quest-Hinweise bei einem sprechenden Stein finden kann.",
|
||||
/*french*/ "Selon moi, des #indices# se trouvent auprès d'une pierre parlante... Duh!"));
|
||||
|
||||
hintTextTable[RHT_JUNK38] = HintText(CustomMessage("They say that the final item you're looking for can be found somewhere in Hyrule.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass das letzte Item, nach dem du suchst, irgendwo in Hyrule zu finden ist.",
|
||||
/*french*/ "Selon moi, le #dernier objet# se trouve quelque part dans Hyrule... Duh!"));
|
||||
|
||||
hintTextTable[RHT_JUNK39] = HintText(CustomMessage("Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.^Mweep.",
|
||||
/*french*/ "Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip.^Mwip."));
|
||||
|
||||
hintTextTable[RHT_JUNK40] = HintText(CustomMessage("They say that Barinade fears Deku Nuts.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Barinade Angst vor Deku-Nüssen hat.",
|
||||
/*french*/ "Selon moi, Barinade a la frousse des noix Mojo."));
|
||||
|
||||
hintTextTable[RHT_JUNK41] = HintText(CustomMessage("They say that Flare Dancers do not fear Goron-crafted blades.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Flammenderwische keine Angst vor von Goronen geschmiedeten Klingen haben.",
|
||||
/*french*/ "Selon moi, le danse-flamme n'a pas peur des armes de Goron."));
|
||||
|
||||
hintTextTable[RHT_JUNK42] = HintText(CustomMessage("They say that Morpha is easily trapped in a corner.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass man Morpha ganz leicht in die Ecke drängen kann.",
|
||||
/*french*/ "Selon moi, Morpha est facilement coincé."));
|
||||
|
||||
hintTextTable[RHT_JUNK43] = HintText(CustomMessage("They say that Bongo Bongo really hates the cold.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Bongo Bongo die Kälte wirklich hasst.",
|
||||
/*french*/ "Selon moi, Bongo Bongo a facilement froid aux doigts."));
|
||||
|
||||
hintTextTable[RHT_JUNK44] = HintText(CustomMessage("They say that your sword is most powerful when you put it away.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass dein Schwert am mächtigsten ist, wenn du es wegsteckst.",
|
||||
/*french*/ "Selon moi, ton épée est à pleine puissance quand tu la rengaines."));
|
||||
|
||||
hintTextTable[RHT_JUNK45] = HintText(CustomMessage("They say that bombing the hole Volvagia last flew into can be rewarding.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass es sich lohnt, das Loch zu bombardieren, in das Volvagia zuletzt geflogen ist.",
|
||||
/*french*/ "Selon moi, le trou où se creuse Volvagia est vulnérable aux bombes."));
|
||||
|
||||
hintTextTable[RHT_JUNK46] = HintText(CustomMessage("They say that invisible ghosts can be exposed with Deku Nuts.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass unsichtbare Geister mit Deku-Nüssen sichtbar gemacht werden können.",
|
||||
/*french*/ "Selon moi, des fantômes invisibles apparaissent avec des noix Mojo."));
|
||||
|
||||
hintTextTable[RHT_JUNK47] = HintText(CustomMessage("They say that the real Phantom Ganon is bright and loud.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass der wahre Phantom-Ganon durch Helligkeit und Lärm auffällt.",
|
||||
/*french*/ "Selon moi, le vrai spectre de Ganon est clair et bruyant."));
|
||||
|
||||
hintTextTable[RHT_JUNK48] = HintText(CustomMessage("They say that walking backwards is very fast.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass rückwärts laufen sehr schnell ist.",
|
||||
/*french*/ "Selon moi, tu fais marche arrière très rapidement pour un héros."));
|
||||
|
||||
hintTextTable[RHT_JUNK49] = HintText(CustomMessage("They say Ingo is not very good at planning ahead.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Ingo nicht besonders gut darin ist, vorauszuplanen.",
|
||||
/*french*/ "Selon moi, Ingo ne fait pas un très bon geôlier."));
|
||||
|
||||
hintTextTable[RHT_JUNK50] = HintText(CustomMessage("You found a spiritual Stone! By which I mean, I worship Nayru.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Du hast einen heiligen Stein gefunden! Also... eigentlich heißt das nur, dass ich Nayru verehre.",
|
||||
/*french*/ "Vous avez trouvé une Pierre Ancestrale! En effet, je vénère la déesse Hylia."));
|
||||
|
||||
hintTextTable[RHT_JUNK51] = HintText(CustomMessage("Open your eyes.^Open your eyes.^Wake up, @.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Öffne deine Augen.^Öffne deine Augen.^Wach auf, @.",
|
||||
/*french*/ "Réveille-toi...^Réveille-toi.^Ouvre les yeux, @."));
|
||||
|
||||
hintTextTable[RHT_JUNK52] = HintText(CustomMessage("They say that the Nocturne of Shadow can bring you very close to Ganon.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass das Nocturne des Schattens dich Ganon sehr nahe bringen kann.",
|
||||
/*french*/ "Selon moi, le Nocturne de l'Ombre peut t'amener très près de Ganon."));
|
||||
|
||||
hintTextTable[RHT_JUNK53] = HintText(CustomMessage("They say that Twinrova always casts the same spell the first three times.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Twinrova die ersten drei Male immer denselben Zauber benutzt.",
|
||||
/*french*/ "Selon moi, le Duo Maléfique lance toujours les mêmes trois premiers sorts."));
|
||||
|
||||
hintTextTable[RHT_JUNK54] = HintText(CustomMessage("They say that the nightly builds may be unstable.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass die \"nightly builds\" instabil sein könnten.",
|
||||
/*french*/ "Selon moi, les \"nightly builds\" peuvent être instables."));
|
||||
|
||||
hintTextTable[RHT_JUNK55] = HintText(CustomMessage("You're playing a Randomizer. I'm randomized!^Here's a random number: #4#.&Enjoy your Randomizer!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Du spielst einen Randomizer. Ich bin randomisiert!^Hier ist eine zufällige Zahl: #4#.&Viel Spaß mit dem Randomizer!",
|
||||
/*french*/ "Tu joues à un randomizer. Je suis aléatoire!^Voici un nombre aléatoire: #4#.&Bonne partie!"));
|
||||
|
||||
hintTextTable[RHT_JUNK56] = HintText(CustomMessage("They say Ganondorf's bolts can be reflected with glass or steel.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass man Ganondorfs Blitze mit Glas oder Stahl reflektieren kann.",
|
||||
/*french*/ "Selon moi, les éclairs de Ganon se reflètent sur l'acier et le verre."));
|
||||
|
||||
hintTextTable[RHT_JUNK57] = HintText(CustomMessage("They say Ganon's tail is vulnerable to nuts, arrows, swords, explosives, hammers...^...sticks, seeds, "
|
||||
"boomerangs...^...rods, shovels, iron balls, angry bees...",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Ganons Schwanz verwundbar ist durch Nüsse, Pfeile, Schwerter...^...Sprengstoffe, Hämmer, "
|
||||
"Stöcke...^...Kerne, Bumerangs, Schaufeln, Eisenkugeln, wütende Bienen...",
|
||||
/*french*/ "Selon moi, la queue de Ganon est vulnérable aux noix, flèches, épées, bombes, marteaux...^...bâtons, "
|
||||
"graines, boomerangs...^...baguettes, pelles, boulets de fer, abeilles enragées..."));
|
||||
|
||||
hintTextTable[RHT_JUNK58] = HintText(CustomMessage("They say that you're wasting time reading this hint, but I disagree. Talk to me again!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass du deine Zeit mit dem Lesen dieses Hinweises verschwendest, aber ich bin anderer Meinung. Sprich noch einmal mit mir.",
|
||||
/*french*/ "Selon moi... tu sais quoi? Parle-moi encore, et je te le dirai!"));
|
||||
|
||||
hintTextTable[RHT_JUNK59] = HintText(CustomMessage("They say Ganondorf knows where to find the instrument of his doom.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Ganondorf weiß, wo er das Instrument seines Untergangs finden kann.",
|
||||
/*french*/ "Selon moi, Ganondorf sait où il a caché son point faible."));
|
||||
|
||||
hintTextTable[RHT_JUNK60] = HintText(CustomMessage("I heard @ is pretty good at Zelda.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ich habe gehört, dass @ ziemlich gut in Zelda ist.",
|
||||
/*french*/ "Apparemment, @ est super bon à Zelda."));
|
||||
|
||||
hintTextTable[RHT_JUNK61] = HintText(CustomMessage("Hi @, we've been trying to reach you about your car's extended warranty. ",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Hallo @, wir haben versucht, dich wegen der erweiterten Garantie für dein Auto zu erreichen.",
|
||||
/*french*/ "Bonjour, @. Vous avez une voiture? Vous savez, nous offrons des assurances abordables..."));
|
||||
|
||||
hintTextTable[RHT_JUNK62] = HintText(CustomMessage("They say that it's actually possible to beat the running man.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass es tatsächlich möglich ist, den Laufenden Mann zu besiegen.",
|
||||
/*french*/ "Selon moi, il est possible de battre le coureur.&Donc, tu prends ton arc, et..."));
|
||||
|
||||
hintTextTable[RHT_JUNK63] = HintText(CustomMessage("They say this hint makes more sense in other languages.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass diese Hinweise besser übersetzt werden könnten… na ja, wer hätte das gedacht.",
|
||||
/*french*/ "Selon moi, ces indices auraient pu être mieux traduits... Duh!"));
|
||||
|
||||
// ^ Junk hints above are from 3drando
|
||||
|
|
@ -1717,46 +1718,43 @@ void StaticData::HintTable_Init() {
|
|||
// Please keep hints to stuff related to ship directly, or to Nintendo/Zelda related stuff.
|
||||
// And nothing that's super obscure that no one's going to understand.
|
||||
|
||||
#define HINT_TEXT_NEEDS_TRANSLATION_FR \
|
||||
"Erreur 0x69a504:&Traduction manquante^C'est de la faute à Purple Hato!&J'vous jure!"
|
||||
|
||||
hintTextTable[RHT_JUNK64] = HintText(CustomMessage("They say Greg is special.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Greg etwas Besonderes ist.",
|
||||
/*french*/ "Selon moi, Greg est spécial."));
|
||||
|
||||
hintTextTable[RHT_JUNK65] = HintText(CustomMessage("They say the longer the Goron's neck, the wiser they are.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass ein Gorone umso weiser wird, je länger sein Hals ist.",
|
||||
/*french*/ "Selon moi, plus le cou des Gorons est long, plus ils sont sage." ));
|
||||
|
||||
hintTextTable[RHT_JUNK66] = HintText(CustomMessage("They say this ship is what all true gamers strive for.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass dieses \"ship\" das ist, wonach alle echten Gamer streben.",
|
||||
/*french*/ "Selon moi, cette version du port est ce pour quoi luttent tous les vrais gamers."));
|
||||
|
||||
|
||||
hintTextTable[RHT_JUNK67] = HintText(CustomMessage("They say that Glowsticks can be found in the Raveyard.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass Leuchtstäbe auf dem Partyfriedhof zu finden sind.",
|
||||
/*french*/ "Selon moi, on peut trouver des Bâtons Lumineux sur le dancefloor du cimetière."));
|
||||
|
||||
hintTextTable[RHT_JUNK68] = HintText(CustomMessage("They say @'s uncle works for Nintendo.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass @'s Onkel bei Nintendo arbeitet.",
|
||||
/*french*/ "Selon moi, l'oncle de @ travaille chez Nintendo."));
|
||||
|
||||
hintTextTable[RHT_JUNK69] = HintText(CustomMessage("They say pulling all gravestones in the graveyard leads to something magical.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass das Ziehen aller Grabsteine auf dem Friedhof zu etwas Magischem führt.",
|
||||
/*french*/ "Selon moi, tirer toutes les tombes du Cimetière déclanche un truc magique."));
|
||||
|
||||
hintTextTable[RHT_JUNK70] = HintText(CustomMessage("They say holding L while pausing makes you win the game.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich, dass man das Spiel gewinnt, wenn man L gedrückt hält, während man pausiert.",
|
||||
/*french*/ "Selon moi, maintenir L pendant que vous appuyez sur START vous permet de terminer le jeu."));
|
||||
|
||||
hintTextTable[RHT_JUNK71] = HintText(CustomMessage("They say @'s body is ready.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Man erzählt sich... nein weisst du was, ich hab keine lust mehr.",
|
||||
/*french*/ "Selon moi, ce junk hint ne se traduirait pas bien en français."));
|
||||
|
||||
/*--------------------------
|
||||
| DUNGEON HINT TEXT |
|
||||
---------------------------*/
|
||||
|
||||
|
||||
|
||||
hintTextTable[RHT_DEKU_TREE] = HintText(CustomMessage("Deku Tree",
|
||||
/*german*/ "Deku-Baum",
|
||||
/*french*/ "l'Arbre Mojo"),
|
||||
|
|
@ -2000,13 +1998,13 @@ void StaticData::HintTable_Init() {
|
|||
// /*spanish*/$8Los sabios aguardarán a que el héroe&obtenga #[[d]] |medallón|medallones|#.^
|
||||
|
||||
hintTextTable[RHT_BRIDGE_REWARDS_HINT] = HintText(CustomMessage("$CThe awakened ones will await for the Hero to collect #[[d]]# |#Spiritual Stone# or #Medallion#|"
|
||||
"#Spiritual Stones# and #Medallions#|.^",
|
||||
/*german*/ "$CDie Weisen werden darauf warten, daß der Held #[[d]]# |#Heiligen Stein# oder #Amulett#|"
|
||||
"#Heilige Steine# oder #Amulette#| sammelt.^",
|
||||
/*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
|
||||
"|#Pierres Ancestrales# ou #Médaillons#|.^",
|
||||
{QM_YELLOW, QM_BLUE, QM_RED}));
|
||||
// /*spanish*/$CLos sabios aguardarán a que el héroe obtenga #[[d]]# |#piedra espiritual# o #medallón#|
|
||||
"#Spiritual Stones# and #Medallions#|.^",
|
||||
/*german*/ "$CDie Weisen werden darauf warten, daß der Held #[[d]]# |#Heiligen Stein# oder #Amulett#|"
|
||||
"#Heilige Steine# oder #Amulette#| sammelt.^",
|
||||
/*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
|
||||
"|#Pierres Ancestrales# ou #Médaillons#|.^",
|
||||
{QM_YELLOW, QM_BLUE, QM_RED}));
|
||||
// /*spanish*/$CLos sabios aguardarán a que el héroe obtenga #[[d]]# |#piedra espiritual# o #medallón#|
|
||||
//#piedras espirtuales# y #medallones#|.^
|
||||
|
||||
hintTextTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText(CustomMessage("$mThe awakened ones will await for the Hero to conquer #[[d]] Dungeon||s|#.^",
|
||||
|
|
@ -2022,6 +2020,8 @@ void StaticData::HintTable_Init() {
|
|||
// /*spanish*/$sLos sabios aguardarán a que el héroe obtenga #[[d]] símbolo||s| de skulltula dorada#.^
|
||||
|
||||
hintTextTable[RHT_BRIDGE_GREG_HINT] = HintText(CustomMessage("$gThe awakened ones will await for the Hero to find #Greg#.^",
|
||||
/*german*/ "$gDie Erwachten werden darauf warten, dass der Held #Greg# findet.^",
|
||||
/*french*/ "$gLes êtres de sagesse attendront le héros muni de #Greg#.^",
|
||||
{QM_GREEN}));
|
||||
|
||||
|
||||
|
|
@ -2188,7 +2188,7 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "$cJener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und&spiele hier die Hymne der Zeit.",
|
||||
/*french*/ "$cÀ celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps."));
|
||||
// /*spanish*/$cPara aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo.
|
||||
|
||||
|
||||
hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTCLOSED] = HintText(CustomMessage("$iYe who may become a Hero...&Offer the spiritual stones and&play the Song of Time.",
|
||||
/*german*/ "$iJener mit den drei Heiligen Steinen&nehme seine Okarina zur Hand und&spiele hier die Hymne der Zeit.",
|
||||
/*french*/ "$iÀ celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps."));
|
||||
|
|
@ -2214,19 +2214,20 @@ void StaticData::HintTable_Init() {
|
|||
---------------------------*/
|
||||
|
||||
hintTextTable[RHT_GANONDORF_HINT_LA_ONLY] = HintText(CustomMessage("Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from #[[1]]#!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ha ha ha... Du wirst mich nie besiegen, indem du meine Blitze zurückschlägst und die Pfeile aus #[[1]]# entfesselts!",
|
||||
/*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans #[[1]]#!",
|
||||
{QM_RED}));
|
||||
// /*spanish*/Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de #[[1]]#!
|
||||
|
||||
hintTextTable[RHT_GANONDORF_HINT_MS_ONLY] = HintText(CustomMessage("Ha ha ha... You'll never defeat me, drop a castle on me and finish me off with the sacred blade from #[[2]]#!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ha ha ha... Du wirst mich nie besiegen, wirf ein Schloss auf mich und beende mich mit dem heiligen Schwert von #[[2]]#!",
|
||||
/*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans l'Épée de Légende cachée dans #[[2]]#!",
|
||||
{QM_RED}));
|
||||
|
||||
hintTextTable[RHT_GANONDORF_HINT_LA_AND_MS] = HintText(CustomMessage("Ha ha ha... You'll never beat me by reflecting my lightning bolts and unleashing the arrows from #[[1]]#!"
|
||||
"^And even if you do, you'll never find the legendary blade hidden in #[[2]]#!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ha ha ha... Du wirst mich nie besiegen, indem du meine Blitze zurückschlägst und die Pfeile aus #[[1]]# entfesselts!"
|
||||
"^Und selbst wenn du es tust, wirst du nie das legendäre Schwert finden, das in #[[2]]# versteckt ist!",
|
||||
/*french*/ "Ha ha ha... Pauvre fou! Tu ne pourras jamais me vaincre sans les flèches que j'ai cachées dans #[[1]]#!"
|
||||
"^Et même si tu les trouves, tu ne touveras jamais l'Épée de Légende cachée dans #[[2]]#!",
|
||||
{QM_RED, QM_RED}));
|
||||
|
|
@ -2234,34 +2235,38 @@ void StaticData::HintTable_Init() {
|
|||
// ^E incluso si lo haces, nunca encontrarás la espada legendaria escondida en #[[2]]#!
|
||||
|
||||
hintTextTable[RHT_SHEIK_HINT_LA_ONLY] = HintText(CustomMessage("I overheard Ganondorf say that he misplaced the #Light Arrows# in #[[1]]#.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ich habe Ganondorf sagen hören, dass er die #Lichtpfeile# in #[[1]]# verlegt hat.",
|
||||
/*french*/ "J'ai entendu dire que Ganondorf aurait caché les #Flèches de Lumière# dans #[[1]]#.",
|
||||
{QM_YELLOW, QM_RED}));
|
||||
|
||||
hintTextTable[RHT_DAMPE_DIARY] = HintText(CustomMessage("Whoever reads this, please enter #[[1]]#. I will let you have my #stretching, shrinking keepsake#.^I'm waiting for you.&--Dampé",
|
||||
/*german*/ "Wer immer dies liest, der möge folgenden Ort aufsuchen: #[[1]]#. Ihm gebe ich meinen #dehnenden, schrumpfenden Schatz#.^Ich warte!&Boris", //RANDOTODO color in whatever refers to the hookshot
|
||||
/*german*/ "Wer immer dies liest, der möge folgenden Ort aufsuchen: #[[1]]#. Ihm gebe ich meinen #dehnenden, schrumpfenden Schatz#.^Ich warte!&Boris",
|
||||
/*french*/ "Toi qui lit ce journal, rends-toi dans #[[1]]#. Et peut-être auras-tu droit à mon précieux #trésor#.^Je t'attends...&--Igor",
|
||||
{QM_RED, QM_RED}));
|
||||
|
||||
hintTextTable[RHT_GREG_HINT] = HintText(CustomMessage("By the way, if you're interested, I saw the shiniest #Green Rupee# somewhere in #[[1]]#.^It's said to have #mysterious powers#...^But then, it could just be another regular rupee.&Oh well.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*french*/ "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des #Rubis Verts# quelque part à #[[1]]#. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.",//RANDOTODO color in mysterious powers
|
||||
/*german*/ "Übrigens, falls es dich interessiert, ich habe irgendwo in #[[1]]# den glänzendsten #Grünen Rubinen# gesehen.^Es soll #mysteriöse Kräfte# haben...^Aber na ja, es könnte auch einfach nur ein normaler Rubin sein. Tja",
|
||||
/*french*/ "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des #Rubis Verts# quelque part à #[[1]]#.^On dit qu'il possède des #pouvoirs mystérieux#...^Mais bon, ça pourrait juste être un autre rubis ordinaire.",
|
||||
{QM_GREEN, QM_RED, QM_RED}));
|
||||
|
||||
hintTextTable[RHT_SARIA_TALK_HINT] = HintText(CustomMessage("Did you feel the #surge of magic# recently? A mysterious bird told me it came from #[[1]]#.^You should check that place out, @!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!",
|
||||
{QM_GREEN, QM_RED}));
|
||||
/*german*/ "Hast du kürzlich den #Magieschub# gespürt? Ein geheimnisvoller Vogel hat mir erzählt, dass er aus #[[1]]# kam.^Du solltest dir diesen Ort mal ansehen, @!",
|
||||
/*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#.^Tu devrais aller y jeter un coup d'oeil, @!",
|
||||
{QM_GREEN, QM_RED}));
|
||||
|
||||
hintTextTable[RHT_SARIA_SONG_HINT] = HintText(CustomMessage("Did you feel the #surge of magic# recently? A mysterious bird told me it came from #[[1]]#.^You should check that place out, @!\x0B",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!\x0B",
|
||||
{QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
|
||||
/*german*/ "Hast du kürzlich den #Magieschub# gespürt? Ein geheimnisvoller Vogel hat mir erzählt, dass er aus #[[1]]# kam.^Du solltest dir diesen Ort mal ansehen, @!\x0B",
|
||||
/*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#.^Tu devrais aller y jeter un coup d'oeil, @!\x0B",
|
||||
{QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
|
||||
|
||||
hintTextTable[RHT_LOACH_HINT] = HintText(CustomMessage("What?^You wanna know about the&%rHyrule Loach%w?^It's a big fish, but it's so rare that I'll give my %g[[1]]%w to anyone who catches it. Seriously!",
|
||||
{QM_RED}));
|
||||
/*german*/ "Was?^Du willst was über den&%rHyrule-Schleicher%w wissen?^Das ist ein riesiger Fisch, aber&so selten, dass ich jedem mein&%g[[1]]%w gebe, der ihn fängt.&Im Ernst."
|
||||
/*french*/ "Quoi?&Tu veux en savoir plus sur le&%rBrochet d'Hyrule%w?^C'est un gros poisson, mais il&est si rare que je donne&%g[[1]]%w&à celui qui l'attrape.^Ouais, j'suis sérieux!",
|
||||
{QM_RED}));
|
||||
|
||||
hintTextTable[RHT_FISHING_POLE_HINT] = HintText(CustomMessage("^If I remember correctly, I lost it somewhere in #[[1]]#...&Let me know if you find it!",
|
||||
/*german*/ "Wenn ich mich recht erinnere,&hab ich es irgendwo in #[[1]]#&verloren...&Sag mir Bescheid, wenn du es findest."
|
||||
/*french*/ "Si je me souviens bien, il me&semble que je l'ai perdue&quelque part dans&#[[1]]#...^Fais-moi signe si jamais&tu la trouves!",
|
||||
{QM_RED}));
|
||||
|
||||
/*--------------------------
|
||||
|
|
@ -2272,49 +2277,89 @@ void StaticData::HintTable_Init() {
|
|||
/*german*/ "Zu&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK&No#",
|
||||
/*french*/ "Se téléporter vers&#[[1]]#?&" + TWO_WAY_CHOICE() + "#OK!&Non#",
|
||||
{QM_RED, QM_GREEN}));
|
||||
|
||||
|
||||
/*--------------------------
|
||||
| STATIC LOCATION HINTS |
|
||||
---------------------------*/
|
||||
|
||||
/*--------------------------
|
||||
| STATIC LOCATION HINTS |
|
||||
---------------------------*/
|
||||
|
||||
hintTextTable[RHT_HBA_HINT_SIGN] = HintText(CustomMessage("#Horseback Archery# Range Prizes:&1000: #[[1]]#&1500: #[[2]]#^@'s Record: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
|
||||
/*german*/ "#Bogenschießen zu Pferde#&Schießstandpreise:&1000: #[[1]]#&1500: #[[2]]#^@'s Record: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
|
||||
/*french*/ "Récompenses de l'#Archerie Montée#:&1000: #[[1]]#&1500: #[[2]]#^Record de @: #" + CustomMessage::POINTS(HS_HORSE_ARCHERY) + "#",
|
||||
{QM_RED, QM_GREEN, QM_GREEN, QM_GREEN}, {}, TEXTBOX_TYPE_WOODEN));
|
||||
|
||||
hintTextTable[RHT_HBA_HINT_NOT_ON_HORSE] = HintText(CustomMessage("Hey, rookie!&Come back on your #horse# and take on then #Horseback Archery# challenge!^"
|
||||
hintTextTable[RHT_HBA_HINT_NOT_ON_HORSE] = HintText(CustomMessage("Hey, rookie!&Come back on your #horse# and take on the #Horseback Archery# challenge!^"
|
||||
"Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for #[[2]]#!",
|
||||
/*german*/ "Hey, Neuling!&Komm mit deinem #Pferd# zurück und stell dich der #Pferdebogenschießen#-Herausforderung!^"
|
||||
"Beeindruck mich mit 1000 Punkten und gewinne #[[1]]#! Oder hol dir 1500 Punkte für #[[2]]#!",
|
||||
/*french*/ "Hé, l'nouveau!&Reviens avec ton #cheval# et essaie notre #Terrain d'Archerie Montée#^"
|
||||
"Impressionne-moi avec un score de 1000 pour gagner #[[1]]# ou atteins 1500 pour #[[2]]#!",
|
||||
{QM_RED, QM_RED, QM_GREEN, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_HBA_HINT_INITIAL] = HintText(CustomMessage("Hey, rookie!&Want to take on the #Horseback Archery# challenge?^"
|
||||
"Impress me with a high score of 1000 to win a #[[1]]# or score 1500 for #[[2]]#!\x0B",
|
||||
/*german*/ "Hey, Neuling!&Willst du dich der #Pferdebogenschießen#-Herausforderung stellen?^"
|
||||
"Zeig, was du drauf hast - hol 1000 Punkte für #[[1]]#! Oder knack die 1500 und kassier #[[2]]#!\x0B",
|
||||
/*french*/ "Hé, l'nouveau!&Tu veux essayer notre #Terrain d'Archerie Montée#^"
|
||||
"Impressionne-moi avec un score de 1000 pour gagner #[[1]]# ou atteins 1500 pour #[[2]]#!\x0B",
|
||||
{QM_RED, QM_GREEN, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_HBA_HINT_HAVE_1000] = HintText(CustomMessage("Hey, newcomer!&Want to take on the #Horseback Archery# challenge?^"
|
||||
"Prove yourself to be a horsemaster by scoring 1500 points to win #[[2]]#!\x0B",
|
||||
/*german*/ "Hey, Neuling!&Willst du dich der #Pferdebogenschießen#-Herausforderung stellen?^"
|
||||
"Beweise dein Können als Reitmeister - hol 1500 Punkte und gewinne #[[2]]#!\x0B",
|
||||
/*french*/ "Hé, l'nouveau!&Tu veux essayer notre #Terrain d'Archerie Montée#^"
|
||||
"Prouve que tu es un véritable cavalier en obtenant 1500 points pour gagner #[[2]]#!\x0B",
|
||||
{QM_RED, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_MALON_HINT_HOW_IS_EPONA] = HintText(CustomMessage("@! You should come back with Epona and try to beat my time on the #Obstacle Course#!^"
|
||||
"If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
|
||||
/*german*/ "@! Du solltest mit Epona zurückkommen und versuchen, meine Zeit im #Hindernisparcours# zu schlagen!^"
|
||||
"Wenn du meine Zeit schlägst, gebe ich dir meine #Lieblingskuh# Elsie und ihr Spielzeug #[[1]]#!",
|
||||
/*french*/ "@! Tu devrais revenir avec Epona et essayer de battre mon temps sur le #Parcours d'Obstacles#!^"
|
||||
"Si tu bats mon temps, je te donnerai ma vache préférée, Elsie, ainsi que son jouet #[[1]]#!",
|
||||
{QM_RED, QM_BLUE, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_MALON_HINT_OBSTICLE_COURSE] = HintText(CustomMessage("How about trying the #Obstacle Course?# If you beat my time I'll let you keep my favourite #cow# Elsie and her toy #[[1]]#!^"
|
||||
"Challenge the #Obstacle Course?#&\x1B&#Let's go&No thanks#",
|
||||
/*german*/ "Wie wärs mit dem #Hindernisparcours#? Wenn du meine Zeit schlägst, lasse ich dir meine #LieblingsKuh# Elsie und ihr Spielzeug #[[1]]#!^"
|
||||
"Herausforderung: #Hindernisparcours?#&\x1B&#Los geht's!&nein, danke#",
|
||||
/*french*/ "Que dirais-tu d'essayer le #Parcours d'Obstacles#? Si tu bats mon temps, je te donnerai ma vache préférée, Elsie, et son jouet #[[1]]#!^"
|
||||
"Tenter le #Parcours d'Obstacles#?&\x1B&#Allons-y&Non merci#",
|
||||
{QM_RED, QM_BLUE, QM_GREEN, QM_RED, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_MALON_HINT_TURNING_EVIL] = HintText(CustomMessage("@? Is that you? ^If I ran the ranch, I'd build an #Obstacle Course#, and whoever gets the best time would win a #cow#!^"
|
||||
"Elsie loves sharing her #[[1]]# with new people, It'll be fun!^...But Ingo won't let me...",
|
||||
/*german*/ "@? Bist du das? ^Wenn ich die Ranch leiten würde, würde ich einen #Hindernisparcours# bauen, und wer die beste Zeit schafft, gewinnt eine #Kuh#!^"
|
||||
"Elsie liebt es, ihr #[[1]]# mit neuen Leuten zu teilen. Es wird Spaß machen^...Aber Ingo lässt mich nicht",
|
||||
/*french*/ "@? C'est toi?^Si je dirigeais le ranch, je construirais un #Parcours d'Obstacles#, et celui qui obtiendrait le meilleur temps gagnerait une #vache#!^"
|
||||
"Elsie adore partager son #[[1]]# avec de nouvelles personnes, ce serait amusant!^... Mais Ingo ne me laisse pas faire...",
|
||||
{QM_RED, QM_BLUE, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_MALON_HINT_INGO_TEMPTED] = HintText(CustomMessage("@! You should come back in the morning and try to beat my time on the #Obstacle Course#!^"
|
||||
"If you beat my time, I'll give you my favourite #cow# Elsie and her toy #[[1]]#!",
|
||||
/*german*/ "@! Du solltest morgens zurückkommen und versuchen, meine Zeit im #Hindernisparcours# zu schlagen!^"
|
||||
"Wenn du meine Zeit schlägst, gebe ich dir meine #Lieblingskuh# Elsie und ihr Spielzeug #[[1]]#!",
|
||||
/*french*/ "@! Tu devrais revenir le matin et essayer de battre mon temps sur le #Parcours d'Obstacles#!^"
|
||||
"Si tu bats mon temps, je te donnerai ma vache préférée, Elsie, ainsi que son jouet #[[1]]#!",
|
||||
{QM_RED, QM_BLUE, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_CHICKENS_HINT] = HintText(CustomMessage("You! Please!&Bring my Cucco's back to my pen!&I'll give you my #[[1]]#!",
|
||||
/*german*/ "Du! Bitte!&Bring meine Hühner zurück in ihren&Stall! Ich gebe dir meine #[[1]]#!",
|
||||
/*french*/ "Mes Cocottes sont perdues!&Dépose toutes les cocottes dans cet enclos!&Je te donnerai #[[1]]#!",
|
||||
{QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_BIG_POES_HINT] = HintText(CustomMessage("You have #\x1E\x01 Poe Points#! Reach 1000 and you'll get a #[[1]]#!",
|
||||
/*german*/ "Du hast #\x1E\x01 Nachtschwärmer-Punkte#! Erreiche 1000 und du bekommst ein #[[1]]#!",
|
||||
/*french*/ "Tu as #\x1E\x01 Points d'Âme#! Atteins 1000 et tu recevras #[[1]]#!",
|
||||
{QM_YELLOW, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_BIGGORON_HINT] = HintText(CustomMessage("Arrrrrre you here to claim my finest #[[1]]#? Shoooooow me your #Claim Check#.",
|
||||
/*german*/ "Arrrrr, bist du hier, um mein feinsten #[[1]]# zu beanspruchen? Zeig mir deinen #Zertifikat#!"
|
||||
/*french*/ "Eeeeeees-tu ici pour réclaaaaaamer mon plus beau #[[1]]#? Moooooontre-moi ton #Certificat#.",
|
||||
{QM_GREEN, QM_RED}));
|
||||
|
||||
hintTextTable[RHT_FROGS_HINT] = HintText(CustomMessage("Some frogs holding #[[1]]# are looking at you from underwater...",
|
||||
|
|
@ -2323,6 +2368,8 @@ void StaticData::HintTable_Init() {
|
|||
{QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_OOT_HINT] = HintText(CustomMessage("Bring the #Spiritual Stones# to the past so you can receive #[[1]]# from Zelda and learn #[[2]]#!",
|
||||
/*german*/ "Bringe die #Spirituellen Steine# in die Vergangenheit, damit du #[[1]]# von Zelda erhältst und #[[2]]#! lernst",
|
||||
/*french*/ "Amène les #Pierres Spirituelles# dans le passé et Zelda te donnera #[[1]]# et t'apprendra #[[2]]# !",
|
||||
{QM_BLUE, QM_GREEN, QM_GREEN}));
|
||||
|
||||
hintTextTable[RHT_SKULLS_HINT] = HintText(CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying #[[d]] Spiders of the Curse# and I will give you my #[[1]]#!",
|
||||
|
|
@ -2332,6 +2379,10 @@ void StaticData::HintTable_Init() {
|
|||
|
||||
hintTextTable[RHT_MASK_SHOP_HINT] = HintText(CustomMessage("Some young scrubs in the #Deku Theatre# love seeing Masks!^"
|
||||
"They'll give you #[[1]]# if you show them the #Skull Mask#, and #[[2]]# if you show them the #Mask of Truth#!",
|
||||
/*german*/ "Ein paar junge Gören in der #Waldbühne# lieben es, Masken zu sehen!^"
|
||||
"Sie geben dir #[[1]]#, wenn du ihnen die #Schädel-Maske# zeigst, und #[[2]]#, wenn du ihnen die #Maske des Wissens# zeigst!",
|
||||
/*french*/ "De jeunes Pestes Mojo qui se trouvent dans le #Théâtre Mojo# adorent voir des masques !^"
|
||||
"Elles te donneront #[[1]]# si tu leur montres le #Masque de Mort#, et #[[2]]# si tu leur montres le #Masque de Vérité#.",
|
||||
{QM_GREEN, QM_GREEN, QM_RED, QM_GREEN, QM_RED}));
|
||||
|
||||
/*--------------------------
|
||||
|
|
@ -2339,33 +2390,34 @@ void StaticData::HintTable_Init() {
|
|||
---------------------------*/
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE01] = HintText(CustomMessage("Oh! It's @.&I was expecting someone called Sheik.&Do you know what happened to them?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Oh! Da ist @.&Ich hatte eigentlich jemanden namens&Sheik erwartet. Weißt du, was mit&ihnen passiert ist?",
|
||||
/*french*/ "Ah, c'est @.&J'attendais un certain Sheik.&Tu sais ce qui lui est arrivé?"));
|
||||
// /*spanish*/¡Oh! Pero si es @.&Estaba esperando a alguien llamado Sheik. ¿Sabes qué puede haberle pasado?
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE02] = HintText(CustomMessage("I knew I shouldn't have put the key on the other side of my door.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ich wusste, dass ich den Schlüssel nicht auf der anderen Seite meiner Tür legen sollte.",
|
||||
/*french*/ "J'aurais dû garder la clé ici. Hélas..."));
|
||||
// /*spanish*/Sabía que no tendría que haber dejado la llave al otro lado de la puerta.
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE03] = HintText(CustomMessage("Looks like it's time for a round of tennis.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Sieht so aus, als wäre es Zeit für eine Runde Tennis.",
|
||||
/*french*/ "C'est l'heure de jouer au tennis."));
|
||||
// /*spanish*/Parece que es hora de una pachanga de tenis.
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE04] = HintText(CustomMessage("You'll never deflect my bolts of energy with your sword, then shoot me with those Light Arrows you happen to have.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Du wirst meine Energiestrahlen nie mit deinem Schwert abwehren und mich dann mit den Lichtpfeilen beschießen, die du zufällig hast.",
|
||||
/*french*/ "Ne perds pas ton temps à frapper mes éclairs d'énergie avec ton épée et me tirer avec tes flèches de Lumière!"));
|
||||
// /*spanish*/Nunca reflejarás mis esferas de energía con tu espada, para después dispararme con las flechas de luz que tendrás.
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE05] = HintText(CustomMessage("Why did I leave my trident back in the desert?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Warum habe ich meinen Dreizack wieder in der Wüste gelassen?",
|
||||
/*french*/ "Sale bêtise... Et j'ai oublié mon trident dans le désert!"));
|
||||
// /*spanish*/Santa Hylia... ¿Por qué me habré dejado el tridente en el desierto?
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE06] = HintText(CustomMessage("Zelda is probably going to do something stupid, like send you back to your own timeline.^So this is "
|
||||
"quite meaningless. Do you really want to save this moron?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Zelda wird wahrscheinlich wieder etwas Dummes tun, wie dich zurück in deine eigene Timeline schicken "
|
||||
"^Das ist also ziemlich bedeutungslos. Willst du wirklich diese Idiotin retten?",
|
||||
/*french*/ "Même si je suis vaincu... Zelda te renverra dans ton ère, et je reviendrai conquérir!^Telle est la "
|
||||
"prophécie d'Hyrule Historia!"));
|
||||
// /*spanish*/Seguro que Zelda trata de hacer alguna tontería, como enviarte de vuelta a tu línea temporal.^No tiene
|
||||
|
|
@ -2373,30 +2425,31 @@ void StaticData::HintTable_Init() {
|
|||
|
||||
hintTextTable[RHT_GANON_JOKE07] = HintText(CustomMessage("What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the "
|
||||
"hungry,&and my castle floats.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Was an Zelda lässt dich glauben&sie wäre eine bessere&Herrscherin als ich?^Ich rettete die Lon Lon Ranch,&fütterte die Hungrigen"
|
||||
"&und mein Schloss schwebt.",
|
||||
/*french*/ "Zelda ne sera jamais un meilleur monarque que moi!^J'ai un château volant, mes sujets sont des belles "
|
||||
"amazones... et mes Moblins sont clairement plus puissants que jamais!"));
|
||||
// /*spanish*/¿Qué te hace pensar que Zelda gobierna mejor que yo?^Yo he salvado el Rancho Lon Lon,&he alimentado a
|
||||
// los hambrientos&y hasta hago que mi castillo flote.
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE08] = HintText(CustomMessage("I've learned this spell,&it's really neat,&I'll keep it later&for your treat!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Ich hab' diesen Zauber gelernt,&er ist wirklich ziemlich fein,&ich heb' ihn auf für später,&und dann soll er dein Geschenk sein!",
|
||||
/*french*/ "Gamin, ton destin achève,&sous mon sort tu périras!&Cette partie ne fut pas brève,&et cette mort, tu subiras!"));
|
||||
// /*spanish*/Veamos ahora que harás,&la batalla ha de comenzar,&te enviaré de una vez al más allá,&¿listo para
|
||||
// afrontar la verdad?
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE09] = HintText(CustomMessage("Many tricks are up my sleeve,&to save yourself&you'd better leave!",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Viele Tricks hab' ich im Gepäck,&und um dich zu retten,&solltest du lieber weg.",
|
||||
/*french*/ "Sale petit garnement,&tu fais erreur!&C'est maintenant que marque&ta dernière heure!"));
|
||||
// /*spanish*/¿No osarás a mí enfrentarte?&Rimas aparte,&¡voy a matarte!
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE10] = HintText(CustomMessage("After what you did to Koholint Island, how can you call me the bad guy?",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Nach dem, was du auf Insel Cocolint getan hast, wie kannst du mich da den Bösewicht nennen?",
|
||||
/*french*/ "J'admire ce que tu as fait à l'Île Koholint... Toi et moi, nous devrions faire équipe!"));
|
||||
// /*spanish*/Después de lo que le hiciste a la Isla Koholint, ¿cómo te atreves a llamarme malvado?
|
||||
|
||||
hintTextTable[RHT_GANON_JOKE11] = HintText(CustomMessage("Today, let's begin down&'The Hero is Defeated' timeline.",
|
||||
/*german*/ TODO_TRANSLATE,
|
||||
/*german*/ "Heute beginnen wir in der&‚Der Held ist besiegt‘-Timeline",
|
||||
/*french*/ "Si tu me vaincs, Hyrule sera englouti... mais si tu meurs, on aura A Link to the Past, le meilleur opus "
|
||||
"de la série!"));
|
||||
// /*spanish*/Hoy daremos lugar a la línea temporal del Héroe Derrotado.&¡Prepárate para el culmen de esta saga!
|
||||
|
|
@ -2404,13 +2457,15 @@ void StaticData::HintTable_Init() {
|
|||
/*--------------------------
|
||||
| Misc utilities |
|
||||
---------------------------*/
|
||||
|
||||
|
||||
hintTextTable[RHT_YOUR_POCKET] = HintText(CustomMessage("your pocket",
|
||||
/*german*/ "deine Tasche",
|
||||
/*french*/ "tes poches"));
|
||||
// /*spanish*/tu bolsillo
|
||||
|
||||
hintTextTable[RHT_ISOLATED_PLACE] = HintText(CustomMessage("an Isolated Place"));
|
||||
hintTextTable[RHT_ISOLATED_PLACE] = HintText(CustomMessage("an Isolated Place",
|
||||
/*german*/ "ein abgelegener Ort",
|
||||
/*french*/ "un lieu isolé"));
|
||||
|
||||
hintTextTable[RHT_DUNGEON_ORDINARY] = HintText(CustomMessage(" It's ordinary.",
|
||||
/*german*/ "&Sieht aus wie immer.",
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
|
|||
hintTextTable[RHT_DEKU_TREE_GRASS] = HintText(CustomMessage("They say that some #grass in the Deku Tree# hides #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß etwas #Gras im Deku-Baum# #[[1]]# verstecke.",
|
||||
/*french*/ "Selon moi, de l'#herbe dans l'Arbre Mojo# cache #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
||||
|
||||
hintTextTable[RHT_CRATE_DEKU_TREE] = HintText(CustomMessage("They say that a #crate in the Deku Tree# contains #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß eine #Kiste im Deku-Baum# #[[1]]# enthielte.",
|
||||
/*french*/ "Selon moi, une #caisse dans l'Arbre Mojo# contient #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
|
@ -475,7 +475,7 @@ void StaticData::HintTable_Init_Exclude_Dungeon() {
|
|||
hintTextTable[RHT_JABU_JABUS_BELLY_GRASS] = HintText(CustomMessage("They say that some #grass in Jabu Jabu's Belly# hides #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß etwas #Gras in Jabu-Jabus Bauch# #[[1]]# verstecke.",
|
||||
/*french*/ "Selon moi, de l'#herbe dans le Ventre de Jabu-Jabu# cache #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
||||
|
||||
hintTextTable[RHT_CRATE_JABU_JABU] = HintText(CustomMessage("They say that a #crate in Jabu Jabu's Belly# contains #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß eine #Kiste in Jabu-Jabus Bauch# #[[1]]# enthielte.",
|
||||
/*french*/ "Selon moi, une #caisse dans le Ventre de Jabu-Jabu# contient #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
|
|||
/*french*/ "Selon moi, #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
// /*spanish*/ Según dicen, #[[1]]#.
|
||||
|
||||
|
||||
|
||||
hintTextTable[RHT_GC_ROLLING_GORON_AS_ADULT] = HintText(CustomMessage("They say that #reassuring a young Goron# is rewarded with #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß das #Beruhigen eines jungen Goronen# mit #[[1]]# belohnt würde.",
|
||||
/*french*/ "Selon moi, #rassurer un jeune Goron# donne #[[1]]#.", {QM_RED, QM_GREEN}),
|
||||
|
|
@ -1936,7 +1936,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
|
|||
hintTextTable[RHT_DMC_UPPER_GROTTO_GOSSIP_STONE_FAIRY_BIG] = HintText(CustomMessage("They say that #playing a stormy tune for an odd stone within the side of a crater# reveals #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß das #Spielen einer stürmischen Melodie für einen seltsamen Stein innerhalb der Seite eines Kraters# #[[1]]# enthülle.",
|
||||
/*french*/ "Selon moi, #jouer une mélodie orageuse pour une pierre étrange dans le côté d'un cratère# révèle [[1]].", {QM_RED, QM_GREEN}));
|
||||
|
||||
|
||||
hintTextTable[RHT_LH_ISLAND_SUN_FAIRY] = HintText(CustomMessage("They say that #summoning the sun on the lake's island# calls #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß das #Beschwören der Sonne auf der Insel eines Sees# #[[1]]# anrufe.",
|
||||
/*french*/ "Selon moi, #appeler le soleil sur l'île du lac # révèle #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
|
@ -2012,7 +2012,7 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
|
|||
hintTextTable[RHT_GROTTO_GRASS] = HintText(CustomMessage("They say that #cutting some grass in a grotto# reveals #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß das #Schneiden einiger Gräser in einer Grotte# #[[1]]# enthülle.",
|
||||
/*french*/ "Selon moi, de l'#herbe# cache #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
||||
|
||||
hintTextTable[RHT_CRATE_GERUDO_VALLEY] = HintText(CustomMessage("They say that a #crate in Gerudo Valley# contains #[[1]]#.",
|
||||
/*german*/ "Man erzählt sich, daß eine #Kiste im Gerudotal# #[[1]]# enthielte.",
|
||||
/*french*/ "Selon moi, une #caisse dans une vallée# a #[[1]]#.", {QM_RED, QM_GREEN}));
|
||||
|
|
|
|||
|
|
@ -2097,7 +2097,7 @@ void StaticData::HintTable_Init_Item() {
|
|||
},
|
||||
{ CustomMessage("a master unlocker", /*german*/ "ein Meisterentsperrer", /*french*/ "un Kit de Déverrouillage") });
|
||||
// /*spanish*/un desbloqueador maestro
|
||||
|
||||
|
||||
//RANDOTODO if these are ever used for anything other than name, they want abscure and ambiguous hints
|
||||
hintTextTable[RHT_QUIVER_INF] = HintText(CustomMessage("an infinite Quiver", /*german*/"ein unendlicher Köcher", /*french*/"un Carquois Infini"));
|
||||
|
||||
|
|
@ -2136,7 +2136,7 @@ void StaticData::HintTable_Init_Item() {
|
|||
|
||||
hintTextTable[RHT_MYSTERIOUS_ITEM] = HintText(CustomMessage("mysterious item", /*german*/"mysteriöser Gegenstand", /*french*/"objet mystérieux"));
|
||||
// /*spanish*/algo misterioso
|
||||
|
||||
|
||||
hintTextTable[RHT_MYSTERIOUS_ITEM_CAPITAL] = HintText(CustomMessage("Mysterious Item", /*german*/"Mysteriöser Gegenstand", /*french*/"Objet Mystérieux"));
|
||||
// /*spanish*/Algo Misterioso
|
||||
|
||||
|
|
|
|||
|
|
@ -11,29 +11,30 @@
|
|||
#include "../../custom-message/CustomMessageManager.h"
|
||||
|
||||
struct HintDistributionSetting {
|
||||
std::string name;
|
||||
HintType type;
|
||||
uint32_t weight;
|
||||
uint8_t fixed;
|
||||
uint8_t copies;
|
||||
std::function<bool(RandomizerCheck)> filter;
|
||||
uint8_t dungeonLimit;
|
||||
std::string name;
|
||||
HintType type;
|
||||
uint32_t weight;
|
||||
uint8_t fixed;
|
||||
uint8_t copies;
|
||||
std::function<bool(RandomizerCheck)> filter;
|
||||
uint8_t dungeonLimit;
|
||||
|
||||
HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies,
|
||||
std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
|
||||
HintDistributionSetting(std::string _name, HintType _type, uint32_t _weight, uint8_t _fixed, uint8_t _copies,
|
||||
std::function<bool(RandomizerCheck)> _filter, uint8_t _dungeonLimit = 40);
|
||||
};
|
||||
|
||||
struct HintSetting {
|
||||
uint8_t alwaysCopies;
|
||||
uint8_t trialCopies;
|
||||
uint8_t junkWeight;
|
||||
std::vector<HintDistributionSetting> distTable;
|
||||
uint8_t alwaysCopies;
|
||||
uint8_t trialCopies;
|
||||
uint8_t junkWeight;
|
||||
std::vector<HintDistributionSetting> distTable;
|
||||
};
|
||||
|
||||
class HintText {
|
||||
public:
|
||||
public:
|
||||
HintText() = default;
|
||||
HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {}, std::vector<CustomMessage> obscureText_ = {});
|
||||
HintText(CustomMessage clearText_, std::vector<CustomMessage> ambiguousText_ = {},
|
||||
std::vector<CustomMessage> obscureText_ = {});
|
||||
const CustomMessage& GetClear() const;
|
||||
const CustomMessage& GetObscure() const;
|
||||
const CustomMessage& GetObscure(uint8_t selection) const;
|
||||
|
|
@ -46,27 +47,28 @@ public:
|
|||
bool operator==(const HintText& right) const;
|
||||
bool operator!=(const HintText& right) const;
|
||||
|
||||
private:
|
||||
private:
|
||||
CustomMessage clearText;
|
||||
std::vector<CustomMessage> ambiguousText = {};
|
||||
std::vector<CustomMessage> obscureText = {};
|
||||
};
|
||||
|
||||
struct StaticHintInfo{
|
||||
HintType type;
|
||||
std::vector<RandomizerHintTextKey> hintKeys;
|
||||
RandomizerSettingKey setting;
|
||||
std::variant<bool, uint8_t> condition;
|
||||
std::vector<RandomizerCheck> targetChecks;
|
||||
std::vector<RandomizerGet> targetItems;
|
||||
std::vector<RandomizerCheck> hintChecks;
|
||||
bool yourPocket;
|
||||
int num;
|
||||
struct StaticHintInfo {
|
||||
HintType type;
|
||||
std::vector<RandomizerHintTextKey> hintKeys;
|
||||
RandomizerSettingKey setting;
|
||||
std::variant<bool, uint8_t> condition;
|
||||
std::vector<RandomizerCheck> targetChecks;
|
||||
std::vector<RandomizerGet> targetItems;
|
||||
std::vector<RandomizerCheck> hintChecks;
|
||||
bool yourPocket;
|
||||
int num;
|
||||
|
||||
StaticHintInfo() = default;
|
||||
StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting, std::variant<bool, uint8_t> _condition,
|
||||
std::vector<RandomizerCheck> _targetChecks, std::vector<RandomizerGet> _targetItems = {},
|
||||
std::vector<RandomizerCheck> _hintChecks = {}, bool _yourPocket = false, int _num = 0);
|
||||
StaticHintInfo() = default;
|
||||
StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey> _hintKeys, RandomizerSettingKey _setting,
|
||||
std::variant<bool, uint8_t> _condition, std::vector<RandomizerCheck> _targetChecks,
|
||||
std::vector<RandomizerGet> _targetItems = {}, std::vector<RandomizerCheck> _hintChecks = {},
|
||||
bool _yourPocket = false, int _num = 0);
|
||||
};
|
||||
|
||||
RandomizerHintTextKey GetRandomJunkHint();
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@
|
|||
#define DELETE_PRESET 6
|
||||
#define RESET_TO_DEFAULTS 8
|
||||
|
||||
bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
|
||||
bool GenerateRandomizer(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
|
||||
std::string seedInput);
|
||||
|
|
@ -4,6 +4,8 @@
|
|||
#include "../context.h"
|
||||
|
||||
namespace Playthrough {
|
||||
int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks);
|
||||
int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, int count = 1);
|
||||
}
|
||||
int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
|
||||
std::set<RandomizerTrick> enabledTricks);
|
||||
int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
|
||||
int count = 1);
|
||||
} // namespace Playthrough
|
||||
|
|
|
|||
|
|
@ -5,38 +5,35 @@
|
|||
#include <iostream>
|
||||
#include <iterator>
|
||||
|
||||
template <typename T, typename Predicate>
|
||||
static void erase_if(std::vector<T>& vector, Predicate pred) {
|
||||
vector.erase(std::remove_if(begin(vector), end(vector), pred), end(vector));
|
||||
template <typename T, typename Predicate> static void erase_if(std::vector<T>& vector, Predicate pred) {
|
||||
vector.erase(std::remove_if(begin(vector), end(vector), pred), end(vector));
|
||||
}
|
||||
|
||||
template <typename T, typename Predicate>
|
||||
std::vector<T> FilterFromPool(std::vector<T>& vector, Predicate pred, bool eraseAfterFilter = false) {
|
||||
std::vector<T> filteredPool = {};
|
||||
std::copy_if(vector.begin(), vector.end(), std::back_inserter(filteredPool), pred);
|
||||
std::vector<T> filteredPool = {};
|
||||
std::copy_if(vector.begin(), vector.end(), std::back_inserter(filteredPool), pred);
|
||||
|
||||
if (eraseAfterFilter) {
|
||||
erase_if(vector, pred);
|
||||
}
|
||||
if (eraseAfterFilter) {
|
||||
erase_if(vector, pred);
|
||||
}
|
||||
|
||||
return filteredPool;
|
||||
return filteredPool;
|
||||
}
|
||||
|
||||
template <typename T, typename Predicate>
|
||||
std::vector<T> FilterAndEraseFromPool(std::vector<T>& vector, Predicate pred) {
|
||||
return FilterFromPool(vector, pred, true);
|
||||
return FilterFromPool(vector, pred, true);
|
||||
}
|
||||
|
||||
template <typename T, typename FromPool>
|
||||
void AddElementsToPool(std::vector<T>& toPool, const FromPool& fromPool) {
|
||||
toPool.insert(toPool.end(), std::cbegin(fromPool), std::cend(fromPool));
|
||||
template <typename T, typename FromPool> void AddElementsToPool(std::vector<T>& toPool, const FromPool& fromPool) {
|
||||
toPool.insert(toPool.end(), std::cbegin(fromPool), std::cend(fromPool));
|
||||
}
|
||||
|
||||
template <typename T, typename Container>
|
||||
bool ElementInContainer(T& element, const Container& container) {
|
||||
return std::find(container.begin(), container.end(), element) != container.end();
|
||||
template <typename T, typename Container> bool ElementInContainer(T& element, const Container& container) {
|
||||
return std::find(container.begin(), container.end(), element) != container.end();
|
||||
}
|
||||
|
||||
template <typename First, typename... T> bool IsAnyOf(First&& first, T&&... t) {
|
||||
return ((first == t) || ...);
|
||||
return ((first == t) || ...);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,5 +3,6 @@
|
|||
|
||||
#include <set>
|
||||
namespace RandoMain {
|
||||
void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks, std::string seedInput);
|
||||
void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
|
||||
std::string seedInput);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,8 @@ void Random_Init(uint32_t seed);
|
|||
uint32_t Random(int min, int max);
|
||||
double RandomDouble();
|
||||
|
||||
//Get a random element from a vector or array
|
||||
template <typename T>
|
||||
T RandomElement(std::vector<T>& vector, bool erase) {
|
||||
// Get a random element from a vector or array
|
||||
template <typename T> T RandomElement(std::vector<T>& vector, bool erase) {
|
||||
const auto idx = Random(0, vector.size());
|
||||
const T selected = vector[idx];
|
||||
if (erase) {
|
||||
|
|
@ -21,17 +20,14 @@ T RandomElement(std::vector<T>& vector, bool erase) {
|
|||
}
|
||||
return selected;
|
||||
}
|
||||
template <typename Container>
|
||||
auto& RandomElement(Container& container) {
|
||||
template <typename Container> auto& RandomElement(Container& container) {
|
||||
return container[Random(0, std::size(container))];
|
||||
}
|
||||
template <typename Container>
|
||||
const auto& RandomElement(const Container& container) {
|
||||
template <typename Container> const auto& RandomElement(const Container& container) {
|
||||
return container[Random(0, std::size(container))];
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
const T RandomElementFromSet(const std::set<T>& set) {
|
||||
template <typename T> const T RandomElementFromSet(const std::set<T>& set) {
|
||||
if (set.size() == 1) {
|
||||
return *set.begin();
|
||||
}
|
||||
|
|
@ -44,19 +40,15 @@ const T RandomElementFromSet(const std::set<T>& set) {
|
|||
return *it;
|
||||
}
|
||||
|
||||
//Shuffle items within a vector or array
|
||||
//RANDOTODO There's probably a more efficient way to do what this does.
|
||||
template <typename T>
|
||||
void Shuffle(std::vector<T>& vector) {
|
||||
for (std::size_t i = 0; i + 1 < vector.size(); i++)
|
||||
{
|
||||
// Shuffle items within a vector or array
|
||||
// RANDOTODO There's probably a more efficient way to do what this does.
|
||||
template <typename T> void Shuffle(std::vector<T>& vector) {
|
||||
for (std::size_t i = 0; i + 1 < vector.size(); i++) {
|
||||
std::swap(vector[i], vector[Random(i, vector.size())]);
|
||||
}
|
||||
}
|
||||
template <typename T, std::size_t size>
|
||||
void Shuffle(std::array<T, size>& arr) {
|
||||
for (std::size_t i = 0; i + 1 < arr.size(); i++)
|
||||
{
|
||||
template <typename T, std::size_t size> void Shuffle(std::array<T, size>& arr) {
|
||||
for (std::size_t i = 0; i + 1 < arr.size(); i++) {
|
||||
std::swap(arr[i], arr[Random(i, arr.size())]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,16 +16,10 @@ struct PriceSettingsStruct {
|
|||
RandomizerSettingKey tycoonWallet;
|
||||
RandomizerSettingKey affordable;
|
||||
|
||||
PriceSettingsStruct(RandomizerSettingKey _main,
|
||||
RandomizerSettingKey _fixedPrice,
|
||||
RandomizerSettingKey _range1,
|
||||
RandomizerSettingKey _range2,
|
||||
RandomizerSettingKey _noWallet,
|
||||
RandomizerSettingKey _childWallet,
|
||||
RandomizerSettingKey _adultWallet,
|
||||
RandomizerSettingKey _giantWallet,
|
||||
RandomizerSettingKey _tycoonWallet,
|
||||
RandomizerSettingKey _affordable);
|
||||
PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice, RandomizerSettingKey _range1,
|
||||
RandomizerSettingKey _range2, RandomizerSettingKey _noWallet, RandomizerSettingKey _childWallet,
|
||||
RandomizerSettingKey _adultWallet, RandomizerSettingKey _giantWallet,
|
||||
RandomizerSettingKey _tycoonWallet, RandomizerSettingKey _affordable);
|
||||
};
|
||||
|
||||
extern void PlaceVanillaShopItems();
|
||||
|
|
@ -34,5 +28,3 @@ extern uint16_t GetRandomPrice(Rando::Location* loc, PriceSettingsStruct priceSe
|
|||
extern uint16_t GetCheapBalancedPrice();
|
||||
extern int GetShopsanityReplaceAmount();
|
||||
extern Text GetIceTrapName(uint8_t id);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,22 +7,20 @@
|
|||
#define SINGULAR 1
|
||||
|
||||
class Text {
|
||||
public:
|
||||
public:
|
||||
Text() = default;
|
||||
Text(std::string english_, std::string french_, std::string spanish_)
|
||||
: english(std::move(english_)),
|
||||
french(std::move(french_)),
|
||||
spanish(std::move(spanish_)),
|
||||
german(std::move("")) {
|
||||
// german defaults to english text until a translation is provided.
|
||||
german = english;
|
||||
}
|
||||
: english(std::move(english_)), french(std::move(french_)), spanish(std::move(spanish_)),
|
||||
german(std::move("")) {
|
||||
// german defaults to english text until a translation is provided.
|
||||
german = english;
|
||||
}
|
||||
Text(std::string english_, std::string french_, std::string spanish_, std::string german_)
|
||||
: english(std::move(english_)),
|
||||
french(std::move(french_)),
|
||||
spanish(std::move(spanish_)),
|
||||
german(std::move(german_)) {}
|
||||
Text(std::string english_) : english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {
|
||||
: english(std::move(english_)), french(std::move(french_)), spanish(std::move(spanish_)),
|
||||
german(std::move(german_)) {
|
||||
}
|
||||
Text(std::string english_)
|
||||
: english(std::move(english_)), french(std::move("")), spanish(std::move("")), german(std::move("")) {
|
||||
// default unprovided languages to english text
|
||||
french = spanish = german = english;
|
||||
}
|
||||
|
|
@ -54,24 +52,24 @@ public:
|
|||
|
||||
const std::string& GetForLanguage(uint8_t language) const {
|
||||
switch (language) {
|
||||
case 0: //LANGUAGE_ENG: changed to resolve #include loops
|
||||
case 0: // LANGUAGE_ENG: changed to resolve #include loops
|
||||
return GetEnglish();
|
||||
case 2: //LANGUAGE_FRA:
|
||||
case 2: // LANGUAGE_FRA:
|
||||
return GetFrench();
|
||||
case 1: //LANGUAGE_GER:
|
||||
case 1: // LANGUAGE_GER:
|
||||
return GetGerman();
|
||||
default:
|
||||
return GetEnglish();
|
||||
}
|
||||
}
|
||||
|
||||
Text operator+ (const Text& right) const {
|
||||
return Text{english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish(),
|
||||
german + right.GetGerman()};
|
||||
Text operator+(const Text& right) const {
|
||||
return Text{ english + right.GetEnglish(), french + right.GetFrench(), spanish + right.GetSpanish(),
|
||||
german + right.GetGerman() };
|
||||
}
|
||||
|
||||
Text operator+ (const std::string& right) const {
|
||||
return Text{english + right, french + right, spanish + right, german + right};
|
||||
Text operator+(const std::string& right) const {
|
||||
return Text{ english + right, french + right, spanish + right, german + right };
|
||||
}
|
||||
|
||||
bool operator==(const Text& right) const {
|
||||
|
|
@ -88,11 +86,11 @@ public:
|
|||
|
||||
void Replace(std::string oldStr, std::string newStr) {
|
||||
|
||||
for (std::string* str : {&english, &french, &spanish, &german}) {
|
||||
for (std::string* str : { &english, &french, &spanish, &german }) {
|
||||
size_t position = str->find(oldStr);
|
||||
while (position != std::string::npos) {
|
||||
str->replace(position, oldStr.length(), newStr);
|
||||
position = str->find(oldStr);
|
||||
str->replace(position, oldStr.length(), newStr);
|
||||
position = str->find(oldStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -123,15 +121,15 @@ public:
|
|||
// Convert first char to upper case
|
||||
Text Capitalize(void) const {
|
||||
Text cap = *this + "";
|
||||
for (std::string* str : {&cap.english, &cap.french, &cap.spanish, &cap.german}) {
|
||||
for (std::string* str : { &cap.english, &cap.french, &cap.spanish, &cap.german }) {
|
||||
(*str)[0] = std::toupper((*str)[0]);
|
||||
}
|
||||
return cap;
|
||||
}
|
||||
|
||||
//find the appropriate bars that separate singular from plural
|
||||
// find the appropriate bars that separate singular from plural
|
||||
void SetForm(int form) {
|
||||
for (std::string* str : {&english, &french, &spanish, &german}) {
|
||||
for (std::string* str : { &english, &french, &spanish, &german }) {
|
||||
|
||||
size_t firstBar = str->find('|');
|
||||
if (firstBar != std::string::npos) {
|
||||
|
|
@ -151,7 +149,7 @@ public:
|
|||
}
|
||||
}
|
||||
}
|
||||
//remove the remaining bar
|
||||
// remove the remaining bar
|
||||
this->Replace("|", "");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@ void Rando::StaticData::RegisterCrateLocations() {
|
|||
locationTable[RC_GV_CRATE_BRIDGE_3] = Location::NLCrate(RC_GV_CRATE_BRIDGE_3, RCQUEST_BOTH, RCAREA_GERUDO_VALLEY, SCENE_GERUDO_VALLEY, TWO_ACTOR_PARAMS(-860, -150), "Near Bridge Crate 3", RHT_CRATE_GERUDO_VALLEY, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_CRATE_BRIDGE_3));
|
||||
locationTable[RC_GV_CRATE_BRIDGE_4] = Location::NLCrate(RC_GV_CRATE_BRIDGE_4, RCQUEST_BOTH, RCAREA_GERUDO_VALLEY, SCENE_GERUDO_VALLEY, TWO_ACTOR_PARAMS(-860, -90), "Near Bridge Crate 4", RHT_CRATE_GERUDO_VALLEY, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_CRATE_BRIDGE_4));
|
||||
locationTable[RC_GF_ARCHERY_LEFT_END_CHILD_CRATE] = Location::NLCrate(RC_GF_ARCHERY_LEFT_END_CHILD_CRATE, RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS, SCENE_GERUDOS_FORTRESS, TWO_ACTOR_PARAMS(3443, -4876), "Archery Left End Child Crate", RHT_CRATE_GERUDOS_FORTRESS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_ARCHERY_LEFT_END_CHILD_CRATE));
|
||||
|
||||
|
||||
// MQ Crates
|
||||
// Randomizer Check Randomizer Check Quest Area Scene ID Params Short Name Hint Text Key Vanilla Spoiler Collection Check
|
||||
locationTable[RC_DEKU_TREE_MQ_LOBBY_CRATE] = Location::Crate(RC_DEKU_TREE_MQ_LOBBY_CRATE, RCQUEST_MQ, RCAREA_DEKU_TREE, SCENE_DEKU_TREE, TWO_ACTOR_PARAMS(279, 333), "MQ Lobby Crate", RHT_CRATE_DEKU_TREE, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DEKU_TREE_MQ_LOBBY_CRATE));
|
||||
|
|
@ -524,7 +524,7 @@ void Rando::StaticData::RegisterCrateLocations() {
|
|||
locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3] = Location::Crate(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3, RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-150, -1186), "MQ Big Mirror Crate 3", RHT_CRATE_SPIRIT_TEMPLE, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_3));
|
||||
locationTable[RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4] = Location::Crate(RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4, RCQUEST_MQ, RCAREA_SPIRIT_TEMPLE, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(270, -1186), "MQ Big Mirror Crate 4", RHT_CRATE_SPIRIT_TEMPLE, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TEMPLE_MQ_BIG_MIRROR_CRATE_4));
|
||||
locationTable[RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE] = Location::Crate(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE, RCQUEST_MQ, RCAREA_GERUDO_TRAINING_GROUND, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-59, -1598), "MQ Maze Crate", RHT_CRATE_GERUDO_TRAINING_GROUND, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GERUDO_TRAINING_GROUND_MQ_MAZE_CRATE));
|
||||
|
||||
|
||||
// Small Crates
|
||||
// Randomizer Check Randomizer Check Quest Area Scene ID Params Short Name Hint Text Key Vanilla Spoiler Collection Check
|
||||
locationTable[RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1] = Location::SmallCrate(RC_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1, RCQUEST_VANILLA, RCAREA_JABU_JABUS_BELLY, SCENE_JABU_JABU, TWO_ACTOR_PARAMS(-141, -1945), "Platform Room Small Crate 1", RHT_CRATE_JABU_JABU, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_JABU_JABUS_BELLY_PLATFORM_ROOM_SMALL_CRATE_1));
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -180,6 +180,8 @@ void Context::GenerateLocationPool() {
|
|||
location.GetRandomizerCheck() == RC_HF_DEKU_SCRUB_GROTTO)) ||
|
||||
(location.GetRCType() == RCTYPE_ADULT_TRADE && mOptions[RSK_SHUFFLE_ADULT_TRADE].Is(RO_GENERIC_OFF)) ||
|
||||
(location.GetRCType() == RCTYPE_COW && mOptions[RSK_SHUFFLE_COWS].Is(RO_GENERIC_OFF)) ||
|
||||
(location.GetRandomizerCheck() == RC_LH_HYRULE_LOACH &&
|
||||
mOptions[RSK_FISHSANITY].IsNot(RO_FISHSANITY_HYRULE_LOACH)) ||
|
||||
(location.GetRCType() == RCTYPE_FISH && !mFishsanity->GetFishLocationIncluded(&location)) ||
|
||||
(location.GetRCType() == RCTYPE_POT && mOptions[RSK_SHUFFLE_POTS].Is(RO_SHUFFLE_POTS_OFF)) ||
|
||||
(location.GetRCType() == RCTYPE_GRASS && mOptions[RSK_SHUFFLE_GRASS].Is(RO_SHUFFLE_GRASS_OFF)) ||
|
||||
|
|
|
|||
|
|
@ -74,13 +74,10 @@ Fishsanity::~Fishsanity() {
|
|||
bool Fishsanity::GetFishLocationIncluded(Rando::Location* loc, FishsanityOptionsSource optionsSource) {
|
||||
auto [mode, numFish, ageSplit] = GetOptions(optionsSource);
|
||||
|
||||
if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF) {
|
||||
if (loc->GetRCType() != RCTYPE_FISH || mode == RO_FISHSANITY_OFF || mode == RO_FISHSANITY_HYRULE_LOACH) {
|
||||
return false;
|
||||
}
|
||||
RandomizerCheck rc = loc->GetRandomizerCheck();
|
||||
if (mode == RO_FISHSANITY_HYRULE_LOACH && rc != RC_LH_HYRULE_LOACH) {
|
||||
return false;
|
||||
}
|
||||
// Are pond fish enabled, and is this a pond fish location?
|
||||
if (mode != RO_FISHSANITY_OVERWORLD && numFish > 0 && loc->GetScene() == SCENE_FISHING_POND &&
|
||||
loc->GetActorID() == ACTOR_FISHING) {
|
||||
|
|
|
|||
|
|
@ -245,10 +245,6 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
|
|||
Flags_SetRandomizerInf(RAND_INF_ZELDAS_LETTER);
|
||||
}
|
||||
|
||||
if (flagType == FLAG_EVENT_CHECK_INF && flag == EVENTCHKINF_OBTAINED_POCKET_EGG) {
|
||||
Flags_SetRandomizerInf(RAND_INF_WEIRD_EGG);
|
||||
}
|
||||
|
||||
RandomizerCheck rc = GetRandomizerCheckFromFlag(flagType, flag);
|
||||
if (rc == RC_UNKNOWN_CHECK)
|
||||
return;
|
||||
|
|
@ -1765,10 +1761,6 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
|
|||
|
||||
// Handle updated link spawn positions
|
||||
Entrance_OverrideSpawnScene(sceneNum, gPlayState->curSpawn);
|
||||
|
||||
Entrance_OverrideWeatherState();
|
||||
// Need to reinitialize the environment after replacing the weather mode
|
||||
Play_InitEnvironment(gPlayState, gPlayState->skyboxId);
|
||||
}
|
||||
|
||||
// LACs & Prelude checks
|
||||
|
|
@ -1807,6 +1799,13 @@ void RandomizerOnSceneInitHandler(int16_t sceneNum) {
|
|||
});
|
||||
}
|
||||
|
||||
void RandomizerAfterSceneCommandsHandler(int16_t sceneNum) {
|
||||
// ENTRTODO: Move all entrance rando handling to a dedicated file
|
||||
if (RAND_GET_OPTION(RSK_SHUFFLE_ENTRANCES)) {
|
||||
Entrance_OverrideWeatherState();
|
||||
}
|
||||
}
|
||||
|
||||
void EnSi_DrawRandomizedItem(EnSi* enSi, PlayState* play) {
|
||||
GetItemEntry randoItem = enSi->sohGetItemEntry;
|
||||
if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
|
||||
|
|
@ -2362,6 +2361,7 @@ void RandomizerRegisterHooks() {
|
|||
static uint32_t onDialogMessageHook = 0;
|
||||
static uint32_t onVanillaBehaviorHook = 0;
|
||||
static uint32_t onSceneInitHook = 0;
|
||||
static uint32_t afterSceneCommandsHook = 0;
|
||||
static uint32_t onActorInitHook = 0;
|
||||
static uint32_t onActorUpdateHook = 0;
|
||||
static uint32_t onPlayerUpdateHook = 0;
|
||||
|
|
@ -2398,6 +2398,7 @@ void RandomizerRegisterHooks() {
|
|||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnItemReceive>(onDialogMessageHook);
|
||||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnVanillaBehavior>(onVanillaBehaviorHook);
|
||||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnSceneInit>(onSceneInitHook);
|
||||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::AfterSceneCommands>(afterSceneCommandsHook);
|
||||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorInit>(onActorInitHook);
|
||||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnActorUpdate>(onActorUpdateHook);
|
||||
GameInteractor::Instance->UnregisterGameHook<GameInteractor::OnPlayerUpdate>(onPlayerUpdateHook);
|
||||
|
|
@ -2430,6 +2431,7 @@ void RandomizerRegisterHooks() {
|
|||
onDialogMessageHook = 0;
|
||||
onVanillaBehaviorHook = 0;
|
||||
onSceneInitHook = 0;
|
||||
afterSceneCommandsHook = 0;
|
||||
onActorInitHook = 0;
|
||||
onActorUpdateHook = 0;
|
||||
onPlayerUpdateHook = 0;
|
||||
|
|
@ -2481,6 +2483,8 @@ void RandomizerRegisterHooks() {
|
|||
RandomizerOnVanillaBehaviorHandler);
|
||||
onSceneInitHook =
|
||||
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneInit>(RandomizerOnSceneInitHandler);
|
||||
afterSceneCommandsHook = GameInteractor::Instance->RegisterGameHook<GameInteractor::AfterSceneCommands>(
|
||||
RandomizerAfterSceneCommandsHandler);
|
||||
onActorInitHook =
|
||||
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnActorInit>(RandomizerOnActorInitHandler);
|
||||
onActorUpdateHook =
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ void Rando::StaticData::InitItemTable() {
|
|||
|
||||
itemTable[RG_BOMBCHU_BAG] = Item(RG_BOMBCHU_BAG, Text{ "Bombchu Bag", "Sac de Missiles Teigneux", "Krabbelminentasche" }, ITEMTYPE_ITEM, RG_BOMBCHU_BAG, true, LOGIC_BOMBCHUS, RHT_BOMBCHU_BAG, RG_BOMBCHU_BAG, OBJECT_GI_BOMB_2, GID_BOMBCHU, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
|
||||
itemTable[RG_BOMBCHU_BAG].SetCustomDrawFunc(Randomizer_DrawBombchuBag);
|
||||
|
||||
|
||||
itemTable[RG_QUIVER_INF] = Item(RG_QUIVER_INF, Text{ "Infinite Quiver", "Carquois Infini", "Unendlicher Köcher" }, ITEMTYPE_ITEM, RG_QUIVER_INF, true, LOGIC_PROGRESSIVE_BOW, RHT_QUIVER_INF, RG_QUIVER_INF, OBJECT_GI_ARROWCASE, GID_QUIVER_50, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
|
||||
itemTable[RG_BOMB_BAG_INF] = Item(RG_BOMB_BAG_INF, Text{ "Infinite Bomb Bag", "Sac de Bombes Infini", "Unendliche Bombentasche" }, ITEMTYPE_ITEM, RG_BOMB_BAG_INF, true, LOGIC_PROGRESSIVE_BOMB_BAG, RHT_BOMB_BAG_INF, RG_BOMB_BAG_INF, OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
|
||||
itemTable[RG_BULLET_BAG_INF] = Item(RG_BULLET_BAG_INF, Text{ "Infinite Bullet Bag", "Sac de Graines Infinis", "Unendliche Samentasche" }, ITEMTYPE_ITEM, RG_BULLET_BAG_INF, true, LOGIC_PROGRESSIVE_BULLET_BAG, RHT_BULLET_BAG_INF, RG_BULLET_BAG_INF, OBJECT_GI_DEKUPOUCH, GID_BULLET_BAG, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_LESSER, MOD_RANDOMIZER);
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ void RegionTable_Init_GanonsCastle() {
|
|||
}, {
|
||||
//Locations
|
||||
LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_CHEST, logic->CanKillEnemy(RE_WOLFOS)),
|
||||
LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_1, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE))),
|
||||
LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_2, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_DINS_FIRE))),
|
||||
LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_1, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))))),
|
||||
LOCATION(RC_GANONS_CASTLE_FOREST_TRIAL_POT_2, logic->CanBreakPots() && (logic->CanUse(RG_FIRE_ARROWS) || (logic->CanUse(RG_DINS_FIRE) && (logic->CanUse(RG_FAIRY_BOW) || logic->CanUse(RG_HOOKSHOT))))),
|
||||
}, {});
|
||||
|
||||
areaTable[RR_GANONS_CASTLE_FIRE_TRIAL] = Region("Ganon's Castle Fire Trial", "Ganon's Castle", {RA_GANONS_CASTLE}, NO_DAY_NIGHT_CYCLE, {
|
||||
|
|
|
|||
|
|
@ -773,7 +773,7 @@ void RegionTable_Init_WaterTemple() {
|
|||
LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_4, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
|
||||
LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_5, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
|
||||
LOCATION(RC_WATER_TEMPLE_MQ_WHIRLPOOL_SUBMERGED_CRATE_6, logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16 && logic->CanBreakCrates()),
|
||||
|
||||
|
||||
},
|
||||
{
|
||||
//Exits
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ void RegionTable_Init_CastleGrounds() {
|
|||
}, {
|
||||
//Exits
|
||||
Entrance(RR_CASTLE_GROUNDS, []{return true;}),
|
||||
Entrance(RR_HC_GARDEN, []{return logic->CanUse(RG_WEIRD_EGG) || !ctx->GetOption(RSK_SHUFFLE_WEIRD_EGG) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives() && logic->CanJumpslash());}),
|
||||
Entrance(RR_HC_GARDEN, []{return logic->CanUse(RG_WEIRD_EGG) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->HasExplosives() && logic->CanJumpslash());}),
|
||||
Entrance(RR_HC_GREAT_FAIRY_FOUNTAIN, []{return logic->BlastOrSmash();}),
|
||||
Entrance(RR_HC_STORMS_GROTTO, []{return logic->CanOpenStormsGrotto();}),
|
||||
});
|
||||
|
|
|
|||
|
|
@ -121,8 +121,6 @@ bool Logic::HasItem(RandomizerGet itemName) {
|
|||
case RG_STONE_OF_AGONY:
|
||||
case RG_GERUDO_MEMBERSHIP_CARD:
|
||||
return CheckQuestItem(RandoGetToQuestItem.at(itemName));
|
||||
case RG_RUTOS_LETTER:
|
||||
return CheckEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
|
||||
case RG_DOUBLE_DEFENSE:
|
||||
return GetSaveContext()->isDoubleDefenseAcquired;
|
||||
case RG_FISHING_POLE:
|
||||
|
|
@ -171,6 +169,7 @@ bool Logic::HasItem(RandomizerGet itemName) {
|
|||
case RG_BACK_TOWER_KEY:
|
||||
case RG_HYLIA_LAB_KEY:
|
||||
case RG_FISHING_HOLE_KEY:
|
||||
case RG_RUTOS_LETTER:
|
||||
return CheckRandoInf(RandoGetToRandInf.at(itemName));
|
||||
// Boss Keys
|
||||
case RG_EPONA:
|
||||
|
|
@ -1455,6 +1454,7 @@ std::map<RandomizerGet, uint32_t> Logic::RandoGetToEquipFlag = {
|
|||
std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = {
|
||||
{ RG_ZELDAS_LETTER, RAND_INF_ZELDAS_LETTER },
|
||||
{ RG_WEIRD_EGG, RAND_INF_WEIRD_EGG },
|
||||
{ RG_RUTOS_LETTER, RAND_INF_OBTAINED_RUTOS_LETTER },
|
||||
{ RG_GOHMA_SOUL, RAND_INF_GOHMA_SOUL },
|
||||
{ RG_KING_DODONGO_SOUL, RAND_INF_KING_DODONGO_SOUL },
|
||||
{ RG_BARINADE_SOUL, RAND_INF_BARINADE_SOUL },
|
||||
|
|
@ -1819,7 +1819,7 @@ void Logic::ApplyItemEffect(Item& item, bool state) {
|
|||
mSaveContext->inventory.items[slot] = itemId;
|
||||
} break;
|
||||
case RG_RUTOS_LETTER:
|
||||
SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER, state);
|
||||
SetRandoInf(RAND_INF_OBTAINED_RUTOS_LETTER, state);
|
||||
break;
|
||||
case RG_GOHMA_SOUL:
|
||||
case RG_KING_DODONGO_SOUL:
|
||||
|
|
|
|||
|
|
@ -368,7 +368,9 @@ void OptionGroup::Disable() {
|
|||
bool OptionGroup::RenderImGui() const { // NOLINT(*-no-recursion)
|
||||
ImGuiWindow* window = ImGui::GetCurrentWindow();
|
||||
bool changed = false;
|
||||
ImGui::BeginDisabled(mDisabled);
|
||||
ImGui::BeginDisabled(mDisabled || CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) ||
|
||||
CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) ||
|
||||
CVarGetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0));
|
||||
if (mContainerType == WidgetContainerType::TABLE) {
|
||||
if (ImGui::BeginTable(mName.c_str(), static_cast<int>(mSubGroups.size()),
|
||||
ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
|
||||
|
|
|
|||
|
|
@ -3690,6 +3690,7 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
locationsTabOpen = false;
|
||||
tricksTabOpen = false;
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
UIWidgets::Spacer(0);
|
||||
UIWidgets::CVarCheckbox("Manual seed entry", CVAR_RANDOMIZER_SETTING("ManualSeedEntry"),
|
||||
|
|
@ -3725,9 +3726,7 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
}
|
||||
|
||||
UIWidgets::Spacer(0);
|
||||
ImGui::BeginDisabled((CVarGetInteger(CVAR_RANDOMIZER_SETTING("DontGenerateSpoiler"), 0) &&
|
||||
gSaveContext.gameMode != GAMEMODE_FILE_SELECT) ||
|
||||
GameInteractor::IsSaveLoaded());
|
||||
ImGui::BeginDisabled((gSaveContext.gameMode != GAMEMODE_FILE_SELECT) || GameInteractor::IsSaveLoaded());
|
||||
if (UIWidgets::Button("Generate Randomizer",
|
||||
UIWidgets::ButtonOptions().Size(ImVec2(250.f, 0.f)).Color(THEME_COLOR))) {
|
||||
ctx->SetSpoilerLoaded(false);
|
||||
|
|
@ -3746,7 +3745,6 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
// ImGui::Text("Settings File: %s", presetfilepath.c_str());
|
||||
|
||||
UIWidgets::Separator(true, true, 0.f, 0.f);
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
|
||||
ImGuiWindow* window = ImGui::GetCurrentWindow();
|
||||
static ImVec2 cellPadding(8.0f, 8.0f);
|
||||
|
|
@ -3762,8 +3760,6 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
ImGui::EndTabItem();
|
||||
}
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
if (ImGui::BeginTabItem("Items")) {
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
|
|
@ -3775,23 +3771,23 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
ImGui::PopStyleVar(1);
|
||||
ImGui::EndTabItem();
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
if (ImGui::BeginTabItem("Gameplay")) {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
|
||||
if (mSettings->GetOptionGroup(RSG_GAMEPLAY_IMGUI_TABLE).RenderImGui()) {
|
||||
mNeedsUpdate = true;
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
ImGui::PopStyleVar(1);
|
||||
ImGui::EndTabItem();
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
if (ImGui::BeginTabItem("Locations")) {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) || disableEditingRandoSettings ||
|
||||
CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding);
|
||||
if (!locationsTabOpen) {
|
||||
locationsTabOpen = true;
|
||||
|
|
@ -3924,10 +3920,10 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
}
|
||||
ImGui::PopStyleVar(1);
|
||||
ImGui::EndTabItem();
|
||||
ImGui::EndDisabled();
|
||||
} else {
|
||||
locationsTabOpen = false;
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
if (ImGui::BeginTabItem("Tricks/Glitches")) {
|
||||
if (!tricksTabOpen) {
|
||||
|
|
@ -3975,8 +3971,9 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
ImGui::EndTable();
|
||||
}
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0) || disableEditingRandoSettings ||
|
||||
CVarGetInteger(CVAR_RANDOMIZER_SETTING("LogicRules"), RO_LOGIC_GLITCHLESS) ==
|
||||
RO_LOGIC_VANILLA);
|
||||
|
||||
// Tricks
|
||||
static std::unordered_map<RandomizerArea, bool> areaTreeDisabled{
|
||||
|
|
@ -4354,9 +4351,6 @@ void RandomizerSettingsWindow::DrawElement() {
|
|||
ImGui::EndTabBar();
|
||||
}
|
||||
UIWidgets::PopStyleTabs();
|
||||
|
||||
ImGui::EndDisabled();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void RandomizerSettingsWindow::UpdateElement() {
|
||||
|
|
|
|||
|
|
@ -1258,8 +1258,13 @@ void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flag
|
|||
windowFlags |= ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove;
|
||||
}
|
||||
}
|
||||
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(Color_Background.r / 255.0f, Color_Background.g / 255.0f,
|
||||
Color_Background.b / 255.0f, Color_Background.a / 255.0f));
|
||||
auto maybeParent = ImGui::GetCurrentWindow();
|
||||
ImGuiWindow* window = ImGui::FindWindowByName(UniqueName.c_str());
|
||||
if (window != NULL && window->DockTabIsVisible && window->ParentWindow != NULL &&
|
||||
std::string(window->ParentWindow->Name).compare(0, strlen("Main - Deck"), "Main - Deck") == 0) {
|
||||
Color_Background.a = 255;
|
||||
}
|
||||
ImGui::PushStyleColor(ImGuiCol_WindowBg, VecFromRGBA8(Color_Background));
|
||||
ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
|
||||
ImGui::Begin(UniqueName.c_str(), &open, windowFlags);
|
||||
|
|
@ -2075,11 +2080,13 @@ void CheckTrackerSettingsWindow::DrawElement() {
|
|||
.DefaultIndex(TRACKER_COMBO_BUTTON_L));
|
||||
}
|
||||
}
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::CVarCheckbox("Vanilla/MQ Dungeon Spoilers", CVAR_TRACKER_CHECK("MQSpoilers"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("If enabled, Vanilla/MQ dungeons will show on the tracker immediately. "
|
||||
"Otherwise, Vanilla/MQ dungeon locations must be unlocked.")
|
||||
.Color(THEME_COLOR));
|
||||
ImGui::EndDisabled();
|
||||
if (UIWidgets::CVarCheckbox(
|
||||
"Hide unshuffled shop item checks", CVAR_TRACKER_CHECK("HideUnshuffledShopChecks"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
|
|
@ -2100,6 +2107,7 @@ void CheckTrackerSettingsWindow::DrawElement() {
|
|||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("If enabled, will show a check's logic when hovering over it.")
|
||||
.Color(THEME_COLOR));
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
if (UIWidgets::CVarCheckbox("Enable Available Checks", CVAR_TRACKER_CHECK("EnableAvailableChecks"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("If enabled, will show the checks that are available to be collected "
|
||||
|
|
@ -2108,6 +2116,7 @@ void CheckTrackerSettingsWindow::DrawElement() {
|
|||
enableAvailableChecks = CVarGetInteger(CVAR_TRACKER_CHECK("EnableAvailableChecks"), 0);
|
||||
RecalculateAvailableChecks();
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
// Filtering settings
|
||||
UIWidgets::PaddedSeparator();
|
||||
|
|
|
|||
|
|
@ -690,6 +690,7 @@ void EntranceTrackerSettingsWindow::DrawElement() {
|
|||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("Automatically scroll to the first available entrance in the current scene")
|
||||
.Color(THEME_COLOR));
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::CVarCheckbox("Highlight previous", CVAR_TRACKER_ENTRANCE("HighlightPrevious"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("Highlight the previous entrance that Link came from")
|
||||
|
|
@ -698,6 +699,7 @@ void EntranceTrackerSettingsWindow::DrawElement() {
|
|||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("Highlight available entrances in the current scene")
|
||||
.Color(THEME_COLOR));
|
||||
ImGui::EndDisabled();
|
||||
UIWidgets::CVarCheckbox("Hide undiscovered", CVAR_TRACKER_ENTRANCE("CollapseUndiscovered"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("Collapse undiscovered entrances towards the bottom of each group")
|
||||
|
|
@ -724,6 +726,7 @@ void EntranceTrackerSettingsWindow::DrawElement() {
|
|||
UIWidgets::RadioButtonsOptions().Color(THEME_COLOR).Tooltip("Group entrances by their entrance type"));
|
||||
|
||||
ImGui::Text("Spoiler Reveal");
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::CVarCheckbox(
|
||||
"Show Source", CVAR_TRACKER_ENTRANCE("ShowFrom"),
|
||||
UIWidgets::CheckboxOptions().Tooltip("Reveal the sourcefor undiscovered entrances").Color(THEME_COLOR));
|
||||
|
|
@ -731,7 +734,7 @@ void EntranceTrackerSettingsWindow::DrawElement() {
|
|||
UIWidgets::CheckboxOptions()
|
||||
.Tooltip("Reveal the destination for undiscovered entrances")
|
||||
.Color(THEME_COLOR));
|
||||
|
||||
ImGui::EndDisabled();
|
||||
ImGui::EndTable();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1952,6 +1952,7 @@ typedef enum {
|
|||
RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_7,
|
||||
RAND_INF_DEKU_TREE_QUEEN_GOHMA_GRASS_8,
|
||||
// End Grass
|
||||
RAND_INF_OBTAINED_RUTOS_LETTER,
|
||||
// If you add anything to this list, you need to update the size of randomizerInf in z64save.h to be
|
||||
// ceil(RAND_INF_MAX / 16)
|
||||
|
||||
|
|
|
|||
|
|
@ -1162,8 +1162,10 @@ void BeginFloatingWindows(std::string UniqueName, ImGuiWindowFlags flags = 0) {
|
|||
}
|
||||
}
|
||||
auto color = VecFromRGBA8(CVarGetColor(CVAR_TRACKER_ITEM("BgColor.Value"), { 0, 0, 0, 0 }));
|
||||
auto maybeParent = ImGui::GetCurrentWindow();
|
||||
ImGuiWindow* window = ImGui::FindWindowByName(UniqueName.c_str());
|
||||
if (window != NULL && window->DockTabIsVisible) {
|
||||
if (window != NULL && window->DockTabIsVisible && window->ParentWindow != NULL &&
|
||||
std::string(window->ParentWindow->Name).compare(0, strlen("Main - Deck"), "Main - Deck") == 0) {
|
||||
color.w = 1.0f;
|
||||
}
|
||||
ImGui::PushStyleColor(ImGuiCol_WindowBg, color);
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ void Settings::CreateOptions() {
|
|||
OPT_BOOL(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD, "Shuffle Gerudo Membership Card", CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
|
||||
OPT_U8(RSK_SHUFFLE_POTS, "Shuffle Pots", {"Off", "Dungeons", "Overworld", "All Pots"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShufflePots"), mOptionDescriptions[RSK_SHUFFLE_POTS], WidgetType::Combobox, RO_SHUFFLE_POTS_OFF);
|
||||
OPT_U8(RSK_SHUFFLE_GRASS, "Shuffle Grass", {"Off", "Dungeons", "Overworld", "All Grass/Bushes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGrass"), mOptionDescriptions[RSK_SHUFFLE_GRASS], WidgetType::Combobox, RO_SHUFFLE_GRASS_OFF);
|
||||
OPT_U8(RSK_SHUFFLE_CRATES, "Shuffle Crates", {"Off", "Dungeons", "Overworld", "All Crates"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleCrates"), mOptionDescriptions[RSK_SHUFFLE_CRATES], WidgetType::Combobox, RO_SHUFFLE_CRATES_OFF);
|
||||
OPT_U8(RSK_SHUFFLE_CRATES, "Shuffle Crates", {"Off", "Dungeons", "Overworld", "All Crates"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleCrates"), mOptionDescriptions[RSK_SHUFFLE_CRATES], WidgetType::Combobox, RO_SHUFFLE_CRATES_OFF);
|
||||
OPT_BOOL(RSK_SHUFFLE_FISHING_POLE, "Shuffle Fishing Pole", CVAR_RANDOMIZER_SETTING("ShuffleFishingPole"), mOptionDescriptions[RSK_SHUFFLE_FISHING_POLE]);
|
||||
OPT_U8(RSK_SHUFFLE_MERCHANTS, "Shuffle Merchants", {"Off", "Bean Merchant Only", "All But Beans", "All"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleMerchants"), mOptionDescriptions[RSK_SHUFFLE_MERCHANTS], WidgetType::Combobox, RO_SHUFFLE_MERCHANTS_OFF, IMFLAG_NONE);
|
||||
OPT_U8(RSK_MERCHANT_PRICES, "Merchant Prices", {"Vanilla", "Cheap Balanced", "Balanced", "Fixed", "Range", "Set By Wallet"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("MerchantPrices"), mOptionDescriptions[RSK_MERCHANT_PRICES], WidgetType::Combobox, RO_PRICE_VANILLA, false, IMFLAG_NONE);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Fire Keese", "spawn_fire_keese") { Category = "Spawn Enemies/Objects", Price = 15, Description = "Do not bring close to Deku Shields. Or do, we're not your parents." },
|
||||
new("Wolfos", "spawn_wolfos") { Category = "Spawn Enemies/Objects", Price = 15, Description = "Awooooooo" },
|
||||
new("Wallmaster", "spawn_wallmaster") { Category = "Spawn Enemies/Objects", Price = 30, Description = "Need a hand? Try it together with electrocuting Link." },
|
||||
|
||||
|
||||
// Link Modifiers
|
||||
new("Take Half Damage", "take_half_damage") { Category = "Link Modifiers", Duration = 30, Price = 20, Description = "Halves the damage Link takes. Won't save the streamer if they're bad at the game though." },
|
||||
new("Take Double Damage", "take_double_damage") { Category = "Link Modifiers", Duration = 30, Price = 30, Description = "Doubles the damage Link takes. Turns OoT into Dark Souls.. kinda." },
|
||||
|
|
@ -52,7 +52,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Disable Ledge Grabs", "no_ledge_grabs") { Category = "Link Modifiers", Duration = 30, Price = 15, Description = "Jump! Pull up-- Oh, woops." },
|
||||
new("Random Wind", "random_wind") { Category = "Link Modifiers", Duration = 30, Price = 30, Description = "A wind blows, which changes to a random direction every 5 seconds." },
|
||||
new("Random Bonks When Rolling", "random_bonks") { Category = "Link Modifiers", Duration = 60, Price = 15, Description = "Why do I keep bonking while there's nothing here!?" },
|
||||
|
||||
|
||||
// Hurt or Heal Link
|
||||
new("Empty Heart", "empty_heart") { Category = "Hurt/Heal Link", Quantity = 20, Price = 10, Description = "Damage Link for however many hearts you choose." },
|
||||
new("Fill Heart", "fill_heart") { Category = "Hurt/Heal Link", Quantity = 20, Price = 5, Description = "Heal Link for however many hearts you choose." },
|
||||
|
|
@ -63,7 +63,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Freeze Link", "freeze_link") { Category = "Hurt/Heal Link", Price = 20, Description = "FREEZE! Don't move!" },
|
||||
new("Electrocute Link", "electrocute_link") { Category = "Hurt/Heal Link", Price = 20, Description = "Ganon used Thundershock!" },
|
||||
new("Kill Link", "kill_link") { Category = "Hurt/Heal Link", Price = 150, Description = "Rest in RIP." },
|
||||
|
||||
|
||||
// Give Items and Consumables
|
||||
new("Add Heart Container", "add_heart_container") { Category = "Give Items/Consumables", Price = 25, Description = "The limit is 20 heart containers." },
|
||||
new("Fill Magic", "fill_magic") { Category = "Give Items/Consumables", Price = 20, Description = "Fills the entire magic bar. Abra-kadabra." },
|
||||
|
|
@ -76,7 +76,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Refill Slingshot Seeds", "refill_seeds") { Category = "Give Items/Consumables", Quantity = 30, Price = 1, Description = "Only works when the player already has a Slingshot." },
|
||||
new("Refill Arrows", "refill_arrows") { Category = "Give Items/Consumables", Price = 1, Description = "Only works when the player already has a bow." },
|
||||
new("Refill Bombchus", "refill_bombchus") { Category = "Give Items/Consumables", Quantity = 30, Price = 5, Description = "Only works when the player already had Bombchus before." },
|
||||
|
||||
|
||||
// Take Items and Consumables
|
||||
new("Remove Heart Container", "remove_heart_container") { Category = "Take Items/Consumables", Price = 35, Description = "The limit is 1 heart. But you wouldn't go that far, would you?" },
|
||||
new("Empty Magic", "empty_magic") { Category = "Take Items/Consumables", Price = 25, Description = "Empties the entire magic bar. They didn't need it anyway." },
|
||||
|
|
@ -89,25 +89,25 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Take Slingshot Seeds", "take_seeds") { Category = "Take Items/Consumables", Quantity = 30, Price = 2, Description = "Who even uses the Slingshot?" },
|
||||
new("Take Arrows", "take_arrows") { Category = "Take Items/Consumables", Quantity = 30, Price = 2, Description = "*ploink*" },
|
||||
new("Take Bombchus", "take_bombchus") { Category = "Take Items/Consumables", Quantity = 30, Price = 10, Description = "Hopefully they still have some regular bombs." },
|
||||
|
||||
|
||||
// Link Size Modifiers
|
||||
new("Giant Lonk", "giant_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "Big Lonk equals big sword." },
|
||||
new("Minish Link", "minish_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "They say size doesn't matter." },
|
||||
new("Paper Link", "paper_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "We might not have a Zelda variant of Paper Mario, but this gets pretty close." },
|
||||
new("Squished Link", "squished_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "Drop an anvil on Link, but the anvil is invisible." },
|
||||
new("Invisible Link", "invisible_link") { Category = "Change Link's Size", Duration = 30, Price = 20, Description = "Now you see me, now you don't." },
|
||||
|
||||
|
||||
// Generic Effects
|
||||
new("Random Bomb Fuse Timer", "random_bomb_timer") { Category = "Generic Effects", Duration = 60, Price = 5, Description = "Sets the timer for new bombs to either super short, super long or something inbetween (does not work for bombchus)." },
|
||||
new("Set Time to Dawn", "set_time_to_dawn") { Category = "Generic Effects", Price = 25, Description = "Sets the time to early day. Might require an area reload to take effect." },
|
||||
new("Set Time to Dusk", "set_time_to_dusk") { Category = "Generic Effects", Price = 25, Description = "Sets the time to early night. Might require an area reload to take effect." },
|
||||
|
||||
|
||||
// Visual Effects
|
||||
new("No UI", "no_ui") { Category = "Visual Effects", Duration = 60, Price = 20, Description = "No need to see ammo counts. The cinematic experience." },
|
||||
new("Rainstorm", "rainstorm") { Category = "Visual Effects", Duration = 30, Price = 5, Description = "Summon a rainstorm for a sad moment." },
|
||||
new("Debug Mode", "debug_mode") { Category = "Visual Effects", Duration = 30, Price = 20, Description = "if (debug_mode) { ShowCollision(); }" },
|
||||
new("Randomize Cosmetics", "random_cosmetics") { Category = "Visual Effects", Price = 30, Description = "Randomize most cosmetics options. Cosmetics changed by bidding wars are unaffected." },
|
||||
|
||||
|
||||
// Controls
|
||||
new("No Z Button", "no_z_button") { Category = "Controls", Duration = 30, Price = 20, Description = "No sidehops, no backflips, no jump attacks, no camera adjustments." },
|
||||
new("Reverse Controls", "reverse_controls") { Category = "Controls", Duration = 60, Price = 25, Description = "Just hold the controller upside down." },
|
||||
|
|
@ -115,7 +115,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Press Random Buttons", "press_random_buttons") { Category = "Controls", Duration = 30, Price = 25, Description = "Press random buttons on the controller for the duration. Maybe it'll help (spoiler: probably not)." },
|
||||
new("Clear C-Buttons", "clear_cbuttons") { Category = "Controls", Price = 10, Description = "Clear the assigned items from the C-buttons." },
|
||||
new("Clear D-pad", "clear_dpad") { Category = "Controls", Price = 10, Description = "Clear the assigned items from the D-pad." },
|
||||
|
||||
|
||||
// Teleport Player
|
||||
new("Link's House", "tp_links_house") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to Link's House. Welcome Home!" },
|
||||
new("Minuet Destination", "tp_minuet") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to Sacred Forest Meadow." },
|
||||
|
|
@ -124,7 +124,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new("Requiem Destination", "tp_requiem") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to Desert Colossus." },
|
||||
new("Nocturne Destination", "tp_nocturne") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to the Raveyard." },
|
||||
new("Prelude Destination", "tp_prelude") { Category = "Teleport Player", Price = 100, Description = "Teleport the player to the Temple of Time." },
|
||||
|
||||
|
||||
// Tunic Color (Bidding War)
|
||||
new("Tunic Color", "tunic", ItemKind.BidWar)
|
||||
{
|
||||
|
|
@ -139,7 +139,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new Parameter("Brown", "brown"),
|
||||
new Parameter("Black", "black"))
|
||||
},
|
||||
|
||||
|
||||
// Navi Color (Bidding War)
|
||||
new("Navi Color", "navi", ItemKind.BidWar)
|
||||
{
|
||||
|
|
@ -154,7 +154,7 @@ public class ShipOfHarkinian : SimpleTCPPack<SimpleTCPServerConnector>
|
|||
new Parameter("Brown", "brown"),
|
||||
new Parameter("Black", "black"))
|
||||
},
|
||||
|
||||
|
||||
// Link's Hair Color (Bidding War)
|
||||
new("Link's Hair Color", "hair", ItemKind.BidWar)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ void Window::Draw() {
|
|||
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoFocusOnAppearing |
|
||||
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar |
|
||||
ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove |
|
||||
ImGuiWindowFlags_NoScrollbar);
|
||||
ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings);
|
||||
|
||||
ImGui::SetWindowFontScale(CVarGetFloat(CVAR_SETTING("Notifications.Size"), 1.8f)); // Make this adjustable
|
||||
|
||||
|
|
|
|||
|
|
@ -28,34 +28,34 @@ struct ShipInit {
|
|||
|
||||
/**
|
||||
* @brief Register a function to execute on boot and (optionally) in other situations
|
||||
*
|
||||
*
|
||||
* @param initFunc The function to execute
|
||||
* @param updatePaths Strings to specify additional situations in which to execute the function
|
||||
*
|
||||
*
|
||||
* ### Examples:
|
||||
*
|
||||
*
|
||||
* #### Execute function `bar` on boot
|
||||
*
|
||||
*
|
||||
* ```cpp
|
||||
* static RegisterShipInitFunc foo(bar);
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* #### Execute function `bar` on boot and when the CVar `baz` might have changed
|
||||
*
|
||||
*
|
||||
* ```cpp
|
||||
* static RegisterShipInitFunc foo(bar, { "baz" });
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* #### Execute function `bar` on boot and when `IS_RANDO` might have changed
|
||||
*
|
||||
*
|
||||
* ```cpp
|
||||
* static RegisterShipInitFunc foo(bar, { "IS_RANDO" });
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* ### Additional Information:
|
||||
*
|
||||
* To get a better sense of when your function will be executed
|
||||
* you can look for `ShipInit::Init` calls throughout the codebase
|
||||
*
|
||||
* To get a better sense of when your function will be executed
|
||||
* you can look for `ShipInit::Init` calls throughout the codebase
|
||||
*/
|
||||
struct RegisterShipInitFunc {
|
||||
RegisterShipInitFunc(std::function<void()> initFunc, const std::set<std::string>& updatePaths = {}) {
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ uint32_t GetVectorIndexOf(std::vector<std::string>& vector, std::string value) {
|
|||
return std::distance(vector.begin(), std::find(vector.begin(), vector.end(), value));
|
||||
}
|
||||
|
||||
static bool raceDisableActive = false;
|
||||
|
||||
void Menu::InsertSidebarSearch() {
|
||||
menuEntries["Settings"].sidebars.emplace("Search", searchSidebarEntry);
|
||||
uint32_t curIndex = 0;
|
||||
|
|
@ -228,7 +230,7 @@ std::unordered_map<uint32_t, disabledInfo>& Menu::GetDisabledMap() {
|
|||
}
|
||||
|
||||
void Menu::MenuDrawItem(WidgetInfo& widget, uint32_t width, UIWidgets::Colors menuThemeIndex) {
|
||||
disabledTempTooltip = "This setting is disabled because: \n\n";
|
||||
disabledTempTooltip = "This setting is disabled because: \n";
|
||||
disabledValue = false;
|
||||
disabledTooltip = " ";
|
||||
|
||||
|
|
@ -241,11 +243,16 @@ void Menu::MenuDrawItem(WidgetInfo& widget, uint32_t width, UIWidgets::Colors me
|
|||
if (!widget.activeDisables.empty()) {
|
||||
widget.options->disabled = true;
|
||||
for (auto option : widget.activeDisables) {
|
||||
disabledTempTooltip += std::string("- ") + disabledMap.at(option).reason + std::string("\n");
|
||||
disabledTempTooltip += std::string("\n- ") + disabledMap.at(option).reason;
|
||||
}
|
||||
widget.options->disabledTooltip = disabledTempTooltip.c_str();
|
||||
}
|
||||
}
|
||||
if (widget.raceDisable && raceDisableActive) {
|
||||
widget.options->disabled = true;
|
||||
disabledTempTooltip += std::string("\n- Race Lockout Active");
|
||||
widget.options->disabledTooltip = disabledTempTooltip.c_str();
|
||||
}
|
||||
|
||||
if (widget.sameLine) {
|
||||
ImGui::SameLine();
|
||||
|
|
@ -492,6 +499,8 @@ void Menu::DrawElement() {
|
|||
info.active = info.evaluation(info);
|
||||
}
|
||||
|
||||
raceDisableActive = CVarGetInteger(CVAR_SETTING("DisableChanges"), 0);
|
||||
|
||||
windowHeight = ImGui::GetMainViewport()->WorkSize.y;
|
||||
windowWidth = ImGui::GetMainViewport()->WorkSize.x;
|
||||
auto windowFlags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings;
|
||||
|
|
|
|||
|
|
@ -109,6 +109,7 @@ struct WidgetInfo {
|
|||
const char* windowName = "";
|
||||
bool isHidden = false;
|
||||
bool sameLine = false;
|
||||
bool raceDisable = true;
|
||||
|
||||
WidgetInfo& CVar(const char* cVar_) {
|
||||
cVar = cVar_;
|
||||
|
|
@ -191,6 +192,10 @@ struct WidgetInfo {
|
|||
customFunction = customFunction_;
|
||||
return *this;
|
||||
}
|
||||
WidgetInfo& RaceDisable(bool disable) {
|
||||
raceDisable = disable;
|
||||
return *this;
|
||||
}
|
||||
};
|
||||
|
||||
struct WidgetPath {
|
||||
|
|
|
|||
|
|
@ -371,29 +371,37 @@ void RegisterResolutionWidgets() {
|
|||
WidgetPath path = { "Settings", "Graphics", SECTION_COLUMN_2 };
|
||||
|
||||
// Resolution visualiser
|
||||
mSohMenu->AddWidget(path, "Viewport dimensions: {} x {}", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
|
||||
info.name = fmt::format("Viewport dimensions: {} x {}", gfx_current_game_window_viewport.width,
|
||||
gfx_current_game_window_viewport.height);
|
||||
});
|
||||
mSohMenu->AddWidget(path, "Internal resolution: {} x {}", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
|
||||
info.name =
|
||||
fmt::format("Internal resolution: {} x {}", gfx_current_dimensions.width, gfx_current_dimensions.height);
|
||||
});
|
||||
mSohMenu->AddWidget(path, "Viewport dimensions: {} x {}", WIDGET_TEXT)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
info.name = fmt::format("Viewport dimensions: {} x {}", gfx_current_game_window_viewport.width,
|
||||
gfx_current_game_window_viewport.height);
|
||||
});
|
||||
mSohMenu->AddWidget(path, "Internal resolution: {} x {}", WIDGET_TEXT)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
info.name = fmt::format("Internal resolution: {} x {}", gfx_current_dimensions.width,
|
||||
gfx_current_dimensions.height);
|
||||
});
|
||||
|
||||
// Activator
|
||||
mSohMenu->AddWidget(path, "Enable advanced settings.", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled");
|
||||
.CVar(CVAR_PREFIX_ADVANCED_RESOLUTION ".Enabled")
|
||||
.RaceDisable(false);
|
||||
// Error/Warning display
|
||||
mSohMenu
|
||||
->AddWidget(path, ICON_FA_EXCLAMATION_TRIANGLE " Significant frame rate (FPS) drops may be occuring.",
|
||||
WIDGET_TEXT)
|
||||
.RaceDisable(false)
|
||||
.PreFunc(
|
||||
[](WidgetInfo& info) { info.isHidden = !(!CVarGetInteger(CVAR_LOW_RES_MODE, 0) && IsDroppingFrames()); })
|
||||
.Options(TextOptions().Color(Colors::Orange));
|
||||
mSohMenu->AddWidget(path, ICON_FA_QUESTION_CIRCLE " \"N64 Mode\" is overriding these settings.", WIDGET_TEXT)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_LOW_RES_MODE, 0); })
|
||||
.Options(TextOptions().Color(Colors::LightBlue));
|
||||
mSohMenu->AddWidget(path, "Click to disable N64 mode", WIDGET_BUTTON)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) { info.isHidden = !CVarGetInteger(CVAR_LOW_RES_MODE, 0); })
|
||||
.Callback([](WidgetInfo& info) {
|
||||
CVarSetInteger(CVAR_LOW_RES_MODE, 0);
|
||||
|
|
@ -401,17 +409,18 @@ void RegisterResolutionWidgets() {
|
|||
});
|
||||
|
||||
// Aspect Ratio
|
||||
mSohMenu->AddWidget(path, "AspectSep", WIDGET_SEPARATOR).PreFunc([](WidgetInfo& info) {
|
||||
mSohMenu->AddWidget(path, "AspectSep", WIDGET_SEPARATOR).RaceDisable(false).PreFunc([](WidgetInfo& info) {
|
||||
if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
|
||||
info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
|
||||
}
|
||||
});
|
||||
mSohMenu->AddWidget(path, "Force aspect ratio:", WIDGET_TEXT).PreFunc([](WidgetInfo& info) {
|
||||
mSohMenu->AddWidget(path, "Force aspect ratio:", WIDGET_TEXT).RaceDisable(false).PreFunc([](WidgetInfo& info) {
|
||||
if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
|
||||
info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
|
||||
}
|
||||
});
|
||||
mSohMenu->AddWidget(path, "(Select \"Off\" to disable.)", WIDGET_TEXT)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
|
||||
info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
|
||||
|
|
@ -422,6 +431,7 @@ void RegisterResolutionWidgets() {
|
|||
// Presets
|
||||
mSohMenu->AddWidget(path, "Aspect Ratio", WIDGET_COMBOBOX)
|
||||
.ValuePointer(&item_aspectRatio)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
if (mSohMenu->GetDisabledMap().at(DISABLE_FOR_ADVANCED_RESOLUTION_OFF).active) {
|
||||
info.activeDisables.push_back(DISABLE_FOR_ADVANCED_RESOLUTION_OFF);
|
||||
|
|
@ -443,44 +453,49 @@ void RegisterResolutionWidgets() {
|
|||
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
|
||||
})
|
||||
.Options(ComboboxOptions().ComboMap(aspectRatioPresetLabels));
|
||||
mSohMenu->AddWidget(path, "AspectRatioCustom", WIDGET_CUSTOM).CustomFunction([](WidgetInfo& info) {
|
||||
// Hide aspect ratio input fields if using one of the presets.
|
||||
if (item_aspectRatio == default_aspectRatio && !showHorizontalResField) {
|
||||
// Declare input interaction bools outside of IF statement to prevent Y field from disappearing.
|
||||
const bool input_X =
|
||||
UIWidgets::SliderFloat("X", &aspectRatioX,
|
||||
UIWidgets::FloatSliderOptions({ { .disabled = disabled_everything } })
|
||||
.Min(0.1f)
|
||||
.Max(32.0f)
|
||||
.Step(0.001f)
|
||||
.Format("%3f")
|
||||
.Color(THEME_COLOR)
|
||||
.LabelPosition(UIWidgets::LabelPositions::Near)
|
||||
.ComponentAlignment(UIWidgets::ComponentAlignments::Right));
|
||||
const bool input_Y =
|
||||
UIWidgets::SliderFloat("Y", &aspectRatioY,
|
||||
UIWidgets::FloatSliderOptions({ { .disabled = disabled_everything } })
|
||||
.Min(0.1f)
|
||||
.Max(24.0f)
|
||||
.Step(0.001f)
|
||||
.Format("%3f")
|
||||
.Color(THEME_COLOR)
|
||||
.LabelPosition(UIWidgets::LabelPositions::Near)
|
||||
.ComponentAlignment(UIWidgets::ComponentAlignments::Right));
|
||||
if (input_X || input_Y) {
|
||||
item_aspectRatio = default_aspectRatio;
|
||||
update[UPDATE_aspectRatioX] = true;
|
||||
update[UPDATE_aspectRatioY] = true;
|
||||
mSohMenu->AddWidget(path, "AspectRatioCustom", WIDGET_CUSTOM)
|
||||
.RaceDisable(false)
|
||||
.CustomFunction([](WidgetInfo& info) {
|
||||
// Hide aspect ratio input fields if using one of the presets.
|
||||
if (item_aspectRatio == default_aspectRatio && !showHorizontalResField) {
|
||||
// Declare input interaction bools outside of IF statement to prevent Y field from disappearing.
|
||||
const bool input_X =
|
||||
UIWidgets::SliderFloat("X", &aspectRatioX,
|
||||
UIWidgets::FloatSliderOptions({ { .disabled = disabled_everything } })
|
||||
.Min(0.1f)
|
||||
.Max(32.0f)
|
||||
.Step(0.001f)
|
||||
.Format("%3f")
|
||||
.Color(THEME_COLOR)
|
||||
.LabelPosition(UIWidgets::LabelPositions::Near)
|
||||
.ComponentAlignment(UIWidgets::ComponentAlignments::Right));
|
||||
const bool input_Y =
|
||||
UIWidgets::SliderFloat("Y", &aspectRatioY,
|
||||
UIWidgets::FloatSliderOptions({ { .disabled = disabled_everything } })
|
||||
.Min(0.1f)
|
||||
.Max(24.0f)
|
||||
.Step(0.001f)
|
||||
.Format("%3f")
|
||||
.Color(THEME_COLOR)
|
||||
.LabelPosition(UIWidgets::LabelPositions::Near)
|
||||
.ComponentAlignment(UIWidgets::ComponentAlignments::Right));
|
||||
if (input_X || input_Y) {
|
||||
item_aspectRatio = default_aspectRatio;
|
||||
update[UPDATE_aspectRatioX] = true;
|
||||
update[UPDATE_aspectRatioY] = true;
|
||||
}
|
||||
} else if (showHorizontalResField) { // Show calculated aspect ratio
|
||||
if (item_aspectRatio) {
|
||||
ImGui::Dummy({ 0, 2 });
|
||||
const float resolvedAspectRatio =
|
||||
(float)gfx_current_dimensions.width / gfx_current_dimensions.height;
|
||||
ImGui::Text("Aspect ratio: %.2f:1", resolvedAspectRatio);
|
||||
}
|
||||
}
|
||||
} else if (showHorizontalResField) { // Show calculated aspect ratio
|
||||
if (item_aspectRatio) {
|
||||
ImGui::Dummy({ 0, 2 });
|
||||
const float resolvedAspectRatio = (float)gfx_current_dimensions.width / gfx_current_dimensions.height;
|
||||
ImGui::Text("Aspect ratio: %.2f:1", resolvedAspectRatio);
|
||||
}
|
||||
}
|
||||
});
|
||||
mSohMenu->AddWidget(path, "MoreResolutionSettings", WIDGET_CUSTOM).CustomFunction(ResolutionCustomWidget);
|
||||
});
|
||||
mSohMenu->AddWidget(path, "MoreResolutionSettings", WIDGET_CUSTOM)
|
||||
.CustomFunction(ResolutionCustomWidget)
|
||||
.RaceDisable(false);
|
||||
}
|
||||
|
||||
void UpdateResolutionVars() {
|
||||
|
|
|
|||
|
|
@ -32,14 +32,15 @@
|
|||
#include "SohModals.h"
|
||||
|
||||
namespace SohGui {
|
||||
void SetupHooks();
|
||||
void SetupGuiElements();
|
||||
void Draw();
|
||||
void Destroy();
|
||||
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "", std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
|
||||
void ShowRandomizerSettingsMenu();
|
||||
UIWidgets::Colors GetMenuThemeColor();
|
||||
}
|
||||
void SetupHooks();
|
||||
void SetupGuiElements();
|
||||
void Draw();
|
||||
void Destroy();
|
||||
void RegisterPopup(std::string title, std::string message, std::string button1 = "OK", std::string button2 = "",
|
||||
std::function<void()> button1callback = nullptr, std::function<void()> button2callback = nullptr);
|
||||
void ShowRandomizerSettingsMenu();
|
||||
UIWidgets::Colors GetMenuThemeColor();
|
||||
} // namespace SohGui
|
||||
|
||||
#define THEME_COLOR SohGui::GetMenuThemeColor()
|
||||
|
||||
|
|
|
|||
|
|
@ -93,6 +93,7 @@ void SohMenu::AddMenuDevTools() {
|
|||
AddSidebarEntry("Dev Tools", path.sidebarName, 1);
|
||||
AddWidget(path, "Popout Stats Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("SohStats"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Stats##Soh")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Stats Window."));
|
||||
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Saving", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Autosave", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("Autosave"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Save the game automatically on a 3 minute interval and when soft-resetting the game. The interval "
|
||||
"autosave will wait if the game is paused in any way (dialogue, pause screen up, cutscenes, "
|
||||
|
|
@ -168,9 +169,11 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Controls", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Answer Navi Prompt with L Button", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("NaviOnL"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Speak to Navi with L but enter First-Person Camera with C-Up."));
|
||||
AddWidget(path, "Don't Require Input for Credits Sequence", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("NoInputForCredits"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Removes the Input Requirement on Text boxes after defeating Ganon, allowing the Credits "
|
||||
"Sequence to continue to progress."));
|
||||
|
|
@ -202,14 +205,20 @@ void SohMenu::AddMenuEnhancements() {
|
|||
|
||||
AddWidget(path, "Item Count Messages", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Gold Skulltula Tokens", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"));
|
||||
AddWidget(path, "Pieces of Heart", WIDGET_CVAR_CHECKBOX).CVar(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"));
|
||||
AddWidget(path, "Heart Containers", WIDGET_CVAR_CHECKBOX).CVar(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"));
|
||||
.CVar(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"))
|
||||
.RaceDisable(false);
|
||||
AddWidget(path, "Pieces of Heart", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("InjectItemCounts.HeartPiece"))
|
||||
.RaceDisable(false);
|
||||
AddWidget(path, "Heart Containers", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("InjectItemCounts.HeartContainer"))
|
||||
.RaceDisable(false);
|
||||
|
||||
path.column = SECTION_COLUMN_3;
|
||||
AddWidget(path, "Misc", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Disable Crit Wiggle", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableCritWiggle"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Disable Random Camera Wiggle at Low Health."));
|
||||
AddWidget(path, "Better Owl", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("BetterOwl"))
|
||||
|
|
@ -430,27 +439,32 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Mods", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Use Alternate Assets", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("AltAssets"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Toggle between standard assets and alternate assets. Usually mods will indicate if "
|
||||
"this setting has to be used or not."));
|
||||
AddWidget(path, "Disable Bomb Billboarding", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableBombBillboarding"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Disables bombs always rotating to face the camera. To be used in conjunction with mods that want to "
|
||||
"replace bombs with 3D objects."));
|
||||
AddWidget(path, "Disable Grotto Fixed Rotation", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableGrottoRotation"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Disables Grottos rotating with the Camera. To be used in conjuction with mods that want to "
|
||||
"replace grottos with 3D objects."));
|
||||
AddWidget(path, "Ingame Text Spacing: %d", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_ENHANCEMENT("TextSpacing"))
|
||||
.RaceDisable(false)
|
||||
.Options(IntSliderOptions().Min(4).Max(6).DefaultValue(6).Tooltip(
|
||||
"Space between text characters (useful for HD font textures)."));
|
||||
|
||||
AddWidget(path, "Models & Textures", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Disable LOD", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableLOD"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Turns off the Level of Detail setting, making models use their Higher-Poly variants at any distance."));
|
||||
AddWidget(path, "Enemy Health Bars", WIDGET_CVAR_CHECKBOX)
|
||||
|
|
@ -458,18 +472,22 @@ void SohMenu::AddMenuEnhancements() {
|
|||
.Options(CheckboxOptions().Tooltip("Renders a health bar for Enemies when Z-Targeted."));
|
||||
AddWidget(path, "Enable 3D Dropped Items/Projectiles", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("NewDrops"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Replaces most 2D items and projectiles on the overworld with their equivalent 3D models."));
|
||||
AddWidget(path, "Animated Link in Pause Menu", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("PauseMenuAnimatedLink"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Turns the Static Image of Link in the Pause Menu's Equipment Subscreen "
|
||||
"into a model cycling through his idle animations."));
|
||||
AddWidget(path, "Show Age-Dependent Equipment", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) { UpdatePatchHand(); })
|
||||
.Options(CheckboxOptions().Tooltip("Makes all equipment visible, regardless of age."));
|
||||
AddWidget(path, "Scale Adult Equipment as Child", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("ScaleAdultEquipmentAsChild"))
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("EquipmentAlwaysVisible"), 0) == 0;
|
||||
})
|
||||
|
|
@ -478,11 +496,14 @@ void SohMenu::AddMenuEnhancements() {
|
|||
"not work properly with some mods."));
|
||||
AddWidget(path, "Show Gauntlets in First Person", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FirstPersonGauntlets"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Renders Gauntlets when using the Bow and Hookshot like in OoT3D."));
|
||||
AddWidget(path, "Show Chains on Both Sides of Locked Doors", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("ShowDoorLocksOnBothSides"));
|
||||
.CVar(CVAR_ENHANCEMENT("ShowDoorLocksOnBothSides"))
|
||||
.RaceDisable(false);
|
||||
AddWidget(path, "Color Temple of Time's Medallions", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("ToTMedallionsColors"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) { PatchToTMedallions(); })
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"When Medallions are collected, the Medallion imprints around the Master Sword Pedestal in the Temple "
|
||||
|
|
@ -500,15 +521,18 @@ void SohMenu::AddMenuEnhancements() {
|
|||
"in Hot/Underwater conditions."));
|
||||
AddWidget(path, "Remember Minimap State Between Areas", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("RememberMapToggleState"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Preverse the minimap visibility state when going between areas rather than default it to \"on\" "
|
||||
"Preserve the minimap visibility state when going between areas rather than default it to \"on\" "
|
||||
"when going through loading zones."));
|
||||
AddWidget(path, "Visual Stone of Agony", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("VisualAgony"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble."));
|
||||
AddWidget(path, "Disable HUD Heart Animations", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("NoHUDHeartAnimation"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Disables the Beating Animation of the Hearts on the HUD."));
|
||||
AddWidget(path, "Glitch Line-up Tick", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DrawLineupTick"))
|
||||
|
|
@ -517,26 +541,32 @@ void SohMenu::AddMenuEnhancements() {
|
|||
"UI based line-ups do not work outside of 4:3"));
|
||||
AddWidget(path, "Disable Black Bar Letterboxes", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableBlackBars"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Disables Black Bar Letterboxes during cutscenes and Z-Targeting. NOTE: There may be minor visual "
|
||||
"glitches that were covered up by the black bars. Please disable this setting before reporting a bug."));
|
||||
AddWidget(path, "Dynamic Wallet Icon", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DynamicWalletIcon"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Changes the Rupee in the Wallet icon to match the wallet size you currently have."));
|
||||
AddWidget(path, "Always Show Dungeon Entrances", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("AlwaysShowDungeonMinimapIcon"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Always shows dungeon entrance icons on the Minimap."));
|
||||
AddWidget(path, "More Info in File Select", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FileSelectMoreInfo"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Shows what items you have collected in the File Select screen, like in N64 Randomizer."));
|
||||
AddWidget(path, "Better Ammo Rendering in Pause Menu", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("BetterAmmoRendering"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Ammo counts in the pause menu will work correctly regardless of the position of items in the Inventory."));
|
||||
AddWidget(path, "Enable Passage of Time on File Select", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("TimeFlowFileSelect"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("The skybox in the background of the File Select screen will go through the "
|
||||
"day and night cycle over time."));
|
||||
|
||||
|
|
@ -544,14 +574,17 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Misc.", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "N64 Mode", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_LOW_RES_MODE)
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Sets the aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution."));
|
||||
AddWidget(path, "Remove Spin Attack Darkness", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("RemoveSpinAttackDarkness"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Remove the Darkness that appears when charging a Spin Attack."));
|
||||
AddWidget(path, "Draw Distance", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Draw Distance", WIDGET_SEPARATOR_TEXT).RaceDisable(false);
|
||||
AddWidget(path, "Increase Actor Draw Distance: %dx", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableDrawDistance"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
if (CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1) {
|
||||
CVarSetInteger(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"), 0);
|
||||
|
|
@ -561,6 +594,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
"Increases the range in which Actors/Objects are drawn."));
|
||||
AddWidget(path, "Kokiri Draw Distance", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("DisableKokiriDrawDistance"))
|
||||
.RaceDisable(false)
|
||||
.PreFunc(
|
||||
[](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("DisableDrawDistance"), 1) <= 1; })
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
|
|
@ -860,7 +894,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
[](WidgetInfo& info) { info.isHidden = CVarGetInteger(CVAR_ENHANCEMENT("CrouchStabHammerFix"), 0) == 0; })
|
||||
.Options(CheckboxOptions().Tooltip("Make crouch stabbing always do the same damage as a regular slash."));
|
||||
AddWidget(path, "Fix Broken Giant's Knife Bug", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"))
|
||||
.CVar(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"))
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
info.options->disabled = IS_RANDO && GameInteractor::IsSaveLoaded(true);
|
||||
info.options->disabledTooltip = "This setting is forcefully enabled when you are playing a Randomizer.";
|
||||
|
|
@ -896,22 +930,27 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Graphical Fixes", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Fix L&R Pause Menu", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FixMenuLR"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Makes the L and R buttons in the pause menu the same color."));
|
||||
AddWidget(path, "Fix Dungeon Entrances", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Removes the Dungeon Entrance icon on the top-left corner of the screen when no dungeon is present on the "
|
||||
"current map."));
|
||||
AddWidget(path, "Fix Two-Handed Idle Animations", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("TwoHandedIdle"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Re-Enables the two-handed idle animation, a seemingly finished animation that was disabled on accident "
|
||||
"in the original game."));
|
||||
AddWidget(path, "Fix Navi Text HUD Position", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("NaviTextFix"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Correctly centers the Navi text prompt on the HUD's C-Up button."));
|
||||
AddWidget(path, "Fix Gerudo Warrior's Clothing Colors", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Prevent the Gerudo Warrior's clothes changing color when changing Link's tunic or "
|
||||
"using bombs in front of her."));
|
||||
|
|
@ -922,15 +961,18 @@ void SohMenu::AddMenuEnhancements() {
|
|||
"Fixes authentic out of bounds texture reads, instead loading textures with the correct size."));
|
||||
AddWidget(path, "Fix Link's Eyes Open while Sleeping", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FixEyesOpenWhileSleeping"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Fixes Link's eyes being open in the opening cutscene when he is supposed to be sleeping."));
|
||||
AddWidget(path, "Fix Hand Holding Hammer", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FixHammerHand"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) { UpdatePatchHand(); })
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Fixes Adult Link having a backwards Left hand when holding the Megaton Hammer."));
|
||||
AddWidget(path, "Fix Vanishing Paths", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("SceneSpecificDirtPathFix"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
if (gPlayState != NULL) {
|
||||
UpdateDirtPathFixState(gPlayState->sceneNum);
|
||||
|
|
@ -948,6 +990,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Audio Fixes", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Fix Missing Jingle after 5 Silver Rupees", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Adds 5 higher pitches for the Silver Rupee Jingle for the rooms with more than 5 Silver Rupees. "
|
||||
"Only relevant for playthroughs involving Master Quest Dungeons."));
|
||||
|
|
@ -955,10 +998,12 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Desync Fixes", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Fix Darunia Dancing too Fast", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("FixDaruniaDanceSpeed"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Fixes Darunia's dancing speed so he dances to the beat of Saria's Song, like in the Original Game."));
|
||||
AddWidget(path, "Fix Credits Timing (PAL)", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("CreditsFix"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Extend certain credits scenes so the music lines up properly with the visuals. (PAL only)"));
|
||||
|
||||
|
|
@ -966,6 +1011,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddWidget(path, "Graphical Restorations", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Red Ganon Blood", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("RedGanonBlood"))
|
||||
.RaceDisable(false)
|
||||
.Options(
|
||||
CheckboxOptions().Tooltip("Restore the original red blood from NTSC 1.0/1.1. Disable for Green blood."));
|
||||
AddWidget(path, "Restore Old Gold Skulltula Cutscene", WIDGET_CVAR_CHECKBOX)
|
||||
|
|
@ -974,6 +1020,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
"Restore pre-release behavior where defeating a Gold Skulltula will play a cutscene showing it die."));
|
||||
AddWidget(path, "Pulsate Boss Icon", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENHANCEMENT("PulsateBossIcon"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Restores an unfinished feature to pulsate the boss room icon when you are in the boss room."));
|
||||
|
||||
|
|
@ -1657,6 +1704,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
path.column = SECTION_COLUMN_1;
|
||||
AddWidget(path, "Popout Cosmetics Editor Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("CosmeticsEditor"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Cosmetics Editor")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Cosmetics Editor Window."));
|
||||
|
||||
|
|
@ -1665,6 +1713,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddSidebarEntry("Enhancements", path.sidebarName, 1);
|
||||
AddWidget(path, "Popout Audio Editor Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("AudioEditor"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Audio Editor")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Audio Editor Window."));
|
||||
|
||||
|
|
@ -1673,6 +1722,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddSidebarEntry("Enhancements", path.sidebarName, 2);
|
||||
AddWidget(path, "Popout Gameplay Stats Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("GameplayStats"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Gameplay Stats")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Gameplay Stats Window."));
|
||||
|
||||
|
|
@ -1681,6 +1731,7 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddSidebarEntry("Enhancements", path.sidebarName, 1);
|
||||
AddWidget(path, "Popout Time Splits Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("TimeSplits"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Time Splits")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Time Splits Window."));
|
||||
|
||||
|
|
@ -1689,19 +1740,23 @@ void SohMenu::AddMenuEnhancements() {
|
|||
AddSidebarEntry("Enhancements", path.sidebarName, 3);
|
||||
AddWidget(path, "Toggle Timers Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("TimeDisplayEnabled"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Additional Timers")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Additional Timers Window."));
|
||||
AddWidget(path, "Font Scale: %.2fx", WIDGET_CVAR_SLIDER_FLOAT)
|
||||
.CVar(CVAR_TIME_DISPLAY("FontScale"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) { TimeDisplayInitSettings(); })
|
||||
.Options(FloatSliderOptions().Min(1.0f).Max(5.0f).DefaultValue(1.0f).Format("%.2fx"));
|
||||
AddWidget(path, "Hide Background", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_TIME_DISPLAY("ShowWindowBG"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) { TimeDisplayInitSettings(); });
|
||||
for (auto& timer : timeDisplayList) {
|
||||
AddWidget(path, timer.timeLabel, WIDGET_CVAR_CHECKBOX).CVar(timer.timeEnable).Callback([](WidgetInfo& info) {
|
||||
TimeDisplayUpdateDisplayOptions();
|
||||
});
|
||||
AddWidget(path, timer.timeLabel, WIDGET_CVAR_CHECKBOX)
|
||||
.RaceDisable(false)
|
||||
.CVar(timer.timeEnable)
|
||||
.Callback([](WidgetInfo& info) { TimeDisplayUpdateDisplayOptions(); });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ void SohMenu::AddMenuNetwork() {
|
|||
})
|
||||
.Options(ButtonOptions().Tooltip("https://github.com/HarbourMasters/sail"));
|
||||
AddWidget(path, "Host & Port", WIDGET_CUSTOM).CustomFunction([](WidgetInfo& info) {
|
||||
ImGui::BeginDisabled(Sail::Instance->isEnabled);
|
||||
ImGui::BeginDisabled(Sail::Instance->isEnabled || CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
ImGui::Text("%s", info.name.c_str());
|
||||
CVarInputString("##HostSail", CVAR_REMOTE_SAIL("Host"),
|
||||
InputOptions()
|
||||
|
|
@ -111,7 +111,7 @@ void SohMenu::AddMenuNetwork() {
|
|||
})
|
||||
.Options(ButtonOptions().Tooltip("https://crowdcontrol.live"));
|
||||
AddWidget(path, "Host & Port", WIDGET_CUSTOM).CustomFunction([](WidgetInfo& info) {
|
||||
ImGui::BeginDisabled(CrowdControl::Instance->isEnabled);
|
||||
ImGui::BeginDisabled(CrowdControl::Instance->isEnabled || CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
ImGui::Text("%s", info.name.c_str());
|
||||
CVarInputString("##HostCrowdControl", CVAR_REMOTE_CROWD_CONTROL("Host"),
|
||||
InputOptions()
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ void SohMenu::AddMenuRandomizer() {
|
|||
.DefaultValue(true));
|
||||
AddWidget(path, "Random Rupee Names", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_RANDOMIZER_ENHANCEMENT("RandomizeRupeeNames"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions()
|
||||
.Tooltip("When obtaining Rupees, randomize what the Rupee is called in the textbox.")
|
||||
.DefaultValue(true));
|
||||
|
|
@ -60,6 +61,7 @@ void SohMenu::AddMenuRandomizer() {
|
|||
.DefaultValue(true));
|
||||
AddWidget(path, "Quest Item Fanfares", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_RANDOMIZER_ENHANCEMENT("QuestItemFanfares"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Play unique fanfares when obtaining quest items (medallions/stones/songs). Note that these "
|
||||
"fanfares can be longer than usual."));
|
||||
|
|
@ -71,6 +73,7 @@ void SohMenu::AddMenuRandomizer() {
|
|||
"so you never know what you're getting."));
|
||||
AddWidget(path, "Simpler Boss Soul Models", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_RANDOMIZER_ENHANCEMENT("SimplerBossSoulModels"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"When shuffling boss souls, they'll appear as a simpler model instead of showing the boss' models."
|
||||
"This might make boss souls more distinguishable from a distance, and can help with performance."));
|
||||
|
|
@ -93,6 +96,7 @@ void SohMenu::AddMenuRandomizer() {
|
|||
AddSidebarEntry("Randomizer", path.sidebarName, 1);
|
||||
AddWidget(path, "Popout Plandomizer Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("PlandomizerEditor"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Plandomizer Editor")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Randomizer Settings Window."));
|
||||
|
||||
|
|
@ -103,12 +107,14 @@ void SohMenu::AddMenuRandomizer() {
|
|||
AddWidget(path, "Item Tracker", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Toggle Item Tracker", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("ItemTracker"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Item Tracker")
|
||||
.Options(WindowButtonOptions().Tooltip("Toggles the Item Tracker.").EmbedWindow(false));
|
||||
|
||||
AddWidget(path, "Item Tracker Settings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Popout Item Tracker Settings", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("ItemTrackerSettings"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Item Tracker Settings")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Item Tracker Settings Window."));
|
||||
|
||||
|
|
@ -119,12 +125,14 @@ void SohMenu::AddMenuRandomizer() {
|
|||
AddWidget(path, "Entrance Tracker", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Toggle Entrance Tracker", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("EntranceTracker"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Entrance Tracker")
|
||||
.Options(WindowButtonOptions().Tooltip("Toggles the Entrance Tracker.").EmbedWindow(false));
|
||||
|
||||
AddWidget(path, "Entrance Tracker Settings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Popout Entrance Tracker Settings", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("EntranceTrackerSettings"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Entrance Tracker Settings")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Entrance Tracker Settings Window."));
|
||||
|
||||
|
|
@ -135,12 +143,14 @@ void SohMenu::AddMenuRandomizer() {
|
|||
AddWidget(path, "Check Tracker", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Toggle Check Tracker", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("CheckTracker"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Check Tracker")
|
||||
.Options(WindowButtonOptions().Tooltip("Toggles the Check Tracker.").EmbedWindow(false));
|
||||
|
||||
AddWidget(path, "Check Tracker Settings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Popout Check Tracker Settings", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("CheckTrackerSettings"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Check Tracker Settings")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Check Tracker Settings Window."));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ void SohMenu::AddMenuSettings() {
|
|||
AddWidget(path, "Menu Settings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Menu Theme", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_SETTING("Menu.Theme"))
|
||||
.RaceDisable(false)
|
||||
.Options(ComboboxOptions()
|
||||
.Tooltip("Changes the Theme of the Menu Widgets.")
|
||||
.ComboMap(menuThemeOptions)
|
||||
|
|
@ -102,18 +103,21 @@ void SohMenu::AddMenuSettings() {
|
|||
#if not defined(__SWITCH__) and not defined(__WIIU__)
|
||||
AddWidget(path, "Menu Controller Navigation", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_IMGUI_CONTROLLER_NAV)
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Allows controller navigation of the port menu (Settings, Enhancements,...)\nCAUTION: "
|
||||
"This will disable game inputs while the menu is visible.\n\nD-pad to move between "
|
||||
"items, A to select, B to move up in scope."));
|
||||
AddWidget(path, "Menu Background Opacity", WIDGET_CVAR_SLIDER_FLOAT)
|
||||
.CVar(CVAR_SETTING("Menu.BackgroundOpacity"))
|
||||
.RaceDisable(false)
|
||||
.Options(FloatSliderOptions().DefaultValue(0.85f).IsPercentage().Tooltip(
|
||||
"Sets the opacity of the background of the port menu."));
|
||||
|
||||
AddWidget(path, "General Settings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Cursor Always Visible", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("CursorVisibility"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Ship::Context::GetInstance()->GetWindow()->SetForceCursorVisibility(
|
||||
CVarGetInteger(CVAR_SETTING("CursorVisibility"), 0));
|
||||
|
|
@ -122,6 +126,7 @@ void SohMenu::AddMenuSettings() {
|
|||
#endif
|
||||
AddWidget(path, "Search In Sidebar", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("Menu.SidebarSearch"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
if (CVarGetInteger(CVAR_SETTING("Menu.SidebarSearch"), 0)) {
|
||||
mSohMenu->InsertSidebarSearch();
|
||||
|
|
@ -133,13 +138,16 @@ void SohMenu::AddMenuSettings() {
|
|||
"Displays the Search menu as a sidebar entry in Settings instead of in the header."));
|
||||
AddWidget(path, "Search Input Autofocus", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("Menu.SearchAutofocus"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Search input box gets autofocus when visible. Does not affect using other widgets."));
|
||||
AddWidget(path, "Alt Assets Tab hotkey", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("Mods.AlternateAssetsHotkey"))
|
||||
.RaceDisable(false)
|
||||
.Options(
|
||||
CheckboxOptions().Tooltip("Allows pressing the Tab key to toggle alternate assets").DefaultValue(true));
|
||||
AddWidget(path, "Open App Files Folder", WIDGET_BUTTON)
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
std::string filesPath = Ship::Context::GetInstance()->GetAppDirectoryPath();
|
||||
SDL_OpenURL(std::string("file:///" + std::filesystem::absolute(filesPath).string()).c_str());
|
||||
|
|
@ -149,6 +157,7 @@ void SohMenu::AddMenuSettings() {
|
|||
AddWidget(path, "Boot", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Boot Sequence", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_SETTING("BootSequence"))
|
||||
.RaceDisable(false)
|
||||
.Options(ComboboxOptions()
|
||||
.DefaultIndex(BOOTSEQUENCE_DEFAULT)
|
||||
.LabelPosition(LabelPositions::Far)
|
||||
|
|
@ -160,9 +169,12 @@ void SohMenu::AddMenuSettings() {
|
|||
"File Select: Skip to file select menu"));
|
||||
|
||||
AddWidget(path, "Languages", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Translate Title Screen", WIDGET_CVAR_CHECKBOX).CVar(CVAR_SETTING("TitleScreenTranslation"));
|
||||
AddWidget(path, "Translate Title Screen", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("TitleScreenTranslation"))
|
||||
.RaceDisable(false);
|
||||
AddWidget(path, "Language", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_SETTING("Languages"))
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
auto options = std::static_pointer_cast<UIWidgets::ComboboxOptions>(info.options);
|
||||
SohMenu::UpdateLanguageMap(options->comboMap);
|
||||
|
|
@ -176,14 +188,17 @@ void SohMenu::AddMenuSettings() {
|
|||
#if defined(_WIN32) || defined(__APPLE__)
|
||||
AddWidget(path, "Text to Speech", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("A11yTTS"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Enables text to speech for in game dialog"));
|
||||
#endif
|
||||
AddWidget(path, "Disable Idle Camera Re-Centering", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("A11yDisableIdleCam"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Disables the automatic re-centering of the camera when idle."));
|
||||
AddWidget(path, "EXPERIMENTAL", WIDGET_SEPARATOR_TEXT).Options(TextOptions().Color(Colors::Orange));
|
||||
AddWidget(path, "ImGui Menu Scaling", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_SETTING("ImGuiScale"))
|
||||
.RaceDisable(false)
|
||||
.Options(ComboboxOptions()
|
||||
.ComboMap(imguiScaleOptions)
|
||||
.Tooltip("Changes the scaling of the ImGui menu elements.")
|
||||
|
|
@ -214,9 +229,11 @@ void SohMenu::AddMenuSettings() {
|
|||
|
||||
AddWidget(path, "Master Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_SETTING("Volume.Master"))
|
||||
.RaceDisable(false)
|
||||
.Options(IntSliderOptions().Min(0).Max(100).DefaultValue(40).ShowButtons(true).Format(""));
|
||||
AddWidget(path, "Main Music Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_SETTING("Volume.MainMusic"))
|
||||
.RaceDisable(false)
|
||||
.Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Audio_SetGameVolume(SEQ_PLAYER_BGM_MAIN,
|
||||
|
|
@ -224,6 +241,7 @@ void SohMenu::AddMenuSettings() {
|
|||
});
|
||||
AddWidget(path, "Sub Music Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_SETTING("Volume.SubMusic"))
|
||||
.RaceDisable(false)
|
||||
.Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Audio_SetGameVolume(SEQ_PLAYER_BGM_SUB,
|
||||
|
|
@ -231,6 +249,7 @@ void SohMenu::AddMenuSettings() {
|
|||
});
|
||||
AddWidget(path, "Fanfare Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_SETTING("Volume.Fanfare"))
|
||||
.RaceDisable(false)
|
||||
.Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Audio_SetGameVolume(SEQ_PLAYER_FANFARE,
|
||||
|
|
@ -238,11 +257,12 @@ void SohMenu::AddMenuSettings() {
|
|||
});
|
||||
AddWidget(path, "Sound Effects Volume: %d %%", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_SETTING("Volume.SFX"))
|
||||
.RaceDisable(false)
|
||||
.Options(IntSliderOptions().Min(0).Max(100).DefaultValue(100).ShowButtons(true).Format(""))
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Audio_SetGameVolume(SEQ_PLAYER_SFX, ((float)CVarGetInteger(CVAR_SETTING("Volume.SFX"), 100) / 100.0f));
|
||||
});
|
||||
AddWidget(path, "Audio API (Needs reload)", WIDGET_AUDIO_BACKEND);
|
||||
AddWidget(path, "Audio API (Needs reload)", WIDGET_AUDIO_BACKEND).RaceDisable(false);
|
||||
|
||||
// Graphics Settings
|
||||
static int32_t maxFps = 360;
|
||||
|
|
@ -253,10 +273,12 @@ void SohMenu::AddMenuSettings() {
|
|||
AddSidebarEntry("Settings", "Graphics", 3);
|
||||
AddWidget(path, "Graphics Options", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Toggle Fullscreen", WIDGET_BUTTON)
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); })
|
||||
.Options(ButtonOptions().Tooltip("Toggles Fullscreen On/Off."));
|
||||
AddWidget(path, "Internal Resolution", WIDGET_CVAR_SLIDER_FLOAT)
|
||||
.CVar(CVAR_INTERNAL_RESOLUTION)
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Ship::Context::GetInstance()->GetWindow()->SetResolutionMultiplier(
|
||||
CVarGetFloat(CVAR_INTERNAL_RESOLUTION, 1));
|
||||
|
|
@ -281,6 +303,7 @@ void SohMenu::AddMenuSettings() {
|
|||
#ifndef __WIIU__
|
||||
AddWidget(path, "Anti-aliasing (MSAA)", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_MSAA_VALUE)
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Ship::Context::GetInstance()->GetWindow()->SetMsaaLevel(CVarGetInteger(CVAR_MSAA_VALUE, 1));
|
||||
})
|
||||
|
|
@ -297,6 +320,7 @@ void SohMenu::AddMenuSettings() {
|
|||
const char* fpsFormat = fps == 20 ? "Original (%d)" : "%d";
|
||||
AddWidget(path, "Current FPS", WIDGET_CVAR_SLIDER_INT)
|
||||
.CVar(CVAR_SETTING("InterpolationFPS"))
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
auto options = std::static_pointer_cast<IntSliderOptions>(info.options);
|
||||
int32_t defaultValue = options->defaultValue;
|
||||
|
|
@ -313,28 +337,33 @@ void SohMenu::AddMenuSettings() {
|
|||
.Options(IntSliderOptions().Tooltip(tooltip).Min(20).Max(maxFps).DefaultValue(20).Format(fpsFormat));
|
||||
AddWidget(path, "Match Refresh Rate", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SETTING("MatchRefreshRate"))
|
||||
.RaceDisable(false)
|
||||
.Options(CheckboxOptions().Tooltip("Matches interpolation value to the refresh rate of your display."));
|
||||
AddWidget(path, "Renderer API (Needs reload)", WIDGET_VIDEO_BACKEND);
|
||||
AddWidget(path, "Renderer API (Needs reload)", WIDGET_VIDEO_BACKEND).RaceDisable(false);
|
||||
AddWidget(path, "Enable Vsync", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_VSYNC_ENABLED)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) { info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NO_VSYNC).active; })
|
||||
.Options(CheckboxOptions()
|
||||
.Tooltip("Removes tearing, but clamps your max FPS to your displays refresh rate.")
|
||||
.DefaultValue(true));
|
||||
AddWidget(path, "Windowed Fullscreen", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_SDL_WINDOWED_FULLSCREEN)
|
||||
.RaceDisable(false)
|
||||
.PreFunc([](WidgetInfo& info) {
|
||||
info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NO_WINDOWED_FULLSCREEN).active;
|
||||
})
|
||||
.Options(CheckboxOptions().Tooltip("Enables Windowed Fullscreen Mode."));
|
||||
AddWidget(path, "Allow multi-windows", WIDGET_CVAR_CHECKBOX)
|
||||
.CVar(CVAR_ENABLE_MULTI_VIEWPORTS)
|
||||
.RaceDisable(false)
|
||||
.PreFunc(
|
||||
[](WidgetInfo& info) { info.isHidden = mSohMenu->disabledMap.at(DISABLE_FOR_NO_MULTI_VIEWPORT).active; })
|
||||
.Options(CheckboxOptions().Tooltip(
|
||||
"Allows multiple windows to be opened at once. Requires a reload to take effect."));
|
||||
AddWidget(path, "Texture Filter (Needs reload)", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_TEXTURE_FILTER)
|
||||
.RaceDisable(false)
|
||||
.Options(ComboboxOptions().Tooltip("Sets the applied Texture Filtering.").ComboMap(textureFilteringMap));
|
||||
|
||||
path.column = SECTION_COLUMN_2;
|
||||
|
|
@ -347,6 +376,7 @@ void SohMenu::AddMenuSettings() {
|
|||
AddWidget(path, "Controller Bindings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Popout Bindings Window", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("ControllerConfiguration"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Configure Controller")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Bindings Window."));
|
||||
|
||||
|
|
@ -356,12 +386,14 @@ void SohMenu::AddMenuSettings() {
|
|||
AddWidget(path, "Input Viewer", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Toggle Input Viewer", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("InputViewer"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Input Viewer")
|
||||
.Options(WindowButtonOptions().Tooltip("Toggles the Input Viewer.").EmbedWindow(false));
|
||||
|
||||
AddWidget(path, "Input Viewer Settings", WIDGET_SEPARATOR_TEXT);
|
||||
AddWidget(path, "Popout Input Viewer Settings", WIDGET_WINDOW_BUTTON)
|
||||
.CVar(CVAR_WINDOW("InputViewerSettings"))
|
||||
.RaceDisable(false)
|
||||
.WindowName("Input Viewer Settings")
|
||||
.Options(WindowButtonOptions().Tooltip("Enables the separate Input Viewer Settings Window."));
|
||||
|
||||
|
|
@ -371,12 +403,14 @@ void SohMenu::AddMenuSettings() {
|
|||
AddSidebarEntry("Settings", path.sidebarName, 3);
|
||||
AddWidget(path, "Position", WIDGET_CVAR_COMBOBOX)
|
||||
.CVar(CVAR_SETTING("Notifications.Position"))
|
||||
.RaceDisable(false)
|
||||
.Options(ComboboxOptions()
|
||||
.Tooltip("Which corner of the screen notifications appear in.")
|
||||
.ComboMap(notificationPosition)
|
||||
.DefaultIndex(3));
|
||||
AddWidget(path, "Duration (seconds):", WIDGET_CVAR_SLIDER_FLOAT)
|
||||
.CVar(CVAR_SETTING("Notifications.Duration"))
|
||||
.RaceDisable(false)
|
||||
.Options(FloatSliderOptions()
|
||||
.Tooltip("How long notifications are displayed for.")
|
||||
.Format("%.1f")
|
||||
|
|
@ -386,12 +420,14 @@ void SohMenu::AddMenuSettings() {
|
|||
.DefaultValue(10.0f));
|
||||
AddWidget(path, "Background Opacity", WIDGET_CVAR_SLIDER_FLOAT)
|
||||
.CVar(CVAR_SETTING("Notifications.BgOpacity"))
|
||||
.RaceDisable(false)
|
||||
.Options(FloatSliderOptions()
|
||||
.Tooltip("How opaque the background of notifications is.")
|
||||
.DefaultValue(0.5f)
|
||||
.IsPercentage());
|
||||
AddWidget(path, "Size:", WIDGET_CVAR_SLIDER_FLOAT)
|
||||
.CVar(CVAR_SETTING("Notifications.Size"))
|
||||
.RaceDisable(false)
|
||||
.Options(FloatSliderOptions()
|
||||
.Tooltip("How large notifications are.")
|
||||
.Format("%.1f")
|
||||
|
|
@ -400,6 +436,7 @@ void SohMenu::AddMenuSettings() {
|
|||
.Max(5.0f)
|
||||
.DefaultValue(1.8f));
|
||||
AddWidget(path, "Test Notification", WIDGET_BUTTON)
|
||||
.RaceDisable(false)
|
||||
.Callback([](WidgetInfo& info) {
|
||||
Notification::Emit({
|
||||
.itemIcon = "__OTR__textures/icon_item_24_static/gQuestIconGoldSkulltulaTex",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,7 +3,7 @@
|
|||
#include <libultraship/libultraship.h>
|
||||
#include "soh/resource/type/Scene.h"
|
||||
#include <utils/StringHelper.h>
|
||||
#include "soh/Enhancements/game-interactor/GameInteractor.h"
|
||||
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
|
||||
#include "global.h"
|
||||
#include "vt.h"
|
||||
#include <Vertex.h>
|
||||
|
|
@ -59,7 +59,7 @@ extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneId, s32 spawn) {
|
|||
|
||||
osSyncPrintf("ROOM SIZE=%fK\n", roomSize / 1024.0f);
|
||||
|
||||
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(play->sceneNum);
|
||||
GameInteractor_ExecuteOnSceneInit(play->sceneNum);
|
||||
SPDLOG_INFO("Scene Init - sceneNum: {0:#x}, entranceIndex: {1:#x}", play->sceneNum, gSaveContext.entranceIndex);
|
||||
}
|
||||
|
||||
|
|
@ -79,6 +79,7 @@ void OTRPlay_InitScene(PlayState* play, s32 spawn) {
|
|||
YREG(15) = 0;
|
||||
gSaveContext.worldMapArea = 0;
|
||||
OTRScene_ExecuteCommands(play, (SOH::Scene*)play->sceneSegment);
|
||||
GameInteractor_ExecuteAfterSceneCommands(play->sceneNum);
|
||||
Play_InitEnvironment(play, play->skyboxId);
|
||||
/* auto data = static_cast<LUS::Vertex*>(Ship::Context::GetInstance()
|
||||
->GetResourceManager()
|
||||
|
|
|
|||
|
|
@ -2411,6 +2411,9 @@ u8 Item_Give(PlayState* play, u8 item) {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
if (item == ITEM_LETTER_RUTO) {
|
||||
Flags_SetRandomizerInf(RAND_INF_OBTAINED_RUTOS_LETTER);
|
||||
}
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (gSaveContext.inventory.items[temp + i] == ITEM_NONE) {
|
||||
gSaveContext.inventory.items[temp + i] = item;
|
||||
|
|
@ -2434,6 +2437,9 @@ u8 Item_Give(PlayState* play, u8 item) {
|
|||
}
|
||||
} else {
|
||||
Flags_SetRandomizerInf(item - ITEM_WEIRD_EGG + RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG);
|
||||
if (item == ITEM_WEIRD_EGG) {
|
||||
Flags_SetRandomizerInf(RAND_INF_WEIRD_EGG);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5170,7 +5170,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
|
|||
if (Actor_HasParent(&this->actor, play)) {
|
||||
this->stateAndTimer = 24;
|
||||
} else {
|
||||
if (!GameInteractor_Should(VB_GIVE_RANDO_GLITCH_FISHING_PRIZE, false, &this)) {
|
||||
if (!GameInteractor_Should(VB_GIVE_RANDO_GLITCH_FISHING_PRIZE, false, this)) {
|
||||
Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLDEN, 2000.0f, 1000.0f);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12773,9 +12773,8 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
|
|||
if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
|
||||
temp2 += sControlInput->rel.stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
|
||||
}
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) &&
|
||||
fabsf(sControlInput->cur.right_stick_y) > 15.0f) {
|
||||
temp2 += sControlInput->cur.right_stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
|
||||
temp2 += sControlInput->rel.right_stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
|
||||
}
|
||||
if (fabsf(sControlInput->cur.gyro_x) > 0.01f) {
|
||||
temp2 += (-sControlInput->cur.gyro_x) * 750.0f;
|
||||
|
|
@ -12792,9 +12791,8 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
|
|||
if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
|
||||
temp2 += sControlInput->rel.stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
|
||||
}
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) &&
|
||||
fabsf(sControlInput->cur.right_stick_x) > 15.0f) {
|
||||
temp2 += sControlInput->cur.right_stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
|
||||
temp2 += sControlInput->rel.right_stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
|
||||
}
|
||||
if (fabsf(sControlInput->cur.gyro_y) > 0.01f) {
|
||||
temp2 += (sControlInput->cur.gyro_y) * 750.0f * invertXAxisMulti;
|
||||
|
|
@ -12810,10 +12808,9 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
|
|||
(s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f) * invertYAxisMulti *
|
||||
yAxisMulti;
|
||||
}
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) &&
|
||||
fabsf(sControlInput->cur.right_stick_y) > 15.0f) {
|
||||
temp3 += ((sControlInput->cur.right_stick_y >= 0) ? 1 : -1) *
|
||||
(s32)((1.0f - Math_CosS(sControlInput->cur.right_stick_y * 200)) * 1500.0f) * invertYAxisMulti *
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
|
||||
temp3 += ((sControlInput->rel.right_stick_y >= 0) ? 1 : -1) *
|
||||
(s32)((1.0f - Math_CosS(sControlInput->rel.right_stick_y * 200)) * 1500.0f) * invertYAxisMulti *
|
||||
yAxisMulti;
|
||||
}
|
||||
if (fabsf(sControlInput->cur.gyro_x) > 0.01f) {
|
||||
|
|
@ -12831,10 +12828,9 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
|
|||
(s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f) * invertXAxisMulti *
|
||||
xAxisMulti;
|
||||
}
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) &&
|
||||
fabsf(sControlInput->cur.right_stick_x) > 15.0f) {
|
||||
temp3 += ((sControlInput->cur.right_stick_x >= 0) ? 1 : -1) *
|
||||
(s32)((1.0f - Math_CosS(sControlInput->cur.right_stick_x * 200)) * -1500.0f) * invertXAxisMulti *
|
||||
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
|
||||
temp3 += ((sControlInput->rel.right_stick_x >= 0) ? 1 : -1) *
|
||||
(s32)((1.0f - Math_CosS(sControlInput->rel.right_stick_x * 200)) * -1500.0f) * invertXAxisMulti *
|
||||
xAxisMulti;
|
||||
}
|
||||
if (fabsf(sControlInput->cur.gyro_y) > 0.01f) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue