Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Golden Thief Bug card immunity (fixes #1400)

Browse Source 
* White Imprison and Hell's Plant are now blocked by Golden Thief Bug card.
* Removed an extra status end of White Imprison in Status Recovery.
This commit is contained in:
aleos89 2016-07-07 20:13:25 -04:00
parent 82250c24dd
commit 1a0fb8f821
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/map/skill.c
View File

@ -7193,7 +7193,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
status_change_end(bl, SC_STUN, INVALID_TIMER); status_change_end(bl, SC_STUN, INVALID_TIMER);
status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER); status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER);
status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER); status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER);
status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER);
} }
status_change_end(bl, SC_STASIS, INVALID_TIMER); status_change_end(bl, SC_STASIS, INVALID_TIMER);
if(battle_check_undead(tstatus->race,tstatus->def_ele)) if(battle_check_undead(tstatus->race,tstatus->def_ele))
@ -9256,7 +9255,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break; break;
case WL_WHITEIMPRISON: case WL_WHITEIMPRISON:
if( (src == bl || battle_check_target(src, bl, BCT_ENEMY)>0) && status_get_class_(bl) != CLASS_BOSS ) // Should not work with Bosses. if( (src == bl || battle_check_target(src, bl, BCT_ENEMY)>0) && status_get_class_(bl) != CLASS_BOSS && !status_isimmune(bl) ) // Should not work with Bosses.
{ {
int rate = ( sd? sd->status.job_level : 50 ) / 4; int rate = ( sd? sd->status.job_level : 50 ) / 4;
@ -13932,7 +13931,7 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns
break; break;
case UNT_HELLS_PLANT: case UNT_HELLS_PLANT:
if (tsc && tsc->data[SC__MANHOLE]) if ((tsc && tsc->data[SC__MANHOLE]) || status_isimmune(bl))
break; break;
if( battle_check_target(&unit->bl,bl,BCT_ENEMY) > 0 ) if( battle_check_target(&unit->bl,bl,BCT_ENEMY) > 0 )
skill_attack(skill_get_type(GN_HELLS_PLANT_ATK), ss, &unit->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, SCSTART_NONE); skill_attack(skill_get_type(GN_HELLS_PLANT_ATK), ss, &unit->bl, bl, GN_HELLS_PLANT_ATK, sg->skill_lv, tick, SCSTART_NONE);