mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-10-31 15:45:06 -04:00
Rename cvar and fix check tracker
This commit is contained in:
parent
6cd110b934
commit
23570e2963
@ -161,7 +161,7 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
|
||||
(location.GetRandomizerCheck() != RC_KF_KOKIRI_SWORD_CHEST ||
|
||||
CVarGetInteger("gRandomizeShuffleKokiriSword", RO_GENERIC_NO)) &&
|
||||
(location.GetRandomizerCheck() != RC_LH_HYRULE_LOACH ||
|
||||
CVarGetInteger("gRandomizeShuffleHyruleLoachReward", RO_GENERIC_NO)) &&
|
||||
CVarGetInteger("gRandomizeFishsanity", RO_GENERIC_NO) == RO_FISHSANITY_HYRULE_LOACH) &&
|
||||
(location.GetRandomizerCheck() != RC_ZR_MAGIC_BEAN_SALESMAN ||
|
||||
CVarGetInteger("gRandomizeShuffleBeans", RO_GENERIC_NO)) &&
|
||||
(location.GetRandomizerCheck() != RC_HC_MALON_EGG ||
|
||||
|
@ -879,7 +879,7 @@ void DrawEnhancementsMenu() {
|
||||
UIWidgets::Tooltip("The minimum weight for the unique fishing reward as a child");
|
||||
UIWidgets::PaddedEnhancementSliderInt("Adult Minimum Weight: %d", "##aMinimumWeight", "gAdultMinimumWeightFish", 6, 13, "", 13, true, true, false, disabled, disabledTooltip);
|
||||
UIWidgets::Tooltip("The minimum weight for the unique fishing reward as an adult");
|
||||
UIWidgets::PaddedEnhancementCheckbox("All fish are Hyrule Loaches", "gAllHyruleLoaches", true, false, disabled, disabledTooltip);
|
||||
UIWidgets::PaddedEnhancementCheckbox("All fish are Hyrule Loaches", "gEnhancements.AllHyruleLoaches", true, false, disabled, disabledTooltip);
|
||||
UIWidgets::Tooltip("Every fish in the fishing pond will always be a Hyrule Loach");
|
||||
ImGui::EndMenu();
|
||||
}
|
||||
|
@ -1000,7 +1000,7 @@ void Fishing_Init(Actor* thisx, PlayState* play2) {
|
||||
sFishInits[i].pos.z, 0, Rand_ZeroFloat(0x10000), 0, 100 + i, true);
|
||||
}
|
||||
} else {
|
||||
u8 allHyruleLoaches = CVarGetInteger("gCustomizeFishing", 0) && CVarGetInteger("gAllHyruleLoaches", 0);
|
||||
u8 allHyruleLoaches = CVarGetInteger("gCustomizeFishing", 0) && CVarGetInteger("gEnhancements.AllHyruleLoaches", 0);
|
||||
if ((thisx->params < (EN_FISH_PARAM + 15) && !allHyruleLoaches) || (thisx->params == EN_FISH_AQUARIUM)) {
|
||||
SkelAnime_InitFlex(play, &this->skelAnime, &gFishingFishSkel, &gFishingFishAnim, NULL, NULL, 0);
|
||||
Animation_MorphToLoop(&this->skelAnime, &gFishingFishAnim, 0.0f);
|
||||
|
Loading…
Reference in New Issue
Block a user