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(-) 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 From f9d41bae5863671995f5be590b8efa3a5f8af94b Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Tue, 17 Mar 2020 07:11:04 +0100 Subject: Add Grenades requirement to Spread Attack in RE mode to make Grenade Launchers usable --- db/re/skill_db.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 376fba179..8cb55d918 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -16043,6 +16043,7 @@ skill_db: ( } AmmoTypes: { A_BULLET: true + A_GRENADE: true } AmmoAmount: 5 } -- cgit v1.2.3-70-g09d2