Merge branch 'master' of https://code.mycard.moe/alstroemeria-silentlove/ygopro-222DIY-cards

expansions/script/c16372014.lua

@@ -121,7 +121,7 @@ function c16372014.setop2(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_SZONE)<1 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c16372014.setfilter),tp,LOCATION_GRAVE,0,1,1,nil):GetFirst()
-	if tc and Duel.MoveToField(tc,tp,p,LOCATION_SZONE,POS_FACEUP,true) then
+	if tc and Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_CHANGE_TYPE)

expansions/script/c16372019.lua

@@ -52,8 +52,7 @@ function c16372019.bfgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
 end
 function c16372019.ffilter(c,e,tp)
-	return c:IsType(TYPE_FUSION)
-		and Duel.IsExistingMatchingCard(c16372019.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,c,e,tp)
+	return Duel.IsExistingMatchingCard(c16372019.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,c,e,tp)
 end
 function c16372019.spfilter(c,fc,e,tp)
 	return aux.IsCodeListed(fc,c:GetCode()) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c4202048.lua

@@ -46,6 +46,12 @@ function cm.initial_effect(c)
 		end
 	end)
 	Duel.RegisterEffect(e3,0)
+	--spsummon
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_SINGLE)
+	e4:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
+	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	c:RegisterEffect(e4)
 	--spsummon cost
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c79100300.lua

@@ -22,7 +22,7 @@ local e2=Effect.CreateEffect(c)
 	c:RegisterEffect(e2)
 end
 function cm.filter0(c)
-	return c:IsAbleToRemove() and c:IsLocation(LOCATION_MZONE)
+	return c:IsAbleToRemove()
 end
 function cm.filter1(c,e)
 	return c:IsAbleToRemove() and not c:IsImmuneToEffect(e)