Commit 3182e64e authored by argon.sun's avatar argon.sun

fix

parent d7f0c7d6
...@@ -37,7 +37,7 @@ end ...@@ -37,7 +37,7 @@ end
function c37164373.operation(e,tp,eg,ep,ev,re,r,rp) function c37164373.operation(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e)
Duel.SendtoDeck(g,nil,2,REASON_EFFECT) Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
local ct=g:FilterCount(Card.IsLocation,nil,LOCATION_DECK+LOCATION_HAND) local ct=g:FilterCount(Card.IsLocation,nil,LOCATION_DECK+LOCATION_HAND+LOCATION_EXTRA)
local dg=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,0,LOCATION_ONFIELD,nil) local dg=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,0,LOCATION_ONFIELD,nil)
if ct>0 and dg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(37164373,1)) then if ct>0 and dg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(37164373,1)) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
......
...@@ -43,6 +43,10 @@ function c51858306.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,6 +43,10 @@ function c51858306.operation(e,tp,eg,ep,ev,re,r,rp)
e:SetLabelObject(tc) e:SetLabelObject(tc)
e:GetHandler():RegisterFlagEffect(51858306,RESET_EVENT+0x1e60000,0,1) e:GetHandler():RegisterFlagEffect(51858306,RESET_EVENT+0x1e60000,0,1)
tc:RegisterFlagEffect(51858306,RESET_EVENT+0x1fe0000,0,1) tc:RegisterFlagEffect(51858306,RESET_EVENT+0x1fe0000,0,1)
else
local cg=Duel.GetFieldGroup(tp,LOCATION_DECK,0)
Duel.ConfirmCards(1-tp,cg)
Duel.ShuffleDeck(tp)
end end
end end
function c51858306.thcon(e,tp,eg,ep,ev,re,r,rp) function c51858306.thcon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -12,7 +12,7 @@ function c78613627.initial_effect(c) ...@@ -12,7 +12,7 @@ function c78613627.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c78613627.condition(e,tp,eg,ep,ev,re,r,rp) function c78613627.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetAttackTarget()==e:GetHandler() and e:GetHandler():IsDefencePos() return Duel.GetAttackTarget()==e:GetHandler() and bit.band(e:GetHandler():GetBattlePosition(),POS_DEFENCE)~=0
and Duel.GetAttacker():GetAttack()<e:GetHandler():GetDefence() and Duel.GetAttacker():GetAttack()<e:GetHandler():GetDefence()
end end
function c78613627.target(e,tp,eg,ep,ev,re,r,rp,chk) function c78613627.target(e,tp,eg,ep,ev,re,r,rp,chk)
......
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