Skip to content

Commit 96d3b48

Browse files
MalkierianMalkierian
authored
Merge pull request HarbourMasters#5638 from Malkierian/blair-dev-6-30
Blair->Dev 6/30
2 parents 063fb25 + 7f3d2ad commit 96d3b48

36 files changed

+486
-292
lines changed

‎soh/assets/custom/presets/Main Enhanced.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
"SkipText": 1,
4545
"TextSpeed": 5,
4646
"TimeFlowFileSelect": 1,
47+
"TimeSavers": {
48+
"SkipJabuJabuFish": 1
49+
},
4750
"TwoHandedIdle": 1,
4851
"VisualAgony": 1,
4952
"WidescreenActorCulling": 1

‎soh/assets/custom/presets/Main Randomizer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
"Story": 1
117117
},
118118
"SkipForcedDialog": 3,
119+
"SkipJabuJabuFish": 1,
119120
"SkipMiscInteractions": 1,
120121
"SkipOwlInteractions": 1,
121122
"SkipTowerEscape": 1,

‎soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/SkipChildRutoInteractions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void Ru1Init(void* actorRef) {
1414
if (enRu1->action == 22) {
1515
enRu1->action = 27;
1616
enRu1->drawConfig = 1;
17-
enRu1->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY;
17+
enRu1->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY);
1818
Animation_Change(&enRu1->skelAnime, (AnimationHeader*)&gRutoChildSittingAnim, 1.0f, 0.0f,
1919
Animation_GetLastFrame((void*)&gRutoChildSittingAnim), ANIMMODE_LOOP, 0.0f);
2020
}

‎soh/soh/Enhancements/controls/SohInputEditorWindow.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,10 +1366,10 @@ void SohInputEditorWindow::DrawCameraControlPanel() {
13661366
.Color(THEME_COLOR)
13671367
.Tooltip("Allows for aiming with the right stick in:\n-First-Person/C-Up view\n-Weapon Aiming"));
13681368
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
1369-
CVarCheckbox("Allow moving while in first person mode", CVAR_SETTING("MoveInFirstPerson"),
1369+
CVarCheckbox("Allow moving while in first-person mode", CVAR_SETTING("MoveInFirstPerson"),
13701370
CheckboxOptions()
13711371
.Color(THEME_COLOR)
1372-
.Tooltip("Changes the left stick to move the player while in first person mode"));
1372+
.Tooltip("Changes the left stick to move the player while in first-person mode"));
13731373
}
13741374
CVarCheckbox("Invert Aiming X Axis", CVAR_SETTING("Controls.InvertAimingXAxis"),
13751375
CheckboxOptions()
@@ -1432,7 +1432,9 @@ void SohInputEditorWindow::DrawCameraControlPanel() {
14321432
CheckboxOptions()
14331433
.Color(THEME_COLOR)
14341434
.Tooltip("Enables free look camera control\nNote: You must remap C buttons off of the right stick in the "
1435-
"controller config menu, and map the camera stick to the right stick."));
1435+
"controller config menu, and map the camera stick to the right stick.\n"
1436+
"Doesn't work in areas were the game locks the camera.\n"
1437+
"Scene reload may be necessary to enable."));
14361438
CVarCheckbox("Invert Camera X Axis", CVAR_SETTING("FreeLook.InvertXAxis"),
14371439
CheckboxOptions().Color(THEME_COLOR).Tooltip("Inverts the Camera X Axis in:\n-Free look"));
14381440
CVarCheckbox(

‎soh/soh/Enhancements/custom-message/CustomMessageManager.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class CustomMessage {
4747
TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
4848
CustomMessage(std::string english_, TextBoxType type_ = TEXTBOX_TYPE_BLACK,
4949
TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
50+
// RANDOTODO trying to declare this with capital and type causes ambiguity with the first signature
5051
CustomMessage(std::string english_, std::vector<std::string> colors_, std::vector<bool> capital_ = {},
5152
TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);
5253
CustomMessage(Text text, TextBoxType type_ = TEXTBOX_TYPE_BLACK, TextBoxPosition position_ = TEXTBOX_POS_BOTTOM);

‎soh/soh/Enhancements/debugconsole.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,10 +1471,7 @@ static bool AvailableChecksProcessUndiscoveredExitsHandler(std::shared_ptr<Ship:
14711471
INFO_MESSAGE("[SOH] Available Checks - Process Undiscovered Exits %s",
14721472
logic->ACProcessUndiscoveredExits ? "enabled" : "disabled");
14731473

1474-
if (GameInteractor::IsSaveLoaded(true)) {
1475-
CheckTracker::RecalculateAvailableChecks();
1476-
}
1477-
1474+
CheckTracker::RecalculateAvailableChecks();
14781475
return 0;
14791476
}
14801477

‎soh/soh/Enhancements/randomizer/3drando/hint_list.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,27 +1972,27 @@ void StaticData::HintTable_Init() {
19721972
hintTextTable[RHT_BRIDGE_OPEN_HINT] = HintText(CustomMessage("$lThe awakened ones have #already created a bridge# to the castle where the evil dwells.^",
19731973
/*german*/ "$lDie Weisen haben #bereits&eine Brücke zum Portal von&Ganons Schloß gelegt#...^",
19741974
/*french*/ "$lLes êtres de sagesse ont#déjà créé un pont# vers le repaire du mal.^",
1975-
{QM_LBLUE}));
1975+
{QM_LBLUE}, {}, TEXTBOX_TYPE_BLUE));
19761976
// /*spanish*/$lLos sabios #ya habrán creado un puente#&al castillo, de donde emana el mal.^
19771977

19781978

19791979
hintTextTable[RHT_BRIDGE_VANILLA_HINT] = HintText(CustomMessage("$6The awakened ones require the #Shadow and Spirit Medallions# as well as the #Light Arrows#.^",
19801980
/*german*/ "$6Die Weisen, die darauf warten,&daß der Held das #Amulett des Schattens, Amulett der Geister#&und die #Licht-Pfeile# sammelt.^",
19811981
/*french*/ "$6Les êtres de sagesse attendront le héros muni des #Médaillons de l'Ombre et l'Esprit# et des #Flèches de Lumière#.^",
1982-
{QM_RED, QM_YELLOW}));
1982+
{QM_RED, QM_YELLOW}, {}, TEXTBOX_TYPE_BLUE));
19831983
// /*spanish*/$6Los sabios aguardarán a que el héroe obtenga tanto el #Medallón de las Sombras y el del Espíritu# junto
19841984
// a la #flecha de luz#.^
19851985

