7

expansions/script/c65850100.lua

@@ -37,11 +37,13 @@ end
 function c65850100.matfilter(c)
 	return c:IsLinkSetCard(0xa35)
 end
-
+function c65850100.filter1(c)
+	return c:IsSetCard(0xa35) and c:IsAbleToDeck()
+end
 function c65850100.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,5,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c65850100.filter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,5,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,5,5,nil)
+	local g=Duel.SelectMatchingCard(tp,c65850100.filter1,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,5,5,nil)
 	Duel.HintSelection(g)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_COST)
 end
@@ -49,7 +51,7 @@ function c65850100.spfilter(c,e,tp)
 	return c:IsSetCard(0xa35) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER) and aux.NecroValleyFilter()
 end
 function c65850100.target1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,2) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(2)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)