diff options
author | shenhuyong <shenhuyong@hotmail.com> | 2013-09-27 10:35:52 +0800 |
---|---|---|
committer | shenhuyong <shenhuyong@hotmail.com> | 2013-09-27 10:35:52 +0800 |
commit | 7d8f83d8ff360df4c2b960933c015117eb9d776b (patch) | |
tree | 318c95d3365526fcc60799d1fd554e56c6ab5f5d /src/map/skill.c | |
parent | 3e5bca5a3df07320ff5c41edbb282df041c36f66 (diff) | |
download | hercules-7d8f83d8ff360df4c2b960933c015117eb9d776b.tar.gz hercules-7d8f83d8ff360df4c2b960933c015117eb9d776b.tar.bz2 hercules-7d8f83d8ff360df4c2b960933c015117eb9d776b.tar.xz hercules-7d8f83d8ff360df4c2b960933c015117eb9d776b.zip |
Added full support for the Rebellion.
Credits to 3ceam2 for the base,Thanks to Rytech.
-The skill still needs to be completed, as well as support for higher base stats.
-Bonus stats are set to temporarily values until the official ones are known.
-Updated the item_db.txt file with information on the Rebellion's job equip mask.
-Added packets and packet keys for 2013-08-07Ragexe with the info provided by Shakto,Thanks to Shakto.
-A 2013-08-07Ragexe client or higher is required for this job to be properly playable.
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 3541f9f45..32880e535 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5813,7 +5813,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; @@ -5828,7 +5828,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); |