Merge branch 'patch-2' into 'master'

Fix スクラップ・シンクロン

See merge request !219

script/c100244004.lua

@@ -17,20 +17,36 @@ function s.initial_effect(c)
 	e1:SetCountLimit(1,id)
 	e1:SetValue(s.matval)
 	c:RegisterEffect(e1)
-	--destroy replace
+	--register HOpT
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EFFECT_DESTROY_REPLACE)
-	e2:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
-	e2:SetCountLimit(1,id+o)
-	e2:SetTarget(s.reptg)
-	e2:SetValue(s.repval)
-	e2:SetOperation(s.repop)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_BE_PRE_MATERIAL)
+	e2:SetProperty(EFFECT_FLAG_EVENT_PLAYER+EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetLabelObject(e1)
+	e2:SetCondition(s.hsyncon)
+	e2:SetOperation(s.hsynreg)
 	c:RegisterEffect(e2)
+	--destroy replace
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e3:SetCode(EFFECT_DESTROY_REPLACE)
+	e3:SetRange(LOCATION_MZONE+LOCATION_GRAVE)
+	e3:SetCountLimit(1,id+o)
+	e3:SetTarget(s.reptg)
+	e3:SetValue(s.repval)
+	e3:SetOperation(s.repop)
+	c:RegisterEffect(e3)
 end
 function s.matval(e,c)
 	return c:IsType(TYPE_SYNCHRO) and aux.IsMaterialListSetCard(c,0x1017)
 end
+function s.hsyncon(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return r==REASON_SYNCHRO and s.matval(nil,c:GetReasonCard()) and c:IsPreviousLocation(LOCATION_HAND)
+end
+function s.hsynreg(e,tp,eg,ep,ev,re,r,rp)
+	e:GetLabelObject():UseCountLimit(tp)
+end
 function s.repfilter(c,tp)
 	return c:IsFaceup() and (c:IsOriginalSetCard(0x66) and c:IsType(TYPE_SYNCHRO)
 		or aux.IsCodeListed(c,60800381) and c:IsType(TYPE_MONSTER))