Skip to content

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

fix

parent 1ed37c9d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
script/c101004031.lua
View file @ c9eb6d48
...@@ -89,10 +89,10 @@ function c101004031.mvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,10 +89,10 @@ function c101004031.mvop(e,tp,eg,ep,ev,re,r,rp)
local seq1=c:GetSequence() local seq1=c:GetSequence()
local seq2=tc:GetSequence() local seq2=tc:GetSequence()
if seq1>4 then return end if seq1>4 then return end
if (seq1>seq2 and Duel.CheckLocation(tp,LOCATION_MZONE,seq-1)) if (seq1>seq2 and Duel.CheckLocation(tp,LOCATION_MZONE,seq1-1))
or (seq1<seq2 and Duel.CheckLocation(tp,LOCATION_MZONE,seq+1)) then or (seq1<seq2 and Duel.CheckLocation(tp,LOCATION_MZONE,seq1+1)) then
local nseq=0 local nseq=0
if seq1>seq2 and Duel.CheckLocation(tp,LOCATION_MZONE,seq-1) then nseq=seq1-1 if seq1>seq2 and Duel.CheckLocation(tp,LOCATION_MZONE,seq1-1) then nseq=seq1-1
else nseq=seq1+1 end else nseq=seq1+1 end
Duel.MoveSequence(c,nseq) Duel.MoveSequence(c,nseq)
local cg=c:GetColumnGroup() local cg=c:GetColumnGroup()
......
script/c101004033.lua
View file @ c9eb6d48
...@@ -24,10 +24,10 @@ function c101004033.discon(e,tp,eg,ep,ev,re,r,rp) ...@@ -24,10 +24,10 @@ function c101004033.discon(e,tp,eg,ep,ev,re,r,rp)
local ex4,g4,gc4,dp4,dv4=Duel.GetOperationInfo(ev,CATEGORY_SPECIAL_SUMMON) local ex4,g4,gc4,dp4,dv4=Duel.GetOperationInfo(ev,CATEGORY_SPECIAL_SUMMON)
local ex5,g5,gc5,dp5,dv5=Duel.GetOperationInfo(ev,CATEGORY_TOGRAVE) local ex5,g5,gc5,dp5,dv5=Duel.GetOperationInfo(ev,CATEGORY_TOGRAVE)
local ex6=re:IsHasCategory(CATEGORY_LEAVE_GRAVE) local ex6=re:IsHasCategory(CATEGORY_LEAVE_GRAVE)
return ((ex1 and bit.band(dv1,LOCATION_GRAVE)==LOCATION_GRAVE) return ((ex1 and (bit.band(dv1,LOCATION_GRAVE)==LOCATION_GRAVE or g1 and g1:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
or (ex2 and bit.band(dv2,LOCATION_GRAVE)==LOCATION_GRAVE) or (ex2 and (bit.band(dv2,LOCATION_GRAVE)==LOCATION_GRAVE or g2 and g2:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
or (ex4 and bit.band(dv4,LOCATION_GRAVE)==LOCATION_GRAVE) or (ex4 and (bit.band(dv4,LOCATION_GRAVE)==LOCATION_GRAVE or g4 and g4:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
or (ex5 and bit.band(dv5,LOCATION_GRAVE)==LOCATION_GRAVE) or (ex5 and (bit.band(dv5,LOCATION_GRAVE)==LOCATION_GRAVE or g5 and g5:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
or ex6) and Duel.IsChainNegatable(ev) or ex6) and Duel.IsChainNegatable(ev)
end end
function c101004033.discost(e,tp,eg,ep,ev,re,r,rp,chk) function c101004033.discost(e,tp,eg,ep,ev,re,r,rp,chk)
......
script/c101004059.lua
View file @ c9eb6d48
...@@ -65,12 +65,12 @@ function c101004059.mvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,12 +65,12 @@ function c101004059.mvop(e,tp,eg,ep,ev,re,r,rp)
end end
else else
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
local g1=Duel.SelectMatchingCard(tp,c101004059.mvfilter3,tp,LOCATION_MZONE,0,1,1,nil,tp) local g1=Duel.SelectMatchingCard(tp,c101004059.mvfilter2,tp,LOCATION_MZONE,0,1,1,nil,tp)
local tc1=g1:GetFirst() local tc1=g1:GetFirst()
if not tc1 then return end if not tc1 then return end
Duel.HintSelection(g1) Duel.HintSelection(g1)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
local g2=Duel.SelectMatchingCard(tp,c101004059.mvfilter2,tp,LOCATION_MZONE,0,1,1,tc1) local g2=Duel.SelectMatchingCard(tp,c101004059.mvfilter3,tp,LOCATION_MZONE,0,1,1,tc1)
Duel.HintSelection(g2) Duel.HintSelection(g2)
local tc2=g2:GetFirst() local tc2=g2:GetFirst()
Duel.SwapSequence(tc1,tc2) Duel.SwapSequence(tc1,tc2)
......
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