update chain attack

ocgcore/processor.cpp

@@ -2844,14 +2844,13 @@ int32 field::process_idle_command(uint16 step) {
 int32 field::process_battle_command(uint16 step) {
 	switch(step) {
 	case 0: {
-		pair<effect_container::iterator, effect_container::iterator> pr;
 		effect* peffect = 0;
 		card* pcard = 0;
 		core.select_chains.clear();
 		chain newchain;
 		nil_event.event_code = EVENT_FREE_CHAIN;
-		core.chain_attack = FALSE;
-		core.chain_attack_target = 0;
+		if(!core.chain_attack)
+			core.chain_attack_target = 0;
 		core.attacker = 0;
 		core.attack_target = 0;
 		if((peffect = is_player_affected_by_effect(infos.turn_player, EFFECT_SKIP_BP))) {
@@ -2872,7 +2871,7 @@ int32 field::process_battle_command(uint16 step) {
 			return FALSE;
 		}
 		core.battle_phase_action = TRUE;
-		pr = effects.activate_effect.equal_range(EVENT_FREE_CHAIN);
+		auto pr = effects.activate_effect.equal_range(EVENT_FREE_CHAIN);
 		for(; pr.first != pr.second; ++pr.first) {
 			peffect = pr.first->second;
 			peffect->s_range = peffect->handler->current.location;
@@ -2901,7 +2900,10 @@ int32 field::process_battle_command(uint16 step) {
 				if(!pcard->is_capable_attack_announce(infos.turn_player))
 					continue;
 				core.select_cards.clear();
-				get_attack_target(pcard, &core.select_cards);
+				uint8 chain_attack = FALSE;
+				if(core.chain_attack && core.pre_field[0] == pcard->fieldid_r)
+					chain_attack = TRUE;
+				get_attack_target(pcard, &core.select_cards, chain_attack);
 				if(core.select_cards.size() == 0 && pcard->operation_param == 0)
 					continue;
 				core.attackable_cards.push_back(pcard);
@@ -2954,7 +2956,12 @@ int32 field::process_battle_command(uint16 step) {
 			return FALSE;
 		} else if(ctype == 1) {
 			core.units.begin()->step = 2;
-			core.attacker = core.attackable_cards[sel];
+			card* attacker = core.attackable_cards[sel];
+			if(core.chain_attack && core.pre_field[0] != attacker->fieldid_r) {
+				core.chain_attack = FALSE;
+				core.chain_attack_target = 0;
+			}
+			core.attacker = attacker;
 			core.attacker->set_status(STATUS_ATTACK_CANCELED, FALSE);
 			core.pre_field[0] = core.attacker->fieldid_r;
 			core.phase_action = TRUE;
@@ -3796,6 +3803,7 @@ 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;
@@ -3818,7 +3826,7 @@ int32 field::process_battle_command(uint16 step) {
 					add_process(PROCESSOR_EXECUTE_OPERATION, 0, eset[i], 0, infos.turn_player, 0);
 				}
 			}
-			core.units.begin()->step = 2;
+			core.chain_attack = TRUE;
 		}
 		return FALSE;
 	}
@@ -4274,6 +4282,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 		core.new_ochain.clear();
 		core.quick_f_chain.clear();
 		core.delayed_quick_tmp.clear();
+		core.chain_attack = FALSE;
 		add_process(PROCESSOR_BATTLE_COMMAND, 0, 0, 0, 0, 0);
 		return FALSE;
 	}

script/c10032958.lua

@@ -71,22 +71,7 @@ function c10032958.atcon(e,tp,eg,ep,ev,re,r,rp)
 	return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:IsChainAttackable() and c:IsStatus(STATUS_OPPO_BATTLE)
 end
 function c10032958.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end
 function c10032958.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/c17313545.lua

@@ -27,20 +27,5 @@ function c17313545.atcon(e,tp,eg,ep,ev,re,r,rp)
 		and bc:IsAttribute(ATTRIBUTE_LIGHT)
 end
 function c17313545.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c18013090.lua

@@ -68,53 +68,8 @@ function c18013090.catg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c18013090.caop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	local c=e:GetHandler()
 	if tc and tc:IsRelateToEffect(e) and tc:IsFaceup() then
 		Duel.ChangePosition(tc,POS_FACEUP_ATTACK)
-		--Duel.ChainAttack(tc)
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetCode(EFFECT_EXTRA_ATTACK)
-		e1:SetValue(1)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		c:RegisterEffect(e1)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		c:RegisterEffect(e2)
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
-		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e3:SetLabelObject(tc)
-		e3:SetValue(c18013090.exttg)
-		e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		c:RegisterEffect(e3)
-		e2:SetLabelObject(e3)
-		e1:SetLabelObject(e2)
-		local e4=Effect.CreateEffect(c)
-		e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e4:SetCode(EVENT_ATTACK_ANNOUNCE)
-		e4:SetLabelObject(e1)
-		e4:SetOperation(c18013090.atrst)
-		e4:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-		Duel.RegisterEffect(e4,tp)
-	end
-end
-function c18013090.exttg(e,c)
-	local tc=e:GetLabelObject()
-	return c~=tc
-end
-function c18013090.atrst(e,tp,eg,ep,ev,re,r,rp)
-	local e1=e:GetLabelObject()
-	local e2=e1:GetLabelObject()
-	local e3=e2:GetLabelObject()
-	if eg:GetFirst()~=e1:GetHandler() then
-		e1:Reset()
-		e2:Reset()
-		e3:Reset()
+		Duel.ChainAttack(tc)
 	end
 end

script/c21435914.lua

@@ -37,26 +37,13 @@ end
 function c21435914.atop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToBattle() then return end
+	Duel.ChainAttack()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
 	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e3:SetLabelObject(e1)
-	e3:SetOperation(aux.atrst)
-	e3:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e3,tp)
 end
 function c21435914.damcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp

script/c23118924.lua

@@ -46,20 +46,5 @@ function c23118924.atcon(e,tp,eg,ep,ev,re,r,rp)
 		and not c:IsDisabled() and Duel.IsExistingMatchingCard(c23118924.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_WIND)
 end
 function c23118924.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c30314994.lua

@@ -31,20 +31,5 @@ function c30314994.atcon(e,tp,eg,ep,ev,re,r,rp)
 		and not c:IsDisabled() and Duel.IsExistingMatchingCard(c30314994.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_WIND)
 end
 function c30314994.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c31632536.lua

@@ -32,20 +32,7 @@ function c31632536.caop2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if e:GetLabelObject():GetLabel()==1 and c:IsRelateToBattle() and c:IsChainAttackable()
 		and Duel.GetMatchingGroupCount(Card.IsSetCard,tp,LOCATION_GRAVE,0,nil,0x39)>=2 then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetCode(EFFECT_EXTRA_ATTACK)
-		e1:SetValue(1)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-		c:RegisterEffect(e1)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-		e2:SetLabelObject(e1)
-		e2:SetOperation(aux.atrst)
-		e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-		Duel.RegisterEffect(e2,tp)
+		Duel.ChainAttack()
 	end
 end
 function c31632536.pcon(e)

script/c33823832.lua

@@ -59,7 +59,6 @@ function c33823832.cacon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c33823832.caop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
-	local c=e:GetHandler()
 	if tc:IsFaceup() and tc:IsControler(tp) and tc:IsRelateToBattle() then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
@@ -69,20 +68,7 @@ function c33823832.caop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
 		tc:RegisterEffect(e1)
 		if tc:IsChainAttackable() then
-			local e2=Effect.CreateEffect(c)
-			e2:SetType(EFFECT_TYPE_SINGLE)
-			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-			e2:SetCode(EFFECT_EXTRA_ATTACK)
-			e2:SetValue(1)
-			e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-			tc:RegisterEffect(e2)
-			local e3=Effect.CreateEffect(c)
-			e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-			e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-			e3:SetLabelObject(e2)
-			e3:SetOperation(aux.atrst)
-			e3:SetReset(RESET_PHASE+PHASE_BATTLE)
-			Duel.RegisterEffect(e3,tp)
+			Duel.ChainAttack()
 		end
 	end
 end

script/c35514096.lua

@@ -66,20 +66,7 @@ function c35514096.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP)
 	elseif e:GetLabel()==1 then
 		if c:IsRelateToBattle() then
-			local e1=Effect.CreateEffect(c)
-			e1:SetType(EFFECT_TYPE_SINGLE)
-			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-			e1:SetCode(EFFECT_EXTRA_ATTACK)
-			e1:SetValue(1)
-			e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-			c:RegisterEffect(e1)
-			local e2=Effect.CreateEffect(c)
-			e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-			e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-			e2:SetLabelObject(e1)
-			e2:SetOperation(aux.atrst)
-			e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-			Duel.RegisterEffect(e2,tp)
+			Duel.ChainAttack()
 		end
 	end
 end

script/c35638627.lua

@@ -44,20 +44,5 @@ function c35638627.atcon(e,tp,eg,ep,ev,re,r,rp)
 	return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:IsChainAttackable() and c:IsStatus(STATUS_OPPO_BATTLE)
 end
 function c35638627.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c40225398.lua

@@ -15,19 +15,6 @@ function c40225398.caop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local bc=c:GetBattleTarget()
 	if Duel.GetAttacker()==c and bc and bit.band(bc:GetBattlePosition(),POS_DEFENCE)~=0 and c:IsRelateToBattle() and c:IsChainAttackable() then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetCode(EFFECT_EXTRA_ATTACK)
-		e1:SetValue(1)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-		c:RegisterEffect(e1)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-		e2:SetLabelObject(e1)
-		e2:SetOperation(aux.atrst)
-		e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-		Duel.RegisterEffect(e2,tp)
+		Duel.ChainAttack()
 	end
 end

script/c46427957.lua

@@ -16,20 +16,5 @@ function c46427957.atcon(e,tp,eg,ep,ev,re,r,rp)
 	return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:IsChainAttackable() and c:IsStatus(STATUS_OPPO_BATTLE)
 end
 function c46427957.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c49202331.lua

@@ -55,20 +55,5 @@ function c49202331.atcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c49202331.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c57274196.lua

@@ -32,21 +32,5 @@ function c57274196.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e3,tp)
 end
 function c57274196.operation(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local tc=eg:GetFirst()
-	if not tc:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	tc:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c58272005.lua

@@ -70,26 +70,13 @@ function c58272005.atcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c58272005.atop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local ec=e:GetHandler():GetEquipTarget()
+	local ec=c:GetEquipTarget()
 	if not ec:IsRelateToBattle() then return end
+	Duel.ChainAttack()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
 	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
 	ec:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	ec:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e3:SetLabelObject(e1)
-	e3:SetOperation(aux.atrst)
-	e3:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e3,tp)
 end

script/c62315111.lua

@@ -16,20 +16,5 @@ function c62315111.atcon(e,tp,eg,ep,ev,re,r,rp)
 		and bc:GetCounter(0xe)>0
 end
 function c62315111.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c6330307.lua

@@ -74,47 +74,6 @@ function c6330307.atkop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetValue(0)
 		e1:SetReset(RESET_EVENT+0x1fe0000)
 		at:RegisterEffect(e1)
-		--Duel.ChainAttack(at)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_EXTRA_ATTACK)
-		e2:SetValue(1)
-		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		ec:RegisterEffect(e2)
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-		e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		ec:RegisterEffect(e3)
-		local e4=Effect.CreateEffect(c)
-		e4:SetType(EFFECT_TYPE_SINGLE)
-		e4:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
-		e4:SetLabelObject(at)
-		e4:SetValue(c6330307.exttg)
-		e4:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		ec:RegisterEffect(e4)
-		e3:SetLabelObject(e4)
-		e2:SetLabelObject(e3)
-		local e5=Effect.CreateEffect(c)
-		e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e5:SetCode(EVENT_ATTACK_ANNOUNCE)
-		e5:SetLabelObject(e2)
-		e5:SetOperation(c6330307.atrst)
-		e5:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-		Duel.RegisterEffect(e5,tp)
-	end
-end
-function c6330307.exttg(e,c)
-	local tc=e:GetLabelObject()
-	return c~=tc
-end
-function c6330307.atrst(e,tp,eg,ep,ev,re,r,rp)
-	local e2=e:GetLabelObject()
-	local e3=e2:GetLabelObject()
-	local e4=e3:GetLabelObject()
-	if eg:GetFirst()~=e2:GetHandler() then
-		e2:Reset()
-		e3:Reset()
-		e4:Reset()
+		Duel.ChainAttack(at)
 	end
 end

