Commit e0c8ea53 authored by xiaoye's avatar xiaoye

Update vgfuncLib.lua

parent 7aa7e678
...@@ -1037,10 +1037,10 @@ function VgF.GetMatchingGroup(f, p, loc_self, loc_oppo, ex, ...) ...@@ -1037,10 +1037,10 @@ function VgF.GetMatchingGroup(f, p, loc_self, loc_oppo, ex, ...)
local g = Duel.GetMatchingGroup(loc_self_con, p, loc_self, 0, nil) local g = Duel.GetMatchingGroup(loc_self_con, p, loc_self, 0, nil)
g = g + Duel.GetMatchingGroup(loc_oppo_con, p, 0, loc_oppo, nil) g = g + Duel.GetMatchingGroup(loc_oppo_con, p, 0, loc_oppo, nil)
g = g - Duel.GetMatchingGroup(Card.IsFacedown, p, LOCATION_CIRCLE, LOCATION_CIRCLE, nil) g = g - Duel.GetMatchingGroup(Card.IsFacedown, p, LOCATION_CIRCLE, LOCATION_CIRCLE, nil)
if loc_self & LOCATION_OVERLAY > 0 then if loc_self & LOCATION_SOUL > 0 then
g = g + VgF.GetSoulGroup(p) g = g + VgF.GetSoulGroup(p)
end end
if loc_oppo & LOCATION_OVERLAY > 0 then if loc_oppo & LOCATION_SOUL > 0 then
g = g + VgF.GetSoulGroup(1 - p) g = g + VgF.GetSoulGroup(1 - p)
end end
return g:Filter(f, ex, ...) return g:Filter(f, ex, ...)
...@@ -1070,8 +1070,8 @@ function VgF.SelectMatchingCard(msg, e, sp, f, p, loc_self, loc_oppo, min, max, ...@@ -1070,8 +1070,8 @@ function VgF.SelectMatchingCard(msg, e, sp, f, p, loc_self, loc_oppo, min, max,
Duel.ConfirmCards(sp, Duel.GetFieldGroup(sp, LOCATION_DECK, 0)) Duel.ConfirmCards(sp, Duel.GetFieldGroup(sp, LOCATION_DECK, 0))
check_deck = true check_deck = true
end end
local filter = function(c, e) local filter = function(c, re)
return c:IsCanBeEffectTarget(e) or not c:IsLocation(LOCATION_CIRCLE) return c:IsCanBeEffectTarget(re) or not c:IsLocation(LOCATION_CIRCLE)
end end
local g = VgF.GetMatchingGroup(filter, p, loc_self, loc_oppo, ex, e) local g = VgF.GetMatchingGroup(filter, p, loc_self, loc_oppo, ex, e)
Duel.Hint(HINT_SELECTMSG, sp, msg) Duel.Hint(HINT_SELECTMSG, sp, msg)
......
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