fix

expansions/script/c11451860.lua

@@ -113,17 +113,19 @@ function cm.desop2(e,tp,eg,ep,ev,re,r,rp)
 		cm.desop3(e,tp,eg,ep,ev,re,r,rp)
 	else
 		Duel.RaiseEvent(eg,EVENT_CUSTOM+11451848,re,r,rp,ep,ev)
+		Duel.RaiseEvent(eg,EVENT_CUSTOM+11451850,re,r,rp,ep,ev)
 	end
 end
 function cm.descon3(e,tp,eg,ep,ev,re,r,rp)
 	return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():GetFieldID()==re:GetHandler():GetRealFieldID()
 end
 function cm.desop3(e,tp,eg,ep,ev,re,r,rp)
+	Duel.RaiseEvent(eg,EVENT_CUSTOM+11451848,re,r,rp,ep,ev)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_CHAIN_ACTIVATING)
 	e1:SetCountLimit(1)
-	e1:SetOperation(function(e) Duel.RaiseEvent(eg,EVENT_CUSTOM+11451848,re,r,rp,ep,ev) end)
+	e1:SetOperation(function(e) Duel.RaiseEvent(eg,EVENT_CUSTOM+11451850,re,r,rp,ep,ev) end)
 	e1:SetReset(RESET_CHAIN)
 	Duel.RegisterEffect(e1,0)
 end
@@ -195,17 +197,17 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 			local e3=Effect.CreateEffect(c)
 			e3:SetDescription(aux.Stringid(m,i))
 			e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-			e3:SetCode(EVENT_CUSTOM+11451848)
+			e3:SetCode(EVENT_CUSTOM+11451849)
 			e3:SetLabel(i)
 			e3:SetCountLimit(1)
 			e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
-			e3:SetCondition(cm.thcon2)
+			e3:SetCondition(cm.thcon4)
 			e3:SetTarget(cm.thtg2)
 			e3:SetOperation(cm.thop2)
 			Duel.RegisterEffect(e3,tp)
 			local e4=e3:Clone()
 			e4:SetType(EFFECT_TYPE_QUICK_F)
-			e4:SetCode(EVENT_CUSTOM+11451848)
+			e4:SetCode(EVENT_CUSTOM+11451850)
 			e4:SetCondition(cm.thcon3)
 			Duel.RegisterEffect(e4,tp)
 			local e5=Effect.CreateEffect(c)
@@ -214,7 +216,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 			e5:SetLabel(i)
 			e5:SetCondition(cm.thcon2)
 			e5:SetOperation(cm.delayop)
-			--Duel.RegisterEffect(e5,tp)
+			Duel.RegisterEffect(e5,tp)
 			e3:SetLabelObject(e4)
 			e4:SetLabelObject(e3)
 		end
@@ -227,24 +229,24 @@ function cm.delayop(e,tp,eg,ep,ev,re,r,rp)
 	ge1:SetCondition(function() return Duel.GetCurrentChain()==1 end)
 	ge1:SetOperation(cm.MergedDelayEventCheck(e,tp,eg,ep,ev,re,r,rp,e:GetLabel()))
 	ge1:SetReset(RESET_CHAIN)
-	Duel.RegisterEffect(ge1,0)
+	--Duel.RegisterEffect(ge1,0)
 	local ge2=ge1:Clone()
 	ge2:SetCode(EVENT_CHAIN_NEGATED)
-	Duel.RegisterEffect(ge2,0)
-	local ge3=Effect.CreateEffect(e:GetHandler())
-	ge3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	ge3:SetCode(EVENT_CHAIN_END)
-	ge3:SetOperation(cm.MergedDelayEventCheck2(e,tp,eg,ep,ev,re,r,rp,e:GetLabel()))
-	Duel.RegisterEffect(ge3,0)
+	--Duel.RegisterEffect(ge2,0)
+	if Duel.GetCurrentChain()==0 then
+		Duel.RaiseEvent(eg,EVENT_CUSTOM+11451849,re,e:GetLabel(),tp,tp,ev)
+	else
+		local ge3=Effect.CreateEffect(e:GetHandler())
+		ge3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge3:SetCode(EVENT_CHAIN_END)
+		ge3:SetOperation(cm.MergedDelayEventCheck(e,tp,eg,ep,ev,re,r,rp,e:GetLabel()))
+		Duel.RegisterEffect(ge3,0)
+	end
 end
 function cm.MergedDelayEventCheck(e,tp,eg,ep,ev,re,r,rp,i)
-	return function()
-				Duel.RaiseEvent(eg,EVENT_CUSTOM+11451849,re,i,tp,tp,ev)
-			end
-end
-function cm.MergedDelayEventCheck2(e,tp,eg,ep,ev,re,r,rp,i)
-	return function()
+	return function(e)
 				Duel.RaiseEvent(eg,EVENT_CUSTOM+11451849,re,i,tp,tp,ev)
+				e:Reset()
 			end
 end
 function cm.thcon4(e,tp,eg,ep,ev,re,r,rp)