mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporary Fishing Fixes for rando (#1525) 

Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2022-09-19 22:55:46 -04:00 committed by GitHub
parent 978b325a30
commit b18cc9d628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/GameMenuBar.cpp
View File

@ -399,16 +399,14 @@ namespace GameMenuBar {
// Allow the cursor to be on any slot // Allow the cursor to be on any slot
CVar_SetS32("gPauseAnyCursor", 1); CVar_SetS32("gPauseAnyCursor", 1);
// Instant Fishing
CVar_SetS32("gInstantFishing", 1);
// Guarantee Bite // Guarantee Bite
CVar_SetS32("gGuaranteeFishingBite", 1); CVar_SetS32("gGuaranteeFishingBite", 1);
// Fish Never Escape // Fish Never Escape
CVar_SetS32("gFishNeverEscape", 1); CVar_SetS32("gFishNeverEscape", 1);
// Child Minimum Weight (6 to 10) // Child Minimum Weight (6 to 10)
CVar_SetS32("gChildMinimumWeightFish", 6); CVar_SetS32("gChildMinimumWeightFish", 3);
// Adult Minimum Weight (8 to 13) // Adult Minimum Weight (8 to 13)
CVar_SetS32("gAdultMinimumWeightFish", 8); CVar_SetS32("gAdultMinimumWeightFish", 6);
// Visual Stone of Agony // Visual Stone of Agony
CVar_SetS32("gVisualAgony", 1); CVar_SetS32("gVisualAgony", 1);
@ -861,9 +859,9 @@ namespace GameMenuBar {
UIWidgets::Tooltip("When a line is stable, guarantee bite. Otherwise use default logic"); UIWidgets::Tooltip("When a line is stable, guarantee bite. Otherwise use default logic");
UIWidgets::PaddedEnhancementCheckbox("Fish Never Escape", "gFishNeverEscape", true, false); UIWidgets::PaddedEnhancementCheckbox("Fish Never Escape", "gFishNeverEscape", true, false);
UIWidgets::Tooltip("Once a hook has been set, fish will never let go while being reeled in."); UIWidgets::Tooltip("Once a hook has been set, fish will never let go while being reeled in.");
UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", "gChildMinimumWeightFish", 6, 10, "", 10, false, true, false); UIWidgets::PaddedEnhancementSliderInt("Child Minimum Weight: %d", "##cMinimumWeight", "gChildMinimumWeightFish", 3, 10, "", 10, false, true, false);
UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child"); UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", "gAdultMinimumWeightFish", 8, 13, "", 13, false, true, false); UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", "gAdultMinimumWeightFish", 6, 13, "", 13, false, true, false);
UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult"); UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult");
ImGui::EndMenu(); ImGui::EndMenu();
} }

12
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
View File

@ -2901,18 +2901,8 @@ f32 Fishing_GetMinimumRequiredScore() {
// values above rando fish weight values when rando'd // values above rando fish weight values when rando'd
if(sLinkAge == 1) { if(sLinkAge == 1) {
weight = CVar_GetS32("gChildMinimumWeightFish", 10); weight = CVar_GetS32("gChildMinimumWeightFish", 10);
if (gSaveContext.n64ddFlag) {
if (weight > 8) {
weight = 8;
}
}
} else { } else {
weight = CVar_GetS32("gAdultMinimumWeightFish", 13); weight = CVar_GetS32("gAdultMinimumWeightFish", 13);
if (gSaveContext.n64ddFlag) {
if (weight > 10) {
weight = 10;
}
}
} }
return sqrt(((f32)weight - 0.5f) / 0.0036f); return sqrt(((f32)weight - 0.5f) / 0.0036f);