watele

expansions/script/c85402430.lua

@@ -2,7 +2,7 @@
 function c85402430.initial_effect(c)
 ---
 	aux.AddCodeList(c,85402400)
-	c:SetUniqueOnField(1,0,85402430)
+	c:SetUniqueOnField(1,0,c85402430.uqfilter)
 	aux.AddXyzProcedure(c,c85402430.xyzfilter,4,2,c85402430.ovfilter,aux.Stringid(85402430,0),2,c85402430.xyzop)
 	c:EnableReviveLimit()
 ---
@@ -75,6 +75,9 @@ function c85402430.initial_effect(c)
 	c:RegisterEffect(e6)
 ------返回卡组
 end
+function c85402430.uqfilter(c)
+	return c:IsCode(85402460,85402430)
+end
 function c85402430.xyzfilter(c)
 	return c:IsSetCard(0xe45)
 end
@@ -94,7 +97,6 @@ function c85402430.sprcon(e,c)
 	return Duel.IsExistingMatchingCard(c85402430.fl,tp,LOCATION_ONFIELD+LOCATION_HAND,0,2,nil) and Duel.GetFlagEffect(tp,85402430)==0
 end
 function c85402430.sprop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCountFromEx(tp)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
 	local mg=Duel.SelectMatchingCard(tp,c85402430.fl,tp,LOCATION_HAND+LOCATION_ONFIELD,0,2,2,nil)
 	e:GetHandler():SetMaterial(mg)