Commit 91fe3daf authored by mercury233's avatar mercury233 Committed by GitHub

fix フェイバリット・コンタクト (#1898)

parent 148a1c39
...@@ -42,9 +42,6 @@ end ...@@ -42,9 +42,6 @@ end
function s.dfilter(c,tp) function s.dfilter(c,tp)
return c:IsLocation(LOCATION_DECK) and c:IsControler(tp) return c:IsLocation(LOCATION_DECK) and c:IsControler(tp)
end end
function s.exfilter(c,tp)
return c:IsLocation(LOCATION_DECK) and c:IsCode(89943723)
end
function s.fsop(e,tp,eg,ep,ev,re,r,rp) function s.fsop(e,tp,eg,ep,ev,re,r,rp)
local chkf=tp|0x200 local chkf=tp|0x200
local mg=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.fsfilter1),tp,LOCATION_HAND+LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,nil,e) local mg=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.fsfilter1),tp,LOCATION_HAND+LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED,0,nil,e)
...@@ -60,6 +57,7 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -60,6 +57,7 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp)
if cf:GetCount()>0 then if cf:GetCount()>0 then
Duel.ConfirmCards(1-tp,cf) Duel.ConfirmCards(1-tp,cf)
end end
local ng=mat:Filter(Card.IsCode,nil,89943723)
if #mat>0 and Duel.SendtoDeck(mat,nil,SEQ_DECKTOP,REASON_EFFECT)>0 then if #mat>0 and Duel.SendtoDeck(mat,nil,SEQ_DECKTOP,REASON_EFFECT)>0 then
local p=tp local p=tp
for i=1,2 do for i=1,2 do
...@@ -76,7 +74,7 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -76,7 +74,7 @@ function s.fsop(e,tp,eg,ep,ev,re,r,rp)
end end
Duel.BreakEffect() Duel.BreakEffect()
Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP) Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP)
if mat:IsExists(s.exfilter,1,nil) then if ng:IsExists(Card.IsLocation,1,nil,LOCATION_DECK) then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetDescription(aux.Stringid(id,1)) e1:SetDescription(aux.Stringid(id,1))
e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment