fix

expansions/script/c12400063.lua

@@ -76,7 +76,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetMZoneCount(tp)>0
+	if chk==0 then return Duel.GetMZoneCount(tp)>0 and tp==Duel.GetTurnPlayer()
 		and Duel.IsPlayerCanSpecialSummonMonster(tp,12400064,0,0x4011,3000,3000,6,RACE_PSYCHO,ATTRIBUTE_DARK) end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)

expansions/script/c16104206.lua

@@ -94,11 +94,7 @@ function cm.advop(e,tp,eg,ep,ev,re,r,rp,c)
 	cm.check_s = false
 end
 function cm.rtg(e,c)
-	if not (c:IsFaceup() and c~=e:GetHandler()) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c:IsFaceup() and c~=e:GetHandler()
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:SetLabel(1)

expansions/script/c16104401.lua

@@ -73,11 +73,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104402.lua

@@ -75,11 +75,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104403.lua

@@ -69,11 +69,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104405.lua

@@ -70,11 +70,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104407.lua

@@ -63,11 +63,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104411.lua

@@ -109,11 +109,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104412.lua

@@ -85,7 +85,7 @@ end
 function cm.adcheck(c)
 	return c:IsFaceup() and c:IsCode(m)
 end
-function cm.adconop(e,tp)
+function cm.adconop(e,tp,eg)
 	for tc in aux.Next(eg) do
 		if tc:IsFaceup() and tc:IsCode(m) and Duel.GetFlagEffect(tc:GetSummonPlayer(),m)<1 then
 			Duel.RegisterFlagEffect(tc:GetSummonPlayer(),m,0,0,0)

expansions/script/c16104413.lua

@@ -76,11 +76,7 @@ function cm.initial_effect(c)
 end
 --summon with s/t
 function cm.rtg(e,c)
-	if not (c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)) then return false end
-	if Duel.GetCurrentChain()<2 then
-		return not c:IsStatus(STATUS_LEAVE_CONFIRMED) and not c:IsStatus(STATUS_ACTIVATE_DISABLED)
-	end
-	return true
+	return c~=e:GetHandler() and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 --summon/set with 1 tribute
 function cm.otcon(e,c,minc)

expansions/script/c16104420.lua

@@ -22,6 +22,9 @@ function cm.initial_effect(c)
 	e1:SetTargetRange(1,0)
 	e1:SetTarget(cm.splimit)
 	c:RegisterEffect(e1)  
+	local e1_1=e1:Clone()
+	e1_1:SetCode(EFFECT_CANNOT_SUMMON)
+	c:RegisterEffect(e1_1)
 	--Effect 2  
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,2))

expansions/script/c16401240.lua

@@ -32,7 +32,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function s.XyzFilter(c)
-	return c:IsSetCard(0x5ce1) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0x5ce1) and c:IsType(TYPE_MONSTER) and c:IsRace(RACE_WARRIOR)
 end
 function s.atkcon(e)
 	return Duel.IsBattlePhase()

expansions/script/c18018019.lua

@@ -41,7 +41,7 @@ function s.mttg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
 	local tg=Duel.SelectTarget(tp,s.filter2,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,1,nil,e,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,s.filter1,tp,LOCATION_MZONE,0,1,1,tg,e,tp)
+	local g=Duel.SelectTarget(tp,s.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,tg,e,tp)
 	local tc=g:GetFirst()
 	e:SetLabelObject(tc)
 end
@@ -51,6 +51,10 @@ function s.mtop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
 	local oc=tg:Filter(aux.TRUE,tc):GetFirst()
 	if oc:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() then
+		local og=oc:GetOverlayGroup()
+		if og:GetCount()>0 then
+			Duel.SendtoGrave(og,REASON_RULE)
+		end
 		Duel.Overlay(tc,Group.FromCards(oc))
 	end
 end

expansions/script/c30700038.lua

@@ -53,6 +53,7 @@ function s.aufilter(c)
 	return c:IsSetCard(0x5420) 
 end
 function s.atkval(e)
+	local tp=e:GetHandlerPlayer()
 	return Duel.GetMatchingGroupCount(nil,tp,LOCATION_DECK,0,nil)*100
 end
 --

expansions/script/c5012604.lua

