Commit 4368c20c authored by mercury233's avatar mercury233

fix field::check_tuner_material vs EFFECT_MUST_BE_SMATERIAL

parent 60c3c4f0
......@@ -2692,7 +2692,7 @@ int32_t field::check_tuner_material(lua_State* L, card* pcard, card* tuner, int3
++location_count;
}
if(min == 0) {
if(location_count > 0 && check_with_sum_limit_m(nsyn, lv, 0, 0, 0, 0xffff, 2)) {
if(location_count > 0 && must_list.size() == 0 && check_with_sum_limit_m(nsyn, lv, 0, 0, 0, 0xffff, 2)) {
pduel->restore_assumes();
return TRUE;
}
......@@ -2704,6 +2704,12 @@ int32_t field::check_tuner_material(lua_State* L, card* pcard, card* tuner, int3
}
if(must_list.size()) {
for(auto& mcard : must_list) {
if(mg) {
if(!mg->has_card(mcard)) {
pduel->restore_assumes();
return FALSE;
}
}
if(pcheck)
pcheck->get_value(mcard);
if((mcard->current.location == LOCATION_MZONE && !mcard->is_position(POS_FACEUP)) || !mcard->is_can_be_synchro_material(pcard, tuner)) {
......
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