Skip to content

Y
ygopro-pre-data
Commit 1d96ef61 authored by mercury233's avatar mercury233
Browse files
Options

fix

parent 607795d6
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
script/c101104012.lua
View file @ 1d96ef61
......@@ -63,8 +63,9 @@ function c101104012.thfilter(c,code)
return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x88) and not c:IsCode(code) and c:IsAbleToHand()
end
function c101104012.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c101104012.thcfilter,tp,LOCATION_HAND,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c101104012.thcfilter,tp,LOCATION_HAND,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c101104012.thcfilter,tp,LOCATION_HAND,0,1,nil,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectMatchingCard(tp,c101104012.thcfilter,tp,LOCATION_HAND,0,1,1,nil,tp)
e:SetLabel(g:GetFirst():GetCode())
Duel.SendtoGrave(g,REASON_COST)
end
......@@ -74,7 +75,7 @@ function c101104012.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
end
function c101104012.thop(e,tp,eg,ep,ev,re,r,rp)
local code=e:GetLabel()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOHAND)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectMatchingCard(tp,c101104012.thfilter,tp,LOCATION_GRAVE,0,1,1,nil,code)
if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT)
......
script/c101104055.lua
View file @ 1d96ef61
......@@ -52,7 +52,7 @@ function c101104055.fcheck(tp,sg,fc)
if sg:IsExists(c101104055.chkfilter,1,nil,tp) then
return sg:IsExists(Card.IsRace,1,nil,RACE_DRAGON)
else
return sg:IsExists(Card.IsRace,1,nil,RACE_DRAGON) and sg:FilterCount(c101104055.exfilter,nil,tp)<=0
return sg:IsExists(Card.IsRace,1,nil,RACE_DRAGON) and not sg:IsExists(c101104055.exfilter,1,nil,tp)
end
end
function c101104055.target(e,tp,eg,ep,ev,re,r,rp,chk)
......@@ -60,7 +60,7 @@ function c101104055.target(e,tp,eg,ep,ev,re,r,rp,chk)
local chkf=tp
local mg1=Duel.GetFusionMaterial(tp):Filter(c101104055.filter2,nil,e)
local mg2=Duel.GetMatchingGroup(c101104055.filter1,tp,LOCATION_GRAVE,0,nil,e)
if mg1:IsExists(c101104055.chkfilter,1,nil,tp) and mg2:GetCount()>0 then
if mg1:IsExists(c101104055.chkfilter,1,nil,tp) and mg2:GetCount()>0 or mg2:IsExists(c101104055.chkfilter,1,nil,tp) then
mg1:Merge(mg2)
end
aux.FCheckAdditional=c101104055.fcheck
......@@ -84,7 +84,7 @@ function c101104055.activate(e,tp,eg,ep,ev,re,r,rp)
local chkf=tp
local mg1=Duel.GetFusionMaterial(tp):Filter(c101104055.filter2,nil,e)
local mg2=Duel.GetMatchingGroup(c101104055.filter1,tp,LOCATION_GRAVE,0,nil,e)
if mg1:IsExists(c101104055.chkfilter,1,nil,tp) and mg2:GetCount()>0 then
if mg1:IsExists(c101104055.chkfilter,1,nil,tp) and mg2:GetCount()>0 or mg2:IsExists(c101104055.chkfilter,1,nil,tp) then
mg1:Merge(mg2)
end
aux.FCheckAdditional=c101104055.fcheck
......
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