Commit 510bc461 authored by POLYMER's avatar POLYMER

fix

parent 9fb97a9d
...@@ -175,7 +175,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -175,7 +175,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
local sc=e:GetHandler() local sc=e:GetHandler()
local code=sc:GetOriginalCode() local code=sc:GetOriginalCode()
if code>=11451881 and code<=11451883 and tc:IsSummonableCard() then --[[if code>=11451881 and code<=11451883 and tc:IsSummonableCard() then
local e1=Effect.CreateEffect(sc) local e1=Effect.CreateEffect(sc)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DUAL_SUMMONABLE) e1:SetCode(EFFECT_DUAL_SUMMONABLE)
...@@ -233,7 +233,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -233,7 +233,7 @@ function cm.costop2(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e5,true) tc:RegisterEffect(e5,true)
tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(code,0)) tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(code,0))
tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(code,1)) tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(code,1))
end end--]]
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
end end
elseif sel==2 then elseif sel==2 then
......
...@@ -32,7 +32,7 @@ function cm.counterfilter(c) ...@@ -32,7 +32,7 @@ function cm.counterfilter(c)
return c:IsRace(RACE_ZOMBIE) return c:IsRace(RACE_ZOMBIE)
end end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
......
...@@ -28,7 +28,7 @@ function cm.counterfilter(c) ...@@ -28,7 +28,7 @@ function cm.counterfilter(c)
return c:IsRace(RACE_ZOMBIE) return c:IsRace(RACE_ZOMBIE)
end end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
......
...@@ -26,7 +26,7 @@ function c91040032.initial_effect(c) ...@@ -26,7 +26,7 @@ function c91040032.initial_effect(c)
Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.counterfilter) Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.counterfilter)
end end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
...@@ -42,7 +42,7 @@ function cm.splimit(e,c) ...@@ -42,7 +42,7 @@ function cm.splimit(e,c)
return not c:IsRace(RACE_ZOMBIE) return not c:IsRace(RACE_ZOMBIE)
end end
function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() and Duel.GetActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() and Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
Duel.SendtoGrave(e:GetHandler(),REASON_COST) Duel.SendtoGrave(e:GetHandler(),REASON_COST)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
...@@ -54,6 +54,7 @@ function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -54,6 +54,7 @@ function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>1 end if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>1 end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end end
function cm.filter0(c,e) function cm.filter0(c,e)
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e) return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e)
......
...@@ -18,8 +18,8 @@ function c91040033.initial_effect(c) ...@@ -18,8 +18,8 @@ function c91040033.initial_effect(c)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_SPSUMMON_SUCCESS) e3:SetCode(EVENT_SPSUMMON_SUCCESS)
e3:SetRange(LOCATION_REMOVED) e3:SetRange(LOCATION_REMOVED)
e3:SetCountLimit(1,m+100) e3:SetCountLimit(1,m+1)
e3:SetCost(cm.cost) e3:SetCost(cm.stcost2)
e3:SetCondition(cm.drcon) e3:SetCondition(cm.drcon)
e3:SetTarget(cm.drtg) e3:SetTarget(cm.drtg)
e3:SetOperation(cm.drop) e3:SetOperation(cm.drop)
...@@ -30,7 +30,7 @@ function cm.counterfilter(c) ...@@ -30,7 +30,7 @@ function cm.counterfilter(c)
return c:IsRace(RACE_ZOMBIE) return c:IsRace(RACE_ZOMBIE)
end end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
...@@ -100,23 +100,25 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -100,23 +100,25 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
tc:CompleteProcedure() tc:CompleteProcedure()
end end
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetTargetRange(LOCATION_EXTRA,0)
e1:SetTarget(cm.splimit)
e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end end
end end
function cm.splimit(e,c)
return not c:IsRace(RACE_ZOMBIE)
end
function cm.thfilter(c,tp) function cm.thfilter(c,tp)
return c:IsFaceup() and c:IsRace(RACE_ZOMBIE) and c:IsType(TYPE_FUSION) return c:IsFaceup() and c:IsRace(RACE_ZOMBIE) and c:IsType(TYPE_FUSION)
and c:IsControler(tp) and c:IsControler(tp)
end end
function cm.stcost2(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetReset(RESET_PHASE+PHASE_END)
e1:SetTargetRange(1,0)
e1:SetTarget(cm.splimit)
Duel.RegisterEffect(e1,tp)
end
function cm.drcon(e,tp,eg,ep,ev,re,r,rp) function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.thfilter,1,nil,tp) return eg:IsExists(cm.thfilter,1,nil,tp)
end 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