Skip to content

Y
ygopro-2pick
Commit 090258a1 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master-test' of https://github.com/moecube/ygopro-2pick

parents e6996d2b 0fabadc6
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
2pick/pick.lua
View file @ 090258a1
...@@ -123,6 +123,9 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy) ...@@ -123,6 +123,9 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy)
local sc=sg:Select(p,1,1,nil):GetFirst() local sc=sg:Select(p,1,1,nil):GetFirst()
local tg=g1:IsContains(sc) and g1 or g2 local tg=g1:IsContains(sc) and g1 or g2
local rg=g1:IsContains(sc) and g2 or g1 local rg=g1:IsContains(sc) and g2 or g1
if sc:IsLocation(LOCATION_DECK) then
Duel.ConfirmCards(p,tg)
end
Duel.Exile(rg,REASON_RULE) Duel.Exile(rg,REASON_RULE)
if copy then if copy then
local g3=Group.CreateGroup() local g3=Group.CreateGroup()
...@@ -158,13 +161,13 @@ function Auxiliary.StartPick(e) ...@@ -158,13 +161,13 @@ function Auxiliary.StartPick(e)
Auxiliary.SinglePick(p,list,count,ex_list,ex_count,true) Auxiliary.SinglePick(p,list,count,ex_list,ex_count,true)
end end
end end
for p=0,1 do --for p=0,1 do
if Duel.IsPlayerNeedToPickDeck(p) then -- if Duel.IsPlayerNeedToPickDeck(p) then
Duel.ResetTimeLimit(p,70) -- Duel.ResetTimeLimit(p,70)
local cg=Duel.GetFieldGroup(p,LOCATION_DECK,0) -- local cg=Duel.GetFieldGroup(p,LOCATION_DECK,0)
Duel.ConfirmCards(p,cg) -- Duel.ConfirmCards(p,cg)
end -- end
end --end
for tp,list in pairs(extra_sp) do for tp,list in pairs(extra_sp) do
if tp~=TYPE_FUSION then if tp~=TYPE_FUSION then
for p=0,1 do for p=0,1 do
......
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