Mercury233

expansions/script/c33700784.lua

@@ -138,15 +138,12 @@ function cm.initial_effect(c)
 	e1:SetOperation(cm.thop)
 	c:RegisterEffect(e1)  
 end
-function cm.cknfilter(c)
-	return not c:IsDisabled()
-end
 function cm.lkfilter(c,lc,tp)
 	local flag=c:IsFaceup() and c:IsCanBeLinkMaterial(lc)
 	if c:IsType(TYPE_MONSTER) then
 		return flag and c:IsLinkRace(RACE_CYBERSE+RACE_MACHINE)
 	else
-		return c:IsFaceup() and c:IsType(TYPE_TRAP) and not Duel.IsExistingMatchingCard(cm.cknfilter,tp,0,LOCATION_SZONE,1,nil)
+		return c:IsFaceup() and c:IsType(TYPE_TRAP)
 	end
 end
 function cm.lvfilter(c)

expansions/script/c81011047.lua

 --雨泪·砂冢明音
 function c81011047.initial_effect(c)
 	c:EnableReviveLimit()
-	--
+	--extra link
 	local e0=Effect.CreateEffect(c)
+	e0:SetDescription(aux.Stringid(81011047,0))
 	e0:SetType(EFFECT_TYPE_FIELD)
 	e0:SetCode(EFFECT_SPSUMMON_PROC)
 	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
@@ -40,15 +41,12 @@ function c81011047.initial_effect(c)
 	e5:SetOperation(c81011047.setop)
 	c:RegisterEffect(e5)
 end
-function c81011047.cknfilter(c)
-	return c:GetOriginalCode()==77765004 and not c:IsDisabled()
-end
 function c81011047.lkfilter(c,lc,tp)
 	local flag=c:IsFaceup() and c:IsCanBeLinkMaterial(lc)
 	if c:IsType(TYPE_MONSTER) then
-		return flag and c:IsType(TYPE_EFFECT)
+		return flag and c:IsLinkType(TYPE_EFFECT)
 	else
-		return c:IsFaceup() and c:IsType(TYPE_TRAP) and not Duel.IsExistingMatchingCard(c81011047.cknfilter,tp,0,LOCATION_SZONE,1,nil)
+		return c:IsFaceup() and c:IsType(TYPE_TRAP)
 	end
 end
 function c81011047.lvfilter(c)
@@ -58,6 +56,7 @@ function c81011047.lvfilter(c)
 		return 1 
 	end
 end
+--
 function c81011047.lcheck(tp,sg,lc,minc,ct)
 	return ct>=minc and sg:CheckWithSumEqual(c81011047.lvfilter,lc:GetLink(),ct,ct) and Duel.GetLocationCountFromEx(tp,tp,sg,lc)>0
 end
@@ -71,7 +70,6 @@ function c81011047.lkchenk(c,tp,sg,mg,lc,ct,minc,maxc)
 end
 function c81011047.lkcon(e,c)
 	if c==nil then return true end
-	if c:IsType(TYPE_PENDULUM) and c:IsFaceup() then return false end
 	local tp=c:GetControler()
 	local mg=Duel.GetMatchingGroup(c81011047.lkfilter,tp,LOCATION_ONFIELD,0,nil,c,tp)
 	local sg=Group.CreateGroup()
@@ -102,7 +100,7 @@ function c81011047.lkop(e,tp,eg,ep,ev,re,r,rp,c)
 		if cg:GetCount()==0 then break end
 		local minct=1
 		if c81011047.lcheck(tp,sg,c,minc,i) then
-			if not Duel.SelectYesNo(tp,210) then break end
+			if not Duel.SelectYesNo(tp,aux.Stringid(81011047,0)) then break end
 			minct=0
 		end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_LMATERIAL)