Commit 413a1247 authored by DailyShana's avatar DailyShana

update

these cards do not contain effects of confirming deck/hand
parent 68454254
...@@ -23,11 +23,7 @@ end ...@@ -23,11 +23,7 @@ end
function c22123627.activate(e,tp,eg,ep,ev,re,r,rp) function c22123627.activate(e,tp,eg,ep,ev,re,r,rp)
local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER) local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
local g=Duel.GetMatchingGroup(c22123627.filter,p,LOCATION_HAND,0,nil) local g=Duel.GetMatchingGroup(c22123627.filter,p,LOCATION_HAND,0,nil)
if g:GetCount()<2 then if g:GetCount()>=2 then
local hg=Duel.GetFieldGroup(p,LOCATION_HAND,0)
Duel.ConfirmCards(1-p,hg)
Duel.ShuffleHand(p)
else
Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
local sg=g:Select(p,2,2,nil) local sg=g:Select(p,2,2,nil)
Duel.ConfirmCards(1-p,sg) Duel.ConfirmCards(1-p,sg)
......
...@@ -32,9 +32,5 @@ function c26495087.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -32,9 +32,5 @@ function c26495087.tgop(e,tp,eg,ep,ev,re,r,rp)
else g=Duel.SelectMatchingCard(1-tp,c26495087.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP) end else g=Duel.SelectMatchingCard(1-tp,c26495087.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP) end
if g:GetCount()~=0 then if g:GetCount()~=0 then
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
else
local cg=Duel.GetFieldGroup(tp,0,LOCATION_DECK)
Duel.ConfirmCards(tp,cg)
Duel.ShuffleDeck(1-tp)
end end
end end
...@@ -89,9 +89,5 @@ function c27279764.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,9 +89,5 @@ function c27279764.tgop(e,tp,eg,ep,ev,re,r,rp)
local sg=g:Select(1-tp,1,1,nil) local sg=g:Select(1-tp,1,1,nil)
Duel.HintSelection(sg) Duel.HintSelection(sg)
Duel.SendtoGrave(sg,REASON_RULE) Duel.SendtoGrave(sg,REASON_RULE)
else
local hg=Duel.GetFieldGroup(1-tp,LOCATION_HAND,0)
Duel.ConfirmCards(tp,hg)
Duel.ShuffleHand(1-tp)
end end
end end
...@@ -65,9 +65,5 @@ function c40607210.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,9 +65,5 @@ function c40607210.tgop(e,tp,eg,ep,ev,re,r,rp)
else g=Duel.SelectMatchingCard(1-tp,c40607210.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP) end else g=Duel.SelectMatchingCard(1-tp,c40607210.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP) end
if g:GetCount()~=0 then if g:GetCount()~=0 then
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
else
local cg=Duel.GetFieldGroup(tp,0,LOCATION_DECK)
Duel.ConfirmCards(tp,cg)
Duel.ShuffleDeck(1-tp)
end end
end end
...@@ -21,9 +21,5 @@ function c55348096.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -21,9 +21,5 @@ function c55348096.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(1-tp,c55348096.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(1-tp,c55348096.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
else
local cg=Duel.GetFieldGroup(1-tp,LOCATION_DECK,0)
Duel.ConfirmCards(tp,cg)
Duel.ShuffleDeck(1-tp)
end end
end end
...@@ -65,10 +65,6 @@ function c58820923.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,10 +65,6 @@ function c58820923.rmop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_REMOVE)
local sg=g:Select(1-tp,3,3,nil) local sg=g:Select(1-tp,3,3,nil)
Duel.Remove(sg,POS_FACEUP,REASON_EFFECT) Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
else
local cg=Duel.GetFieldGroup(1-tp,LOCATION_DECK,0)
Duel.ConfirmCards(tp,cg)
Duel.ShuffleDeck(1-tp)
end end
end end
function c58820923.atkcon(e,tp,eg,ep,ev,re,r,rp) function c58820923.atkcon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -19,14 +19,8 @@ function c72405967.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -19,14 +19,8 @@ function c72405967.target(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,PLAYER_ALL,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,PLAYER_ALL,LOCATION_HAND)
end end
function c72405967.activate(e,tp,eg,ep,ev,re,r,rp) function c72405967.activate(e,tp,eg,ep,ev,re,r,rp)
local g1=Duel.GetFieldGroup(tp,LOCATION_HAND,0) local g=Duel.GetMatchingGroup(Card.IsType,tp,LOCATION_HAND,LOCATION_HAND,nil,TYPE_MONSTER)
local g2=Duel.GetFieldGroup(tp,0,LOCATION_HAND) if g:GetCount()>0 then
Duel.ConfirmCards(tp,g2) Duel.SendtoGrave(g,REASON_EFFECT+REASON_DISCARD)
Duel.ConfirmCards(1-tp,g1) end
local dg1=g1:Filter(Card.IsType,nil,TYPE_MONSTER)
local dg2=g2:Filter(Card.IsType,nil,TYPE_MONSTER)
dg1:Merge(dg2)
if dg1:GetCount()>0 then Duel.SendtoGrave(dg1,REASON_EFFECT+REASON_DISCARD) end
Duel.ShuffleHand(tp)
Duel.ShuffleHand(1-tp)
end end
...@@ -26,9 +26,5 @@ function c78053598.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,9 +26,5 @@ function c78053598.activate(e,tp,eg,ep,ev,re,r,rp)
if tc then if tc then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(tp,tc) Duel.ConfirmCards(tp,tc)
else
local dg=Duel.GetFieldGroup(tp,0,LOCATION_DECK)
Duel.ConfirmCards(tp,dg)
Duel.ShuffleDeck(1-tp)
end end
end end
...@@ -35,10 +35,5 @@ function c89801755.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,10 +35,5 @@ function c89801755.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(p,c89801755.filter,p,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,rc,att) local g=Duel.SelectMatchingCard(p,c89801755.filter,p,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,rc,att)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
else
local cg=Duel.GetFieldGroup(p,LOCATION_DECK+LOCATION_HAND,0)
Duel.ConfirmCards(1-p,cg)
Duel.ShuffleHand(p)
Duel.ShuffleDeck(p)
end end
end end
...@@ -19,9 +19,5 @@ function c95214051.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -19,9 +19,5 @@ function c95214051.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.ShuffleDeck(1-tp) Duel.ShuffleDeck(1-tp)
Duel.MoveSequence(tc,0) Duel.MoveSequence(tc,0)
Duel.ConfirmDecktop(1-tp,1) Duel.ConfirmDecktop(1-tp,1)
else
local g=Duel.GetFieldGroup(tp,0,LOCATION_DECK)
Duel.ConfirmCards(tp,g)
Duel.ShuffleDeck(1-tp)
end end
end end
...@@ -23,11 +23,7 @@ end ...@@ -23,11 +23,7 @@ end
function c98891840.activate(e,tp,eg,ep,ev,re,r,rp) function c98891840.activate(e,tp,eg,ep,ev,re,r,rp)
local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER) local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
local g=Duel.GetMatchingGroup(c98891840.filter,p,LOCATION_HAND,0,nil) local g=Duel.GetMatchingGroup(c98891840.filter,p,LOCATION_HAND,0,nil)
if g:GetCount()<2 then if g:GetCount()>=2 then
local hg=Duel.GetFieldGroup(p,LOCATION_HAND,0)
Duel.ConfirmCards(1-p,hg)
Duel.ShuffleHand(p)
else
Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
local sg=g:Select(p,2,2,nil) local sg=g:Select(p,2,2,nil)
Duel.ConfirmCards(1-p,sg) Duel.ConfirmCards(1-p,sg)
......
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