@@ -5,6 +5,7 @@ function s.initial_effect(c)
 
 	c:SetUniqueOnField(1,1,id)
 	--synchro summon
+	--aux.AddSynchroProcedure(c,s.sfliter,aux.TRUE,1)
 	aux.AddSynchroProcedure(c,s.sfliter,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	--cannot special summon
@@ -41,9 +42,8 @@ function s.initial_effect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_CHAINING)
-	--e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e3:SetRange(LOCATION_GRAVE+LOCATION_REMOVED)
-	--e3:SetCountLimit(1,EFFECT_COUNT_CODE_CHAIN)
+	e3:SetCountLimit(1,EFFECT_COUNT_CODE_CHAIN)
 	e3:SetCondition(s.gspcon)
 	e3:SetTarget(s.gsptg)
 	e3:SetOperation(s.gspop)
@@ -150,7 +150,7 @@ function s.effectfilter(e,ct)
 	return p==tp and te:GetHandler()==e:GetHandler() 
 end
 function s.gtfilter(c,tp)
-	return c:IsControler(tp) and c.MoJin==true and c:IsType(TYPE_MONSTER)
+	return c:IsControler(tp) and (c.MoJin or c:IsSetCard(0x23c))  and c:IsType(TYPE_MONSTER)
 		and c:IsLocation(LOCATION_MZONE) and c:IsAbleToHand()
 end
 function s.gspcon(e,tp,eg,ep,ev,re,r,rp)
@@ -161,7 +161,7 @@ function s.gspcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.gspcon2(e,tp,eg,ep,ev,re,r,rp)
 	local d=Duel.GetAttackTarget()
-	return d:IsFaceup() and d.MoJin==true  and d:IsControler(tp) 
+	return d:IsFaceup() and (c.MoJin or c:IsSetCard(0x23c))   and d:IsControler(tp) 
 		and Duel.GetMZoneCount(tp,d,tp)>0 and d:IsAbleToHand()
 end
 function s.gsptg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -189,10 +189,9 @@ function s.gspop(e,tp,eg,ep,ev,re,r,rp)
 	local sg=tg:Filter(s.gstfilter,nil,e)
 	
 	Duel.SendtoHand(sg,nil,REASON_EFFECT)
-	if c:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and c:IsFaceupEx() and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
-	
-	--if Duel.SendtoHand(sg,nil,REASON_EFFECT)==0 then return end
 	--if c:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and c:IsFaceupEx() and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
+	if Duel.SendtoHand(sg,nil,REASON_EFFECT)==0 then return end
+	if c:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and c:IsFaceupEx() and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 	
 		local fid=c:GetFieldID()
 		c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1,fid)

expansions/script/c5012606.lua

@@ -26,23 +26,23 @@ function s.initial_effect(c)
 	e2:SetOperation(s.thop)
 	c:RegisterEffect(e2)
 end
-function s.cfilter(c)
-	return c.MoJin and c:IsAbleToRemoveAsCost()
+function s.filter1(c,e,tp)
+	return c.MoJin and c:IsAbleToRemoveAsCost() and Duel.GetLocationCountFromEx(tp,tp,c)>0 and Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_GRAVE+LOCATION_ONFIELD,LOCATION_GRAVE+LOCATION_ONFIELD,5,c) and c:IsFaceup()
 end
-function s.fselect(g,e,tp)
-	return Duel.IsExistingMatchingCard(s.sfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,g)
-end
-function s.sfilter(c,e,tp,g)
-	return c:IsFacedown() and c.MoJin
-		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0
+function s.filter2(c)
+	return c.MoJin and c:IsAbleToRemoveAsCost() and c:IsFaceup() and c:IsFaceup()
 end
 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,c)
