update card.islevel

7122a4e1 · xiaoye · 7e6b0920 · 7122a4e1 · 7122a4e1 · 7122a4e1
Commit 7122a4e1 authored Jul 27, 2024 by xiaoye
26 changed files
--- a/README.md
+++ b/README.md
@@ -276,7 +276,7 @@ function cm.initial_effect(c)
 	vgd.EffectTypeIgnition(c, m, LOCATION_MZONE, vgf.SearchCardSpecialSummon(LOCATION_DROP,cm.filter), vgf.DisCardCost(1), nil, nil, 1)
 end
 function cm.filter(c)
-	return vgf.IsLevel(c,0)
+	return c:IsLevel(0)
 end
 ```

@@ -372,12 +372,12 @@ vgf.LvCondition(e_or_c)
 用于判断`这张卡的等级`是否在`...`之中, 返回 `boolean` 值

 ```lua
-vgf.IsLevel(c, ...)
+c:IsLevel( ...)
 ```

 参数注释

-> **... : 要判断的等级, 可填入多个参数, 如: vgf.IsLevel(c, 1, 2)**
+> **... : 要判断的等级, 可填入多个参数, 如: c:IsLevel( 1, 2)**

 范例 : [天枪的骑士 勒克斯](c10103002.lua)


--- a/VgFuncLib.lua
+++ b/VgFuncLib.lua
@@ -196,19 +196,6 @@ end
 function VgF.VMonsterCondition(e)
    return VgF.VMonsterFilter(e:GetHandler())
 end
---判断c是否是某（几）个等级（之一）。
---@param c Card 要判断的卡
---@param ... integer 等级
---@return boolean 指示是否是给定等级中的一个
-function VgF.IsLevel(c,...)
-    for i,v in ipairs{...} do
-        local lv=v+1
-        if c:IsLevel(lv) then
-            return true
-        end
-    end
-    return false
-end
 ---判断c是否在当前区域的某（几）个编号上
 ---@param c Card 要判断的卡
 ---@param ... integer 编号

--- a/c10101001.lua
+++ b/c10101001.lua
@@ -6,7 +6,7 @@ function cm.initial_effect(c)
 	vgd.EffectTypeTrigger(c,m,LOCATION_MZONE,EFFECT_TYPE_SINGLE,EVENT_ATTACK_ANNOUNCE,cm.operation,vgf.DamageCost(1))
 end
 function cm.filter(c)
-	return vgf.IsLevel(c,0)
+	return c:IsLevel(0)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

--- a/c10103001.lua
+++ b/c10103001.lua
@@ -25,7 +25,7 @@ function cm.initial_effect(c)
    c:RegisterEffect(e1)
 end
 function cm.checkfilter(c,tp)
-    return c:IsLocation(LOCATION_TRIGGER) and vgf.IsLevel(c,3) and c:IsControler(tp) and Duel.GetTurnPlayer()==tp
+    return c:IsLocation(LOCATION_TRIGGER) and c:IsLevel(3) and c:IsControler(tp) and Duel.GetTurnPlayer()==tp
 end
 function cm.checkcon(e,tp,eg,ep,ev,re,r,rp)
    return eg:IsExists(cm.checkfilter,1,nil,tp) and Duel.GetTurnPlayer()==tp and Duel.GetAttackTarget()
@@ -49,5 +49,5 @@ function cm.condition(e,tp,eg,ep,ev,re,r,rp)
    return vgf.VMonsterCondition(e) and Duel.GetFlagEffect(tp,m)>0
 end
 function cm.target(e,c)
-    return vgf.IsLevel(c,3) and Duel.GetTurnPlayer()==e:GetHandlerPlayer()
+    return c:IsLevel(3) and Duel.GetTurnPlayer()==e:GetHandlerPlayer()
 end
\ No newline at end of file
--- a/c10103003.lua
+++ b/c10103003.lua
@@ -30,5 +30,5 @@ function cm.operation2(e,tp,eg,ep,ev,re,r,rp)
    end
 end
 function cm.filter(c)
-    return vgf.IsLevel(c,3) and vgf.VMonsterFilter(c)
+    return c:IsLevel(3) and vgf.VMonsterFilter(c)
 end
\ No newline at end of file
--- a/c10103006.lua
+++ b/c10103006.lua
@@ -10,7 +10,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
    vgf.AtkUp(c,g,10000,nil)
 end
 function cm.filter(c)
-    return vgf.IsLevel(c,3) and vgf.RMonsterFilter(c)
+    return c:IsLevel(3) and vgf.RMonsterFilter(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
    local c=e:GetHandler()

--- a/c10104003.lua
+++ b/c10104003.lua
@@ -20,7 +20,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetDecktopGroup(tp,1)
 	local tc=vgf.ReturnCard(g)
 	Duel.DisableShuffleCheck()
-	if vgf.IsCanBeCalled(tc,e,tp) and vgf.IsLevel(tc,0,1,2) then
+	if vgf.IsCanBeCalled(tc,e,tp) and tc:IsLevel(0,1,2) then
        vgf.Sendto(LOCATION_MZONE,g,0,tp)
 	else
 		vgf.Sendto(LOCATION_OVERLAY,g,c)

--- a/c10202001.lua
+++ b/c10202001.lua
@@ -60,5 +60,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter(c)
-	return vgf.VMonsterFilter(c) and c:IsLevelAbove(4)
+	return vgf.VMonsterFilter(c) and c:IsLevelAbove(3)
 end
\ No newline at end of file
--- a/c10202008.lua
+++ b/c10202008.lua
@@ -7,5 +7,5 @@ function cm.initial_effect(c)
 	vgd.EffectTypeTrigger(c,m,LOCATION_MZONE,EFFECT_TYPE_FIELD,EVENT_CUSTOM+EVENT_SUPPORT,vgf.OverlayFill(1),vgf.True,cm.condition)
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetAttacker():IsLevelAbove(3) and eg:GetFirst()==e:GetHandler()
+	return Duel.GetAttacker():IsLevelAbove(2) and eg:GetFirst()==e:GetHandler()
 end
\ No newline at end of file
--- a/c10202009.lua
+++ b/c10202009.lua
@@ -6,7 +6,7 @@ function cm.initial_effect(c)
 	vgd.EffectTypeIgnition(c,m,LOCATION_MZONE,cm.operation,vgf.DamageCost(2),cm.condition,nil,1)
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return vgf.RMonsterFilter(e:GetHandler()) and vgf.GetVMonster(tp):IsLevelAbove(4)
+	return vgf.RMonsterFilter(e:GetHandler()) and vgf.GetVMonster(tp):IsLevelAbove(3)
 end
 function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Draw(tp,1,REASON_EFFECT)

--- a/c10203001.lua
+++ b/c10203001.lua
@@ -27,7 +27,7 @@ function cm.filter(c,e,tp)
 	return c:IsSetCard(0x76) and vgf.IsCanBeCalled(c,e,tp)
 end
 function cm.checkfilter(c)
-	return (c:IsSummonType(SUMMON_TYPE_SELFRIDE) or c:IsSummonType(SUMMON_TYPE_RIDE)) and c:IsLevelAbove(4)
+	return (c:IsSummonType(SUMMON_TYPE_SELFRIDE) or c:IsSummonType(SUMMON_TYPE_RIDE)) and c:IsLevelAbove(3)
 end
 function cm.checkcon(e,tp,eg,ep,ev,re,r,rp)
    return eg:IsExists(cm.checkfilter,1,nil)

--- a/c10203002.lua
+++ b/c10203002.lua
@@ -8,7 +8,7 @@ function cm.filter(c)
 	return c:IsSetCard(0x202)
 end
 function cm.filter1(c)
-	return c:IsLevelAbove(3)
+	return c:IsLevelAbove(2)
 end
 function cm.condition1(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(cm.cfilter,1,nil,e:GetHandler()) and Duel.GetAttacker()==e:GetHandler()

--- a/c10203003.lua
+++ b/c10203003.lua
@@ -49,5 +49,5 @@ function cm.filter(c)
 	return c:IsSetCard(0x77)
 end
 function cm.filter1(c,e,tp)
-	return c:IsLevelBelow(3) and vgf.IsCanBeCalled(c,e,tp)
+	return c:IsLevelBelow(2) and vgf.IsCanBeCalled(c,e,tp)
 end
\ No newline at end of file
--- a/c10203008.lua
+++ b/c10203008.lua
@@ -5,7 +5,7 @@ function cm.initial_effect(c)
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsLocation(LOCATION_GZONE) and c:IsPreviousLocation(LOCATION_MZONE) and re:GetHandler()==c and vgf.GetVMonster(tp):GetOverlayGroup():FilterCount(Card.IsSetCard,nil,0x76)>=1
+	return c:IsLocation(LOCATION_GZONE) and c:IsPreviousLocation(LOCATION_MZONE) and re:IsHasCategory(CATEGORY_DEFENDER) and vgf.GetVMonster(tp):GetOverlayGroup():FilterCount(Card.IsSetCard,nil,0x76)>=1
 end
 function cm.filter(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

--- a/c10203016.lua
+++ b/c10203016.lua
@@ -27,5 +27,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter(c,e,tp)
-	return c:IsLevelAbove(3) and vgf.IsCanBeCalled(c,e,tp)
+	return c:IsLevelAbove(2) and vgf.IsCanBeCalled(c,e,tp)
 end
\ No newline at end of file
--- a/c10401001.lua
+++ b/c10401001.lua
@@ -6,7 +6,7 @@ function cm.initial_effect(c)
 	vgd.EffectTypeTriggerWhenHitting(c,m,LOCATION_MZONE,EFFECT_TYPE_SINGLE,cm.op,cm.cost,cm.con)
 end
 function cm.filter(c)
-	return c:IsCode(10101009) or (c:IsLevelBelow(4) and c:GetFlagEffectLabel(FLAG_CONDITION)==201)
+	return c:IsCode(10101009) or (c:IsLevelBelow(3) and c:GetFlagEffectLabel(FLAG_CONDITION)==201)
 end
 function cm.con(e)
 	local c=e:GetHandler()

--- a/c10401024.lua
+++ b/c10401024.lua
@@ -18,7 +18,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 --效果二召唤等级筛选
 function cm.filter2(c)
-	return vgf.IsLevel(c,0,1,2)
+	return c:IsLevel(0,1,2)
 end
 --计数爆发1，灵魂爆发1
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)

--- a/c10401030.lua
+++ b/c10401030.lua
@@ -24,5 +24,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end	
 function cm.filter(c)
-	return vgf.RMonsterFilter(c) and c:IsLevelAbove(3)
+	return vgf.RMonsterFilter(c) and c:IsLevelAbove(2)
 end
\ No newline at end of file
--- a/c10401058.lua
+++ b/c10401058.lua
@@ -10,5 +10,5 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsLocation(LOCATION_GZONE) and c:IsPreviousLocation(LOCATION_MZONE)
+	return c:IsLocation(LOCATION_GZONE) and c:IsPreviousLocation(LOCATION_MZONE) and re:IsHasCategory(CATEGORY_DEFENDER)
 end
\ No newline at end of file
--- a/c10501036.lua
+++ b/c10501036.lua
@@ -34,7 +34,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter(c)
-	return c:IsSetCard(0xb6) and c:IsLevelBelow(3)
+	return c:IsSetCard(0xb6) and c:IsLevelBelow(2)
 end


--- a/c10501038.lua
+++ b/c10501038.lua
@@ -32,7 +32,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
    end
 end
 function cm.filter(c)
-    return c:IsSetCard(0xa040) and vgf.IsLevel(c,2)
+    return c:IsSetCard(0xa040) and c:IsLevel(2)
 end



--- a/c10501082.lua
+++ b/c10501082.lua
@@ -20,7 +20,7 @@ function cm.initial_effect(c)
 		return not cm.con(e,tp,eg,ep,ev,re,r,rp) and vgf.VMonsterCondition(e)
 	end)
    e2:SetValue(function (e,tc)
-		return tc:IsLevelBelow(2) and vgf.RMonsterFilter(tc)
+		return tc:IsLevelBelow(1) and vgf.RMonsterFilter(tc)
 	end)
    c:RegisterEffect(e2)
 	vgd.EffectTypeTrigger(c,m,nil,EFFECT_TYPE_SINGLE,EVENT_SPSUMMON_SUCCESS,cm.op,nil,cm.con1)

--- a/c10501084.lua
+++ b/c10501084.lua
@@ -19,5 +19,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
    end
 end
 function cm.filter(c)
-    return c:IsSetCard(0xa040) and vgf.IsLevel(c,1)
+    return c:IsSetCard(0xa040) and c:IsLevel(1)
 end
\ No newline at end of file
--- a/c10501090.lua
+++ b/c10501090.lua
@@ -33,5 +33,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter(c)
-	return c:IsSetCard(0xb6) and c:IsLevelBelow(2)
+	return c:IsSetCard(0xb6) and c:IsLevelBelow(1)
 end
\ No newline at end of file
--- a/c20104001.lua
+++ b/c20104001.lua
@@ -33,5 +33,5 @@ function cm.operation2(e,tp,eg,ep,ev,re,r,rp)
 end
 --效果二召唤等级筛选
 function cm.filter2(c)
-	return vgf.IsLevel(c,0,1,2,3)
+	return c:IsLevel(0,1,2,3)
 end
\ No newline at end of file
--- a/c20106001.lua
+++ b/c20106001.lua
@@ -32,5 +32,5 @@ function cm.operation2(e,tp,eg,ep,ev,re,r,rp)
 	vgf.AtkUp(c,g,10000)
 end
 function cm.filter2(c)
-	return vgf.IsLevel(c,1,2,3)
+	return c:IsLevel(1,2,3)
 end