diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-13 02:38:51 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-06-13 08:57:59 +0200 |
| commit | 6e0455645bafd9e649f0448ef8067b1d492cba3b (patch) | |
| tree | 6e5995425b9d77cc4a68b0b2fb7e0a518b0d47a6 | |
| parent | 64863884011d9bdb59401685b6f09e9dfacc238e (diff) | |
| download | hercules-6e0455645bafd9e649f0448ef8067b1d492cba3b.tar.gz hercules-6e0455645bafd9e649f0448ef8067b1d492cba3b.tar.bz2 hercules-6e0455645bafd9e649f0448ef8067b1d492cba3b.tar.xz hercules-6e0455645bafd9e649f0448ef8067b1d492cba3b.zip | |
Implement usage of skill_get_item_index()
| -rw-r--r-- | src/map/skill.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 26f4cf0c0..7a5927397 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7972,7 +7972,14 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * } if( sd ) { int bonus = 100, potion = min(500+skill_lv,505); - int item_idx = (skill_lv - 1) % MAX_SKILL_ITEM_REQUIRE; + int item_idx = skill->get_item_index(skill_id, skill_lv); + + if (item_idx == INDEX_NOT_FOUND) { + clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0); + map->freeblock_unlock(); + return 1; + } + int item_id = skill->get_itemid(skill_id, item_idx); int inventory_idx = pc->search_inventory(sd, item_id); if (inventory_idx == INDEX_NOT_FOUND || item_id <= 0) { @@ -11832,7 +11839,13 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill // Slim Pitcher [Celest] case CR_SLIMPITCHER: if (sd) { - int item_idx = (skill_lv - 1) % MAX_SKILL_ITEM_REQUIRE; + int item_idx = skill->get_item_index(skill_id, skill_lv); + + if (item_idx == INDEX_NOT_FOUND) { + clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0, 0); + return 1; + } + int item_id = skill->get_itemid(skill_id, item_idx); int inventory_idx = pc->search_inventory(sd, item_id); int bonus; @@ -11865,7 +11878,11 @@ static int skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill skill->castend_nodamage_id); } } else { - int item_idx = (skill_lv - 1) % MAX_SKILL_ITEM_REQUIRE; + int item_idx = skill->get_item_index(skill_id, skill_lv); + + if (item_idx == INDEX_NOT_FOUND) + return 1; + int item_id = skill->get_itemid(skill_id, item_idx); struct item_data *item = itemdb->search(item_id); int bonus; |