Commit 38a3c3f1 authored by mercury233's avatar mercury233 Committed by GitHub

fix (#1127)

parent 3b490316
......@@ -36,7 +36,7 @@ function c1003840.cfilter(c,e,tp,ft)
and Duel.IsExistingMatchingCard(c1003840.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp,lv)
end
function c1003840.spfilter(c,e,tp,lv)
return c:IsSetCard(0x1017) and not c:IsLevel(lv) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
return c:IsSetCard(0x1017) and not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function c1003840.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
......
......@@ -17,7 +17,7 @@ function c12743620.filter1(c,tp)
and Duel.IsExistingTarget(c12743620.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,lv)
end
function c12743620.filter2(c,lv)
return c:IsFaceup() and (not c:IsType(TYPE_TUNER) or not c:IsLevel(lv))
return c:IsFaceup() and c:IsLevelAbove(1) and (not c:IsType(TYPE_TUNER) or not c:IsLevel(lv))
end
function c12743620.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end
......
......@@ -15,7 +15,7 @@ function c16135253.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) and e:GetHandler():IsReason(REASON_BATTLE)
end
function c16135253.filter(c,e,tp,lv)
if (lv~=6 and not c:IsLevel(lv)) or (lv==6 and c:IsLevelBelow(5)) then return false end
if (lv~=6 and not c:IsLevel(lv) and c:IsLevelAbove(1)) or (lv==6 and c:IsLevelBelow(5)) then return false end
return c:IsRace(RACE_FAIRY) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function c16135253.target(e,tp,eg,ep,ev,re,r,rp,chk)
......
......@@ -21,7 +21,7 @@ function c21620076.initial_effect(c)
c:RegisterEffect(e2)
end
function c21620076.lvfilter(c)
return c:IsFaceup() and c:IsRace(RACE_ZOMBIE) and not c:IsLevel(2)
return c:IsFaceup() and c:IsRace(RACE_ZOMBIE) and not c:IsLevel(2) and c:IsLevelAbove(1)
end
function c21620076.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c21620076.lvfilter(chkc) end
......
......@@ -65,7 +65,7 @@ function c22227683.spfilter1(c,e,tp)
and Duel.IsExistingMatchingCard(c22227683.spfilter2,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,c,e,tp,c:GetLevel())
end
function c22227683.spfilter2(c,e,tp,lv)
return c:IsSetCard(0xab) and c:IsType(TYPE_MONSTER) and not c:IsLevel(lv)
return c:IsSetCard(0xab) and c:IsType(TYPE_MONSTER) and not c:IsLevel(lv) and c:IsLevelAbove(1)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
end
function c22227683.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
......
......@@ -14,7 +14,7 @@ function c26864586.filter1(c,tp)
return lv>0 and c:IsFaceup() and Duel.IsExistingTarget(c26864586.filter2,tp,LOCATION_MZONE,0,1,c,c:GetRace(),c:GetAttribute(),lv)
end
function c26864586.filter2(c,rc,at,lv)
return not c:IsLevel(lv) and c:IsFaceup() and c:IsRace(rc) and c:IsAttribute(at)
return not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsFaceup() and c:IsRace(rc) and c:IsAttribute(at)
end
function c26864586.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end
......
......@@ -41,7 +41,7 @@ function c35058857.spcon(e,c)
and Duel.IsExistingMatchingCard(c35058857.filter,c:GetControler(),LOCATION_MZONE,0,1,nil)
end
function c35058857.lvfilter(c,lv)
return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and not c:IsLevel(lv)
return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and not c:IsLevel(lv) and c:IsLevelAbove(1)
end
function c35058857.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local lv=e:GetHandler():GetLevel()
......
......@@ -19,7 +19,7 @@ function c3606728.initial_effect(c)
c:RegisterEffect(e2)
end
function c3606728.lvfilter(c,lv)
return c:IsFaceup() and c:IsCode(26082117) and not c:IsLevel(lv)
return c:IsFaceup() and c:IsCode(26082117) and not c:IsLevel(lv) and c:IsLevelAbove(1)
end
function c3606728.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c3606728.lvfilter(chkc,e:GetHandler():GetLevel()) end
......
......@@ -10,7 +10,7 @@ function c37168514.initial_effect(c)
c:RegisterEffect(e1)
end
function c37168514.filter(c)
return c:IsFaceup() and c:IsRace(RACE_ROCK) and not c:IsLevel(3)
return c:IsFaceup() and c:IsRace(RACE_ROCK) and not c:IsLevel(3) and c:IsLevelAbove(1)
end
function c37168514.lvtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c37168514.filter,tp,LOCATION_MZONE,0,1,nil) end
......
......@@ -24,8 +24,7 @@ function c39153655.initial_effect(c)
c:RegisterEffect(e3)
end
function c39153655.filter(c)
local lv=c:GetLevel()
return c:IsFaceup() and c:IsSetCard(0xaf) and not c:IsLevel(4)
return c:IsFaceup() and c:IsSetCard(0xaf) and not c:IsLevel(4) and c:IsLevelAbove(1)
end
function c39153655.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c39153655.filter(chkc) end
......
......@@ -45,7 +45,7 @@ function c43464884.splimit(e,c)
return not c:IsRace(RACE_BEASTWARRIOR)
end
function c43464884.cgfilter(c,mc)
return c:IsRace(RACE_BEASTWARRIOR) and c:GetLevel()>0 and not (c:IsLevel(mc:GetLevel()) and c:IsAttribute(mc:GetAttribute()))
return c:IsRace(RACE_BEASTWARRIOR) and c:IsLevelAbove(1) and not (c:IsLevel(mc:GetLevel()) and c:IsAttribute(mc:GetAttribute()))
end
function c43464884.cgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler()
......
......@@ -45,7 +45,7 @@ function c45496268.sumop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c45496268.lvfilter(c)
return c:IsFaceup() and (c:IsSetCard(0x85) or c:IsCode(71071546)) and not c:IsLevel(8)
return c:IsFaceup() and (c:IsSetCard(0x85) or c:IsCode(71071546)) and not c:IsLevel(8) and c:IsLevelAbove(1)
end
function c45496268.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c45496268.lvfilter(chkc) end
......
......@@ -11,7 +11,7 @@ function c46291010.initial_effect(c)
c:RegisterEffect(e1)
end
function c46291010.filter(c,lv)
return c:IsRace(RACE_PSYCHO) and not c:IsLevel(lv) and c:IsAbleToRemove()
return c:IsRace(RACE_PSYCHO) and not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsAbleToRemove()
end
function c46291010.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c46291010.filter,tp,LOCATION_DECK,0,1,nil,e:GetHandler():GetLevel()) end
......
......@@ -13,7 +13,7 @@ function c50457953.initial_effect(c)
c:RegisterEffect(e1)
end
function c50457953.lvfilter(c,lv)
return c:IsFaceup() and not c:IsLevel(lv) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_DRAGON)
return c:IsFaceup() and not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_DRAGON)
end
function c50457953.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c50457953.lvfilter(chkc,e:GetHandler():GetLevel()) end
......
......@@ -14,7 +14,7 @@ function c50785356.initial_effect(c)
c:RegisterEffect(e2)
end
function c50785356.filter(c)
return c:IsFaceup() and not c:IsLevel(3)
return c:IsFaceup() and not c:IsLevel(3) and c:IsLevelAbove(1)
end
function c50785356.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c50785356.filter(chkc) end
......
......@@ -50,7 +50,7 @@ function c52176579.lvfilter(c,tp)
return lv>0 and c:IsFaceup() and c:IsSetCard(0xea) and Duel.IsExistingMatchingCard(c52176579.tgfilter,tp,LOCATION_DECK,0,1,nil,lv)
end
function c52176579.tgfilter(c,lv)
return c:IsSetCard(0xea) and not c:IsLevel(lv) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
return c:IsSetCard(0xea) and not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
end
function c52176579.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c52176579.lvfilter(chkc,tp) end
......
......@@ -20,7 +20,7 @@ function c56427559.initial_effect(c)
c:RegisterEffect(e2)
end
function c56427559.lvfilter(c,lv)
return c:IsFaceup() and c:IsSetCard(0x83) and not c:IsLevel(lv)
return c:IsFaceup() and c:IsSetCard(0x83) and not c:IsLevel(lv) and c:IsLevelAbove(1)
end
function c56427559.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c56427559.lvfilter(chkc,e:GetHandler():GetLevel()) end
......
......@@ -10,8 +10,7 @@ function c58441120.initial_effect(c)
c:RegisterEffect(e1)
end
function c58441120.filter(c)
local lv=c:GetLevel()
return c:IsFaceup() and not c:IsLevel(4)
return c:IsFaceup() and not c:IsLevel(4) and c:IsLevelAbove(1)
end
function c58441120.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c58441120.filter(chkc) end
......
......@@ -21,7 +21,7 @@ function c61777313.synlimit(e,c)
return c:IsSetCard(0x42)
end
function c61777313.cfilter(c,lv)
return c:IsSetCard(0x42) and c:IsType(TYPE_MONSTER) and not c:IsLevel(lv) and c:IsAbleToGraveAsCost()
return c:IsSetCard(0x42) and c:IsType(TYPE_MONSTER) and not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsAbleToGraveAsCost()
end
function c61777313.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c61777313.cfilter,tp,LOCATION_DECK,0,1,nil,e:GetHandler():GetLevel()) end
......
......@@ -51,7 +51,7 @@ function c65536818.thop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c65536818.costfilter(c,lv)
return not c:IsLevel(lv) and c:IsRace(RACE_WYRM) and c:IsAbleToGraveAsCost()
return not c:IsLevel(lv) and c:IsLevelAbove(1) and c:IsRace(RACE_WYRM) and c:IsAbleToGraveAsCost()
end
function c65536818.lvcost(e,tp,eg,ep,ev,re,r,rp,chk)
local lv=e:GetHandler():GetLevel()
......
......@@ -44,7 +44,7 @@ function c65737274.cfilter(c,tp)
return c:IsRace(RACE_DRAGON) and Duel.IsExistingTarget(c65737274.lvfilter,tp,LOCATION_MZONE,0,1,c)
end
function c65737274.lvfilter(c)
return c:IsFaceup() and not c:IsLevel(8)
return c:IsFaceup() and not c:IsLevel(8) and c:IsLevelAbove(1)
end
function c65737274.lvcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckReleaseGroup(tp,c65737274.cfilter,1,nil,tp) end
......
......@@ -12,7 +12,7 @@ function c74611888.initial_effect(c)
c:RegisterEffect(e1)
end
function c74611888.cfilter(c)
return c:IsFaceup() and not c:IsLevel(c:GetOriginalLevel())
return c:IsFaceup() and not c:IsLevel(c:GetOriginalLevel()) and c:IsLevelAbove(1)
end
function c74611888.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c74611888.cfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil)
......
......@@ -68,7 +68,7 @@ function c80773359.tnop(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e1)
end
function c80773359.lvfilter(c,lv)
return c:IsSetCard(0x33) and not c:IsLevel(lv)
return c:IsSetCard(0x33) and not c:IsLevel(lv) and c:IsLevelAbove(1)
end
function c80773359.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c80773359.lvfilter(chkc,e:GetHandler():GetLevel()) end
......
......@@ -34,5 +34,5 @@ function c85239662.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e1,tp)
end
function c85239662.target(e,c)
return not c:IsLevel(e:GetLabel())
return not c:IsLevel(e:GetLabel()) and c:IsLevelAbove(1)
end
......@@ -31,7 +31,7 @@ function c93543806.splimit(e,c)
return not c:IsSetCard(0x70)
end
function c93543806.filter(c)
return c:IsFaceup() and c:IsSetCard(0x70) and not c:IsLevel(6)
return c:IsFaceup() and c:IsSetCard(0x70) and not c:IsLevel(6) and c:IsLevelAbove(1)
end
function c93543806.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c93543806.filter(chkc) end
......
......@@ -43,7 +43,7 @@ function c94203886.lvcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.RegisterEffect(e1,tp)
end
function c94203886.lvfilter(c,lv)
return c:IsFaceup() and c:IsSetCard(0x54) and not c:IsLevel(lv)
return c:IsFaceup() and c:IsSetCard(0x54) and not c:IsLevel(lv) and c:IsLevelAbove(1)
end
function c94203886.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c94203886.lvfilter(chkc,e:GetHandler():GetLevel()) end
......
......@@ -31,7 +31,7 @@ function c95352218.filter1(c)
return c:IsFaceup() and c:IsLevelAbove(1)
end
function c95352218.filter2(c,lv)
return c:IsFaceup() and not c:IsLevel(lv)
return c:IsFaceup() and not c:IsLevel(lv) and c:IsLevelAbove(1)
end
function c95352218.adjustop(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) then return end
......
......@@ -35,7 +35,7 @@ function c9583383.rfilter(c,tp)
and Duel.IsExistingMatchingCard(c9583383.tfilter,tp,LOCATION_MZONE,0,1,nil,lv)
end
function c9583383.tfilter(c,clv)
return not c:IsLevel(clv) and c:IsFaceup() and c:IsSetCard(0x54)
return not c:IsLevel(clv) and c:IsLevelAbove(1) and c:IsFaceup() and c:IsSetCard(0x54)
end
function c9583383.lvcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c9583383.rfilter,tp,LOCATION_GRAVE,0,1,nil,tp) 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