sync ocgcore

Classes/ocgcore/card.cpp

@@ -1899,11 +1899,13 @@ int32 card::replace_effect(uint32 code, uint32 reset, uint32 count) {
 	read_card(code, &cdata);
 	if(cdata.type & TYPE_NORMAL)
 		return -1;
+	if(is_status(STATUS_EFFECT_REPLACED))
+		set_status(STATUS_EFFECT_REPLACED, FALSE);
 	for(auto i = indexer.begin(); i != indexer.end();) {
 		auto rm = i++;
 		effect* peffect = rm->first;
 		auto it = rm->second;
-		if(peffect->is_flag(EFFECT_FLAG_INITIAL | EFFECT_FLAG_COPY_INHERIT))
+		if (peffect->is_flag(EFFECT_FLAG_INITIAL | EFFECT_FLAG_COPY_INHERIT))
 			remove_effect(peffect, it);
 	}
 	uint32 cr = pduel->game_field->core.copy_reset;

Classes/ocgcore/field.cpp

@@ -1225,6 +1225,9 @@ void field::remove_oath_effect(effect* reason_effect) {
 void field::reset_phase(uint32 phase) {
 	for(auto eit = effects.pheff.begin(); eit != effects.pheff.end();) {
 		auto rm = eit++;
+		// 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)->reset(phase, RESET_PHASE)) {

Classes/ocgcore/processor.cpp

@@ -1395,6 +1395,7 @@ int32 field::process_phase_event(int16 step, int32 phase) {
 			core.select_chains.push_back(newchain);
 			cn_count++;
 		}
+		//all effects taking control non-permanently are only until End Phase, not until Turn end
 		for(auto eit = effects.pheff.begin(); eit != effects.pheff.end();) {
 			effect* peffect = *eit++;
 			if(peffect->code != EFFECT_SET_CONTROL)
@@ -1407,7 +1408,8 @@ 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;
-			if(peffect->reset_count != 1)
+			peffect->reset_count--;
+			if(peffect->reset_count != 0)
 				continue;
 			card* phandler = peffect->get_handler();
 			if(pid != phandler->current.controler) {
@@ -5047,7 +5049,7 @@ int32 field::adjust_step(uint16 step) {
 		return FALSE;
 	}
 	case 4: {
-		//1-5 control
+		//control
 		core.control_adjust_set[0].clear();
 		core.control_adjust_set[1].clear();
 		for(uint8 p = 0; p < 2; ++p) {
@@ -5077,7 +5079,6 @@ int32 field::adjust_step(uint16 step) {
 			if(res) {
 				for(uint8 p = 0; p < 2; ++p) {
 					for(auto& pcard : player[p].list_mzone) {
-						// remove EFFECT_SET_CONTROL
 						if(pcard && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) {
 							pcard->reset(EFFECT_SET_CONTROL, RESET_CODE);
 							if(p != pcard->owner && pcard->is_capable_change_control())