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

Addresses Forest Temple Poes and NPC Dialogue issues. (#3334)

This commit is contained in:
Caladius 2023-10-30 12:00:24 -04:00 committed by GitHub
parent 2810996475
commit ff7fa77427
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
soh/soh/Enhancements/mods.cpp
View File

@ -387,11 +387,18 @@ void RegisterShadowTag() {
if (!CVarGetInteger("gShadowTag", 0)) {
return;
}
if (shouldSpawn && (delayTimer <= 0)) {
Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_WALLMAS, 0, 0, 0, 0, 0, 0, 3, false);
shouldSpawn = false;
if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && // Forest Temple Scene
gPlayState->roomCtx.curRoom.num == 16 || // Green Poe Room
gPlayState->roomCtx.curRoom.num == 13 || // Blue Poe Room
gPlayState->roomCtx.curRoom.num == 12) { // Red Poe Room
return;
} else {
delayTimer--;
if (shouldSpawn && (delayTimer <= 0)) {
Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_WALLMAS, 0, 0, 0, 0, 0, 0, 3, false);
shouldSpawn = false;
} else {
delayTimer--;
}
}
});
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnSceneSpawnActors>([]() {

6
soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View File

@ -328,7 +328,11 @@ void EnWallmas_WaitToDrop(EnWallmas* this, PlayState* play) {
}
if (this->timer == 0) {
EnWallmas_SetupDrop(this, play);
if (this->actor.params == WMT_SHADOWTAG && (player->stateFlags1 & PLAYER_STATE1_IN_CUTSCENE)) {
this->timer = 0x82; // Prevents Shadow Tag Hand from dropping when talking to an NPC or Signpost.
} else {
EnWallmas_SetupDrop(this, play);
}
}
}