Commit ddb09c95 authored by POLYMER's avatar POLYMER

fix

parent b5dbf6bc
...@@ -42,7 +42,16 @@ function c44401021.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -42,7 +42,16 @@ function c44401021.target(e,tp,eg,ep,ev,re,r,rp,chk)
--confirm --confirm
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local fc=Duel.SelectMatchingCard(tp,c44401021.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,e,tp):GetFirst() local fc=Duel.SelectMatchingCard(tp,c44401021.spfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,e,tp):GetFirst()
if fc:IsLocation(LOCATION_DECK) then
local seq=fc:GetSequence()
Duel.DisableShuffleCheck()
Duel.MoveSequence(fc,SEQ_DECKTOP)
Duel.ConfirmDecktop(tp,1)
Duel.DisableShuffleCheck()
Duel.MoveSequence(fc,seq)
else
Duel.ConfirmCards(1-tp,fc) Duel.ConfirmCards(1-tp,fc)
end
e:SetLabelObject(fc) e:SetLabelObject(fc)
--target --target
local ct=math.floor(fc:GetLevel()/2) local ct=math.floor(fc:GetLevel()/2)
......
...@@ -38,21 +38,21 @@ function s.LostLink(c) ...@@ -38,21 +38,21 @@ function s.LostLink(c)
local _IsLinkAbove=Card.IsLinkAbove local _IsLinkAbove=Card.IsLinkAbove
local _IsLinkBelow=Card.IsLinkBelow local _IsLinkBelow=Card.IsLinkBelow
Card.GetLink=function(sc) Card.GetLink=function(sc)
if c~=sc or not sc:IsLocation(LOCATION_MZONE) then return _GetLink(sc) end if not sc:IsLocation(LOCATION_MZONE) then return _GetLink(sc) end
return s.NumNumber(sc:GetLinkMarker(),markers) return s.NumNumber(sc:GetLinkMarker(),markers)
end end
Card.IsLink=function(sc,...) Card.IsLink=function(sc,...)
if c~=sc or not sc:IsLocation(LOCATION_MZONE) then return _IsLink(sc,...) end if not sc:IsLocation(LOCATION_MZONE) then return _IsLink(sc,...) end
local t={...} local t={...}
for _,v in ipairs(t) do if s.NumNumber(sc:GetLinkMarker(),markers)==v then return true end end for _,v in ipairs(t) do if s.NumNumber(sc:GetLinkMarker(),markers)==v then return true end end
return false return false
end end
Card.IsLinkAbove=function(sc,link) Card.IsLinkAbove=function(sc,link)
if c~=sc or not sc:IsLocation(LOCATION_MZONE) then return _IsLinkAbove(sc,link) end if not sc:IsLocation(LOCATION_MZONE) then return _IsLinkAbove(sc,link) end
if s.NumNumber(sc:GetLinkMarker(),markers)>=link then return true else return false end if s.NumNumber(sc:GetLinkMarker(),markers)>=link then return true else return false end
end end
Card.IsLinkBelow=function(sc,link) Card.IsLinkBelow=function(sc,link)
if c~=sc or not sc:IsLocation(LOCATION_MZONE) then return _IsLinkBelow(sc,link) end if not sc:IsLocation(LOCATION_MZONE) then return _IsLinkBelow(sc,link) end
if s.NumNumber(sc:GetLinkMarker(),markers)<=link then return true else return false end if s.NumNumber(sc:GetLinkMarker(),markers)<=link then return true else return false end
end end
end end
......
...@@ -51,19 +51,19 @@ function s.acop(e,eg,ep,ev,re,r,rp) ...@@ -51,19 +51,19 @@ function s.acop(e,eg,ep,ev,re,r,rp)
local tc=te:GetHandler() local tc=te:GetHandler()
local tp=tc:GetControler() local tp=tc:GetControler()
local seq=tc:GetSequence() local seq=tc:GetSequence()
local loc=tc:GetLocation() local pos=tc:GetPosition()
local a=nil local a=nil
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
if loc==LOCATION_MZONE and (seq==0 or seq==5) then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfffd) end if tc:IsLocation(LOCATION_MZONE) and (seq==0 or seq==5) then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfffd) end
if loc==LOCATION_MZONE and seq==1 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfffa) end if tc:IsLocation(LOCATION_MZONE) and seq==1 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfffa) end
if loc==LOCATION_MZONE and seq==2 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfff5) end if tc:IsLocation(LOCATION_MZONE) and seq==2 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfff5) end
if loc==LOCATION_MZONE and seq==3 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xffeb) end if tc:IsLocation(LOCATION_MZONE) and seq==3 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xffeb) end
if loc==LOCATION_MZONE and (seq==4 or seq==6) then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfff7) end if tc:IsLocation(LOCATION_MZONE) and (seq==4 or seq==6) then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfff7) end
if loc==LOCATION_SZONE and seq==0 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfdff) end if tc:IsLocation(LOCATION_SZONE) and seq==0 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfdff) end
if loc==LOCATION_SZONE and seq==1 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfaff) end if tc:IsLocation(LOCATION_SZONE) and seq==1 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xfaff) end
if loc==LOCATION_SZONE and seq==2 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xf5ff) end if tc:IsLocation(LOCATION_SZONE) and seq==2 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xf5ff) end
if loc==LOCATION_SZONE and seq==3 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xebff) end if tc:IsLocation(LOCATION_SZONE) and seq==3 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xebff) end
if loc==LOCATION_SZONE and seq==4 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xf7ff) end if tc:IsLocation(LOCATION_SZONE) and seq==4 then a=Duel.SelectDisableField(tp,1,LOCATION_ONFIELD,0,0xf7ff) end
local nseq=0 local nseq=0
if not a then return end if not a then return end
if a==0x1 or a==0x100 then nseq=0 if a==0x1 or a==0x100 then nseq=0
...@@ -72,7 +72,9 @@ function s.acop(e,eg,ep,ev,re,r,rp) ...@@ -72,7 +72,9 @@ function s.acop(e,eg,ep,ev,re,r,rp)
elseif a==0x8 or a==0x800 then nseq=3 elseif a==0x8 or a==0x800 then nseq=3
elseif a==0x10 or a==0x1000 then nseq=4 elseif a==0x10 or a==0x1000 then nseq=4
else end else end
Duel.MoveSequence(tc,nseq) if tc:IsLocation(LOCATION_PZONE) then Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,pos,false,a)
else Duel.MoveSequence(tc,nseq)
end
s[0]=true s[0]=true
end end
......
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