chain attack

ocgcore/field.cpp

@@ -1649,11 +1649,14 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack)
 			continue;
 		if(pcard->is_affected_by_effect(EFFECT_CANNOT_SELECT_BATTLE_TARGET, atarget))
 			continue;
+		if(chain_attack && core.chain_attack_target && atarget != core.chain_attack_target)
+			continue;
 		v->push_back(atarget);
 	}
 	if(must_be_attack.size())
 		return TRUE;
-	if((mcount == 0 || pcard->is_affected_by_effect(EFFECT_DIRECT_ATTACK)) && !pcard->is_affected_by_effect(EFFECT_CANNOT_DIRECT_ATTACK))
+	if((mcount == 0 || pcard->is_affected_by_effect(EFFECT_DIRECT_ATTACK)) && !pcard->is_affected_by_effect(EFFECT_CANNOT_DIRECT_ATTACK) 
+			&& !core.chain_attack_target)
 		pcard->operation_param = 1;
 	return must_be_attack.size() ? TRUE : FALSE;
 }

ocgcore/processor.cpp

@@ -3007,11 +3007,6 @@ int32 field::process_battle_command(uint16 step) {
 		}
 		core.select_cards.clear();
 		core.units.begin()->arg1 = FALSE;
-		if(core.chain_attack && core.chain_attack_target) {
-			core.attack_target = core.chain_attack_target;
-			core.units.begin()->step = 6;
-			return FALSE;
-		}
 		core.units.begin()->arg2 = get_attack_target(core.attacker, &core.select_cards, core.chain_attack);
 		return FALSE;
 	}
@@ -3256,23 +3251,6 @@ int32 field::process_battle_command(uint16 step) {
 			core.units.begin()->step = 19;
 			return FALSE;
 		}
-		if(core.chain_attack && core.chain_attack_target) {
-			core.attacker->announce_count++;
-			attack_all_target_check();
-			if(!(core.chain_attack_target->current.location & LOCATION_MZONE)) {
-				core.units.begin()->step = -1;
-				reset_phase(PHASE_DAMAGE);
-				return FALSE;
-			}
-			uint8 seq = core.chain_attack_target->current.sequence;
-			if(core.opp_mzone[seq] != core.chain_attack_target->fieldid_r) {
-				core.units.begin()->step = -1;
-				reset_phase(PHASE_DAMAGE);
-				return FALSE;
-			}
-			core.units.begin()->step = 19;
-			return FALSE;
-		}
 		core.select_cards.clear();
 		core.units.begin()->arg2 = get_attack_target(core.attacker, &core.select_cards, core.chain_attack);
 		for(uint32 i = 0; i < 5; ++i) {
@@ -3803,29 +3781,6 @@ int32 field::process_battle_command(uint16 step) {
 		if(core.effect_damage_step)
 			return TRUE;
 		if(core.chain_attack) {
-			core.chain_attack = FALSE;
-			if(core.attacker->is_status(STATUS_BATTLE_DESTROYED) || core.attacker->fieldid_r != core.pre_field[0]
-			        || (core.attacker->current.controler != infos.turn_player) || !core.attacker->is_capable_attack_announce(infos.turn_player))
-				return FALSE;
-			if(core.chain_attack_target) {
-				if(!core.chain_attack_target->is_capable_be_battle_target(core.attacker)
-				        || core.chain_attack_target->current.location != LOCATION_MZONE)
-					return FALSE;
-			} else {
-				core.select_cards.clear();
-				get_attack_target(core.attacker, &core.select_cards, TRUE);
-				if(core.select_cards.size() == 0 && core.attacker->operation_param == 0)
-					return FALSE;
-			}
-			effect_set eset;
-			filter_player_effect(infos.turn_player, EFFECT_ATTACK_COST, &eset, FALSE);
-			core.attacker->filter_effect(EFFECT_ATTACK_COST, &eset);
-			for(int32 i = 0; i < eset.size(); ++i) {
-				if(eset[i]->operation) {
-					core.sub_solving_event.push_back(nil_event);
-					add_process(PROCESSOR_EXECUTE_OPERATION, 0, eset[i], 0, infos.turn_player, 0);
-				}
-			}
 			core.chain_attack = TRUE;
 		}
 		return FALSE;