diff options
Diffstat (limited to 'src/bossSamurshai.cpp')
| -rw-r--r-- | src/bossSamurshai.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp index e385a41..1f0906a 100644 --- a/src/bossSamurshai.cpp +++ b/src/bossSamurshai.cpp @@ -113,7 +113,10 @@ daSamurshai *daSamurshai::build() { char hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 2); - if ((hitType == 1) || (hitType == 3)) { + if (hitType == 2) { + // Mini jump + apOther->someFlagByte |= 2; + } else if (hitType > 0) { apOther->someFlagByte |= 2; if (this->isDown == 0) { this->playEnemyDownSound1(); @@ -140,7 +143,7 @@ daSamurshai *daSamurshai::build() { apOther->someFlagByte |= 2; if (this->isDown == 0) { - damage += 10; + damage += 5; if (damage >= 15) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } } @@ -166,11 +169,7 @@ daSamurshai *daSamurshai::build() { return true; } bool daSamurshai::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){ - if (this->isDown == 0) { - damage += 3; - if (damage >= 15) { doStateChange(&StateID_Outro); } - else { doStateChange(&StateID_Damage); } - } + dAcPy_vf3F8(apOther->owner, this, 3); deathInfo.isDead = 0; this->flags_4FC |= (1<<(31-7)); |