Commit 4aced4dd authored by wind2009's avatar wind2009 Committed by GitHub

fix

parent f3b12c40
...@@ -76,11 +76,12 @@ function Auxiliary.SaveDeck() ...@@ -76,11 +76,12 @@ function Auxiliary.SaveDeck()
Duel.SavePickDeck(p,g) Duel.SavePickDeck(p,g)
end end
end end
function Auxiliary.SaveDeck()
function Group.CheckGroup(g,card_id) for p=0,1 do
return g:IsExists(Card.IsCode,1,nil,card_id) local g=Duel.GetFieldGroup(p,0xff,0)
Duel.SavePickDeck(p,g)
end
end end
function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy) function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy)
if not Duel.IsPlayerNeedToPickDeck(p) then return end if not Duel.IsPlayerNeedToPickDeck(p) then return end
local g1=Group.CreateGroup() local g1=Group.CreateGroup()
...@@ -95,7 +96,7 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy) ...@@ -95,7 +96,7 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy)
local pick_count=0 local pick_count=0
while pick_count<count do while pick_count<count do
local code=plist[math.random(#plist)] local code=plist[math.random(#plist)]
if not ag:CheckGroup(code) then if not ag:IsExists(Card.IsCode,1,nil,code) then
local card=Duel.CreateToken(p,code) local card=Duel.CreateToken(p,code)
g:AddCard(card) g:AddCard(card)
ag:AddCard(card) ag:AddCard(card)
...@@ -111,7 +112,7 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy) ...@@ -111,7 +112,7 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy)
local ex_pick_count=0 local ex_pick_count=0
while ex_pick_count<ex_count do while ex_pick_count<ex_count do
local code=ex_plist[math.random(#ex_plist)] local code=ex_plist[math.random(#ex_plist)]
if not ag:CheckGroup(code) then if not ag:IsExists(Card.IsCode,1,nil,code) then
local card=Duel.CreateToken(p,code) local card=Duel.CreateToken(p,code)
g:AddCard(card) g:AddCard(card)
ag:AddCard(card) ag:AddCard(card)
...@@ -138,7 +139,6 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy) ...@@ -138,7 +139,6 @@ function Auxiliary.SinglePick(p,list,count,ex_list,ex_count,copy)
Duel.SendtoDeck(g3,nil,0,REASON_RULE) Duel.SendtoDeck(g3,nil,0,REASON_RULE)
end end
end end
function Auxiliary.StartPick(e) function Auxiliary.StartPick(e)
for p=0,1 do for p=0,1 do
if Duel.IsPlayerNeedToPickDeck(p) then if Duel.IsPlayerNeedToPickDeck(p) then
......
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