-	if chk==0 then return g:CheckSubGroup(s.fselect,5,5,e,tp) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.filter1,tp,LOCATION_GRAVE+LOCATION_ONFIELD,LOCATION_GRAVE+LOCATION_ONFIELD,1,nil,e,tp) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g1=Duel.SelectMatchingCard(tp,s.filter1,tp,LOCATION_GRAVE+LOCATION_ONFIELD,LOCATION_GRAVE+LOCATION_ONFIELD,1,1,c,e,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local sg=g:SelectSubGroup(tp,s.fselect,false,5,5,e,tp)
-	Duel.Remove(sg,POS_FACEUP,REASON_COST)
+	local sg=g1:Clone()
+	sg:AddCard(c)
+	local g2=Duel.SelectMatchingCard(tp,s.filter2,tp,LOCATION_GRAVE+LOCATION_ONFIELD,LOCATION_GRAVE+LOCATION_ONFIELD,5,5,sg,e,tp)
+	g1:Merge(g2)
+	Duel.Remove(g1,POS_FACEUP,REASON_COST)
 end
 function s.filter(c,e,tp)
 	return c:IsFacedown() and c.MoJin

expansions/script/c5012622.lua

@@ -19,13 +19,12 @@ function s.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	--e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetRange(LOCATION_HAND)
-	--e3:SetCountLimit(1,id)
+	e3:SetCountLimit(1,id)
 	e3:SetCost(aux.bfgcost)
 	e3:SetTarget(s.target)
 	e3:SetOperation(s.operation)
 	c:RegisterEffect(e3)
 	local e4=e3:Clone()
-	e4:SetCode(EVENT_FREE_CHAIN)
 	e4:SetRange(LOCATION_GRAVE)
 	e4:SetCountLimit(1,id)
 	c:RegisterEffect(e4)
@@ -53,10 +52,10 @@ function s.val(e,c)
 	return ct+1
 end
 function s.mfilter1(c)
-	return c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
+	return c.MoJin==true and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function s.mfilter2(c)
-	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
+	return c.MoJin==true and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 end
 function s.sfselect(g,tp)
 	return Duel.IsExistingMatchingCard(s.synfilter,tp,LOCATION_EXTRA,0,1,nil,g)

expansions/script/c5012630.lua

@@ -78,7 +78,9 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local rc=c:GetReasonCard()
 	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(id,0))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)

expansions/script/c5012684.lua

@@ -131,7 +131,7 @@ function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 end
 function s.mtfilter(c,tp,e)
-	return c:IsImmuneToEffect(e) and (c:IsAbleToChangeControler() or c:IsControler(tp))
+	return not c:IsImmuneToEffect(e) and (c:IsAbleToChangeControler() or c:IsControler(tp))
 end
 function s.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c52700746.lua

@@ -65,17 +65,17 @@ function s.chainfilter(re,tp,cid)
 	return not re:IsHasCategory(CATEGORY_CONTROL) 
 end  
 --
-function s.cfilter(c)
+function s.cfilter(c,tp)
 	return c:IsFaceup() and c:IsFusionType(TYPE_MONSTER) and ((c:IsSetCard(0x3529) and c:IsRace(RACE_WYRM)) or c:GetOwner()==1-tp)
 end
 function s.cfilter2(c)
 	return c:IsFaceup() and c:IsFusionType(TYPE_MONSTER) and c:IsSetCard(0x3529) and c:IsRace(RACE_WYRM) and c:IsType(TYPE_FUSION)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) and not Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil,tp) and not Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil,tp) and Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_MZONE,0,1,nil)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c60010277.lua

@@ -6,7 +6,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCost(cm.cost)
+	--e1:SetCost(cm.cost)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
@@ -15,6 +15,7 @@ function cm.initial_effect(c)
 	e2:SetDescription(aux.Stringid(m,0))
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetCode(EFFECT_QP_ACT_IN_NTPHAND)
+	e2:SetCost(cm.cost)
 	e2:SetCondition(cm.handcon)
 	c:RegisterEffect(e2)
 end
@@ -45,9 +46,10 @@ function cm.handcon(e)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetTurnPlayer()==tp or Duel.IsExistingMatchingCard(cm.hcfil,tp,LOCATION_HAND,0,1,nil) end
-	if Duel.GetTurnPlayer()==tp then
 	e:SetLabel(1)
-	else
+	if Duel.GetTurnPlayer()~=tp then
+		--e:SetLabel(1)
+	--else
 		e:SetLabel(2)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
 		local g=Duel.GetMatchingGroup(cm.hcfil,tp,LOCATION_HAND,0,nil):Select(tp,1,1,nil)

expansions/script/c60151016.lua

