diff options
Diffstat (limited to 'src/bossSamurshai.cpp')
| -rw-r--r-- | src/bossSamurshai.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp index 98470b9..3afd72b 100644 --- a/src/bossSamurshai.cpp +++ b/src/bossSamurshai.cpp @@ -115,8 +115,8 @@ daSamurshai *daSamurshai::build() { apOther->someFlagByte |= 2; if (this->isDown == 0) { this->playEnemyDownSound1(); - damage += 4; - if (damage > 15) { doStateChange(&StateID_Outro); } + damage += 5; + if (damage >= 15) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } } } @@ -136,8 +136,8 @@ daSamurshai *daSamurshai::build() { apOther->someFlagByte |= 2; if (this->isDown == 0) { - damage += 6; - if (damage > 15) { doStateChange(&StateID_Outro); } + damage += 10; + if (damage >= 15) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } } @@ -149,7 +149,7 @@ daSamurshai *daSamurshai::build() { void daSamurshai::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { if (this->isDown == 0) { damage += 3; - if (damage > 2) { doStateChange(&StateID_Outro); } + if (damage >= 15) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } } } @@ -157,7 +157,7 @@ daSamurshai *daSamurshai::build() { void daSamurshai::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther){ if (this->isDown == 0) { damage += 3; - if (damage > 15) { doStateChange(&StateID_Outro); } + if (damage >= 15) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } } @@ -169,19 +169,19 @@ daSamurshai *daSamurshai::build() { damage += 4; SpawnEffect("Wm_mr_fireball_hit", 0, &apOther->owner->pos, &apOther->owner->rot, &apOther->owner->scale); PlaySoundAsync(this, SE_OBJ_FIREBALL_DISAPP); - if (damage > 15) { doStateChange(&StateID_Outro); } + if (damage >= 15) { doStateChange(&StateID_Outro); } } void daSamurshai::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { damage += 1; SpawnEffect("Wm_mr_fireball_hit", 0, &apOther->owner->pos, &apOther->owner->rot, &apOther->owner->scale); PlaySoundAsync(this, SE_OBJ_FIREBALL_DISAPP); - if (damage > 15) { doStateChange(&StateID_Outro); } + if (damage >= 15) { doStateChange(&StateID_Outro); } } bool daSamurshai::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { return true; } void daSamurshai::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { damage += 2; this->spawnHitEffectAtPosition((Vec2){apOther->owner->pos.x, apOther->owner->pos.y}); - if (damage > 15) { doStateChange(&StateID_Outro); } + if (damage >= 15) { doStateChange(&StateID_Outro); } } |