Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

card.cpp

@@ -1560,6 +1560,7 @@ void card::xyz_overlay(card_set* materials) {
 			pduel->game_field->remove_unique_card(pcard);
 		if(pcard->equiping_target)
 			pcard->unequip();
+		pcard->clear_card_target();
 		xyz_add(pcard, &des);
 	} else {
 		field::card_vector cv;
@@ -1572,6 +1573,7 @@ void card::xyz_overlay(card_set* materials) {
 				pduel->game_field->remove_unique_card(*cvit);
 			if((*cvit)->equiping_target)
 				(*cvit)->unequip();
+			(*cvit)->clear_card_target();
 			xyz_add(*cvit, &des);
 		}
 	}
@@ -1989,20 +1991,6 @@ void card::reset(uint32 id, uint32 reset_type) {
 		}
 		if(id & 0xd7e0000) {
 			counters.clear();
-			for(auto cit = effect_target_owner.begin(); cit != effect_target_owner.end(); ++cit)
-				(*cit)->effect_target_cards.erase(this);
-			for(auto cit = effect_target_cards.begin(); cit != effect_target_cards.end(); ++cit) {
-				card* pcard = *cit;
-				pcard->effect_target_owner.erase(this);
-				for(auto it = pcard->single_effect.begin(); it != pcard->single_effect.end();) {
-					auto rm = it++;
-					effect* peffect = rm->second;
-					if((peffect->owner == this) && peffect->is_flag(EFFECT_FLAG_OWNER_RELATE))
-						pcard->remove_effect(peffect, rm);
-				}
-			}
-			effect_target_owner.clear();
-			effect_target_cards.clear();
 		}
 		if(id & 0x3fe0000) {
 			auto pr = field_effect.equal_range(EFFECT_USE_EXTRA_MZONE);
@@ -2338,6 +2326,22 @@ void card::cancel_card_target(card* pcard) {
 		pduel->write_buffer32(pcard->get_info_location());
 	}
 }
+void card::clear_card_target() {
+	for(auto cit = effect_target_owner.begin(); cit != effect_target_owner.end(); ++cit)
+		(*cit)->effect_target_cards.erase(this);
+	for(auto cit = effect_target_cards.begin(); cit != effect_target_cards.end(); ++cit) {
+		card* pcard = *cit;
+		pcard->effect_target_owner.erase(this);
+		for(auto it = pcard->single_effect.begin(); it != pcard->single_effect.end();) {
+			auto rm = it++;
+			effect* peffect = rm->second;
+			if((peffect->owner == this) && peffect->is_flag(EFFECT_FLAG_OWNER_RELATE))
+				pcard->remove_effect(peffect, rm);
+		}
+	}
+	effect_target_owner.clear();
+	effect_target_cards.clear();
+}
 void card::filter_effect(int32 code, effect_set* eset, uint8 sort) {
 	effect* peffect;
 	auto rg = single_effect.equal_range(code);

card.h

@@ -277,6 +277,7 @@ public:
 	void set_material(card_set* materials);
 	void add_card_target(card* pcard);
 	void cancel_card_target(card* pcard);
+	void clear_card_target();
 
 	void filter_effect(int32 code, effect_set* eset, uint8 sort = TRUE);
 	void filter_single_effect(int32 code, effect_set* eset, uint8 sort = TRUE);

operations.cpp

@@ -3933,6 +3933,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
 			pcard->previous.location = 0;
 		} else if(oloc & LOCATION_ONFIELD) {
 			pcard->reset(RESET_LEAVE + RESET_MSCHANGE, RESET_EVENT);
+			pcard->clear_card_target();
 			param->leave.insert(pcard);
 		}
 		if(param->predirect->operation) {
@@ -3974,6 +3975,22 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
 					pduel->write_buffer32(ptop->data.code | 0x80000000);
 			}
 		}
+		for(auto cit = param->targets->container.begin(); cit != param->targets->container.end(); ++cit) {
+			card* pcard = *cit;
+			uint8 nloc = pcard->current.location;
+			if(nloc == LOCATION_HAND)
+				pcard->reset(RESET_TOHAND, RESET_EVENT);
+			else if(nloc == LOCATION_DECK || nloc == LOCATION_EXTRA)
+				pcard->reset(RESET_TODECK, RESET_EVENT);
+			else if(nloc == LOCATION_GRAVE)
+				pcard->reset(RESET_TOGRAVE, RESET_EVENT);
+			if(nloc == LOCATION_REMOVED || ((pcard->data.type & TYPE_TOKEN) && pcard->sendto_param.location == LOCATION_REMOVED)) {
+				if(pcard->current.reason & REASON_TEMPORARY)
+					pcard->reset(RESET_TEMP_REMOVE, RESET_EVENT);
+				else
+					pcard->reset(RESET_REMOVE, RESET_EVENT);
+			}
+		}
 		for(auto iter = param->leave.begin(); iter != param->leave.end(); ++iter)
 			raise_single_event(*iter, 0, EVENT_LEAVE_FIELD, (*iter)->current.reason_effect, (*iter)->current.reason, (*iter)->current.reason_player, 0, 0);
 		if((core.global_flag & GLOBALFLAG_DETACH_EVENT) && param->detach.size()) {
@@ -4011,18 +4028,16 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
 						equipings.insert(equipc);
 				}
 			}
