github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 05:13:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
commit b099b5649b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
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", "gTimeFlowFileSelect",
"gInjectItemCounts", "gInjectItemCounts",
"gDayGravePull", "gDayGravePull",
"gDampeAllNight",
"gSkipScarecrow", "gSkipScarecrow",
"gBlueFireArrows", "gBlueFireArrows",
"gSunlightArrows", "gSunlightArrows",

2
soh/soh/GameMenuBar.cpp
View file

@ -354,6 +354,8 @@ namespace GameMenuBar {
"to the guard next to the gate."); "to the guard next to the gate.");
UIWidgets::PaddedEnhancementCheckbox("Faster Farore's Wind", "gFastFarores", true, false); UIWidgets::PaddedEnhancementCheckbox("Faster Farore's Wind", "gFastFarores", true, false);
UIWidgets::Tooltip("Greatly decreases cast time of Farore's Wind magic spell."); 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(); 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); CollisionCheck_SetInfo2(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
if (gSaveContext.dayTime <= 0xC000 || gSaveContext.dayTime >= 0xE000 || !!LINK_IS_ADULT || if (CVarGetInteger("gDampeAllNight", 0)) {
play->sceneNum != SCENE_SPOT02) { 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); Actor_Kill(&this->actor);
return; return;
} }