Commit dede1e32 authored by mallu11's avatar mallu11 Committed by GitHub

fix PlaceCardsOnDeckTop/Bottom (#2040)

parent d30ba3b7
...@@ -2974,7 +2974,8 @@ end ...@@ -2974,7 +2974,8 @@ end
function Auxiliary.PlaceCardsOnDeckTop(p,g,reason) function Auxiliary.PlaceCardsOnDeckTop(p,g,reason)
if reason==nil then reason=REASON_EFFECT end if reason==nil then reason=REASON_EFFECT end
Duel.SendtoDeck(g,nil,SEQ_DECKTOP,reason) Duel.SendtoDeck(g,nil,SEQ_DECKTOP,reason)
local og=Duel.GetOperatedGroup():Filter(Card.IsLocation,nil,LOCATION_DECK) local rg=Duel.GetOperatedGroup()
local og=rg:Filter(Card.IsLocation,nil,LOCATION_DECK)
local ct1=og:FilterCount(Card.IsControler,nil,p) local ct1=og:FilterCount(Card.IsControler,nil,p)
local ct2=og:FilterCount(Card.IsControler,nil,1-p) local ct2=og:FilterCount(Card.IsControler,nil,1-p)
if ct1>1 then if ct1>1 then
...@@ -2983,13 +2984,14 @@ function Auxiliary.PlaceCardsOnDeckTop(p,g,reason) ...@@ -2983,13 +2984,14 @@ function Auxiliary.PlaceCardsOnDeckTop(p,g,reason)
if ct2>1 then if ct2>1 then
Duel.SortDecktop(p,1-p,ct2) Duel.SortDecktop(p,1-p,ct2)
end end
return #og return #rg
end end
--Player p place g on the bottom of Deck in any order --Player p place g on the bottom of Deck in any order
function Auxiliary.PlaceCardsOnDeckBottom(p,g,reason) function Auxiliary.PlaceCardsOnDeckBottom(p,g,reason)
if reason==nil then reason=REASON_EFFECT end if reason==nil then reason=REASON_EFFECT end
Duel.SendtoDeck(g,nil,SEQ_DECKTOP,reason) Duel.SendtoDeck(g,nil,SEQ_DECKTOP,reason)
local og=Duel.GetOperatedGroup():Filter(Card.IsLocation,nil,LOCATION_DECK) local rg=Duel.GetOperatedGroup()
local og=rg:Filter(Card.IsLocation,nil,LOCATION_DECK)
local ct1=og:FilterCount(Card.IsControler,nil,p) local ct1=og:FilterCount(Card.IsControler,nil,p)
local ct2=og:FilterCount(Card.IsControler,nil,1-p) local ct2=og:FilterCount(Card.IsControler,nil,1-p)
if ct1>0 then if ct1>0 then
...@@ -3010,7 +3012,7 @@ function Auxiliary.PlaceCardsOnDeckBottom(p,g,reason) ...@@ -3010,7 +3012,7 @@ function Auxiliary.PlaceCardsOnDeckBottom(p,g,reason)
Duel.MoveSequence(tc,SEQ_DECKBOTTOM) Duel.MoveSequence(tc,SEQ_DECKBOTTOM)
end end
end end
return #og return #rg
end end
--The event is triggered multiple times in a chain --The event is triggered multiple times in a chain
--but only 1 event with EVENT_CUSTOM+code will be triggered at EVENT_CHAIN_END, or immediately if not in chain --but only 1 event with EVENT_CUSTOM+code will be triggered at EVENT_CHAIN_END, or immediately if not in chain
......
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