mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

name shock and burn functions (#1594)

Browse source
This commit is contained in:
fig02 2023-12-15 08:53:51 -05:00 • committed by GitHub
parent e3316c9fb1
commit 2b5b0fac06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -811,12 +811,12 @@ s32 BossTw_BeamHitPlayerCheck(BossTw* this, PlayState* play) {
if (sFreezeState == 0) {
sFreezeState = 1;
}
} else if (!player->isBurning) {
} else if (!player->bodyIsBurning) {
for (i = 0; i < PLAYER_BODYPART_MAX; i++) {
player->flameTimers[i] = Rand_S16Offset(0, 200);
player->bodyFlameTimers[i] = Rand_S16Offset(0, 200);
}
player->isBurning = true;
player->bodyIsBurning = true;
Player_PlaySfx(player, player->ageProperties->unk_92 + NA_SE_VO_LI_DEMO_DAMAGE);
}
}
@ -3172,7 +3172,7 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) {
}
}
if (player->isBurning && sShieldIceCharge != 0) {
if (player->bodyIsBurning && sShieldIceCharge != 0) {
sShieldIceCharge = 4;
}
}
@ -4055,15 +4055,15 @@ void BossTw_BlastFire(BossTw* this, PlayState* play) {
yDiff = sKoumePtr->groundBlastPos2.y - player->actor.world.pos.y;
zDiff = sKoumePtr->groundBlastPos2.z - player->actor.world.pos.z;
if (!player->isBurning && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (fabsf(yDiff) < 10.0f) &&
(sqrtf(SQ(xDiff) + SQ(zDiff)) < (sKoumePtr->workf[UNK_F13] * 4550.0f))) {
if (!player->bodyIsBurning && (player->actor.bgCheckFlags & BGCHECKFLAG_GROUND) &&
(fabsf(yDiff) < 10.0f) && (sqrtf(SQ(xDiff) + SQ(zDiff)) < (sKoumePtr->workf[UNK_F13] * 4550.0f))) {
s16 j;
for (j = 0; j < 18; j++) {
player->flameTimers[j] = Rand_S16Offset(0, 200);
player->bodyFlameTimers[j] = Rand_S16Offset(0, 200);
}
player->isBurning = 1;
player->bodyIsBurning = true;
if (this->work[BURN_TMR] == 0) {
Player_PlaySfx(player, player->ageProperties->unk_92 + NA_SE_VO_LI_DEMO_DAMAGE);