+			pcard->clear_card_target();
 			if(!(pcard->data.type & TYPE_TOKEN)) {
 				pcard->enable_field_effect(true);
 				if(nloc == LOCATION_HAND) {
 					tohand.insert(pcard);
-					pcard->reset(RESET_TOHAND, RESET_EVENT);
 					raise_single_event(pcard, 0, EVENT_TO_HAND, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
 				} else if(nloc == LOCATION_DECK || nloc == LOCATION_EXTRA) {
 					todeck.insert(pcard);
-					pcard->reset(RESET_TODECK, RESET_EVENT);
 					raise_single_event(pcard, 0, EVENT_TO_DECK, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
 				} else if(nloc == LOCATION_GRAVE) {
-					pcard->reset(RESET_TOGRAVE, RESET_EVENT);
 					if(pcard->current.reason & REASON_RETURN) {
 						retgrave.insert(pcard);
 						raise_single_event(pcard, 0, EVENT_RETURN_TO_GRAVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
@@ -4034,10 +4049,6 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
 			}
 			if(nloc == LOCATION_REMOVED || ((pcard->data.type & TYPE_TOKEN) && pcard->sendto_param.location == LOCATION_REMOVED)) {
 				remove.insert(pcard);
-				if(pcard->current.reason & REASON_TEMPORARY)
-					pcard->reset(RESET_TEMP_REMOVE, RESET_EVENT);
-				else
-					pcard->reset(RESET_REMOVE, RESET_EVENT);
 				raise_single_event(pcard, 0, EVENT_REMOVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
 			}
 			if(pcard->current.reason & REASON_DISCARD) {
@@ -4386,6 +4397,7 @@ int32 field::move_to_field(uint16 step, card* target, uint32 enable, uint32 ret,
 		}
 		if((target->previous.location == LOCATION_SZONE) && target->equiping_target)
 			target->unequip();
+		target->clear_card_target();
 		if(target->current.location == LOCATION_MZONE) {
 			effect_set eset;
 			filter_player_effect(0, EFFECT_MUST_USE_MZONE, &eset, FALSE);
@@ -4499,6 +4511,7 @@ int32 field::change_position(uint16 step, group * targets, effect * reason_effec
 					if(pcard->status & (STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED))
 						pcard->set_status(STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED, FALSE);
 					pcard->reset(RESET_TURN_SET, RESET_EVENT);
+					pcard->clear_card_target();
 					pcard->set_status(STATUS_SET_TURN, TRUE);
 					pcard->enable_field_effect(false);
 					pcard->summon_info &= 0xdf00ffff;

processor.cpp

@@ -2143,9 +2143,9 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
 			// delayed quick
 			for(auto eit = core.delayed_quick.begin(); eit != core.delayed_quick.end();) {
 				effect* peffect = eit->first;
+				const tevent& evt = eit->second;
 				++eit;
 				peffect->set_activate_location();
-				const tevent& evt = eit->second;
 				if(peffect->is_chainable(priority) && peffect->is_activateable(priority, evt, TRUE, FALSE, FALSE)) {
 					card* phandler = peffect->get_handler();
 					newchain.flag = 0;
@@ -4702,19 +4702,6 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
 				oeit->second = 0;
 		break_effect();
 		core.chain_solving = TRUE;
-		card* pcard = peffect->get_handler();
-		if((peffect->type & EFFECT_TYPE_ACTIVATE) && pcard->is_has_relation(*cait)) {
-			pcard->set_status(STATUS_ACTIVATED, TRUE);
-			pcard->enable_field_effect(true);
-			if(core.duel_rule <= 2) {
-				if(pcard->data.type & TYPE_FIELD) {
-					card* fscard = player[1 - pcard->current.controler].list_szone[5];
-					if(fscard && fscard->is_position(POS_FACEUP))
-						fscard->enable_field_effect(false);
-				}
-			}
-			adjust_instant();
-		}
 		raise_event((card*)0, EVENT_CHAIN_SOLVING, peffect, 0, cait->triggering_player, cait->triggering_player, cait->chain_count);
 		process_instant_event();
 		return FALSE;
@@ -4722,19 +4709,32 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
 	case 2: {
 		core.spsummon_state_count_tmp[0] = core.spsummon_state_count[0];
 		core.spsummon_state_count_tmp[1] = core.spsummon_state_count[1];
-		card* pcard = cait->triggering_effect->get_handler();
+		effect* peffect = cait->triggering_effect;
+		card* pcard = peffect->get_handler();
 		if(is_chain_disablable(cait->chain_count)) {
 			if(is_chain_disabled(cait->chain_count) || (pcard->get_status(STATUS_DISABLED | STATUS_FORBIDDEN) && pcard->is_has_relation(*cait))) {
 				if(!(cait->flag & CHAIN_DISABLE_EFFECT)) {
 					pduel->write_buffer8(MSG_CHAIN_DISABLED);
 					pduel->write_buffer8(cait->chain_count);
 				}
-				raise_event((card*)0, EVENT_CHAIN_DISABLED, cait->triggering_effect, 0, cait->triggering_player, cait->triggering_player, cait->chain_count);
+				raise_event((card*)0, EVENT_CHAIN_DISABLED, peffect, 0, cait->triggering_player, cait->triggering_player, cait->chain_count);
 				process_instant_event();
 				core.units.begin()->step = 3;
 				return FALSE;
 			}
 		}
+		if((peffect->type & EFFECT_TYPE_ACTIVATE) && pcard->is_has_relation(*cait)) {
+			pcard->set_status(STATUS_ACTIVATED, TRUE);
+			pcard->enable_field_effect(true);
+			if(core.duel_rule <= 2) {
+				if(pcard->data.type & TYPE_FIELD) {
+					card* fscard = player[1 - pcard->current.controler].list_szone[5];
+					if(fscard && fscard->is_position(POS_FACEUP))
+						fscard->enable_field_effect(false);
+				}
+			}
+			adjust_instant();
+		}
 		if(cait->replace_op) {
 			core.units.begin()->arg4 = cait->triggering_effect->operation;
 			cait->triggering_effect->operation = cait->replace_op;