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

card.cpp

@@ -2427,8 +2427,10 @@ void card::filter_immune_effect() {
 	immune_effect.sort();
 }
 // for all disable-related peffect of this,
-// 1. put all cards in the target of peffect into effects.disable_check_set, effects.disable_check_list
-// 2. add equiping_target of peffect into effects.disable_check_set, effects.disable_check_list
+// 1. Insert all cards in the target of peffect into effects.disable_check_list.
+// 2. Insert equiping_target of peffect into it.
+// 3. Insert overlay_target of peffect into it.
+// 4. Insert continuous target of this into it.
 void card::filter_disable_related_cards() {
 	for (auto& it : indexer) {
 		effect* peffect = it.first;
@@ -2441,6 +2443,15 @@ void card::filter_disable_related_cards() {
 				pduel->game_field->add_to_disable_check_list(overlay_target);
 		}
 	}
+	for(auto pcard : effect_target_cards) {
+		for(auto it = pcard->single_effect.begin(); it != pcard->single_effect.end(); ++it) {
+			effect* peffect = it->second;
+			if(peffect->is_disable_related() && peffect->is_flag(EFFECT_FLAG_OWNER_RELATE)){
+				pduel->game_field->add_to_disable_check_list(pcard);
+				break;
+			}
+		}
+	}
 }
 // put all summon procedures except ordinay summon in peset (see is_can_be_summoned())
 // return value:

effect.h

@@ -186,7 +186,7 @@ enum effect_flag : uint32 {
 	EFFECT_FLAG_OWNER_RELATE		= 0x1000000,
 	EFFECT_FLAG_CANNOT_INACTIVATE	= 0x2000000,
 	EFFECT_FLAG_CLIENT_HINT			= 0x4000000,
-//	EFFECT_FLAG_CHAIN_UNIQUE		= 0x8000000,
+	EFFECT_FLAG_CONTINUOUS_TARGET	= 0x8000000,
 	EFFECT_FLAG_LIMIT_ZONE			= 0x10000000,
 //	EFFECT_FLAG_COF					= 0x20000000,
 //	EFFECT_FLAG_CVAL_CHECK			= 0x40000000,

field.cpp

@@ -1869,7 +1869,7 @@ int32 field::get_overlay_count(uint8 self, uint8 s, uint8 o) {
 	}
 	return count;
 }
-// put all cards in the target of peffect into effects.disable_check_set, effects.disable_check_list
+// put all cards in the target of peffect into effects.disable_check_list
 void field::update_disable_check_list(effect* peffect) {
 	card_set cset;
 	filter_affected_cards(peffect, &cset);
@@ -1877,9 +1877,9 @@ void field::update_disable_check_list(effect* peffect) {
 		add_to_disable_check_list(pcard);
 }
 void field::add_to_disable_check_list(card* pcard) {
-	if (effects.disable_check_set.find(pcard) != effects.disable_check_set.end())
-		return;
-	effects.disable_check_set.insert(pcard);
+	auto result=effects.disable_check_set.insert(pcard);
+	if(!result.second)
+		return
 	effects.disable_check_list.push_back(pcard);
 }
 void field::adjust_disable_check_list() {

processor.cpp

@@ -4546,7 +4546,9 @@ int32 field::solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2
 			}
 			adjust_instant();
 		}
-		if(is_chain_disablable(cait->chain_count)) {
+		// creating continuous target: peffect->is_flag(EFFECT_FLAG_CONTINUOUS_TARGET) && !cait->replace_op
+		// operation function creating continuous target should be executed even when disabled
+		if(is_chain_disablable(cait->chain_count) && (!peffect->is_flag(EFFECT_FLAG_CONTINUOUS_TARGET) || cait->replace_op)) {
 			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);