Skip to content

Y
ygopro-core
Commit 9e92d5b2 authored by wind2009's avatar wind2009 Committed by GitHub
Browse files
Options

Remove EFFECT_EXTRA_SYNCHRO_MATERIAL condition in card:is_can_be_synchro_material (#786)

parent 5d56b3be
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 13 deletions
card.cpp
View file @ 9e92d5b2
...@@ -4093,19 +4093,6 @@ int32_t card::is_can_be_synchro_material(card* scard, card* tuner) { ...@@ -4093,19 +4093,6 @@ int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) for(effect_set::size_type i = 0; i < eset.size(); ++i)
if(eset[i]->get_value(scard)) if(eset[i]->get_value(scard))
return FALSE; return FALSE;
if(scard && !(current.location == LOCATION_MZONE && current.controler == scard->current.controler)) {
eset.clear();
filter_effect(EFFECT_EXTRA_SYNCHRO_MATERIAL, &eset);
if(eset.size()) {
for(effect_set::size_type i = 0; i < eset.size(); ++i) {
if(!eset[i]->check_count_limit(scard->current.controler))
continue;
if(eset[i]->get_value(scard))
return TRUE;
}
return FALSE;
}
}
return TRUE; return TRUE;
} }
int32_t card::is_can_be_ritual_material(card* scard) { int32_t card::is_can_be_ritual_material(card* scard) {
......
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