diff options
| -rw-r--r-- | src/map/itemdb.h | 6 | ||||
| -rw-r--r-- | src/map/skill.c | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index e312acf1f..66bd27c0d 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -96,6 +96,10 @@ enum item_itemid { ITEMID_ANGRA_MANYU = 1599, ITEMID_STRANGE_EMBRYO = 6415, ITEMID_FACE_PAINT = 6120, + ITEMID_SCARLET_POINT = 6360, + ITEMID_INDIGO_POINT = 6361, + ITEMID_YELLOW_WISH_POINT = 6362, + ITEMID_LIME_GREEN_POINT = 6363, ITEMID_STONE = 7049, ITEMID_FIRE_BOTTLE = 7135, ITEMID_ACID_BOTTLE = 7136, @@ -531,7 +535,7 @@ struct item_data { #define itemdb_canrefine(n) (!itemdb->search(n)->flag.no_refine) #define itemdb_is_rune(n) (((n) >= ITEMID_NAUTHIZ && (n) <= ITEMID_HAGALAZ) || (n) == ITEMID_LUX_ANIMA) -#define itemdb_is_element(n) ((n) >= ITEMID_BOODY_RED && (n) <= ITEMID_YELLOW_LIVE) +#define itemdb_is_element(n) ((n) >= ITEMID_SCARLET_POINT && (n) <= ITEMID_LIME_GREEN_POINT) #define itemdb_is_spellbook(n) ((n) >= ITEMID_MAGIC_BOOK_FB && (n) <= ITEMID_MAGIC_BOOK_DL) #define itemdb_is_poison(n) ((n) >= ITEMID_POISON_PARALYSIS && (n) <= ITEMID_POISON_FATIGUE) #define itemid_isgemstone(n) ((n) >= ITEMID_YELLOW_GEMSTONE && (n) <= ITEMID_BLUE_GEMSTONE) diff --git a/src/map/skill.c b/src/map/skill.c index b5099750a..872c1ef4c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -14072,19 +14072,18 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id, } case NC_SILVERSNIPER: case NC_MAGICDECOY: { - int c = 0; + int j, c = 0; int maxcount = skill->get_maxcount(skill_id,skill_lv); if( battle_config.land_skill_limit && maxcount > 0 && ( battle_config.land_skill_limit&BL_PC ) ) { if (skill_id == NC_MAGICDECOY) { - int j; for (j = MOBID_MAGICDECOY_FIRE; j <= MOBID_MAGICDECOY_WIND; j++) map->foreachinmap(skill->check_condition_mob_master_sub, sd->bl.m, BL_MOB, sd->bl.id, j, skill_id, &c); } else { map->foreachinmap(skill->check_condition_mob_master_sub, sd->bl.m, BL_MOB, sd->bl.id, MOBID_SILVERSNIPER, skill_id, &c); } if( c >= maxcount ) { - clif->skill_fail(sd , skill_id, USESKILL_FAIL_LEVEL, 0); + clif->skill_fail(sd , skill_id, USESKILL_FAIL_SUMMON, 0); return 0; } } @@ -17638,21 +17637,21 @@ int skill_magicdecoy(struct map_session_data *sd, int nameid) { sd->menuskill_val = 0; switch (nameid) { - case ITEMID_BOODY_RED: + case ITEMID_SCARLET_POINT: class_ = MOBID_MAGICDECOY_FIRE; break; - case ITEMID_CRYSTAL_BLUE: + case ITEMID_INDIGO_POINT: class_ = MOBID_MAGICDECOY_WATER; break; - case ITEMID_WIND_OF_VERDURE: + case ITEMID_LIME_GREEN_POINT: class_ = MOBID_MAGICDECOY_WIND; break; - case ITEMID_YELLOW_LIVE: + case ITEMID_YELLOW_WISH_POINT: class_ = MOBID_MAGICDECOY_EARTH; break; } - md = mob->once_spawn_sub(&sd->bl, sd->bl.m, x, y, sd->status.name, class_, "", SZ_SMALL, AI_NONE); + md = mob->once_spawn_sub(&sd->bl, sd->bl.m, x, y, sd->status.name, class_, "", SZ_SMALL, AI_NONE); if( md ) { md->master_id = sd->bl.id; md->special_state.ai = AI_FLORA; |