script/c65260293.lua

@@ -30,20 +30,5 @@ function c65260293.atcon(e,tp,eg,ep,ev,re,r,rp)
 		and not c:IsDisabled() and Duel.IsExistingMatchingCard(c65260293.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_WIND)
 end
 function c65260293.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c69069911.lua

@@ -24,20 +24,5 @@ function c69069911.atcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c69069911.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c69757518.lua

@@ -47,27 +47,13 @@ end
 function c69757518.atop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToBattle() then return end
-	local ct=c:GetAttackAnnouncedCount()
+	Duel.ChainAttack()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(ct)
 	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e3:SetLabelObject(e1)
-	e3:SetOperation(aux.atrst)
-	e3:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-	Duel.RegisterEffect(e3,tp)
 end
 function c69757518.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/c70194827.lua

@@ -22,24 +22,11 @@ end
 function c70194827.atop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToBattle() then return end
+	Duel.ChainAttack()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
 	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e3:SetLabelObject(e1)
-	e3:SetOperation(aux.atrst)
-	e3:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e3,tp)
 end

script/c72989439.lua

@@ -77,24 +77,9 @@ end
 function c72989439.atcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local bc=c:GetBattleTarget()
-	return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:GetFlagEffect(72989439)==0 
+	return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:GetFlagEffect(72989439)==0
 		and c:IsChainAttackable() and c:IsStatus(STATUS_OPPO_BATTLE) 
 end
 function c72989439.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c75292259.lua

