888

expansions/script/c16400033.lua

@@ -41,20 +41,19 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return e:GetHandler():IsAbleToHandAsCost() end
+	if chk==0 then return c:IsAbleToHandAsCost() end
 	Duel.SendtoHand(c,nil,REASON_COST)
 end
 function cm.target1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter1,dp,LOCATION_HAND,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter1,tp,LOCATION_HAND,0,1,nil) end
 end
 function cm.setfilter1(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable() and c:IsSetCard(0xce2)
+	return (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)) and c:IsSSetable() and c:IsSetCard(0xce2)
 end
 function cm.activate1(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.IsExistingMatchingCard(cm.spfilter1,dp,LOCATION_HAND,0,1,nil) then
-		Duel.Hint(HINT_SELECTMSG,dp,HINTMSG_SET)
-		local g=Duel.SelectMatchingCard(dp,cm.spfilter1,dp,LOCATION_HAND,0,1,1,nil)
+	if Duel.IsExistingMatchingCard(cm.spfilter1,tp,LOCATION_HAND,0,1,nil) then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
+		local g=Duel.SelectMatchingCard(dp,cm.spfilter1,tp,LOCATION_HAND,0,1,1,nil)
 		if g:GetCount()>0 then
 			Duel.SSet(tp,g)
 		end

expansions/script/c16400043.lua

@@ -4,20 +4,15 @@ local cm=_G["c"..m]
 function cm.initial_effect(c)
 	--spirit return
 	aux.EnableSpiritReturn(c,EVENT_SUMMON_SUCCESS,EVENT_FLIP)
-	--cannot special summon
-	local e0=Effect.CreateEffect(c)
-	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e0:SetValue(aux.FALSE)
-	c:RegisterEffect(e0)
 	--extra summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
 	e1:SetCategory(CATEGORY_SUMMON)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetCountLimit(1,m)
+	e1:SetTarget(cm.sumtg)
 	e1:SetOperation(cm.sumop)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()
@@ -29,7 +24,6 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_HAND)
-	e3:SetCountLimit(1,m)
 	e3:SetCost(cm.cost)
 	e3:SetTarget(cm.thtg)
 	e3:SetOperation(cm.thop)
@@ -41,6 +35,9 @@ end
 function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not c:IsType(TYPE_SPIRIT)
 end
+function cm.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+end
 function cm.sumop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetFlagEffect(tp,m)~=0 then return end
 	local e1=Effect.CreateEffect(e:GetHandler())