ybb

expansions/script/c16400096.lua

@@ -11,7 +11,6 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1,m+100)
-	e2:SetCondition(cm.sscon)
 	e2:SetCost(cm.sscost)
 	e2:SetTarget(cm.sstg)
 	e2:SetOperation(cm.ssop)
@@ -83,8 +82,12 @@ function cm.solvefun(g,tp)
 		Duel.SendtoGrave(tc,REASON_EFFECT)
 	end
 end
-function cm.ssfilter(c)
-	return c:IsCode(m) and c:IsSSetable()
+function cm.sscost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
+	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
+end
+function cm.thcheck(c)
+	return (c:IsSetCard(0x1ce0) or c:IsSetCard(0x389)) and c:IsAbleToHand()
 end
 function cm.sstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thcheck,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c16499990.lua

 --圣杯的探索-Emiya
+local m=16499990
+local cm=_G["c"..m]
 function c16499990.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)
@@ -15,7 +17,7 @@ function c16499990.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_BE_MATERIAL)
 	e2:SetProperty(EFFECT_FLAG_EVENT_PLAYER)
-	e2:SetCountLimit(1,m+100)
+	e2:SetCountLimit(1,16499991)
 	e2:SetCondition(c16499990.effcon)
 	e2:SetOperation(c16499990.effop)
 	c:RegisterEffect(e2)
@@ -23,9 +25,8 @@ function c16499990.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
-	e3:SetDescription(aux.Stringid(m,1))
+	e3:SetDescription(aux.Stringid(16499990,1))
 	e3:SetCode(EVENT_TO_GRAVE)
-	e3:SetCountLimit(1,m)
 	e3:SetCondition(c16499990.condtion)
 	e3:SetTarget(c16499990.target)
 	e3:SetOperation(c16499990.operation)