Commit bb6fd728 authored by nanahira's avatar nanahira

fix

parent 4345aa58
...@@ -1082,7 +1082,10 @@ uint32_t card::get_mat_level_from_effect(card* pcard, uint32_t effect_code) { ...@@ -1082,7 +1082,10 @@ uint32_t card::get_mat_level_from_effect(card* pcard, uint32_t effect_code) {
uint32_t card::get_mat_level(card* pcard, uint32_t level_effect_code, uint32_t allow_effect_code) { uint32_t card::get_mat_level(card* pcard, uint32_t level_effect_code, uint32_t allow_effect_code) {
if((data.type & (TYPE_XYZ | TYPE_LINK)) || (status & STATUS_NO_LEVEL)) if((data.type & (TYPE_XYZ | TYPE_LINK)) || (status & STATUS_NO_LEVEL))
return get_mat_level_from_effect(pcard, allow_effect_code); return get_mat_level_from_effect(pcard, allow_effect_code);
return get_mat_level_from_effect(pcard, level_effect_code) || get_level(); auto lv = get_mat_level_from_effect(pcard, level_effect_code);
if(lv)
return lv;
return get_level();
} }
uint32_t card::get_synchro_level(card* pcard) { uint32_t card::get_synchro_level(card* pcard) {
return get_mat_level(pcard, EFFECT_SYNCHRO_LEVEL, EFFECT_ALLOW_FOR_SYNCHRO); return get_mat_level(pcard, EFFECT_SYNCHRO_LEVEL, EFFECT_ALLOW_FOR_SYNCHRO);
......
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