sync ocgcore

Classes/ocgcore/processor.cpp

@@ -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;

mobile/assets/data/conf/strings.conf

@@ -466,9 +466,9 @@
 !victory 0x1a 「魂之接力」效果胜利
 !victory 0x1b 「鬼计惰天使」效果胜利
 !victory 0x1c 「幻煌龙的天涡」效果胜利
-!victory 0x20 由于「%ls」的效果获得比赛胜利
 !victory 0x1d 「方程式运动员胜利团队」效果胜利
 !victory 0x1e 「飞行象」效果胜利
+!victory 0x20 由于「%ls」的效果获得比赛胜利
 #counters
 !counter 0x1 魔力指示物
 !counter 0x1002 楔指示物