watele

expansions/script/c26826009.lua

@@ -40,14 +40,15 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsRelateToEffect(e) then return end
 	Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 end
-function cm.filter(c)
-	return c:IsFaceup() and (c:IsSetCard(0x601) or Duel.IsEnvironment(26826000))
+function cm.filter(c,thchk)
+	return c:IsFaceup() and (c:IsSetCard(0x601) or (thchk and c:IsType(TYPE_MONSTER)))
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and cm.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(cm.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	local thchk=Duel.IsEnvironment(26826000)
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and cm.filter(chkc,thchk) end
+	if chk==0 then return Duel.IsExistingTarget(cm.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,thchk) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
-	local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,thchk)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RACE)
 	local rc=Duel.AnnounceRace(tp,1,RACE_ALL-g:GetFirst():GetRace())
 	e:SetLabel(rc)

expansions/script/c33200018.lua

@@ -102,7 +102,7 @@ function c33200018.settg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingTarget(c33200018.filter,tp,0,LOCATION_ONFIELD,1,nil) 
 	and Duel.GetLocationCount(tp,LOCATION_SZONE,tp)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,c33200018.filter,tp,0,LOCATION_MZONE,1,1,nil)
+	local g=Duel.SelectTarget(tp,c33200018.filter,tp,0,LOCATION_ONFIELD,1,1,nil)
 end
 function c33200018.setop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()