Fix エルフの聖賢者

script/c101305003.lua

@@ -33,20 +33,62 @@ function s.cfilter(c)
 end
 function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_HAND,0,1,nil)
-		and not Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil)
-		and Duel.IsPlayerCanDraw(tp,3) end
+		and not Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil) end
 end
 function s.drop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil) then return end
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND,0,nil)
-	if g:GetCount()==0 then return end
-	Duel.ConfirmCards(1-tp,g)
-	if g:IsExists(s.cfilter,1,nil) and Duel.Draw(tp,3,REASON_EFFECT)>0 then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
-		local dg=Duel.SelectMatchingCard(tp,Card.IsDiscardable,tp,LOCATION_HAND,0,2,2,nil,REASON_EFFECT+REASON_DISCARD)
-		Duel.ShuffleHand(tp)
-		Duel.BreakEffect()
-		Duel.SendtoGrave(dg,REASON_EFFECT+REASON_DISCARD)
+	if not Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil) then
+		local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_HAND,0,nil)
+		if g:GetCount()>0 then
+			Duel.ConfirmCards(1-tp,g)
+			if g:IsExists(s.cfilter,1,nil)
+				and Duel.IsPlayerCanDraw(tp,3)
+				and Duel.SelectYesNo(tp,aux.Stringid(id,2))
+				and Duel.Draw(tp,3,REASON_EFFECT)>0 then
+				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
+				local dg=Duel.SelectMatchingCard(tp,Card.IsDiscardable,tp,LOCATION_HAND,0,2,2,nil,REASON_EFFECT+REASON_DISCARD)
+				if dg:GetCount()>0 then
+					Duel.ShuffleHand(tp)
+					Duel.BreakEffect()
+					Duel.SendtoGrave(dg,REASON_EFFECT+REASON_DISCARD)
+				end
+			end
+		end
+	end
+	local c=e:GetHandler()
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e1:SetTargetRange(1,0)
+	e1:SetTarget(s.splimit)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e1,tp)
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e2:SetOperation(s.checkop)
+	e2:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e2,tp)
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e3:SetCode(92345028)
+	e3:SetTargetRange(1,0)
+	e3:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e3,tp)
+end
+function s.splimit(e,c,sump,sumtype,sumpos,targetp,se)
+	return c:IsLocation(LOCATION_EXTRA) and aux.ExtraDeckSummonCountLimit[sump]<=0
+end
+function s.ctfilter(c,tp)
+	return c:IsSummonPlayer(tp) and c:IsPreviousLocation(LOCATION_EXTRA)
+end
+function s.checkop(e,tp,eg,ep,ev,re,r,rp)
+	if eg:IsExists(s.ctfilter,1,nil,tp) then
+		aux.ExtraDeckSummonCountLimit[tp]=aux.ExtraDeckSummonCountLimit[tp]-1
+	end
+	if eg:IsExists(s.ctfilter,1,nil,1-tp) then
+		aux.ExtraDeckSummonCountLimit[1-tp]=aux.ExtraDeckSummonCountLimit[1-tp]-1
 	end
 end
 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)