fix ritual summon

c11398951.lua

@@ -22,6 +22,7 @@ function c11398951.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		return Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,c11398951.filter,e,tp,mg1,mg2,Card.GetLevel,"Equal")
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,0,tp,LOCATION_GRAVE)
 end
 function c11398951.activate(e,tp,eg,ep,ev,re,r,rp)
 	local mg1=Duel.GetRitualMaterial(tp)

c23160024.lua

@@ -28,14 +28,11 @@ function c23160024.initial_effect(c)
 	e4:SetOperation(c23160024.drop)
 	c:RegisterEffect(e4)
 	--ritural
-	local e5=Effect.CreateEffect(c)
-	e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	local e5=aux.AddRitualProcEqualCode(c,98287529,nil,nil,c23160024.mfilter)
 	e5:SetType(EFFECT_TYPE_IGNITION)
+	e5:SetCode(0)
 	e5:SetRange(LOCATION_GRAVE)
 	e5:SetCost(aux.bfgcost)
-	e5:SetTarget(c23160024.sptg)
-	e5:SetOperation(c23160024.spop)
-	c:RegisterEffect(e5)
 end
 function c23160024.cfilter(c,tp)
 	return c:IsPreviousSetCard(0xe0) and c:IsReason(REASON_RELEASE) and c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp
@@ -47,37 +44,6 @@ function c23160024.drop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,e:GetHandler():GetCode())
 	Duel.Draw(tp,1,REASON_EFFECT)
 end
-function c23160024.spfilter(c,e,tp)
-	return c:IsCode(98287529)
-end
-function c23160024.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then
-		local mg=Duel.GetRitualMaterial(tp):Filter(Card.IsType,nil,TYPE_PENDULUM)
-		return Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,c23160024.spfilter,e,tp,mg,nil,Card.GetOriginalLevel,"Equal")
-	end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
-end
-function c23160024.spop(e,tp,eg,ep,ev,re,r,rp)
-	local mg=Duel.GetRitualMaterial(tp):Filter(Card.IsType,nil,TYPE_PENDULUM)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,c23160024.spfilter,e,tp,mg,nil,Card.GetOriginalLevel,"Equal")
-	local tc=g:GetFirst()
-	if tc then
-		mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc)
-		if tc.mat_filter then
-			mg=mg:Filter(tc.mat_filter,tc,tp)
-		else
-			mg:RemoveCard(tc)
-		end
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
-		aux.GCheckAdditional=aux.RitualCheckAdditional(tc,tc:GetOriginalLevel(),"Equal")
-		local mat=mg:SelectSubGroup(tp,aux.RitualCheck,false,1,tc:GetOriginalLevel(),tp,tc,tc:GetOriginalLevel(),"Equal")
-		aux.GCheckAdditional=nil
-		if not mat or mat:GetCount()==0 then return end
-		tc:SetMaterial(mat)
-		Duel.ReleaseRitualMaterial(mat)
-		Duel.BreakEffect()
-		Duel.SpecialSummon(tc,SUMMON_TYPE_RITUAL,tp,tp,false,true,POS_FACEUP)
-		tc:CompleteProcedure()
-	end
+function c23160024.mfilter(c)
+	return c:IsType(TYPE_PENDULUM)
 end

c32828635.lua

 --エンドレス・オブ・ザ・ワールド
 function c32828635.initial_effect(c)
-	--Activate
-	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetTarget(c32828635.target)
-	e1:SetOperation(c32828635.activate)
-	c:RegisterEffect(e1)
+	aux.AddRitualProcGreater2Code2(c,46427957,72426662,nil,nil,c73055622.mfilter)
 	--salvage
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(32828635,0))
@@ -20,41 +13,8 @@ function c32828635.initial_effect(c)
 	e2:SetOperation(c32828635.thop)
 	c:RegisterEffect(e2)
 end
