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

Merge pull request #362 from GreatArgorath/ShortBiggoron 

Adds option for shorter Biggoron quest
This commit is contained in:
Kenix3 2022-06-21 22:22:41 -04:00 committed by GitHub
parent d5db4a86bd 45cb350b7a
commit d3436fc1e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship/libultraship/SohImGuiImpl.cpp
View File

@ -878,6 +878,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");
EnhancementSliderInt("Vine/Ladder Climb speed +%d", "##CLIMBSPEED", "gClimbSpeed", 0, 12, "");
EnhancementSliderInt("Damage Multiplier %dx", "##DAMAGEMUL", "gDamageMul", 1, 4, "");
Tooltip("Modifies all sources of damage not affected by other sliders");

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

@ -35,6 +35,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);
CVar_RegisterS32("gGravediggingTourFix", 1);
CVar_RegisterS32("gHudColors", 1); //0 = N64 / 1 = NGC / 2 = Custom
CVar_RegisterS32("gUseNaviCol", 0);

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

@ -96,7 +96,7 @@ u16 EnGo_GetTextID(GlobalContext* globalCtx, Actor* thisx) {
if (gSaveContext.bgsFlag) {
return 0x305E;
} else if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_CLAIM_CHECK) {
if (Environment_GetBgsDayCount() >= 3) {
if (Environment_GetBgsDayCount() >= CVar_GetS32("gForgeTime", 3)) {
return 0x305E;
} else {
return 0x305D;

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

@ -1021,14 +1021,14 @@ 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 (Environment_GetBgsDayCount() >= 3) {
if (Environment_GetBgsDayCount() >= CVar_GetS32("gForgeTime", 3)) {
textId = 0x305E;
} else {
textId = 0x305D;
}
this->actor.textId = textId;
} else {
if (Environment_GetBgsDayCount() >= 3) {
if (Environment_GetBgsDayCount() >= CVar_GetS32("gForgeTime", 3)) {
textId = 0x3002;
} else {
textId = 0x305D;