Skip to content

Y
ygopro-scripts
Commit a8ec83b4 authored by nekrozar's avatar nekrozar
Browse files
Options

Revert "update adding to opponent's hand (#1202)" 

This reverts commit ea0e0cb7.
parent ea0e0cb7
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 41 deletions
c12152769.lua
View file @ a8ec83b4
...@@ -26,11 +26,8 @@ function c12152769.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,11 +26,8 @@ function c12152769.operation(e,tp,eg,ep,ev,re,r,rp)
if Duel.IsChainDisablable(0) and hg:GetCount()>0 if Duel.IsChainDisablable(0) and hg:GetCount()>0
and Duel.SelectYesNo(1-tp,aux.Stringid(12152769,1)) then and Duel.SelectYesNo(1-tp,aux.Stringid(12152769,1)) then
Duel.Hint(HINT_SELECTMSG,1-tp,aux.Stringid(12152769,2)) Duel.Hint(HINT_SELECTMSG,1-tp,aux.Stringid(12152769,2))
local ac=hg:Select(1-tp,1,1,nil):GetFirst() local sg=hg:Select(1-tp,1,1,nil)
Duel.SendtoHand(ac,tp,REASON_EFFECT) Duel.SendtoHand(sg,tp,REASON_EFFECT)
if ac:GetOwner()~=ac:GetControler() then
ac:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
Duel.NegateEffect(0) Duel.NegateEffect(0)
return return
end end
......
c18809562.lua
View file @ a8ec83b4
...@@ -19,13 +19,10 @@ function c18809562.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -19,13 +19,10 @@ function c18809562.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c18809562.activate(e,tp,eg,ep,ev,re,r,rp) function c18809562.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(18809562,0)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(18809562,0))
local ac=Duel.SelectMatchingCard(tp,Card.IsType,tp,LOCATION_HAND,0,1,1,nil,TYPE_SPELL):GetFirst() local ag=Duel.SelectMatchingCard(tp,Card.IsType,tp,LOCATION_HAND,0,1,1,nil,TYPE_SPELL)
if ac then if ag:GetCount()>0 then
Duel.SendtoHand(ac,1-tp,REASON_EFFECT) Duel.SendtoHand(ag,1-tp,REASON_EFFECT)
if ac:GetOwner()~=ac:GetControler() then Duel.ConfirmCards(tp,ag)
ac:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
Duel.ConfirmCards(tp,ac)
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
Duel.ShuffleHand(1-tp) Duel.ShuffleHand(1-tp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
......
c29654737.lua
View file @ a8ec83b4
...@@ -25,11 +25,8 @@ function c29654737.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -25,11 +25,8 @@ function c29654737.operation(e,tp,eg,ep,ev,re,r,rp)
local tg=g:Filter(Card.IsType,nil,TYPE_MONSTER) local tg=g:Filter(Card.IsType,nil,TYPE_MONSTER)
if tg:GetCount()>0 then if tg:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local ac=tg:Select(tp,1,1,nil):GetFirst() local sg=tg:Select(tp,1,1,nil)
Duel.SendtoHand(ac,tp,REASON_EFFECT) Duel.SendtoHand(sg,tp,REASON_EFFECT)
if ac:GetOwner()~=ac:GetControler() then
ac:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
end end
Duel.ShuffleHand(1-tp) Duel.ShuffleHand(1-tp)
end end
......
c39238953.lua
View file @ a8ec83b4
...@@ -49,7 +49,6 @@ function c39238953.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,6 @@ function c39238953.activate(e,tp,eg,ep,ev,re,r,rp)
end end
if sel==1 then if sel==1 then
Duel.SendtoHand(sg,tp,REASON_EFFECT) Duel.SendtoHand(sg,tp,REASON_EFFECT)
sg:GetFirst():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,sg)
elseif sel==2 then elseif sel==2 then
Duel.SpecialSummon(sg,0,tp,tp,true,false,POS_FACEUP_ATTACK) Duel.SpecialSummon(sg,0,tp,tp,true,false,POS_FACEUP_ATTACK)
......
c43528009.lua
View file @ a8ec83b4
...@@ -19,11 +19,6 @@ function c43528009.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -19,11 +19,6 @@ function c43528009.activate(e,tp,eg,ep,ev,re,r,rp)
local ag=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_HAND,0,2,2,nil) local ag=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_HAND,0,2,2,nil)
if ag:GetCount()==2 then if ag:GetCount()==2 then
Duel.SendtoHand(ag,1-tp,REASON_EFFECT) Duel.SendtoHand(ag,1-tp,REASON_EFFECT)
for ac in aux.Next(ag) do
if ac:GetOwner()~=ac:GetControler() then
ac:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
end
Duel.ConfirmCards(tp,ag) Duel.ConfirmCards(tp,ag)
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
Duel.ShuffleHand(1-tp) Duel.ShuffleHand(1-tp)
......
c5556668.lua
View file @ a8ec83b4
...@@ -19,15 +19,9 @@ function c5556668.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -19,15 +19,9 @@ function c5556668.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(tp,g2) Duel.ConfirmCards(tp,g2)
Duel.ConfirmCards(1-tp,g1) Duel.ConfirmCards(1-tp,g1)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local ac1=g2:Select(tp,1,1,nil):GetFirst() local ag1=g2:Select(tp,1,1,nil)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
local ac2=g1:Select(1-tp,1,1,nil):GetFirst() local ag2=g1:Select(1-tp,1,1,nil)
Duel.SendtoHand(ac1,tp,REASON_EFFECT) Duel.SendtoHand(ag1,tp,REASON_EFFECT)
Duel.SendtoHand(ac2,1-tp,REASON_EFFECT) Duel.SendtoHand(ag2,1-tp,REASON_EFFECT)
if ac1:GetOwner()~=ac1:GetControler() then
ac1:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
if ac2:GetOwner()~=ac2:GetControler() then
ac2:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
end end
c61705417.lua
View file @ a8ec83b4
...@@ -24,7 +24,6 @@ function c61705417.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -24,7 +24,6 @@ function c61705417.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
Duel.SendtoHand(tc,tp,REASON_EFFECT) Duel.SendtoHand(tc,tp,REASON_EFFECT)
tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
tc:RegisterFlagEffect(61705417,RESET_EVENT+0x5c0000+RESET_PHASE+PHASE_END,0,1) tc:RegisterFlagEffect(61705417,RESET_EVENT+0x5c0000+RESET_PHASE+PHASE_END,0,1)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
......
c82257940.lua
View file @ a8ec83b4
...@@ -57,6 +57,4 @@ function c82257940.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,6 +57,4 @@ function c82257940.thop(e,tp,eg,ep,ev,re,r,rp)
g:DeleteGroup() g:DeleteGroup()
Duel.SendtoHand(tc1,1-tc1:GetControler(),REASON_EFFECT) Duel.SendtoHand(tc1,1-tc1:GetControler(),REASON_EFFECT)
Duel.SendtoHand(tc2,1-tc2:GetControler(),REASON_EFFECT) Duel.SendtoHand(tc2,1-tc2:GetControler(),REASON_EFFECT)
tc1:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
tc2:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end end
c9032529.lua
View file @ a8ec83b4
...@@ -21,11 +21,8 @@ function c9032529.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -21,11 +21,8 @@ function c9032529.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetFieldGroup(p,LOCATION_HAND,0) local g=Duel.GetFieldGroup(p,LOCATION_HAND,0)
if g:GetCount()==0 then return end if g:GetCount()==0 then return end
Duel.Hint(HINT_SELECTMSG,p,aux.Stringid(9032529,0)) Duel.Hint(HINT_SELECTMSG,p,aux.Stringid(9032529,0))
local ac=g:Select(p,1,1,nil):GetFirst() local sg=g:Select(p,1,1,nil)
if Duel.SendtoHand(ac,1-p,REASON_EFFECT)~=0 then if Duel.SendtoHand(sg,1-p,REASON_EFFECT)~=0 then
if ac:GetOwner()~=ac:GetControler() then
ac:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,67)
end
Duel.ShuffleHand(p) Duel.ShuffleHand(p)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Recover(p,d,REASON_EFFECT) Duel.Recover(p,d,REASON_EFFECT)
......
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