@@ -15,54 +15,5 @@ function c75292259.atcon(e,tp,eg,ep,ev,re,r,rp)
 		and bc:GetBattlePosition()==POS_FACEUP_ATTACK and c:IsChainAttackable(3)
 end
 function c75292259.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local bc=c:GetBattleTarget()
-	if Duel.SelectYesNo(tp,aux.Stringid(75292259,0)) then
-		--Duel.ChainAttack(e:GetHandler():GetBattleTarget())
-		local ct=c:GetAttackAnnouncedCount()
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetCode(EFFECT_EXTRA_ATTACK)
-		e1:SetValue(ct)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		c:RegisterEffect(e1)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		c:RegisterEffect(e2)
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
-		e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e3:SetLabelObject(bc)
-		e3:SetValue(c75292259.exttg)
-		e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE_CAL)
-		c:RegisterEffect(e3)
-		e2:SetLabelObject(e3)
-		e1:SetLabelObject(e2)
-		local e4=Effect.CreateEffect(c)
-		e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e4:SetCode(EVENT_ATTACK_ANNOUNCE)
-		e4:SetLabelObject(e1)
-		e4:SetOperation(c75292259.atrst)
-		e4:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-		Duel.RegisterEffect(e4,tp)
-	end
-end
-function c75292259.exttg(e,c)
-	local tc=e:GetLabelObject()
-	return c~=tc
-end
-function c75292259.atrst(e,tp,eg,ep,ev,re,r,rp)
-	local e1=e:GetLabelObject()
-	local e2=e1:GetLabelObject()
-	local e3=e2:GetLabelObject()
-	if eg:GetFirst()~=e1:GetHandler() then
-		e1:Reset()
-		e2:Reset()
-		e3:Reset()
-	end
+	Duel.ChainAttack(e:GetHandler():GetBattleTarget())
 end

