update EFFECT_EXTRA_LINK_MATERIAL (#1507)

c2347477.lua

@@ -28,8 +28,9 @@ end
 function c2347477.exmfilter(c)
 	return c:IsLocation(LOCATION_HAND) and c:IsCode(2347477)
 end
-function c2347477.matval(e,c,mg)
-	return c:IsSetCard(0x101) and mg:IsExists(c2347477.mfilter,1,nil) and not mg:IsExists(c2347477.exmfilter,1,nil)
+function c2347477.matval(e,lc,mg,c,tp)
+	if not lc:IsSetCard(0x101) then return false,nil end
+	return true,not mg or mg:IsExists(c2347477.mfilter,1,nil) and not mg:IsExists(c2347477.exmfilter,1,nil)
 end
 function c2347477.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c30114823.lua

@@ -28,8 +28,9 @@ end
 function c30114823.exmfilter(c)
 	return c:IsLocation(LOCATION_HAND) and c:IsCode(30114823)
 end
-function c30114823.matval(e,c,mg)
-	return c:IsSetCard(0x101) and mg:IsExists(c30114823.mfilter,1,nil) and not mg:IsExists(c30114823.exmfilter,1,nil)
+function c30114823.matval(e,lc,mg,c,tp)
+	if not lc:IsSetCard(0x101) then return false,nil end
+	return true,not mg or mg:IsExists(c30114823.mfilter,1,nil) and not mg:IsExists(c30114823.exmfilter,1,nil)
 end
 function c30114823.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c37119142.lua

@@ -28,8 +28,9 @@ end
 function c37119142.exmfilter(c)
 	return c:IsLocation(LOCATION_HAND) and c:IsCode(37119142)
 end
-function c37119142.matval(e,c,mg)
-	return c:IsSetCard(0x101) and mg:IsExists(c37119142.mfilter,1,nil) and not mg:IsExists(c37119142.exmfilter,1,nil)
+function c37119142.matval(e,lc,mg,c,tp)
+	if not lc:IsSetCard(0x101) then return false,nil end
+	return true,not mg or mg:IsExists(c37119142.mfilter,1,nil) and not mg:IsExists(c37119142.exmfilter,1,nil)
 end
 function c37119142.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c59185998.lua

@@ -29,8 +29,9 @@ end
 function c59185998.exmfilter(c)
 	return c:IsLocation(LOCATION_HAND) and c:IsCode(59185998)
 end
-function c59185998.matval(e,c,mg)
-	return c:IsSetCard(0x103) and mg:IsExists(c59185998.mfilter,1,nil) and not mg:IsExists(c59185998.exmfilter,1,nil)
+function c59185998.matval(e,lc,mg,c,tp)
+	if not lc:IsSetCard(0x103) then return false,nil end
+	return true,not mg or mg:IsExists(c59185998.mfilter,1,nil) and not mg:IsExists(c59185998.exmfilter,1,nil)
 end
 function c59185998.cfilter(c,tp)
 	return c:IsFaceup() and c:IsControler(tp) and c:IsSetCard(0x103) and c:IsType(TYPE_LINK) and c:IsSummonType(SUMMON_TYPE_LINK)

c75130221.lua

@@ -28,8 +28,9 @@ end
 function c75130221.exmfilter(c)
 	return c:IsLocation(LOCATION_HAND) and c:IsCode(75130221)
 end
-function c75130221.matval(e,c,mg)
-	return c:IsSetCard(0x101) and mg:IsExists(c75130221.mfilter,1,nil) and not mg:IsExists(c75130221.exmfilter,1,nil)
+function c75130221.matval(e,lc,mg,c,tp)
+	if not lc:IsSetCard(0x101) then return false,nil end
+	return true,not mg or mg:IsExists(c75130221.mfilter,1,nil) and not mg:IsExists(c75130221.exmfilter,1,nil)
 end
 function c75130221.discon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

utility.lua

@@ -1876,7 +1876,14 @@ function Auxiliary.LConditionFilter(c,f,lc)
 end
 function Auxiliary.LExtraFilter(c,f,lc,tp)
 	if c:IsLocation(LOCATION_ONFIELD) and not c:IsFaceup() then return false end
-	return c:IsHasEffect(EFFECT_EXTRA_LINK_MATERIAL,tp) and c:IsCanBeLinkMaterial(lc) and (not f or f(c))
+	if not c:IsCanBeLinkMaterial(lc) or f and not f(c) then return false end
+	local le={c:IsHasEffect(EFFECT_EXTRA_LINK_MATERIAL,tp)}
+	for _,te in pairs(le) do
+		local tf=te:GetValue()
+		local related,valid=tf(te,lc,nil,c,tp)
+		if related then return true end
+	end
+	return false
 end
 function Auxiliary.GetLinkCount(c)
 	if c:IsType(TYPE_LINK) and c:GetLink()>1 then
@@ -1891,11 +1898,15 @@ function Auxiliary.GetLinkMaterials(tp,f,lc)
 end
 function Auxiliary.LCheckOtherMaterial(c,mg,lc,tp)
 	local le={c:IsHasEffect(EFFECT_EXTRA_LINK_MATERIAL,tp)}
+	local res1=false
+	local res2=true
 	for _,te in pairs(le) do
 		local f=te:GetValue()
-		if f and not f(te,lc,mg,c,tp) then return false end
+		local related,valid=f(te,lc,mg,c,tp)
+		if related then res2=false end
+		if related and valid then res1=true end
 	end
-	return true
+	return res1 or res2
 end
 function Auxiliary.LUncompatibilityFilter(c,sg,lc,tp)
 	local mg=sg:Filter(aux.TRUE,c)
@@ -1913,7 +1924,8 @@ function Auxiliary.LExtraMaterialCount(mg,lc,tp)
 		for _,te in pairs(le) do
 			local sg=mg:Filter(aux.TRUE,tc)
 			local f=te:GetValue()
-			if not f or f(te,lc,sg) then
+			local related,valid=f(te,lc,sg,tc,tp)
+			if related and valid then
 				te:UseCountLimit(tp)
 			end
 		end