diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2017-04-18 17:29:04 +0800 |
|---|---|---|
| committer | Jedzkie <jedzkie13@rocketmail.com> | 2017-04-21 01:15:17 +0800 |
| commit | bf21ba7f5924ba0e4a8cba2d21220ef481c90419 (patch) | |
| tree | 1e256d55a00eab39a735181f5ab5c94b78f3fc35 /src | |
| parent | 6f59f290d03774c697b0d3b6520d642b58141fe9 (diff) | |
| download | hercules-bf21ba7f5924ba0e4a8cba2d21220ef481c90419.tar.gz hercules-bf21ba7f5924ba0e4a8cba2d21220ef481c90419.tar.bz2 hercules-bf21ba7f5924ba0e4a8cba2d21220ef481c90419.tar.xz hercules-bf21ba7f5924ba0e4a8cba2d21220ef481c90419.zip | |
Update GX Poison items
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/itemdb.h | 22 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
2 files changed, 8 insertions, 20 deletions
diff --git a/src/map/itemdb.h b/src/map/itemdb.h index ac2382d90..138a783ae 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -147,6 +147,14 @@ enum item_itemid { ITEMID_BLACK_THING = 12435, ITEMID_BOARDING_HALTER = 12622, ITEMID_NOBLE_NAMEPLATE = 12705, + ITEMID_POISON_PARALYSIS = 12717, + ITEMID_POISON_LEECH = 12718, + ITEMID_POISON_OBLIVION = 12719, + ITEMID_POISON_CONTAMINATION = 12720, + ITEMID_POISON_NUMB = 12721, + ITEMID_POISON_FEVER = 12722, + ITEMID_POISON_LAUGHING = 12723, + ITEMID_POISON_FATIGUE = 12724, ITEMID_NAUTHIZ = 12725, ITEMID_RAIDO = 12726, ITEMID_BERKANA = 12727, @@ -272,20 +280,6 @@ enum cash_food_item_list { }; /** - * GC Poison - */ -enum poison_item_list { - ITEMID_POISON_PARALYSIS = 12717, - ITEMID_POISON_LEECH, // 12718 - ITEMID_POISON_OBLIVION, // 12719 - ITEMID_POISON_CONTAMINATION, // 12720 - ITEMID_POISON_NUMB, // 12721 - ITEMID_POISON_FEVER, // 12722 - ITEMID_POISON_LAUGHING, // 12723 - ITEMID_POISON_FATIGUE, // 12724 -}; - -/** * Geneticist */ enum geneticist_item_list { diff --git a/src/map/pc.c b/src/map/pc.c index 4b1a586a8..991018012 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4917,12 +4917,6 @@ int pc_isUseitem(struct map_session_data *sd,int n) if( nameid >= ITEMID_BOW_MERCENARY_SCROLL1 && nameid <= ITEMID_SPEARMERCENARY_SCROLL10 && sd->md != NULL ) // Mercenary Scrolls return 0; - /** - * Only GCross may use poisons - **/ - else if (itemdb_is_poison(nameid) && (sd->job & MAPID_THIRDMASK) != MAPID_GUILLOTINE_CROSS) - return 0; - if( item->package || item->group ) { if (pc_is90overweight(sd)) { clif->msgtable(sd, MSG_ITEM_CANT_OBTAIN_WEIGHT); |