Commit 2eec4807 authored by wyykak's avatar wyykak

fix by keyigu

Signed-off-by: wyykak's avatarwyykak <wyy_1414@126.com>
parent 0345a7e5
......@@ -45,10 +45,10 @@ function c25307.initial_effect(c)
c:RegisterEffect(e5)
end
function c25307.ntfilter1(c)
return c:IsSetCard(0x100) and not c:IsPublic()
return c:IsSetCard(0x100) and not c:IsPublic() and c:IsType(TYPE_MONSTER)
end
function c25307.ntfilter2(c)
return c:IsSetCard(0x710) and not c:IsPublic()
return c:IsSetCard(0x710) and not c:IsPublic() and c:IsType(TYPE_MONSTER)
end
function c25307.ntcon(e,c)
if c==nil then return true end
......
......@@ -45,10 +45,10 @@ function c25316.initial_effect(c)
c:RegisterEffect(e5)
end
function c25316.ntfilter1(c)
return c:IsSetCard(0x137) and not c:IsPublic()
return c:IsSetCard(0x137) and not c:IsPublic() and c:IsType(TYPE_MONSTER)
end
function c25316.ntfilter2(c)
return c:IsSetCard(0x710) and not c:IsPublic()
return c:IsRace(RACE_BEAST) and not c:IsPublic() and c:IsType(TYPE_MONSTER)
end
function c25316.ntcon(e,c)
if c==nil then return true end
......
......@@ -43,10 +43,10 @@ function c25319.initial_effect(c)
c:RegisterEffect(e5)
end
function c25319.ntfilter1(c)
return c:IsSetCard(0x194) and c:IsAbleToRemoveAsCost()
return c:IsSetCard(0x194) and c:IsAbleToRemoveAsCost() and c:IsType(TYPE_MONSTER)
end
function c25319.ntfilter2(c)
return c:IsSetCard(0x252a) and c:IsAbleToRemoveAsCost()
return c:IsSetCard(0x252a) and c:IsAbleToRemoveAsCost() and c:IsType(TYPE_MONSTER)
end
function c25319.ntcon(e,c)
if c==nil then return true end
......
......@@ -44,10 +44,10 @@ function c25325.initial_effect(c)
c:RegisterEffect(e5)
end
function c25325.ntfilter1(c)
return c:IsSetCard(0x255) and c:IsAbleToRemoveAsCost()
return c:IsSetCard(0x255) and c:IsAbleToRemoveAsCost() and c:IsType(TYPE_MONSTER)
end
function c25325.ntfilter2(c)
return c:IsSetCard(0x273) and c:IsAbleToRemoveAsCost()
return c:IsSetCard(0x273) and c:IsAbleToRemoveAsCost() and c:IsType(TYPE_MONSTER)
end
function c25325.ntcon(e,c)
if c==nil then return true end
......
......@@ -44,10 +44,10 @@ function c25328.initial_effect(c)
c:RegisterEffect(e5)
end
function c25328.ntfilter1(c)
return c:IsSetCard(0x255) and c:IsAbleToRemoveAsCost()
return c:IsSetCard(0x255) and c:IsAbleToRemoveAsCost() and c:IsType(TYPE_MONSTER)
end
function c25328.ntfilter2(c)
return c:IsSetCard(0x273) and c:IsAbleToRemoveAsCost()
return c:IsSetCard(0x273) and c:IsAbleToRemoveAsCost() and c:IsType(TYPE_MONSTER)
end
function c25328.ntcon(e,c)
if c==nil then return true end
......
......@@ -53,7 +53,7 @@ function c25340.initial_effect(c)
c:RegisterEffect(e5)
end
function c25340.cfilter(c,tp)
return (c:IsFusionSetCard(0x5779) or c:IsFusionSetCard(0x6779))
return (c:IsFusionSetCard(0x5779) or c:IsFusionSetCard(0x6779)) and c:IsType(TYPE_MONSTER)
and c:IsCanBeFusionMaterial() and c:IsAbleToGraveAsCost() and (c:IsControler(tp) or c:IsFaceup())
end
function c25340.fcheck(c,sg)
......@@ -95,10 +95,10 @@ function c25340.con(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()==tp
end
function c25340.filter(c)
return c:IsSetCard(0x778) and c:IsAbleToHand()
return c:IsSetCard(0x778) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
end
function c25340.tcfilter(c)
return c:IsSetCard(0x779) and c:IsFaceup()
return c:IsSetCard(0x779) and c:IsFaceup() and c:IsType(TYPE_MONSTER)
end
function c25340.tg(e,tp,eg,ep,ev,re,r,rp,chk)
local cy=Duel.GetMatchingGroup(c25340.tcfilter,tp,LOCATION_MZONE+LOCATION_GRAVE,0,nil):GetClassCount(Card.GetCode)
......
......@@ -107,7 +107,7 @@ function c25349.thcon(e,tp,eg,ep,ev,re,r,rp)
and eg:IsExists(c25349.gfilter,1,nil,tp) and g:GetClassCount(Card.GetCode)>=e:GetLabel()
end
function c25349.thfilter(c)
return c:IsSetCard(0x778) and c:IsAbleToHand()
return c:IsSetCard(0x778) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
end
function c25349.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c25349.thfilter,tp,LOCATION_DECK,0,1,nil) end
......
......@@ -34,7 +34,7 @@ function c99677703.initial_effect(c)
e6:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e6:SetCode(EVENT_CHAINING)
e6:SetRange(LOCATION_MZONE)
e6:SetCountLimit(1,996777603)
e6:SetCountLimit(1,99677773)
e6:SetCondition(c99677703.spcon2)
e6:SetCost(c99677703.spcost2)
e6:SetTarget(c99677703.sptg2)
......
......@@ -11,7 +11,7 @@ function c99677793.initial_effect(c)
e5:SetType(EFFECT_TYPE_QUICK_O)
e5:SetCode(EVENT_FREE_CHAIN)
e5:SetRange(LOCATION_MZONE)
e5:SetCountLimit(1,99677793)
e5:SetCountLimit(1)
e5:SetTarget(c99677793.target)
e5:SetOperation(c99677793.operation)
c:RegisterEffect(e5)
......@@ -23,7 +23,6 @@ function c99677793.initial_effect(c)
e2:SetCode(EVENT_FREE_CHAIN)
e2:SetHintTiming(0,0x1c0+TIMING_MAIN_END)
e2:SetRange(LOCATION_MZONE)
e2:SetCountLimit(1)
e2:SetCondition(c99677793.sccon)
e2:SetTarget(c99677793.sctarg)
e2:SetOperation(c99677793.scop)
......
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