Merge remote-tracking branch 'upstream/master' into develop

c27268998.lua

@@ -3,14 +3,6 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,89812483)
 	c:EnableReviveLimit()
-	--cannot spsummon
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e0:SetRange(LOCATION_HAND+LOCATION_DECK)
-	e0:SetValue(aux.FALSE)
-	c:RegisterEffect(e0)
 	--set
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))

c27704731.lua

@@ -3,14 +3,6 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,89812483)
 	c:EnableReviveLimit()
-	--cannot spsummon
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e0:SetRange(LOCATION_HAND+LOCATION_DECK)
-	e0:SetValue(aux.FALSE)
-	c:RegisterEffect(e0)
 	--set
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))

c80870883.lua

@@ -3,14 +3,6 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,89812483)
 	c:EnableReviveLimit()
-	--cannot spsummon
-	local e0=Effect.CreateEffect(c)
-	e0:SetType(EFFECT_TYPE_SINGLE)
-	e0:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e0:SetRange(LOCATION_HAND+LOCATION_DECK)
-	e0:SetValue(aux.FALSE)
-	c:RegisterEffect(e0)
 	--set
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))

c89812483.lua

@@ -23,9 +23,9 @@ function s.filter1(c,e,tp)
 		and Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp,1,c:GetLevel(),c:GetRace(),c:GetAttribute())
 end
 function s.filter2(c,e,tp,ft,lv,race,att)
-	return not c:IsSummonableCard() and aux.IsCodeListed(c,89812483) and c:IsType(TYPE_MONSTER)
-		and (not c:IsLocation(LOCATION_DECK+LOCATION_HAND) and c:IsCanBeSpecialSummoned(e,0,tp,true,false,POS_FACEUP)
-		or c.Metallization_material and c.Metallization_material(ft,lv,race,att) and c:IsCanBeSpecialSummoned(e,0,tp,true,true,POS_FACEUP))
+	if not (not c:IsSummonableCard() and aux.IsCodeListed(c,89812483) and c:IsType(TYPE_MONSTER)) then return false end
+	local proc=e:GetHandler():IsCode(id) and c.Metallization_material and c.Metallization_material(ft,lv,race,att)
+	return c:IsCanBeSpecialSummoned(e,0,tp,proc,proc,POS_FACEUP)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
@@ -49,7 +49,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter2),tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp,e:GetLabel()):GetFirst()
 	if tc and Duel.SpecialSummon(tc,0,tp,tp,true,true,POS_FACEUP)>0 then
-		tc:CompleteProcedure()
+		local proc=c:IsCode(id) and tc.Metallization_material and tc.Metallization_material(ft,lv,race,att)
+		if proc then tc:CompleteProcedure() end
 		if ft==1 and c:IsOnField() and c:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
 			Duel.BreakEffect()
 			c:CancelToGrave(true)

c9567495.lua

@@ -70,7 +70,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
 				e2:SetType(EFFECT_TYPE_SINGLE)
 				e2:SetCode(EFFECT_UPDATE_ATTACK)
 				e2:SetValue(ct*1000)
-				e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+				e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 				c:RegisterEffect(e2)
 				--atkdown
 				if not c:IsHasEffect(EFFECT_REVERSE_UPDATE) then
@@ -82,7 +82,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
 						e3:SetCode(EFFECT_UPDATE_ATTACK)
 						e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 						e3:SetValue(-ct*1000)
-						e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+						e3:SetReset(RESET_EVENT+RESETS_STANDARD)
 						tc:RegisterEffect(e3)
 						tc=g:GetNext()
 					end

c9831539.lua

@@ -10,11 +10,11 @@ function c9831539.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c9831539.filter1(c,tp)
-	return c:IsLevelAbove(1) and c:IsAttackBelow(1000)
+	return c:IsLevelAbove(1) and c:IsAttackBelow(1000) and c:IsFaceup()
 		and Duel.IsExistingTarget(c9831539.filter2,tp,LOCATION_MZONE,0,1,c,c:GetRace())
 end
 function c9831539.filter2(c,rac)
-	return c:IsLevelAbove(1) and c:IsAttackBelow(1000) and c:IsRace(rac)
+	return c:IsLevelAbove(1) and c:IsAttackBelow(1000) and c:IsFaceup() and c:IsRace(rac)
 end
 function c9831539.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end