hole

expansions/script/c81040041.lua

@@ -5,8 +5,8 @@ function c81040041.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetTarget(c81040041.target)
-	e1:SetOperation(c81040041.activate)
+	e1:SetTarget(cm.target)
+	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
@@ -19,35 +19,41 @@ function c81040041.initial_effect(c)
 	e2:SetOperation(c81040041.setop)
 	c:RegisterEffect(e2)
 end
-function c81040041.filter(c,e,tp)
+function cm.filter(c,e,tp)
 	return c:IsSetCard(0x81c)
 end
-function c81040041.cfilter(c)
-	return c:IsFacedown() or not (c:IsFaceup() and c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER))
+function cm.cfilter(c)
+	return c:IsFaceup() and c:IsType(TYPE_RITUAL)
 end
-function c81040041.mfilter(c)
+function cm.mfilter(c)
 	return c:IsSetCard(0x81c)
 end
-function c81040041.target(e,tp,eg,ep,ev,re,r,rp,chk)
+function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		local mg=Duel.GetRitualMaterial(tp)
 		local mg2=nil
-		if Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)>0 and not Duel.IsExistingMatchingCard(c81040041.cfilter,tp,LOCATION_MZONE,0,1,nil) then
-			e:SetLabel(1)
-			mg2=Duel.GetMatchingGroup(aux.RitualExtraFilter,tp,LOCATION_GRAVE,0,nil,c81040041.mfilter)
+		local ug=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)
+		if ug:GetCount()>0 and ug:FilterCount(cm.cfilter,nil)==sg:GetCount() then
+			mg2=Duel.GetMatchingGroup(aux.RitualExtraFilter,tp,LOCATION_GRAVE,0,nil,cm.mfilter)
 		end
-		return Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,c81040041.filter,e,tp,mg,mg2,Card.GetLevel,"Greater")
+		return Duel.IsExistingMatchingCard(aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,nil,cm.filter,e,tp,mg,mg2,Card.GetLevel,"Greater")
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+	if ug:GetCount()>0 and ug:FilterCount(cm.cfilter,nil)==sg:GetCount() then
+		Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,0,tp,LOCATION_GRAVE)
+		e:SetLabel(1)
+	else
+		e:SetLabel(0)
+	end
 end
-function c81040041.activate(e,tp,eg,ep,ev,re,r,rp)
+function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local mg=Duel.GetRitualMaterial(tp)
 	local mg2=nil
 	if e:GetLabel()==1 then
-		mg2=Duel.GetMatchingGroup(aux.RitualExtraFilter,tp,LOCATION_GRAVE,0,nil,c81040041.mfilter)
+		mg2=Duel.GetMatchingGroup(aux.RitualExtraFilter,tp,LOCATION_GRAVE,0,nil,cm.mfilter)
 	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,c81040041.filter,e,tp,mg,mg2,Card.GetLevel,"Greater")
+	local tg=Duel.SelectMatchingCard(tp,aux.RitualUltimateFilter,tp,LOCATION_HAND,0,1,1,nil,cm.filter,e,tp,mg,mg2,Card.GetLevel,"Greater")
 	local tc=tg:GetFirst()
 	if tc then
 		mg=mg:Filter(Card.IsCanBeRitualMaterial,tc,tc)

expansions/script/c81040069.lua

@@ -62,7 +62,7 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_GRAVE)
 end
 function cm.thfilter(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand() and not c:IsType(TYPE_RITUAL)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand() and not c:IsType(TYPE_RITUAL) and c:IsSetCard(0x81c)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end