"Dogmatikalamity" fix

The Extra Deck restriction shouldn't be applied if its effect is applied with a card such as "End of the World Ruler", but should be applied normally with a card such as "Urgent Ritual Art".

Author: pyrQ

official/c31002402.lua

@@ -3,40 +3,42 @@
 --scripted by edo9300
 local s,id=GetID()
 function s.initial_effect(c)
-	local e1=Ritual.CreateProc({handler=c,lvtype=RITPROC_EQUAL,filter=aux.FilterBoolFunction(Card.IsSetCard,SET_DOGMATIKA),extrafil=s.extragroup,
-								extraop=s.extraop,stage2=s.stage2,forcedselection=s.ritcheck})
+	--Ritual Summon any "Dogmatika" Ritual Monster
+	local e1=Ritual.CreateProc({
+				handler=c,
+				lvtype=RITPROC_EQUAL,
+				filter=function(c) return c:IsSetCard(SET_DOGMATIKA) end,
+				extrafil=function(e,tp) return Duel.GetMatchingGroup(aux.AND(Card.HasLevel,Card.IsAbleToGrave),tp,LOCATION_EXTRA,0,nil) end,
+				extraop=s.extraop,
+				stage2=s.stage2,
+				forcedselection=s.ritcheck
+	})
 	e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH)
 	c:RegisterEffect(e1)
 end
 s.listed_series={SET_DOGMATIKA}
-function s.matfilter1(c)
-	return c:IsAbleToGrave() and c:IsLevelAbove(1)
-end
-function s.extragroup(e,tp,eg,ep,ev,re,r,rp,chk)
-	return Duel.GetMatchingGroup(s.matfilter1,tp,LOCATION_EXTRA,0,nil)
-end
 function s.extraop(mat,e,tp,eg,ep,ev,re,r,rp,tc)
-	local mat2=mat:Filter(Card.IsLocation,nil,LOCATION_EXTRA)
-	mat:Sub(mat2)
-	Duel.ReleaseRitualMaterial(mat)
-	Duel.SendtoGrave(mat2,REASON_EFFECT+REASON_MATERIAL+REASON_RITUAL)
+	local extra_mat=mat:Filter(Card.IsLocation,nil,LOCATION_EXTRA)
+	if #extra_mat>0 then
+		Duel.SendtoGrave(extra_mat,REASON_EFFECT|REASON_MATERIAL|REASON_RITUAL)
+	else
+		Duel.ReleaseRitualMaterial(mat)
+	end
 end
 function s.stage2(mat,e,tp,eg,ep,ev,re,r,rp,tc)
-	local e0=Effect.CreateEffect(e:GetHandler())
-	e0:SetType(EFFECT_TYPE_FIELD)
-	e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
-	e0:SetDescription(aux.Stringid(id,0))
-	e0:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e0:SetReset(RESET_PHASE|PHASE_END|RESET_SELF_TURN)
-	e0:SetTargetRange(1,0)
-	e0:SetTarget(s.splimit)
-	Duel.RegisterEffect(e0,tp)
-end
-function s.splimit(e,c,sump,sumtype,sumpos,targetp)
-	return c:IsLocation(LOCATION_EXTRA)
+	if not e:IsHasType(EFFECT_TYPE_ACTIVATE) then return end
+	--For the rest of this turn after this card resolves, you cannot Special Summon monsters from the Extra Deck
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
+	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e1:SetTargetRange(1,0)
+	e1:SetTarget(function(e,c) return c:IsLocation(LOCATION_EXTRA) end)
+	e1:SetReset(RESET_PHASE|PHASE_END)
+	Duel.RegisterEffect(e1,tp)
 end
 function s.ritcheck(e,tp,g,sc)
-	local extrac=g:FilterCount(Card.IsLocation,nil,LOCATION_EXTRA)
-	local gc=#g
-	return extrac==0 or extrac==1 and gc==1,extrac>1 or extrac==1 and gc>1
-end
+	local extra_ct=g:FilterCount(Card.IsLocation,nil,LOCATION_EXTRA)
+	return extra_ct==0 or #g==1,extra_ct>1 or (extra_ct==1 and #g>1)
+end