Skip to content

Y
ygopro-core
Commit ad0c7224 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Fluorohydride/ygopro-core

parents 2393d7c1 14925e2e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
field.cpp
View file @ ad0c7224
...@@ -2367,7 +2367,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack, ...@@ -2367,7 +2367,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
continue; 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))
continue; continue;
if(select_target && atype == 4) { if(select_target && (atype == 2 || atype == 4)) {
if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard)) if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard))
continue; continue;
if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget)) if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget))
...@@ -2388,7 +2388,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack, ...@@ -2388,7 +2388,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack,
mcount++; mcount++;
if(chain_attack && core.chain_attack_target && atarget != core.chain_attack_target) if(chain_attack && core.chain_attack_target && atarget != core.chain_attack_target)
continue; continue;
if(select_target && atype == 4) { if(select_target && (atype == 2 || atype == 4)) {
if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard)) if(atarget->is_affected_by_effect(EFFECT_CANNOT_BE_BATTLE_TARGET, pcard))
continue; continue;
if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget)) if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget))
......
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