duiduiduiduidui

expansions/script/c96071054.lua

@@ -62,7 +62,7 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetLocationCount(tp,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone)>0
 end
 function cm.cfilter(c)
-	return c:IsType(TYPE_PENDULUM) and not c:IsPublic()
+	return c:IsSetCard(0x1ef1) and c:IsType(TYPE_MONSTER) and not c:IsPublic()
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_HAND,0,1,nil) end

expansions/script/c96071064.lua

@@ -63,7 +63,7 @@ end
 cm.pendulum_level=6
 --special summon
 function cm.cfilter(c)
-	return c:IsSetCard(0x1ef1) and c:IsLevelBelow(4) and c:IsType(TYPE_MONSTER) and not c:IsPublic()
+	return c:IsLevelBelow(4) and c:IsType(TYPE_MONSTER) and not c:IsPublic()
 end
 function cm.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_HAND,0,1,nil) end
@@ -112,12 +112,11 @@ function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if not c:IsRelateToEffect(e) then return end
 		Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
 		local tc=Duel.GetFirstTarget()
 		if tc:IsRelateToEffect(e) then
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
-		end
 	end
 end
 --spsummon

expansions/script/c96071068.lua

@@ -49,6 +49,7 @@ function cm.initial_effect(c)
 	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,96071070)
+	e3:SetTarget(cm.settg)
 	e3:SetOperation(cm.setop)
 	c:RegisterEffect(e3)
 	--move
@@ -123,6 +124,12 @@ function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 --position
+function cm.setfilter(c)
+	return c:IsSetCard(0x1ef1) and c:IsType(TYPE_TRAP) and c:IsSSetable()
+end
+function cm.settg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+end
 function cm.setfilter(c,mc,tp)
 	if not (c:IsSetCard(0x1ef1) and c:IsType(TYPE_TRAP)) then return false end
 	if not mc or mc:IsControler(1-tp) then
@@ -133,7 +140,7 @@ function cm.setfilter(c,mc,tp)
 end
 function cm.setop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
-	local g=Duel.SelectMatchingCard(tp,cm.setfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,cm.setfilter,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 	local sc=g:GetFirst()
 	if sc and Duel.SSet(tp,sc)~=0 then
 		local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c96071082.lua

@@ -122,7 +122,7 @@ function cm.stpop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local spchk=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-	local g=Duel.SelectMatchingCard(tp,cm.stpfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp,spchk)
+	local g=Duel.SelectMatchingCard(tp,cm.stpfilter,tp,LOCATION_DECK+LOCATION_EXTRA+LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,spchk)
 	if g:GetCount()>0 then
 		local sc=g:GetFirst()
 		if spchk and sc:IsCanBeSpecialSummoned(e,0,tp,false,false)