Update mechanism for marking effects ("register flags")

constant.lua

@@ -980,13 +980,20 @@ EFFECT_SFORCE_REPLACE        = 55049722 --Uses "S-Force Chase"'s code, but it is
 EFFECT_SUPREME_CASTLE        = 72043279
 EFFECT_SYNSUB_NORDIC         = 61777313
 EFFECT_WITCHCRAFTER_REPLACE  = 83289866
---Flags for Card.RegisterEffect
-REGISTER_FLAG_DETACH_XMAT  = 1
-REGISTER_FLAG_CARDIAN      = 2
-REGISTER_FLAG_THUNDRA      = 4
-REGISTER_FLAG_ALLURE_LVUP  = 8
-REGISTER_FLAG_TELLAR       = 16
-REGISTER_FLAG_DRAGON_RULER = 32
+--Effect markers
+EFFECT_MARKER_DETACH_XMAT  = 511002571
+EFFECT_MARKER_CARDIAN      = 511001692
+EFFECT_MARKER_THUNDRA      = 12081875
+EFFECT_MARKER_ALLURE_LVUP  = 511310036
+EFFECT_MARKER_TELLAR       = 58858807
+EFFECT_MARKER_DRAGON_RULER = 4965193
+--Old names for effect markers (deprecated; new ones should NOT be added here)
+REGISTER_FLAG_DETACH_XMAT  = EFFECT_MARKER_DETACH_XMAT
+REGISTER_FLAG_CARDIAN      = EFFECT_MARKER_CARDIAN
+REGISTER_FLAG_THUNDRA      = EFFECT_MARKER_THUNDRA
+REGISTER_FLAG_ALLURE_LVUP  = EFFECT_MARKER_ALLURE_LVUP
+REGISTER_FLAG_TELLAR       = EFFECT_MARKER_TELLAR
+REGISTER_FLAG_DRAGON_RULER = EFFECT_MARKER_DRAGON_RULER
 --Flags for the various filters in the fusion procedure
 FUSPROC_NOTFUSION  = 0x100
 FUSPROC_CONTACTFUS = 0x200

goat/c504700054.lua

@@ -12,7 +12,7 @@ function s.initial_effect(c)
 	e1:SetCost(s.cost)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_THUNDRA)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_THUNDRA)
 end
 s.listed_names={31786629}
 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)

official/c10000030.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	e1:SetCost(s.effcost)
 	e1:SetTarget(s.efftg)
 	e1:SetOperation(s.effop)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.effcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

official/c10389142.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	e1:SetCost(s.spcost)
 	e1:SetTarget(s.sptg)
 	e1:SetOperation(s.spop)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.listed_names={10389143}
 s.xyz_number=42

official/c10406322.lua

@@ -28,7 +28,7 @@ function s.initial_effect(c)
 	e2:SetCost(Cost.Detach(1,1,nil))
 	e2:SetTarget(s.tdtg)
 	e2:SetOperation(s.tdop)
-	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,1) end

official/c10443957.lua

@@ -34,7 +34,7 @@ function s.initial_effect(c)
 	e3:SetCost(Cost.Detach(1))
 	e3:SetTarget(s.distg)
 	e3:SetOperation(s.disop)
-	c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.listed_names={58069384}
 function s.mfilter(c,xyz,sumtype,tp)

official/c1050186.lua

@@ -12,7 +12,7 @@ function s.initial_effect(c)
 	e1:SetCountLimit(1,id)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR)
 	local e2=e1:Clone()
 	e2:SetCode(EVENT_FLIP_SUMMON_SUCCESS)
 	c:RegisterEffect(e2)

official/c10613952.lua

@@ -27,7 +27,7 @@ function s.initial_effect(c)
 	e2:SetCost(Cost.Detach(1))
 	e2:SetTarget(s.destg)
 	e2:SetOperation(s.desop)
-	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT)
 	--spsummon
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,2))

official/c10666000.lua

@@ -41,7 +41,7 @@ function s.initial_effect(c)
 	e3:SetCost(Cost.Detach(1,1,nil))
 	e3:SetTarget(s.destg)
 	e3:SetOperation(s.desop)