script/c80367387.lua

@@ -61,20 +61,5 @@ function c80367387.atcon(e,tp,eg,ep,ev,re,r,rp)
 	return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:IsChainAttackable() and c:IsStatus(STATUS_OPPO_BATTLE)
 end
 function c80367387.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end

script/c86137485.lua

@@ -34,20 +34,7 @@ function c86137485.atop1(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetValue(800)
 	e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_END)
 	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetCode(EFFECT_EXTRA_ATTACK)
-	e2:SetValue(1)
-	e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e3:SetLabelObject(e2)
-	e3:SetOperation(aux.atrst)
-	e3:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e3,tp)
+	Duel.ChainAttack()
 end
 function c86137485.atcon2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

script/c88301393.lua

@@ -96,22 +96,7 @@ function c88301393.atcon(e,tp,eg,ep,ev,re,r,rp)
 	return bc:IsLocation(LOCATION_GRAVE) and bc:IsType(TYPE_MONSTER) and c:IsChainAttackable() and c:IsStatus(STATUS_OPPO_BATTLE)
 end
 function c88301393.atop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not c:IsRelateToBattle() then return end
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e1:SetCode(EFFECT_EXTRA_ATTACK)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_BATTLE)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetLabelObject(e1)
-	e2:SetOperation(aux.atrst)
-	e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e2,tp)
+	Duel.ChainAttack()
 end
 function c88301393.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckReleaseGroup(tp,Card.IsReleasable,1,nil) end