19861986
hintTextTable[RHT_BRIDGE_STONES_HINT] = HintText(CustomMessage("$0The awakened ones will await for the Hero to collect #[[d]] Spiritual Stone||s|#.^",
19871987
/*german*/ "$0Die Weisen werden darauf&warten, daß der Held&#[[d]] |Heiligen Stein|Heilige Steine|# sammelt.^",
19881988
/*french*/ "$0Les êtres de sagesse attendront le héros muni de #[[d]] |Pierre Ancestrale|Pierres Ancestrales|#.^",
1989-
{QM_BLUE}));
1989+
{QM_BLUE}, {}, TEXTBOX_TYPE_BLUE));
19901990
// /*spanish*/$0Los sabios aguardarán a que el héroe&obtenga #[[d]] |piedra espiritual|piedras espirituales|#.^
19911991

19921992
hintTextTable[RHT_BRIDGE_MEDALLIONS_HINT] = HintText(CustomMessage("$8The awakened ones will await for the Hero to collect #[[d]] Medallion||s|#.^",
19931993
/*german*/ "$8Die Weisen werden darauf&warten, daß der Held&#[[d]] Amulett||e|# sammelt.^",
19941994
/*french*/ "$8Les êtres de sagesse attendront le héros muni de #[[d]] Médaillon||s|#.^",
1995-
{QM_RED}));
1995+
{QM_RED}, {}, TEXTBOX_TYPE_BLUE));
19961996
// /*spanish*/$8Los sabios aguardarán a que el héroe&obtenga #[[d]] |medallón|medallones|#.^
19971997

19981998
hintTextTable[RHT_BRIDGE_REWARDS_HINT] = HintText(CustomMessage("$CThe awakened ones will await for the Hero to collect #[[d]]# |#Spiritual Stone# or #Medallion#|"
@@ -2001,26 +2001,26 @@ void StaticData::HintTable_Init() {
20012001
"#Heilige Steine# oder #Amulette#| sammelt.^",
20022002
/*french*/ "$CLes êtres de sagesse attendront le héros muni de #[[d]]# |#Pierre Ancestrale# ou #Médaillon#"
20032003
"|#Pierres Ancestrales# ou #Médaillons#|.^",
2004-
{QM_YELLOW, QM_BLUE, QM_RED}));
2004+
{QM_YELLOW, QM_BLUE, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
20052005
// /*spanish*/$CLos sabios aguardarán a que el héroe obtenga #[[d]]# |#piedra espiritual# o #medallón#|
20062006
//#piedras espirtuales# y #medallones#|.^
20072007

20082008
hintTextTable[RHT_BRIDGE_DUNGEONS_HINT] = HintText(CustomMessage("$mThe awakened ones will await for the Hero to conquer #[[d]] Dungeon||s|#.^",
20092009
/*german*/ "$mDie Weisen werden darauf&warten, daß der Held&#[[d]] Labyrinth||e|# abschließt.^",
20102010
/*french*/ "$mLes êtres de sagesse attendront la conquête de #[[d]] Donjon||s|#.^",
2011-
{QM_PINK}));
2011+
{QM_PINK}, {}, TEXTBOX_TYPE_BLUE));
20122012
// /*spanish*/$mLos sabios aguardarán a que el héroe complete #[[d]] mazmorra||s|#.^
20132013

