From 1af260babfdc75dde11474333ea9d7f94a9e3205 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Sun, 15 Mar 2020 05:10:01 +0100 Subject: Make skills check if equipped ammunition type is appropriate for equipped weapon --- src/map/skill.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/map') diff --git a/src/map/skill.c b/src/map/skill.c index a1a22f74f..aa9ad33d2 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -15170,10 +15170,8 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski clif->messagecolor_self(sd->fd, COLOR_RED, e_msg); return 0; } - if (!(require.ammo&1<inventory_data[i]->subtype)) { //Ammo type check. Send the "wrong weapon type" message - //which is the closest we have to wrong ammo type. [Skotlex] - clif->arrow_fail(sd,0); //Haplo suggested we just send the equip-arrows message instead. [Skotlex] - //clif->skill_fail(sd, skill_id, USESKILL_FAIL_THIS_WEAPON, 0, 0); + if ((require.ammo & (1 << sd->inventory_data[i]->subtype)) == 0 || !battle->check_arrows(sd)) { // Ammo type check. + clif->arrow_fail(sd, 0); // "Please equip the proper ammunition first." return 0; } } -- cgit v1.2.3-70-g09d2