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

Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright into fairy_split

Browse source
This commit is contained in:
Cameron 2025-08-06 02:13:39 -04:00
commit 77b2e7534a
No known key found for this signature in database
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
View file

@ -2222,6 +2222,15 @@ typedef enum {
// - `s32` limbCount // - `s32` limbCount
// - `*Vec3s` frameTable // - `*Vec3s` frameTable
VB_LOAD_PLAYER_ANIMATION_FRAME, VB_LOAD_PLAYER_ANIMATION_FRAME,
// #### `result`
// ```c
// (this->dyna.actor.params >> 5 & 0x7F) == GI_ICE_TRAP && this->actionFunc == EnBox_Open &&
// this->skelanime.curFrame > 45 && this->iceSmokeTimer < 100
// ```
// #### `args`
// - `*EnBox`
VB_CHEST_USE_ICE_EFFECT,
} GIVanillaBehavior; } GIVanillaBehavior;
#endif #endif

1
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -1713,6 +1713,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
case VB_GIVE_ITEM_WATER_MEDALLION: case VB_GIVE_ITEM_WATER_MEDALLION:
case VB_GIVE_ITEM_SPIRIT_MEDALLION: case VB_GIVE_ITEM_SPIRIT_MEDALLION:
case VB_GIVE_ITEM_SHADOW_MEDALLION: case VB_GIVE_ITEM_SHADOW_MEDALLION:
case VB_CHEST_USE_ICE_EFFECT:
*should = false; *should = false;
break; break;
case VB_GIVE_ITEM_SKULL_TOKEN: case VB_GIVE_ITEM_SKULL_TOKEN:

1
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -2471,6 +2471,7 @@ void Logic::Reset(bool resetSaveContext /*= true*/) {
THCouldFreeDoubleCellCarpenter = false; THCouldFreeDoubleCellCarpenter = false;
TH_CouldFreeDeadEndCarpenter = false; TH_CouldFreeDeadEndCarpenter = false;
THCouldRescueSlopeCarpenter = false; THCouldRescueSlopeCarpenter = false;
THRescuedAllCarpenters = false;
GF_GateOpen = false; GF_GateOpen = false;
GtG_GateOpen = false; GtG_GateOpen = false;
DampesWindmillAccess = false; DampesWindmillAccess = false;

6
soh/src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -567,8 +567,10 @@ void EnBox_Update(Actor* thisx, PlayState* play) {
Actor_SetFocus(&this->dyna.actor, 40.0f); Actor_SetFocus(&this->dyna.actor, 40.0f);
} }
if ((this->dyna.actor.params >> 5 & 0x7F) == GI_ICE_TRAP && this->actionFunc == EnBox_Open && if (GameInteractor_Should(VB_CHEST_USE_ICE_EFFECT,
this->skelanime.curFrame > 45 && this->iceSmokeTimer < 100) { (this->dyna.actor.params >> 5 & 0x7F) == GI_ICE_TRAP && this->actionFunc == EnBox_Open &&
this->skelanime.curFrame > 45 && this->iceSmokeTimer < 100,
this)) {
EnBox_SpawnIceSmoke(this, play); EnBox_SpawnIceSmoke(this, play);
} }
} }