20142014
hintTextTable[RHT_BRIDGE_TOKENS_HINT] = HintText(CustomMessage("$sThe awakened ones will await for the Hero to collect #[[d]] Gold Skulltula Token||s|#.^",
20152015
/*german*/ "$sDie Weisen werden darauf&warten, daß der Held&#[[d]] Skulltula-Symbol||e|# sammelt.^",
20162016
/*french*/ "$sLes êtres de sagesse attendront le héros muni de #[[d]] Symbole||s| de Skulltula d'or#.^",
2017-
{QM_YELLOW}));
2017+
{QM_YELLOW}, {}, TEXTBOX_TYPE_BLUE));
20182018
// /*spanish*/$sLos sabios aguardarán a que el héroe obtenga #[[d]] símbolo||s| de skulltula dorada#.^
20192019

20202020
hintTextTable[RHT_BRIDGE_GREG_HINT] = HintText(CustomMessage("$gThe awakened ones will await for the Hero to find #Greg#.^",
20212021
/*german*/ "$gDie Weisen werden darauf&warten, daß der Held&#Greg# findet.^",
20222022
/*french*/ "$gLes êtres de sagesse attendront le héros muni de #Greg#.^",
2023-
{QM_GREEN}));
2023+
{QM_GREEN}, {}, TEXTBOX_TYPE_BLUE));
20242024

20252025

20262026
/*--------------------------
@@ -2174,22 +2174,22 @@ void StaticData::HintTable_Init() {
21742174
hintTextTable[RHT_CHILD_ALTAR_STONES] = HintText(CustomMessage("3 Spiritual Stones found in Hyrule...^$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
21752175
/*german*/ "Drei Heilige Steine, zu finden in Hyrule...^$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
21762176
/*french*/ "Les trois Pierres Ancestrales cachées&dans Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^",
2177-
{QM_GREEN, QM_RED, QM_BLUE}, {true, true, true}));
2177+
{QM_GREEN, QM_RED, QM_BLUE}, {true, true, true}, TEXTBOX_TYPE_BLUE));
21782178
// /*spanish*/ Tres piedras espirituales halladas por Hyrule...$0#[[1]]#...^$1#[[2]]#...^$2#[[3]]#...^
21792179

21802180
hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTOPEN] = HintText(CustomMessage("$oYe who may become a Hero...&The path to the future is open...",
21812181
/*german*/ "$oJener auf dem Weg des Helden...&Der Pfad zur Zukunft sei geöffnet...",
2182-
/*french*/ "$oÀ celui qui a quête de devenir&héros...&Le futur vous accueille béant..."));
2182+
/*french*/ "$oÀ celui qui a quête de devenir&héros...&Le futur vous accueille béant...", TEXTBOX_TYPE_BLUE));
21832183
// /*spanish*/$oPara aquel que se convierta en el héroe...&La puerta al futuro está a su disposición...
21842184

21852185
hintTextTable[RHT_CHILD_ALTAR_TEXT_END_DOTSONGONLY] = HintText(CustomMessage("$cYe who may become a Hero...&Stand with the Ocarina and&play the Song of Time.",
21862186
/*german*/ "$cJener auf dem Weg des Helden...&Nehme er seine Okarina zur Hand und spiele hier die Hymne der Zeit.",
2187-
/*french*/ "$cÀ celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps."));
2187+
/*french*/ "$cÀ celui qui a quête de devenir&héros...&Portez l'Ocarina et jouez&le chant du temps.", TEXTBOX_TYPE_BLUE));
21882188
// /*spanish*/$cPara aquel que se convierta en el héroe...&Tome la ocarina y&entone la Canción del Tiempo.
21892189

21902190
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.",
21912191
/*german*/ "$iJener mit den drei Heiligen Steinen nehme er seine Okarina zur Hand und spiele hier die Hymne der Zeit.",
2192-
/*french*/ "$iÀ celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps."));
2192+
/*french*/ "$iÀ celui qui a quête de devenir&héros... Présentez les Pierres&Ancestrales et jouez&le chant du temps.", TEXTBOX_TYPE_BLUE));
21932193
// /*spanish*/$iPara aquel que se convierta en el héroe...&Tome las piedras espirituales y&entone la Canción del Tiempo.
21942194

21952195
hintTextTable[RHT_ADULT_ALTAR_MEDALLIONS] = HintText(CustomMessage("An awakening voice from the Sacred Realm will call those destined to be Sages, who dwell in the #five temples#.^"

0 commit comments

Comments
 (0)