-	c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.xyz_number=1
 function s.mattg(e,tp,eg,ep,ev,re,r,rp,chk)

official/c10678778.lua

@@ -28,7 +28,7 @@ function s.initial_effect(c)
 	e2:SetCost(Cost.Detach(1))
 	e2:SetTarget(s.destg)
 	e2:SetOperation(s.desop)
-	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.rmfilter(c)
 	return c:IsFacedown() and c:IsAbleToRemove()

official/c11398059.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(1))
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.filter(c)
 	return c:IsRace(RACE_REPTILE) and c:IsAbleToHand()

official/c11411223.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(1,1,nil))
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.xyz_number=10
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)

official/c11441009.lua

@@ -17,7 +17,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.AND(Cost.PayLP(600),Cost.Detach(1)))
 	e1:SetTarget(s.drtg)
 	e1:SetOperation(s.drop)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 	--Negate the activation of another monster's effect, and if you do, destroy that monster
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))

official/c11510448.lua

@@ -27,7 +27,7 @@ function s.initial_effect(c)
 	e3:SetCost(Cost.Detach(1))
 	e3:SetTarget(s.target)
 	e3:SetOperation(s.operation)
-	c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.listed_series={SET_ZOODIAC}
 function s.ovfilter(c,tp,lc)

official/c11522979.lua

@@ -27,7 +27,7 @@ function s.initial_effect(c)
 	e2:SetCost(Cost.Detach(1))
 	e2:SetTarget(s.target)
 	e2:SetOperation(s.operation)
-	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.xyz_number=69
 s.listed_names={2407234}

official/c11646785.lua

@@ -23,7 +23,7 @@ function s.initial_effect(c)
 	e2:SetCost(Cost.Detach(1))
 	e2:SetTarget(s.settg)
 	e2:SetOperation(s.setop)
-	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT)
 	--This is a Quick effect if this card has "Super Quantum Green Layer" as Xyz Material
 	local e3=e2:Clone()
 	e3:SetType(EFFECT_TYPE_QUICK_O)

official/c12014404.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(1,1,nil))
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

official/c12081875.lua

@@ -4,117 +4,88 @@
 local s,id=GetID()
 function s.initial_effect(c)
 	c:EnableReviveLimit()
+	--Link Summon procedure: 2+ Thunder monsters
 	Link.AddProcedure(c,aux.FilterBoolFunctionEx(Card.IsRace,RACE_THUNDER),2)
-	--Apply the effect of 1 "Thunder Dragon" monster
+	--Apply 1 "Thunder Dragon" monster's effect that discards itself to activate, then place that monster on the top or bottom of your Deck
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetCategory(CATEGORY_TODECK)
 	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetRange(LOCATION_MZONE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,id)
-	e1:SetCondition(s.condition)
-	e1:SetTarget(s.target)
-	e1:SetOperation(s.operation)
+	e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end)
+	e1:SetTarget(s.applytg)
+	e1:SetOperation(s.applyop)
 	c:RegisterEffect(e1)
-	--Destruction replacement
+	--If a Thunder monster(s) you control would be destroyed by battle or card effect, you can banish 3 cards from your GY instead
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EFFECT_DESTROY_REPLACE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTarget(s.reptg)
-	e2:SetValue(s.repval)
+	e2:SetValue(function(e,c) return s.repfilter(c,e:GetHandlerPlayer()) end)
 	c:RegisterEffect(e2)
 end
 s.listed_series={SET_THUNDER_DRAGON}
-function s.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsLinkSummoned()
+function s.runfn(fn,eff,tp,chk)
+	return not fn or fn(eff,tp,Group.CreateGroup(),PLAYER_NONE,0,nil,REASON_EFFECT,PLAYER_NONE,chk)
 end
-function s.filter(c,e,tp)
+function s.applyfilter(c,e,tp)
 	if not (c:IsSetCard(SET_THUNDER_DRAGON) and c:IsMonster()
 		and (c:IsFaceup() or not c:IsLocation(LOCATION_REMOVED))
-		and c:IsHasEffect(id) and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()) then 
+		and c:IsHasEffect(EFFECT_MARKER_THUNDRA) and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()) then
 		return false
 	end
