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

Changes forge time into a slider, making it variable

This commit is contained in:
Ada 2022-05-17 18:30:16 +01:00
parent 9f82457830
commit 52091c2912
4 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -665,6 +665,8 @@ namespace SohImGui {
{
EnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", "gTextSpeed", 1, 5, "");
EnhancementSliderInt("King Zora Speed: %dx", "##WEEPSPEED", "gMweepSpeed", 1, 5, "");
EnhancementSliderInt("Biggoron Forge Time: %d days", "##FORGETIME", "gForgeTime", 0, 3, "");
Tooltip("Allows you to change the number of days it takes for Biggoron to forge the Biggoron Sword");
EnhancementCheckbox("Skip Text", "gSkipText");
Tooltip("Holding down B skips text");
@ -679,8 +681,6 @@ namespace SohImGui {
Tooltip("Allows equiping the tunic and boots to c-buttons");
EnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood");
Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask");
EnhancementCheckbox("2 Day Biggoron Quest", "gBiggoronShortQuest");
Tooltip("Makes you wait 2 days instead of 3 to forge the Biggoron Sword");
ImGui::EndMenu();
}

1
soh/soh/Enhancements/bootcommands.c
View File

@ -31,6 +31,7 @@ void BootCommands_Init()
CVar_RegisterS32("gNewDrops", 0);
CVar_RegisterS32("gVisualAgony", 0);
CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French
CVar_RegisterS32("gForgeTime", 3);
}
//void BootCommands_ParseBootArgs(char* str)

14
soh/src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@ -96,18 +96,10 @@ u16 EnGo_GetTextID(GlobalContext* globalCtx, Actor* thisx) {
if (gSaveContext.bgsFlag) {
return 0x305E;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) {
if (CVar_GetS32("gBiggoronShortQuest", 0) != 0) {
if (Environment_GetBgsDayCount() >= 2) {
return 0x305E;
} else {
return 0x305D;
}
if (Environment_GetBgsDayCount() >= CVar_GetS32("gForgeTime", 1)) {
return 0x305E;
} else {
if (Environment_GetBgsDayCount() >= 3) {
return 0x305E;
} else {
return 0x305D;
}
return 0x305D;
}
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_EYEDROPS) {
player->exchangeItemId = EXCH_ITEM_EYEDROPS;

34
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@ -1021,37 +1021,19 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, GlobalContext* globalCtx, Player* play
} else if (!gSaveContext.bgsFlag && (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)) {
if (func_8002F368(globalCtx) == EXCH_ITEM_CLAIM_CHECK) {
if (CVar_GetS32("gBiggoronShortQuest", 0) != 0) {
if (Environment_GetBgsDayCount() >= 2) {
textId = 0x305E;
} else {
textId = 0x305D;
}
this->actor.textId = textId;
if (Environment_GetBgsDayCount() >= CVar_GetS32("gForgeTime", 1)) {
textId = 0x305E;
} else {
if (Environment_GetBgsDayCount() >= 3) {
textId = 0x305E;
} else {
textId = 0x305D;
}
this->actor.textId = textId;
}
this->actor.textId = textId;
} else {
if (CVar_GetS32("gBiggoronShortQuest", 0) != 0) {
if (Environment_GetBgsDayCount() >= 2) {
textId = 0x3002;
} else {
textId = 0x305D;
}
this->actor.textId = textId;
if (Environment_GetBgsDayCount() >= CVar_GetS32("gForgeTime", 1)) {
textId = 0x3002;
} else {
if (Environment_GetBgsDayCount() >= 3) {
textId = 0x3002;
} else {
textId = 0x305D;
}
this->actor.textId = textId;
textId = 0x305D;
}
this->actor.textId = textId;
}
player->actor.textId = this->actor.textId;
@ -2082,4 +2064,4 @@ void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) {
this->skelAnime.dListCount, EnGo2_OverrideLimbDraw, EnGo2_PostLimbDraw, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2.c", 3081);
}
}
}