sync ocgcore

Classes/ocgcore/card.cpp

@@ -2734,6 +2734,7 @@ effect* card::is_affected_by_effect(int32 code, card* target) {
 	}
 	return 0;
 }
+// return the last control-changing continous effect
 effect* card::check_control_effect() {
 	effect* ret_effect = 0;
 	for (auto& pcard : equiping_cards) {
@@ -2757,7 +2758,7 @@ effect* card::check_control_effect() {
 	auto rg = single_effect.equal_range(EFFECT_SET_CONTROL);
 	for (; rg.first != rg.second; ++rg.first) {
 		effect* peffect = rg.first->second;
-		if(!peffect->is_flag(EFFECT_FLAG_SINGLE_RANGE))
+		if(!peffect->is_flag(EFFECT_FLAG_OWNER_RELATE))
 			continue;
 		if(!ret_effect || peffect->id > ret_effect->id)
 			ret_effect = peffect;

Classes/ocgcore/effect.cpp

@@ -168,7 +168,6 @@ int32 effect::check_count_limit(uint8 playerid) {
 }
 // check if an EFFECT_TYPE_ACTIONS effect can be activated
 // for triggering effects, it checks EFFECT_FLAG_DAMAGE_STEP, EFFECT_FLAG_SET_AVAILABLE
-// for continuous effect, it checks EFFECT_FLAG_AVAILABLE_BD
 int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_cond, int32 neglect_cost, int32 neglect_target, int32 neglect_loc, int32 neglect_faceup) {
 	if(!(type & EFFECT_TYPE_ACTIONS))
 		return FALSE;
@@ -546,7 +545,7 @@ int32 effect::is_chainable(uint8 tp) {
 	return TRUE;
 }
 //return: this can be reset by reset_level or not
-//RESET_CODE can only reset single effects without EFFECT_FLAG_SINGLE_RANGE
+//RESET_CODE can only reset single effects without EFFECT_FLAG_SINGLE_RANGE, EFFECT_FLAG_OWNER_RELATE
 //RESET_DISABLE is valid only when owner == handler
 int32 effect::reset(uint32 reset_level, uint32 reset_type) {
 	switch (reset_type) {
@@ -579,7 +578,7 @@ int32 effect::reset(uint32 reset_level, uint32 reset_type) {
 	}
 	case RESET_CODE: {
 		return (code == reset_level) && (type & EFFECT_TYPE_SINGLE) && !(type & EFFECT_TYPE_ACTIONS) 
-			&& !is_flag(EFFECT_FLAG_SINGLE_RANGE);
+			&& !is_flag(EFFECT_FLAG_SINGLE_RANGE) && !is_flag(EFFECT_FLAG_OWNER_RELATE);
 		break;
 	}
 	case RESET_COPY: {

Classes/ocgcore/effect.h

@@ -184,7 +184,7 @@ enum effect_flag : uint32 {
 	EFFECT_FLAG_NO_TURN_RESET		= 0x400000,
 	EFFECT_FLAG_EVENT_PLAYER		= 0x800000,
 	EFFECT_FLAG_OWNER_RELATE		= 0x1000000,
-//	EFFECT_FLAG_AVAILABLE_BD		= 0x2000000,
+	EFFECT_FLAG_CANNOT_INACTIVATE	= 0x2000000,
 	EFFECT_FLAG_CLIENT_HINT			= 0x4000000,
 //	EFFECT_FLAG_CHAIN_UNIQUE		= 0x8000000,
 	EFFECT_FLAG_LIMIT_ZONE			= 0x10000000,

Classes/ocgcore/field.cpp

@@ -3132,7 +3132,7 @@ int32 field::is_chain_negatable(uint8 chaincount) {
 		peffect = core.current_chain.back().triggering_effect;
 	else
 		peffect = core.current_chain[chaincount - 1].triggering_effect;
-	if(peffect->is_flag(EFFECT_FLAG_CANNOT_DISABLE))
+	if(peffect->is_flag(EFFECT_FLAG_CANNOT_INACTIVATE))
 		return FALSE;
 	filter_field_effect(EFFECT_CANNOT_INACTIVATE, &eset);
 	for(int32 i = 0; i < eset.size(); ++i) {

Classes/ocgcore/operations.cpp

@@ -1266,25 +1266,60 @@ int32 field::self_destroy(uint16 step, card* ucard, int32 p) {
 			auto cit = cset.begin();
 			ucard->unique_fieldid = (*cit)->fieldid;
 		} else {
-			card* mcard = 0;
+			core.select_cards.clear();
+			uint8 player = p;
 			for(auto& pcard : cset) {
-				if(ucard->unique_fieldid == pcard->fieldid) {
-					mcard = pcard;
-					break;
+				if(pcard->current.controler == player && pcard->unique_fieldid != UINT_MAX)
+					core.select_cards.push_back(pcard);
+			}
+			if(core.select_cards.size() == 0) {
+				player = 1 - p;
+				for(auto& pcard : cset) {
+					if(pcard->current.controler == player && pcard->unique_fieldid != UINT_MAX)
+						core.select_cards.push_back(pcard);
 				}
-				if(!mcard || pcard->fieldid < mcard->fieldid)
-					mcard = pcard;
 			}
-			ucard->unique_fieldid = mcard->fieldid;
-			cset.erase(mcard);
-			for(auto& pcard : cset) {
-				pcard->temp.reason_effect = pcard->current.reason_effect;
-				pcard->temp.reason_player = pcard->current.reason_player;
-				pcard->current.reason_effect = ucard->unique_effect;
-				pcard->current.reason_player = ucard->current.controler;
+			if(core.select_cards.size() == 0) {
+				player = p;
+				for(auto& pcard : cset) {
+					if(pcard->current.controler == player)
+						core.select_cards.push_back(pcard);
+				}
+			}
+			if(core.select_cards.size() == 0) {
+				player = 1 - p;
+				for(auto& pcard : cset) {
+					if(pcard->current.controler == player)
+						core.select_cards.push_back(pcard);
+				}
+			}
+			if(core.select_cards.size() == 1) {
+				returns.bvalue[1] = 0;
 			}
-			destroy(&cset, 0, REASON_RULE, 5);
+			else {
+				pduel->write_buffer8(MSG_HINT);
+				pduel->write_buffer8(HINT_SELECTMSG);
+				pduel->write_buffer8(player);
+				pduel->write_buffer32(534);
+				add_process(PROCESSOR_SELECT_CARD, 0, 0, 0, player, 0x10001);
+			}
+			return FALSE;
+		}
+		return TRUE;
+	}
+	case 1: {
+		card_set cset;
+		ucard->get_unique_target(&cset, p);
+		card* mcard = core.select_cards[returns.bvalue[1]];
+		ucard->unique_fieldid = mcard->fieldid;
+		cset.erase(mcard);
+		for(auto& pcard : cset) {
+			pcard->temp.reason_effect = pcard->current.reason_effect;
+			pcard->temp.reason_player = pcard->current.reason_player;
+			pcard->current.reason_effect = ucard->unique_effect;
+			pcard->current.reason_player = ucard->current.controler;
 		}
+		destroy(&cset, 0, REASON_RULE, 5);
 		return TRUE;
 	}
 	case 10: {
@@ -4445,6 +4480,8 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
 				core.hint_timing[pcard->current.controler] |= TIMING_POS_CHANGE;
 				if((opos & POS_FACEDOWN) && (npos & POS_FACEUP)) {
 					pcard->fieldid = infos.field_id++;
+					if(check_unique_onfield(pcard, pcard->current.controler, pcard->current.location))
+						pcard->unique_fieldid = UINT_MAX;
 					if(pcard->current.location == LOCATION_MZONE) {
 						raise_single_event(pcard, 0, EVENT_FLIP, reason_effect, 0, reason_player, 0, flag);
 						flips.insert(pcard);