Merge pull request #29 from whenmo/main

fix IllegalFunctionCheck

VgD.Lua

@@ -872,7 +872,7 @@ end
 ---@return Effect 这个效果
 function VgD.SpellActivate(c, m, op, cost, con)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("SpellActivate")
+    local fchk = VgF.IllegalFunctionCheck("SpellActivate", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.op(op) then return end
     -- set param
     m = m or c:GetOriginalCode()
@@ -1215,7 +1215,7 @@ end
 ---@return Effect 这个效果
 function VgD.QuickSpell(c, op, cost, con, tg)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("QuickSpell")
+    local fchk = VgF.IllegalFunctionCheck("QuickSpell", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.tg(tg) or fchk.op(op) then return end
     -- set param
     local condition = function(e, tp, eg, ep, ev, re, r, rp)
@@ -1242,7 +1242,7 @@ end
 ---@return Effect 这个效果
 function VgD.ContinuousSpell(c, cost, con, tg)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("ContinuousSpell")
+    local fchk = VgF.IllegalFunctionCheck("ContinuousSpell", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.tg(tg) then return end
     -- set param
     local operation = function(e, tp, eg, ep, ev, re, r, rp)
@@ -1279,7 +1279,7 @@ end
 ---@return Effect 这个效果
 function VgD.EffectTypeTrigger(c, m, loc, typ, code, op, cost, con, tg, count, property, id)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("EffectTypeTrigger")
+    local fchk = VgF.IllegalFunctionCheck("EffectTypeTrigger", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.tg(tg) or fchk.op(op) then return end
     -- set param
     m = m or c:GetOriginalCode()
@@ -1318,7 +1318,7 @@ end
 ---@return Effect 这个效果 *回传两个效果*
 function VgD.EffectTypeTriggerWhenHitting(c, m, loc, typ, op, cost, con, tg, count, p, property, id)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("EffectTypeTriggerWhenHitting")
+    local fchk = VgF.IllegalFunctionCheck("EffectTypeTriggerWhenHitting", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.tg(tg) or fchk.op(op) then return end
     -- set param
     typ = typ or EFFECT_TYPE_SINGLE 
@@ -1344,7 +1344,7 @@ end
 ---@return Effect 这个效果
 function VgD.CardToG(c, m, op, cost, con)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("CardToG")
+    local fchk = VgF.IllegalFunctionCheck("CardToG", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.op(op) then return end
     -- set param
     m = m or c:GetOriginalCode()
@@ -1398,7 +1398,7 @@ end
 ---@return Effect 这个效果
 function VgD.BeRidedByCard(c, m, filter, op, cost, con, tg, id)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("BeRidedByCard")
+    local fchk = VgF.IllegalFunctionCheck("BeRidedByCard", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.tg(tg) or fchk.op(op) then return end
     -- set param
     m = m or c:GetOriginalCode()
@@ -1468,7 +1468,7 @@ end
 ---@return Effect 这个效果
 function VgD.EffectTypeIgnition(c, m, loc, op, cost, con, tg, count, property, id)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("EffectTypeIgnition")
+    local fchk = VgF.IllegalFunctionCheck("EffectTypeIgnition", c)
     if fchk.con(con) or fchk.cost(cost) or fchk.tg(tg) or fchk.op(op) then return end
     -- set param
     m = m or c:GetOriginalCode()
@@ -1507,7 +1507,7 @@ end
 ---@return Effect 这个效果
 function VgD.EffectTypeContinuous(c, m, loc, typ, code, val, con, tg, loc_self, loc_op, reset, hc)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("EffectTypeContinuous")
+    local fchk = VgF.IllegalFunctionCheck("EffectTypeContinuous", c)
     if fchk.con(con) or fchk.tg(tg) then return end
     -- set param
     local cm = _G["c"..(m or c:GetOriginalCode())]
@@ -1589,7 +1589,7 @@ end
 ---@return Effect 这个效果
 function VgD.TriggerCountUp(c, m, num, con, reset, hc)
     -- check func
-    if VgF.IllegalFunctionCheck("TriggerCountUp").con(con) then return end
+    if VgF.IllegalFunctionCheck("TriggerCountUp", c).con(con) then return end
     -- set param
     local cm = _G["c"..(m or c:GetOriginalCode())]
     cm.is_has_continuous = cm.is_has_continuous or not reset
@@ -1633,7 +1633,7 @@ end
 ---@return Effect 这个效果
 function VgD.CannotBeTarget(c, m, loc, typ, val, con, tg, loc_self)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("CannotBeTarget")
+    local fchk = VgF.IllegalFunctionCheck("CannotBeTarget", c)
     if fchk.con(con) or fchk.tg(tg) then return end
     -- set param
     local cm = _G["c"..(m or c:GetOriginalCode())]
@@ -1777,7 +1777,7 @@ end
 ---@param con function|nil 这个效果的条件函数
 function VgD.GlobalCheckEffect(c, m, code, con, op)
     -- check func
-    local fchk = VgF.IllegalFunctionCheck("GlobalCheckEffect")
+    local fchk = VgF.IllegalFunctionCheck("GlobalCheckEffect", c)
     if fchk.con(con) or fchk.op(op) then return end
     -- set param and check global
     m = m or c:GetOriginalCode()

VgFuncLib.lua

@@ -1374,12 +1374,14 @@ function VgF.PlayerEffect(e, tp, eg, ep, ev, re, r, rp)
     return true
 end
 ---创建一个函数检查器 检查func是否为nil或函数
-function VgF.IllegalFunctionCheck(name)
+function VgF.IllegalFunctionCheck(name, c)
+    if VgF.GetValueType(c) ~= "Card" then Debug.Message("VgD."..name.." param c isn't Card") end
+    local m = c:GetOriginalCode()
     local chk = function(key)
         return function(func)
             local ftyp = type(func)
             if ftyp == "nil" or ftyp == "function" then return false end
-            Debug.Message("c"..self_code.." VgD."..name.." param "..key.." isn't function | nil")
+            Debug.Message("c"..m.." VgD."..name.." param "..key.." isn't function | nil")
             return true
         end
     end