diff options
Diffstat (limited to 'mm/2s2h/Rando/Logic/Logic.h')
| -rw-r--r-- | mm/2s2h/Rando/Logic/Logic.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/2s2h/Rando/Logic/Logic.h b/mm/2s2h/Rando/Logic/Logic.h index 31912efb2..04d94ad64 100644 --- a/mm/2s2h/Rando/Logic/Logic.h +++ b/mm/2s2h/Rando/Logic/Logic.h @@ -217,7 +217,7 @@ inline bool CanKillEnemy(ActorId EnemyId) { case ACTOR_EN_KNIGHT: // Igos du Ikana/IdI Lackey return (CAN_USE_MAGIC_ARROW(FIRE) && (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) >= EQUIP_VALUE_SHIELD_MIRROR) && - (CAN_USE_HUMAN_SWORD || CAN_BE_DEKU || CAN_BE_GORON || CAN_BE_ZORA)); + (CAN_USE_SWORD || CAN_BE_DEKU || CAN_BE_GORON || CAN_BE_ZORA)); case ACTOR_EN_KAIZOKU: // Fighter Pirate return (CAN_USE_SWORD || CAN_BE_ZORA); case ACTOR_EN_PAMETFROG: // Swamp Gekko @@ -225,17 +225,17 @@ inline bool CanKillEnemy(ActorId EnemyId) { case ACTOR_EN_BIGSLIME: // Great Bay Gekko return (CAN_USE_MAGIC_ARROW(ICE)); case ACTOR_EN_SW: // Gold Skulltula & Skullwalltula - return (CAN_USE_PROJECTILE || CAN_BE_DEKU || CAN_BE_GORON || CAN_USE_HUMAN_SWORD || CAN_USE_EXPLOSIVE); + return (CAN_USE_PROJECTILE || CAN_BE_DEKU || CAN_BE_GORON || CAN_USE_SWORD || CAN_USE_EXPLOSIVE); case ACTOR_EN_DINOFOS: // Dinofos return (CAN_USE_SWORD || CAN_BE_GORON || HAS_ITEM(ITEM_BOW) || (CAN_BE_DEKU && HAS_MAGIC)); case ACTOR_EN_WIZ: // Wizrobe return (HAS_ITEM(ITEM_BOW) || HAS_ITEM(ITEM_HOOKSHOT) || CAN_USE_SWORD || CAN_BE_GORON); case ACTOR_EN_WF: // Wolfos - return (CAN_USE_HUMAN_SWORD || (CAN_BE_DEKU && HAS_MAGIC) || CAN_BE_GORON || CAN_BE_ZORA); + return (CAN_USE_SWORD || (CAN_BE_DEKU && HAS_MAGIC) || CAN_BE_GORON || CAN_BE_ZORA); case ACTOR_EN_JSO2: // Garo Master return (HAS_ITEM(ITEM_BOW) || CAN_BE_GORON || CAN_USE_SWORD); case ACTOR_EN_IK: // Iron Knuckle - return (CAN_USE_HUMAN_SWORD || CAN_BE_GORON); + return (CAN_USE_SWORD || CAN_BE_GORON); case ACTOR_EN_GRASSHOPPER: // Dragonfly return ((CAN_BE_DEKU && HAS_MAGIC) || CAN_USE_EXPLOSIVE || HAS_ITEM(ITEM_DEKU_NUT) || CAN_USE_SWORD || CAN_BE_ZORA); @@ -250,7 +250,7 @@ inline bool CanKillEnemy(ActorId EnemyId) { return (CAN_USE_SWORD || HAS_ITEM(ITEM_HOOKSHOT) || HAS_ITEM(ITEM_BOW) || CAN_USE_EXPLOSIVE || CAN_BE_GORON || CAN_BE_ZORA); case ACTOR_EN_DEKUBABA: // Neck bending Deku Baba - return (CAN_USE_HUMAN_SWORD || CAN_BE_DEKU || CAN_BE_GORON || CAN_BE_ZORA || HAS_ITEM(ITEM_BOW) || + return (CAN_USE_SWORD || CAN_BE_DEKU || CAN_BE_GORON || CAN_BE_ZORA || HAS_ITEM(ITEM_BOW) || CAN_USE_EXPLOSIVE || HAS_ITEM(ITEM_DEKU_STICK)); case ACTOR_OBJ_SNOWBALL: // Large Snowball return (CAN_USE_EXPLOSIVE || CAN_BE_GORON || CAN_USE_MAGIC_ARROW(FIRE)); |