Commit d6e2cebb authored by Nemo Ma's avatar Nemo Ma

fix

parent ccb2c4cf
...@@ -29,7 +29,7 @@ function c10080420.initial_effect(c) ...@@ -29,7 +29,7 @@ function c10080420.initial_effect(c)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c10080420.Isshinka(c) function c10080420.Isshinka(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) and (c:IsSetCard(0x10e) or c:IsCode(5338223,7373632,8632967,14154221,22431243,24362891,25573054,34026662,34572613,38179121,62991886,64815084,74100225,77840540,84808313,88760522,93504463,10080420)) return c:IsType(TYPE_SPELL+TYPE_TRAP) and (c:IsSetCard(0x10e) or c:IsCode(5338223,7373632,8632967,14154221,24362891,25573054,34026662,34572613,62991886,64815084,74100225,77840540,88760522,93504463,10080420))
end end
function c10080420.spcon(e,tp,eg,ep,ev,re,r,rp) function c10080420.spcon(e,tp,eg,ep,ev,re,r,rp)
return rp==tp and c10080420.Isshinka(re:GetHandler()) return rp==tp and c10080420.Isshinka(re:GetHandler())
......
...@@ -49,6 +49,8 @@ function c22348148.recfilter(c,tp) ...@@ -49,6 +49,8 @@ function c22348148.recfilter(c,tp)
return c:IsControler(tp) and c:IsFaceup() and c:IsSetCard(0x45) and c:IsPreviousControler(tp) return c:IsControler(tp) and c:IsFaceup() and c:IsSetCard(0x45) and c:IsPreviousControler(tp)
end end
function c22348148.recon(e,tp,eg,ep,ev,re,r,rp) function c22348148.recon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tp=c:GetControler()
return eg:IsExists(c22348148.recfilter,1,e:GetHandler(),tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED) return eg:IsExists(c22348148.recfilter,1,e:GetHandler(),tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
end end
function c22348148.regop(e,tp,eg,ep,ev,re,r,rp) function c22348148.regop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -272,7 +272,7 @@ function cm.cefilter(c,tc,ct,e,tp) ...@@ -272,7 +272,7 @@ function cm.cefilter(c,tc,ct,e,tp)
end end
function cm.cfilter(c,e,tp) function cm.cfilter(c,e,tp)
local ct=Duel.GetMatchingGroupCount(cm.cgfilter,tp,LOCATION_GRAVE,0,nil) local ct=Duel.GetMatchingGroupCount(cm.cgfilter,tp,LOCATION_GRAVE,0,nil)
return c:IsRace(RACE_BEAST+RACE_BEASTWARRIOR+RACE_WINDBEAST) return c:IsType(TYPE_XYZ)
and c:IsCanBeEffectTarget(e) and c:IsFaceup() and c:IsCanBeEffectTarget(e) and c:IsFaceup()
and Duel.IsExistingMatchingCard(cm.cefilter,tp,LOCATION_EXTRA,0,1,nil,c,ct,e,tp) and Duel.IsExistingMatchingCard(cm.cefilter,tp,LOCATION_EXTRA,0,1,nil,c,ct,e,tp)
end end
...@@ -309,7 +309,7 @@ function cm.tgefilter(c,tc,e,tp,rank) ...@@ -309,7 +309,7 @@ function cm.tgefilter(c,tc,e,tp,rank)
and Duel.GetLocationCountFromEx(tp,tp,tc,c)>0 and Duel.GetLocationCountFromEx(tp,tp,tc,c)>0
end end
function cm.tgfilter(c,e,tp,rank) function cm.tgfilter(c,e,tp,rank)
return c:IsRace(RACE_BEAST+RACE_BEASTWARRIOR+RACE_WINDBEAST) return c:IsType(TYPE_XYZ)
and Duel.IsExistingMatchingCard(cm.tgefilter,tp,LOCATION_EXTRA,0,1,nil,c,e,tp,rank) and Duel.IsExistingMatchingCard(cm.tgefilter,tp,LOCATION_EXTRA,0,1,nil,c,e,tp,rank)
end end
function cm.uptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.uptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -9,7 +9,7 @@ function c33310210.initial_effect(c) ...@@ -9,7 +9,7 @@ function c33310210.initial_effect(c)
e0:SetCode(EFFECT_SPSUMMON_PROC) e0:SetCode(EFFECT_SPSUMMON_PROC)
e0:SetProperty(EFFECT_FLAG_UNCOPYABLE) e0:SetProperty(EFFECT_FLAG_UNCOPYABLE)
e0:SetRange(LOCATION_EXTRA) e0:SetRange(LOCATION_EXTRA)
e0:SetCountLimit(1,33311211) e0:SetCountLimit(1,33311210)
e0:SetCondition(c33310210.sprcon) e0:SetCondition(c33310210.sprcon)
e0:SetOperation(c33310210.sprop) e0:SetOperation(c33310210.sprop)
c:RegisterEffect(e0) c:RegisterEffect(e0)
...@@ -29,6 +29,7 @@ function c33310210.initial_effect(c) ...@@ -29,6 +29,7 @@ function c33310210.initial_effect(c)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCode(EVENT_SPSUMMON_SUCCESS)
e5:SetCountLimit(1,33310210)
e1:SetTarget(c33310210.thtg) e1:SetTarget(c33310210.thtg)
e1:SetOperation(c33310210.thop) e1:SetOperation(c33310210.thop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
...@@ -49,7 +49,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.sfilter(c,e,tp) function cm.sfilter(c,e,tp)
return cm.SilverThorn(c) and c:IsType(TYPE_PENDULUM) and (c:IsAbleToHand() return cm.SilverThorn(c) and c:IsType(TYPE_PENDULUM) and (c:IsAbleToHand()
or (Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))) or (Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))) and not c:IsCode(m)
end end
function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk) function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.sfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end if chk==0 then return Duel.IsExistingMatchingCard(cm.sfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end
......
...@@ -28,6 +28,13 @@ function c4058.initial_effect(c) ...@@ -28,6 +28,13 @@ function c4058.initial_effect(c)
e3:SetRange(LOCATION_ONFIELD) e3:SetRange(LOCATION_ONFIELD)
e3:SetValue(c4058.efilter) e3:SetValue(c4058.efilter)
c:RegisterEffect(e3) c:RegisterEffect(e3)
local e0=Effect.CreateEffect(c)
e0:SetType(EFFECT_TYPE_SINGLE)
e0:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e0:SetRange(LOCATION_MZONE)
e0:SetValue(aux.imval1)
c:RegisterEffect(e0)
--atk --atk
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE) e4:SetType(EFFECT_TYPE_SINGLE)
......
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