github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 10:37:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[Enhancement] Added checkbox to disable finishing difficulty behavior changes (#1990)

Browse source
This commit is contained in:
Oliver Schall 2022-11-23 13:43:06 +01:00 • committed by GitHub
commit 4526550e95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -2900,24 +2900,24 @@ f32 Fishing_GetMinimumRequiredScore() {
// RANDOTODO: update the enhancement sliders to not allow
// values above rando fish weight values when rando'd
if(sLinkAge == 1) {
weight = CVar_GetS32("gChildMinimumWeightFish", 10);
weight = CVar_GetS32("gCustomizeFishing", 0) ? CVar_GetS32("gChildMinimumWeightFish", 10) : 10;
} else {
weight = CVar_GetS32("gAdultMinimumWeightFish", 13);
weight = CVar_GetS32("gCustomizeFishing", 0) ? CVar_GetS32("gAdultMinimumWeightFish", 13) : 13;
}
return sqrt(((f32)weight - 0.5f) / 0.0036f);
}
bool getInstantFish() {
return CVar_GetS32("gInstantFishing", 0);
return CVar_GetS32("gCustomizeFishing", 0) && CVar_GetS32("gInstantFishing", 0);
}
bool getGuaranteeBite() {
return CVar_GetS32("gGuaranteeFishingBite", 0);
return CVar_GetS32("gCustomizeFishing", 0) && CVar_GetS32("gGuaranteeFishingBite", 0);
}
bool getFishNeverEscape() {
return CVar_GetS32("gFishNeverEscape", 0);
return CVar_GetS32("gCustomizeFishing", 0) && CVar_GetS32("gFishNeverEscape", 0);
}
void Fishing_UpdateFish(Actor* thisx, PlayState* play2) {