Commit 59559357 authored by mercury233's avatar mercury233 Committed by GitHub

temp revert (#207)

fix #203 and Fluorohydride/ygopro#2176 but skip turn effect don't works well with temp get control effect
parent df431baf
......@@ -1225,8 +1225,8 @@ void field::reset_phase(uint32 phase) {
// work around: skip turn still raise reset_phase(PHASE_END)
// without this taking control only for one turn will be returned when skipping turn
// RESET_TURN_END should be introduced
if((*rm)->code == EFFECT_SET_CONTROL)
continue;
//if((*rm)->code == EFFECT_SET_CONTROL)
// continue;
if((*rm)->reset(phase, RESET_PHASE)) {
if((*rm)->is_flag(EFFECT_FLAG_FIELD_ONLY))
remove_effect((*rm));
......
......@@ -1408,8 +1408,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
uint8 tp = infos.turn_player;
if(!(((peffect->reset_flag & RESET_SELF_TURN) && pid == tp) || ((peffect->reset_flag & RESET_OPPO_TURN) && pid != tp)))
continue;
peffect->reset_count--;
if(peffect->reset_count != 0)
if(peffect->reset_count != 1)
continue;
card* phandler = peffect->get_handler();
if(pid != phandler->current.controler) {
......
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