Move boss kill logic into CanKillEnemy #5000
Conversation
serprex
force-pushed
the
can-kill-boss
branch
5 times, most recently
from
d0634db to
57e3139
Compare
| return HasBossSoul(RG_PHANTOM_GANON_SOUL) && | ||
| (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && | ||
| (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT)); |
There was a problem hiding this comment.
Instead of the separate swords, this can use CanJumpslashExceptHammer().
There was a problem hiding this comment.
Don't think we want logic to expect fighting phantom ganon with sticks
| return HasBossSoul(RG_MORPHA_SOUL) && CanUse(RG_HOOKSHOT) && | ||
| (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_MEGATON_HAMMER)); |
There was a problem hiding this comment.
This can use CanJumpslash().
There was a problem hiding this comment.
morpha has 20 health. Seems tight with sticks
| (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)) && | ||
| (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || ctx->GetTrickOption(RT_SHADOW_BONGO)); |
There was a problem hiding this comment.
This can use CanJumpslashExceptHammer().
| (CanUse(RG_HOOKSHOT) || CanUse(RG_FAIRY_BOW) || CanUse(RG_FAIRY_SLINGSHOT) || ctx->GetTrickOption(RT_SHADOW_BONGO)); | ||
| case RE_TWINROVA: | ||
| return HasBossSoul(RG_TWINROVA_SOUL) && CanUse(RG_MIRROR_SHIELD) && | ||
| (CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD)); |
There was a problem hiding this comment.
Twinrova can be beaten by hammer so can use CanJumpslash().
There was a problem hiding this comment.
twinrova has 24 health, but will add hammer
|
If we're going to change boss logic in this PR, it's worth noting that the ganon logic is wrong, it doesn't account for the first phase where you don't have the master sword. |
Added hammer as being able to defeat Morpha
serprex
force-pushed
the
can-kill-boss
branch
from
57e3139 to
2a75137
Compare
|
Added hammer kills, but for sticks it may be preferable to have a concept of being able to damage boss down with weapons that can't deliver kill before dealing killing blow with stick |
Added hammer as being able to defeat Gohma, King Dodongo, Morpha, & Twinrova
split out from #4866
Build Artifacts