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

ice cavern (red ice, sliding ice block, silver rupee, ice bars)

Browse source
This commit is contained in:
Demur Rumed 2025-05-23 00:36:40 +00:00
commit 8d32bfe96f
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp
View file

@ -20,6 +20,7 @@ extern "C" {
#include "overlays/actors/ovl_En_Dog/z_en_dog.h" #include "overlays/actors/ovl_En_Dog/z_en_dog.h"
#include "overlays/actors/ovl_En_Ba/z_en_ba.h" #include "overlays/actors/ovl_En_Ba/z_en_ba.h"
#include "overlays/actors/ovl_En_Eiyer/z_en_eiyer.h" #include "overlays/actors/ovl_En_Eiyer/z_en_eiyer.h"
#include "overlays/actors/ovl_En_G_Switch/z_en_g_switch.h"
void EnBox_WaitOpen(EnBox*, PlayState*); void EnBox_WaitOpen(EnBox*, PlayState*);
void EnKarebaba_DeadItemDrop(EnKarebaba*, PlayState*); void EnKarebaba_DeadItemDrop(EnKarebaba*, PlayState*);
@ -27,6 +28,7 @@ void EnDog_FollowPlayer(EnDog*, PlayState*);
s8 EnDog_CanFollow(EnDog*, PlayState*); s8 EnDog_CanFollow(EnDog*, PlayState*);
void EnEiyer_Die(EnEiyer*, PlayState*); void EnEiyer_Die(EnEiyer*, PlayState*);
void EnEiyer_Dead(EnEiyer*, PlayState*); void EnEiyer_Dead(EnEiyer*, PlayState*);
void EnGSwitch_SilverRupeeIdle(EnGSwitch*, PlayState*);
} }
// User data for the general helper VA. // User data for the general helper VA.
@ -190,14 +192,6 @@ void accessible_area_change(AccessibleActor* actor) {
actor->play->sceneNum != 82) { actor->play->sceneNum != 82) {
return; return;
} }
/*switch (actor->sceneIndex) {
case 85 || 91:
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_SARIA_MELODY, false);
case 81:
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_IT_INGO_HORSE_NEIGH, false);
case 0:
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_FANTOM_WARP_L, false);
}*/
// hyrule field attenuation // hyrule field attenuation
if (actor->play->sceneNum == 81) { if (actor->play->sceneNum == 81) {
@ -250,11 +244,7 @@ void accessible_area_change(AccessibleActor* actor) {
if (actor->xzDistToPlayer > 1000) { if (actor->xzDistToPlayer > 1000) {
return; return;
} }
} } else {
/* if (actor->play->sceneNum <= 11) {
actor->policy.distance = 500;
}*/
else {
if (actor->xzDistToPlayer > 1500) { if (actor->xzDistToPlayer > 1500) {
return; return;
} }
@ -264,7 +254,6 @@ void accessible_area_change(AccessibleActor* actor) {
return; return;
} }
if (actor->play->sceneNum == 85 && actor->world.pos.y < 0) { if (actor->play->sceneNum == 85 && actor->world.pos.y < 0) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_HORSE_RUN_LEVEL, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_HORSE_RUN_LEVEL, false);
} else { } else {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_SARIA_MELODY, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_SARIA_MELODY, false);
@ -826,9 +815,19 @@ void ActorAccessibility_InitActors() {
ActorAccessibility_AddSupportedActor(ACTOR_EN_HINTNUTS, policy); ActorAccessibility_AddSupportedActor(ACTOR_EN_HINTNUTS, policy);
ActorAccessibility_InitPolicy(&policy, "Flame Circle", NA_SE_EV_FIRE_PILLAR); ActorAccessibility_InitPolicy(&policy, "Flame Circle", NA_SE_EV_FIRE_PILLAR);
ActorAccessibility_AddSupportedActor(ACTOR_BG_HIDAN_CURTAIN, policy); ActorAccessibility_AddSupportedActor(ACTOR_BG_HIDAN_CURTAIN, policy);
ActorAccessibility_InitPolicy(&policy, "Ice Barred", NA_SE_EV_CHAIN_KEY_UNLOCK);
ActorAccessibility_AddSupportedActor(ACTOR_BG_ICE_SHUTTER, policy);
ActorAccessibility_InitPolicy(&policy, "Ice Block", NA_SE_PL_SLIP_ICE_LELEL);
ActorAccessibility_AddSupportedActor(ACTOR_BG_GND_ICEBLOCK, policy);
ActorAccessibility_AddSupportedActor(ACTOR_BG_ICE_OBJECTS, policy);
ActorAccessibility_InitPolicy(&policy, "Iceberg", NA_SE_EV_ICE_FREEZE); ActorAccessibility_InitPolicy(&policy, "Iceberg", NA_SE_EV_ICE_FREEZE);
policy.distance = 1500; policy.distance = 1500;
ActorAccessibility_AddSupportedActor(ACTOR_BG_SPOT08_ICEBLOCK, policy); ActorAccessibility_AddSupportedActor(ACTOR_BG_SPOT08_ICEBLOCK, policy);
policy.englishName = "Red Ice";
policy.distance = 300;
ActorAccessibility_AddSupportedActor(ACTOR_BG_ICE_SHELTER, policy);
ActorAccessibility_InitPolicy(&policy, "uninteractable rocks in kokiri forest", [](AccessibleActor* actor) { ActorAccessibility_InitPolicy(&policy, "uninteractable rocks in kokiri forest", [](AccessibleActor* actor) {
if (actor->actor->params == 1) { if (actor->actor->params == 1) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_OCTAROCK_ROCK, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_OCTAROCK_ROCK, false);
@ -899,7 +898,14 @@ void ActorAccessibility_InitActors() {
ActorAccessibility_InitPolicy(&policy, "Amos Statue", NA_SE_EN_AMOS_WAVE); ActorAccessibility_InitPolicy(&policy, "Amos Statue", NA_SE_EN_AMOS_WAVE);
policy.n = 30; policy.n = 30;
ActorAccessibility_AddSupportedActor(ACTOR_EN_AM, policy); ActorAccessibility_AddSupportedActor(ACTOR_EN_AM, policy);
ActorAccessibility_InitPolicy(&policy, "shooting gallery rupees", nullptr); ActorAccessibility_InitPolicy(&policy, "Big Rupee", [](AccessibleActor* actor) {
if ((actor->frameCount & 31) == 0) {
EnGSwitch* gswitch = (EnGSwitch*)actor->actor;
if (gswitch->actionFunc == EnGSwitch_SilverRupeeIdle) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_FIVE_COUNT_LUPY, false);
}
}
});
policy.aimAssist.isProvider = true; policy.aimAssist.isProvider = true;
policy.distance = 1000; policy.distance = 1000;
policy.n = 1; policy.n = 1;

2
soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
View file

@ -332,7 +332,7 @@ void ActorAccessibility_CopyParamsFromRealActor(AccessibleActor* actor) {
actor->xzDistToPlayer = actor->actor->xzDistToPlayer; actor->xzDistToPlayer = actor->actor->xzDistToPlayer;
actor->isDrawn = actor->actor->isDrawn; actor->isDrawn = actor->actor->isDrawn;
actor->world = actor->actor->world; actor->world = actor->actor->world;
actor->xyzDistToPlayer = Math_Vec3f_DistXYZ(&actor->actor->world.pos, &player->actor.world.pos); actor->xyzDistToPlayer = sqrtf(actor->actor->xyzDistToPlayerSq);
} }
void ActorAccessibility_StopAllVirtualActors(VirtualActorList* list) { void ActorAccessibility_StopAllVirtualActors(VirtualActorList* list) {