Merge branch 'new-fusion-Clock-Lizard' into 'master'

Add クロック・リザード + add e,tp to fusfilter, and skip_summon_check to params

See merge request !52

c51476410.lua

 --クロック・リザード
-function c51476410.initial_effect(c)
+local s,id,o=GetID()
+function s.initial_effect(c)
 	--link summon
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_CYBERSE),2,2)
 	--fusion summon
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(51476410,0))
+	local e1=FusionSpell.CreateSummonEffect(c,{
+		fusfilter=s.fusfilter,
+		pre_select_mat_location=LOCATION_GRAVE,
+		fuslocation=LOCATION_GRAVE,
+		mat_operation_code_map={
+			{ [LOCATION_REMOVED]=FusionSpell.FUSION_OPERATION_GRAVE },
+			{ [0xff]=FusionSpell.FUSION_OPERATION_BANISH }
+		},
+		extra_target=s.extra_target,
+		stage_x_operation=s.stage_x_operation,
+		skip_summon_check=true
+	})
+	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetCategory(CATEGORY_TOEXTRA+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetCost(c51476410.spcost)
-	e1:SetTarget(c51476410.sptg)
-	e1:SetOperation(c51476410.spop)
+	e1:SetCost(s.spcost)
 	c:RegisterEffect(e1)
 	--remove
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(51476410,1))
+	e2:SetDescription(aux.Stringid(id,1))
 	e2:SetCategory(CATEGORY_ATKCHANGE)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_REMOVE)
-	e2:SetCondition(c51476410.atkcon)
-	e2:SetTarget(c51476410.atktg)
-	e2:SetOperation(c51476410.atkop)
+	e2:SetCondition(s.atkcon)
+	e2:SetTarget(s.atktg)
+	e2:SetOperation(s.atkop)
 	c:RegisterEffect(e2)
 end
-function c51476410.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+
+function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsReleasable() end
 	Duel.Release(e:GetHandler(),REASON_COST)
 end
-function c51476410.spfilter0(c)
-	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
+
+--- @param c Card
+function s.fusfilter(c,e,tp)
+	--- FIXME: this is just ignore revive limit
+	--- If player is under different oath about monsters can be special summoned from Grave and Extra deck, this will fail
+	--- e.g. 嗤う黒山羊, ヴァリアンツ etc
+	return c:IsAbleToExtra() and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,true)
 end
-function c51476410.spfilter1(c,e)
-	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
-end
-function c51476410.spfilter2(c,e,tp,m,f,chkf)
-	return (not f or f(c)) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,true) and c:CheckFusionMaterial(m,nil,chkf)
-end
-function c51476410.spfilter3(c,e,tp,chkf,rc)
-	if not c:IsType(TYPE_FUSION) or not c:IsAbleToExtra() then return false end
-	if Duel.GetLocationCountFromEx(tp,tp,rc,TYPE_FUSION)<=0 then return false end
-	local mg=Duel.GetMatchingGroup(c51476410.spfilter0,tp,LOCATION_GRAVE,0,c)
-	local res=c51476410.spfilter2(c,e,tp,mg,nil,chkf)
-	if not res then
-		local ce=Duel.GetChainMaterial(tp)
-		if ce~=nil then
-			local fgroup=ce:GetTarget()
-			local mg2=fgroup(ce,e,tp)
-			local mf=ce:GetValue()
-			res=c51476410.spfilter2(c,e,tp,mg,mf,chkf)
-		end
+
+function s.extra_target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		return true
 	end
-	return res
-end
-function c51476410.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	local chkf=PLAYER_NONE
-	if chk==0 then return Duel.IsPlayerCanRemove(tp)
-		and Duel.IsExistingMatchingCard(c51476410.spfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp,chkf,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOEXTRA,nil,1,tp,LOCATION_GRAVE)
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
-function c51476410.spop(e,tp,eg,ep,ev,re,r,rp)
-	if not Duel.IsPlayerCanRemove(tp) then return end
-	local chkf=tp
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
-	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c51476410.spfilter3),tp,LOCATION_GRAVE,0,1,1,nil,e,tp,chkf,nil)
-	local tc=g:GetFirst()
-	if tc and Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_EXTRA) then
-		local mg1=Duel.GetMatchingGroup(c51476410.spfilter1,tp,LOCATION_GRAVE,0,nil,e)
-		local mgchk1=c51476410.spfilter2(tc,e,tp,mg1,nil,chkf)
-		local mg2=nil
-		local mgchk2=false
-		local ce=Duel.GetChainMaterial(tp)
-		if ce~=nil then
-			local fgroup=ce:GetTarget()
-			mg2=fgroup(ce,e,tp)
-			local mf=ce:GetValue()
-			mgchk2=c51476410.spfilter2(tc,e,tp,mg2,mf,chkf)
+
+--- @type FUSION_SPELL_STAGE_X_CALLBACK_FUNCTION
+function s.stage_x_operation(e,tc,tp,stage)
+	if stage==FusionSpell.STAGE_BEFORE_MOVE_MATERIAL then
+		Duel.HintSelection(Group.FromCards(tc))
+		if Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)==0 then
+			return false
 		end
-		if mgchk1 or mgchk2 then
-			if mgchk1 and (not mgchk2 or not Duel.SelectYesNo(tp,ce:GetDescription())) then
-				local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
-				tc:SetMaterial(mat1)
-				Duel.Remove(mat1,POS_FACEUP,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
-				Duel.BreakEffect()
-				Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
-			else
-				local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf)
-				local fop=ce:GetOperation()
-				fop(ce,e,tp,tc,mat2)
-			end
-			tc:CompleteProcedure()
+		if not tc:IsLocation(LOCATION_EXTRA) then
+			return false
 		end
+		Duel.BreakEffect()
+		return true
 	end
 end
-function c51476410.atkcon(e,tp,eg,ep,ev,re,r,rp)
+
+function s.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return c:IsFaceup() and c:IsPreviousLocation(LOCATION_GRAVE)
 end
-function c51476410.atkfilter(c)
+
+function s.atkfilter(c)
 	return c:IsFaceup() and c:IsSummonType(SUMMON_TYPE_SPECIAL)
 end
-function c51476410.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
+
+function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsRace,tp,LOCATION_GRAVE,0,1,nil,RACE_CYBERSE)
-		and Duel.IsExistingMatchingCard(c51476410.atkfilter,tp,0,LOCATION_MZONE,1,nil) end
+		and Duel.IsExistingMatchingCard(s.atkfilter,tp,0,LOCATION_MZONE,1,nil) end
 end
-function c51476410.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(c51476410.atkfilter,tp,0,LOCATION_MZONE,nil)
+
+function s.atkop(e,tp,eg,ep,ev,re,r,rp)
+	local g=Duel.GetMatchingGroup(s.atkfilter,tp,0,LOCATION_MZONE,nil)
 	if g:GetCount()==0 then return end
 	local atk=Duel.GetMatchingGroupCount(Card.IsRace,tp,LOCATION_GRAVE,0,nil,RACE_CYBERSE)*400
 	local tc=g:GetFirst()