Commit fae7551d authored by DailyShana's avatar DailyShana

update immune effect

parent 27e0668f
...@@ -2560,7 +2560,7 @@ int32 card::is_affect_by_effect(effect* peffect) { ...@@ -2560,7 +2560,7 @@ int32 card::is_affect_by_effect(effect* peffect) {
return FALSE; return FALSE;
if(!peffect || peffect->is_flag(EFFECT_FLAG_IGNORE_IMMUNE)) if(!peffect || peffect->is_flag(EFFECT_FLAG_IGNORE_IMMUNE))
return TRUE; return TRUE;
if(peffect->is_immuned(&immune_effect)) if(peffect->is_immuned(this))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
......
...@@ -472,13 +472,15 @@ int32 effect::is_player_effect_target(card* pcard) { ...@@ -472,13 +472,15 @@ int32 effect::is_player_effect_target(card* pcard) {
} }
return TRUE; return TRUE;
} }
int32 effect::is_immuned(effect_set_v* effects) { int32 effect::is_immuned(card* pcard) {
effect_set_v effects = pcard->immune_effect;
effect* peffect; effect* peffect;
for (int i = 0; i < effects->count; ++i) { for (int i = 0; i < effects.count; ++i) {
peffect = effects->at(i); peffect = effects.at(i);
if(peffect->value) { if(peffect->value) {
pduel->lua->add_param(this, PARAM_TYPE_EFFECT); pduel->lua->add_param(this, PARAM_TYPE_EFFECT);
if(peffect->check_value_condition(1)) pduel->lua->add_param(pcard, PARAM_TYPE_CARD);
if(peffect->check_value_condition(2))
return TRUE; return TRUE;
} }
} }
......
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
int32 is_target(card* pcard); int32 is_target(card* pcard);
int32 is_target_player(uint8 playerid); int32 is_target_player(uint8 playerid);
int32 is_player_effect_target(card* pcard); int32 is_player_effect_target(card* pcard);
int32 is_immuned(effect_set_v* effects); int32 is_immuned(card* pcard);
int32 is_chainable(uint8 tp); int32 is_chainable(uint8 tp);
int32 reset(uint32 reset_level, uint32 reset_type); int32 reset(uint32 reset_level, uint32 reset_type);
void dec_count(uint32 playerid = 2); void dec_count(uint32 playerid = 2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment