Commit 2af646b4 authored by Satty's avatar Satty

fix

parent 84273237
Pipeline #35637 passed with stages
in 55 minutes and 52 seconds
......@@ -27,12 +27,12 @@ function s.initial_effect(c)
e3:SetCode(EFFECT_IMMUNE_EFFECT)
e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
e3:SetRange(LOCATION_SZONE)
e3:SetTargetRange(LOCATION_MZONE,0)
e3:SetTargetRange(LOCATION_ONFIELD,0)
e3:SetCondition(s.indcon)
e3:SetValue(s.efilter1)
c:RegisterEffect(e3)
local e4=e3:Clone()
e4:SetTargetRange(0,LOCATION_MZONE)
e4:SetTargetRange(0,LOCATION_ONFIELD)
e4:SetValue(s.efilter2)
c:RegisterEffect(e4)
......@@ -57,8 +57,8 @@ function s.indcon(e)
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
end
function s.efilter1(e,re)
return e:GetHandlerPlayer()~=re:GetOwnerPlayer() and re:IsActivated()
return e:GetOwnerPlayer()~=re:GetOwnerPlayer() and re:IsActivated()
end
function s.efilter2(e,re)
return e:GetHandlerPlayer()==re:GetOwnerPlayer() and re:IsActivated()
return e:GetOwnerPlayer()==re:GetOwnerPlayer() and re:IsActivated()
end
......@@ -61,9 +61,10 @@ function s.typecheck(g)
end
function s.spcon(e,c)
if c==nil then return true end
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return false end
local tp=c:GetControler()
local g=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,c)
return g:CheckSubGroup(s.typecheck,2,2)
return g:CheckSubGroup(s.typecheck,2,2)
end
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
local g=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,c)
......@@ -85,6 +86,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
tc=g:GetNext()
end
e:SetLabel(typ)
Duel.ShuffleHand(tp)
end
function s.regcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+SUMMON_VALUE_SELF
......
......@@ -61,6 +61,7 @@ function s.typecheck(g)
end
function s.spcon(e,c)
if c==nil then return true end
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return false end
local tp=c:GetControler()
local g=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,c)
return g:CheckSubGroup(s.typecheck,2,2)
......@@ -85,6 +86,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
tc=g:GetNext()
end
e:SetLabel(typ)
Duel.ShuffleHand(tp)
end
function s.regcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+SUMMON_VALUE_SELF
......
......@@ -61,6 +61,7 @@ function s.typecheck(g)
end
function s.spcon(e,c)
if c==nil then return true end
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return false end
local tp=c:GetControler()
local g=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,c)
return g:CheckSubGroup(s.typecheck,2,2)
......@@ -85,6 +86,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
tc=g:GetNext()
end
e:SetLabel(typ)
Duel.ShuffleHand(tp)
end
function s.regcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+SUMMON_VALUE_SELF
......
......@@ -60,6 +60,7 @@ function s.typecheck(g)
end
function s.spcon(e,c)
if c==nil then return true end
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return false end
local tp=c:GetControler()
local g=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,c)
return g:CheckSubGroup(s.typecheck,2,2)
......@@ -84,6 +85,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
tc=g:GetNext()
end
e:SetLabel(typ)
Duel.ShuffleHand(tp)
end
function s.regcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+SUMMON_VALUE_SELF
......
......@@ -46,6 +46,7 @@ function s.cos1(e,tp,eg,ep,ev,re,r,rp,chk)
if op==2 then typ=4 end
end
e:SetLabel(typ)
Duel.ShuffleHand(tp)
end
function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
local og=Duel.GetMatchingGroup(s.cos1f,tp,LOCATION_DECK,0,nil)
......
......@@ -82,6 +82,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if not (res or Duel.IsExistingMatchingCard(s.comcheck,tp,LOCATION_HAND,0,1,e:GetHandler(),tp,e)) then
e:SetLabel(0)
end
Duel.ShuffleHand(tp)
end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return e:IsCostChecked() and chkc:IsControler(1-tp) and chkc:IsOnField() and s.descheck(chkc,e:GetLabel(),e) end
......
......@@ -80,6 +80,7 @@ function s.cos3(e,tp,eg,ep,ev,re,r,rp,chk)
typ = typ | (c:GetType() & 7)
end
e:SetLabel((typ&1) + (typ>>1&1) + (typ>>2&1))
Duel.ShuffleHand(tp)
end
function s.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:IsCostChecked() end
......
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