Commit 4ba50834 authored by Chrono-Genex's avatar Chrono-Genex Committed by mercury233

fix & update for Puppet King and Puppet Queen (#1766)

parent 3bbb1a02
...@@ -68,6 +68,7 @@ function c11819473.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,6 +68,7 @@ function c11819473.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(1-tp,c11819473.thfilter2,1-tp,LOCATION_DECK,0,1,1,nil,1-tp) local g=Duel.SelectMatchingCard(1-tp,c11819473.thfilter2,1-tp,LOCATION_DECK,0,1,1,nil,1-tp)
if g:GetCount()>0 then if g:GetCount()>0 then
g:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
end end
end end
......
...@@ -28,7 +28,7 @@ function c15001619.initial_effect(c) ...@@ -28,7 +28,7 @@ function c15001619.initial_effect(c)
end end
function c15001619.cfilter(c,tp) function c15001619.cfilter(c,tp)
return c:IsControler(1-tp) and c:IsPreviousLocation(LOCATION_DECK) and not c:IsReason(REASON_DRAW) return c:IsControler(1-tp) and c:IsPreviousLocation(LOCATION_DECK) and not c:IsReason(REASON_DRAW)
and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_MONSTER) and not c:IsStatus(STATUS_TO_HAND_WITHOUT_CONFIRM)
end end
function c15001619.spcon(e,tp,eg,ep,ev,re,r,rp) function c15001619.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c15001619.cfilter,1,nil,tp) return eg:IsExists(c15001619.cfilter,1,nil,tp)
......
...@@ -36,6 +36,7 @@ function c23270035.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -36,6 +36,7 @@ function c23270035.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,sg)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
tg:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tg,nil,REASON_EFFECT)
end end
end end
...@@ -38,6 +38,7 @@ function c2403771.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -38,6 +38,7 @@ function c2403771.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,sg)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
tg:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tg,nil,REASON_EFFECT)
end end
end end
......
...@@ -51,6 +51,7 @@ function c27564031.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,6 +51,7 @@ function c27564031.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,sg)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
tg:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tg,nil,REASON_EFFECT)
end end
end end
...@@ -24,7 +24,7 @@ function c3167573.initial_effect(c) ...@@ -24,7 +24,7 @@ function c3167573.initial_effect(c)
end end
function c3167573.cfilter(c,tp) function c3167573.cfilter(c,tp)
return c:IsControler(1-tp) and c:IsPreviousLocation(LOCATION_DECK) and not c:IsReason(REASON_DRAW) return c:IsControler(1-tp) and c:IsPreviousLocation(LOCATION_DECK) and not c:IsReason(REASON_DRAW)
and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_MONSTER) and not c:IsStatus(STATUS_TO_HAND_WITHOUT_CONFIRM)
end end
function c3167573.spcon(e,tp,eg,ep,ev,re,r,rp) function c3167573.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c3167573.cfilter,1,nil,tp) return eg:IsExists(c3167573.cfilter,1,nil,tp)
......
...@@ -37,6 +37,7 @@ function c32360466.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,6 +37,7 @@ function c32360466.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=tg:GetFirst() local tc=tg:GetFirst()
Duel.Hint(HINT_CARD,0,tc:GetCode()) Duel.Hint(HINT_CARD,0,tc:GetCode())
if c32360466.filter2(tc) and tc:IsAbleToHand() then if c32360466.filter2(tc) and tc:IsAbleToHand() then
tc:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
sg1:RemoveCard(tc) sg1:RemoveCard(tc)
end end
......
...@@ -57,6 +57,7 @@ function c40230018.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,6 +57,7 @@ function c40230018.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
local tg=sg1:Select(1-tp,1,1,nil) local tg=sg1:Select(1-tp,1,1,nil)
local tc=tg:GetFirst() local tc=tg:GetFirst()
tc:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
end end
end end
...@@ -64,6 +64,7 @@ function c47120245.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,6 +64,7 @@ function c47120245.thop(e,tp,eg,ep,ev,re,r,rp)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
local tc=tg:GetFirst() local tc=tg:GetFirst()
if tc:IsAbleToHand() then if tc:IsAbleToHand() then
tc:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
sg:RemoveCard(tc) sg:RemoveCard(tc)
end end
......
...@@ -59,8 +59,8 @@ function c49776811.ctop(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,8 +59,8 @@ function c49776811.ctop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=cg:Select(tp,1,1,nil) local g=cg:Select(tp,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
g:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
end end
end end
end end
......
...@@ -47,6 +47,7 @@ function c50756327.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,6 +47,7 @@ function c50756327.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,sg1) Duel.ConfirmCards(1-tp,sg1)
local cg=sg1:RandomSelect(1-tp,1) local cg=sg1:RandomSelect(1-tp,1)
local tc=cg:GetFirst() local tc=cg:GetFirst()
tc:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
end end
......
...@@ -70,6 +70,7 @@ function c64280356.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,6 +70,7 @@ function c64280356.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
local cg=sg1:Select(1-tp,1,1,nil) local cg=sg1:Select(1-tp,1,1,nil)
local tc=cg:GetFirst() local tc=cg:GetFirst()
tc:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
sg1:RemoveCard(tc) sg1:RemoveCard(tc)
Duel.SendtoGrave(sg1,REASON_EFFECT) Duel.SendtoGrave(sg1,REASON_EFFECT)
......
...@@ -55,6 +55,7 @@ function c69838761.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,6 +55,7 @@ function c69838761.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,sg)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
tg:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tg,nil,REASON_EFFECT)
end end
end end
...@@ -84,6 +84,7 @@ function c72813401.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -84,6 +84,7 @@ function c72813401.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,sg) Duel.ConfirmCards(1-tp,sg)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
tg:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tg,nil,REASON_EFFECT)
sg:Sub(tg) sg:Sub(tg)
Duel.SendtoGrave(sg,REASON_EFFECT) Duel.SendtoGrave(sg,REASON_EFFECT)
......
...@@ -48,8 +48,8 @@ function c90969892.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,8 +48,8 @@ function c90969892.operation(e,tp,eg,ep,ev,re,r,rp)
and Duel.SelectOption(tp,1190,1152)==1 then and Duel.SelectOption(tp,1190,1152)==1 then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
else else
tc:SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc)
end end
sg:RemoveCard(tc) sg:RemoveCard(tc)
Duel.SendtoDeck(sg,nil,SEQ_DECKTOP,REASON_EFFECT) Duel.SendtoDeck(sg,nil,SEQ_DECKTOP,REASON_EFFECT)
......
...@@ -28,6 +28,7 @@ function c93437091.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,6 +28,7 @@ function c93437091.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
local tg=sg:RandomSelect(1-tp,1) local tg=sg:RandomSelect(1-tp,1)
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
tg:GetFirst():SetStatus(STATUS_TO_HAND_WITHOUT_CONFIRM,true)
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tg,nil,REASON_EFFECT)
end end
end end
...@@ -175,7 +175,7 @@ STATUS_EFFECT_REPLACED =0x80000 --效果被替代(红莲霸权) ...@@ -175,7 +175,7 @@ STATUS_EFFECT_REPLACED =0x80000 --效果被替代(红莲霸权)
STATUS_FUTURE_FUSION =0x100000 --未来融合特殊召唤(不触发融合素材效果) STATUS_FUTURE_FUSION =0x100000 --未来融合特殊召唤(不触发融合素材效果)
STATUS_ATTACK_CANCELED =0x200000 --若其為攻擊者,則攻擊中止 STATUS_ATTACK_CANCELED =0x200000 --若其為攻擊者,則攻擊中止
STATUS_INITIALIZING =0x400000 --初始化.. STATUS_INITIALIZING =0x400000 --初始化..
STATUS_ACTIVATED =0x800000 --N/A STATUS_TO_HAND_WITHOUT_CONFIRM =0x800000 --非公开的卡被效果加入手卡但未给对方确认
STATUS_JUST_POS =0x1000000 --已改變表示形式(用於STATUS_CONTINUOUS_POS判定) STATUS_JUST_POS =0x1000000 --已改變表示形式(用於STATUS_CONTINUOUS_POS判定)
STATUS_CONTINUOUS_POS =0x2000000 --改變後再次設定成其他表示形式 STATUS_CONTINUOUS_POS =0x2000000 --改變後再次設定成其他表示形式
STATUS_FORBIDDEN =0x4000000 --不能play STATUS_FORBIDDEN =0x4000000 --不能play
......
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