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

[Time Saver Enhancement] Dampe Appears All Night (#2618) 

* Dampe Appears All Night

* Take out time check
This commit is contained in:
Patrick12115 2023-04-02 04:19:58 -04:00 committed by GitHub
parent ca23d87a3a
commit b099b5649b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
soh/soh/Enhancements/presets.h
View File

@ -129,6 +129,7 @@ const std::vector<const char*> enhancementsCvars = {
"gTimeFlowFileSelect",
"gInjectItemCounts",
"gDayGravePull",
"gDampeAllNight",
"gSkipScarecrow",
"gBlueFireArrows",
"gSunlightArrows",

2
soh/soh/GameMenuBar.cpp
View File

@ -354,6 +354,8 @@ namespace GameMenuBar {
"to the guard next to the gate.");
UIWidgets::PaddedEnhancementCheckbox("Faster Farore's Wind", "gFastFarores", true, false);
UIWidgets::Tooltip("Greatly decreases cast time of Farore's Wind magic spell.");
UIWidgets::PaddedEnhancementCheckbox("Dampe Appears All Night", "gDampeAllNight", true, false);
UIWidgets::Tooltip("Makes Dampe appear anytime during it's night, not just his usual working hours.");
ImGui::EndMenu();
}

8
soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c
View File

@ -502,8 +502,12 @@ void EnTk_Init(Actor* thisx, PlayState* play) {
CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
if (gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || !!LINK_IS_ADULT ||
play->sceneNum != SCENE_SPOT02) {
if (CVarGetInteger("gDampeAllNight", 0)) {
if (!!LINK_IS_ADULT || play->sceneNum != SCENE_SPOT02) {
Actor_Kill(&this->actor);
return;
}
} else if (gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || !!LINK_IS_ADULT || play->sceneNum != SCENE_SPOT02) {
Actor_Kill(&this->actor);
return;
}