mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 17:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Add ability to disable fish randomly escaping

Browse Source
This commit is contained in:
Josh Bodner 2022-09-08 17:58:26 -07:00 committed by briaguya
parent c9aafcf7c5
commit 55e79cd9d2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/soh/GameMenuBar.cpp
View File

@ -209,6 +209,8 @@ namespace GameMenuBar {
CVar_SetS32("gInstantFishing", 0); CVar_SetS32("gInstantFishing", 0);
// Guarantee Bite // Guarantee Bite
CVar_SetS32("gGuaranteeFishingBite", 0); CVar_SetS32("gGuaranteeFishingBite", 0);
// Fish Never Escape
CVar_SetS32("gFishNeverEscape", 0);
// Child Minimum Weight (6 to 10) // Child Minimum Weight (6 to 10)
CVar_SetS32("gChildMinimumWeightFish", 10); CVar_SetS32("gChildMinimumWeightFish", 10);
// Adult Minimum Weight (8 to 13) // Adult Minimum Weight (8 to 13)
@ -401,6 +403,8 @@ namespace GameMenuBar {
CVar_SetS32("gInstantFishing", 1); CVar_SetS32("gInstantFishing", 1);
// Guarantee Bite // Guarantee Bite
CVar_SetS32("gGuaranteeFishingBite", 1); CVar_SetS32("gGuaranteeFishingBite", 1);
// Fish Never Escape
CVar_SetS32("gFishNeverEscape", 1);
// Child Minimum Weight (6 to 10) // Child Minimum Weight (6 to 10)
CVar_SetS32("gChildMinimumWeightFish", 6); CVar_SetS32("gChildMinimumWeightFish", 6);
// Adult Minimum Weight (8 to 13) // Adult Minimum Weight (8 to 13)
@ -850,6 +854,8 @@ namespace GameMenuBar {
UIWidgets::Tooltip("All fish will be caught instantly"); UIWidgets::Tooltip("All fish will be caught instantly");
UIWidgets::PaddedEnhancementCheckbox("Guarantee Bite", "gGuaranteeFishingBite", true, false); UIWidgets::PaddedEnhancementCheckbox("Guarantee Bite", "gGuaranteeFishingBite", true, false);
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::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", 6, 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", 8, 13, "", 13, false, true, false);

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

@ -2926,6 +2926,10 @@ bool getGuaranteeBite() {
return CVar_GetS32("gGuaranteeFishingBite", 0); return CVar_GetS32("gGuaranteeFishingBite", 0);
} }
bool getFishNeverEscape() {
return CVar_GetS32("gFishNeverEscape", 0);
}
void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) { void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
s16 i; s16 i;
s16 sp134 = 10; s16 sp134 = 10;
@ -3837,7 +3841,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
if ((D_80B7A694 < 3) || ((D_80B7E074 != 0) && (D_80B7E080 > 50)) || (D_80B7E080 >= 6000) || if ((D_80B7A694 < 3) || ((D_80B7E074 != 0) && (D_80B7E080 > 50)) || (D_80B7E080 >= 6000) ||
((D_80B7E122 == 0) && (D_80B7E124 == 0)) || (D_80B7E116 == 0) || ((D_80B7E122 == 0) && (D_80B7E124 == 0)) || (D_80B7E116 == 0) ||
(((D_80B7E0AE & 0x7F) == 0) && (Rand_ZeroOne() < 0.05f) && (D_80B7E0B6 != 2) && (KREG(69) == 0))) { (((D_80B7E0AE & 0x7F) == 0) && (Rand_ZeroOne() < 0.05f) && (D_80B7E0B6 != 2) && (KREG(69) == 0) && (getFishNeverEscape() == 0))) {
D_80B7A67C = 20; D_80B7A67C = 20;
if ((D_80B7E122 == 0) && (D_80B7E124 == 0)) { if ((D_80B7E122 == 0) && (D_80B7E124 == 0)) {