daniaozhuanzhuanzhuan

expansions/script/c33400601.lua

@@ -5,7 +5,7 @@ function cm.initial_effect(c)
 	--tohand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND+LOCATION_MZONE)
 	e1:SetCountLimit(1,m)
@@ -78,6 +78,6 @@ Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) 
 		local g2=Duel.SelectMatchingCard(tp,cm.refilter,tp,LOCATION_DECK,0,1,1,nil,m1,tp)
 		local tc2=g2:GetFirst()
-		Duel.Remove(tc2,POS_FACEUP,REASON_EFFECT)		
+		Duel.Remove(tc2,POS_FACEUP,REASON_EFFECT)	   
 	end 
 end
\ No newline at end of file

expansions/script/c33400818.lua

@@ -4,8 +4,8 @@ local cm=_G["c"..m]
 function cm.initial_effect(c)
 	 --fusion materia
 	c:EnableReviveLimit()
-	aux.AddFusionProcCode2(c,33400814,33400815,false,false)
-	aux.AddContactFusionProcedure(c,Card.IsAbleToGraveAsCost,LOCATION_MZONE,0,Duel.SendtoGrave,REASON_COST)
+	 aux.AddFusionProcCode2(c,33400814,33400815,false,false)
+   aux.AddContactFusionProcedure(c,Card.IsAbleToGraveAsCost,LOCATION_MZONE,0,Duel.SendtoGrave,REASON_COST)
  --spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
@@ -100,7 +100,7 @@ function cm.effectfilter(e,ct)
 end
 
 function cm.regop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
+   local c=e:GetHandler()
 	  --activate limit
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
@@ -126,6 +126,7 @@ function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	e3:SetValue(cm.efilter2)
 	e3:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e3,tp)
+	Duel.RegisterFlagEffect(tp,m,RESET_EVENT+RESET_PHASE+PHASE_END,0,0)  
 end
 function cm.actlimit1(e,re,tp)
 	return not re:GetHandler():IsLocation(LOCATION_ONFIELD)
@@ -225,7 +226,7 @@ function cm.setfilter(c)
 	return c:IsSetCard(0xa341) and  c:IsAbleToHand()
 end
 function cm.stop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
+	c=e:GetHandler()
 	if not c:IsRelateToEffect(e) then return end 
 	local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
 	local seq1=aux.MZoneSequence(c:GetSequence())
@@ -323,7 +324,6 @@ function cm.Eqop1(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.TojiEquip(ec,e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
 	local token=Duel.CreateToken(tp,33400819)
 	Duel.MoveToField(token,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 	token:CancelToGrave()
@@ -356,7 +356,7 @@ function cm.TojiEquip(ec,e,tp,eg,ep,ev,re,r,rp)
 			e5:SetCountLimit(1)
 			token:RegisterEffect(e5)
 			--move
-			local e1=Effect.CreateEffect(c)
+			local e1=Effect.CreateEffect(ec)
 			e1:SetType(EFFECT_TYPE_QUICK_O)
 			e1:SetCode(EVENT_FREE_CHAIN)
 			e1:SetRange(LOCATION_SZONE)