Update c1111003.lua

script/c1111003.lua

@@ -16,6 +16,7 @@ function c1111003.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetCondition(c1111003.con2)
 	e2:SetTarget(c1111003.tg2)
 	e2:SetOperation(c1111003.op2)
 	c:RegisterEffect(e2)
@@ -60,24 +61,26 @@ function c1111003.op1(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 --
-function c1111003.tfilter2(c,tp)
-	return c:GetPreviousControler()==tp
+function c1111003.tfilter2(c,tp,rp)
+	return c:IsPreviousControler(tp)
 		and c:IsPreviousPosition(POS_FACEUP)
-		and c:IsSetCard(0x3e1f) and c:IsType(TYPE_SPELL)
+		and c:IsSetCard(0x3e1f) and bit.band(c:GetPreviousTypeOnField(),TYPE_MONSTER)~=0
 		and c:IsAbleToDeck()
+		and rp==1-tp and c:IsReason(REASON_EFFECT)
+end
+function c1111003.con2(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(c1111003.tfilter2,1,nil,tp,rp) and not eg:IsContains(e:GetHandler())
 end
 function c1111003.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return r and r==REASON_EFFECT and rp==1-tp
-		and e:GetHandler():IsAbleToDeck()
-		and eg:IsExists(c1111003.tfilter2,1,nil,tp)
-		and not eg:IsContains(e:GetHandler()) end
-	local sg=eg:Filter(c1111003.tfilter2,nil,tp)
+	if chk==0 then return e:GetHandler():IsAbleToDeck()
+		and eg:IsExists(c1111003.tfilter2,1,nil,tp,rp) end
+	local sg=eg:Filter(c1111003.tfilter2,nil,tp,rp)
 	sg:AddCard(e:GetHandler())
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,sg,sg:GetCount(),0,0)
 end
 function c1111003.op2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local rg=eg:Filter(c1111003.tfilter2,nil,tp)
+	local rg=eg:Filter(c1111003.tfilter2,nil,tp,rp)
 	if c:IsRelateToEffect(e) then rg:AddCard(c) end
 	if rg:GetCount()<1 then return end
 	Duel.SendtoDeck(rg,nil,2,REASON_EFFECT)