-	local eff={c:GetCardEffect(id)}
-	for _,teh in ipairs(eff) do
-		local te=teh:GetLabelObject()
-		local con=te:GetCondition()
-		local tg=te:GetTarget()
-		if (not con or con(te,tp,Group.CreateGroup(),PLAYER_NONE,0,teh,REASON_EFFECT,PLAYER_NONE,0)) 
-			and (not tg or tg(te,tp,Group.CreateGroup(),PLAYER_NONE,0,teh,REASON_EFFECT,PLAYER_NONE,0)) then return true end
+	for _,eff in ipairs(c:GetMarkedEffects(EFFECT_MARKER_THUNDRA)) do
+		if s.runfn(eff:GetCondition(),eff,tp,0) and s.runfn(eff:GetTarget(),eff,tp,0) then return true end
 	end
-	return false
 end
-function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE|LOCATION_REMOVED) and chkc:IsControler(tp) and s.filter(chkc,e,tp) end
-	if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE|LOCATION_REMOVED,0,1,nil,e,tp) end
+function s.applytg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE|LOCATION_REMOVED) and chkc:IsControler(tp) and s.applyfilter(chkc,e,tp) end
+	if chk==0 then return Duel.IsExistingTarget(s.applyfilter,tp,LOCATION_GRAVE|LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
-	local g=Duel.SelectTarget(tp,s.filter,tp,LOCATION_GRAVE|LOCATION_REMOVED,0,1,1,nil,e,tp)
+	local g=Duel.SelectTarget(tp,s.applyfilter,tp,LOCATION_GRAVE|LOCATION_REMOVED,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,1,tp,0)
 end
-function s.operation(e,tp,eg,ep,ev,re,r,rp)
+function s.applyop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) then
-		local eff={tc:GetCardEffect(id)}
-		local te=nil
-		local acd={}
-		local ac={}
-		for _,teh in ipairs(eff) do
-			local temp=teh:GetLabelObject()
-			local con=temp:GetCondition()
-			local tg=temp:GetTarget()
-			if (not con or con(temp,tp,Group.CreateGroup(),PLAYER_NONE,0,teh,REASON_EFFECT,PLAYER_NONE,0)) 
-				and (not tg or tg(temp,tp,Group.CreateGroup(),PLAYER_NONE,0,teh,REASON_EFFECT,PLAYER_NONE,0)) then
-				table.insert(ac,teh)
-				table.insert(acd,temp:GetDescription())
-			end
-		end
-		if #ac==1 then te=ac[1] elseif #ac>1 then
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EFFECT)
-			op=Duel.SelectOption(tp,table.unpack(acd))
-			op=op+1
-			te=ac[op]
-		end
-		if not te then return end
-		Duel.ClearTargetCard()
-		local teh=te
-		te=teh:GetLabelObject()
-		local tg=te:GetTarget()
-		local op=te:GetOperation()
-		if tg then tg(te,tp,Group.CreateGroup(),PLAYER_NONE,0,teh,REASON_EFFECT,PLAYER_NONE,1) end
-		Duel.BreakEffect()
-		tc:CreateEffectRelation(te)
-		Duel.BreakEffect()
-		local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-		for etc in aux.Next(g) do
-			etc:CreateEffectRelation(te)
-		end
-		if op then op(te,tp,Group.CreateGroup(),PLAYER_NONE,0,teh,REASON_EFFECT,PLAYER_NONE,1) end
-		tc:ReleaseEffectRelation(te)
-		for etc in aux.Next(g) do
-			etc:ReleaseEffectRelation(te)
-		end
-		local opt=Duel.SelectOption(tp,aux.Stringid(id,1),aux.Stringid(id,2))
-		Duel.SendtoDeck(tc,nil,opt,REASON_EFFECT)
+	if not tc:IsRelateToEffect(e) then return end
+	local effs=tc:GetMarkedEffects(EFFECT_MARKER_THUNDRA)
+	local options={}
+	for _,eff in ipairs(effs) do
+		local eff_chk=s.runfn(eff:GetCondition(),eff,tp,0) and s.runfn(eff:GetTarget(),eff,tp,0)
+		table.insert(options,{eff_chk,eff:GetDescription()})
 	end
