From 7509319d606c63d6d4b9f9a9d1e6efc2f7deb5cf Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:00:43 +0800 Subject: [PATCH 01/10] use effect codes directly as "register flags" Since `Card.RegisterEffect` loops through the passed register flags, they don't need to have unique bits. This removes the unnecessary conversion step from flag to code. --- constant.lua | 12 ++++++------ utility.lua | 40 ++++++++++++++-------------------------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/constant.lua b/constant.lua index f3dd02aef5..fce60096b4 100644 --- a/constant.lua +++ b/constant.lua @@ -981,12 +981,12 @@ 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 +REGISTER_FLAG_DETACH_XMAT = 511002571 +REGISTER_FLAG_CARDIAN = 511001692 +REGISTER_FLAG_THUNDRA = 12081875 +REGISTER_FLAG_ALLURE_LVUP = 511310036 +REGISTER_FLAG_TELLAR = 58858807 +REGISTER_FLAG_DRAGON_RULER = 4965193 --Flags for the various filters in the fusion procedure FUSPROC_NOTFUSION = 0x100 FUSPROC_CONTACTFUS = 0x200 diff --git a/utility.lua b/utility.lua index 74332cab3a..a41dde5937 100644 --- a/utility.lua +++ b/utility.lua @@ -1007,37 +1007,25 @@ end --for additional registers Card.RegisterEffect=(function() local oldf=Card.RegisterEffect - local function map_to_effect_code(val) - if val==1 then return 511002571 end -- access to effects that activate that detach an Xyz Material as cost - if val==2 then return 511001692 end -- access to Cardian Summoning conditions/effects - if val==4 then return 12081875 end -- access to Thunder Dragon effects that activate by discarding - if val==8 then return 511310036 end -- access to Allure Queen effects that activate by sending themselves to GY - if val==16 then return 58858807 end -- access to tellarknights/constellar effects that activate when Normal Summoned - if val==32 then return 4965193 end -- access to Dragon Ruler effects that activate by discarding - return nil - end return function(c,e,forced,...) local reg_e=oldf(c,e,forced) if not reg_e or reg_e<=0 then return reg_e end + local prop=EFFECT_FLAG_CANNOT_DISABLE|EFFECT_FLAG_IGNORE_IMMUNE|EFFECT_FLAG_SET_AVAILABLE + if e:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) then prop=prop|EFFECT_FLAG_UNCOPYABLE end local resetflag,resetcount=e:GetReset() - for _,val in ipairs{...} do - local code=map_to_effect_code(val) - if code then - local prop=EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_SET_AVAILABLE - if e:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) then prop=prop|EFFECT_FLAG_UNCOPYABLE end - local e2=Effect.CreateEffect(c) - e2:SetType(EFFECT_TYPE_SINGLE) - e2:SetProperty(prop,EFFECT_FLAG2_MAJESTIC_MUST_COPY) - e2:SetCode(code) - e2:SetLabelObject(e) - e2:SetLabel(c:GetOriginalCode()) - if resetflag and resetcount then - e2:SetReset(resetflag,resetcount) - elseif resetflag then - e2:SetReset(resetflag) - end - c:RegisterEffect(e2) + for _,code in ipairs({...}) do + local e2=Effect.CreateEffect(c) + e2:SetType(EFFECT_TYPE_SINGLE) + e2:SetProperty(prop,EFFECT_FLAG2_MAJESTIC_MUST_COPY) + e2:SetCode(code) + e2:SetLabelObject(e) + e2:SetLabel(c:GetOriginalCode()) + if resetflag and resetcount then + e2:SetReset(resetflag,resetcount) + elseif resetflag then + e2:SetReset(resetflag) end + c:RegisterEffect(e2) end return reg_e end From 7135fda33f9489603576b483c2955b21309d0a4f Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:22:06 +0800 Subject: [PATCH 02/10] add `Card.GetEffectsWithRegisterFlag` A function for retrieving a card's effects that were registered with "register flags". This returns the actual effects directly, instead of the flag effects that have them as label object (which is what `GetCardEffect` returns). --- utility.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/utility.lua b/utility.lua index a41dde5937..3cf81bc8a9 100644 --- a/utility.lua +++ b/utility.lua @@ -1031,6 +1031,17 @@ Card.RegisterEffect=(function() end end)() +function Card.GetEffectsWithRegisterFlag(c,code) + local effs={} + for _,flag_eff in ipairs({c:GetOwnEffects()}) do + if flag_eff:GetCode()==code and flag_eff:IsHasType(EFFECT_TYPE_SINGLE) then + local eff=flag_eff:GetLabelObject() + if eff then table.insert(effs,eff) end + end + end + return effs +end + function Card.ListsCodeAsMaterial(c,...) if not c.material then return false end local codes={...} From 694397cc035a76eadacef5598ceff2482b0a56b6 Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:27:26 +0800 Subject: [PATCH 03/10] update "Thunder Dragon Thunderstormech" Made the card use `GetEffectsWithRegisterFlag` instead of `GetCardEffect`. --- official/c12081875.lua | 77 +++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/official/c12081875.lua b/official/c12081875.lua index 0ca717134b..a3e697bf85 100644 --- a/official/c12081875.lua +++ b/official/c12081875.lua @@ -30,19 +30,17 @@ s.listed_series={SET_THUNDER_DRAGON} function s.condition(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():IsLinkSummoned() end +function s.runfn(fn,eff,tp,re,chk) + return not fn or fn(eff,tp,Group.CreateGroup(),PLAYER_NONE,0,re,REASON_EFFECT,PLAYER_NONE,chk) +end function s.filter(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(REGISTER_FLAG_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:GetEffectsWithRegisterFlag(REGISTER_FLAG_THUNDRA)) do + if s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) then return true end end return false end @@ -55,49 +53,28 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.operation(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:GetEffectsWithRegisterFlag(REGISTER_FLAG_THUNDRA) + local options={} + for _,eff in ipairs(effs) do + local eff_chk=s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) + table.insert(options,{eff_chk,eff:GetDescription()}) end + local op=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,e) + Duel.BreakEffect() + tc:CreateEffectRelation(te) + Duel.BreakEffect() + local tg=Duel.GetTargetCards(te) + tg:ForEach(Card.CreateEffectRelation,te) + s.runfn(te:GetOperation(),te,tp,e,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) From c3ece0bbacd78ebc065410b3a7cd3ff001bc3a7d Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:00:43 +0800 Subject: [PATCH 04/10] use effect codes directly as "register flags" Since `Card.RegisterEffect` loops through the passed register flags, they don't need to have unique bits. This removes the unnecessary conversion step from flag to code. --- constant.lua | 12 ++++++------ utility.lua | 40 ++++++++++++++-------------------------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/constant.lua b/constant.lua index f3dd02aef5..fce60096b4 100644 --- a/constant.lua +++ b/constant.lua @@ -981,12 +981,12 @@ 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 +REGISTER_FLAG_DETACH_XMAT = 511002571 +REGISTER_FLAG_CARDIAN = 511001692 +REGISTER_FLAG_THUNDRA = 12081875 +REGISTER_FLAG_ALLURE_LVUP = 511310036 +REGISTER_FLAG_TELLAR = 58858807 +REGISTER_FLAG_DRAGON_RULER = 4965193 --Flags for the various filters in the fusion procedure FUSPROC_NOTFUSION = 0x100 FUSPROC_CONTACTFUS = 0x200 diff --git a/utility.lua b/utility.lua index 7d7d1a7bd6..82e78c84bb 100644 --- a/utility.lua +++ b/utility.lua @@ -1007,37 +1007,25 @@ end --for additional registers Card.RegisterEffect=(function() local oldf=Card.RegisterEffect - local function map_to_effect_code(val) - if val==1 then return 511002571 end -- access to effects that activate that detach an Xyz Material as cost - if val==2 then return 511001692 end -- access to Cardian Summoning conditions/effects - if val==4 then return 12081875 end -- access to Thunder Dragon effects that activate by discarding - if val==8 then return 511310036 end -- access to Allure Queen effects that activate by sending themselves to GY - if val==16 then return 58858807 end -- access to tellarknights/constellar effects that activate when Normal Summoned - if val==32 then return 4965193 end -- access to Dragon Ruler effects that activate by discarding - return nil - end return function(c,e,forced,...) local reg_e=oldf(c,e,forced) if not reg_e or reg_e<=0 then return reg_e end + local prop=EFFECT_FLAG_CANNOT_DISABLE|EFFECT_FLAG_IGNORE_IMMUNE|EFFECT_FLAG_SET_AVAILABLE + if e:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) then prop=prop|EFFECT_FLAG_UNCOPYABLE end local resetflag,resetcount=e:GetReset() - for _,val in ipairs{...} do - local code=map_to_effect_code(val) - if code then - local prop=EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_SET_AVAILABLE - if e:IsHasProperty(EFFECT_FLAG_UNCOPYABLE) then prop=prop|EFFECT_FLAG_UNCOPYABLE end - local e2=Effect.CreateEffect(c) - e2:SetType(EFFECT_TYPE_SINGLE) - e2:SetProperty(prop,EFFECT_FLAG2_MAJESTIC_MUST_COPY) - e2:SetCode(code) - e2:SetLabelObject(e) - e2:SetLabel(c:GetOriginalCode()) - if resetflag and resetcount then - e2:SetReset(resetflag,resetcount) - elseif resetflag then - e2:SetReset(resetflag) - end - c:RegisterEffect(e2) + for _,code in ipairs({...}) do + local e2=Effect.CreateEffect(c) + e2:SetType(EFFECT_TYPE_SINGLE) + e2:SetProperty(prop,EFFECT_FLAG2_MAJESTIC_MUST_COPY) + e2:SetCode(code) + e2:SetLabelObject(e) + e2:SetLabel(c:GetOriginalCode()) + if resetflag and resetcount then + e2:SetReset(resetflag,resetcount) + elseif resetflag then + e2:SetReset(resetflag) end + c:RegisterEffect(e2) end return reg_e end From 249ec2389a8355edea08d580288c23bbafa953c8 Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:22:06 +0800 Subject: [PATCH 05/10] add `Card.GetEffectsWithRegisterFlag` A function for retrieving a card's effects that were registered with "register flags". This returns the actual effects directly, instead of the flag effects that have them as label object (which is what `GetCardEffect` returns). --- utility.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/utility.lua b/utility.lua index 82e78c84bb..3cb604b246 100644 --- a/utility.lua +++ b/utility.lua @@ -1031,6 +1031,17 @@ Card.RegisterEffect=(function() end end)() +function Card.GetEffectsWithRegisterFlag(c,code) + local effs={} + for _,flag_eff in ipairs({c:GetOwnEffects()}) do + if flag_eff:GetCode()==code and flag_eff:IsHasType(EFFECT_TYPE_SINGLE) then + local eff=flag_eff:GetLabelObject() + if eff then table.insert(effs,eff) end + end + end + return effs +end + function Card.ListsCodeAsMaterial(c,...) if not c.material then return false end local codes={...} From 6eb82f8963778fc0f09602045d0c78e5efa1352f Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:27:26 +0800 Subject: [PATCH 06/10] update "Thunder Dragon Thunderstormech" Made the card use `GetEffectsWithRegisterFlag` instead of `GetCardEffect`. --- official/c12081875.lua | 77 +++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 50 deletions(-) diff --git a/official/c12081875.lua b/official/c12081875.lua index 0ca717134b..a3e697bf85 100644 --- a/official/c12081875.lua +++ b/official/c12081875.lua @@ -30,19 +30,17 @@ s.listed_series={SET_THUNDER_DRAGON} function s.condition(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():IsLinkSummoned() end +function s.runfn(fn,eff,tp,re,chk) + return not fn or fn(eff,tp,Group.CreateGroup(),PLAYER_NONE,0,re,REASON_EFFECT,PLAYER_NONE,chk) +end function s.filter(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(REGISTER_FLAG_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:GetEffectsWithRegisterFlag(REGISTER_FLAG_THUNDRA)) do + if s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) then return true end end return false end @@ -55,49 +53,28 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.operation(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:GetEffectsWithRegisterFlag(REGISTER_FLAG_THUNDRA) + local options={} + for _,eff in ipairs(effs) do + local eff_chk=s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) + table.insert(options,{eff_chk,eff:GetDescription()}) end + local op=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,e) + Duel.BreakEffect() + tc:CreateEffectRelation(te) + Duel.BreakEffect() + local tg=Duel.GetTargetCards(te) + tg:ForEach(Card.CreateEffectRelation,te) + s.runfn(te:GetOperation(),te,tp,e,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) From 227d558dd4e943b85ac1249c9a93f466704610c4 Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Sun, 29 Jun 2025 16:05:02 +0800 Subject: [PATCH 07/10] rename "register flags" to "effect markers" old REGISTER_FLAG constants will still work but are deprecated --- constant.lua | 21 ++++++++++++++------- official/c12081875.lua | 7 +++---- utility.lua | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/constant.lua b/constant.lua index fce60096b4..9f719aa665 100644 --- a/constant.lua +++ b/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 = 511002571 -REGISTER_FLAG_CARDIAN = 511001692 -REGISTER_FLAG_THUNDRA = 12081875 -REGISTER_FLAG_ALLURE_LVUP = 511310036 -REGISTER_FLAG_TELLAR = 58858807 -REGISTER_FLAG_DRAGON_RULER = 4965193 +--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 diff --git a/official/c12081875.lua b/official/c12081875.lua index a3e697bf85..df961176c7 100644 --- a/official/c12081875.lua +++ b/official/c12081875.lua @@ -39,10 +39,9 @@ function s.filter(c,e,tp) and c:IsHasEffect(REGISTER_FLAG_THUNDRA) and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()) then return false end - for _,eff in ipairs(c:GetEffectsWithRegisterFlag(REGISTER_FLAG_THUNDRA)) do + for _,eff in ipairs(c:GetMarkedEffects(REGISTER_FLAG_THUNDRA)) do if s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,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 @@ -54,13 +53,13 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if not tc:IsRelateToEffect(e) then return end - local effs=tc:GetEffectsWithRegisterFlag(REGISTER_FLAG_THUNDRA) + local effs=tc:GetMarkedEffects(REGISTER_FLAG_THUNDRA) local options={} for _,eff in ipairs(effs) do local eff_chk=s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) table.insert(options,{eff_chk,eff:GetDescription()}) end - local op=Duel.SelectEffect(tp,table.unpack(options)) + 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 diff --git a/utility.lua b/utility.lua index 3cb604b246..0f860b61e9 100644 --- a/utility.lua +++ b/utility.lua @@ -1031,7 +1031,7 @@ Card.RegisterEffect=(function() end end)() -function Card.GetEffectsWithRegisterFlag(c,code) +function Card.GetMarkedEffects(c,code) local effs={} for _,flag_eff in ipairs({c:GetOwnEffects()}) do if flag_eff:GetCode()==code and flag_eff:IsHasType(EFFECT_TYPE_SINGLE) then @@ -2706,4 +2706,4 @@ Duel.LoadScript("proc_gemini.lua") Duel.LoadScript("proc_spirit.lua") Duel.LoadScript("proc_unofficial.lua") Duel.LoadScript("deprecated_functions.lua") -pcall(dofile,"init.lua") +pcall(dofile,"init.lua") \ No newline at end of file From b788bcd83d9dfbe5fa7b867a1205dd83716190d9 Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Sun, 29 Jun 2025 16:17:10 +0800 Subject: [PATCH 08/10] modernize "Thunder Dragon Thunderstormech" --- official/c12081875.lua | 49 +++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/official/c12081875.lua b/official/c12081875.lua index df961176c7..e4c5bc3910 100644 --- a/official/c12081875.lua +++ b/official/c12081875.lua @@ -4,59 +4,57 @@ 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.runfn(fn,eff,tp,re,chk) - return not fn or fn(eff,tp,Group.CreateGroup(),PLAYER_NONE,0,re,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(REGISTER_FLAG_THUNDRA) and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()) then return false end for _,eff in ipairs(c:GetMarkedEffects(REGISTER_FLAG_THUNDRA)) do - if s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) then return true end + if s.runfn(eff:GetCondition(),eff,tp,0) and s.runfn(eff:GetTarget(),eff,tp,0) then return true end end 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 not tc:IsRelateToEffect(e) then return end local effs=tc:GetMarkedEffects(REGISTER_FLAG_THUNDRA) local options={} for _,eff in ipairs(effs) do - local eff_chk=s.runfn(eff:GetCondition(),eff,tp,e,0) and s.runfn(eff:GetTarget(),eff,tp,e,0) + 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)) @@ -64,13 +62,13 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local te=effs[op] if not te then return end Duel.ClearTargetCard() - s.runfn(te:GetTarget(),te,tp,e) + 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,e,1) + 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) @@ -79,18 +77,15 @@ 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 \ No newline at end of file From 258131f0b4c09051e180eb5a152d9d52b063a87b Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Sun, 29 Jun 2025 17:27:42 +0800 Subject: [PATCH 09/10] mass rename uses of REGISTER_FLAG constants to EFFECT_MARKER --- goat/c504700054.lua | 2 +- official/c10000030.lua | 2 +- official/c10389142.lua | 2 +- official/c10406322.lua | 2 +- official/c10443957.lua | 2 +- official/c1050186.lua | 2 +- official/c10613952.lua | 2 +- official/c10666000.lua | 2 +- official/c10678778.lua | 2 +- official/c11398059.lua | 2 +- official/c11411223.lua | 2 +- official/c11441009.lua | 2 +- official/c11510448.lua | 2 +- official/c11522979.lua | 2 +- official/c11646785.lua | 2 +- official/c12014404.lua | 2 +- official/c12081875.lua | 6 +++--- official/c12219047.lua | 2 +- official/c1249315.lua | 2 +- official/c12533811.lua | 2 +- official/c12615446.lua | 2 +- official/c12632096.lua | 2 +- official/c1269512.lua | 2 +- official/c13030280.lua | 2 +- official/c13183454.lua | 2 +- official/c13851202.lua | 2 +- official/c14152862.lua | 2 +- official/c1426714.lua | 2 +- official/c14301396.lua | 2 +- official/c14306092.lua | 2 +- official/c14759024.lua | 2 +- official/c15092394.lua | 2 +- official/c15232745.lua | 2 +- official/c15561463.lua | 2 +- official/c15862758.lua | 2 +- official/c15871676.lua | 2 +- official/c15914410.lua | 2 +- official/c15939229.lua | 4 ++-- official/c16024176.lua | 2 +- official/c16037007.lua | 2 +- official/c16110708.lua | 2 +- official/c16195942.lua | 2 +- official/c1621413.lua | 4 ++-- official/c1639384.lua | 2 +- official/c16643334.lua | 2 +- official/c16691074.lua | 2 +- official/c16699558.lua | 2 +- official/c16802689.lua | 2 +- official/c1688285.lua | 2 +- official/c16906241.lua | 2 +- official/c16955631.lua | 2 +- official/c17016362.lua | 2 +- official/c17141718.lua | 2 +- official/c1828513.lua | 2 +- official/c18326736.lua | 4 ++-- official/c18511599.lua | 2 +- official/c18897163.lua | 2 +- official/c18963306.lua | 2 +- official/c19333131.lua | 2 +- official/c19369609.lua | 4 ++-- official/c19684740.lua | 2 +- official/c19891310.lua | 2 +- official/c1992816.lua | 2 +- official/c20145685.lua | 2 +- official/c20318029.lua | 2 +- official/c20343502.lua | 2 +- official/c20563387.lua | 2 +- official/c2061963.lua | 2 +- official/c20785975.lua | 2 +- official/c2091298.lua | 2 +- official/c21044178.lua | 2 +- official/c21065189.lua | 2 +- official/c21223277.lua | 2 +- official/c21313376.lua | 2 +- official/c21501505.lua | 2 +- official/c21521304.lua | 2 +- official/c21772453.lua | 2 +- official/c21858819.lua | 2 +- official/c2191144.lua | 2 +- official/c22110647.lua | 2 +- official/c22617205.lua | 2 +- official/c22653490.lua | 2 +- official/c2273734.lua | 2 +- official/c23454876.lua | 2 +- official/c23603403.lua | 2 +- official/c23649496.lua | 2 +- official/c23756165.lua | 2 +- official/c23776077.lua | 2 +- official/c23848752.lua | 2 +- official/c24701066.lua | 2 +- official/c2530830.lua | 2 +- official/c25341652.lua | 2 +- official/c26057276.lua | 2 +- official/c26096328.lua | 2 +- official/c26211048.lua | 2 +- official/c26329679.lua | 2 +- official/c26400609.lua | 2 +- official/c26556950.lua | 2 +- official/c26563200.lua | 2 +- official/c2665273.lua | 2 +- official/c26988374.lua | 2 +- official/c27069566.lua | 2 +- official/c27337596.lua | 2 +- official/c27415516.lua | 2 +- official/c27420823.lua | 4 ++-- official/c27552504.lua | 2 +- official/c2766877.lua | 2 +- official/c28150174.lua | 2 +- official/c28290705.lua | 2 +- official/c28346136.lua | 2 +- official/c28400508.lua | 2 +- official/c28781003.lua | 2 +- official/c28912357.lua | 2 +- official/c2896663.lua | 2 +- official/c28981598.lua | 2 +- official/c29085954.lua | 2 +- official/c29208536.lua | 2 +- official/c29423048.lua | 2 +- official/c29510428.lua | 2 +- official/c29515122.lua | 2 +- official/c29596581.lua | 2 +- official/c29669359.lua | 2 +- official/c2978414.lua | 6 +++--- official/c30095833.lua | 2 +- official/c30100551.lua | 2 +- official/c30128445.lua | 2 +- official/c30350202.lua | 2 +- official/c30382214.lua | 2 +- official/c30439101.lua | 2 +- official/c30741334.lua | 2 +- official/c31123642.lua | 2 +- official/c31320433.lua | 2 +- official/c31437713.lua | 2 +- official/c31539614.lua | 2 +- official/c31563350.lua | 2 +- official/c31786629.lua | 2 +- official/c31801517.lua | 2 +- official/c32003338.lua | 2 +- official/c32224143.lua | 2 +- official/c32302078.lua | 4 ++-- official/c32446630.lua | 2 +- official/c32530043.lua | 2 +- official/c32559361.lua | 2 +- official/c3292267.lua | 2 +- official/c33776843.lua | 2 +- official/c33779875.lua | 4 ++-- official/c33909817.lua | 2 +- official/c34086406.lua | 2 +- official/c34481518.lua | 2 +- official/c34909328.lua | 2 +- official/c34945480.lua | 2 +- official/c3594985.lua | 2 +- official/c359563.lua | 2 +- official/c36076683.lua | 2 +- official/c36757171.lua | 2 +- official/c36776089.lua | 2 +- official/c37057743.lua | 2 +- official/c37164373.lua | 2 +- official/c37279508.lua | 2 +- official/c3743515.lua | 2 +- official/c3758046.lua | 2 +- official/c37649320.lua | 2 +- official/c3790062.lua | 2 +- official/c37926346.lua | 2 +- official/c38026562.lua | 2 +- official/c3814632.lua | 2 +- official/c38180759.lua | 2 +- official/c38250531.lua | 2 +- official/c38273745.lua | 2 +- official/c3828844.lua | 2 +- official/c38495396.lua | 2 +- official/c38667773.lua | 2 +- official/c38694052.lua | 2 +- official/c39030163.lua | 2 +- official/c39139935.lua | 2 +- official/c39272762.lua | 2 +- official/c39622156.lua | 2 +- official/c3989465.lua | 2 +- official/c39972129.lua | 2 +- official/c39987164.lua | 2 +- official/c40143123.lua | 2 +- official/c4019153.lua | 2 +- official/c40390147.lua | 2 +- official/c40424929.lua | 2 +- official/c40673853.lua | 2 +- official/c41147577.lua | 2 +- official/c41269771.lua | 2 +- official/c41309158.lua | 2 +- official/c41375811.lua | 2 +- official/c41522092.lua | 2 +- official/c41524885.lua | 2 +- official/c42160203.lua | 2 +- official/c42230449.lua | 2 +- official/c42391240.lua | 2 +- official/c42421606.lua | 2 +- official/c42589641.lua | 2 +- official/c42741437.lua | 2 +- official/c42752141.lua | 2 +- official/c42822433.lua | 2 +- official/c42940335.lua | 2 +- official/c43047672.lua | 2 +- official/c43413875.lua | 2 +- official/c43513897.lua | 2 +- official/c440556.lua | 2 +- official/c4423206.lua | 2 +- official/c44311445.lua | 2 +- official/c44405066.lua | 2 +- official/c44505297.lua | 2 +- official/c44698398.lua | 2 +- official/c45533023.lua | 2 +- official/c45742626.lua | 2 +- official/c45852939.lua | 2 +- official/c46772449.lua | 2 +- official/c46871387.lua | 2 +- official/c46895036.lua | 2 +- official/c47017574.lua | 2 +- official/c47060528.lua | 2 +- official/c47132793.lua | 2 +- official/c47349116.lua | 2 +- official/c47506081.lua | 2 +- official/c47579719.lua | 2 +- official/c47805931.lua | 2 +- official/c48348921.lua | 2 +- official/c48608796.lua | 2 +- official/c48739166.lua | 2 +- official/c48905153.lua | 2 +- official/c48928529.lua | 2 +- official/c49032236.lua | 2 +- official/c49121795.lua | 2 +- official/c49202331.lua | 2 +- official/c49221191.lua | 2 +- official/c49456901.lua | 2 +- official/c49678559.lua | 2 +- official/c4997565.lua | 2 +- official/c5014629.lua | 2 +- official/c50260683.lua | 2 +- official/c50449881.lua | 2 +- official/c50789693.lua | 2 +- official/c5088741.lua | 2 +- official/c51497409.lua | 2 +- official/c51543904.lua | 2 +- official/c51735257.lua | 2 +- official/c51960178.lua | 2 +- official/c52323874.lua | 2 +- official/c52558805.lua | 2 +- official/c52653092.lua | 2 +- official/c53054164.lua | 2 +- official/c53244294.lua | 2 +- official/c53334641.lua | 2 +- official/c53701457.lua | 2 +- official/c53797637.lua | 2 +- official/c53804307.lua | 2 +- official/c54135423.lua | 2 +- official/c54358015.lua | 2 +- official/c54366836.lua | 2 +- official/c54719828.lua | 2 +- official/c5489987.lua | 2 +- official/c5530780.lua | 2 +- official/c55470553.lua | 2 +- official/c55727845.lua | 2 +- official/c55935416.lua | 2 +- official/c56051086.lua | 2 +- official/c56292140.lua | 2 +- official/c56337500.lua | 2 +- official/c56638325.lua | 2 +- official/c56713174.lua | 2 +- official/c56832966.lua | 2 +- official/c56910167.lua | 2 +- official/c57031794.lua | 4 ++-- official/c57043117.lua | 2 +- official/c57261568.lua | 2 +- official/c57314798.lua | 2 +- official/c57450198.lua | 4 ++-- official/c57707471.lua | 2 +- official/c58058134.lua | 2 +- official/c58069384.lua | 2 +- official/c581014.lua | 2 +- official/c58201062.lua | 2 +- official/c58504745.lua | 2 +- official/c58600555.lua | 2 +- official/c58712976.lua | 2 +- official/c58720904.lua | 2 +- official/c58820923.lua | 2 +- official/c59071624.lua | 6 +++--- official/c5916510.lua | 2 +- official/c59170782.lua | 4 ++-- official/c59208943.lua | 2 +- official/c59242457.lua | 2 +- official/c59627393.lua | 2 +- official/c60195675.lua | 2 +- official/c60517697.lua | 2 +- official/c60645181.lua | 2 +- official/c60992364.lua | 2 +- official/c61307542.lua | 2 +- official/c61344030.lua | 2 +- official/c61374414.lua | 2 +- official/c61399402.lua | 2 +- official/c6165656.lua | 2 +- official/c62070231.lua | 2 +- official/c6247535.lua | 2 +- official/c62541668.lua | 2 +- official/c62709239.lua | 2 +- official/c6284176.lua | 2 +- official/c62967433.lua | 2 +- official/c63274863.lua | 2 +- official/c63746411.lua | 2 +- official/c63767246.lua | 2 +- official/c6387204.lua | 2 +- official/c64245689.lua | 2 +- official/c64276752.lua | 2 +- official/c64332231.lua | 2 +- official/c64414267.lua | 2 +- official/c64554883.lua | 2 +- official/c64689404.lua | 2 +- official/c65056481.lua | 2 +- official/c6511113.lua | 2 +- official/c65301952.lua | 2 +- official/c65676461.lua | 2 +- official/c65884091.lua | 2 +- official/c65892585.lua | 2 +- official/c66011101.lua | 2 +- official/c66506689.lua | 2 +- official/c66523544.lua | 2 +- official/c66547759.lua | 2 +- official/c6659193.lua | 2 +- official/c66970002.lua | 2 +- official/c67173574.lua | 2 +- official/c68300121.lua | 2 +- official/c68396121.lua | 2 +- official/c68597372.lua | 2 +- official/c68618157.lua | 4 ++-- official/c68679595.lua | 2 +- official/c68836428.lua | 2 +- official/c69058960.lua | 2 +- official/c69069911.lua | 2 +- official/c69170557.lua | 2 +- official/c69610924.lua | 2 +- official/c69655484.lua | 4 ++-- official/c69757518.lua | 2 +- official/c6983839.lua | 2 +- official/c69840739.lua | 2 +- official/c698785.lua | 2 +- official/c7020743.lua | 2 +- official/c70636044.lua | 2 +- official/c71068247.lua | 2 +- official/c71612253.lua | 2 +- official/c7194917.lua | 2 +- official/c72409226.lua | 2 +- official/c72971064.lua | 2 +- official/c73082255.lua | 2 +- official/c73289035.lua | 2 +- official/c73347079.lua | 2 +- official/c73445448.lua | 2 +- official/c73659078.lua | 2 +- official/c73887236.lua | 2 +- official/c73964868.lua | 2 +- official/c74294676.lua | 6 +++--- official/c74371660.lua | 2 +- official/c74416224.lua | 2 +- official/c74593218.lua | 2 +- official/c75083197.lua | 2 +- official/c75253697.lua | 2 +- official/c75367227.lua | 2 +- official/c75402014.lua | 2 +- official/c75433814.lua | 2 +- official/c75574498.lua | 2 +- official/c75620895.lua | 2 +- official/c75797046.lua | 2 +- official/c75840616.lua | 2 +- official/c75878039.lua | 2 +- official/c7593748.lua | 2 +- official/c76067258.lua | 2 +- official/c7628844.lua | 2 +- official/c76290637.lua | 2 +- official/c76372778.lua | 2 +- official/c76419637.lua | 2 +- official/c76589815.lua | 2 +- official/c770365.lua | 2 +- official/c77205367.lua | 2 +- official/c77571454.lua | 2 +- official/c77799846.lua | 2 +- official/c78135071.lua | 2 +- official/c78144171.lua | 2 +- official/c78486968.lua | 2 +- official/c78625448.lua | 2 +- official/c79210531.lua | 2 +- official/c79559912.lua | 2 +- official/c79625003.lua | 2 +- official/c80117527.lua | 2 +- official/c80630522.lua | 2 +- official/c80764541.lua | 2 +- official/c80796456.lua | 2 +- official/c80993256.lua | 2 +- official/c81122844.lua | 4 ++-- official/c8165596.lua | 2 +- official/c81927732.lua | 2 +- official/c82308875.lua | 2 +- official/c82633039.lua | 4 ++-- official/c82697249.lua | 2 +- official/c82944432.lua | 2 +- official/c83107873.lua | 2 +- official/c83531441.lua | 2 +- official/c83827392.lua | 2 +- official/c84013237.lua | 2 +- official/c84025439.lua | 2 +- official/c84124261.lua | 2 +- official/c84224627.lua | 2 +- official/c84401683.lua | 2 +- official/c84417082.lua | 4 ++-- official/c8491961.lua | 2 +- official/c85004150.lua | 2 +- official/c85115440.lua | 2 +- official/c85121942.lua | 2 +- official/c85252081.lua | 4 ++-- official/c85692042.lua | 2 +- official/c85747929.lua | 2 +- official/c8617563.lua | 4 ++-- official/c86221741.lua | 2 +- official/c86238081.lua | 2 +- official/c86331741.lua | 2 +- official/c86466163.lua | 2 +- official/c86532744.lua | 2 +- official/c86848580.lua | 2 +- official/c87257460.lua | 2 +- official/c87327776.lua | 2 +- official/c87676171.lua | 2 +- official/c87911394.lua | 2 +- official/c88021907.lua | 2 +- official/c88120966.lua | 2 +- official/c88177324.lua | 2 +- official/c88581108.lua | 2 +- official/c88722973.lua | 2 +- official/c88754763.lua | 2 +- official/c88917691.lua | 2 +- official/c88942504.lua | 2 +- official/c89185742.lua | 2 +- official/c89399912.lua | 2 +- official/c89477759.lua | 2 +- official/c89516305.lua | 6 +++--- official/c89642993.lua | 2 +- official/c89818984.lua | 2 +- official/c90098780.lua | 2 +- official/c90162951.lua | 2 +- official/c90411554.lua | 2 +- official/c90664857.lua | 2 +- official/c90726340.lua | 2 +- official/c90809975.lua | 2 +- official/c91020571.lua | 2 +- official/c91279700.lua | 2 +- official/c91499077.lua | 2 +- official/c9161357.lua | 2 +- official/c91895091.lua | 2 +- official/c92661479.lua | 2 +- official/c9272381.lua | 2 +- official/c92918648.lua | 2 +- official/c93039339.lua | 2 +- official/c93568288.lua | 2 +- official/c93713837.lua | 2 +- official/c93730230.lua | 2 +- official/c94119480.lua | 2 +- official/c94151981.lua | 2 +- official/c94380860.lua | 2 +- official/c9453320.lua | 2 +- official/c94655777.lua | 2 +- official/c9486959.lua | 2 +- official/c95113856.lua | 2 +- official/c95134948.lua | 2 +- official/c95169481.lua | 2 +- official/c95239444.lua | 2 +- official/c95243515.lua | 2 +- official/c95442074.lua | 2 +- official/c95474755.lua | 2 +- official/c95685352.lua | 2 +- official/c95992081.lua | 2 +- official/c96157835.lua | 2 +- official/c96223501.lua | 2 +- official/c96471335.lua | 2 +- official/c96592102.lua | 2 +- official/c96864105.lua | 2 +- official/c97170107.lua | 4 ++-- official/c97403510.lua | 2 +- official/c97453744.lua | 2 +- official/c97584719.lua | 2 +- official/c99469936.lua | 2 +- official/c99666430.lua | 2 +- official/c99668578.lua | 2 +- pre-release/c100445058.lua | 2 +- pre-release/c101302106.lua | 2 +- unofficial/c100000178.lua | 2 +- unofficial/c100000179.lua | 2 +- unofficial/c100000498.lua | 2 +- unofficial/c100000549.lua | 2 +- unofficial/c111011803.lua | 2 +- unofficial/c111011903.lua | 2 +- unofficial/c111011904.lua | 2 +- unofficial/c111011905.lua | 2 +- unofficial/c511000034.lua | 2 +- unofficial/c511000041.lua | 2 +- unofficial/c511000183.lua | 2 +- unofficial/c511000184.lua | 2 +- unofficial/c511000192.lua | 4 ++-- unofficial/c511000230.lua | 2 +- unofficial/c511000231.lua | 2 +- unofficial/c511000232.lua | 2 +- unofficial/c511000233.lua | 2 +- unofficial/c511000277.lua | 2 +- unofficial/c511000294.lua | 2 +- unofficial/c511000296.lua | 2 +- unofficial/c511000369.lua | 2 +- unofficial/c511000512.lua | 2 +- unofficial/c511000513.lua | 2 +- unofficial/c511000515.lua | 2 +- unofficial/c511000674.lua | 2 +- unofficial/c511000675.lua | 2 +- unofficial/c511001247.lua | 2 +- unofficial/c511001273.lua | 2 +- unofficial/c511001275.lua | 2 +- unofficial/c511001338.lua | 2 +- unofficial/c511001339.lua | 2 +- unofficial/c511001371.lua | 2 +- unofficial/c511001372.lua | 2 +- unofficial/c511001374.lua | 2 +- unofficial/c511001376.lua | 4 ++-- unofficial/c511001429.lua | 6 +++--- unofficial/c511001430.lua | 2 +- unofficial/c511001431.lua | 2 +- unofficial/c511001432.lua | 2 +- unofficial/c511001624.lua | 2 +- unofficial/c511001659.lua | 2 +- unofficial/c511001692.lua | 2 +- unofficial/c511001693.lua | 2 +- unofficial/c511001694.lua | 2 +- unofficial/c511001695.lua | 2 +- unofficial/c511001696.lua | 2 +- unofficial/c511001697.lua | 2 +- unofficial/c511001698.lua | 2 +- unofficial/c511001699.lua | 2 +- unofficial/c511001700.lua | 2 +- unofficial/c511001706.lua | 2 +- unofficial/c511001723.lua | 2 +- unofficial/c511001724.lua | 2 +- unofficial/c511001725.lua | 2 +- unofficial/c511001776.lua | 2 +- unofficial/c511001777.lua | 2 +- unofficial/c511001778.lua | 2 +- unofficial/c511001779.lua | 2 +- unofficial/c511001781.lua | 2 +- unofficial/c511001791.lua | 2 +- unofficial/c511001997.lua | 2 +- unofficial/c511001998.lua | 2 +- unofficial/c511001999.lua | 2 +- unofficial/c511002001.lua | 2 +- unofficial/c511002054.lua | 2 +- unofficial/c511002058.lua | 2 +- unofficial/c511002059.lua | 4 ++-- unofficial/c511002060.lua | 2 +- unofficial/c511002064.lua | 2 +- unofficial/c511002075.lua | 2 +- unofficial/c511002076.lua | 2 +- unofficial/c511002077.lua | 2 +- unofficial/c511002079.lua | 2 +- unofficial/c511002088.lua | 2 +- unofficial/c511002090.lua | 2 +- unofficial/c511002091.lua | 2 +- unofficial/c511002092.lua | 2 +- unofficial/c511002111.lua | 2 +- unofficial/c511002112.lua | 2 +- unofficial/c511002384.lua | 2 +- unofficial/c511002482.lua | 2 +- unofficial/c511002543.lua | 2 +- unofficial/c511002599.lua | 2 +- unofficial/c511002658.lua | 2 +- unofficial/c511002727.lua | 2 +- unofficial/c511002737.lua | 2 +- unofficial/c511002749.lua | 2 +- unofficial/c511002762.lua | 2 +- unofficial/c511002763.lua | 2 +- unofficial/c511002764.lua | 2 +- unofficial/c511002778.lua | 2 +- unofficial/c511002829.lua | 2 +- unofficial/c511002830.lua | 2 +- unofficial/c511002839.lua | 2 +- unofficial/c511002855.lua | 2 +- unofficial/c511002858.lua | 2 +- unofficial/c511002864.lua | 2 +- unofficial/c511002866.lua | 4 ++-- unofficial/c511002870.lua | 2 +- unofficial/c511002871.lua | 2 +- unofficial/c511002872.lua | 2 +- unofficial/c511002873.lua | 2 +- unofficial/c511002896.lua | 2 +- unofficial/c511002912.lua | 2 +- unofficial/c511002913.lua | 2 +- unofficial/c511003224.lua | 2 +- unofficial/c511003236.lua | 2 +- unofficial/c511009002.lua | 2 +- unofficial/c511009026.lua | 2 +- unofficial/c511009062.lua | 2 +- unofficial/c511009074.lua | 4 ++-- unofficial/c511009136.lua | 2 +- unofficial/c511009321.lua | 2 +- unofficial/c511009340.lua | 2 +- unofficial/c511009387.lua | 2 +- unofficial/c511009462.lua | 2 +- unofficial/c511009480.lua | 2 +- unofficial/c511009560.lua | 4 ++-- unofficial/c511009567.lua | 2 +- unofficial/c511009951.lua | 2 +- unofficial/c511010007.lua | 2 +- unofficial/c511010009.lua | 2 +- unofficial/c511010010.lua | 2 +- unofficial/c511010011.lua | 2 +- unofficial/c511010020.lua | 2 +- unofficial/c511010021.lua | 2 +- unofficial/c511010025.lua | 2 +- unofficial/c511010032.lua | 2 +- unofficial/c511010034.lua | 2 +- unofficial/c511010039.lua | 2 +- unofficial/c511010047.lua | 2 +- unofficial/c511010053.lua | 4 ++-- unofficial/c511010056.lua | 2 +- unofficial/c511010064.lua | 2 +- unofficial/c511010065.lua | 2 +- unofficial/c511010083.lua | 2 +- unofficial/c511010096.lua | 2 +- unofficial/c511010103.lua | 2 +- unofficial/c511010104.lua | 2 +- unofficial/c511010105.lua | 2 +- unofficial/c511010107.lua | 4 ++-- unofficial/c511010132.lua | 2 +- unofficial/c511010139.lua | 2 +- unofficial/c511010165.lua | 2 +- unofficial/c511010173.lua | 2 +- unofficial/c511010192.lua | 2 +- unofficial/c511010196.lua | 2 +- unofficial/c511010205.lua | 2 +- unofficial/c511010207.lua | 2 +- unofficial/c511010238.lua | 2 +- unofficial/c511010239.lua | 2 +- unofficial/c511010504.lua | 2 +- unofficial/c511010515.lua | 2 +- unofficial/c511015129.lua | 2 +- unofficial/c511020000.lua | 2 +- unofficial/c511023000.lua | 2 +- unofficial/c511027117.lua | 2 +- unofficial/c511600284.lua | 2 +- unofficial/c511600298.lua | 2 +- unofficial/c511600369.lua | 2 +- unofficial/c511600384.lua | 2 +- unofficial/c513000017.lua | 2 +- unofficial/c513000018.lua | 2 +- unofficial/c513000059.lua | 2 +- unofficial/c513000060.lua | 2 +- unofficial/c513000061.lua | 2 +- unofficial/c513000062.lua | 2 +- unofficial/c513000063.lua | 2 +- unofficial/c700000026.lua | 2 +- unofficial/c700000027.lua | 2 +- unofficial/c810000081.lua | 2 +- 659 files changed, 697 insertions(+), 697 deletions(-) diff --git a/goat/c504700054.lua b/goat/c504700054.lua index a9519cfed5..d2803998cd 100644 --- a/goat/c504700054.lua +++ b/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) diff --git a/official/c10000030.lua b/official/c10000030.lua index 79908f6310..cd5e1ddec8 100644 --- a/official/c10000030.lua +++ b/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() diff --git a/official/c10389142.lua b/official/c10389142.lua index aa10a91479..a1676abb80 100644 --- a/official/c10389142.lua +++ b/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 diff --git a/official/c10406322.lua b/official/c10406322.lua index b457c4430e..5801e1519c 100644 --- a/official/c10406322.lua +++ b/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 diff --git a/official/c10443957.lua b/official/c10443957.lua index eb52b3ba0c..3c7f0b50fa 100644 --- a/official/c10443957.lua +++ b/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) diff --git a/official/c1050186.lua b/official/c1050186.lua index 75f4df27b0..39891e0234 100644 --- a/official/c1050186.lua +++ b/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) diff --git a/official/c10613952.lua b/official/c10613952.lua index f647dfd437..b919c4f2c7 100644 --- a/official/c10613952.lua +++ b/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)) diff --git a/official/c10666000.lua b/official/c10666000.lua index efc9636b8b..22c67568e9 100644 --- a/official/c10666000.lua +++ b/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) diff --git a/official/c10678778.lua b/official/c10678778.lua index 0d4060db48..87c7bafbeb 100644 --- a/official/c10678778.lua +++ b/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() diff --git a/official/c11398059.lua b/official/c11398059.lua index db2b7d4dbb..1317112bbb 100644 --- a/official/c11398059.lua +++ b/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() diff --git a/official/c11411223.lua b/official/c11411223.lua index 7eb42a6db5..1b54a70ac9 100644 --- a/official/c11411223.lua +++ b/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) diff --git a/official/c11441009.lua b/official/c11441009.lua index 531be06b24..aff52a33e6 100644 --- a/official/c11441009.lua +++ b/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)) diff --git a/official/c11510448.lua b/official/c11510448.lua index e6b5c0a68a..991536a6e5 100644 --- a/official/c11510448.lua +++ b/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) diff --git a/official/c11522979.lua b/official/c11522979.lua index a1bafa74cb..e7118052d6 100644 --- a/official/c11522979.lua +++ b/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} diff --git a/official/c11646785.lua b/official/c11646785.lua index ba0f4a28c0..4268f64f82 100644 --- a/official/c11646785.lua +++ b/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) diff --git a/official/c12014404.lua b/official/c12014404.lua index 305c839b49..324e5e60e8 100644 --- a/official/c12014404.lua +++ b/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 diff --git a/official/c12081875.lua b/official/c12081875.lua index e4c5bc3910..dbd9dcb1ff 100644 --- a/official/c12081875.lua +++ b/official/c12081875.lua @@ -34,10 +34,10 @@ end 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(REGISTER_FLAG_THUNDRA) 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 - for _,eff in ipairs(c:GetMarkedEffects(REGISTER_FLAG_THUNDRA)) do + 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 end @@ -51,7 +51,7 @@ end function s.applyop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if not tc:IsRelateToEffect(e) then return end - local effs=tc:GetMarkedEffects(REGISTER_FLAG_THUNDRA) + 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) diff --git a/official/c12219047.lua b/official/c12219047.lua index b0200fcab4..b5f1d58bce 100644 --- a/official/c12219047.lua +++ b/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) diff --git a/official/c1249315.lua b/official/c1249315.lua index 2e1a76ec29..4c633897ee 100644 --- a/official/c1249315.lua +++ b/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() diff --git a/official/c12533811.lua b/official/c12533811.lua index a78b4784c1..fdb636bb14 100644 --- a/official/c12533811.lua +++ b/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) diff --git a/official/c12615446.lua b/official/c12615446.lua index 7cd1fdd1db..cfb7f0c852 100644 --- a/official/c12615446.lua +++ b/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)) diff --git a/official/c12632096.lua b/official/c12632096.lua index a71640c81b..1de8c0513e 100644 --- a/official/c12632096.lua +++ b/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} diff --git a/official/c1269512.lua b/official/c1269512.lua index 43081d58e4..9bddcb5720 100644 --- a/official/c1269512.lua +++ b/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) diff --git a/official/c13030280.lua b/official/c13030280.lua index e4e06831b9..02493d8074 100644 --- a/official/c13030280.lua +++ b/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) diff --git a/official/c13183454.lua b/official/c13183454.lua index 4484c7e5e9..3b740e4ad4 100644 --- a/official/c13183454.lua +++ b/official/c13183454.lua @@ -14,7 +14,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:IsFaceup() and c:GetAttack()>0 diff --git a/official/c13851202.lua b/official/c13851202.lua index 6c57777ce6..cf7ecbb31c 100644 --- a/official/c13851202.lua +++ b/official/c13851202.lua @@ -11,7 +11,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) diff --git a/official/c14152862.lua b/official/c14152862.lua index cfbec0a6c2..bb00dc29a3 100644 --- a/official/c14152862.lua +++ b/official/c14152862.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.discon(e,tp,eg,ep,ev,re,r,rp) if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end diff --git a/official/c1426714.lua b/official/c1426714.lua index abd35796d0..273edf2086 100644 --- a/official/c1426714.lua +++ b/official/c1426714.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --cannot be battle target local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c14301396.lua b/official/c14301396.lua index 9d05e38647..dcf07f08ba 100644 --- a/official/c14301396.lua +++ b/official/c14301396.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Equip this card to another monster you control local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c14306092.lua b/official/c14306092.lua index 33931b1b93..9afb4d0f7b 100644 --- a/official/c14306092.lua +++ b/official/c14306092.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.ctop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --atkup local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c14759024.lua b/official/c14759024.lua index ebba75f94b..2c282b6f3d 100644 --- a/official/c14759024.lua +++ b/official/c14759024.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) 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_SPSUMMON_SUCCESS) c:RegisterEffect(e2) diff --git a/official/c15092394.lua b/official/c15092394.lua index ab960f841f..11d42c0c8c 100644 --- a/official/c15092394.lua +++ b/official/c15092394.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c15232745.lua b/official/c15232745.lua index ce824ee746..8a3a228670 100644 --- a/official/c15232745.lua +++ b/official/c15232745.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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.listed_series={SET_NUMERON} s.xyz_number=1 diff --git a/official/c15561463.lua b/official/c15561463.lua index c424904e5c..0a387e7f90 100644 --- a/official/c15561463.lua +++ b/official/c15561463.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) end diff --git a/official/c15862758.lua b/official/c15862758.lua index 94cc48293c..0c5baa5cb0 100644 --- a/official/c15862758.lua +++ b/official/c15862758.lua @@ -51,7 +51,7 @@ function s.initial_effect(c) e7:SetCost(Cost.Detach(1)) e7:SetTarget(s.natg) e7:SetOperation(s.naop) - c:RegisterEffect(e7,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e7,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={89477759} s.xyz_number=1000 diff --git a/official/c15871676.lua b/official/c15871676.lua index caec2fb43a..009c80f4da 100644 --- a/official/c15871676.lua +++ b/official/c15871676.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) end s.listed_series={SET_CONSTELLAR} function s.filter(c,e,tp) diff --git a/official/c15914410.lua b/official/c15914410.lua index 42c47589ee..b297f28065 100644 --- a/official/c15914410.lua +++ b/official/c15914410.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetTarget(s.postg) e1:SetOperation(s.posop) e1:SetHintTiming(0,TIMING_BATTLE_START|TIMING_END_PHASE) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.filter(c) return c:IsPosition(POS_FACEUP_ATTACK) and c:IsCanChangePosition() diff --git a/official/c15939229.lua b/official/c15939229.lua index 7fa71df61d..2fe18afc19 100644 --- a/official/c15939229.lua +++ b/official/c15939229.lua @@ -23,7 +23,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) --Set local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.settg) e3:SetOperation(s.setop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) aux.DoubleSnareValidity(c,LOCATION_MZONE) end s.listed_series={SET_DARK_CONTRACT,SET_DD} diff --git a/official/c16024176.lua b/official/c16024176.lua index 05a7c8a2e1..e1e01ed00f 100644 --- a/official/c16024176.lua +++ b/official/c16024176.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCondition(s.hspcon) e1:SetTarget(s.hsptg) e1:SetOperation(s.hspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --draw and special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c16037007.lua b/official/c16037007.lua index 0e75a56e54..ace2180c33 100644 --- a/official/c16037007.lua +++ b/official/c16037007.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=74 function s.discon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c16110708.lua b/official/c16110708.lua index 1cf34706cd..8826431760 100644 --- a/official/c16110708.lua +++ b/official/c16110708.lua @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCondition(function(e) return not e:GetHandler():IsBaseAttack(1500) end) e3:SetCost(Cost.Detach(1,1)) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={63767246} --"Number 38: Hope Harbinger Dragon Titanic Galaxy" s.xyz_number=38 diff --git a/official/c16195942.lua b/official/c16195942.lua index 227613f67c..35bf65a1b6 100644 --- a/official/c16195942.lua +++ b/official/c16195942.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,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,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:HasNonZeroAttack() end diff --git a/official/c1621413.lua b/official/c1621413.lua index 839b55a800..cb50bd1ada 100644 --- a/official/c1621413.lua +++ b/official/c1621413.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Negate monster effect activation and special summon 1 Xyz monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -30,7 +30,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={16195942} function s.atkcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c1639384.lua b/official/c1639384.lua index bb0036c0bd..b1f24d9901 100644 --- a/official/c1639384.lua +++ b/official/c1639384.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER|TIMING_END_PHASE) - 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,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end diff --git a/official/c16643334.lua b/official/c16643334.lua index 935500f07b..6f241c8f24 100644 --- a/official/c16643334.lua +++ b/official/c16643334.lua @@ -49,7 +49,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1)) e4:SetTarget(s.sptg2) e4:SetOperation(s.spop2) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_PHOTON} s.listed_names={CARD_GALAXYEYES_P_DRAGON} diff --git a/official/c16691074.lua b/official/c16691074.lua index b96d17437e..f038719211 100644 --- a/official/c16691074.lua +++ b/official/c16691074.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special summon 1 "Odd-Eyes" monster from the Extra Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c16699558.lua b/official/c16699558.lua index fd2e4ceaf0..f2ccf1d2de 100644 --- a/official/c16699558.lua +++ b/official/c16699558.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1)) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end function s.negtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(Card.IsNegatable,tp,0,LOCATION_ONFIELD,1,nil) end diff --git a/official/c16802689.lua b/official/c16802689.lua index af4976edca..1bd90cfa06 100644 --- a/official/c16802689.lua +++ b/official/c16802689.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCondition(s.hspcon) e1:SetTarget(s.hsptg) e1:SetOperation(s.hspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --draw and special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c1688285.lua b/official/c1688285.lua index 9a5765cc80..ed9baabfc2 100644 --- a/official/c1688285.lua +++ b/official/c1688285.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Attach 1 monster to this card local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c16906241.lua b/official/c16906241.lua index 093b6cf142..8ee72dd27f 100644 --- a/official/c16906241.lua +++ b/official/c16906241.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) end s.listed_series={SET_CONSTELLAR} function s.filter(c,e,tp) diff --git a/official/c16955631.lua b/official/c16955631.lua index f604cc64c6..b494168c56 100644 --- a/official/c16955631.lua +++ b/official/c16955631.lua @@ -38,7 +38,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.listed_series={SET_MIMIGHOUL} function s.thfilter(c) diff --git a/official/c17016362.lua b/official/c17016362.lua index f55a2efd72..939ac0eebb 100644 --- a/official/c17016362.lua +++ b/official/c17016362.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.mttg) e2:SetOperation(s.mtop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special summon "Performage" monster from deck local e3=Effect.CreateEffect(c) e3:SetCategory(CATEGORY_SPECIAL_SUMMON) diff --git a/official/c17141718.lua b/official/c17141718.lua index f2ca5b5073..340fa9ec26 100644 --- a/official/c17141718.lua +++ b/official/c17141718.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCondition(s.spcon) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --shuffle local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_DRAW) diff --git a/official/c1828513.lua b/official/c1828513.lua index 47e348965a..17ca930212 100644 --- a/official/c1828513.lua +++ b/official/c1828513.lua @@ -18,7 +18,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 s.listed_series={SET_SIX_SAMURAI} function s.filter(c) diff --git a/official/c18326736.lua b/official/c18326736.lua index c303b2133b..5c0c76b7ef 100644 --- a/official/c18326736.lua +++ b/official/c18326736.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) e1:SetHintTiming(0,TIMING_END_PHASE) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --turn skip local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(s.skipcost) e2:SetTarget(s.skiptg) e2:SetOperation(s.skipop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --material local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c18511599.lua b/official/c18511599.lua index 89198c0359..648d1562db 100644 --- a/official/c18511599.lua +++ b/official/c18511599.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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 function s.indcon(e) return e:GetHandler():GetOverlayCount()~=0 diff --git a/official/c18897163.lua b/official/c18897163.lua index a7700733ce..514c5d4103 100644 --- a/official/c18897163.lua +++ b/official/c18897163.lua @@ -45,7 +45,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1)) e4:SetTarget(s.destg) e4:SetOperation(s.desop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --move to the pendulum zone local e5=Effect.CreateEffect(c) e5:SetDescription(aux.Stringid(id,3)) diff --git a/official/c18963306.lua b/official/c18963306.lua index 9d917157e8..5dd1d029c3 100644 --- a/official/c18963306.lua +++ b/official/c18963306.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) end function s.filter(c) return c:IsFaceup() and c:IsControlerCanBeChanged() diff --git a/official/c19333131.lua b/official/c19333131.lua index 68ad91e4fc..9c2ced525b 100644 --- a/official/c19333131.lua +++ b/official/c19333131.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NINJA} s.xyz_number=12 diff --git a/official/c19369609.lua b/official/c19369609.lua index dd94961a53..1fcbfe0dbe 100644 --- a/official/c19369609.lua +++ b/official/c19369609.lua @@ -23,7 +23,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) --ATK gain on battle local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) @@ -34,7 +34,7 @@ function s.initial_effect(c) e3:SetCondition(s.atkcon) e3:SetCost(s.atkcost) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end --ATK gain function s.atkval(e,c) diff --git a/official/c19684740.lua b/official/c19684740.lua index fded0a04d8..6c73c99583 100644 --- a/official/c19684740.lua +++ b/official/c19684740.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) 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.thtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) end diff --git a/official/c19891310.lua b/official/c19891310.lua index 7d6e147b27..c1d929d61a 100644 --- a/official/c19891310.lua +++ b/official/c19891310.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCondition(s.condition) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --add to hand local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_TOHAND) diff --git a/official/c1992816.lua b/official/c1992816.lua index e7ce51ef2b..380b4c963e 100644 --- a/official/c1992816.lua +++ b/official/c1992816.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetCondition(s.dacon) e3:SetCost(Cost.Detach(1)) e3:SetOperation(s.daop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=9 function s.atkcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c20145685.lua b/official/c20145685.lua index 85c12fa74d..4edd87dc32 100644 --- a/official/c20145685.lua +++ b/official/c20145685.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(s.thcost) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Double battle damage local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_EQUIP) diff --git a/official/c20318029.lua b/official/c20318029.lua index f84457e4cb..6c0a56f37d 100644 --- a/official/c20318029.lua +++ b/official/c20318029.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.SelfDiscard) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_THUNDRA) + c:RegisterEffect(e1,false,EFFECT_MARKER_THUNDRA) --to hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c20343502.lua b/official/c20343502.lua index 83f5cb2258..43aafd38bb 100644 --- a/official/c20343502.lua +++ b/official/c20343502.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetTarget(s.immtg) e1:SetOperation(s.immop) e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER|TIMING_END_PHASE) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Shuffle up to 2 cards from either GY into deck local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_TODECK) diff --git a/official/c20563387.lua b/official/c20563387.lua index f7264ce05d..b90558032a 100644 --- a/official/c20563387.lua +++ b/official/c20563387.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.rmtg) e2:SetOperation(s.rmop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=80 s.listed_names={93568288} diff --git a/official/c2061963.lua b/official/c2061963.lua index 2b2d454359..8f6e881edd 100644 --- a/official/c2061963.lua +++ b/official/c2061963.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_MZONE) e2:SetTarget(s.decktg) e2:SetOperation(s.deckop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=104 function s.condition(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c20785975.lua b/official/c20785975.lua index f4fbb6902e..eb3909e518 100644 --- a/official/c20785975.lua +++ b/official/c20785975.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCondition(s.spcon) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=103 s.listed_names={94380860} diff --git a/official/c2091298.lua b/official/c2091298.lua index c8fcd74696..fb423447de 100644 --- a/official/c2091298.lua +++ b/official/c2091298.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCondition(s.condition) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_CONSTELLAR} function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c21044178.lua b/official/c21044178.lua index ce143a3c6a..ad21f6c984 100644 --- a/official/c21044178.lua +++ b/official/c21044178.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_MZONE) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkcon(e) return e:GetHandler():GetOverlayGroup():IsExists(Card.IsAttribute,1,nil,ATTRIBUTE_WATER) diff --git a/official/c21065189.lua b/official/c21065189.lua index 73cf792df3..f3e6388329 100644 --- a/official/c21065189.lua +++ b/official/c21065189.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():IsXyzSummoned() diff --git a/official/c21223277.lua b/official/c21223277.lua index ae0348359a..fb44ec6e86 100644 --- a/official/c21223277.lua +++ b/official/c21223277.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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 s.listed_series={SET_NOBLE_ARMS,SET_NOBLE_KNIGHT} function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c21313376.lua b/official/c21313376.lua index dea37f26ca..973bcf6fed 100644 --- a/official/c21313376.lua +++ b/official/c21313376.lua @@ -23,7 +23,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 s.xyz_number=14 function s.refcon(e,re,val,r,rp,rc) diff --git a/official/c21501505.lua b/official/c21501505.lua index 7b8a9094fd..5ee053979f 100644 --- a/official/c21501505.lua +++ b/official/c21501505.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) end function s.condition(e,tp,eg,ep,ev,re,r,rp) if e==re or not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end diff --git a/official/c21521304.lua b/official/c21521304.lua index c87108b4a1..9ab2fc862c 100644 --- a/official/c21521304.lua +++ b/official/c21521304.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_UTOPIA} s.xyz_number=39 diff --git a/official/c21772453.lua b/official/c21772453.lua index ab1582f9f4..6ecc1aea61 100644 --- a/official/c21772453.lua +++ b/official/c21772453.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCondition(s.hspcon) e1:SetTarget(s.hsptg) e1:SetOperation(s.hspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --draw local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) diff --git a/official/c21858819.lua b/official/c21858819.lua index e79eb09a54..3230ceffc3 100644 --- a/official/c21858819.lua +++ b/official/c21858819.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --recover local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_RECOVER) diff --git a/official/c2191144.lua b/official/c2191144.lua index bebab854f3..8677a347ca 100644 --- a/official/c2191144.lua +++ b/official/c2191144.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetOverlayCount(tp,1,1)>1 end diff --git a/official/c22110647.lua b/official/c22110647.lua index 4ac471067a..f94e5ff2a9 100644 --- a/official/c22110647.lua +++ b/official/c22110647.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Destroy 1 card on the field local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,1)) diff --git a/official/c22617205.lua b/official/c22617205.lua index 1ee6d6c65a..1b798c0a71 100644 --- a/official/c22617205.lua +++ b/official/c22617205.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetCountLimit(1,id) e2:SetTarget(s.target) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e2,false,EFFECT_MARKER_TELLAR) local e3=e2:Clone() e3:SetCode(EVENT_FLIP_SUMMON_SUCCESS) c:RegisterEffect(e3) diff --git a/official/c22653490.lua b/official/c22653490.lua index 67b1972a13..2fa33afe9d 100644 --- a/official/c22653490.lua +++ b/official/c22653490.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.tdtg2) e2:SetOperation(s.tdop2) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.tdcon1(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():IsXyzSummoned() diff --git a/official/c2273734.lua b/official/c2273734.lua index 3a95c14b94..15b0e1dd49 100644 --- a/official/c2273734.lua +++ b/official/c2273734.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - 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) diff --git a/official/c23454876.lua b/official/c23454876.lua index 3370cb5ed1..77dea5d2cd 100644 --- a/official/c23454876.lua +++ b/official/c23454876.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) 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={51960178} function s.drcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c23603403.lua b/official/c23603403.lua index 0ca2478111..6f24d5affb 100644 --- a/official/c23603403.lua +++ b/official/c23603403.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.atktg) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_RAIDRAPTOR} function s.descon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c23649496.lua b/official/c23649496.lua index c8152653b2..fd48c45fb6 100644 --- a/official/c23649496.lua +++ b/official/c23649496.lua @@ -17,7 +17,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) --Send 2 "Heraldic Beast" monsters from your Deck to the Graveyard. local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c23756165.lua b/official/c23756165.lua index c860c5788d..77906be217 100644 --- a/official/c23756165.lua +++ b/official/c23756165.lua @@ -44,7 +44,7 @@ function s.initial_effect(c) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) e3:SetLabelObject(e1) - c:RegisterEffect(e3,false,REGISTER_FLAG_ALLURE_LVUP) + c:RegisterEffect(e3,false,EFFECT_MARKER_ALLURE_LVUP) end s.listed_names={87257460,50140163} --"Allure Queen LV3", "Allure Queen LV7" s.LVnum=5 diff --git a/official/c23776077.lua b/official/c23776077.lua index 075f4b2dbd..1d62ce87ef 100644 --- a/official/c23776077.lua +++ b/official/c23776077.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --atk/def local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c23848752.lua b/official/c23848752.lua index 5f7eb8e681..987a4b77fd 100644 --- a/official/c23848752.lua +++ b/official/c23848752.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Gain LP equal to the ATK of a battling monster local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c24701066.lua b/official/c24701066.lua index b4d277de42..bfb159598c 100644 --- a/official/c24701066.lua +++ b/official/c24701066.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.thtgtg) e2:SetOperation(s.thtgop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card from the GY in Defense Position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c2530830.lua b/official/c2530830.lua index 3ca6362e04..a152cb6806 100644 --- a/official/c2530830.lua +++ b/official/c2530830.lua @@ -23,7 +23,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) --special summon local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c25341652.lua b/official/c25341652.lua index ab3ab2b1a8..29f1951f73 100644 --- a/official/c25341652.lua +++ b/official/c25341652.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.postg) e1:SetOperation(s.posop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destruction replacement for a "Djinn" monster local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c26057276.lua b/official/c26057276.lua index 7872f31d05..10868e1e29 100644 --- a/official/c26057276.lua +++ b/official/c26057276.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) diff --git a/official/c26096328.lua b/official/c26096328.lua index 41175fb7e7..cdffc8e8ef 100644 --- a/official/c26096328.lua +++ b/official/c26096328.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --multi attack local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c26211048.lua b/official/c26211048.lua index c158673f49..6c796b9e72 100644 --- a/official/c26211048.lua +++ b/official/c26211048.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) aux.AddEREquipLimit(c,nil,function(ec,_,tp) return ec:IsControler(1-tp) end,s.equipop,e1) end function s.eqfilter(c) diff --git a/official/c26329679.lua b/official/c26329679.lua index d2ad848c86..d43fcd4bd6 100644 --- a/official/c26329679.lua +++ b/official/c26329679.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) e1:SetHintTiming(TIMING_STANDBY_PHASE|TIMING_END_PHASE) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_CONSTELLAR} function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c26400609.lua b/official/c26400609.lua index aa7e790aec..9b0d63a5b0 100644 --- a/official/c26400609.lua +++ b/official/c26400609.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetCost(s.tgcost) e3:SetTarget(s.tgtg) e3:SetOperation(s.tgop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e3,false,EFFECT_MARKER_DRAGON_RULER) --Add 1 WATER Dragon-Type monster from your Deck to your hand local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,3)) diff --git a/official/c26556950.lua b/official/c26556950.lua index 61522cd59e..bf632a412d 100644 --- a/official/c26556950.lua +++ b/official/c26556950.lua @@ -38,7 +38,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1,1,nil)) e4:SetTarget(s.destg) e4:SetOperation(s.desop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=84 function s.ovfilter(c,tp,xyzc) diff --git a/official/c26563200.lua b/official/c26563200.lua index a80a4b8ffb..6f502f56f9 100644 --- a/official/c26563200.lua +++ b/official/c26563200.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCondition(s.atkcon) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_DJINN} function s.atkcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c2665273.lua b/official/c2665273.lua index f03ff29276..12cbcb2267 100644 --- a/official/c2665273.lua +++ b/official/c2665273.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) 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 function s.atkval(e,c) return c:GetOverlayCount()*1000 diff --git a/official/c26988374.lua b/official/c26988374.lua index a602d85698..4fcb3d9b43 100644 --- a/official/c26988374.lua +++ b/official/c26988374.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Detach 1 material and banish local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c27069566.lua b/official/c27069566.lua index 36d7e91bf3..419c87e0b1 100644 --- a/official/c27069566.lua +++ b/official/c27069566.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) e1:SetTarget(s.rmvtg) e1:SetOperation(s.rmvop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 2 "Datascape" local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c27337596.lua b/official/c27337596.lua index ff5430b0d0..5c610efe1e 100644 --- a/official/c27337596.lua +++ b/official/c27337596.lua @@ -16,7 +16,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 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/official/c27415516.lua b/official/c27415516.lua index c8669ce6b7..c0b8cdd6b5 100644 --- a/official/c27415516.lua +++ b/official/c27415516.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e1,false,EFFECT_MARKER_DRAGON_RULER) end s.listed_names={26400609} --"Tidal, Dragon Ruler of Waterfalls" function s.costfilter(c) diff --git a/official/c27420823.lua b/official/c27420823.lua index bfff541a46..e7480d8eee 100644 --- a/official/c27420823.lua +++ b/official/c27420823.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) Duel.AddCustomActivityCounter(id,ACTIVITY_CHAIN,function(re,tp,cid) return not re:IsMonsterEffect() end) --Negate an opponent's monster effect activated in the hand or GY local e2=Effect.CreateEffect(c) @@ -30,7 +30,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.distg) e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) Duel.NegateEffect(ev) end) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_K9} function s.thfilter(c) diff --git a/official/c27552504.lua b/official/c27552504.lua index 333fa65f89..c136a357b1 100644 --- a/official/c27552504.lua +++ b/official/c27552504.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.tgtg) e1:SetOperation(s.tgop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) diff --git a/official/c2766877.lua b/official/c2766877.lua index f6ccff0f5d..1529cb2d99 100644 --- a/official/c2766877.lua +++ b/official/c2766877.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) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.IsAbleToEnterBP() diff --git a/official/c28150174.lua b/official/c28150174.lua index d8229cf017..a517e2f3cc 100644 --- a/official/c28150174.lua +++ b/official/c28150174.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.postg) e1:SetOperation(s.posop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsDefensePos() end diff --git a/official/c28290705.lua b/official/c28290705.lua index e3c9a861e2..ebecc15b7d 100644 --- a/official/c28290705.lua +++ b/official/c28290705.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.adtg) e1:SetOperation(s.adop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.adtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttributeExcept,ATTRIBUTE_EARTH),tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end diff --git a/official/c28346136.lua b/official/c28346136.lua index 4a09ce68c5..8fd0d48cca 100644 --- a/official/c28346136.lua +++ b/official/c28346136.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,nil)) e1:SetTarget(s.cannottgtg) e1:SetOperation(s.cannottgop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Return 1 Rank 9 or lower Dragon Xyz Monster from your GY to the Extra Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,2)) diff --git a/official/c28400508.lua b/official/c28400508.lua index 777aaf8b9f..1ae792bf80 100644 --- a/official/c28400508.lua +++ b/official/c28400508.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={id} diff --git a/official/c28781003.lua b/official/c28781003.lua index f16dd480a7..e031a866d9 100644 --- a/official/c28781003.lua +++ b/official/c28781003.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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_series={SET_THE_PHANTOM_KNIGHTS,SET_RAIDRAPTOR,SET_XYZ_DRAGON} function s.spfilter(c,e,tp,mc,rk,pg) diff --git a/official/c28912357.lua b/official/c28912357.lua index 0c42580478..ecc5b58e71 100644 --- a/official/c28912357.lua +++ b/official/c28912357.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) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c2896663.lua b/official/c2896663.lua index 8f9832521d..d311bb39b6 100644 --- a/official/c2896663.lua +++ b/official/c2896663.lua @@ -24,7 +24,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) --Equip this card on the field to 1 Utopia monster local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c28981598.lua b/official/c28981598.lua index 6cd2b19b01..74f8686edb 100644 --- a/official/c28981598.lua +++ b/official/c28981598.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.tgfilter(e,c) return c:IsSummonLocation(LOCATION_GRAVE) and c~=e:GetHandler() diff --git a/official/c29085954.lua b/official/c29085954.lua index 97ac782f12..f102b67401 100644 --- a/official/c29085954.lua +++ b/official/c29085954.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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_series={SET_NUMBER} s.xyz_number=78 diff --git a/official/c29208536.lua b/official/c29208536.lua index 21c4647cd0..eab76183a1 100644 --- a/official/c29208536.lua +++ b/official/c29208536.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) --cannnot activate local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c29423048.lua b/official/c29423048.lua index 355c269400..1380b47d2c 100644 --- a/official/c29423048.lua +++ b/official/c29423048.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.thtgtg) e1:SetOperation(s.thtgop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c29510428.lua b/official/c29510428.lua index e90cceddd3..088d585ce9 100644 --- a/official/c29510428.lua +++ b/official/c29510428.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Add to hand or Special Summon 1 Level 5 monster from the Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c29515122.lua b/official/c29515122.lua index 2b8f4ebcf2..654de8c80d 100644 --- a/official/c29515122.lua +++ b/official/c29515122.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.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDiscardDeck(1-tp,3) end diff --git a/official/c29596581.lua b/official/c29596581.lua index acdf07be1e..e0cd66ebe8 100644 --- a/official/c29596581.lua +++ b/official/c29596581.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(Cost.SelfDiscard) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_THUNDRA) + c:RegisterEffect(e1,false,EFFECT_MARKER_THUNDRA) --Special summon 1 "Thunder Dragon" monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c29669359.lua b/official/c29669359.lua index 9019f1ba1e..87c79a78e0 100644 --- a/official/c29669359.lua +++ b/official/c29669359.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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=61 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c2978414.lua b/official/c2978414.lua index f53ba48ac3..c2a1b59c23 100644 --- a/official/c2978414.lua +++ b/official/c2978414.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --control local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetCost(s.cost) e2:SetTarget(s.cttg) e2:SetOperation(s.ctop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --effect limit local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) @@ -39,7 +39,7 @@ function s.initial_effect(c) e3:SetCondition(s.condition) e3:SetCost(s.cost) e3:SetOperation(s.efop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=46 function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c30095833.lua b/official/c30095833.lua index 96bc89af61..02039498ab 100644 --- a/official/c30095833.lua +++ b/official/c30095833.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1)) e3:SetTarget(s.destg) e3:SetOperation(s.desop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Place this card in the Pendulum Zone local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,2)) diff --git a/official/c30100551.lua b/official/c30100551.lua index eefaa6f78e..83941f5819 100644 --- a/official/c30100551.lua +++ b/official/c30100551.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.distg) e1:SetOperation(s.drop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --discard deck & destroy local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_DECKDES+CATEGORY_DESTROY) diff --git a/official/c30128445.lua b/official/c30128445.lua index e36ccc8803..4be10c761b 100644 --- a/official/c30128445.lua +++ b/official/c30128445.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Shuffle 1 Normal Monster from your GY into the Deck and Special Summon this card local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c30350202.lua b/official/c30350202.lua index 0d1ac1cb7c..636b44916d 100644 --- a/official/c30350202.lua +++ b/official/c30350202.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,nil)) e2:SetTarget(s.negtg) e2:SetOperation(s.negop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_DRAGON_RULER} function s.tdfilter(c,e,tp) diff --git a/official/c30382214.lua b/official/c30382214.lua index 6187858db4..14e81d632f 100644 --- a/official/c30382214.lua +++ b/official/c30382214.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCondition(s.spcon) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --Draw 1 and search or Special Summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c30439101.lua b/official/c30439101.lua index 2cc0c2b82f..752106d95a 100644 --- a/official/c30439101.lua +++ b/official/c30439101.lua @@ -17,7 +17,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) --Opponent's targeted monster cannot attack, also negate its effect local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c30741334.lua b/official/c30741334.lua index 8c79975680..832a4a818d 100644 --- a/official/c30741334.lua +++ b/official/c30741334.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/official/c31123642.lua b/official/c31123642.lua index 1f21d5324c..91358a3167 100644 --- a/official/c31123642.lua +++ b/official/c31123642.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,nil)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destruction replacement for a "Utopia" or "Utopic" Xyz monster local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c31320433.lua b/official/c31320433.lua index 013230b014..f65b171d6f 100644 --- a/official/c31320433.lua +++ b/official/c31320433.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.datg) e2:SetOperation(s.daop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=47 function s.matfilter(c) diff --git a/official/c31437713.lua b/official/c31437713.lua index 603ec69c6a..bf41d49f48 100644 --- a/official/c31437713.lua +++ b/official/c31437713.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCondition(s.condition) e2:SetCost(s.cost) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=82 function s.filter(c) diff --git a/official/c31539614.lua b/official/c31539614.lua index c065c8721f..f3921e5d8e 100644 --- a/official/c31539614.lua +++ b/official/c31539614.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.changeatkdeftg) e1:SetOperation(s.changeatkdefop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Make a monster(s) Special Summoned to your field gain 900 ATK local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c31563350.lua b/official/c31563350.lua index 747fd7a63e..72316d617f 100644 --- a/official/c31563350.lua +++ b/official/c31563350.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) aux.AddEREquipLimit(c,nil,s.eqval,s.equipop,e1) end function s.eqval(ec,c,tp) diff --git a/official/c31786629.lua b/official/c31786629.lua index 043860b959..8f907ac25b 100644 --- a/official/c31786629.lua +++ b/official/c31786629.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(Cost.SelfDiscard) 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={id} function s.filter(c) diff --git a/official/c31801517.lua b/official/c31801517.lua index 41c751c158..cfeb76a5e2 100644 --- a/official/c31801517.lua +++ b/official/c31801517.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCondition(s.atkcon) e1:SetCost(s.atkcost) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c32003338.lua b/official/c32003338.lua index ee0145347c..cc6a20b7ca 100644 --- a/official/c32003338.lua +++ b/official/c32003338.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) end s.xyz_number=34 function s.filter(c) diff --git a/official/c32224143.lua b/official/c32224143.lua index 0f968077fe..ffcf830219 100644 --- a/official/c32224143.lua +++ b/official/c32224143.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) --cannot be battle target local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c32302078.lua b/official/c32302078.lua index 8b324c4b1d..839a889263 100644 --- a/official/c32302078.lua +++ b/official/c32302078.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.tgtg) e2:SetOperation(s.tgop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 1 monster from your opponent's GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) @@ -40,7 +40,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) local g=Group.CreateGroup() g:KeepAlive() e3:SetLabelObject(g) diff --git a/official/c32446630.lua b/official/c32446630.lua index 473171a75e..246f427e3a 100644 --- a/official/c32446630.lua +++ b/official/c32446630.lua @@ -25,7 +25,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=43 s.listed_names={56051086,32446631} diff --git a/official/c32530043.lua b/official/c32530043.lua index 2a0e93e338..298dd48398 100644 --- a/official/c32530043.lua +++ b/official/c32530043.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) 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.thfilter(c) return c:IsRace(RACE_ROCK) and c:IsAbleToHand() diff --git a/official/c32559361.lua b/official/c32559361.lua index 8ef832af2a..093d22323f 100644 --- a/official/c32559361.lua +++ b/official/c32559361.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,s.mxmc,s.slwc)) e3:SetTarget(s.damtg2) e3:SetOperation(s.damop2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=9 s.listed_names={1992816} diff --git a/official/c3292267.lua b/official/c3292267.lua index c08bea98dd..32323e3304 100644 --- a/official/c3292267.lua +++ b/official/c3292267.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.tfilter(c,tp) return (c:IsOnField() or c:IsLocation(LOCATION_GRAVE) or c:IsLocation(LOCATION_REMOVED)) and c:IsControler(tp) diff --git a/official/c33776843.lua b/official/c33776843.lua index 458df22f4c..554f5e5a18 100644 --- a/official/c33776843.lua +++ b/official/c33776843.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) end s.xyz_number=15 function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c33779875.lua b/official/c33779875.lua index 1ca927b041..de7802b76c 100644 --- a/official/c33779875.lua +++ b/official/c33779875.lua @@ -18,13 +18,13 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.trtg) e1:SetOperation(s.trop) - 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) e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER) e2:SetCondition(s.quickcon) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Increase ATK when a monster is tributed local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c33909817.lua b/official/c33909817.lua index 8a16920896..60c03f4054 100644 --- a/official/c33909817.lua +++ b/official/c33909817.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) --Special Summon 1 "Sylvan" monster from the GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c34086406.lua b/official/c34086406.lua index e9523db3d3..e17e0c27e4 100644 --- a/official/c34086406.lua +++ b/official/c34086406.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) 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.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,LOCATION_DECK,0,1,nil) diff --git a/official/c34481518.lua b/official/c34481518.lua index 937e1cc347..e25187aadf 100644 --- a/official/c34481518.lua +++ b/official/c34481518.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy 1 card on the field local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c34909328.lua b/official/c34909328.lua index 4c9a07c2e5..32da3cb088 100644 --- a/official/c34909328.lua +++ b/official/c34909328.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Attach 1 monster from your GY to this card as material local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c34945480.lua b/official/c34945480.lua index 2baed11b19..0c1cff9f54 100644 --- a/official/c34945480.lua +++ b/official/c34945480.lua @@ -29,7 +29,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_OUTER_ENTITY} function s.ovfilter(c,tp,xyzc) diff --git a/official/c3594985.lua b/official/c3594985.lua index 8c26e43512..9efbedfeee 100644 --- a/official/c3594985.lua +++ b/official/c3594985.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Place this card in the Pendulum Zone local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c359563.lua b/official/c359563.lua index 32e1fafb11..630039081a 100644 --- a/official/c359563.lua +++ b/official/c359563.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,e,tp) return c:IsFaceup() and c:IsCanTurnSet() and c:IsSummonPlayer(1-tp) and (not e or c:IsRelateToEffect(e)) diff --git a/official/c36076683.lua b/official/c36076683.lua index 6bf2f52aa8..298a89fa2d 100644 --- a/official/c36076683.lua +++ b/official/c36076683.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCondition(aux.StatChangeDamageStepCondition) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=73 function s.atkop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c36757171.lua b/official/c36757171.lua index cbbd4572be..8aeb04f5cf 100644 --- a/official/c36757171.lua +++ b/official/c36757171.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) end s.listed_series={SET_LSWARM} function s.filter(c) diff --git a/official/c36776089.lua b/official/c36776089.lua index 2a115c5f88..9da006987f 100644 --- a/official/c36776089.lua +++ b/official/c36776089.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.rettg) e2:SetOperation(s.retop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.incon(e) return e:GetHandler():GetOverlayCount()>0 diff --git a/official/c37057743.lua b/official/c37057743.lua index 3d4b2648ab..19a3053149 100644 --- a/official/c37057743.lua +++ b/official/c37057743.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.filter(c) return c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToHand() diff --git a/official/c37164373.lua b/official/c37164373.lua index 3563d8fb1d..77c6bddefd 100644 --- a/official/c37164373.lua +++ b/official/c37164373.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) end s.listed_series={SET_MADOLCHE} function s.filter(c) diff --git a/official/c37279508.lua b/official/c37279508.lua index fb286b08cb..5cbf3ee6a4 100644 --- a/official/c37279508.lua +++ b/official/c37279508.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c3743515.lua b/official/c3743515.lua index b02bf3cdff..f20a667381 100644 --- a/official/c3743515.lua +++ b/official/c3743515.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy this card, and if you do, your Dinosaur monster battling gains 2000 ATK until the end of the Battle Phase local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c3758046.lua b/official/c3758046.lua index 8e35b02e58..056a2ba8d4 100644 --- a/official/c3758046.lua +++ b/official/c3758046.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.regtg) e1:SetOperation(s.regop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Search 1 "Dark Contract" card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c37649320.lua b/official/c37649320.lua index b8d3b059b5..9152113399 100644 --- a/official/c37649320.lua +++ b/official/c37649320.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --"Paleozoic" Trap cards can be activated from the hand local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c3790062.lua b/official/c3790062.lua index 87e34dc71f..8bd75a1073 100644 --- a/official/c3790062.lua +++ b/official/c3790062.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) 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=65 function s.condition(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c37926346.lua b/official/c37926346.lua index d9a720f29a..3cbadb2268 100644 --- a/official/c37926346.lua +++ b/official/c37926346.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) end function s.filter(c) return c:IsLevelAbove(5) diff --git a/official/c38026562.lua b/official/c38026562.lua index f4e915602b..8b3046c580 100644 --- a/official/c38026562.lua +++ b/official/c38026562.lua @@ -47,7 +47,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1,1,nil)) e4:SetTarget(s.tgtg) e4:SetOperation(s.tgop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end function s.spfilter(c,e,tp) return c:IsType(TYPE_GEMINI) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c3814632.lua b/official/c3814632.lua index bc5986df29..8f30232ec7 100644 --- a/official/c3814632.lua +++ b/official/c3814632.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.AND(Cost.Detach(1),s.descost)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/official/c38180759.lua b/official/c38180759.lua index b2cdf7e788..cf05487765 100644 --- a/official/c38180759.lua +++ b/official/c38180759.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) return Duel.IsTurnPlayer(1-tp) and (Duel.IsMainPhase()) diff --git a/official/c38250531.lua b/official/c38250531.lua index 5810d83c78..edc310c185 100644 --- a/official/c38250531.lua +++ b/official/c38250531.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c38273745.lua b/official/c38273745.lua index 5c74c6b204..3fe824917b 100644 --- a/official/c38273745.lua +++ b/official/c38273745.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) 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.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then diff --git a/official/c3828844.lua b/official/c3828844.lua index 6e425b5913..0ababe2d6a 100644 --- a/official/c3828844.lua +++ b/official/c3828844.lua @@ -19,7 +19,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) --If tributed, special summon 1 rank 5+ plant Xyz from extra deck or GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c38495396.lua b/official/c38495396.lua index 638f9b991b..dba354471e 100644 --- a/official/c38495396.lua +++ b/official/c38495396.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 s.listed_series={SET_CONSTELLAR} function s.ovfilter(c,tp,xyzc) diff --git a/official/c38667773.lua b/official/c38667773.lua index 0f7db0972c..262ec89bc0 100644 --- a/official/c38667773.lua +++ b/official/c38667773.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - 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) diff --git a/official/c38694052.lua b/official/c38694052.lua index 8df27a20e8..823e8b6256 100644 --- a/official/c38694052.lua +++ b/official/c38694052.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.AND(Cost.Detach(2),s.descost)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --This is a Quick Effect if this card has a Dragon monster as material local e2=e1:Clone() e2:SetType(EFFECT_TYPE_QUICK_O) diff --git a/official/c39030163.lua b/official/c39030163.lua index 2996c5bb17..af734cd88e 100644 --- a/official/c39030163.lua +++ b/official/c39030163.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(s.descost) 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.ovfilter(c,tp,xyzc) return c:IsFaceup() and c:IsSetCard(SET_GALAXY_EYES,xyzc,SUMMON_TYPE_XYZ,tp) and c:IsType(TYPE_XYZ,xyzc,SUMMON_TYPE_XYZ,tp) and not c:IsSummonCode(xyzc,SUMMON_TYPE_XYZ,tp,id) diff --git a/official/c39139935.lua b/official/c39139935.lua index 0bf28aeb2a..7288040bff 100644 --- a/official/c39139935.lua +++ b/official/c39139935.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) end s.xyz_number=33 function s.filter(c) diff --git a/official/c39272762.lua b/official/c39272762.lua index 6c7e44a970..548dfb970e 100644 --- a/official/c39272762.lua +++ b/official/c39272762.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.attg) e3:SetOperation(s.atop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={CARD_GALAXYEYES_P_DRAGON} function s.valcheck(e,c) diff --git a/official/c39622156.lua b/official/c39622156.lua index f96387f348..f25efdb504 100644 --- a/official/c39622156.lua +++ b/official/c39622156.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id) e1:SetTarget(Cost.Detach(1)) e1:SetOperation(s.btop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --control local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c3989465.lua b/official/c3989465.lua index db67758e58..0be940681e 100644 --- a/official/c3989465.lua +++ b/official/c3989465.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCondition(s.condition) e1:SetCost(s.cost) 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) local ph=Duel.GetCurrentPhase() diff --git a/official/c39972129.lua b/official/c39972129.lua index 6f97a51515..00717690d7 100644 --- a/official/c39972129.lua +++ b/official/c39972129.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Cannot be destroyed by battle or effects local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c39987164.lua b/official/c39987164.lua index 02d23276a9..9dd26ec2d4 100644 --- a/official/c39987164.lua +++ b/official/c39987164.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) aux.AddEREquipLimit(c,nil,s.eqval,s.equipop,e1) --destroy local e2=Effect.CreateEffect(c) diff --git a/official/c40143123.lua b/official/c40143123.lua index 0cd2ac5fc7..45b433b416 100644 --- a/official/c40143123.lua +++ b/official/c40143123.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) end s.listed_series={SET_CONSTELLAR} function s.filter(c,e,tp) diff --git a/official/c4019153.lua b/official/c4019153.lua index 7c935259b1..cd8ceb3d08 100644 --- a/official/c4019153.lua +++ b/official/c4019153.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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.listed_series={SET_NUMERON} s.xyz_number=4 diff --git a/official/c40390147.lua b/official/c40390147.lua index a47207e1d8..2dcc024235 100644 --- a/official/c40390147.lua +++ b/official/c40390147.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(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_series={SET_PHOTON} s.listed_names={CARD_GALAXYEYES_P_DRAGON} diff --git a/official/c40424929.lua b/official/c40424929.lua index 909dc3f710..5f9c3d4f8d 100644 --- a/official/c40424929.lua +++ b/official/c40424929.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.damtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0 end diff --git a/official/c40673853.lua b/official/c40673853.lua index f4ee1b3547..aadeb81009 100644 --- a/official/c40673853.lua +++ b/official/c40673853.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.postg) e1:SetOperation(s.posop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy 1 face-down card on the field local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c41147577.lua b/official/c41147577.lua index 1d104f3a86..5ea782c2e0 100644 --- a/official/c41147577.lua +++ b/official/c41147577.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.postg) e2:SetOperation(s.posop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={14152862} function s.efilter(e,te) diff --git a/official/c41269771.lua b/official/c41269771.lua index d763481b9c..c150745133 100644 --- a/official/c41269771.lua +++ b/official/c41269771.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) end s.listed_series={SET_CONSTELLAR} function s.filter(c,e,tp) diff --git a/official/c41309158.lua b/official/c41309158.lua index 1b3695ec77..ad79374a70 100644 --- a/official/c41309158.lua +++ b/official/c41309158.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) 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={15914410} function s.poscon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41375811.lua b/official/c41375811.lua index f1ac08efe8..bd30960227 100644 --- a/official/c41375811.lua +++ b/official/c41375811.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) - 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) diff --git a/official/c41522092.lua b/official/c41522092.lua index 266cb5dd20..f9936522b6 100644 --- a/official/c41522092.lua +++ b/official/c41522092.lua @@ -46,7 +46,7 @@ function s.initial_effect(c) e5:SetCost(Cost.Detach(1)) e5:SetTarget(s.cttg) e5:SetOperation(s.ctop) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=0 function s.xyzcheck(g,tp,xyz) diff --git a/official/c41524885.lua b/official/c41524885.lua index b7c3bcb28a..251a3c38ee 100644 --- a/official/c41524885.lua +++ b/official/c41524885.lua @@ -41,7 +41,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) diff --git a/official/c42160203.lua b/official/c42160203.lua index 20690cd52b..101c2c2079 100644 --- a/official/c42160203.lua +++ b/official/c42160203.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCondition(s.atkcon) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c42230449.lua b/official/c42230449.lua index 21f4ac6e58..e0b2cfeb49 100644 --- a/official/c42230449.lua +++ b/official/c42230449.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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.listed_series={SET_NUMERON} s.xyz_number=2 diff --git a/official/c42391240.lua b/official/c42391240.lua index 6276a122a3..210ce0c81b 100644 --- a/official/c42391240.lua +++ b/official/c42391240.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) local e2=e1:Clone() e2:SetCode(EVENT_SPSUMMON_SUCCESS) c:RegisterEffect(e2) diff --git a/official/c42421606.lua b/official/c42421606.lua index 1d5a056ba0..5389f34871 100644 --- a/official/c42421606.lua +++ b/official/c42421606.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.eftg) e2:SetOperation(s.efop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.roll_dice=true s.xyz_number=85 diff --git a/official/c42589641.lua b/official/c42589641.lua index 46c3cab775..ad3aa0d9fc 100644 --- a/official/c42589641.lua +++ b/official/c42589641.lua @@ -40,7 +40,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1)) e4:SetTarget(s.hdtg) e4:SetOperation(s.hdop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e5=Effect.CreateEffect(c) e5:SetDescription(aux.Stringid(id,2)) diff --git a/official/c42741437.lua b/official/c42741437.lua index 6681d43200..37c6c549fc 100644 --- a/official/c42741437.lua +++ b/official/c42741437.lua @@ -44,7 +44,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) diff --git a/official/c42752141.lua b/official/c42752141.lua index 023633b0a8..e41196d70c 100644 --- a/official/c42752141.lua +++ b/official/c42752141.lua @@ -17,7 +17,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.condition(e,tp,eg,ep,ev,re,r,rp,chk) return re~=e and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) diff --git a/official/c42822433.lua b/official/c42822433.lua index c6e6b1aba8..817964ef22 100644 --- a/official/c42822433.lua +++ b/official/c42822433.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - 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) diff --git a/official/c42940335.lua b/official/c42940335.lua index 1c14f754ce..77121cd7a4 100644 --- a/official/c42940335.lua +++ b/official/c42940335.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Equip this card to 1 "Mimighoul Master" you control local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c43047672.lua b/official/c43047672.lua index adf5526c73..81815864e0 100644 --- a/official/c43047672.lua +++ b/official/c43047672.lua @@ -24,7 +24,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) --chain attack local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c43413875.lua b/official/c43413875.lua index 1da788229b..4a0223c7b8 100644 --- a/official/c43413875.lua +++ b/official/c43413875.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCondition(s.hspcon) e1:SetTarget(s.hsptg) e1:SetOperation(s.hspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --draw(spsummon) local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) diff --git a/official/c43513897.lua b/official/c43513897.lua index 960ae41e31..3faf4a55c5 100644 --- a/official/c43513897.lua +++ b/official/c43513897.lua @@ -9,7 +9,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) local e2=e1:Clone() e2:SetCode(EVENT_SPSUMMON_SUCCESS) c:RegisterEffect(e2) diff --git a/official/c440556.lua b/official/c440556.lua index eec5154f32..14ae85bf96 100644 --- a/official/c440556.lua +++ b/official/c440556.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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 function s.filter(c,e,tp) return c:IsRankBelow(3) and c:IsAttribute(ATTRIBUTE_WATER) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c4423206.lua b/official/c4423206.lua index 426c90a3ba..d78b3937ce 100644 --- a/official/c4423206.lua +++ b/official/c4423206.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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 function s.spfilter(c,e,tp) return c:IsRace(RACE_WARRIOR|RACE_BEASTWARRIOR) and c:IsAttribute(ATTRIBUTE_EARTH) diff --git a/official/c44311445.lua b/official/c44311445.lua index 0cc401ba72..5f0910cad2 100644 --- a/official/c44311445.lua +++ b/official/c44311445.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(s.spcost) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_MADOLCHE} s.listed_names={74641045} diff --git a/official/c44405066.lua b/official/c44405066.lua index feb219d804..18a379195b 100644 --- a/official/c44405066.lua +++ b/official/c44405066.lua @@ -40,7 +40,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1,1,nil)) e4:SetTarget(s.sptg) e4:SetOperation(s.spop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_RED_EYES} function s.indcon(e) diff --git a/official/c44505297.lua b/official/c44505297.lua index 498fbb287c..9694cfc72e 100644 --- a/official/c44505297.lua +++ b/official/c44505297.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.tgtg) e2:SetOperation(s.tgop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.eqcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():IsXyzSummoned() diff --git a/official/c44698398.lua b/official/c44698398.lua index f104331d7a..1f494a831d 100644 --- a/official/c44698398.lua +++ b/official/c44698398.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_GALAXY,SET_TACHYON} function s.thfilter(c) diff --git a/official/c45533023.lua b/official/c45533023.lua index fa45d1e70f..e9c5361bfe 100644 --- a/official/c45533023.lua +++ b/official/c45533023.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e2:SetCondition(s.descon) e2:SetTarget(s.destg1) e2:SetOperation(s.desop1) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --destroy local e3=Effect.CreateEffect(c) e3:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE) diff --git a/official/c45742626.lua b/official/c45742626.lua index 41dc5214be..62129ff339 100644 --- a/official/c45742626.lua +++ b/official/c45742626.lua @@ -26,7 +26,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 function s.value(e,c) return Duel.GetMatchingGroupCount(Card.IsAttribute,0,LOCATION_GRAVE,LOCATION_GRAVE,nil,ATTRIBUTE_DARK)*200 diff --git a/official/c45852939.lua b/official/c45852939.lua index 8aa94138ba..25e375d7f8 100644 --- a/official/c45852939.lua +++ b/official/c45852939.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 1 Rank 4 or lower Xyz monster from the GY and attach another to it local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c46772449.lua b/official/c46772449.lua index 9c8a18f243..565ee3c36d 100644 --- a/official/c46772449.lua +++ b/official/c46772449.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.descon(e,tp,eg,ep,ev,re,r,rp) if not ((Duel.IsTurnPlayer(tp) and Duel.IsMainPhase()) or (Duel.IsTurnPlayer(1-tp) and Duel.IsBattlePhase())) then return false end diff --git a/official/c46871387.lua b/official/c46871387.lua index a163038c71..97bb8b9813 100644 --- a/official/c46871387.lua +++ b/official/c46871387.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) --def local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c46895036.lua b/official/c46895036.lua index 3810d9daec..d8ec8a65c2 100644 --- a/official/c46895036.lua +++ b/official/c46895036.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) --to hand local e3=Effect.CreateEffect(c) e3:SetCategory(CATEGORY_TOHAND) diff --git a/official/c47017574.lua b/official/c47017574.lua index 70cbce6853..4cc823ca42 100644 --- a/official/c47017574.lua +++ b/official/c47017574.lua @@ -35,7 +35,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.xyz_number=92 s.listed_names={97403510} diff --git a/official/c47060528.lua b/official/c47060528.lua index e61a0f783a..892cb0f6d6 100644 --- a/official/c47060528.lua +++ b/official/c47060528.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Change the name of 1 other face-up monster on the field to "Sakra Vendirage" until the End Phase local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c47132793.lua b/official/c47132793.lua index 75a5bc57c4..91a22a9b89 100644 --- a/official/c47132793.lua +++ b/official/c47132793.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card from your GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c47349116.lua b/official/c47349116.lua index 4d687875dd..ad514827f2 100644 --- a/official/c47349116.lua +++ b/official/c47349116.lua @@ -21,7 +21,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --destroy replace local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c47506081.lua b/official/c47506081.lua index 4b6b694460..9a8f620a91 100644 --- a/official/c47506081.lua +++ b/official/c47506081.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.damcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c47579719.lua b/official/c47579719.lua index 2e09e5dff3..90af745c69 100644 --- a/official/c47579719.lua +++ b/official/c47579719.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 not c:IsPosition(POS_FACEUP_DEFENSE) and c:IsCanChangePosition() diff --git a/official/c47805931.lua b/official/c47805931.lua index d179255d11..d5197d76d3 100644 --- a/official/c47805931.lua +++ b/official/c47805931.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=20 function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c48348921.lua b/official/c48348921.lua index f03754bb4f..52d61461ed 100644 --- a/official/c48348921.lua +++ b/official/c48348921.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCondition(function(_,tp) return Duel.IsTurnPlayer(tp) end) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Unaffected by opponent's monster effects local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c48608796.lua b/official/c48608796.lua index 54ccf410b1..c5b0fe023f 100644 --- a/official/c48608796.lua +++ b/official/c48608796.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e4:SetCountLimit(1) e4:SetCost(Cost.Detach(1)) e4:SetOperation(s.indop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_LYRILUSC} function s.atkval(e,c) diff --git a/official/c48739166.lua b/official/c48739166.lua index d3a6c10e57..171dea3e29 100644 --- a/official/c48739166.lua +++ b/official/c48739166.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,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) --Protect itself from destruction local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c48905153.lua b/official/c48905153.lua index d1d7bfe2cc..081b7fc9e2 100644 --- a/official/c48905153.lua +++ b/official/c48905153.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) 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.listed_series={SET_ZOODIAC} function s.ovfilter(c,tp,lc) diff --git a/official/c48928529.lua b/official/c48928529.lua index f35a3d89c7..61ac6e818f 100644 --- a/official/c48928529.lua +++ b/official/c48928529.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=83 function s.operation(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c49032236.lua b/official/c49032236.lua index c116ccf45f..f8325f9e12 100644 --- a/official/c49032236.lua +++ b/official/c49032236.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) e1:SetHintTiming(TIMING_STANDBY_PHASE|TIMING_END_PHASE) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=81 function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c49121795.lua b/official/c49121795.lua index 66ff2b1699..622bdcb1f0 100644 --- a/official/c49121795.lua +++ b/official/c49121795.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.datg) e1:SetOperation(s.daop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --search local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c49202331.lua b/official/c49202331.lua index 92096139fc..1987bddccb 100644 --- a/official/c49202331.lua +++ b/official/c49202331.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCondition(s.atcon) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.atop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={3814632} function s.damtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c49221191.lua b/official/c49221191.lua index 20956828de..7ff2078dec 100644 --- a/official/c49221191.lua +++ b/official/c49221191.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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=32 s.listed_names={65676461} diff --git a/official/c49456901.lua b/official/c49456901.lua index 682c6e1715..345319ccb7 100644 --- a/official/c49456901.lua +++ b/official/c49456901.lua @@ -28,7 +28,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) aux.DoubleSnareValidity(c,LOCATION_MZONE) end s.xyz_number=104 diff --git a/official/c49678559.lua b/official/c49678559.lua index 71c266f884..a184ad305f 100644 --- a/official/c49678559.lua +++ b/official/c49678559.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) --Destruction Replacement local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE) diff --git a/official/c4997565.lua b/official/c4997565.lua index 6c3fe26451..ea1885fe46 100644 --- a/official/c4997565.lua +++ b/official/c4997565.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=3 function s.spfilter(c,e,tp) diff --git a/official/c5014629.lua b/official/c5014629.lua index 00eee45f68..845672b4f8 100644 --- a/official/c5014629.lua +++ b/official/c5014629.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.filter(c) return c:IsFaceup() and c:IsMonster() diff --git a/official/c50260683.lua b/official/c50260683.lua index c10b8cc20e..ec81aabb35 100644 --- a/official/c50260683.lua +++ b/official/c50260683.lua @@ -19,7 +19,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) --destroy local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c50449881.lua b/official/c50449881.lua index fab9815a61..85bbbc0b28 100644 --- a/official/c50449881.lua +++ b/official/c50449881.lua @@ -17,7 +17,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) --Opponent can only target this card for attacks local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c50789693.lua b/official/c50789693.lua index 2f87482d61..33c52d32a4 100644 --- a/official/c50789693.lua +++ b/official/c50789693.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.adop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) -- local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c5088741.lua b/official/c5088741.lua index 0b0061e854..5b91f0fdb6 100644 --- a/official/c5088741.lua +++ b/official/c5088741.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_MZONE) e2:SetCountLimit(1,{id,1}) e2:SetCost(Cost.Detach(1,1,nil)) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Add 1 "A.I." Trap from your Deck to your hand local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c51497409.lua b/official/c51497409.lua index fc18a3e113..df593f92cb 100644 --- a/official/c51497409.lua +++ b/official/c51497409.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.ddtg) e1:SetOperation(s.ddop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --indes local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c51543904.lua b/official/c51543904.lua index 5662c1b0bd..9be8f566df 100644 --- a/official/c51543904.lua +++ b/official/c51543904.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_RANK_UP_MAGIC,SET_NUMBER} s.xyz_number=99 diff --git a/official/c51735257.lua b/official/c51735257.lua index 0c91af6d1d..f3aa3b4bd9 100644 --- a/official/c51735257.lua +++ b/official/c51735257.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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=50 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c51960178.lua b/official/c51960178.lua index 1edaa273b9..5e6bb4e02e 100644 --- a/official/c51960178.lua +++ b/official/c51960178.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) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end diff --git a/official/c52323874.lua b/official/c52323874.lua index 1759ca1ecc..70789d45ab 100644 --- a/official/c52323874.lua +++ b/official/c52323874.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 s.listed_series={SET_RAIDRAPTOR} function s.filter(c) diff --git a/official/c52558805.lua b/official/c52558805.lua index 61ab262e5b..7b196035de 100644 --- a/official/c52558805.lua +++ b/official/c52558805.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_DJINN} function s.filter(c,tp) diff --git a/official/c52653092.lua b/official/c52653092.lua index d98571a9f9..64bd918ea6 100644 --- a/official/c52653092.lua +++ b/official/c52653092.lua @@ -41,7 +41,7 @@ function s.initial_effect(c) e6:SetCondition(s.actcon) e6:SetCost(Cost.Detach(1)) e6:SetOperation(s.actop) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER,SET_RANK_UP_MAGIC,SET_UTOPIA} s.xyz_number=0 diff --git a/official/c53054164.lua b/official/c53054164.lua index a7e89bb770..76c9abd44b 100644 --- a/official/c53054164.lua +++ b/official/c53054164.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Return to the Extra Deck and Special Summon from the GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c53244294.lua b/official/c53244294.lua index 6318f99a6b..dbc16b6607 100644 --- a/official/c53244294.lua +++ b/official/c53244294.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.ztg) e2:SetOperation(s.zop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=57 function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c53334641.lua b/official/c53334641.lua index d2ed66eab2..b854bee499 100644 --- a/official/c53334641.lua +++ b/official/c53334641.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --material local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c53701457.lua b/official/c53701457.lua index 5547f0cf5f..c8891d92bc 100644 --- a/official/c53701457.lua +++ b/official/c53701457.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.damtg) e3:SetOperation(s.damop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=28 function s.dircon(e) diff --git a/official/c53797637.lua b/official/c53797637.lua index 638e9ac3fc..d6ce3a4bc2 100644 --- a/official/c53797637.lua +++ b/official/c53797637.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e1,false,EFFECT_MARKER_DRAGON_RULER) end s.listed_names={53804307}--"Blaster, Dragon Ruler of Infernos" function s.costfilter(c) diff --git a/official/c53804307.lua b/official/c53804307.lua index 89b367e220..51886831e3 100644 --- a/official/c53804307.lua +++ b/official/c53804307.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetCost(s.descost) e3:SetTarget(s.destg) e3:SetOperation(s.desop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e3,false,EFFECT_MARKER_DRAGON_RULER) --Add 1 FIRE Dragon monster from your Deck to your han local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,3)) diff --git a/official/c54135423.lua b/official/c54135423.lua index ae83f7dfda..8e58c05853 100644 --- a/official/c54135423.lua +++ b/official/c54135423.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCondition(s.spcon) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --shuffle local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW) diff --git a/official/c54358015.lua b/official/c54358015.lua index 52516e81ad..137be567ca 100644 --- a/official/c54358015.lua +++ b/official/c54358015.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Prevent effect target local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c54366836.lua b/official/c54366836.lua index c584e4dd53..b18e7b51c2 100644 --- a/official/c54366836.lua +++ b/official/c54366836.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e3:SetCondition(s.damcon2) e3:SetCost(s.damcost2) e3:SetOperation(s.damop2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=54 function s.damcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c54719828.lua b/official/c54719828.lua index 83256f4ce2..05aa18609d 100644 --- a/official/c54719828.lua +++ b/official/c54719828.lua @@ -14,7 +14,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 s.xyz_number=16 function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c5489987.lua b/official/c5489987.lua index c7422be03e..9f05b05873 100644 --- a/official/c5489987.lua +++ b/official/c5489987.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.drcost) e1:SetTarget(s.drtg) e1:SetOperation(s.drop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --atk up local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c5530780.lua b/official/c5530780.lua index dc4cbb0eac..9c5f4d7441 100644 --- a/official/c5530780.lua +++ b/official/c5530780.lua @@ -43,7 +43,7 @@ function s.initial_effect(c) e3:SetCountLimit(1,{id,1}) e3:SetCost(s.atkcost) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) diff --git a/official/c55470553.lua b/official/c55470553.lua index caf3c41252..bda4f9b7ad 100644 --- a/official/c55470553.lua +++ b/official/c55470553.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.postg) e1:SetOperation(s.posop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c55727845.lua b/official/c55727845.lua index 4b4e5c5059..bd2ee51764 100644 --- a/official/c55727845.lua +++ b/official/c55727845.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=96 function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c55935416.lua b/official/c55935416.lua index aff752c2b5..d1b894db89 100644 --- a/official/c55935416.lua +++ b/official/c55935416.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(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) end s.xyz_number=56 function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c56051086.lua b/official/c56051086.lua index 8c4a0c03ff..3d5a9248c3 100644 --- a/official/c56051086.lua +++ b/official/c56051086.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) aux.AddEREquipLimit(c,nil,s.eqval,Card.EquipByEffectAndLimitRegister,e1) --indest local e2=Effect.CreateEffect(c) diff --git a/official/c56292140.lua b/official/c56292140.lua index 0463c0d0f3..6867a1409c 100644 --- a/official/c56292140.lua +++ b/official/c56292140.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.cttg) e2:SetOperation(s.ctop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --destroy local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c56337500.lua b/official/c56337500.lua index 26f9c39eb8..58864c0962 100644 --- a/official/c56337500.lua +++ b/official/c56337500.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.thcost) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c56638325.lua b/official/c56638325.lua index 64f6eaad3d..fdf1128da1 100644 --- a/official/c56638325.lua +++ b/official/c56638325.lua @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.destg) e3:SetOperation(s.desop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,1)) diff --git a/official/c56713174.lua b/official/c56713174.lua index a43852099c..aff01402ba 100644 --- a/official/c56713174.lua +++ b/official/c56713174.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.SelfDiscard) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_THUNDRA) + c:RegisterEffect(e1,false,EFFECT_MARKER_THUNDRA) --Add to hand when banished or sent to the GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c56832966.lua b/official/c56832966.lua index 789fcc002f..8d02e99e40 100644 --- a/official/c56832966.lua +++ b/official/c56832966.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e3:SetCondition(s.atkcon) e3:SetCost(s.atkcost) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_UTOPIA} s.xyz_number=39 diff --git a/official/c56910167.lua b/official/c56910167.lua index 711d63bd70..3a433afe0e 100644 --- a/official/c56910167.lua +++ b/official/c56910167.lua @@ -16,7 +16,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 diff --git a/official/c57031794.lua b/official/c57031794.lua index d696b82ae9..2ca958293c 100644 --- a/official/c57031794.lua +++ b/official/c57031794.lua @@ -23,14 +23,14 @@ 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) --This is a Quick effect if this card has "Super Quantum Red Layer" as Xyz Material local e3=e2:Clone() e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetCode(EVENT_FREE_CHAIN) e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER_E) e3:SetCondition(s.quickeffcond) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Attach 1 "Super Quantum" monster from your hand or field to this card local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,1)) diff --git a/official/c57043117.lua b/official/c57043117.lua index 735e1cd953..ec683b14b6 100644 --- a/official/c57043117.lua +++ b/official/c57043117.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetHintTiming(TIMING_DAMAGE_STEP) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.efilter(e,te) return te:IsMonsterEffect() and te:GetOwner()~=e:GetOwner() diff --git a/official/c57261568.lua b/official/c57261568.lua index 02bb55c49b..6f8a0de876 100644 --- a/official/c57261568.lua +++ b/official/c57261568.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCondition(s.hspcon) e1:SetTarget(s.hsptg) e1:SetOperation(s.hspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --draw local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) diff --git a/official/c57314798.lua b/official/c57314798.lua index 82faeabc0b..acfb964845 100644 --- a/official/c57314798.lua +++ b/official/c57314798.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy as many monsters on the field as possible and each player sets 1 Spell/Trap from the GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c57450198.lua b/official/c57450198.lua index bfc2e3020b..b0d863cf7d 100644 --- a/official/c57450198.lua +++ b/official/c57450198.lua @@ -24,14 +24,14 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - 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 White Layer" as Xyz Material local e3=e2:Clone() e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetCode(EVENT_FREE_CHAIN) e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER_E) e3:SetCondition(s.quickeffcond) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Attach 1 "Super Quantum" monster from your hand or field to this card local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,1)) diff --git a/official/c57707471.lua b/official/c57707471.lua index 2c362ebfce..7fbf337933 100644 --- a/official/c57707471.lua +++ b/official/c57707471.lua @@ -21,7 +21,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) 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=21 function s.ovfilter(c,tp,xyzc) diff --git a/official/c58058134.lua b/official/c58058134.lua index 4d19315e07..4f11743cac 100644 --- a/official/c58058134.lua +++ b/official/c58058134.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.negtg) e2:SetOperation(s.negop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.valcon(e,re,r,rp) return (r&REASON_BATTLE)~=0 diff --git a/official/c58069384.lua b/official/c58069384.lua index 1d8ceca00d..2fdf6a7307 100644 --- a/official/c58069384.lua +++ b/official/c58069384.lua @@ -16,7 +16,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) --Increase ATK by 2100 local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c581014.lua b/official/c581014.lua index 10177b0ce3..974ae8a7cd 100644 --- a/official/c581014.lua +++ b/official/c581014.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) 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.spfilter(c,e,tp) return c:IsNonEffectMonster() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c58201062.lua b/official/c58201062.lua index e789fce69b..5f7d68c1d4 100644 --- a/official/c58201062.lua +++ b/official/c58201062.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.thcost) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e1,false,EFFECT_MARKER_DRAGON_RULER) --Special Summon 1 "Chasmatis, Dragon Ruler of Auroras" from your GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c58504745.lua b/official/c58504745.lua index a44681b601..fd411b8a1d 100644 --- a/official/c58504745.lua +++ b/official/c58504745.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) 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.listed_series={SET_FIRE_FIST,SET_FIRE_FORMATION} function s.filter1(c) diff --git a/official/c58600555.lua b/official/c58600555.lua index 7ff94ad3c4..5a48be649a 100644 --- a/official/c58600555.lua +++ b/official/c58600555.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.tdtg) e2:SetOperation(s.tdop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Change position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c58712976.lua b/official/c58712976.lua index a37e71b6bc..189b2a3289 100644 --- a/official/c58712976.lua +++ b/official/c58712976.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c58720904.lua b/official/c58720904.lua index 85476f5f4d..34dfc1b7c9 100644 --- a/official/c58720904.lua +++ b/official/c58720904.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.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_EXTRA,0)-Duel.GetFieldGroupCount(tp,0,LOCATION_EXTRA)>0 end diff --git a/official/c58820923.lua b/official/c58820923.lua index 7ac8a098a9..5cc9562242 100644 --- a/official/c58820923.lua +++ b/official/c58820923.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.atktg) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=95 function s.ovfilter(c,tp,xyzc) diff --git a/official/c59071624.lua b/official/c59071624.lua index 03f4d12797..e5c3f92b12 100644 --- a/official/c59071624.lua +++ b/official/c59071624.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --If an opponent's monster is in GY/banished due to your effect, special summon local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) @@ -40,10 +40,10 @@ function s.initial_effect(c) e3:SetCondition(s.sscon) e3:SetTarget(s.sstg) e3:SetOperation(s.ssop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) local e4=e3:Clone() e4:SetCode(EVENT_REMOVE) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end --Part of "Traptrix" archetype s.listed_series={SET_TRAPTRIX} diff --git a/official/c5916510.lua b/official/c5916510.lua index 699d1530f2..599b79cd74 100644 --- a/official/c5916510.lua +++ b/official/c5916510.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon itself from the GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c59170782.lua b/official/c59170782.lua index a27a3a7e5e..04f161119c 100644 --- a/official/c59170782.lua +++ b/official/c59170782.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCondition(s.tgcon1) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.tgop1) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Change battle target local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCondition(s.tgcon2) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.tgop2) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c59208943.lua b/official/c59208943.lua index c09dfa1604..c3d231e021 100644 --- a/official/c59208943.lua +++ b/official/c59208943.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - 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)) diff --git a/official/c59242457.lua b/official/c59242457.lua index 404c9516ff..dfdac7124b 100644 --- a/official/c59242457.lua +++ b/official/c59242457.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.rmtg) e2:SetOperation(s.rmop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Return material to Extra Deck local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c59627393.lua b/official/c59627393.lua index 088f8dc455..3d37048b91 100644 --- a/official/c59627393.lua +++ b/official/c59627393.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.listed_series={SET_BATTLIN_BOXER} s.xyz_number=105 diff --git a/official/c60195675.lua b/official/c60195675.lua index fee1aa0390..a52e7923f8 100644 --- a/official/c60195675.lua +++ b/official/c60195675.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCountLimit(1,id) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card from the GY in Defense Position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c60517697.lua b/official/c60517697.lua index 024945a187..a59d5d7679 100644 --- a/official/c60517697.lua +++ b/official/c60517697.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.thcost) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 3 Level 3 or lower Fish, Sea Serpent, and/or Aqua monsters from your hand and/or GY. local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,2)) diff --git a/official/c60645181.lua b/official/c60645181.lua index 230a0a382e..4d7376f41c 100644 --- a/official/c60645181.lua +++ b/official/c60645181.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(2)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c60992364.lua b/official/c60992364.lua index 53a492d947..976cf47e11 100644 --- a/official/c60992364.lua +++ b/official/c60992364.lua @@ -21,7 +21,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) --Equip this card on the field to 1 "Utopia" monster local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c61307542.lua b/official/c61307542.lua index 02c5fa0d30..4a66361639 100644 --- a/official/c61307542.lua +++ b/official/c61307542.lua @@ -39,7 +39,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 function s.efilter(e,re) return re:IsMonsterEffect() and re:GetOwner()~=e:GetOwner() diff --git a/official/c61344030.lua b/official/c61344030.lua index 25d752a5ae..59fe12f3a3 100644 --- a/official/c61344030.lua +++ b/official/c61344030.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --draw local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c61374414.lua b/official/c61374414.lua index 60ba00dbc2..25afbc871d 100644 --- a/official/c61374414.lua +++ b/official/c61374414.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={34876719} diff --git a/official/c61399402.lua b/official/c61399402.lua index a802a8b79d..d0fddc7996 100644 --- a/official/c61399402.lua +++ b/official/c61399402.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.descost) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c6165656.lua b/official/c6165656.lua index af808fc0da..cd4d502ffb 100644 --- a/official/c6165656.lua +++ b/official/c6165656.lua @@ -30,7 +30,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) --win local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c62070231.lua b/official/c62070231.lua index 8add1a1627..cc6c786f45 100644 --- a/official/c62070231.lua +++ b/official/c62070231.lua @@ -18,7 +18,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 s.xyz_number=94 function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c6247535.lua b/official/c6247535.lua index 0185c158f5..7e13a454ac 100644 --- a/official/c6247535.lua +++ b/official/c6247535.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.atktg) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_BORREL} function s.mfilter(c,lc,sumtype,tp) diff --git a/official/c62541668.lua b/official/c62541668.lua index aa87020809..e8cbeb35da 100644 --- a/official/c62541668.lua +++ b/official/c62541668.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,nil)) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Protect itself from destruction local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c62709239.lua b/official/c62709239.lua index 25b822dfe9..f51530087f 100644 --- a/official/c62709239.lua +++ b/official/c62709239.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c6284176.lua b/official/c6284176.lua index ae7d99fc73..c52764d729 100644 --- a/official/c6284176.lua +++ b/official/c6284176.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy replace local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c62967433.lua b/official/c62967433.lua index c4c7987197..908d8e20b4 100644 --- a/official/c62967433.lua +++ b/official/c62967433.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.tdtg) e1:SetOperation(s.tdop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 1 Level 4 monster from your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c63274863.lua b/official/c63274863.lua index c9a1ad46fa..03ec5dd5f1 100644 --- a/official/c63274863.lua +++ b/official/c63274863.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) diff --git a/official/c63746411.lua b/official/c63746411.lua index 022568f146..9fe3874dc7 100644 --- a/official/c63746411.lua +++ b/official/c63746411.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) 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=106 function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c63767246.lua b/official/c63767246.lua index 614ea1ecd2..36900da489 100644 --- a/official/c63767246.lua +++ b/official/c63767246.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCondition(function(e,tp) return Duel.GetAttacker():IsControler(1-tp) and Duel.GetAttackTarget()~=e:GetHandler() end) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetOperation(s.chngtgop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Make 1 of your Xyz monsters gain ATK local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c6387204.lua b/official/c6387204.lua index 1711f1b2e2..bde33d679a 100644 --- a/official/c6387204.lua +++ b/official/c6387204.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCondition(s.lpcon) e2:SetCost(s.lpcost) e2:SetOperation(s.lpop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.xyz_number=6 diff --git a/official/c64245689.lua b/official/c64245689.lua index 415019373a..58e7bc7a0c 100644 --- a/official/c64245689.lua +++ b/official/c64245689.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) 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.tgfilter(c) return c:IsRace(RACE_PLANT) and c:IsAbleToGrave() diff --git a/official/c64276752.lua b/official/c64276752.lua index efdaaf53c8..7e842ca791 100644 --- a/official/c64276752.lua +++ b/official/c64276752.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.atktg) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.indescon(e) return e:GetHandler():IsXyzSummoned() diff --git a/official/c64332231.lua b/official/c64332231.lua index 303c858133..f6bc6a2670 100644 --- a/official/c64332231.lua +++ b/official/c64332231.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.CheckReleaseGroupEx(tp,Card.IsReleasableByEffect,1,nil) diff --git a/official/c64414267.lua b/official/c64414267.lua index ce6eac3c27..f41f5abf80 100644 --- a/official/c64414267.lua +++ b/official/c64414267.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.AND(Cost.Detach(1),Cost.Discard())) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) local e3=e2:Clone() e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetCode(EVENT_FREE_CHAIN) diff --git a/official/c64554883.lua b/official/c64554883.lua index ba7b71d877..93a59b1e79 100644 --- a/official/c64554883.lua +++ b/official/c64554883.lua @@ -18,7 +18,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 s.xyz_number=25 function s.filter(c) diff --git a/official/c64689404.lua b/official/c64689404.lua index 982210b2ff..485cf83396 100644 --- a/official/c64689404.lua +++ b/official/c64689404.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.ractg) e1:SetOperation(s.racop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c65056481.lua b/official/c65056481.lua index a31a1ea486..ff8864a47e 100644 --- a/official/c65056481.lua +++ b/official/c65056481.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - 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) diff --git a/official/c6511113.lua b/official/c6511113.lua index cddd13d667..c344a429b8 100644 --- a/official/c6511113.lua +++ b/official/c6511113.lua @@ -43,7 +43,7 @@ function s.initial_effect(c) e5:SetCost(s.cost) e5:SetTarget(s.target) e5:SetOperation(s.operation) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={id} s.listed_series={SET_TRAPTRIX,SET_TRAP_HOLE,SET_HOLE} diff --git a/official/c65301952.lua b/official/c65301952.lua index c0d2f408a4..08da822755 100644 --- a/official/c65301952.lua +++ b/official/c65301952.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(s.setcost) e2:SetTarget(s.settg) e2:SetOperation(s.setop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkval(e,c) return Duel.GetMatchingGroupCount(Card.IsSpell,c:GetControler(),LOCATION_GRAVE,0,nil)*200 diff --git a/official/c65676461.lua b/official/c65676461.lua index abb212b6e8..87ee6eabce 100644 --- a/official/c65676461.lua +++ b/official/c65676461.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.attg) e1:SetOperation(s.atop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=32 function s.atcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c65884091.lua b/official/c65884091.lua index 5e39011cf1..c8bca23033 100644 --- a/official/c65884091.lua +++ b/official/c65884091.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER|TIMING_END_PHASE) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c65892585.lua b/official/c65892585.lua index 5847cc57ad..e32b74c3dd 100644 --- a/official/c65892585.lua +++ b/official/c65892585.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Return itself to the Extra Deck and Special Summon "Gold Pride - Captain Carrie" local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c66011101.lua b/official/c66011101.lua index ea034abe43..d5ee56a410 100644 --- a/official/c66011101.lua +++ b/official/c66011101.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,nil)) 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 s.xyz_number=60 function s.spfilter(c,e,tp) diff --git a/official/c66506689.lua b/official/c66506689.lua index 97042c10ff..a5ef91aff4 100644 --- a/official/c66506689.lua +++ b/official/c66506689.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.tg) e1:SetOperation(s.op) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.filter(c) return c:IsCanChangePosition() diff --git a/official/c66523544.lua b/official/c66523544.lua index 1f094bfe46..3244964b06 100644 --- a/official/c66523544.lua +++ b/official/c66523544.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:IsSpellTrap() diff --git a/official/c66547759.lua b/official/c66547759.lua index cfc1179963..6841d6e086 100644 --- a/official/c66547759.lua +++ b/official/c66547759.lua @@ -33,7 +33,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) aux.DoubleSnareValidity(c,LOCATION_MZONE) end s.xyz_number=23 diff --git a/official/c6659193.lua b/official/c6659193.lua index b361dfdb9d..cb04fd58cf 100644 --- a/official/c6659193.lua +++ b/official/c6659193.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e4:SetCondition(s.atkcon) e4:SetCost(Cost.Detach(1,1,nil)) e4:SetOperation(s.atkop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={17016362} --"Performage Trapeze Magician" function s.reflectcond(e) diff --git a/official/c66970002.lua b/official/c66970002.lua index 0243afffa6..21cc02ced5 100644 --- a/official/c66970002.lua +++ b/official/c66970002.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 s.listed_series={SET_UTOPIA} s.xyz_number=39 diff --git a/official/c67173574.lua b/official/c67173574.lua index 042a0fb0da..afa51c3a85 100644 --- a/official/c67173574.lua +++ b/official/c67173574.lua @@ -35,7 +35,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.xyz_number=102 s.listed_names={49678559} diff --git a/official/c68300121.lua b/official/c68300121.lua index c160b0e311..afb9715d3a 100644 --- a/official/c68300121.lua +++ b/official/c68300121.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Make the opponent send a monste to the GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c68396121.lua b/official/c68396121.lua index 9b1c926097..9a1521e99e 100644 --- a/official/c68396121.lua +++ b/official/c68396121.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --atk local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c68597372.lua b/official/c68597372.lua index 5c703be317..960532daf6 100644 --- a/official/c68597372.lua +++ b/official/c68597372.lua @@ -24,7 +24,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 function s.atkval(e,c) return c:GetOverlayCount()*300 diff --git a/official/c68618157.lua b/official/c68618157.lua index 03b5bdceb5..f6b96d8067 100644 --- a/official/c68618157.lua +++ b/official/c68618157.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --tohand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -33,7 +33,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) return Duel.IsTurnPlayer(tp) diff --git a/official/c68679595.lua b/official/c68679595.lua index 61d27e8333..d1d71014b3 100644 --- a/official/c68679595.lua +++ b/official/c68679595.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Negate local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c68836428.lua b/official/c68836428.lua index 31ffc3248a..e343873701 100644 --- a/official/c68836428.lua +++ b/official/c68836428.lua @@ -24,7 +24,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 function s.filter(c) return c:IsFaceup() and (c:IsType(TYPE_EFFECT) or c:GetAttack()>0) diff --git a/official/c69058960.lua b/official/c69058960.lua index 2c1dc3f248..d68a0aa8c7 100644 --- a/official/c69058960.lua +++ b/official/c69058960.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) --cannot be destroyed local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c69069911.lua b/official/c69069911.lua index 101b95d656..52497ebd0b 100644 --- a/official/c69069911.lua +++ b/official/c69069911.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCondition(s.atcon) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.atop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.atcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c69170557.lua b/official/c69170557.lua index 46347996b7..a1cb897824 100644 --- a/official/c69170557.lua +++ b/official/c69170557.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.cttg) e2:SetOperation(s.ctop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.counter_place_list={0x1024} s.xyz_number=40 diff --git a/official/c69610924.lua b/official/c69610924.lua index f78a83e51f..d9c1f4b0dc 100644 --- a/official/c69610924.lua +++ b/official/c69610924.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --cannot direct attack local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c69655484.lua b/official/c69655484.lua index afc3310e34..ee2dc16b0a 100644 --- a/official/c69655484.lua +++ b/official/c69655484.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.edsptg) e1:SetOperation(s.edspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Add 1 "Rank-Up-Magic" Spell from your Deck to your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetCost(s.thcost) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 1 "Performage" monster from your GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c69757518.lua b/official/c69757518.lua index b324fab321..de1410d44f 100644 --- a/official/c69757518.lua +++ b/official/c69757518.lua @@ -21,7 +21,7 @@ function s.initial_effect(c) e2:SetCondition(s.atcon) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.atop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) local e3=Effect.CreateEffect(c) e3:SetCategory(CATEGORY_TODECK) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) diff --git a/official/c6983839.lua b/official/c6983839.lua index 895e6a3a34..c4b64dee35 100644 --- a/official/c6983839.lua +++ b/official/c6983839.lua @@ -18,7 +18,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,chkc) if chkc then return chkc:IsOnField() and chkc:IsSpellTrap() end diff --git a/official/c69840739.lua b/official/c69840739.lua index 14fff4fadd..a358a9f688 100644 --- a/official/c69840739.lua +++ b/official/c69840739.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local event_chaining,_,_,event_value,reason_effect,_,reason_player=Duel.CheckEvent(EVENT_CHAINING,true) diff --git a/official/c698785.lua b/official/c698785.lua index 2ad536d2b4..b2293f7dec 100644 --- a/official/c698785.lua +++ b/official/c698785.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.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_MZONE,LOCATION_MZONE,1,e:GetHandler()) end diff --git a/official/c7020743.lua b/official/c7020743.lua index 31e4a756cb..8b57528695 100644 --- a/official/c7020743.lua +++ b/official/c7020743.lua @@ -51,7 +51,7 @@ function s.initial_effect(c) e6:SetCost(Cost.Detach(4,4,nil)) e6:SetTarget(s.destg) e6:SetOperation(s.desop) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) end function s.atchtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():IsType(TYPE_XYZ) and Duel.GetFieldGroupCount(0,LOCATION_GRAVE,LOCATION_GRAVE)>0 end diff --git a/official/c70636044.lua b/official/c70636044.lua index 587de791f3..f5e4899135 100644 --- a/official/c70636044.lua +++ b/official/c70636044.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --At start of Damage Step, destroy 1 card on the field local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c71068247.lua b/official/c71068247.lua index 7517add1d1..f9b918e92d 100644 --- a/official/c71068247.lua +++ b/official/c71068247.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --ATK decrease local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c71612253.lua b/official/c71612253.lua index 400e9a9e8d..6204352e32 100644 --- a/official/c71612253.lua +++ b/official/c71612253.lua @@ -18,7 +18,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) --to grave local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_TOGRAVE) diff --git a/official/c7194917.lua b/official/c7194917.lua index 0c75514c72..e1241cbdfd 100644 --- a/official/c7194917.lua +++ b/official/c7194917.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.adop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --pos local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c72409226.lua b/official/c72409226.lua index 28dda806dc..082be83783 100644 --- a/official/c72409226.lua +++ b/official/c72409226.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.deckspthtg) e1:SetOperation(s.deckspthop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Add up to 2 cards attached to this card to your hand, including at least 1 "Materiactor" card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c72971064.lua b/official/c72971064.lua index 8e39571436..9679da9925 100644 --- a/official/c72971064.lua +++ b/official/c72971064.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.retopthtg) e2:SetOperation(s.retopthop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Add 1 "Lyrilusc" monster from your GY to your hand, except this card local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c73082255.lua b/official/c73082255.lua index 092b8e2832..20bc7c52f7 100644 --- a/official/c73082255.lua +++ b/official/c73082255.lua @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) e3:SetTarget(s.gytg) e3:SetOperation(s.gyop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end function s.lvtg(e,c) return c:IsLevelAbove(1) and c:GetOwner()~=e:GetHandlerPlayer() diff --git a/official/c73289035.lua b/official/c73289035.lua index 6f1a3a21fd..5dc2a6e6b2 100644 --- a/official/c73289035.lua +++ b/official/c73289035.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) --spsummon local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) diff --git a/official/c73347079.lua b/official/c73347079.lua index eb36df3333..d851a4c152 100644 --- a/official/c73347079.lua +++ b/official/c73347079.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end function s.adval(e,c) return Duel.GetMatchingGroupCount(aux.FaceupFilter(Card.IsRace,RACE_WINGEDBEAST),c:GetControler(),LOCATION_MZONE,0,c)*500 diff --git a/official/c73445448.lua b/official/c73445448.lua index 1da10ee77e..30c7957d1d 100644 --- a/official/c73445448.lua +++ b/official/c73445448.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(s.cost) 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=22 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c73659078.lua b/official/c73659078.lua index 3921d25765..307cf9dd50 100644 --- a/official/c73659078.lua +++ b/official/c73659078.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.countertg) e1:SetOperation(s.counterop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Non-WATER monsters lose 200 ATK for each Ice Counter on the field local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c73887236.lua b/official/c73887236.lua index f9ad3a88d9..aaea9da5ea 100644 --- a/official/c73887236.lua +++ b/official/c73887236.lua @@ -21,7 +21,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 function s.atkfilter(e,c) return c:IsSpecialSummoned() diff --git a/official/c73964868.lua b/official/c73964868.lua index 32b6bdefe4..d9952e7f7e 100644 --- a/official/c73964868.lua +++ b/official/c73964868.lua @@ -18,7 +18,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.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsOnField() and chkc:IsAbleToHand() end diff --git a/official/c74294676.lua b/official/c74294676.lua index cc156d6d9d..e630b27e30 100644 --- a/official/c74294676.lua +++ b/official/c74294676.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2,2,nil)) e1:SetTarget(s.target1) e1:SetOperation(s.operation1) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Negate Normal Summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -29,12 +29,12 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,nil)) e2:SetTarget(s.target2) e2:SetOperation(s.operation2) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Negate Special Summon local e3=e2:Clone() e3:SetDescription(aux.Stringid(id,2)) e3:SetCode(EVENT_SPSUMMON) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) aux.DoubleSnareValidity(c,LOCATION_MZONE) end function s.condition1(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c74371660.lua b/official/c74371660.lua index eb896095a2..aa995ed37f 100644 --- a/official/c74371660.lua +++ b/official/c74371660.lua @@ -25,7 +25,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 function s.dscon(e) return e:GetHandler():GetOverlayCount()~=0 diff --git a/official/c74416224.lua b/official/c74416224.lua index 7ccc59df4b..5f402ba261 100644 --- a/official/c74416224.lua +++ b/official/c74416224.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) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end diff --git a/official/c74593218.lua b/official/c74593218.lua index 201b9b5e02..85a0531fe9 100644 --- a/official/c74593218.lua +++ b/official/c74593218.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) aux.DoubleSnareValidity(c,LOCATION_MZONE) end function s.negcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75083197.lua b/official/c75083197.lua index c6324143fc..d350b04ec9 100644 --- a/official/c75083197.lua +++ b/official/c75083197.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={id} --Filter for cards summoned from GY diff --git a/official/c75253697.lua b/official/c75253697.lua index 5d63e13785..dc8620c56a 100644 --- a/official/c75253697.lua +++ b/official/c75253697.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=72 function s.dfilter(c,pos) diff --git a/official/c75367227.lua b/official/c75367227.lua index fdb3c2d2af..5ff8096065 100644 --- a/official/c75367227.lua +++ b/official/c75367227.lua @@ -24,7 +24,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) -- local e3=Effect.CreateEffect(c) e3:SetCategory(CATEGORY_TOHAND) diff --git a/official/c75402014.lua b/official/c75402014.lua index 6f35359494..e04799ceda 100644 --- a/official/c75402014.lua +++ b/official/c75402014.lua @@ -41,7 +41,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 s.listed_series={SET_ZW} s.xyz_number=39 diff --git a/official/c75433814.lua b/official/c75433814.lua index 12a7ca0942..7cbf22ca2b 100644 --- a/official/c75433814.lua +++ b/official/c75433814.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.cttg) e1:SetOperation(s.ctop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy monsters with String counters and burn 500 for each local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c75574498.lua b/official/c75574498.lua index 527114299a..debd577791 100644 --- a/official/c75574498.lua +++ b/official/c75574498.lua @@ -41,7 +41,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1)) e4:SetTarget(s.sptg2) e4:SetOperation(s.spop2) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={81587028} --"Box of Friends" function s.spcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75620895.lua b/official/c75620895.lua index 7a0717cf40..2e5f33665a 100644 --- a/official/c75620895.lua +++ b/official/c75620895.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) end function s.filter(c) return c:IsFaceup() and c:IsType(TYPE_XYZ) diff --git a/official/c75797046.lua b/official/c75797046.lua index 4b4cf51119..07c90db3f7 100644 --- a/official/c75797046.lua +++ b/official/c75797046.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.rettg) e1:SetOperation(s.retop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_BUTTERSPY} function s.rettg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c75840616.lua b/official/c75840616.lua index f1f28afd54..eb1a9e4aa9 100644 --- a/official/c75840616.lua +++ b/official/c75840616.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) --attack all local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c75878039.lua b/official/c75878039.lua index 87b96fe415..18ab174d99 100644 --- a/official/c75878039.lua +++ b/official/c75878039.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) diff --git a/official/c7593748.lua b/official/c7593748.lua index c0c55e30d4..490debf65b 100644 --- a/official/c7593748.lua +++ b/official/c7593748.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(2)) e1:SetTarget(s.cttg) e1:SetOperation(s.ctop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --level local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c76067258.lua b/official/c76067258.lua index 2f256c8cc4..bf2cdd90d8 100644 --- a/official/c76067258.lua +++ b/official/c76067258.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) --desrep local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE) diff --git a/official/c7628844.lua b/official/c7628844.lua index 86a00db2db..2cc0f3d7f4 100644 --- a/official/c7628844.lua +++ b/official/c7628844.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --This card can make a second attack during each Battle Phase local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c76290637.lua b/official/c76290637.lua index 001b0808e9..9e4575e99d 100644 --- a/official/c76290637.lua +++ b/official/c76290637.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card from your GY to either field in Defense Position local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c76372778.lua b/official/c76372778.lua index 68dce6c70c..0b6cbacc0d 100644 --- a/official/c76372778.lua +++ b/official/c76372778.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCondition(s.condition) e1:SetCost(Cost.Detach(1)) 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) local c=e:GetHandler() diff --git a/official/c76419637.lua b/official/c76419637.lua index 9fa0969f30..9fffb55ebc 100644 --- a/official/c76419637.lua +++ b/official/c76419637.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) 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={40424929} function s.dccon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c76589815.lua b/official/c76589815.lua index ee8103f83f..8a211902a1 100644 --- a/official/c76589815.lua +++ b/official/c76589815.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(2)) e3:SetTarget(s.cftg) e3:SetOperation(s.cfop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_BATTLIN_BOXER} function s.atfilter(c) diff --git a/official/c770365.lua b/official/c770365.lua index 0b50308b0a..ef2084ffd3 100644 --- a/official/c770365.lua +++ b/official/c770365.lua @@ -22,7 +22,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.listed_series={SET_SPELLBOOK} function s.atkval(e,c) diff --git a/official/c77205367.lua b/official/c77205367.lua index 0645029858..6ad258b2ed 100644 --- a/official/c77205367.lua +++ b/official/c77205367.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.atktg) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=96 s.listed_names={55727845} diff --git a/official/c77571454.lua b/official/c77571454.lua index a859b0987c..cd1cffe2e5 100644 --- a/official/c77571454.lua +++ b/official/c77571454.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) e3:SetTarget(s.namechangetg) e3:SetOperation(s.namechangeop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Negate the activated effects of "Unknown" your opponent controls local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c77799846.lua b/official/c77799846.lua index a0963e8221..526aae1559 100644 --- a/official/c77799846.lua +++ b/official/c77799846.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c78135071.lua b/official/c78135071.lua index 21ba21d060..2af87057fd 100644 --- a/official/c78135071.lua +++ b/official/c78135071.lua @@ -40,7 +40,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) diff --git a/official/c78144171.lua b/official/c78144171.lua index 48864c20c4..d84d254498 100644 --- a/official/c78144171.lua +++ b/official/c78144171.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.ovfilter(c,tp,lc) return c:IsFaceup() and c:IsRace(RACE_DRAGON,lc,SUMMON_TYPE_XYZ,tp) and c:IsAttribute(ATTRIBUTE_DARK,lc,SUMMON_TYPE_XYZ,tp) and c:IsLevelAbove(5) diff --git a/official/c78486968.lua b/official/c78486968.lua index e2bb0a83ce..38381d5dc5 100644 --- a/official/c78486968.lua +++ b/official/c78486968.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetTarget(s.tg) e1:SetOperation(s.op) - c:RegisterEffect(e1,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e1,false,EFFECT_MARKER_TELLAR) end s.listed_series={SET_CONSTELLAR} function s.filter(c) diff --git a/official/c78625448.lua b/official/c78625448.lua index 999d7f6298..1274d9537a 100644 --- a/official/c78625448.lua +++ b/official/c78625448.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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.listed_series={SET_NUMERON} s.xyz_number=3 diff --git a/official/c79210531.lua b/official/c79210531.lua index b61c52e710..aca1943810 100644 --- a/official/c79210531.lua +++ b/official/c79210531.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCountLimit(1,{id,1}) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e2,false,EFFECT_MARKER_TELLAR) local e3=e2:Clone() e3:SetCode(EVENT_FLIP_SUMMON_SUCCESS) c:RegisterEffect(e3) diff --git a/official/c79559912.lua b/official/c79559912.lua index ef0164ef84..8290d1f607 100644 --- a/official/c79559912.lua +++ b/official/c79559912.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Search 1 "Dark Contract" card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,2)) diff --git a/official/c79625003.lua b/official/c79625003.lua index b693e8b278..77e60086e6 100644 --- a/official/c79625003.lua +++ b/official/c79625003.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1)) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,2)) diff --git a/official/c80117527.lua b/official/c80117527.lua index 346eaa7cb2..b57d7dcff2 100644 --- a/official/c80117527.lua +++ b/official/c80117527.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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=11 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c80630522.lua b/official/c80630522.lua index 5963d630fe..ee51e2c27b 100644 --- a/official/c80630522.lua +++ b/official/c80630522.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetCondition(s.spcon) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --Draw 1 local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_DRAW) diff --git a/official/c80764541.lua b/official/c80764541.lua index 71d49b9986..898fa8adf7 100644 --- a/official/c80764541.lua +++ b/official/c80764541.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=44 function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c80796456.lua b/official/c80796456.lua index ca3ca83f8b..d7a66ccbde 100644 --- a/official/c80796456.lua +++ b/official/c80796456.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --atkup local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c80993256.lua b/official/c80993256.lua index b80f68a11f..31e7494a76 100644 --- a/official/c80993256.lua +++ b/official/c80993256.lua @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) e3:SetTarget(s.negtg) e3:SetOperation(s.negop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end function s.matkval(e,c) local oc=e:GetHandler():GetOverlayCount() diff --git a/official/c81122844.lua b/official/c81122844.lua index 6c0cf8f61a..a5ae8638b7 100644 --- a/official/c81122844.lua +++ b/official/c81122844.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --salvage local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_TOHAND) @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_WIND_UP} function s.spfilter(c,e,tp) diff --git a/official/c8165596.lua b/official/c8165596.lua index 551e6339d1..8ca63e30e8 100644 --- a/official/c8165596.lua +++ b/official/c8165596.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,function(e,og) e:SetLabel(og:GetFirst():IsSetCard(SET_GALAXY) and 1 or 0) end)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Take 1 "Photon" or "Galaxy" card from your Deck, and either add it to your hand or attach it to this card as material local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c81927732.lua b/official/c81927732.lua index 96945522f5..312d3dc8ec 100644 --- a/official/c81927732.lua +++ b/official/c81927732.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCondition(s.condition) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --atk/def local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE) diff --git a/official/c82308875.lua b/official/c82308875.lua index bc6150a44d..9c88e3c42f 100644 --- a/official/c82308875.lua +++ b/official/c82308875.lua @@ -14,7 +14,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.roll_dice=true s.xyz_number=7 diff --git a/official/c82633039.lua b/official/c82633039.lua index 75e31e32e7..54b8fad727 100644 --- a/official/c82633039.lua +++ b/official/c82633039.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.settg) e1:SetOperation(s.setop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Shuffle 1 face-up card into the Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,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.setfilter(c) return c:IsFaceup() and c:IsCanTurnSet() diff --git a/official/c82697249.lua b/official/c82697249.lua index 4137fc4ce4..48f872c583 100644 --- a/official/c82697249.lua +++ b/official/c82697249.lua @@ -25,7 +25,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 s.xyz_number=59 function s.imcon(e) diff --git a/official/c82944432.lua b/official/c82944432.lua index 13d9366581..23c5c0a5b5 100644 --- a/official/c82944432.lua +++ b/official/c82944432.lua @@ -17,7 +17,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 s.listed_series={SET_NINJA} function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c83107873.lua b/official/c83107873.lua index 3369250cb0..18edeec8e9 100644 --- a/official/c83107873.lua +++ b/official/c83107873.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(Cost.SelfDiscard) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_THUNDRA) + c:RegisterEffect(e1,false,EFFECT_MARKER_THUNDRA) --to deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c83531441.lua b/official/c83531441.lua index e79de849a4..ca8cdac92a 100644 --- a/official/c83531441.lua +++ b/official/c83531441.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(s.atkcost) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --to defense local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c83827392.lua b/official/c83827392.lua index 94dc837451..768f11bcff 100644 --- a/official/c83827392.lua +++ b/official/c83827392.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,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) local e3=e2:Clone() e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetCode(EVENT_FREE_CHAIN) diff --git a/official/c84013237.lua b/official/c84013237.lua index fe76882a43..b6c288d8c1 100644 --- a/official/c84013237.lua +++ b/official/c84013237.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_ATTACK_ANNOUNCE) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetOperation(function() Duel.NegateAttack() end) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Self destroy local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c84025439.lua b/official/c84025439.lua index a6a5f24397..b8e60ffe61 100644 --- a/official/c84025439.lua +++ b/official/c84025439.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.tdtg) e1:SetOperation(s.tdop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Unaffected by other effects local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c84124261.lua b/official/c84124261.lua index c80ce25f77..e8b2c7207f 100644 --- a/official/c84124261.lua +++ b/official/c84124261.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=39 function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c84224627.lua b/official/c84224627.lua index d8dd9fa5cd..6bdc72f2cf 100644 --- a/official/c84224627.lua +++ b/official/c84224627.lua @@ -26,7 +26,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 function s.indcon(e) return e:GetHandler():GetOverlayGroup():IsExists(Card.IsAttribute,1,nil,ATTRIBUTE_WATER) diff --git a/official/c84401683.lua b/official/c84401683.lua index b5bc6862dd..c439d394d1 100644 --- a/official/c84401683.lua +++ b/official/c84401683.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c84417082.lua b/official/c84417082.lua index f6162836f6..46abe584d7 100644 --- a/official/c84417082.lua +++ b/official/c84417082.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost1) e1:SetTarget(s.target1) e1:SetOperation(s.operation1) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy2 local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(s.cost2) e2:SetTarget(s.target2) e2:SetOperation(s.operation2) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=91 function s.cost1(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c8491961.lua b/official/c8491961.lua index c56db3d31f..84a7137642 100644 --- a/official/c8491961.lua +++ b/official/c8491961.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():IsXyzSummoned() and e:GetHandler():GetOverlayCount()>0 diff --git a/official/c85004150.lua b/official/c85004150.lua index 68b940e8e9..10125e445e 100644 --- a/official/c85004150.lua +++ b/official/c85004150.lua @@ -15,7 +15,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) -- local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c85115440.lua b/official/c85115440.lua index bebd614c8c..3d2ea8485e 100644 --- a/official/c85115440.lua +++ b/official/c85115440.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) diff --git a/official/c85121942.lua b/official/c85121942.lua index 48d93db8b0..33ac6e8bfb 100644 --- a/official/c85121942.lua +++ b/official/c85121942.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 s.xyz_number=105 s.listed_names={59627393} diff --git a/official/c85252081.lua b/official/c85252081.lua index b817120fab..0b9f356ef7 100644 --- a/official/c85252081.lua +++ b/official/c85252081.lua @@ -23,14 +23,14 @@ 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) --This is a Quick effect if this card has "Super Quantum Blue Layer" as Xyz Material local e3=e2:Clone() e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetCode(EVENT_FREE_CHAIN) e3:SetHintTiming(0,TIMING_END_PHASE|TIMING_EQUIP) e3:SetCondition(s.quickeffcond) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Attach 1 "Super Quantum" monster from your hand or field to this card local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,1)) diff --git a/official/c85692042.lua b/official/c85692042.lua index 4c692b12b3..4a8a1fbee3 100644 --- a/official/c85692042.lua +++ b/official/c85692042.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.thcost) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,4)) diff --git a/official/c85747929.lua b/official/c85747929.lua index da4ecc0972..28a6608cd7 100644 --- a/official/c85747929.lua +++ b/official/c85747929.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.target) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Change levels to 4 or 8 local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/official/c8617563.lua b/official/c8617563.lua index 677ede23ab..f17f2ae311 100644 --- a/official/c8617563.lua +++ b/official/c8617563.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.settg) e1:SetOperation(s.setop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Search 1 "Rank-Up-Magic" Spell if it has a Winged Beast monster attached local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --A "Raidraptor" Xyz Monster that has this card as material gains ATK local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_XMATERIAL) diff --git a/official/c86221741.lua b/official/c86221741.lua index 3a596207cd..b2c08d0acd 100644 --- a/official/c86221741.lua +++ b/official/c86221741.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_MZONE) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Minus 1000 ATK for opp cards, optionally inflict damage local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) diff --git a/official/c86238081.lua b/official/c86238081.lua index 006562df9d..b784f96cb9 100644 --- a/official/c86238081.lua +++ b/official/c86238081.lua @@ -49,7 +49,7 @@ function s.initial_effect(c) e5:SetCost(Cost.Detach(1)) e5:SetTarget(s.destg) e5:SetOperation(s.desop) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) --Place itself into pendulum zone local e6=Effect.CreateEffect(c) e6:SetDescription(aux.Stringid(id,2)) diff --git a/official/c86331741.lua b/official/c86331741.lua index df0b279d8e..6cdf61c29d 100644 --- a/official/c86331741.lua +++ b/official/c86331741.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Xyz Material local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c86466163.lua b/official/c86466163.lua index 5f53ad6818..27f250b207 100644 --- a/official/c86466163.lua +++ b/official/c86466163.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e1:SetCountLimit(1,id) 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) diff --git a/official/c86532744.lua b/official/c86532744.lua index bb03b6a0cd..55b7d965c0 100644 --- a/official/c86532744.lua +++ b/official/c86532744.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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=39 s.listed_names={84013237} --Number 39: Utopia diff --git a/official/c86848580.lua b/official/c86848580.lua index 35dab939df..a64ac774f0 100644 --- a/official/c86848580.lua +++ b/official/c86848580.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.distg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(Card.IsNegatable,tp,0,LOCATION_ONFIELD,1,nil) end diff --git a/official/c87257460.lua b/official/c87257460.lua index cce2645829..8e188d9faa 100644 --- a/official/c87257460.lua +++ b/official/c87257460.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) e3:SetLabelObject(e1) - c:RegisterEffect(e3,false,REGISTER_FLAG_ALLURE_LVUP) + c:RegisterEffect(e3,false,EFFECT_MARKER_ALLURE_LVUP) end s.listed_names={23756165} --"Allure Queen LV5" s.LVnum=3 diff --git a/official/c87327776.lua b/official/c87327776.lua index 1ecd971db6..6ed6c41581 100644 --- a/official/c87327776.lua +++ b/official/c87327776.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Return 1 monster on the field to the hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c87676171.lua b/official/c87676171.lua index 1a65fd39fb..ad714dbd12 100644 --- a/official/c87676171.lua +++ b/official/c87676171.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCondition(function(e) return e:GetHandler():GetOverlayGroup():IsExists(Card.IsCode,1,nil,CARD_CRYSTAL_GOD_TISTINA) end) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 1 "Tistina" monster from the GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c87911394.lua b/official/c87911394.lua index a5101c7240..8ab6016d70 100644 --- a/official/c87911394.lua +++ b/official/c87911394.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.atktg) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_UTOPIA} s.xyz_number=39 diff --git a/official/c88021907.lua b/official/c88021907.lua index 935136a9dd..e335ab044b 100644 --- a/official/c88021907.lua +++ b/official/c88021907.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.tg) e1:SetOperation(s.op) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destruction replacement for "Mathmech" cards local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c88120966.lua b/official/c88120966.lua index 992421ce79..55a8ce5de0 100644 --- a/official/c88120966.lua +++ b/official/c88120966.lua @@ -17,7 +17,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 s.xyz_number=15 function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c88177324.lua b/official/c88177324.lua index eca497cf1d..b0099b3493 100644 --- a/official/c88177324.lua +++ b/official/c88177324.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Can gain ATK and make a second attack local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c88581108.lua b/official/c88581108.lua index 688641714b..a7130c029c 100644 --- a/official/c88581108.lua +++ b/official/c88581108.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.attg) e1:SetOperation(s.atop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --"True Draco" and "True King" opponent destruction flag local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c88722973.lua b/official/c88722973.lua index 7a1e0f0f4f..026e35be63 100644 --- a/official/c88722973.lua +++ b/official/c88722973.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_DRACOSLAYER} function s.regtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c88754763.lua b/official/c88754763.lua index 109cd29f59..5be903838e 100644 --- a/official/c88754763.lua +++ b/official/c88754763.lua @@ -24,7 +24,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 function s.condition(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_XYZ) diff --git a/official/c88917691.lua b/official/c88917691.lua index a69cef9132..e13b48b91c 100644 --- a/official/c88917691.lua +++ b/official/c88917691.lua @@ -17,7 +17,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) --A "Utopic Future" Xyz Monster that has this card as material gains this effect. --● If it is Xyz Summoned: Activate this effect; it can make a second attack during each Battle Phase this turn. local e2=Effect.CreateEffect(c) diff --git a/official/c88942504.lua b/official/c88942504.lua index e10b5fa541..5a0e67895c 100644 --- a/official/c88942504.lua +++ b/official/c88942504.lua @@ -17,7 +17,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 s.listed_series={SET_DJINN} function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c89185742.lua b/official/c89185742.lua index 6070ca9e96..1f1851f3c9 100644 --- a/official/c89185742.lua +++ b/official/c89185742.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e1,false,EFFECT_MARKER_DRAGON_RULER) end s.listed_names={89399912} --"Tempest, Dragon Ruler of Storms" function s.costfilter(c) diff --git a/official/c89399912.lua b/official/c89399912.lua index 6c7d8e8763..224811ab18 100644 --- a/official/c89399912.lua +++ b/official/c89399912.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetCost(s.thdrgncost) e3:SetTarget(s.thdrgntg) e3:SetOperation(s.thdrgnop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e3,false,EFFECT_MARKER_DRAGON_RULER) --Add 1 WIND Dragon monster from your Deck to your hand local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,3)) diff --git a/official/c89477759.lua b/official/c89477759.lua index 8fd853d89c..b46d2df2e7 100644 --- a/official/c89477759.lua +++ b/official/c89477759.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Destroy and Special Summon (Battle Phase) local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c89516305.lua b/official/c89516305.lua index 7377f3a1ca..a1b8f864a9 100644 --- a/official/c89516305.lua +++ b/official/c89516305.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.sttg) e1:SetOperation(s.stop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --turn set local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(s.cost) e2:SetTarget(s.settg) e2:SetOperation(s.setop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --atkup local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) @@ -42,7 +42,7 @@ function s.initial_effect(c) e3:SetCost(s.cost) e3:SetTarget(s.atktg) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=87 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c89642993.lua b/official/c89642993.lua index fc6824d4df..ec07df051e 100644 --- a/official/c89642993.lua +++ b/official/c89642993.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.eftg) e1:SetOperation(s.efop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=63 function s.eftg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c89818984.lua b/official/c89818984.lua index 2490bed519..f108c92f25 100644 --- a/official/c89818984.lua +++ b/official/c89818984.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCondition(s.hspcon) e1:SetTarget(s.hsptg) e1:SetOperation(s.hspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --draw local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) diff --git a/official/c90098780.lua b/official/c90098780.lua index 89a7f42a2d..d70baf525a 100644 --- a/official/c90098780.lua +++ b/official/c90098780.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.atktg) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_DJINN} function s.filter(c,e,tp) diff --git a/official/c90162951.lua b/official/c90162951.lua index 4122587829..12840437de 100644 --- a/official/c90162951.lua +++ b/official/c90162951.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1,1,nil)) e4:SetTarget(s.destg) e4:SetOperation(s.desop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --Register flag in order to avoid some loops with certain anime cards local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c90411554.lua b/official/c90411554.lua index 9c2d886bb8..9e93950e7e 100644 --- a/official/c90411554.lua +++ b/official/c90411554.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetCost(s.spcost) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e3,false,EFFECT_MARKER_DRAGON_RULER) --Add 1 EARTH Dragon-Type monster from your Deck to your hand local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,3)) diff --git a/official/c90664857.lua b/official/c90664857.lua index c28655f86e..ed66ee57d5 100644 --- a/official/c90664857.lua +++ b/official/c90664857.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.indtg) e1:SetOperation(s.indop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Banish a battled monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c90726340.lua b/official/c90726340.lua index 88d50d9a6a..cc379f315e 100644 --- a/official/c90726340.lua +++ b/official/c90726340.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.indtg(e,c) return c:IsRace(RACE_DRAGON) and c:GetCode()~=id diff --git a/official/c90809975.lua b/official/c90809975.lua index 2634b38072..a48eb02319 100644 --- a/official/c90809975.lua +++ b/official/c90809975.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Negate activation local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c91020571.lua b/official/c91020571.lua index 380f0c7b66..06f83e8178 100644 --- a/official/c91020571.lua +++ b/official/c91020571.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e1,false,EFFECT_MARKER_DRAGON_RULER) end s.listed_names={90411554} --"Redox, Dragon Ruler of Boulders" function s.costfilter(c) diff --git a/official/c91279700.lua b/official/c91279700.lua index d29fc6fdf0..07fac66b00 100644 --- a/official/c91279700.lua +++ b/official/c91279700.lua @@ -24,7 +24,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.listed_series={SET_INFESTATION,SET_LSWARM} function s.dscon(e) diff --git a/official/c91499077.lua b/official/c91499077.lua index 95d5f49d6a..da3ceffd5c 100644 --- a/official/c91499077.lua +++ b/official/c91499077.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.attg) e1:SetOperation(s.atop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --When your monster is targeted for attack, change the attack target to this card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c9161357.lua b/official/c9161357.lua index ea65f59c72..57aec67ad0 100644 --- a/official/c9161357.lua +++ b/official/c9161357.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_MZONE) e2:SetCost(s.lpcost) e2:SetOperation(s.lpop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.xyz_number=6 diff --git a/official/c91895091.lua b/official/c91895091.lua index fef2e442aa..1130ea831a 100644 --- a/official/c91895091.lua +++ b/official/c91895091.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) --spsummon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c92661479.lua b/official/c92661479.lua index c136204f66..a279fa791d 100644 --- a/official/c92661479.lua +++ b/official/c92661479.lua @@ -17,7 +17,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,chk) local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION) diff --git a/official/c9272381.lua b/official/c9272381.lua index f5f72f64d8..e4ce7627a2 100644 --- a/official/c9272381.lua +++ b/official/c9272381.lua @@ -43,7 +43,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1)) e4:SetTarget(s.target) e4:SetOperation(s.operation) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end function s.ovfilter(c,tp,xyzc) return c:IsFaceup() and c:IsSetCard(SET_TELLARKNIGHT,xyzc,SUMMON_TYPE_XYZ,tp) and c:IsType(TYPE_XYZ,xyzc,SUMMON_TYPE_XYZ,tp) diff --git a/official/c92918648.lua b/official/c92918648.lua index 70ff6c57c4..fcc06f657e 100644 --- a/official/c92918648.lua +++ b/official/c92918648.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 s.listed_series={SET_SPELLBOOK} function s.cfilter(c) diff --git a/official/c93039339.lua b/official/c93039339.lua index 0dd1142857..b12050ac8f 100644 --- a/official/c93039339.lua +++ b/official/c93039339.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Register Special Summons from the Extra Deck aux.GlobalCheck(s,function() local ge1=Effect.CreateEffect(c) diff --git a/official/c93568288.lua b/official/c93568288.lua index b98966ec24..b307cb05c9 100644 --- a/official/c93568288.lua +++ b/official/c93568288.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.rmtg) e2:SetOperation(s.rmop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=80 function s.filter(c) diff --git a/official/c93713837.lua b/official/c93713837.lua index a64f66f7b0..c434818ad2 100644 --- a/official/c93713837.lua +++ b/official/c93713837.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.postg) e1:SetOperation(s.posop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c93730230.lua b/official/c93730230.lua index b9bfbc4a73..df496c2044 100644 --- a/official/c93730230.lua +++ b/official/c93730230.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c94119480.lua b/official/c94119480.lua index 55949edd1d..f4c1383203 100644 --- a/official/c94119480.lua +++ b/official/c94119480.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) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and chkc:IsFaceup() end diff --git a/official/c94151981.lua b/official/c94151981.lua index 441ef5b0ae..28480485b9 100644 --- a/official/c94151981.lua +++ b/official/c94151981.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(2,2,nil)) e2:SetTarget(s.drwtg) e2:SetOperation(s.drwop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Your opponent cannot activate cards or effects if the equipped monster battles local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c94380860.lua b/official/c94380860.lua index 1f87da22d3..92cfe1824f 100644 --- a/official/c94380860.lua +++ b/official/c94380860.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER_E) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=103 function s.filter(c,e) diff --git a/official/c9453320.lua b/official/c9453320.lua index 561d1d8bf7..4017f958aa 100644 --- a/official/c9453320.lua +++ b/official/c9453320.lua @@ -39,7 +39,7 @@ function s.initial_effect(c) e4:SetCost(Cost.Detach(1,1,nil)) e4:SetTarget(s.settg) e4:SetOperation(s.setop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_ABYSS} function s.spfilter(c,e,tp) diff --git a/official/c94655777.lua b/official/c94655777.lua index 37c74763ba..83b66ddc4e 100644 --- a/official/c94655777.lua +++ b/official/c94655777.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.rmspcost) e1:SetTarget(s.rmsptg) e1:SetOperation(s.rmspop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DRAGON_RULER) + c:RegisterEffect(e1,false,EFFECT_MARKER_DRAGON_RULER) --Special Summon 1 "Eclepsis, Dragon Ruler of Woes" from your GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c9486959.lua b/official/c9486959.lua index 1598092718..662c9cc370 100644 --- a/official/c9486959.lua +++ b/official/c9486959.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Return to the Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c95113856.lua b/official/c95113856.lua index 1d383868e7..aebb59c63c 100644 --- a/official/c95113856.lua +++ b/official/c95113856.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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.efftg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD|LOCATION_HAND|LOCATION_GRAVE|LOCATION_DECK,1,nil) end diff --git a/official/c95134948.lua b/official/c95134948.lua index 0d10703957..be9f4c8ed2 100644 --- a/official/c95134948.lua +++ b/official/c95134948.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --disable attack local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c95169481.lua b/official/c95169481.lua index 89e43805cb..5015fdf9fa 100644 --- a/official/c95169481.lua +++ b/official/c95169481.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.desfilter(c) return c:IsFaceup() and c:IsRace(RACES_BEAST_BWARRIOR_WINGB) diff --git a/official/c95239444.lua b/official/c95239444.lua index 029381f0eb..bdf00b2efd 100644 --- a/official/c95239444.lua +++ b/official/c95239444.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,1,nil)) 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 function s.cfilter(c,lv) return c:IsRace(RACE_PLANT) and c:IsLevelBelow(lv) and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) and c:IsAbleToGraveAsCost() diff --git a/official/c95243515.lua b/official/c95243515.lua index 924804270b..db54f8ace1 100644 --- a/official/c95243515.lua +++ b/official/c95243515.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Can attack directly local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c95442074.lua b/official/c95442074.lua index c2728149b7..0ec57a4de7 100644 --- a/official/c95442074.lua +++ b/official/c95442074.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) --cannot be destroyed local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c95474755.lua b/official/c95474755.lua index 3191a3b3d5..079e3a0b77 100644 --- a/official/c95474755.lua +++ b/official/c95474755.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1,1,nil)) e1:SetTarget(s.extg) e1:SetOperation(s.exop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Banish 1 card from the opponent's GY local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c95685352.lua b/official/c95685352.lua index 7f104ad52e..a8fff2952f 100644 --- a/official/c95685352.lua +++ b/official/c95685352.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.target) e2:SetOperation(s.atkop2) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --place in pendulum zone local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) diff --git a/official/c95992081.lua b/official/c95992081.lua index 801c7219ac..4258cfa505 100644 --- a/official/c95992081.lua +++ b/official/c95992081.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) end function s.filter(c,e,tp) return c:IsFaceup() and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c96157835.lua b/official/c96157835.lua index 65f787f6c3..67d010030e 100644 --- a/official/c96157835.lua +++ b/official/c96157835.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.sptg1) e1:SetOperation(s.spop1) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --extra attack local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c96223501.lua b/official/c96223501.lua index f0c9cb2e15..e7f19c6e05 100644 --- a/official/c96223501.lua +++ b/official/c96223501.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetCountLimit(1,id) e2:SetTarget(s.target) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_TELLAR) + c:RegisterEffect(e2,false,EFFECT_MARKER_TELLAR) local e3=e2:Clone() e3:SetCode(EVENT_FLIP_SUMMON_SUCCESS) c:RegisterEffect(e3) diff --git a/official/c96471335.lua b/official/c96471335.lua index 364593753c..2191a8511c 100644 --- a/official/c96471335.lua +++ b/official/c96471335.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) --remove local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,2)) diff --git a/official/c96592102.lua b/official/c96592102.lua index d854c43569..72c3b1c064 100644 --- a/official/c96592102.lua +++ b/official/c96592102.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(s.descost) 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.atkcon(e,tp,eg,ep,ev,re,r,rp) return Duel.GetLP(tp)<=Duel.GetLP(1-tp)-3000 and e:GetHandler():GetSummonType()==SUMMON_TYPE_XYZ diff --git a/official/c96864105.lua b/official/c96864105.lua index e50120b8ca..afead73d09 100644 --- a/official/c96864105.lua +++ b/official/c96864105.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCondition(s.atkcon) e1:SetCost(s.atkcost) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --indes local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c97170107.lua b/official/c97170107.lua index 3d2157e622..725184b480 100644 --- a/official/c97170107.lua +++ b/official/c97170107.lua @@ -15,10 +15,10 @@ 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:SetCode(EVENT_SUMMON_SUCCESS) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.filter(c,e,tp) return c:IsFaceup() and c:IsControler(1-tp) and c:GetAttack()>0 and (not e or c:IsRelateToEffect(e)) diff --git a/official/c97403510.lua b/official/c97403510.lua index 8887b75bf7..de3e00d351 100644 --- a/official/c97403510.lua +++ b/official/c97403510.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.rmtg) e3:SetOperation(s.rmop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --spsummon local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,1)) diff --git a/official/c97453744.lua b/official/c97453744.lua index 8ac9b0acec..085b4b121c 100644 --- a/official/c97453744.lua +++ b/official/c97453744.lua @@ -38,7 +38,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1,1,nil)) e3:SetTarget(s.atktg) e3:SetOperation(s.atkop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end --Cannot target other monsters for attacks function s.tgtg(e,c) diff --git a/official/c97584719.lua b/official/c97584719.lua index b0f80bdf82..f044176e18 100644 --- a/official/c97584719.lua +++ b/official/c97584719.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1,function(e,tp) return Duel.GetMatchingGroupCount(Card.IsCanBeEffectTarget,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil,e) end,function(e,og) e:SetLabel(#og) end)) e2:SetTarget(s.destg) e2:SetOperation(s.desop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon this card from the GY in Defense Position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/official/c99469936.lua b/official/c99469936.lua index c7686994e5..99aa1a329d 100644 --- a/official/c99469936.lua +++ b/official/c99469936.lua @@ -31,7 +31,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 function s.ovfilter(c,tp,xyzc) return c:IsFaceup() and c:GetRank()==5 and c:IsAttribute(ATTRIBUTE_WATER,xyzc,SUMMON_TYPE_XYZ,tp) diff --git a/official/c99666430.lua b/official/c99666430.lua index 9979338532..27856fbbe5 100644 --- a/official/c99666430.lua +++ b/official/c99666430.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.ctrltg) e1:SetOperation(s.ctrlop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Tribute 1 monster, and if you do, destroy 1 face-up card on the field local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c99668578.lua b/official/c99668578.lua index 99622c956e..a04e757a25 100644 --- a/official/c99668578.lua +++ b/official/c99668578.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) diff --git a/pre-release/c100445058.lua b/pre-release/c100445058.lua index fb444b02ea..c8b64c8173 100644 --- a/pre-release/c100445058.lua +++ b/pre-release/c100445058.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e4:SetCondition(s.atcon) e4:SetCost(Cost.Detach(1)) e4:SetOperation(s.atop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_MIKANKO} function s.thfilter(c) diff --git a/pre-release/c101302106.lua b/pre-release/c101302106.lua index 1e04dd7902..1c2bff4300 100644 --- a/pre-release/c101302106.lua +++ b/pre-release/c101302106.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) --A targeted "D/D" Effect Monster gains an effect until the end of this turn local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c100000178.lua b/unofficial/c100000178.lua index bc1e038f21..876d104f48 100644 --- a/unofficial/c100000178.lua +++ b/unofficial/c100000178.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c100000179.lua b/unofficial/c100000179.lua index 4924380bca..eff49a1dc8 100644 --- a/unofficial/c100000179.lua +++ b/unofficial/c100000179.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c100000498.lua b/unofficial/c100000498.lua index cd2a081db6..b0f36c3acb 100644 --- a/unofficial/c100000498.lua +++ b/unofficial/c100000498.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.negcost) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.negcon(e,tp,eg,ep,ev,re,r,rp) return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) diff --git a/unofficial/c100000549.lua b/unofficial/c100000549.lua index 3ecdea678c..4aaea8e51f 100644 --- a/unofficial/c100000549.lua +++ b/unofficial/c100000549.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c111011803.lua b/unofficial/c111011803.lua index f88c3506f8..80961c2f93 100644 --- a/unofficial/c111011803.lua +++ b/unofficial/c111011803.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c111011903.lua b/unofficial/c111011903.lua index 3e73ef99e2..efea63fb84 100644 --- a/unofficial/c111011903.lua +++ b/unofficial/c111011903.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c111011904.lua b/unofficial/c111011904.lua index 314a064e54..a6f4d18af5 100644 --- a/unofficial/c111011904.lua +++ b/unofficial/c111011904.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.actg) e2:SetOperation(s.acop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.thfilter(c) return c:IsSpellTrap() and c:IsAbleToHand() diff --git a/unofficial/c111011905.lua b/unofficial/c111011905.lua index 9037498f7d..391033798b 100644 --- a/unofficial/c111011905.lua +++ b/unofficial/c111011905.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511000034.lua b/unofficial/c511000034.lua index caa6da6806..49f96a1621 100644 --- a/unofficial/c511000034.lua +++ b/unofficial/c511000034.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCondition(s.condition) e2:SetCost(s.cost) e2:SetOperation(s.operation) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.atktg(e,c) return c==e:GetHandler():GetBattleTarget() diff --git a/unofficial/c511000041.lua b/unofficial/c511000041.lua index 594caf441f..9ac2c0070b 100644 --- a/unofficial/c511000041.lua +++ b/unofficial/c511000041.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.catg) e2:SetOperation(s.caop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end diff --git a/unofficial/c511000183.lua b/unofficial/c511000183.lua index 935d0587f2..601253ca49 100644 --- a/unofficial/c511000183.lua +++ b/unofficial/c511000183.lua @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCost(Cost.Detach(1)) e3:SetTarget(s.negtg) e3:SetOperation(s.negop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000184.lua b/unofficial/c511000184.lua index 59c1dd6022..3d6da9ea34 100644 --- a/unofficial/c511000184.lua +++ b/unofficial/c511000184.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCondition(s.tbcon) e1:SetCost(s.tbcost) e1:SetOperation(s.tbop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000192.lua b/unofficial/c511000192.lua index bf3f23e252..c61e684889 100644 --- a/unofficial/c511000192.lua +++ b/unofficial/c511000192.lua @@ -41,7 +41,7 @@ function s.initial_effect(c) e4:SetCountLimit(1) e4:SetCost(s.cost) e4:SetOperation(s.op2) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --Prevent Effect damage local e5=Effect.CreateEffect(c) e5:SetDescription(aux.Stringid(20450925,0)) @@ -51,7 +51,7 @@ function s.initial_effect(c) e5:SetCountLimit(1) e5:SetCost(s.cost) e5:SetOperation(s.op3) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=0 function s.xyzfilter(c,xyz,sumtype,tp) diff --git a/unofficial/c511000230.lua b/unofficial/c511000230.lua index 474adf6a53..8695cf0778 100644 --- a/unofficial/c511000230.lua +++ b/unofficial/c511000230.lua @@ -13,7 +13,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) --Battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000231.lua b/unofficial/c511000231.lua index 1b6178a616..c0b60518c1 100644 --- a/unofficial/c511000231.lua +++ b/unofficial/c511000231.lua @@ -13,7 +13,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) --Battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000232.lua b/unofficial/c511000232.lua index 1c05b9c671..9ea5bb9c53 100644 --- a/unofficial/c511000232.lua +++ b/unofficial/c511000232.lua @@ -13,7 +13,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) --Battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000233.lua b/unofficial/c511000233.lua index d82dbbe0be..0e136fcf1b 100644 --- a/unofficial/c511000233.lua +++ b/unofficial/c511000233.lua @@ -13,7 +13,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) --Battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000277.lua b/unofficial/c511000277.lua index a08d676179..c4f8476f1e 100644 --- a/unofficial/c511000277.lua +++ b/unofficial/c511000277.lua @@ -98,7 +98,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetOperation(s.damop) e1:SetLabel(e:GetLabel()) e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP) end end diff --git a/unofficial/c511000294.lua b/unofficial/c511000294.lua index 3d3a0a8fba..5e6fe90250 100644 --- a/unofficial/c511000294.lua +++ b/unofficial/c511000294.lua @@ -42,7 +42,7 @@ function s.initial_effect(c) e4:SetCost(s.descost) e4:SetTarget(s.destg) e4:SetOperation(s.desop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --Destroy and Special Summon (Battle Phase) local e5=Effect.CreateEffect(c) e5:SetCategory(CATEGORY_DESTROY+CATEGORY_SPECIAL_SUMMON) diff --git a/unofficial/c511000296.lua b/unofficial/c511000296.lua index 93751aa74a..fd9de74524 100644 --- a/unofficial/c511000296.lua +++ b/unofficial/c511000296.lua @@ -61,7 +61,7 @@ function s.initial_effect(c) e7:SetCost(s.nacost) e7:SetTarget(s.natg) e7:SetOperation(s.naop) - c:RegisterEffect(e7,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e7,false,EFFECT_MARKER_DETACH_XMAT) --number generic effect local e8=Effect.CreateEffect(c) e8:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000369.lua b/unofficial/c511000369.lua index adb64b4604..a1e28861a0 100644 --- a/unofficial/c511000369.lua +++ b/unofficial/c511000369.lua @@ -45,7 +45,7 @@ function s.initial_effect(c) e4:SetRange(LOCATION_MZONE) e4:SetCost(Cost.Detach(1)) e4:SetOperation(s.regop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --Cannot be destroyed by battle local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000512.lua b/unofficial/c511000512.lua index 661c5d77bf..a64dbe176d 100644 --- a/unofficial/c511000512.lua +++ b/unofficial/c511000512.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000513.lua b/unofficial/c511000513.lua index 54451892e5..0b9fd3eaf2 100644 --- a/unofficial/c511000513.lua +++ b/unofficial/c511000513.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.desatchtg) e2:SetOperation(s.desatchop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --If this card would be banished, you can detach 1 material from this card instead local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511000515.lua b/unofficial/c511000515.lua index a6bf398f67..e289a2e9cc 100644 --- a/unofficial/c511000515.lua +++ b/unofficial/c511000515.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) e3:SetCondition(s.atcon) e3:SetCost(s.atcost) e3:SetOperation(s.atop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --remove local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,2)) diff --git a/unofficial/c511000674.lua b/unofficial/c511000674.lua index b0f2db7376..2ebcb10001 100644 --- a/unofficial/c511000674.lua +++ b/unofficial/c511000674.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e4:SetCost(s.cost) e4:SetTarget(s.target) e4:SetOperation(s.operation) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end function s.bttg(e,c) return not c:IsSpecialSummoned() diff --git a/unofficial/c511000675.lua b/unofficial/c511000675.lua index 5eea23d8ae..8b32cacad9 100644 --- a/unofficial/c511000675.lua +++ b/unofficial/c511000675.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.atkfilter(c) return c:IsLevelAbove(5) and c:HasNonZeroAttack() diff --git a/unofficial/c511001247.lua b/unofficial/c511001247.lua index 3c02ade1a3..e6ab665c66 100644 --- a/unofficial/c511001247.lua +++ b/unofficial/c511001247.lua @@ -13,7 +13,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 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511001273.lua b/unofficial/c511001273.lua index 85fbe1ef9a..5f716870c2 100644 --- a/unofficial/c511001273.lua +++ b/unofficial/c511001273.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --to grave local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/unofficial/c511001275.lua b/unofficial/c511001275.lua index 07dcba1777..50b8e107de 100644 --- a/unofficial/c511001275.lua +++ b/unofficial/c511001275.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e3:SetCondition(s.con) e3:SetCost(s.cost) e3:SetOperation(s.op) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --gain atk local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,3)) diff --git a/unofficial/c511001338.lua b/unofficial/c511001338.lua index e45e8c4a60..674d2c3443 100644 --- a/unofficial/c511001338.lua +++ b/unofficial/c511001338.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e3:SetCost(s.descost) e3:SetTarget(s.destg) e3:SetOperation(s.desop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511001339.lua b/unofficial/c511001339.lua index 216a3e5b66..ae4969f7d3 100644 --- a/unofficial/c511001339.lua +++ b/unofficial/c511001339.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Cannot be destroyed by battle, expect with "Number" monsters local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511001371.lua b/unofficial/c511001371.lua index 9f115aaceb..1008150b6c 100644 --- a/unofficial/c511001371.lua +++ b/unofficial/c511001371.lua @@ -47,7 +47,7 @@ function s.initial_effect(c) e5:SetType(EFFECT_TYPE_SINGLE) e5:SetCode(EFFECT_RANKUP_EFFECT) e5:SetLabelObject(e3) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) local e6=e5:Clone() e6:SetLabelObject(e4) c:RegisterEffect(e6) diff --git a/unofficial/c511001372.lua b/unofficial/c511001372.lua index 165380f8b4..eccd10d66e 100644 --- a/unofficial/c511001372.lua +++ b/unofficial/c511001372.lua @@ -46,7 +46,7 @@ function s.initial_effect(c) e5:SetType(EFFECT_TYPE_SINGLE) e5:SetCode(EFFECT_RANKUP_EFFECT) e5:SetLabelObject(e3) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) local e6=e5:Clone() e6:SetLabelObject(e4) c:RegisterEffect(e6) diff --git a/unofficial/c511001374.lua b/unofficial/c511001374.lua index 5567c5f4a3..21d8ead76b 100644 --- a/unofficial/c511001374.lua +++ b/unofficial/c511001374.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.efftg) e2:SetOperation(s.effop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={CARD_UNKNOWN} diff --git a/unofficial/c511001376.lua b/unofficial/c511001376.lua index 32b987987c..6b961880f5 100644 --- a/unofficial/c511001376.lua +++ b/unofficial/c511001376.lua @@ -34,7 +34,7 @@ function s.initial_effect(c) e3:SetCost(s.cost) e3:SetTarget(s.destg) e3:SetOperation(s.desop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --return local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) @@ -46,7 +46,7 @@ function s.initial_effect(c) e4:SetCost(s.cost) e4:SetTarget(s.rettg) e4:SetOperation(s.retop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --special summon local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/unofficial/c511001429.lua b/unofficial/c511001429.lua index 7b8ef42b91..67d627d63e 100644 --- a/unofficial/c511001429.lua +++ b/unofficial/c511001429.lua @@ -43,13 +43,13 @@ function s.initial_effect(c) e5:SetType(EFFECT_TYPE_SINGLE) e5:SetCode(EFFECT_RANKUP_EFFECT) e5:SetLabelObject(e2) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) local e6=e5:Clone() e6:SetLabelObject(e3) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) local e7=e5:Clone() e7:SetLabelObject(e4) - c:RegisterEffect(e7,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e7,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.xyz_number=102 diff --git a/unofficial/c511001430.lua b/unofficial/c511001430.lua index 83f15ecd93..8f14246648 100644 --- a/unofficial/c511001430.lua +++ b/unofficial/c511001430.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.damtg) e2:SetOperation(s.damop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Special Summon 1 "Number 103: Raganzero" from your GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c511001431.lua b/unofficial/c511001431.lua index 6ba1c9c1b5..88a49cf339 100644 --- a/unofficial/c511001431.lua +++ b/unofficial/c511001431.lua @@ -37,7 +37,7 @@ function s.initial_effect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_RANKUP_EFFECT) e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) aux.DoubleSnareValidity(c,LOCATION_MZONE) end s.listed_series={SET_NUMBER} diff --git a/unofficial/c511001432.lua b/unofficial/c511001432.lua index eda26ea753..57f15397e9 100644 --- a/unofficial/c511001432.lua +++ b/unofficial/c511001432.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.damcost) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.damcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511001624.lua b/unofficial/c511001624.lua index 8da41ae012..792b3a4737 100644 --- a/unofficial/c511001624.lua +++ b/unofficial/c511001624.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511001659.lua b/unofficial/c511001659.lua index 4f264e7298..8939a76ac2 100644 --- a/unofficial/c511001659.lua +++ b/unofficial/c511001659.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetCost(s.damcost) e3:SetTarget(s.damtg2) e3:SetOperation(s.damop2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --material local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,2)) diff --git a/unofficial/c511001692.lua b/unofficial/c511001692.lua index 93ce8fc185..1bb5042c8d 100644 --- a/unofficial/c511001692.lua +++ b/unofficial/c511001692.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end s.listed_series={SET_FLOWER_CARDIAN} function s.filter(c) diff --git a/unofficial/c511001693.lua b/unofficial/c511001693.lua index 2901112349..4f663bcc39 100644 --- a/unofficial/c511001693.lua +++ b/unofficial/c511001693.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end s.listed_series={SET_FLOWER_CARDIAN} function s.filter(c) diff --git a/unofficial/c511001694.lua b/unofficial/c511001694.lua index 7ec663f386..cffcb33a76 100644 --- a/unofficial/c511001694.lua +++ b/unofficial/c511001694.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end s.listed_series={SET_FLOWER_CARDIAN} function s.filter(c) diff --git a/unofficial/c511001695.lua b/unofficial/c511001695.lua index 311d19bb53..a296ddc009 100644 --- a/unofficial/c511001695.lua +++ b/unofficial/c511001695.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end function s.filter(c) local re=c:GetReasonEffect() diff --git a/unofficial/c511001696.lua b/unofficial/c511001696.lua index 33edf645f6..439b94802d 100644 --- a/unofficial/c511001696.lua +++ b/unofficial/c511001696.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end s.listed_series={SET_FLOWER_CARDIAN} function s.filter(c) diff --git a/unofficial/c511001697.lua b/unofficial/c511001697.lua index d8e0bd4927..8747b9217f 100644 --- a/unofficial/c511001697.lua +++ b/unofficial/c511001697.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end s.listed_series={SET_FLOWER_CARDIAN} function s.filter(c) diff --git a/unofficial/c511001698.lua b/unofficial/c511001698.lua index f65a395e84..f4f022075e 100644 --- a/unofficial/c511001698.lua +++ b/unofficial/c511001698.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end function s.filter(c) local re=c:GetReasonEffect() diff --git a/unofficial/c511001699.lua b/unofficial/c511001699.lua index e18b665f11..c0b268e7c5 100644 --- a/unofficial/c511001699.lua +++ b/unofficial/c511001699.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end s.listed_series={SET_FLOWER_CARDIAN} function s.filter(c) diff --git a/unofficial/c511001700.lua b/unofficial/c511001700.lua index dc4b616cf9..afe2ca7ba3 100644 --- a/unofficial/c511001700.lua +++ b/unofficial/c511001700.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --synchro level local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511001706.lua b/unofficial/c511001706.lua index da32f0218d..56766bc9e0 100644 --- a/unofficial/c511001706.lua +++ b/unofficial/c511001706.lua @@ -33,7 +33,7 @@ function s.initial_effect(c) e4:SetCondition(s.efcon) e4:SetTarget(s.eftg) e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={0x48} s.listed_names={86532744} diff --git a/unofficial/c511001723.lua b/unofficial/c511001723.lua index b25122501d..5b4e4c7994 100644 --- a/unofficial/c511001723.lua +++ b/unofficial/c511001723.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end function s.filter(c) local re=c:GetReasonEffect() diff --git a/unofficial/c511001724.lua b/unofficial/c511001724.lua index 005cd792a6..51a82a7468 100644 --- a/unofficial/c511001724.lua +++ b/unofficial/c511001724.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) --synchro level local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511001725.lua b/unofficial/c511001725.lua index 88385a1f59..6f2f944f87 100644 --- a/unofficial/c511001725.lua +++ b/unofficial/c511001725.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - c:RegisterEffect(e1,false,REGISTER_FLAG_CARDIAN) + c:RegisterEffect(e1,false,EFFECT_MARKER_CARDIAN) end function s.filter(c) local re=c:GetReasonEffect() diff --git a/unofficial/c511001776.lua b/unofficial/c511001776.lua index 11b31b5bae..9c6f9a10e3 100644 --- a/unofficial/c511001776.lua +++ b/unofficial/c511001776.lua @@ -63,7 +63,7 @@ function s.initial_effect(c) e6:SetCost(s.discost) e6:SetTarget(s.distg) e6:SetOperation(s.disop) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e7=Effect.CreateEffect(c) e7:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511001777.lua b/unofficial/c511001777.lua index b260ce984f..29b845567e 100644 --- a/unofficial/c511001777.lua +++ b/unofficial/c511001777.lua @@ -62,7 +62,7 @@ function s.initial_effect(c) c:RegisterEffect(e8) local e9=e6:Clone() e9:SetLabelObject(e5) - c:RegisterEffect(e9,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e9,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={56051086,32446631} diff --git a/unofficial/c511001778.lua b/unofficial/c511001778.lua index 65f0603078..6ff8210af1 100644 --- a/unofficial/c511001778.lua +++ b/unofficial/c511001778.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(Cost.Detach(1)) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/unofficial/c511001779.lua b/unofficial/c511001779.lua index 88c77a59f8..96962a6965 100644 --- a/unofficial/c511001779.lua +++ b/unofficial/c511001779.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511001781.lua b/unofficial/c511001781.lua index bac32b6e66..36b23a9b8c 100644 --- a/unofficial/c511001781.lua +++ b/unofficial/c511001781.lua @@ -88,7 +88,7 @@ function s.initial_effect(c) c:RegisterEffect(e10) local e11=e7:Clone() e11:SetLabelObject(e5) - c:RegisterEffect(e11,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e11,false,EFFECT_MARKER_DETACH_XMAT) local e12=e7:Clone() e12:SetLabelObject(e6) c:RegisterEffect(e12) diff --git a/unofficial/c511001791.lua b/unofficial/c511001791.lua index 0ba5c9a1b6..d52d1c728b 100644 --- a/unofficial/c511001791.lua +++ b/unofficial/c511001791.lua @@ -39,7 +39,7 @@ function s.initial_effect(c) e4:SetCost(s.atkcost) e4:SetTarget(s.atktg) e4:SetOperation(s.atkop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --To Pendulum local e5=Effect.CreateEffect(c) e5:SetDescription(aux.Stringid(35952884,1)) diff --git a/unofficial/c511001997.lua b/unofficial/c511001997.lua index 4a720d1649..4201fffbca 100644 --- a/unofficial/c511001997.lua +++ b/unofficial/c511001997.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(s.descost) e2:SetTarget(s.destg) e2:SetOperation(s.desop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --equip local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(93568288,0)) diff --git a/unofficial/c511001998.lua b/unofficial/c511001998.lua index 111073276f..719701080e 100644 --- a/unofficial/c511001998.lua +++ b/unofficial/c511001998.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e4:SetCondition(s.spcon) e4:SetTarget(s.sptg) e4:SetOperation(s.spop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --control or destroy local e5=Effect.CreateEffect(c) e5:SetCategory(CATEGORY_DESTROY) diff --git a/unofficial/c511001999.lua b/unofficial/c511001999.lua index 758dca74f9..59460491f8 100644 --- a/unofficial/c511001999.lua +++ b/unofficial/c511001999.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.descost) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002001.lua b/unofficial/c511002001.lua index 1ce8afec99..a549a418d5 100644 --- a/unofficial/c511002001.lua +++ b/unofficial/c511002001.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002054.lua b/unofficial/c511002054.lua index e604d71b11..89a2c2ffdb 100644 --- a/unofficial/c511002054.lua +++ b/unofficial/c511002054.lua @@ -14,7 +14,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) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002058.lua b/unofficial/c511002058.lua index 7f3935e39c..9a0070dada 100644 --- a/unofficial/c511002058.lua +++ b/unofficial/c511002058.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.adcost) e1:SetTarget(s.adtg) e1:SetOperation(s.adop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --to defense local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_POSITION) diff --git a/unofficial/c511002059.lua b/unofficial/c511002059.lua index 34ab30642c..37db7b8e9e 100644 --- a/unofficial/c511002059.lua +++ b/unofficial/c511002059.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetLabel(3) e1:SetTarget(s.destg1) e1:SetOperation(s.desop1) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy2 local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(84417082,1)) @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetLabel(5) e2:SetTarget(s.destg2) e2:SetOperation(s.desop2) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002060.lua b/unofficial/c511002060.lua index 58ee385483..6940ff9779 100644 --- a/unofficial/c511002060.lua +++ b/unofficial/c511002060.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002064.lua b/unofficial/c511002064.lua index edc5cbde3c..5df4682690 100644 --- a/unofficial/c511002064.lua +++ b/unofficial/c511002064.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) aux.GlobalCheck(s,function() s[0]=true local ge1=Effect.CreateEffect(c) diff --git a/unofficial/c511002075.lua b/unofficial/c511002075.lua index 937af1bd4b..26e009dd03 100644 --- a/unofficial/c511002075.lua +++ b/unofficial/c511002075.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 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002076.lua b/unofficial/c511002076.lua index 09cb7eca96..e4ca7c8659 100644 --- a/unofficial/c511002076.lua +++ b/unofficial/c511002076.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002077.lua b/unofficial/c511002077.lua index f02a9edb7a..be61301aa6 100644 --- a/unofficial/c511002077.lua +++ b/unofficial/c511002077.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002079.lua b/unofficial/c511002079.lua index bea09d7b35..70ffb3c5d7 100644 --- a/unofficial/c511002079.lua +++ b/unofficial/c511002079.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.negcost) e1:SetTarget(s.negtg) e1:SetOperation(s.negop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --effect local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/unofficial/c511002088.lua b/unofficial/c511002088.lua index a546e58872..6d1f50ad3e 100644 --- a/unofficial/c511002088.lua +++ b/unofficial/c511002088.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Cannot be destroyed by battle by non-"Number" monsters local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002090.lua b/unofficial/c511002090.lua index 6843e8e717..ad188aceaa 100644 --- a/unofficial/c511002090.lua +++ b/unofficial/c511002090.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_MZONE) e2:SetCost(s.lpcost) e2:SetOperation(s.lpop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --lp - 0 materials local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(52090844,0)) diff --git a/unofficial/c511002091.lua b/unofficial/c511002091.lua index 0efa4fc14a..a5aa2e1176 100644 --- a/unofficial/c511002091.lua +++ b/unofficial/c511002091.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002092.lua b/unofficial/c511002092.lua index 25c07a368a..7acea091ea 100644 --- a/unofficial/c511002092.lua +++ b/unofficial/c511002092.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCondition(s.atkcon) e1:SetCost(s.atkcost) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002111.lua b/unofficial/c511002111.lua index d15550a097..deb5715dc9 100644 --- a/unofficial/c511002111.lua +++ b/unofficial/c511002111.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Destroy monster targeted by previous effect when it declares an attack local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(50491121,0)) diff --git a/unofficial/c511002112.lua b/unofficial/c511002112.lua index 9a72d91a96..c872a18bb0 100644 --- a/unofficial/c511002112.lua +++ b/unofficial/c511002112.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002384.lua b/unofficial/c511002384.lua index 340c3646c6..285336143d 100644 --- a/unofficial/c511002384.lua +++ b/unofficial/c511002384.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Disable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/unofficial/c511002482.lua b/unofficial/c511002482.lua index e68f08f882..9dfc15b6df 100644 --- a/unofficial/c511002482.lua +++ b/unofficial/c511002482.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_RANKUP_EFFECT) e3:SetLabelObject(e2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={88120966} diff --git a/unofficial/c511002543.lua b/unofficial/c511002543.lua index 2852cbbb45..ff030a8259 100644 --- a/unofficial/c511002543.lua +++ b/unofficial/c511002543.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.discost) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Double Snare local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002599.lua b/unofficial/c511002599.lua index c4a8ee57b2..53dc14bfc8 100644 --- a/unofficial/c511002599.lua +++ b/unofficial/c511002599.lua @@ -21,7 +21,7 @@ function s.initial_effect(c) e2:SetCondition(function(e) return Duel.GetAttacker() and not e:GetHandler():IsStatus(STATUS_CHAINING) end) e2:SetCost(Cost.Detach(1)) e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) Duel.NegateAttack() end) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.xyz_number=39 \ No newline at end of file diff --git a/unofficial/c511002658.lua b/unofficial/c511002658.lua index b851c40b26..48ac9d7d43 100644 --- a/unofficial/c511002658.lua +++ b/unofficial/c511002658.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002727.lua b/unofficial/c511002727.lua index e1a8235692..58efdf2783 100644 --- a/unofficial/c511002727.lua +++ b/unofficial/c511002727.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e4:SetCondition(function(e,tp) return Duel.GetBattleDamage(tp)>=Duel.GetLP(tp) end) e4:SetCost(Cost.Detach(1)) e4:SetOperation(s.damop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.xyz_number=54 diff --git a/unofficial/c511002737.lua b/unofficial/c511002737.lua index 3b4d822b9a..3b8208450a 100644 --- a/unofficial/c511002737.lua +++ b/unofficial/c511002737.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.damcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/unofficial/c511002749.lua b/unofficial/c511002749.lua index 5ca0a8c79d..7774d0aceb 100644 --- a/unofficial/c511002749.lua +++ b/unofficial/c511002749.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --desrep local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511002762.lua b/unofficial/c511002762.lua index 1b22b5c601..9b7e67e6cd 100644 --- a/unofficial/c511002762.lua +++ b/unofficial/c511002762.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e2:SetCode(EVENT_BATTLE_START) e2:SetCost(s.cost) e2:SetOperation(s.op) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002763.lua b/unofficial/c511002763.lua index e97e1ff7df..c3ba900c7b 100644 --- a/unofficial/c511002763.lua +++ b/unofficial/c511002763.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) return Duel.GetAttackTarget() and (Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()) diff --git a/unofficial/c511002764.lua b/unofficial/c511002764.lua index 46dcf625f2..39d25cf594 100644 --- a/unofficial/c511002764.lua +++ b/unofficial/c511002764.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.retcost) e1:SetTarget(s.rettg) e1:SetOperation(s.retop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.retcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,2,REASON_COST) end diff --git a/unofficial/c511002778.lua b/unofficial/c511002778.lua index 924ba9c13e..faf71ab0e0 100644 --- a/unofficial/c511002778.lua +++ b/unofficial/c511002778.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(96470883,1)) diff --git a/unofficial/c511002829.lua b/unofficial/c511002829.lua index c401575853..4eb9c6178b 100644 --- a/unofficial/c511002829.lua +++ b/unofficial/c511002829.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002830.lua b/unofficial/c511002830.lua index 91a0d2f7a3..8476c34d44 100644 --- a/unofficial/c511002830.lua +++ b/unofficial/c511002830.lua @@ -14,7 +14,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) --destroy & damage local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(75433814,1)) diff --git a/unofficial/c511002839.lua b/unofficial/c511002839.lua index 427501be64..5afdd13383 100644 --- a/unofficial/c511002839.lua +++ b/unofficial/c511002839.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002855.lua b/unofficial/c511002855.lua index ef53d4d8f1..0c74702e77 100644 --- a/unofficial/c511002855.lua +++ b/unofficial/c511002855.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_RANKUP_EFFECT) e3:SetLabelObject(e2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={30741334} function s.uncon(e,tp,eg,ep,ev,re,r,rp) diff --git a/unofficial/c511002858.lua b/unofficial/c511002858.lua index 6f74629418..ad84c9b2d7 100644 --- a/unofficial/c511002858.lua +++ b/unofficial/c511002858.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e3:SetCost(s.descost) e3:SetTarget(s.destg2) e3:SetOperation(s.desop2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end function s.descon(e,tp,eg,ep,ev,re,r,rp) return ep~=tp diff --git a/unofficial/c511002864.lua b/unofficial/c511002864.lua index 6cfbb45207..9b9fff94db 100644 --- a/unofficial/c511002864.lua +++ b/unofficial/c511002864.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCountLimit(1) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002866.lua b/unofficial/c511002866.lua index 14adac5e5c..f87e938e14 100644 --- a/unofficial/c511002866.lua +++ b/unofficial/c511002866.lua @@ -41,10 +41,10 @@ function s.initial_effect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_RANKUP_EFFECT) e4:SetLabelObject(e2) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) local e5=e4:Clone() e5:SetLabelObject(e3) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={2407234} diff --git a/unofficial/c511002870.lua b/unofficial/c511002870.lua index 4d7a6dcb90..f3d0c76533 100644 --- a/unofficial/c511002870.lua +++ b/unofficial/c511002870.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.disatkchtg) e2:SetOperation(s.disatkchop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Detach all materials from this to prevent this card's destruction (Battle) local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c511002871.lua b/unofficial/c511002871.lua index eb813e2fa6..98d53206bf 100644 --- a/unofficial/c511002871.lua +++ b/unofficial/c511002871.lua @@ -41,7 +41,7 @@ function s.initial_effect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_RANKUP_EFFECT) e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={2061963} diff --git a/unofficial/c511002872.lua b/unofficial/c511002872.lua index b7399ef5ba..264e0e5eac 100644 --- a/unofficial/c511002872.lua +++ b/unofficial/c511002872.lua @@ -40,7 +40,7 @@ function s.initial_effect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_RANKUP_EFFECT) e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={59627393} diff --git a/unofficial/c511002873.lua b/unofficial/c511002873.lua index c207271664..6bf2fb912b 100644 --- a/unofficial/c511002873.lua +++ b/unofficial/c511002873.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.eqcost) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --direct local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_EQUIP) diff --git a/unofficial/c511002896.lua b/unofficial/c511002896.lua index ee19b4655b..3986a57fc4 100644 --- a/unofficial/c511002896.lua +++ b/unofficial/c511002896.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Draw 1 card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c511002912.lua b/unofficial/c511002912.lua index 629704d9f8..34cfcc9ffe 100644 --- a/unofficial/c511002912.lua +++ b/unofficial/c511002912.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511002913.lua b/unofficial/c511002913.lua index 3f5cc95399..85fe32df51 100644 --- a/unofficial/c511002913.lua +++ b/unofficial/c511002913.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511003224.lua b/unofficial/c511003224.lua index 72e1634fc1..5cf80dc9b5 100644 --- a/unofficial/c511003224.lua +++ b/unofficial/c511003224.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.xyzcheck(g,tp,xyz) local mg=g:Filter(Card.IsAttribute,nil,ATTRIBUTE_EARTH) diff --git a/unofficial/c511003236.lua b/unofficial/c511003236.lua index a94bb0be04..f25e5d7d91 100644 --- a/unofficial/c511003236.lua +++ b/unofficial/c511003236.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Always Battle Destroy local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/unofficial/c511009002.lua b/unofficial/c511009002.lua index ec37e014f6..7ed30c9097 100644 --- a/unofficial/c511009002.lua +++ b/unofficial/c511009002.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) e2:SetCost(s.btcost) e2:SetTarget(s.bttg) e2:SetOperation(s.btop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.filter(c) return c:IsSpecialSummoned() and c:HasNonZeroAttack() diff --git a/unofficial/c511009026.lua b/unofficial/c511009026.lua index c9006a9fe9..8ee800bf40 100644 --- a/unofficial/c511009026.lua +++ b/unofficial/c511009026.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) 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.tgfilter(c) return c:IsRace(RACE_MACHINE) and not c:IsHasEffect(EFFECT_DIRECT_ATTACK) and c:IsFaceup() diff --git a/unofficial/c511009062.lua b/unofficial/c511009062.lua index 30122f343b..a7afc28519 100644 --- a/unofficial/c511009062.lua +++ b/unofficial/c511009062.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.GetCurrentPhase()==PHASE_MAIN1 diff --git a/unofficial/c511009074.lua b/unofficial/c511009074.lua index 0fb296f482..bc77583387 100644 --- a/unofficial/c511009074.lua +++ b/unofficial/c511009074.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCondition(s.efcon) e2:SetTarget(s.eftg) e2:SetLabelObject(e1) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --negate local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) @@ -38,7 +38,7 @@ function s.initial_effect(c) e3:SetOperation(s.disop) local e4=e2:Clone() e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --Double Snare local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511009136.lua b/unofficial/c511009136.lua index 22a5fa9efa..62e8706216 100644 --- a/unofficial/c511009136.lua +++ b/unofficial/c511009136.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCondition(s.efcon) e2:SetTarget(s.eftg) e2:SetLabelObject(e1) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_MATERIAL_CHECK) diff --git a/unofficial/c511009321.lua b/unofficial/c511009321.lua index 170bb5f0d2..28bba89dc6 100644 --- a/unofficial/c511009321.lua +++ b/unofficial/c511009321.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated() diff --git a/unofficial/c511009340.lua b/unofficial/c511009340.lua index 85ade13c37..3a9458def2 100644 --- a/unofficial/c511009340.lua +++ b/unofficial/c511009340.lua @@ -47,7 +47,7 @@ function s.initial_effect(c) c:RegisterEffect(e5) local e6=e5:Clone() e6:SetLabelObject(e4) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) --To Pendulum local e7=Effect.CreateEffect(c) e7:SetDescription(aux.Stringid(id,2)) diff --git a/unofficial/c511009387.lua b/unofficial/c511009387.lua index 58ba091c3c..d03c569588 100644 --- a/unofficial/c511009387.lua +++ b/unofficial/c511009387.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --pendulum local e7=Effect.CreateEffect(c) e7:SetDescription(aux.Stringid(90036274,0)) diff --git a/unofficial/c511009462.lua b/unofficial/c511009462.lua index 312545a45a..f70756e465 100644 --- a/unofficial/c511009462.lua +++ b/unofficial/c511009462.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511009480.lua b/unofficial/c511009480.lua index 460e1f8c85..a15393e23b 100644 --- a/unofficial/c511009480.lua +++ b/unofficial/c511009480.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetCost(s.descost) e2:SetTarget(s.destg) e2:SetOperation(s.desop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --material local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) diff --git a/unofficial/c511009560.lua b/unofficial/c511009560.lua index df53d08f7b..cb3074ca07 100644 --- a/unofficial/c511009560.lua +++ b/unofficial/c511009560.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCondition(s.indcon) e1:SetCost(s.indcost) e1:SetOperation(s.indop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --effect local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) @@ -80,7 +80,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.atkcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511009567.lua b/unofficial/c511009567.lua index 3a617c2633..551392e609 100644 --- a/unofficial/c511009567.lua +++ b/unofficial/c511009567.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(Cost.Detach(1)) e1:SetTarget(s.rtgtg) e1:SetOperation(s.rtgop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Allow 1 "Raidraptor" monster to attack multiple times in a row local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c511009951.lua b/unofficial/c511009951.lua index 965ff8c9b3..c34495ce27 100644 --- a/unofficial/c511009951.lua +++ b/unofficial/c511009951.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,alias) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --to deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(alias,1)) diff --git a/unofficial/c511010007.lua b/unofficial/c511010007.lua index 050959bdb3..4297d020fc 100644 --- a/unofficial/c511010007.lua +++ b/unofficial/c511010007.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.atktg) e2:SetOperation(s.atkop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=7 s.roll_dice=true diff --git a/unofficial/c511010009.lua b/unofficial/c511010009.lua index 6e5d2043e5..2e02693b48 100644 --- a/unofficial/c511010009.lua +++ b/unofficial/c511010009.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetCondition(s.dacon) e3:SetCost(Cost.Detach(1)) e3:SetOperation(s.daop) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Cannot be destroyed by battle, except by "Number" monsters local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010010.lua b/unofficial/c511010010.lua index dcd3085e3a..52b04f36b9 100644 --- a/unofficial/c511010010.lua +++ b/unofficial/c511010010.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010011.lua b/unofficial/c511010011.lua index bcd147ff42..cddc6fa48d 100644 --- a/unofficial/c511010011.lua +++ b/unofficial/c511010011.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e6=Effect.CreateEffect(c) e6:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010020.lua b/unofficial/c511010020.lua index 5319ebdd56..8ef5e133ea 100644 --- a/unofficial/c511010020.lua +++ b/unofficial/c511010020.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010021.lua b/unofficial/c511010021.lua index 3208a987e6..c37b6d0af3 100644 --- a/unofficial/c511010021.lua +++ b/unofficial/c511010021.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(s.descost) e2:SetTarget(s.destg) e2:SetOperation(s.desop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010025.lua b/unofficial/c511010025.lua index 6bd50a33fe..8aea3553d6 100644 --- a/unofficial/c511010025.lua +++ b/unofficial/c511010025.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --Cannot be destroyed by battle, except with "Number" monsters local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010032.lua b/unofficial/c511010032.lua index 0c9d1a15ea..d2b61a0af7 100644 --- a/unofficial/c511010032.lua +++ b/unofficial/c511010032.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.atcost) e1:SetTarget(s.attg) e1:SetOperation(s.atop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010034.lua b/unofficial/c511010034.lua index 920213a344..8421d4cd99 100644 --- a/unofficial/c511010034.lua +++ b/unofficial/c511010034.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010039.lua b/unofficial/c511010039.lua index a398ca3555..e14df67fac 100644 --- a/unofficial/c511010039.lua +++ b/unofficial/c511010039.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010047.lua b/unofficial/c511010047.lua index dbc4ad085b..6193298cb2 100644 --- a/unofficial/c511010047.lua +++ b/unofficial/c511010047.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e2:SetValue(s.indes) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.xyz_number=47 function s.matfilter(c) diff --git a/unofficial/c511010053.lua b/unofficial/c511010053.lua index c7584de799..990773ff78 100644 --- a/unofficial/c511010053.lua +++ b/unofficial/c511010053.lua @@ -60,7 +60,7 @@ function s.initial_effect(c) e6:SetCost(s.bdcost) e6:SetTarget(s.rectg) e6:SetOperation(s.recop) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) --battle damage local e7=Effect.CreateEffect(c) e7:SetDescription(aux.Stringid(93730230,0)) @@ -74,7 +74,7 @@ function s.initial_effect(c) e7:SetCost(s.bdcost) e7:SetTarget(s.bdtg) e7:SetOperation(s.bdop) - c:RegisterEffect(e7,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e7,false,EFFECT_MARKER_DETACH_XMAT) --93 Summon local e8=Effect.CreateEffect(c) e8:SetDescription(aux.Stringid(64414267,0)) diff --git a/unofficial/c511010056.lua b/unofficial/c511010056.lua index 4f2a9514bc..ab6caf1384 100644 --- a/unofficial/c511010056.lua +++ b/unofficial/c511010056.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.drcost) e1:SetTarget(s.drtg) e1:SetOperation(s.drop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010064.lua b/unofficial/c511010064.lua index a4402e8042..1b96bc9da5 100644 --- a/unofficial/c511010064.lua +++ b/unofficial/c511010064.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) --indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010065.lua b/unofficial/c511010065.lua index 19c5b880c3..42876fec53 100644 --- a/unofficial/c511010065.lua +++ b/unofficial/c511010065.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.negdamtg) e2:SetOperation(s.negdamop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.xyz_number=65 diff --git a/unofficial/c511010083.lua b/unofficial/c511010083.lua index 99105d5a43..f4b68d9643 100644 --- a/unofficial/c511010083.lua +++ b/unofficial/c511010083.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010096.lua b/unofficial/c511010096.lua index 9ef1707356..eca92322ea 100644 --- a/unofficial/c511010096.lua +++ b/unofficial/c511010096.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e6=Effect.CreateEffect(c) e6:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010103.lua b/unofficial/c511010103.lua index c4f5e64272..ffd345a68f 100644 --- a/unofficial/c511010103.lua +++ b/unofficial/c511010103.lua @@ -25,7 +25,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 s.listed_series={SET_NUMBER} s.xyz_number=103 diff --git a/unofficial/c511010104.lua b/unofficial/c511010104.lua index 5e65779327..ee564cdf40 100644 --- a/unofficial/c511010104.lua +++ b/unofficial/c511010104.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(2061963,1)) diff --git a/unofficial/c511010105.lua b/unofficial/c511010105.lua index e68f8c7257..53441635d7 100644 --- a/unofficial/c511010105.lua +++ b/unofficial/c511010105.lua @@ -23,7 +23,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.listed_series={SET_NUMBER} s.xyz_number=105 diff --git a/unofficial/c511010107.lua b/unofficial/c511010107.lua index 08d13a74c6..d6c40c5929 100644 --- a/unofficial/c511010107.lua +++ b/unofficial/c511010107.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.distg) e2:SetOperation(s.disop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Workaround to make the extra attack part work on your turn local e3=e2:Clone() e3:SetType(EFFECT_TYPE_QUICK_O) @@ -33,7 +33,7 @@ function s.initial_effect(c) e3:SetCountLimit(1) e3:SetCondition(s.discon) e3:SetCost(s.discost) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) --Global effects to keep track of total effect resolutions and the last attacker aux.GlobalCheck(s,function() --Keep track of how many effects have resolved during each Battle Phase diff --git a/unofficial/c511010132.lua b/unofficial/c511010132.lua index 20d0035e97..85faa979ba 100644 --- a/unofficial/c511010132.lua +++ b/unofficial/c511010132.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --selfdes local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010139.lua b/unofficial/c511010139.lua index 0b65cf3a13..17115ef34f 100644 --- a/unofficial/c511010139.lua +++ b/unofficial/c511010139.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e1:SetCost(s.atkcost) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --selfdes local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010165.lua b/unofficial/c511010165.lua index 3fbe1fd080..aec31d9676 100644 --- a/unofficial/c511010165.lua +++ b/unofficial/c511010165.lua @@ -23,7 +23,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) --Prevent the activation of effects local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_FIELD) diff --git a/unofficial/c511010173.lua b/unofficial/c511010173.lua index 47c23e7b8b..fd28ad468c 100644 --- a/unofficial/c511010173.lua +++ b/unofficial/c511010173.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCondition(s.atkcon) e1:SetCost(s.atkcost) e1:SetOperation(s.atkop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e6=Effect.CreateEffect(c) e6:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c511010192.lua b/unofficial/c511010192.lua index 6768936c57..5d11b0670a 100644 --- a/unofficial/c511010192.lua +++ b/unofficial/c511010192.lua @@ -42,7 +42,7 @@ function s.initial_effect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_RANKUP_EFFECT) e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) aux.DoubleSnareValidity(c,LOCATION_MZONE) aux.GlobalCheck(s,function() s[0]=0 diff --git a/unofficial/c511010196.lua b/unofficial/c511010196.lua index e2f9f48ffd..e6aedbc553 100644 --- a/unofficial/c511010196.lua +++ b/unofficial/c511010196.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_RANKUP_EFFECT) e4:SetLabelObject(e3) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={55727845} diff --git a/unofficial/c511010205.lua b/unofficial/c511010205.lua index 26ff4d3db2..9e723f2f46 100644 --- a/unofficial/c511010205.lua +++ b/unofficial/c511010205.lua @@ -40,7 +40,7 @@ function s.initial_effect(c) e4:SetCondition(s.atkcon) e4:SetTarget(s.atktg) e4:SetOperation(s.atkop) - c:RegisterEffect(e4,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e4,false,EFFECT_MARKER_DETACH_XMAT) --halve atk local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/unofficial/c511010207.lua b/unofficial/c511010207.lua index a89e54935a..d83653061a 100644 --- a/unofficial/c511010207.lua +++ b/unofficial/c511010207.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetCountLimit(1) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.negop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Double Snare aux.DoubleSnareValidity(c,LOCATION_MZONE) --Three attacks diff --git a/unofficial/c511010238.lua b/unofficial/c511010238.lua index 3ed821ae1a..88e17a870c 100644 --- a/unofficial/c511010238.lua +++ b/unofficial/c511010238.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_RANKUP_EFFECT) e3:SetLabelObject(e2) - c:RegisterEffect(e3,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e3,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={92365601} diff --git a/unofficial/c511010239.lua b/unofficial/c511010239.lua index 6df2553159..a15225479c 100644 --- a/unofficial/c511010239.lua +++ b/unofficial/c511010239.lua @@ -44,7 +44,7 @@ function s.initial_effect(c) c:RegisterEffect(e4) local e5=e4:Clone() e5:SetLabelObject(e3) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={84013237} diff --git a/unofficial/c511010504.lua b/unofficial/c511010504.lua index 01866c8d0a..6dd5b2180a 100644 --- a/unofficial/c511010504.lua +++ b/unofficial/c511010504.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c511010515.lua b/unofficial/c511010515.lua index c97e904b21..c8d74ce7a8 100644 --- a/unofficial/c511010515.lua +++ b/unofficial/c511010515.lua @@ -58,7 +58,7 @@ function s.initial_effect(c) e7:SetCost(s.descost) e7:SetTarget(s.destg) e7:SetOperation(s.desop) - c:RegisterEffect(e7,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e7,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={0x10af} s.listed_names={47198668} diff --git a/unofficial/c511015129.lua b/unofficial/c511015129.lua index a9f602b9ae..33242c0c62 100644 --- a/unofficial/c511015129.lua +++ b/unofficial/c511015129.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e2:SetCost(s.cost) 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 function s.indes(e,c) return not c:IsSetCard(SET_NUMBER) diff --git a/unofficial/c511020000.lua b/unofficial/c511020000.lua index 21e54b3c77..fa915a7488 100644 --- a/unofficial/c511020000.lua +++ b/unofficial/c511020000.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCondition(s.condition) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --atk/def local e2=Effect.CreateEffect(c) e2:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE) diff --git a/unofficial/c511023000.lua b/unofficial/c511023000.lua index 0c95de9229..92b08aae37 100644 --- a/unofficial/c511023000.lua +++ b/unofficial/c511023000.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.copycost) e1:SetTarget(s.copytg) e1:SetOperation(s.copyop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) end function s.copycost(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/unofficial/c511027117.lua b/unofficial/c511027117.lua index 33b304119a..5cd7078597 100644 --- a/unofficial/c511027117.lua +++ b/unofficial/c511027117.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.diszatg) e2:SetOperation(s.diszaop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end function s.desfilter(c,e) return c:GetAttack()==0 and c:IsPosition(POS_FACEUP) and c:IsDestructable(e) and not c:IsImmuneToEffect(e) diff --git a/unofficial/c511600284.lua b/unofficial/c511600284.lua index 8918801d84..7df3073087 100644 --- a/unofficial/c511600284.lua +++ b/unofficial/c511600284.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_RANKUP_EFFECT) e2:SetLabelObject(e1) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_names={15914410} function s.damcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/unofficial/c511600298.lua b/unofficial/c511600298.lua index 666f5cbd6a..09c734f2f9 100644 --- a/unofficial/c511600298.lua +++ b/unofficial/c511600298.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(alias,1)) diff --git a/unofficial/c511600369.lua b/unofficial/c511600369.lua index a164b0e9de..6a35853857 100644 --- a/unofficial/c511600369.lua +++ b/unofficial/c511600369.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.atcost) e1:SetTarget(s.attg) e1:SetOperation(s.atop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --change target local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c511600384.lua b/unofficial/c511600384.lua index 05606cc311..1d00c0cb3e 100644 --- a/unofficial/c511600384.lua +++ b/unofficial/c511600384.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.listed_names={CARD_GALAXYEYES_P_DRAGON} function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/unofficial/c513000017.lua b/unofficial/c513000017.lua index 21d04952de..3a77ca90a8 100644 --- a/unofficial/c513000017.lua +++ b/unofficial/c513000017.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) e1:SetTarget(s.target) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --destroy replace local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) diff --git a/unofficial/c513000018.lua b/unofficial/c513000018.lua index c1f3da3c37..a6c5f69b49 100644 --- a/unofficial/c513000018.lua +++ b/unofficial/c513000018.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetOperation(s.operation) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c513000059.lua b/unofficial/c513000059.lua index 8e75ea6979..025557e546 100644 --- a/unofficial/c513000059.lua +++ b/unofficial/c513000059.lua @@ -48,7 +48,7 @@ function s.initial_effect(c) e5:SetType(EFFECT_TYPE_SINGLE) e5:SetCode(EFFECT_RANKUP_EFFECT) e5:SetLabelObject(e4) - c:RegisterEffect(e5,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e5,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={48739166} diff --git a/unofficial/c513000060.lua b/unofficial/c513000060.lua index 1827aeaebf..3f43bf4efc 100644 --- a/unofficial/c513000060.lua +++ b/unofficial/c513000060.lua @@ -51,7 +51,7 @@ function s.initial_effect(c) c:RegisterEffect(e5) local e6=e5:Clone() e6:SetLabelObject(e4) - c:RegisterEffect(e6,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e6,false,EFFECT_MARKER_DETACH_XMAT) end s.listed_series={SET_NUMBER} s.listed_names={84013237} diff --git a/unofficial/c513000061.lua b/unofficial/c513000061.lua index 0d10b1e550..dcc2f67dbe 100644 --- a/unofficial/c513000061.lua +++ b/unofficial/c513000061.lua @@ -28,7 +28,7 @@ function s.initial_effect(c) e2:SetCondition(s.negcon) e2:SetTarget(s.negtg) e2:SetOperation(s.negop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c513000062.lua b/unofficial/c513000062.lua index 051bb50b76..294790f6a8 100644 --- a/unofficial/c513000062.lua +++ b/unofficial/c513000062.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetCost(s.rmcost) e2:SetTarget(s.rmtg) e2:SetOperation(s.rmop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) diff --git a/unofficial/c513000063.lua b/unofficial/c513000063.lua index 7c37855b54..b42356bef4 100644 --- a/unofficial/c513000063.lua +++ b/unofficial/c513000063.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetTarget(s.rmtg) e2:SetOperation(s.rmop) - c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e2,false,EFFECT_MARKER_DETACH_XMAT) --Equip to a monster you control local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) diff --git a/unofficial/c700000026.lua b/unofficial/c700000026.lua index 893c45848f..55ac674968 100644 --- a/unofficial/c700000026.lua +++ b/unofficial/c700000026.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={id} function s.spcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/unofficial/c700000027.lua b/unofficial/c700000027.lua index f8752b796f..8f718d6a2b 100644 --- a/unofficial/c700000027.lua +++ b/unofficial/c700000027.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetCost(s.cost) 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.cost(e,tp,ep,eg,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end diff --git a/unofficial/c810000081.lua b/unofficial/c810000081.lua index 0c1b14a6da..1e63982f65 100644 --- a/unofficial/c810000081.lua +++ b/unofficial/c810000081.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetCondition(s.discon) e1:SetTarget(s.distg) e1:SetOperation(s.disop) - c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) + c:RegisterEffect(e1,false,EFFECT_MARKER_DETACH_XMAT) --battle indestructable local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) From 5e4cec7dfc7af9554bd571ee76ec4a2e295a84d5 Mon Sep 17 00:00:00 2001 From: Hatter <47074795+that-hatter@users.noreply.github.com> Date: Sun, 29 Jun 2025 17:52:56 +0800 Subject: [PATCH 10/10] missing newline --- utility.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utility.lua b/utility.lua index 0f860b61e9..15c3fd38bb 100644 --- a/utility.lua +++ b/utility.lua @@ -2706,4 +2706,4 @@ Duel.LoadScript("proc_gemini.lua") Duel.LoadScript("proc_spirit.lua") Duel.LoadScript("proc_unofficial.lua") Duel.LoadScript("deprecated_functions.lua") -pcall(dofile,"init.lua") \ No newline at end of file +pcall(dofile,"init.lua")