Commit bebba9f0 authored by nanahira's avatar nanahira

Revert "update EFFECT_ALLOW_SYNCHRO_KOISHI"

This reverts commit 28734ebf.
parent 28734ebf
......@@ -1069,15 +1069,14 @@ uint32_t card::get_link() {
uint32_t card::get_synchro_level(card* pcard) {
if((data.type & (TYPE_XYZ | TYPE_LINK)) || (status & STATUS_NO_LEVEL))
{
uint32_t lev;
effect_set eset;
filter_effect(EFFECT_ALLOW_SYNCHRO_KOISHI, &eset);
for(int32_t i = 0; i < eset.size(); ++i) {
uint32_t lev = eset[i]->get_value(pcard);
if(lev) {
return lev;
}
}
return 0;
if(eset.size())
lev = eset[0]->get_value(pcard);
else
lev = 0;
return lev;
}
//return 0;
uint32_t lev;
......@@ -4218,19 +4217,7 @@ int32_t card::is_can_be_fusion_material(card* fcard, uint32_t summon_type) {
}
int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {
//support urara
effect_set eset;
if(data.type & (TYPE_XYZ | TYPE_LINK)) {
filter_effect(EFFECT_ALLOW_SYNCHRO_KOISHI, &eset);
auto found = FALSE;
for(int32_t i = 0; i < eset.size(); ++i) {
if(eset[i]->get_value(scard)) {
found = TRUE;
break;
}
}
if(!found)
return FALSE;
}
if(data.type & (TYPE_XYZ | TYPE_LINK) && !is_affected_by_effect(EFFECT_ALLOW_SYNCHRO_KOISHI))
return FALSE;
if(!(get_synchro_type() & TYPE_MONSTER))
return FALSE;
......@@ -4241,7 +4228,7 @@ int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {
if(is_affected_by_effect(EFFECT_SCRAP_CHIMERA, tuner))
return false;
}
eset.clear();
effect_set eset;
filter_effect(EFFECT_CANNOT_BE_SYNCHRO_MATERIAL, &eset);
for(int32_t i = 0; i < eset.size(); ++i)
if(eset[i]->get_value(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