Skip to content

Y
YGOMobile
Commit 8d79b322 authored by fallenstardust's avatar fallenstardust
Browse files
Options

sync ocgcore

parent 3d71c3e9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Classes/ocgcore/card.cpp
View file @ 8d79b322
......@@ -3615,7 +3615,7 @@ int32 card::is_capable_be_battle_target(card* pcard) {
return FALSE;
if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, this))
return FALSE;
if(is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET))
if(is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET, pcard))
return FALSE;
return TRUE;
}
......
Classes/ocgcore/field.cpp
View file @ 8d79b322
......@@ -2336,7 +2336,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
continue;
if(pcard->announced_cards.findcard(atarget) >= (uint32)peffect->get_value(atarget))
continue;
if(atype >= 2 && atarget->is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET))
if(atype >= 2 && atarget->is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET, pcard))
continue;
if(select_target && (atype == 2 || atype == 4)) {
if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard))
......@@ -2354,7 +2354,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
for(auto& atarget : *pv) {
if(!atarget)
continue;
if(atype >= 2 && atarget->is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET))
if(atype >= 2 && atarget->is_affected_by_effect(EFFECT_IGNORE_BATTLE_TARGET, pcard))
continue;
mcount++;
if(chain_attack && core.chain_attack_target && atarget != core.chain_attack_target)
......
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