@@ -76,8 +76,7 @@ function c60151016.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function c60151016.disop2(e,tp,eg,ep,ev,re,r,rp)
-	Duel.NegateActivation(ev)
-	if re:GetHandler():IsRelateToEffect(re) then
+	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
 		local tc=eg:GetFirst()
 		if tc:IsType(TYPE_SPELL+TYPE_TRAP) then
 			tc:CancelToGrave()
@@ -92,8 +91,7 @@ function c60151016.immcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentChain()<2 and e:GetHandler():GetMaterial():FilterCount(c60151016.ccfilter,nil)>0
 end
 function c60151016.efilter(e,te)
-	if te:IsActiveType(TYPE_SPELL+TYPE_TRAP) and te:IsHasType(EFFECT_TYPE_ACTIVATE) then return true end
-	if te:IsActiveType(TYPE_MONSTER) and te:IsActivated() then return true end
+	return te:GetOwner()~=e:GetOwner()
 end
 function c60151016.regcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)

expansions/script/c60151411.lua

@@ -76,7 +76,7 @@ function c60151411.eqop(e,tp,eg,ep,ev,re,r,rp)
 			tc:RegisterFlagEffect(60151411,RESET_EVENT+0x1fe0000,0,0)
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
-            e1:SetProperty(EFFECT_FLAG_COPY_INHERIT+EFFECT_FLAG_OWNER_RELATE)
+			e1:SetProperty(EFFECT_FLAG_OWNER_RELATE)
 			e1:SetCode(EFFECT_EQUIP_LIMIT)
 			e1:SetReset(RESET_EVENT+0x1fe0000)
 			e1:SetValue(c60151411.eqlimit)

expansions/script/c62699968.lua

@@ -17,6 +17,7 @@ function c62699968.initial_effect(c)
 	e1:SetCategory(CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,62699968)
 	e1:SetCondition(c62699968.descon)
 	e1:SetTarget(c62699968.destg)

expansions/script/c62699988.lua

@@ -24,7 +24,7 @@ function c62699988.initial_effect(c)
 	c:RegisterEffect(e00)
 	--set s/t
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_COUNTER)
+	e1:SetCategory(CATEGORY_COUNTER+CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
@@ -79,18 +79,27 @@ function c62699988.hspop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:SetMaterial(Group.FromCards(tc))
 	Duel.Release(tc,REASON_SPSUMMON)
 end
-function c62699988.setfilter(c)
-	return aux.IsCodeListed(c,0x16df) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable()
+function c62699988.setfilter(c,e,tp)
+	return aux.IsCodeListed(c,0x16df)
+		and (c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable()
+			or c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE) and Duel.GetMZoneCount(tp)>0)
 end
 function c62699988.settg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c62699988.setfilter,tp,LOCATION_DECK,0,1,nil)
+	if chk==0 then return Duel.IsExistingMatchingCard(c62699988.setfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
 		and Duel.IsExistingMatchingCard(Card.IsCanAddCounter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,0x16df,1) end
 end
 function c62699988.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
-	local tc=Duel.SelectMatchingCard(tp,c62699988.setfilter,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
-	if tc and Duel.SSet(tp,tc)>0 then
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
+	local tc=Duel.SelectMatchingCard(tp,c62699988.setfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp):GetFirst()
+	if tc then
+		local ck=0
+		if tc:IsType(0x1) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEDOWN_DEFENSE)>0 then
+			Duel.ConfirmCards(1-tp,tc)
+			ck=1
+		end
+		if tc:IsType(0x6) and Duel.SSet(tp,tc,tp,true)>0 then ck=1 end
+		if ck==1 then
 			local g=Duel.GetMatchingGroup(Card.IsCanAddCounter,tp,LOCATION_MZONE,LOCATION_MZONE,nil,0x16df,1)
 			local tc=g:GetFirst()
 			while tc do
@@ -111,6 +120,7 @@ function c62699988.setop(e,tp,eg,ep,ev,re,r,rp)
 				tc=g:GetNext()
 			end
 		end
+	end
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)

expansions/script/c79250019.lua

@@ -32,7 +32,7 @@ function s.initial_effect(c)
 end
 function s.chainfilter(re,tp,cid)
 	local rc=re:GetHandler()
