Skip to content

Commit

Permalink
Updated Golden Thief Bug card immunity (fixes #1400)
Browse files Browse the repository at this point in the history 
* 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.
  • Loading branch information
@aleos89
aleos89 committed Jul 8, 2016
1 parent 82250c2 commit 1a0fb8f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/map/skill.c
View file
Expand Up @@ -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_WHITEIMPRISON, INVALID_TIMER);
status_change_end(bl, SC_NETHERWORLD, INVALID_TIMER);
status_change_end(bl, SC_WHITEIMPRISON, INVALID_TIMER);

This comment has been minimized.

Sign in to view

Copy link
@Jedzkie

Jedzkie Jul 8, 2016

@aleos89 Why this is removed?

http://irowiki.org/wiki/Status_Recovery

This comment has been minimized.

Sign in to view

Copy link
@aleos89

aleos89 Jul 8, 2016

Author Contributor

As stated in the commit message, look 2 lines up. It was a duplicate status_change_end. :)

This comment has been minimized.

Sign in to view

Copy link
@Jedzkie

Jedzkie Jul 8, 2016

Lmao.
}
status_change_end(bl, SC_STASIS, INVALID_TIMER);
if(battle_check_undead(tstatus->race,tstatus->def_ele))
Expand Down Expand Up @@ -9256,7 +9255,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;

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;

Expand Down Expand Up @@ -13932,7 +13931,7 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns
break;

case UNT_HELLS_PLANT:
if (tsc && tsc->data[SC__MANHOLE])
if ((tsc && tsc->data[SC__MANHOLE]) || status_isimmune(bl))

This comment has been minimized.

Sign in to view

Copy link
@lighta

lighta Jul 8, 2016

Member

I wonder if we shouldn,t introduce something like unit_imune. Not that fan of having a status_immunity tell us if we shouldn't have unit_effect... (yes I know in this case it's gtb but still..)
break;
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);
Expand Down

0 comments on commit 1a0fb8f

Please sign in to comment.