+	local op=#options==1 and 1 or Duel.SelectEffect(tp,table.unpack(options))
+	if not op then return end
+	local te=effs[op]
+	if not te then return end
+	Duel.ClearTargetCard()
+	s.runfn(te:GetTarget(),te,tp)
+	Duel.BreakEffect()
+	tc:CreateEffectRelation(te)
+	Duel.BreakEffect()
+	local tg=Duel.GetTargetCards(te)
+	tg:ForEach(Card.CreateEffectRelation,te)
+	s.runfn(te:GetOperation(),te,tp,1)
+	tg:ForEach(Card.ReleaseEffectRelation,te)
+	local opt=Duel.SelectOption(tp,aux.Stringid(id,1),aux.Stringid(id,2))
+	Duel.SendtoDeck(tc,nil,opt,REASON_EFFECT)
 end
 function s.repfilter(c,tp)
 	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_MZONE) and c:IsRace(RACE_THUNDER)
 		and not c:IsReason(REASON_REPLACE) and c:IsReason(REASON_EFFECT|REASON_BATTLE)
 end
-function s.repcfilter(c)
+function s.repcostfilter(c)
 	return c:IsAbleToRemove() and aux.SpElimFilter(c,true)
 end
 function s.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return eg:IsExists(s.repfilter,1,nil,tp) and Duel.IsExistingMatchingCard(s.repcfilter,tp,LOCATION_GRAVE,0,3,nil) end
+	if chk==0 then return eg:IsExists(s.repfilter,1,nil,tp) and Duel.IsExistingMatchingCard(s.repcostfilter,tp,LOCATION_GRAVE,0,3,nil) end
 	if Duel.SelectEffectYesNo(tp,e:GetHandler(),96) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESREPLACE)
 		local g=Duel.SelectMatchingCard(tp,s.repcfilter,tp,LOCATION_GRAVE,0,3,3,nil)
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 		return true
 	else return false end
-end
-function s.repval(e,c)
-	return s.repfilter(c,e:GetHandlerPlayer())
 end

official/c12219047.lua

@@ -16,7 +16,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(1))
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 	local e2=e1:Clone()
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)

official/c1249315.lua

@@ -16,7 +16,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(1))
 	e1:SetTarget(s.thtg)
 	e1:SetOperation(s.thop)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.thfilter(c)
 	return c:IsMonster() and c:IsAbleToHand()

official/c12533811.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(1))
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 function s.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsPhase(PHASE_MAIN1)

official/c12615446.lua

@@ -18,7 +18,7 @@ function s.initial_effect(c)
 	e1:SetCost(Cost.Detach(2))
 	e1:SetTarget(s.postg)
 	e1:SetOperation(s.posop)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 	--Attach
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))

official/c12632096.lua

@@ -16,7 +16,7 @@ function s.initial_effect(c)
 	e1:SetCost(s.ctcost)
 	e1:SetTarget(s.cttg)
 	e1:SetOperation(s.ctop)
-	c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.listed_series={SET_CIPHER}
 s.listed_names={id}

official/c1269512.lua

@@ -33,7 +33,7 @@ function s.initial_effect(c)
 	e3:SetCondition(s.exatkcon)
 	e3:SetCost(Cost.Detach(1,1,nil))
 	e3:SetOperation(function() Duel.ChainAttack() end)
-	c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.listes_names={id}
 function s.ovfilter(c,tp,xyzc)

official/c13030280.lua

@@ -24,7 +24,7 @@ function s.initial_effect(c)
 	e2:SetCost(Cost.Detach(1,1,nil))
 	e2:SetTarget(s.damtg)
 	e2:SetOperation(s.damop)
-	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
+	c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT)
 end
 s.listed_names={77631175} --"Comics Hero King Arthur"
 function s.valcon(e,re,r,rp)