Commit e44e30f9 authored by mercury233's avatar mercury233
parents b1f143d7 1f41d83b
......@@ -2397,7 +2397,7 @@ int32 field::check_synchro_material(card* pcard, int32 findex1, int32 findex2, i
return FALSE;
}
int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32 findex2, int32 min, int32 max, card* smat, group* mg) {
if(!tuner || !tuner->is_position(POS_FACEUP) || !(tuner->get_synchro_type() & TYPE_TUNER) || !tuner->is_can_be_synchro_material(pcard))
if(!tuner || (tuner->current.location == LOCATION_MZONE && !tuner->is_position(POS_FACEUP)) || !(tuner->get_synchro_type() & TYPE_TUNER) || !tuner->is_can_be_synchro_material(pcard))
return FALSE;
effect* pcheck = tuner->is_affected_by_effect(EFFECT_SYNCHRO_CHECK);
if(pcheck)
......
......@@ -4346,6 +4346,8 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
if(!(target->current.location & LOCATION_ONFIELD))
target->clear_relate_effect();
}
if(ret == 1)
target->current.reason &= ~REASON_TEMPORARY;
if(ret == 0 && location != target->current.location
|| ret == 1 && target->turnid != infos.turn_id) {
target->set_status(STATUS_SUMMON_TURN, FALSE);
......
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