Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 13:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

shipinit

Browse source
This commit is contained in:
Demur Rumed 2025-04-17 02:32:12 +00:00
parent bc1b17cb49
commit 4bcafa646f
4 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
View file

@ -1,15 +1,13 @@
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp"
#include "soh/OTRGlobals.h"
extern "C" { extern "C" {
#include "z64save.h" #include "z64save.h"
} }
void FasterBeanSkulltula_Register() { void RegisterFasterBeanSkulltula() {
REGISTER_VB_SHOULD(VB_SPAWN_BEAN_SKULLTULA, { COND_VB_SHOULD(VB_SPAWN_BEAN_SKULLTULA, CVarGetInteger(CVAR_ENHANCEMENT("FasterBeanSkull"), 0),
if (CVarGetInteger(CVAR_ENHANCEMENT("FasterBeanSkull"), 0)) { { *should = true; });
*should = true;
}
});
} }
static RegisterShipInitFunc initFunc(RegisterFasterBeanSkulltula, { CVAR_ENHANCEMENT("FasterBeanSkull") });

21
soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
View file

@ -1,20 +1,19 @@
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h" #include "soh/ShipInit.hpp"
#include "soh/OTRGlobals.h"
extern "C" { extern "C" {
#include "z64save.h" #include "z64save.h"
} }
void FasterEmptyBottle_Register() { void RegisterFasterEmptyBottle() {
REGISTER_VB_SHOULD(VB_EMPTYING_BOTTLE, { COND_VB_SHOULD(VB_EMPTYING_BOTTLE, CVarGetInteger(CVAR_ENHANCEMENT("FasterBottleEmpty"), 0), {
if (CVarGetInteger(CVAR_ENHANCEMENT("FasterBottleEmpty"), 0)) { Player* player = va_arg(args, Player*);
Player* player = va_arg(args, Player*); if (player->skelAnime.curFrame <= 60.0f) {
if (player->skelAnime.curFrame <= 60.0f) { player->skelAnime.playSpeed = 3.0f;
player->skelAnime.playSpeed = 3.0f; } else {
} else { player->skelAnime.playSpeed = 1.0f;
player->skelAnime.playSpeed = 1.0f;
}
} }
}); });
} }
static RegisterShipInitFunc initFunc(RegisterFasterEmptyBottle, { CVAR_ENHANCEMENT("FasterBottleEmpty") });

2
soh/soh/Enhancements/TimeSavers/TimeSavers.cpp
View file

@ -15,6 +15,4 @@ void TimeSavers_Register() {
SkipChildRutoInteractions_Register(); SkipChildRutoInteractions_Register();
FasterHeavyBlockLift_Register(); FasterHeavyBlockLift_Register();
FasterRupeeAccumulator_Register(); FasterRupeeAccumulator_Register();
FasterEmptyBottle_Register();
FasterBeanSkulltula_Register();
} }

2
soh/soh/Enhancements/TimeSavers/TimeSavers.h
View file

@ -17,7 +17,5 @@ void MoveMidoInKokiriForest_Register();
void SkipChildRutoInteractions_Register(); void SkipChildRutoInteractions_Register();
void FasterHeavyBlockLift_Register(); void FasterHeavyBlockLift_Register();
void FasterRupeeAccumulator_Register(); void FasterRupeeAccumulator_Register();
void FasterEmptyBottle_Register();
void FasterBeanSkulltula_Register();
#endif // TIME_SAVERS_H #endif // TIME_SAVERS_H