-	return not re:IsActiveType(TYPE_MONSTER+TYPE_SPELL+TYPE_TRAP)
+	return re:IsActiveType(TYPE_MONSTER+TYPE_SPELL+TYPE_TRAP)
 end
 function s.lkfilter(g,lc)
 	return g:GetClassCount(Card.GetLinkCode)==g:GetCount()

expansions/script/c81902120.lua

@@ -99,10 +99,13 @@ function cm.actcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function cm.actcon1(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetTurnPlayer()==tp and not Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_MZONE,0,1,e:GetHandler(),TYPE_SYNCHRO)
+	return Duel.GetTurnPlayer()==tp and not Duel.IsExistingMatchingCard(cm.actfilter,tp,LOCATION_MZONE,0,1,e:GetHandler())
 end
 function cm.actcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_MZONE,0,1,e:GetHandler(),TYPE_SYNCHRO)
+	return Duel.IsExistingMatchingCard(cm.actfilter,tp,LOCATION_MZONE,0,1,e:GetHandler())
+end
+function cm.actfilter(c)
+	return c:IsType(TYPE_MONSTER) and c:IsType(TYPE_SYNCHRO) and c:IsFaceup()
 end
 function cm.thfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsAbleToHand()

expansions/script/c81907121.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+	e2:SetCode(EFFECT_IMMUNE_EFFECT)
 	e2:SetCondition(cm.intcon)
 	e2:SetValue(cm.efilter)
 	c:RegisterEffect(e2)

expansions/script/c99601011.lua

@@ -81,7 +81,7 @@ end
 function s.csso(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,s.tuner,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.tuner),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
 	if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
 		local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c99601012.lua

@@ -81,7 +81,7 @@ end
 function s.csso(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,s.tuner,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.tuner),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
 	if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
 		local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c99603001.lua

@@ -97,7 +97,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603002.lua

@@ -101,7 +101,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603003.lua

@@ -101,7 +101,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603004.lua

@@ -102,7 +102,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603005.lua

@@ -101,7 +101,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603006.lua

@@ -101,7 +101,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603007.lua

@@ -97,7 +97,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603008.lua

@@ -97,7 +97,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603009.lua

@@ -104,7 +104,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603010.lua

@@ -97,7 +97,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603011.lua

@@ -97,7 +97,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603012.lua

@@ -102,7 +102,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603013.lua

@@ -101,7 +101,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603014.lua

@@ -102,7 +102,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603015.lua

@@ -105,7 +105,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603016.lua

@@ -105,7 +105,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603018.lua

@@ -105,7 +105,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603019.lua

@@ -105,7 +105,7 @@ function s.allt(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function s.allo(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(s.kado,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.kado),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
 	Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
 end
 function s.kado(c)

expansions/script/c99603060.lua

@@ -36,8 +36,8 @@ function s.rider(c)
 	return c:IsFaceup() and c:IsCode(99603100)
 end
 function s.csso(e,tp,eg,ep,ev,re,r,rp)
-	local m=Duel.GetMatchingGroup(s.time,tp,LOCATION_GRAVE,0,nil,e,tp)
-	local w=Duel.GetMatchingGroup(s.time,tp,0,LOCATION_GRAVE,nil,e,tp)
+	local m=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.time),tp,LOCATION_GRAVE,0,nil,e,tp)
+	local w=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.time),tp,0,LOCATION_GRAVE,nil,e,tp)
 	local mz=Duel.GetLocationCount(m:GetFirst():GetOwner(),LOCATION_MZONE)
 	local wz=Duel.GetLocationCount(w:GetFirst():GetOwner(),LOCATION_MZONE)
 	if Duel.IsPlayerAffectedByEffect(tp,59822133) then

expansions/script/c99605000.lua

@@ -71,7 +71,8 @@ function s.dead(c,e,tp)
 end
 function s.sumo(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local g=eg:Filter(s.dead,nil,e,tp)
+	local g=eg:Filter(aux.NecroValleyFilter(s.dead),nil,e,tp)
+	if g:GetCount()<=0 then return end
 	local tc=g:GetFirst()
 	while tc do
 		local tp=tc:GetOwner()
@@ -120,7 +121,7 @@ function s.csso(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,s.rider,tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.rider),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end