Commit 5a8bf352 authored by POLYMER's avatar POLYMER

fix

parent 89625ec4
......@@ -72,7 +72,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
if loc==LOCATION_MZONE then
seq=aux.MZoneSequence(seq)
elseif loc==LOCATION_SZONE then
elseif bit.band(loc,LOCATION_SZONE)==LOCATION_SZONE then
seq=aux.SZoneSequence(seq)
else
return false
......
......@@ -72,7 +72,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
if loc==LOCATION_MZONE then
seq=aux.MZoneSequence(seq)
elseif loc==LOCATION_SZONE then
elseif bit.band(loc,LOCATION_SZONE)==LOCATION_SZONE then
seq=aux.SZoneSequence(seq)
else
return false
......
......@@ -26,7 +26,7 @@ function s.initial_effect(c)
end
function s.chainfilter(re,tp,cid)
local loc=Duel.GetChainInfo(cid,CHAININFO_TRIGGERING_LOCATION)
return not (re:IsActiveType(TYPE_MONSTER) and loc&(LOCATION_HAND)>0)
return not (re:IsActiveType(TYPE_MONSTER) and loc&(LOCATION_HAND+LOCATION_GRAVE)>0)
end
function s.chaincon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentChain()>2 or Duel.GetFlagEffect(tp,id)==0
......
......@@ -71,7 +71,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
if loc==LOCATION_MZONE then
seq=aux.MZoneSequence(seq)
elseif loc==LOCATION_SZONE then
elseif bit.band(loc,LOCATION_SZONE)==LOCATION_SZONE then
seq=aux.SZoneSequence(seq)
else
return false
......
......@@ -71,7 +71,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
local loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
if loc==LOCATION_MZONE then
seq=aux.MZoneSequence(seq)
elseif loc==LOCATION_SZONE then
elseif bit.band(loc,LOCATION_SZONE)==LOCATION_SZONE then
seq=aux.SZoneSequence(seq)
else
return false
......@@ -111,7 +111,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
end
else
Duel.ConfirmCards(1-tp,Duel.GetFieldGroup(tp,LOCATION_HAND,0))
Duel.ShuffleHand(1-tp)
Duel.ShuffleHand(tp)
end
end
end
......
......@@ -66,6 +66,7 @@ function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.rmfilter,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,nil) and Duel.IsPlayerCanDraw(tp,2) end
Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND+LOCATION_ONFIELD)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
if Duel.GetCurrentChain()<4 then Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,1) end
end
function s.drop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
......
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