Commit fd0edf45 authored by mercury233's avatar mercury233

fix

parent bc5b976a
...@@ -35,14 +35,16 @@ function c100235096.effcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,14 +35,16 @@ function c100235096.effcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
end end
function c100235096.thfilter(c) function c100235096.thfilter(c)
return c:IsSetCard(0x108) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return c:IsSetCard(0x108) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
end end
function c100235096.spfilter(c,e,tp) function c100235096.spfilter(c,e,tp)
return c:IsSetCard(0x108) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsSetCard(0x108) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c100235096.efftg(e,tp,eg,ep,ev,re,r,rp,chk) function c100235096.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
local b1=Duel.IsExistingMatchingCard(c100235096.thfilter,tp,LOCATION_DECK,0,1,nil) local b1=Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>0
local b2=Duel.IsExistingMatchingCard(c100235096.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(c100235096.thfilter,tp,LOCATION_DECK,0,1,nil)
local b2=Duel.GetMatchingGroupCount(Card.IsType,tp,0,LOCATION_ONFIELD,nil,TYPE_SPELL+TYPE_TRAP)>0
and Duel.IsExistingMatchingCard(c100235096.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
if chk==0 then return b1 or b2 end if chk==0 then return b1 or b2 end
local op=0 local op=0
if b1 and b2 then op=Duel.SelectOption(tp,aux.Stringid(100235096,0),aux.Stringid(100235096,1)) if b1 and b2 then op=Duel.SelectOption(tp,aux.Stringid(100235096,0),aux.Stringid(100235096,1))
...@@ -65,8 +67,8 @@ function c100235096.effop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,8 +67,8 @@ function c100235096.effop(e,tp,eg,ep,ev,re,r,rp)
local sg=Group.CreateGroup() local sg=Group.CreateGroup()
repeat repeat
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg=g:Select(tp,1,1,nil) local sg1=g:Select(tp,1,1,nil)
local tc=sg:GetFirst() local tc=sg1:GetFirst()
sg:AddCard(tc) sg:AddCard(tc)
g:Remove(Card.IsCode,nil,tc:GetCode()) g:Remove(Card.IsCode,nil,tc:GetCode())
ct=ct-1 ct=ct-1
......
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