summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorshennetsind <notind@gmail.com>2013-09-28 04:23:56 -0700
committershennetsind <notind@gmail.com>2013-09-28 04:23:56 -0700
commit71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce (patch)
tree2c46f0a5ac28f67931433de0f3b18dd0aa6e7d73 /src/map/skill.c
parent346ea5f138e5baee36cf1e986c12fff84277f4ca (diff)
parent7d8f83d8ff360df4c2b960933c015117eb9d776b (diff)
downloadhercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.gz
hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.bz2
hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.tar.xz
hercules-71af4a3caa5c09d38fc6ea99ca3ca3bc3cc280ce.zip
Merge pull request #161 from shenhuyong/master
Added full support for the Rebellion.
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 5c4dddc6f..96c439741 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5743,7 +5743,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case MO_KITRANSLATION:
- if(dstsd && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER) {
+ if(dstsd && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK)!=MAPID_REBELLION)) {
pc->addspiritball(dstsd,skill->get_time(skill_id,skill_lv),5);
}
break;
@@ -5758,7 +5758,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
case MO_ABSORBSPIRITS:
i = 0;
- if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER)
+ if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK)!=MAPID_REBELLION))
{ // split the if for readability, and included gunslingers in the check so that their coins cannot be removed [Reddozen]
i = dstsd->spiritball * 7;
pc->delspiritball(dstsd,dstsd->spiritball,0);