Merge branch 'master' of git.moenext.com:mycard/pre-release-database-cdb

script/c100200284.lua

@@ -64,20 +64,20 @@ end
 function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==1-tp
 end
-function s.tdfilter(c,tp)
-	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_MZONE) and c:IsAttribute(ATTRIBUTE_WIND)
-end
-function s.fselect(g,tp)
+function s.gcheck(g,tp)
 	return g:IsExists(s.tdfilter,1,nil,tp)
 end
+function s.tdfilter(c,tp)
+	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WIND) and c:IsType(TYPE_MONSTER)
+end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	local rg=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil,tp)
-	if chk==0 then return rg:CheckSubGroup(s.fselect,2,2,tp) end
+	local rg=Duel.GetMatchingGroup(aux.AND(Card.IsAbleToDeck,Card.IsCanBeEffectTarget),tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
+	if chk==0 then return rg:CheckSubGroup(s.gcheck,2,2,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local sg=rg:SelectSubGroup(tp,s.fselect,false,2,2,tp,c)
-	Duel.SetTargetCard(sg)
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,sg,2,0,0)
+	local tg=rg:SelectSubGroup(tp,s.gcheck,false,2,2,tp)
+	Duel.SetTargetCard(tg)
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,tg,2,0,0)
 end
 function s.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local tg=Duel.GetTargetsRelateToChain()