-c32828635.fit_monster={46427957,72426662}
-function c32828635.cfilter(c,e,tp)
-	return c:IsCode(46427957,72426662)
-end
-function c32828635.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then
-		local mg1=Duel.GetRitualMaterial(tp)
-		mg1:Remove(Card.IsLocation,nil,LOCATION_HAND)
-		return Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,c32828635.cfilter,e,tp,mg1,nil,Card.GetLevel,"Greater")
-	end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
-end
-function c32828635.activate(e,tp,eg,ep,ev,re,r,rp)
-	local mg1=Duel.GetRitualMaterial(tp)
-	mg1:Remove(Card.IsLocation,nil,LOCATION_HAND)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,c32828635.cfilter,e,tp,mg1,nil,Card.GetLevel,"Greater")
-	local tc=tg:GetFirst()
-	if tc then
-		local mg=mg1:Filter(Card.IsCanBeRitualMaterial,tc,tc)
-		if tc.mat_filter then
-			mg=mg:Filter(tc.mat_filter,tc,tp)
-		else
-			mg:RemoveCard(tc)
-		end
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
-		aux.GCheckAdditional=aux.RitualCheckAdditional(tc,tc:GetLevel(),"Greater")
-		local mat=mg:SelectSubGroup(tp,aux.RitualCheck,false,1,tc:GetLevel(),tp,tc,tc:GetLevel(),"Greater")
-		aux.GCheckAdditional=nil
-		if not mat or mat:GetCount()==0 then return end
-		tc:SetMaterial(mat)
-		Duel.ReleaseRitualMaterial(mat)
-		Duel.SpecialSummon(tc,SUMMON_TYPE_RITUAL,tp,tp,false,true,POS_FACEUP)
-		tc:CompleteProcedure()
-	end
+function c32828635.mfilter(c)
+	return not c:IsLocation(LOCATION_HAND)
 end
 function c32828635.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end

c38784726.lua

@@ -39,6 +39,7 @@ function c38784726.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		return Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,c38784726.filter,e,tp,mg,mg2,Card.GetLevel,"Greater")
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,0,tp,LOCATION_GRAVE)
 end
 function c38784726.activate(e,tp,eg,ep,ev,re,r,rp)
 	local mg=Duel.GetRitualMaterial(tp)

c81306186.lua

@@ -65,6 +65,7 @@ function c81306186.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		e:SetCategory(CATEGORY_SPECIAL_SUMMON)
 		e:SetOperation(c81306186.spop)
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,tc,1,0,0)
+		Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,0,tp,LOCATION_GRAVE)
 	else
 		e:SetCategory(CATEGORY_TOHAND)
 		e:SetOperation(c81306186.thop)

c95612049.lua

 --リバース・オブ・ザ・ワールド
 function c95612049.initial_effect(c)
 	--Activate
-	local e1=aux.AddRitualProcGreater2(c,c95612049.filter,LOCATION_HAND+LOCATION_DECK,nil,c95612049.mfilter)
+	local e1=aux.AddRitualProcGreater2Code2(c,46427957,72426662,LOCATION_HAND+LOCATION_DECK,nil,c95612049.mfilter)
 	e1:SetCountLimit(1,95612049+EFFECT_COUNT_CODE_OATH)
 end
 function c95612049.mfilter(c)
-	return c:IsLocation(LOCATION_HAND) and c:IsType(TYPE_RITUAL)
-end
-function c95612049.filter(c)
-	return c:IsCode(72426662,46427957)
+	return not c:IsOnField() and c:IsType(TYPE_RITUAL)
 end

utility.lua

@@ -1587,6 +1587,9 @@ function Auxiliary.RitualUltimateTarget(filter,level_function,greater_or_equal,s
 					return Duel.IsExistingMatchingCard(Auxiliary.RitualUltimateFilter,tp,summon_location,0,1,nil,filter,e,tp,mg,exg,level_function,greater_or_equal)
 				end
 				Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,summon_location)
+				if grave_filter then
+					Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,0,tp,LOCATION_GRAVE)
+				end
 			end
 end
 function Auxiliary.RitualUltimateOperation(filter,level_function,greater_or_equal,summon_location,grave_filter,mat_filter)