Commit 9ee57c5a authored by POLYMER's avatar POLYMER

fix

parent b25f68a4
...@@ -285,7 +285,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -285,7 +285,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
_G["c"..int].__index=_G["c"..int] _G["c"..int].__index=_G["c"..int]
end end
GetID=function() GetID=function()
return _G["c"..int],int return _G["c"..int],int,int<100000000 and 1 or 100
end end
if pcall(function() dofile("expansions/script/c"..int..".lua") end) or pcall(function() dofile("script/c"..int..".lua") end) then if pcall(function() dofile("expansions/script/c"..int..".lua") end) or pcall(function() dofile("script/c"..int..".lua") end) then
_G["c"..int]=nil _G["c"..int]=nil
...@@ -363,7 +363,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -363,7 +363,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
_G["c"..int].__index=_G["c"..int] _G["c"..int].__index=_G["c"..int]
end end
GetID=function() GetID=function()
return _G["c"..int],int return _G["c"..int],int,int<100000000 and 1 or 100
end end
if pcall(function() dofile("expansions/script/c"..int..".lua") end) or pcall(function() dofile("script/c"..int..".lua") end) then if pcall(function() dofile("expansions/script/c"..int..".lua") end) or pcall(function() dofile("script/c"..int..".lua") end) then
_G["c"..int]=nil _G["c"..int]=nil
...@@ -399,8 +399,11 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -399,8 +399,11 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
table.insert(afilter,OPCODE_OR) table.insert(afilter,OPCODE_OR)
end end
end end
local ac=afilter[1]
if not Duel.SelectYesNo(1-tp,aux.Stringid(m,3)) then
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_CODE) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_CODE)
local ac=Duel.AnnounceCard(1-tp,table.unpack(afilter)) ac=Duel.AnnounceCard(1-tp,table.unpack(afilter))
end
--Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) --Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
--local sg=g2:SelectSubGroup(1-tp,aux.TRUE,false,1,1) --local sg=g2:SelectSubGroup(1-tp,aux.TRUE,false,1,1)
ng2=g2:Filter(Card.IsCode,nil,ac) ng2=g2:Filter(Card.IsCode,nil,ac)
......
...@@ -67,7 +67,7 @@ function c9910053.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -67,7 +67,7 @@ function c9910053.thop(e,tp,eg,ep,ev,re,r,rp)
if thct==0 and Duel.IsExistingMatchingCard(c9910053.thfilter2,tp,LOCATION_DECK,0,1,nil) if thct==0 and Duel.IsExistingMatchingCard(c9910053.thfilter2,tp,LOCATION_DECK,0,1,nil)
and Duel.SelectYesNo(tp,aux.Stringid(9910053,2)) then and Duel.SelectYesNo(tp,aux.Stringid(9910053,2)) then
Duel.BreakEffect() Duel.BreakEffect()
local sg2=Duel.GetFirstMatchingCard(c9910053.thfilter2,tp,LOCATION_DECK,0,nil) local sg2=Duel.SelectMatchingCard(tp,c9910053.thfilter2,tp,LOCATION_DECK,0,1,1,nil)
if sg2 then if sg2 then
Duel.SendtoHand(sg2,nil,REASON_EFFECT) Duel.SendtoHand(sg2,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg2) Duel.ConfirmCards(1-tp,sg2)
......
...@@ -71,7 +71,7 @@ function c9910054.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,7 +71,7 @@ function c9910054.thop(e,tp,eg,ep,ev,re,r,rp)
if thct==0 and Duel.IsExistingMatchingCard(c9910054.thfilter2,tp,LOCATION_DECK,0,1,nil) if thct==0 and Duel.IsExistingMatchingCard(c9910054.thfilter2,tp,LOCATION_DECK,0,1,nil)
and Duel.SelectYesNo(tp,aux.Stringid(9910054,2)) then and Duel.SelectYesNo(tp,aux.Stringid(9910054,2)) then
Duel.BreakEffect() Duel.BreakEffect()
local sg2=Duel.GetFirstMatchingCard(c9910054.thfilter2,tp,LOCATION_DECK,0,nil) local sg2=Duel.SelectMatchingCard(tp,c9910054.thfilter2,tp,LOCATION_DECK,0,1,1,nil)
if sg2 then if sg2 then
Duel.SendtoHand(sg2,nil,REASON_EFFECT) Duel.SendtoHand(sg2,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg2) Duel.ConfirmCards(1-tp,sg2)
......
...@@ -71,7 +71,7 @@ function c9910055.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,7 +71,7 @@ function c9910055.thop(e,tp,eg,ep,ev,re,r,rp)
if thct==0 and Duel.IsExistingMatchingCard(c9910055.thfilter2,tp,LOCATION_DECK,0,1,nil) if thct==0 and Duel.IsExistingMatchingCard(c9910055.thfilter2,tp,LOCATION_DECK,0,1,nil)
and Duel.SelectYesNo(tp,aux.Stringid(9910055,2)) then and Duel.SelectYesNo(tp,aux.Stringid(9910055,2)) then
Duel.BreakEffect() Duel.BreakEffect()
local sg2=Duel.GetFirstMatchingCard(c9910055.thfilter2,tp,LOCATION_DECK,0,nil) local sg2=Duel.SelectMatchingCard(tp,c9910055.thfilter2,tp,LOCATION_DECK,0,1,1,nil)
if sg2 then if sg2 then
Duel.SendtoHand(sg2,nil,REASON_EFFECT) Duel.SendtoHand(sg2,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,sg2) Duel.ConfirmCards(1-tp,sg2)
......
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