From aca70b0dca84d38f3729d359811dbeae46df6a5e Mon Sep 17 00:00:00 2001 From: Naim Date: Fri, 15 Aug 2025 07:46:54 -0300 Subject: [PATCH 1/5] batch1 --- official/c10000080.lua | 2 +- official/c11155484.lua | 2 +- official/c1151281.lua | 2 +- official/c12451640.lua | 4 ++-- official/c14261867.lua | 2 +- official/c14418464.lua | 2 +- official/c15383415.lua | 2 +- official/c15610297.lua | 4 ++-- official/c15629801.lua | 2 +- official/c16279989.lua | 2 +- official/c16509093.lua | 2 +- official/c16769305.lua | 2 +- official/c17601919.lua | 2 +- official/c17739335.lua | 2 +- official/c18094166.lua | 2 +- official/c19665973.lua | 2 +- official/c20799347.lua | 2 +- official/c21698716.lua | 2 +- official/c21768554.lua | 2 +- official/c2326738.lua | 2 +- official/c24101897.lua | 2 +- official/c2694423.lua | 2 +- official/c27491571.lua | 2 +- official/c28429121.lua | 2 +- official/c28534130.lua | 2 +- official/c3072808.lua | 2 +- official/c31829185.lua | 2 +- official/c32335697.lua | 2 +- official/c32710364.lua | 2 +- official/c32933942.lua | 2 +- official/c3510565.lua | 2 +- official/c35486099.lua | 2 +- official/c36328300.lua | 2 +- official/c36975314.lua | 2 +- official/c39711336.lua | 2 +- official/c39980304.lua | 2 +- official/c40267580.lua | 2 +- official/c40659562.lua | 2 +- official/c41039846.lua | 2 +- official/c41753322.lua | 2 +- official/c41802073.lua | 2 +- official/c41872150.lua | 2 +- official/c42899204.lua | 2 +- official/c42994702.lua | 2 +- official/c44092304.lua | 2 +- official/c44330098.lua | 4 ++-- official/c44811425.lua | 2 +- official/c45159319.lua | 2 +- official/c45812361.lua | 2 +- official/c46358784.lua | 2 +- official/c46925518.lua | 2 +- official/c47408488.lua | 2 +- official/c47556396.lua | 2 +- official/c49202162.lua | 2 +- official/c50485594.lua | 2 +- official/c51196805.lua | 2 +- official/c51611041.lua | 2 +- official/c52323207.lua | 2 +- official/c5253985.lua | 4 ++-- official/c53620899.lua | 2 +- official/c54289683.lua | 10 +++++----- official/c54490275.lua | 2 +- official/c54512827.lua | 2 +- official/c55034079.lua | 4 ++-- official/c56824871.lua | 2 +- official/c58062306.lua | 2 +- official/c60514625.lua | 4 ++-- official/c61318483.lua | 2 +- official/c62899696.lua | 2 +- official/c63227401.lua | 4 ++-- official/c63442604.lua | 2 +- official/c64681432.lua | 2 +- official/c64804316.lua | 2 +- official/c66165755.lua | 4 ++-- official/c68215963.lua | 2 +- official/c68597372.lua | 2 +- official/c69937550.lua | 2 +- official/c70284332.lua | 2 +- official/c70456282.lua | 2 +- official/c7093411.lua | 4 ++-- official/c70980824.lua | 2 +- official/c71415349.lua | 2 +- official/c72370114.lua | 2 +- official/c72913666.lua | 2 +- official/c7394770.lua | 2 +- official/c74506079.lua | 6 +++--- official/c74854609.lua | 2 +- official/c75109441.lua | 2 +- official/c75209824.lua | 2 +- official/c75487237.lua | 2 +- official/c78202553.lua | 2 +- official/c78266168.lua | 2 +- official/c79266769.lua | 4 ++-- official/c80885284.lua | 2 +- official/c80889750.lua | 2 +- official/c81278754.lua | 2 +- official/c81907872.lua | 2 +- official/c84472026.lua | 2 +- official/c85463083.lua | 2 +- official/c86871614.lua | 4 ++-- official/c87054946.lua | 10 +++++----- official/c8736823.lua | 2 +- official/c88851326.lua | 2 +- official/c8967776.lua | 6 +++--- official/c89707961.lua | 2 +- official/c923596.lua | 2 +- official/c92693205.lua | 2 +- official/c92736188.lua | 2 +- official/c92970404.lua | 2 +- official/c93130021.lua | 10 +++++----- official/c9334391.lua | 2 +- official/c9336190.lua | 2 +- official/c9365703.lua | 2 +- official/c95218695.lua | 2 +- official/c95600067.lua | 2 +- official/c95701283.lua | 2 +- official/c98707192.lua | 2 +- official/c99011763.lua | 2 +- 118 files changed, 145 insertions(+), 145 deletions(-) diff --git a/official/c10000080.lua b/official/c10000080.lua index f105a5e01b..6fb9f38e3d 100644 --- a/official/c10000080.lua +++ b/official/c10000080.lua @@ -101,7 +101,7 @@ function s.ttop2(e,tp,eg,ep,ev,re,r,rp,c,minc,zone,relzone,exeff) end function s.retreg(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,2) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,2) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_PHASE+PHASE_END) diff --git a/official/c11155484.lua b/official/c11155484.lua index f25c22da3c..0f70c68570 100644 --- a/official/c11155484.lua +++ b/official/c11155484.lua @@ -76,7 +76,7 @@ function s.plop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c1151281.lua b/official/c1151281.lua index 627f606414..f4cf0fcbde 100644 --- a/official/c1151281.lua +++ b/official/c1151281.lua @@ -65,7 +65,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c12451640.lua b/official/c12451640.lua index 0e22228ac8..b267f1a8e4 100644 --- a/official/c12451640.lua +++ b/official/c12451640.lua @@ -35,9 +35,9 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e2:SetOperation(s.thop2) e2:SetLabel(Duel.GetTurnCount()) if Duel.IsTurnPlayer(tp) then - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END|RESET_SELF_TURN,2) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END|RESET_SELF_TURN,2) else - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END|RESET_SELF_TURN) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END|RESET_SELF_TURN) end c:RegisterEffect(e2) end diff --git a/official/c14261867.lua b/official/c14261867.lua index b02f2bb5dd..a3e69ac309 100644 --- a/official/c14261867.lua +++ b/official/c14261867.lua @@ -24,7 +24,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c14418464.lua b/official/c14418464.lua index 549efe5282..2641cc8dc7 100644 --- a/official/c14418464.lua +++ b/official/c14418464.lua @@ -114,7 +114,7 @@ function s.smvop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) tc:RegisterEffect(e1) end diff --git a/official/c15383415.lua b/official/c15383415.lua index 7ab3ba07ab..8f32f55f82 100644 --- a/official/c15383415.lua +++ b/official/c15383415.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c15610297.lua b/official/c15610297.lua index ac0b301fbc..76b3894654 100644 --- a/official/c15610297.lua +++ b/official/c15610297.lua @@ -46,10 +46,10 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),0,1) local bc=c:GetBattleTarget() if c:IsLocation(LOCATION_SZONE) and bc:IsRelateToBattle() and bc:IsFaceup() then bc:AddCounter(0x1038,1) diff --git a/official/c15629801.lua b/official/c15629801.lua index c1d58a2f2d..a83ef35339 100644 --- a/official/c15629801.lua +++ b/official/c15629801.lua @@ -36,7 +36,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(tc:GetAttack()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_BASE_DEFENSE) diff --git a/official/c16279989.lua b/official/c16279989.lua index 19a2968dca..393513f4ac 100644 --- a/official/c16279989.lua +++ b/official/c16279989.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c16509093.lua b/official/c16509093.lua index 110c3aeccb..32ec3fcc0e 100644 --- a/official/c16509093.lua +++ b/official/c16509093.lua @@ -22,7 +22,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c16769305.lua b/official/c16769305.lua index 89364f90dd..9265934ce4 100644 --- a/official/c16769305.lua +++ b/official/c16769305.lua @@ -104,7 +104,7 @@ function s.syncsumop(e,tp,eg,ep,ev,re,r,rp) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e2:SetCode(EVENT_SPSUMMON_SUCCESS) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) e2:SetOperation(s.regop) e2:SetLabelObject(e1) sc:RegisterEffect(e2,true) diff --git a/official/c17601919.lua b/official/c17601919.lua index a18011305b..0ed64732c2 100644 --- a/official/c17601919.lua +++ b/official/c17601919.lua @@ -23,7 +23,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) --counter diff --git a/official/c17739335.lua b/official/c17739335.lua index c8d3cac7e2..45c7056962 100644 --- a/official/c17739335.lua +++ b/official/c17739335.lua @@ -49,7 +49,7 @@ function s.matcheck(e,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_EXTRA_ATTACK) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) c:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,3201) end diff --git a/official/c18094166.lua b/official/c18094166.lua index e3f6f35508..0e43994d0f 100644 --- a/official/c18094166.lua +++ b/official/c18094166.lua @@ -64,7 +64,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_TRAP+TYPE_CONTINUOUS) tc:RegisterEffect(e1) end diff --git a/official/c19665973.lua b/official/c19665973.lua index e2a96eec96..949ea92258 100644 --- a/official/c19665973.lua +++ b/official/c19665973.lua @@ -36,7 +36,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) e1:SetValue(LOCATION_REMOVED) c:RegisterEffect(e1) end diff --git a/official/c20799347.lua b/official/c20799347.lua index 8e45c9209f..31d5a42fac 100644 --- a/official/c20799347.lua +++ b/official/c20799347.lua @@ -54,7 +54,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_ADD_TYPE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) --Banish it if it leaves the field local e2=Effect.CreateEffect(c) diff --git a/official/c21698716.lua b/official/c21698716.lua index 841a4cf0ea..90d5eae7c2 100644 --- a/official/c21698716.lua +++ b/official/c21698716.lua @@ -33,7 +33,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c21768554.lua b/official/c21768554.lua index 0b7f8b9ea9..390b3d1040 100644 --- a/official/c21768554.lua +++ b/official/c21768554.lua @@ -55,7 +55,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tp) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetCondition(s.con) tc:RegisterEffect(e1) end diff --git a/official/c2326738.lua b/official/c2326738.lua index adeaea4b19..f7dfddfb94 100644 --- a/official/c2326738.lua +++ b/official/c2326738.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c24101897.lua b/official/c24101897.lua index 483a55bed8..8842427d9e 100644 --- a/official/c24101897.lua +++ b/official/c24101897.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c2694423.lua b/official/c2694423.lua index fad0464a6e..028b25c160 100644 --- a/official/c2694423.lua +++ b/official/c2694423.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c27491571.lua b/official/c27491571.lua index 766c8cf409..39db577929 100644 --- a/official/c27491571.lua +++ b/official/c27491571.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c28429121.lua b/official/c28429121.lua index dde4b8f941..f76a8ef22c 100644 --- a/official/c28429121.lua +++ b/official/c28429121.lua @@ -30,6 +30,6 @@ function s.extraop(mat,e,tp,eg,ep,ev,re,r,rp,sc) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(sc:GetAttack()/2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) sc:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c28534130.lua b/official/c28534130.lua index 4225bd5d27..a9ad72f568 100644 --- a/official/c28534130.lua +++ b/official/c28534130.lua @@ -67,7 +67,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e3:SetCode(EVENT_SPSUMMON_SUCCESS) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) e3:SetOperation(s.regop) sc:RegisterEffect(e3) Duel.LinkSummon(tp,sc,tc,nil) diff --git a/official/c3072808.lua b/official/c3072808.lua index 73b93df24f..ba7888b7aa 100644 --- a/official/c3072808.lua +++ b/official/c3072808.lua @@ -44,7 +44,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c31829185.lua b/official/c31829185.lua index 8d6635e118..acf25a21ea 100644 --- a/official/c31829185.lua +++ b/official/c31829185.lua @@ -95,7 +95,7 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_EQUIP) e2:SetCode(EFFECT_SET_CONTROL) e2:SetValue(tp) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e2:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) c:RegisterEffect(e2) end end \ No newline at end of file diff --git a/official/c32335697.lua b/official/c32335697.lua index 57ffc22472..83799b59b3 100644 --- a/official/c32335697.lua +++ b/official/c32335697.lua @@ -54,7 +54,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(lv) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c32710364.lua b/official/c32710364.lua index aab4995a18..9aa0d17884 100644 --- a/official/c32710364.lua +++ b/official/c32710364.lua @@ -32,7 +32,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c32933942.lua b/official/c32933942.lua index 73b06b2b3c..e75fb9813c 100644 --- a/official/c32933942.lua +++ b/official/c32933942.lua @@ -33,7 +33,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c3510565.lua b/official/c3510565.lua index 3f878f38b6..cce478a621 100644 --- a/official/c3510565.lua +++ b/official/c3510565.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c35486099.lua b/official/c35486099.lua index e7dc43f4d6..3e5c09e847 100644 --- a/official/c35486099.lua +++ b/official/c35486099.lua @@ -48,7 +48,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) tc:RegisterEffect(e1) end diff --git a/official/c36328300.lua b/official/c36328300.lua index 727748e9c7..32655ea19e 100644 --- a/official/c36328300.lua +++ b/official/c36328300.lua @@ -92,7 +92,7 @@ function s.plop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) tc:RegisterEffect(e1) end diff --git a/official/c36975314.lua b/official/c36975314.lua index 1debba0979..316d246e81 100644 --- a/official/c36975314.lua +++ b/official/c36975314.lua @@ -76,7 +76,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_OWNER_RELATE) e1:SetRange(LOCATION_MZONE) e1:SetValue(tp) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetCondition(s.con) tc:RegisterEffect(e1) end diff --git a/official/c39711336.lua b/official/c39711336.lua index c595c6d875..04e5d8a541 100644 --- a/official/c39711336.lua +++ b/official/c39711336.lua @@ -38,7 +38,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c39980304.lua b/official/c39980304.lua index bf60da88a7..b784f870ff 100644 --- a/official/c39980304.lua +++ b/official/c39980304.lua @@ -59,7 +59,7 @@ function s.chain_operation(e,te,tp,tc,mat,sumtype,sg,sumpos) tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TURN_SET),0,1) else Duel.SpecialSummonStep(tc,sumtype,tp,tp,false,false,sumpos) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),0,1) end local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c40267580.lua b/official/c40267580.lua index 697bc33fd5..e9015d7ea6 100644 --- a/official/c40267580.lua +++ b/official/c40267580.lua @@ -50,7 +50,7 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_EQUIP) e2:SetCode(EFFECT_SET_CONTROL) e2:SetValue(tp) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e2:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) c:RegisterEffect(e2) end end diff --git a/official/c40659562.lua b/official/c40659562.lua index 76e8fc97f8..46cd4bf76f 100644 --- a/official/c40659562.lua +++ b/official/c40659562.lua @@ -24,7 +24,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41039846.lua b/official/c41039846.lua index 0db1fbf4f4..73e49c6250 100644 --- a/official/c41039846.lua +++ b/official/c41039846.lua @@ -31,7 +31,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41753322.lua b/official/c41753322.lua index 89f6d0f4d2..e1ad389a4a 100644 --- a/official/c41753322.lua +++ b/official/c41753322.lua @@ -69,7 +69,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41802073.lua b/official/c41802073.lua index a9025df53e..c1b6ce2747 100644 --- a/official/c41802073.lua +++ b/official/c41802073.lua @@ -84,7 +84,7 @@ function s.szop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) tc:RegisterEffect(e1) end diff --git a/official/c41872150.lua b/official/c41872150.lua index 8aa8c8ef23..0bf0aa5eaa 100644 --- a/official/c41872150.lua +++ b/official/c41872150.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c42899204.lua b/official/c42899204.lua index f261ecec97..7099326f74 100644 --- a/official/c42899204.lua +++ b/official/c42899204.lua @@ -80,7 +80,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_OWNER_RELATE) e1:SetRange(LOCATION_MZONE) e1:SetValue(tp) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetCondition(s.con) tc:RegisterEffect(e1) end diff --git a/official/c42994702.lua b/official/c42994702.lua index 39589173a4..5808b61d50 100644 --- a/official/c42994702.lua +++ b/official/c42994702.lua @@ -15,7 +15,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.filter(c) diff --git a/official/c44092304.lua b/official/c44092304.lua index 12db5ed4aa..b00a0d2b07 100644 --- a/official/c44092304.lua +++ b/official/c44092304.lua @@ -66,7 +66,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(tc:GetBaseAttack()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_CHANGE_RACE) diff --git a/official/c44330098.lua b/official/c44330098.lua index c080e4096d..618144df3b 100644 --- a/official/c44330098.lua +++ b/official/c44330098.lua @@ -76,13 +76,13 @@ function s.sumop2(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(val) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_SET_DEFENSE) e2:SetValue(val) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e2) Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP) end diff --git a/official/c44811425.lua b/official/c44811425.lua index 6b3b020c55..51be33bdd4 100644 --- a/official/c44811425.lua +++ b/official/c44811425.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end function s.flipop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),0,1) end function s.drcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 diff --git a/official/c45159319.lua b/official/c45159319.lua index 35d415a78b..b2872b71d0 100644 --- a/official/c45159319.lua +++ b/official/c45159319.lua @@ -15,7 +15,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c45812361.lua b/official/c45812361.lua index 1bad60cd41..253937df86 100644 --- a/official/c45812361.lua +++ b/official/c45812361.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) c:RegisterEffect(e3) end function s.sumsuc(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 and Duel.IsPhase(PHASE_MAIN1) diff --git a/official/c46358784.lua b/official/c46358784.lua index e8b011386e..196eb7e76d 100644 --- a/official/c46358784.lua +++ b/official/c46358784.lua @@ -63,7 +63,7 @@ function s.replaceop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c46925518.lua b/official/c46925518.lua index 365c1fbce3..efebd690c0 100644 --- a/official/c46925518.lua +++ b/official/c46925518.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c47408488.lua b/official/c47408488.lua index 493df4cd30..729c87d6cc 100644 --- a/official/c47408488.lua +++ b/official/c47408488.lua @@ -84,7 +84,7 @@ function s.plop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) tc:RegisterEffect(e1) end diff --git a/official/c47556396.lua b/official/c47556396.lua index 47232b74e7..90726b99a3 100644 --- a/official/c47556396.lua +++ b/official/c47556396.lua @@ -78,7 +78,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c49202162.lua b/official/c49202162.lua index 20bd0f1e8b..b451939ec4 100644 --- a/official/c49202162.lua +++ b/official/c49202162.lua @@ -38,7 +38,7 @@ function s.matcheck(e,c) e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET) e1:SetRange(LOCATION_MZONE) e1:SetValue(aux.tgoval) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) --Your opponent cannot destroy with card effects. local e2=e1:Clone() diff --git a/official/c50485594.lua b/official/c50485594.lua index 5973f7d9cf..6d31b5c0b3 100644 --- a/official/c50485594.lua +++ b/official/c50485594.lua @@ -58,7 +58,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) Duel.ConfirmCards(1-tp,hg1) end function s.regop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 diff --git a/official/c51196805.lua b/official/c51196805.lua index 346742455a..8c93dad797 100644 --- a/official/c51196805.lua +++ b/official/c51196805.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c51611041.lua b/official/c51611041.lua index 117108de49..0d12d1a6aa 100644 --- a/official/c51611041.lua +++ b/official/c51611041.lua @@ -50,7 +50,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) e1:SetValue(race) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1,true) local e2=e1:Clone() e2:SetCode(EFFECT_CHANGE_ATTRIBUTE) diff --git a/official/c52323207.lua b/official/c52323207.lua index 7a112ba47e..c957ded290 100644 --- a/official/c52323207.lua +++ b/official/c52323207.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c5253985.lua b/official/c5253985.lua index 1552f1e633..a7d7fa8811 100644 --- a/official/c5253985.lua +++ b/official/c5253985.lua @@ -59,7 +59,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetCode(EVENT_SUMMON_SUCCESS) e2:SetOperation(s.sumsuc) e2:SetLabel(tp) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e2,true) Duel.Summon(tp,tc,true,nil,1) else @@ -67,7 +67,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetCode(EVENT_MSET) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) e3:SetOperation(s.sumsuc) e3:SetLabel(tp) tc:RegisterEffect(e3,true) diff --git a/official/c53620899.lua b/official/c53620899.lua index 475087c1dc..55861c24bf 100644 --- a/official/c53620899.lua +++ b/official/c53620899.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c54289683.lua b/official/c54289683.lua index a7d4ded946..f1f72360d1 100644 --- a/official/c54289683.lua +++ b/official/c54289683.lua @@ -62,7 +62,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetValue(s.tokenatk) e1:SetLabelObject(tc) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1,true) local e2=e1:Clone() e2:SetCode(EFFECT_SET_DEFENSE_FINAL) @@ -74,28 +74,28 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e3:SetCode(EFFECT_CHANGE_LEVEL) e3:SetValue(s.tokenlv) e3:SetLabelObject(tc) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e3,true) local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_CHANGE_RACE) e4:SetValue(s.tokenrace) e4:SetLabelObject(tc) - e4:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e4:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e4,true) local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE) e5:SetCode(EFFECT_CHANGE_ATTRIBUTE) e5:SetValue(s.tokenatt) e5:SetLabelObject(tc) - e5:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e5:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e5,true) local e6=Effect.CreateEffect(c) e6:SetType(EFFECT_TYPE_SINGLE) e6:SetCode(EFFECT_SELF_DESTROY) e6:SetCondition(s.tokendes) e6:SetLabelObject(tc) - e6:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e6:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e6,true) Duel.SpecialSummonComplete() else diff --git a/official/c54490275.lua b/official/c54490275.lua index 26cb382344..37865a47fe 100644 --- a/official/c54490275.lua +++ b/official/c54490275.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c54512827.lua b/official/c54512827.lua index b5ae1cf773..15b32640be 100644 --- a/official/c54512827.lua +++ b/official/c54512827.lua @@ -49,7 +49,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c55034079.lua b/official/c55034079.lua index 576879abbc..e996a7cc3b 100644 --- a/official/c55034079.lua +++ b/official/c55034079.lua @@ -104,12 +104,12 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e1,true) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e2,true) local e3=Effect.CreateEffect(c) e3:SetDescription(3300) diff --git a/official/c56824871.lua b/official/c56824871.lua index 3a7790b9bd..6b8b9eb497 100644 --- a/official/c56824871.lua +++ b/official/c56824871.lua @@ -40,7 +40,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetCode(EFFECT_ADD_TYPE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.thfilter(c) diff --git a/official/c58062306.lua b/official/c58062306.lua index 6b23fa44f3..cd13795807 100644 --- a/official/c58062306.lua +++ b/official/c58062306.lua @@ -43,7 +43,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end --This card can be discarded as cost diff --git a/official/c60514625.lua b/official/c60514625.lua index 274abf9529..bfa9637d56 100644 --- a/official/c60514625.lua +++ b/official/c60514625.lua @@ -62,7 +62,7 @@ function s.tkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_DEFENSE) @@ -74,7 +74,7 @@ function s.tkop(e,tp,eg,ep,ev,re,r,rp) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e3) end Duel.SpecialSummonComplete() diff --git a/official/c61318483.lua b/official/c61318483.lua index 819e5d4c58..7ab33db183 100644 --- a/official/c61318483.lua +++ b/official/c61318483.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c62899696.lua b/official/c62899696.lua index c98be2d71b..fb56610b14 100644 --- a/official/c62899696.lua +++ b/official/c62899696.lua @@ -72,7 +72,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e3:SetCode(EVENT_SPSUMMON_SUCCESS) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) e3:SetOperation(s.regop) e3:SetLabelObject(e1) sc:RegisterEffect(e3,true) diff --git a/official/c63227401.lua b/official/c63227401.lua index f115e92c1e..b736c8784e 100644 --- a/official/c63227401.lua +++ b/official/c63227401.lua @@ -36,8 +36,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) - tc:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(0,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_CHAIN_SOLVING) diff --git a/official/c63442604.lua b/official/c63442604.lua index a2a6e84694..83a4791224 100644 --- a/official/c63442604.lua +++ b/official/c63442604.lua @@ -42,7 +42,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(tc:GetAttack()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_BASE_DEFENSE) diff --git a/official/c64681432.lua b/official/c64681432.lua index 8b4a034450..62b3d4a71e 100644 --- a/official/c64681432.lua +++ b/official/c64681432.lua @@ -70,7 +70,7 @@ function s.tgreg1(e,tp,eg,ep,ev,re,r,rp) e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET-RESET_TEMP_REMOVE-RESET_LEAVE|RESET_PHASE|PHASE_END,0,1) end function s.tgreg2(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) end function s.tgcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 diff --git a/official/c64804316.lua b/official/c64804316.lua index be591ad7b1..803550f420 100644 --- a/official/c64804316.lua +++ b/official/c64804316.lua @@ -41,7 +41,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c66165755.lua b/official/c66165755.lua index 2af66df1eb..743dc4f799 100644 --- a/official/c66165755.lua +++ b/official/c66165755.lua @@ -52,7 +52,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_CLIENT_HINT) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e2) --Destroy it during end phase local e3=Effect.CreateEffect(e:GetHandler()) @@ -61,7 +61,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e3:SetCode(EVENT_PHASE+PHASE_END) e3:SetCondition(s.rmcon) e3:SetOperation(s.rmop) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) e3:SetCountLimit(1) tc:RegisterEffect(e3) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP) diff --git a/official/c68215963.lua b/official/c68215963.lua index a85504774c..9b113d31bd 100644 --- a/official/c68215963.lua +++ b/official/c68215963.lua @@ -32,7 +32,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c68597372.lua b/official/c68597372.lua index 0cddcfd906..3cec48b4e3 100644 --- a/official/c68597372.lua +++ b/official/c68597372.lua @@ -43,7 +43,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsFaceup() and tc:IsRelateToEffect(e) and tc:IsFaceup() then Duel.ChangePosition(tc,POS_FACEDOWN_DEFENSE) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_PHASE+PHASE_END) diff --git a/official/c69937550.lua b/official/c69937550.lua index ec09207a0f..2b2ac70543 100644 --- a/official/c69937550.lua +++ b/official/c69937550.lua @@ -32,7 +32,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c70284332.lua b/official/c70284332.lua index 0b410324f3..dbd0e2247f 100644 --- a/official/c70284332.lua +++ b/official/c70284332.lua @@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_OWNER_RELATE) e1:SetRange(LOCATION_MZONE) e1:SetValue(tp) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetCondition(s.con) tc:RegisterEffect(e1) --redirect diff --git a/official/c70456282.lua b/official/c70456282.lua index f71eb49f75..345bcad8fc 100644 --- a/official/c70456282.lua +++ b/official/c70456282.lua @@ -46,7 +46,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetCode(EFFECT_ADD_TYPE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c7093411.lua b/official/c7093411.lua index b09847b92f..7a35088e25 100644 --- a/official/c7093411.lua +++ b/official/c7093411.lua @@ -36,7 +36,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) @@ -59,7 +59,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) tc:RegisterEffect(e1) Duel.RaiseEvent(tc,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c70980824.lua b/official/c70980824.lua index 97c5b41866..c682f73d67 100644 --- a/official/c70980824.lua +++ b/official/c70980824.lua @@ -73,7 +73,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(3300) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) g:GetFirst():RegisterEffect(e1) local g2=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil) if #g2>0 then diff --git a/official/c71415349.lua b/official/c71415349.lua index 1fa2143be2..add11fe519 100644 --- a/official/c71415349.lua +++ b/official/c71415349.lua @@ -23,7 +23,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c72370114.lua b/official/c72370114.lua index a5049533df..55d9f5a07a 100644 --- a/official/c72370114.lua +++ b/official/c72370114.lua @@ -26,7 +26,7 @@ s.listed_series={SET_GEARGIA} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c72913666.lua b/official/c72913666.lua index af989bc293..b3d698fd52 100644 --- a/official/c72913666.lua +++ b/official/c72913666.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c7394770.lua b/official/c7394770.lua index 45999ebba3..b483ee0279 100644 --- a/official/c7394770.lua +++ b/official/c7394770.lua @@ -39,7 +39,7 @@ function s.stage2(e,tc,tp,sg,chk) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_DEFENSE_FINAL) diff --git a/official/c74506079.lua b/official/c74506079.lua index 3e21a2cea8..1148f185e5 100644 --- a/official/c74506079.lua +++ b/official/c74506079.lua @@ -36,7 +36,7 @@ function s.matcheck(e,c) e1:SetCountLimit(1) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end if ct>=4 then @@ -49,7 +49,7 @@ function s.matcheck(e,c) e1:SetCost(s.tgcost) e1:SetTarget(s.tgtg) e1:SetOperation(s.tgop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end if ct>=6 then @@ -62,7 +62,7 @@ function s.matcheck(e,c) e1:SetCountLimit(1) e1:SetTarget(s.drtg) e1:SetOperation(s.drop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end end diff --git a/official/c74854609.lua b/official/c74854609.lua index 4efc45c8a1..cbd8385808 100644 --- a/official/c74854609.lua +++ b/official/c74854609.lua @@ -49,7 +49,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_EQUIP) e2:SetCode(EFFECT_SET_CONTROL) e2:SetValue(tp) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e2:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) ec:RegisterEffect(e2) end end \ No newline at end of file diff --git a/official/c75109441.lua b/official/c75109441.lua index 4644dc29d8..007fe903a8 100644 --- a/official/c75109441.lua +++ b/official/c75109441.lua @@ -22,7 +22,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75209824.lua b/official/c75209824.lua index afaef9b3d3..028014fe8d 100644 --- a/official/c75209824.lua +++ b/official/c75209824.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75487237.lua b/official/c75487237.lua index 579d445b96..4a7478c995 100644 --- a/official/c75487237.lua +++ b/official/c75487237.lua @@ -23,7 +23,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c78202553.lua b/official/c78202553.lua index 67149d3627..3cc27a69b4 100644 --- a/official/c78202553.lua +++ b/official/c78202553.lua @@ -69,7 +69,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c78266168.lua b/official/c78266168.lua index 4ac33e34e5..861fe29752 100644 --- a/official/c78266168.lua +++ b/official/c78266168.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c79266769.lua b/official/c79266769.lua index afd1b7605a..54980ffabd 100644 --- a/official/c79266769.lua +++ b/official/c79266769.lua @@ -45,12 +45,12 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e2) --Place on bottom of deck if it leaves the field local e3=Effect.CreateEffect(c) diff --git a/official/c80885284.lua b/official/c80885284.lua index 5a9dee9fee..c7ce6c9698 100644 --- a/official/c80885284.lua +++ b/official/c80885284.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c80889750.lua b/official/c80889750.lua index 36cf48ccd2..a0ae570425 100644 --- a/official/c80889750.lua +++ b/official/c80889750.lua @@ -67,7 +67,7 @@ function s.valcheck(e,c) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetValue(1) e1:SetCondition(s.indcon) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1,true) local e2=e1:Clone() e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c81278754.lua b/official/c81278754.lua index 59076627b1..05042686a6 100644 --- a/official/c81278754.lua +++ b/official/c81278754.lua @@ -26,7 +26,7 @@ s.listed_series={SET_FROG} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c81907872.lua b/official/c81907872.lua index 2a7d8cc4c7..668c84b05c 100644 --- a/official/c81907872.lua +++ b/official/c81907872.lua @@ -37,7 +37,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c84472026.lua b/official/c84472026.lua index 725cbbe99d..af6db3a21e 100644 --- a/official/c84472026.lua +++ b/official/c84472026.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c85463083.lua b/official/c85463083.lua index a989ca0617..94a6a4c0bd 100644 --- a/official/c85463083.lua +++ b/official/c85463083.lua @@ -40,7 +40,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c86871614.lua b/official/c86871614.lua index 20d4b34897..4890b52a27 100644 --- a/official/c86871614.lua +++ b/official/c86871614.lua @@ -41,7 +41,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(ec:GetBaseAttack()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_BASE_DEFENSE) @@ -66,7 +66,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) de:SetCode(EVENT_TO_GRAVE) de:SetCondition(s.descon) de:SetOperation(s.desop) - de:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + de:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(de) end function s.dfilter(c) diff --git a/official/c87054946.lua b/official/c87054946.lua index 9a22c76f6a..de7614f318 100644 --- a/official/c87054946.lua +++ b/official/c87054946.lua @@ -32,7 +32,7 @@ function s.matcheck(e,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) c:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end @@ -43,13 +43,13 @@ function s.matcheck(e,c) e2:SetCode(EFFECT_UPDATE_ATTACK) e2:SetRange(LOCATION_MZONE) e2:SetValue(1200) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e2) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) e3:SetValue(1) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e3) c:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) end @@ -60,7 +60,7 @@ function s.matcheck(e,c) e4:SetCode(EFFECT_UPDATE_ATTACK) e4:SetRange(LOCATION_MZONE) e4:SetValue(1200) - e4:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e4:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e4) local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE) @@ -68,7 +68,7 @@ function s.matcheck(e,c) e5:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET) e5:SetRange(LOCATION_MZONE) e5:SetValue(1) - e5:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e5:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e5) c:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) end diff --git a/official/c8736823.lua b/official/c8736823.lua index be834f1179..24af3adf64 100644 --- a/official/c8736823.lua +++ b/official/c8736823.lua @@ -58,7 +58,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_ADD_TYPE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) --Banish it if it leaves the field local e2=Effect.CreateEffect(c) diff --git a/official/c88851326.lua b/official/c88851326.lua index 95faa09067..5353316c99 100644 --- a/official/c88851326.lua +++ b/official/c88851326.lua @@ -65,7 +65,7 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp) local g=eg:Filter(Card.IsPreviousLocation,nil,LOCATION_HAND) for tc in aux.Next(g) do if tc:GetFlagEffect(id)==0 then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),0,1) Duel.RegisterFlagEffect(rp,id,RESET_PHASE|PHASE_END,0,1) end end diff --git a/official/c8967776.lua b/official/c8967776.lua index 0bd47726d6..efe4e47e22 100644 --- a/official/c8967776.lua +++ b/official/c8967776.lua @@ -52,18 +52,18 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e2) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_SET_ATTACK) e3:SetValue(4000) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) tc:RegisterEffect(e3) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP) end \ No newline at end of file diff --git a/official/c89707961.lua b/official/c89707961.lua index 6890fa28d5..fe29d7fb50 100644 --- a/official/c89707961.lua +++ b/official/c89707961.lua @@ -37,7 +37,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c923596.lua b/official/c923596.lua index 2bdadddd84..aefbc53af0 100644 --- a/official/c923596.lua +++ b/official/c923596.lua @@ -27,7 +27,7 @@ s.listed_names={id} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c92693205.lua b/official/c92693205.lua index b35e575fe8..88b74ab57e 100644 --- a/official/c92693205.lua +++ b/official/c92693205.lua @@ -25,7 +25,7 @@ s.listed_series={SET_GEARGIA} function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c92736188.lua b/official/c92736188.lua index e35d95ef6d..bda73ad628 100644 --- a/official/c92736188.lua +++ b/official/c92736188.lua @@ -24,7 +24,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c92970404.lua b/official/c92970404.lua index 0727b61dde..06f1c56169 100644 --- a/official/c92970404.lua +++ b/official/c92970404.lua @@ -65,7 +65,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c93130021.lua b/official/c93130021.lua index c2e00ba89a..2068c4c9d6 100644 --- a/official/c93130021.lua +++ b/official/c93130021.lua @@ -73,7 +73,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) e1:SetValue(s.tokenatk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e1,true) local e2=e1:Clone() e2:SetCode(EFFECT_SET_DEFENSE_FINAL) @@ -83,25 +83,25 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_CHANGE_LEVEL) e3:SetValue(s.tokenlv) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e3,true) local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_CHANGE_RACE) e4:SetValue(s.tokenrace) - e4:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e4:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e4,true) local e5=Effect.CreateEffect(c) e5:SetType(EFFECT_TYPE_SINGLE) e5:SetCode(EFFECT_CHANGE_ATTRIBUTE) e5:SetValue(s.tokenatt) - e5:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e5:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e5,true) local e6=Effect.CreateEffect(c) e6:SetType(EFFECT_TYPE_SINGLE) e6:SetCode(EFFECT_SELF_DESTROY) e6:SetCondition(s.tokendes) - e6:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e6:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) token:RegisterEffect(e6,true) Duel.SpecialSummonComplete() else diff --git a/official/c9334391.lua b/official/c9334391.lua index 5224fda98c..1b2c160ca2 100644 --- a/official/c9334391.lua +++ b/official/c9334391.lua @@ -44,7 +44,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) tc:RegisterEffect(e1) Duel.RaiseEvent(tc,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) end diff --git a/official/c9336190.lua b/official/c9336190.lua index a20ea3d67f..b1c64607e2 100644 --- a/official/c9336190.lua +++ b/official/c9336190.lua @@ -86,7 +86,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_CHANGE_LEVEL_FINAL) e2:SetValue(lv) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e2:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) c:RegisterEffect(e2,true) end end diff --git a/official/c9365703.lua b/official/c9365703.lua index 71a921baac..9bfc188229 100644 --- a/official/c9365703.lua +++ b/official/c9365703.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end function s.sumop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) end function s.dacon(e,tp,eg,ep,ev,re,r,rp) return Duel.IsPhase(PHASE_BATTLE_STEP) and Duel.GetCurrentChain()==0 diff --git a/official/c95218695.lua b/official/c95218695.lua index 42ef7d1581..26e2459dab 100644 --- a/official/c95218695.lua +++ b/official/c95218695.lua @@ -62,7 +62,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c95600067.lua b/official/c95600067.lua index 87a383ba75..764d4ebc7d 100644 --- a/official/c95600067.lua +++ b/official/c95600067.lua @@ -30,7 +30,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CHANGE_TYPE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) c:RegisterEffect(e1) Duel.RaiseEvent(c,EVENT_CUSTOM+CARD_CRYSTAL_TREE,e,0,tp,0,0) diff --git a/official/c95701283.lua b/official/c95701283.lua index 3bad25964a..26fc71c4ad 100644 --- a/official/c95701283.lua +++ b/official/c95701283.lua @@ -21,7 +21,7 @@ function s.sumop(g,e,tp,eg,ep,ev,re,r,rp,c,minc,zone,relzone,exeff) e1:SetCountLimit(1) e1:SetTarget(s.tgtg) e1:SetOperation(s.tgop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c98707192.lua b/official/c98707192.lua index 04a0943b69..3303793515 100644 --- a/official/c98707192.lua +++ b/official/c98707192.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c99011763.lua b/official/c99011763.lua index 8fe3515efe..97f2a0a68c 100644 --- a/official/c99011763.lua +++ b/official/c99011763.lua @@ -27,7 +27,7 @@ function s.matcheck(e,c) e1:SetCost(s.addcost) e1:SetTarget(s.addtg) e1:SetOperation(s.addop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) end end From b47d942572f49517a0b6fce8b394ecd57e72fe10 Mon Sep 17 00:00:00 2001 From: Naim Date: Fri, 15 Aug 2025 08:09:12 -0300 Subject: [PATCH 2/5] batch2 --- official/c11443677.lua | 2 +- official/c12451640.lua | 2 +- official/c13235258.lua | 2 +- official/c14577226.lua | 2 +- official/c15066114.lua | 2 +- official/c164710.lua | 4 ++-- official/c16825874.lua | 2 +- official/c17330916.lua | 2 +- official/c17739335.lua | 2 +- official/c20188127.lua | 2 +- official/c20265095.lua | 2 +- official/c20720928.lua | 2 +- official/c21862633.lua | 2 +- official/c23265313.lua | 4 ++-- official/c25449584.lua | 2 +- official/c26556950.lua | 2 +- official/c27552504.lua | 2 +- official/c28601770.lua | 2 +- official/c28617139.lua | 4 ++-- official/c29303524.lua | 2 +- official/c30118701.lua | 2 +- official/c32065885.lua | 6 +++--- official/c32986898.lua | 4 ++-- official/c33022867.lua | 2 +- official/c3322931.lua | 2 +- official/c35405755.lua | 2 +- official/c37520316.lua | 2 +- official/c3752422.lua | 2 +- official/c3775068.lua | 2 +- official/c37991342.lua | 4 ++-- official/c38495396.lua | 2 +- official/c38606913.lua | 2 +- official/c40392714.lua | 2 +- official/c40916023.lua | 2 +- official/c40971261.lua | 2 +- official/c41114306.lua | 2 +- official/c41524885.lua | 2 +- official/c42741437.lua | 2 +- official/c46502744.lua | 2 +- official/c47942531.lua | 2 +- official/c4998619.lua | 2 +- official/c5008836.lua | 2 +- official/c51126152.lua | 2 +- official/c51632798.lua | 2 +- official/c52707042.lua | 2 +- official/c5309481.lua | 4 ++-- official/c54343893.lua | 2 +- official/c57270476.lua | 2 +- official/c57282724.lua | 2 +- official/c57996334.lua | 2 +- official/c61283655.lua | 2 +- official/c62541668.lua | 2 +- official/c64002884.lua | 2 +- official/c6442944.lua | 4 ++-- official/c64496451.lua | 4 ++-- official/c64681432.lua | 2 +- official/c65549080.lua | 2 +- official/c66165755.lua | 2 +- official/c67136033.lua | 2 +- official/c67196946.lua | 2 +- official/c675319.lua | 2 +- official/c67556500.lua | 2 +- official/c67949763.lua | 2 +- official/c68881649.lua | 2 +- official/c69838761.lua | 2 +- official/c7025445.lua | 2 +- official/c71406430.lua | 2 +- official/c71564150.lua | 2 +- official/c71652522.lua | 2 +- official/c74506079.lua | 2 +- official/c74841885.lua | 8 ++++---- official/c74889525.lua | 2 +- official/c74937659.lua | 2 +- official/c76552147.lua | 2 +- official/c77387463.lua | 2 +- official/c77901552.lua | 2 +- official/c78135071.lua | 2 +- official/c78509901.lua | 2 +- official/c78651105.lua | 2 +- official/c79206925.lua | 2 +- official/c79229522.lua | 2 +- official/c79852326.lua | 2 +- official/c84171830.lua | 2 +- official/c84397023.lua | 2 +- official/c85668449.lua | 2 +- official/c85679527.lua | 2 +- official/c87116928.lua | 2 +- official/c88106656.lua | 2 +- official/c88559132.lua | 2 +- official/c88757791.lua | 2 +- official/c89113320.lua | 2 +- official/c91135480.lua | 2 +- official/c91505214.lua | 2 +- official/c94942656.lua | 4 ++-- official/c95403418.lua | 2 +- official/c95515518.lua | 2 +- official/c97385276.lua | 4 ++-- official/c98153934.lua | 2 +- official/c98875863.lua | 2 +- rush/c160022039.lua | 2 +- 100 files changed, 115 insertions(+), 115 deletions(-) diff --git a/official/c11443677.lua b/official/c11443677.lua index 64a352654e..aa977cce6b 100644 --- a/official/c11443677.lua +++ b/official/c11443677.lua @@ -78,7 +78,7 @@ function s.fgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.IsExistingTarget(s.stfilter,tp,LOCATION_GRAVE,0,1,nil) and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOGRAVE-RESET_REMOVE-RESET_LEAVE|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TOGRAVE|RESET_REMOVE|RESET_LEAVE)|RESET_PHASE|PHASE_END,0,1) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) local g=Duel.SelectTarget(tp,s.stfilter,tp,LOCATION_GRAVE,0,1,1,nil) Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g,1,0,0) diff --git a/official/c12451640.lua b/official/c12451640.lua index b267f1a8e4..885626a77a 100644 --- a/official/c12451640.lua +++ b/official/c12451640.lua @@ -21,7 +21,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1) e1:SetTarget(s.thtg1) e1:SetOperation(s.thop1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) c:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c13235258.lua b/official/c13235258.lua index 389215d1a1..9ee6b7d254 100644 --- a/official/c13235258.lua +++ b/official/c13235258.lua @@ -105,7 +105,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) end end function s.regop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) end function s.ctcon2(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetEquipTarget() and ep~=tp and e:GetHandler():GetFlagEffect(id)~=0 diff --git a/official/c14577226.lua b/official/c14577226.lua index 81a647f92f..617951c03e 100644 --- a/official/c14577226.lua +++ b/official/c14577226.lua @@ -82,7 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH+EFFECT_FLAG_CLIENT_HINT) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c15066114.lua b/official/c15066114.lua index 5e2be6b786..dcbc538bee 100644 --- a/official/c15066114.lua +++ b/official/c15066114.lua @@ -39,7 +39,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetRange(LOCATION_MZONE) e1:SetValue(1300) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_BASE_DEFENSE) diff --git a/official/c164710.lua b/official/c164710.lua index b884c4de93..27053f8d0a 100644 --- a/official/c164710.lua +++ b/official/c164710.lua @@ -28,7 +28,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end local e2=Effect.CreateEffect(c) @@ -46,7 +46,7 @@ function s.hlvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c16825874.lua b/official/c16825874.lua index a5b2dd5347..903bc547d6 100644 --- a/official/c16825874.lua +++ b/official/c16825874.lua @@ -47,7 +47,7 @@ function s.cop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e1:SetValue(LOCATION_REMOVED) - e1:SetReset(RESET_EVENT|RESETS_REDIRECT-RESET_OVERLAY) + e1:SetReset(RESET_EVENT|(RESETS_REDIRECT&~RESET_OVERLAY)) rc:RegisterEffect(e1) --Cannot activate its effects local e2=Effect.CreateEffect(c) diff --git a/official/c17330916.lua b/official/c17330916.lua index 96c42b2e53..dff83de6ff 100644 --- a/official/c17330916.lua +++ b/official/c17330916.lua @@ -92,7 +92,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c17739335.lua b/official/c17739335.lua index 45c7056962..e19537cd03 100644 --- a/official/c17739335.lua +++ b/official/c17739335.lua @@ -51,7 +51,7 @@ function s.matcheck(e,c) e1:SetValue(1) e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)) c:RegisterEffect(e1) - c:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,3201) + c:RegisterFlagEffect(0,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),EFFECT_FLAG_CLIENT_HINT,1,0,3201) end end function s.descond(e) diff --git a/official/c20188127.lua b/official/c20188127.lua index faa4cdc7f0..f7e762e65c 100644 --- a/official/c20188127.lua +++ b/official/c20188127.lua @@ -30,7 +30,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c20265095.lua b/official/c20265095.lua index 3e5e51ee0a..72bcbcb5d9 100644 --- a/official/c20265095.lua +++ b/official/c20265095.lua @@ -70,7 +70,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) if c:IsRelateToEffect(e) and tc then local zone=c:GetLinkedZone()&ZONES_MMZ if Duel.GetControl(tc,tp,PHASE_END,1,zone)~=0 then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END --Cannot attack local e1=Effect.CreateEffect(c) e1:SetDescription(3206) diff --git a/official/c20720928.lua b/official/c20720928.lua index ee443767da..99015b3e67 100644 --- a/official/c20720928.lua +++ b/official/c20720928.lua @@ -36,7 +36,7 @@ function s.nttg(e,c) return c:IsLevelAbove(5) and c:IsSetCard(SET_METAPHYS) end function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) local e2=Effect.CreateEffect(e:GetHandler()) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetCode(EVENT_PHASE+PHASE_END) diff --git a/official/c21862633.lua b/official/c21862633.lua index 8c180d4216..9770ae0490 100644 --- a/official/c21862633.lua +++ b/official/c21862633.lua @@ -47,7 +47,7 @@ end function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsType,1,nil,TYPE_NORMAL) then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),0,1) end end function s.drcfilter(c,tp) diff --git a/official/c23265313.lua b/official/c23265313.lua index 8565dccaf5..39390bcdaa 100644 --- a/official/c23265313.lua +++ b/official/c23265313.lua @@ -23,7 +23,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end local e2=Effect.CreateEffect(c) @@ -44,7 +44,7 @@ function s.hlvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c25449584.lua b/official/c25449584.lua index 05a41ff340..cd8de500b2 100644 --- a/official/c25449584.lua +++ b/official/c25449584.lua @@ -53,7 +53,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) end g:DeleteGroup() diff --git a/official/c26556950.lua b/official/c26556950.lua index e7f8a8a94f..a6d3ad9349 100644 --- a/official/c26556950.lua +++ b/official/c26556950.lua @@ -51,7 +51,7 @@ function s.defval(e,c) end function s.regop(e,tp,eg,ep,ev,re,r,rp) if rp==tp or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) end function s.damcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c27552504.lua b/official/c27552504.lua index 0fc34c02f1..9b4cef1ff6 100644 --- a/official/c27552504.lua +++ b/official/c27552504.lua @@ -41,7 +41,7 @@ function s.xyzop(e,tp,chk,mc) local tc=Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_HAND,0,nil):SelectUnselect(Group.CreateGroup(),tp,false,Xyz.ProcCancellable) if tc then Duel.SendtoGrave(tc,REASON_COST) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) return true else return false end end diff --git a/official/c28601770.lua b/official/c28601770.lua index 57151202dc..8a8cb11523 100644 --- a/official/c28601770.lua +++ b/official/c28601770.lua @@ -27,7 +27,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetTarget(s.destg) e1:SetOperation(s.desop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD-RESET_TEMP_REMOVE) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE)) c:RegisterEffect(e1) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c28617139.lua b/official/c28617139.lua index 47aedce165..7498274e0e 100644 --- a/official/c28617139.lua +++ b/official/c28617139.lua @@ -71,7 +71,7 @@ function s.rvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end local e2=Effect.CreateEffect(c) @@ -93,7 +93,7 @@ function s.hlvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c29303524.lua b/official/c29303524.lua index 22077b9f65..9c9830edaf 100644 --- a/official/c29303524.lua +++ b/official/c29303524.lua @@ -37,7 +37,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(1500) c:RegisterEffect(e1) diff --git a/official/c30118701.lua b/official/c30118701.lua index b78834ef88..17504f32e2 100644 --- a/official/c30118701.lua +++ b/official/c30118701.lua @@ -60,7 +60,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(-500) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c32065885.lua b/official/c32065885.lua index 57d594d19e..e0f934123a 100644 --- a/official/c32065885.lua +++ b/official/c32065885.lua @@ -40,17 +40,17 @@ function s.ctlop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,2) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,2) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,2) tc:RegisterEffect(e2) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_CANNOT_ATTACK) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,2) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,2) tc:RegisterEffect(e3) end end \ No newline at end of file diff --git a/official/c32986898.lua b/official/c32986898.lua index 5a134ab5e1..3828b81af0 100644 --- a/official/c32986898.lua +++ b/official/c32986898.lua @@ -36,11 +36,11 @@ function s.matcheck(e,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk*100) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local tp=c:GetControler() if g:IsExists(s.mfilter,1,nil) then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD-RESET_LEAVE-RESET_TEMP_REMOVE,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_LEAVE|RESET_TEMP_REMOVE),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) end end function s.desfilter(c,atk) diff --git a/official/c33022867.lua b/official/c33022867.lua index 1c8ae5870c..81b7f07cf0 100644 --- a/official/c33022867.lua +++ b/official/c33022867.lua @@ -63,7 +63,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c3322931.lua b/official/c3322931.lua index e0ac06bf21..ec5813b645 100644 --- a/official/c3322931.lua +++ b/official/c3322931.lua @@ -40,7 +40,7 @@ end function s.regop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() if not re:IsMonsterEffect() or re:GetHandler()==c then return end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c35405755.lua b/official/c35405755.lua index c0a3f7c355..41f1047f09 100644 --- a/official/c35405755.lua +++ b/official/c35405755.lua @@ -68,7 +68,7 @@ function s.spprocop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.spfilter(c,e,tp) diff --git a/official/c37520316.lua b/official/c37520316.lua index 8c8e99a110..5d10b9d32e 100644 --- a/official/c37520316.lua +++ b/official/c37520316.lua @@ -24,7 +24,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) and Duel.GetControl(tc,tp,PHASE_END,1)~=0 then local e1=Effect.CreateEffect(c) - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) e1:SetReset(reset) diff --git a/official/c3752422.lua b/official/c3752422.lua index 82b60aa359..eb0a89b89f 100644 --- a/official/c3752422.lua +++ b/official/c3752422.lua @@ -34,7 +34,7 @@ end function s.lvop(e,tp,eg,ep,ev,re,r,rp) local tg=Duel.GetMatchingGroup(s.lvfilter,tp,LOCATION_MZONE,0,nil) for tc in aux.Next(tg) do - tc:UpdateLevel(1,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,e:GetHandler()) + tc:UpdateLevel(1,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),e:GetHandler()) end end function s.filter(c) diff --git a/official/c3775068.lua b/official/c3775068.lua index 4afe5bc290..3773a296ea 100644 --- a/official/c3775068.lua +++ b/official/c3775068.lua @@ -73,7 +73,7 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(2400) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c37991342.lua b/official/c37991342.lua index b5998770d2..12eeade66c 100644 --- a/official/c37991342.lua +++ b/official/c37991342.lua @@ -79,7 +79,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCondition(s.lvcon) e1:SetValue(4) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) @@ -88,7 +88,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e2:SetRange(LOCATION_MZONE) e2:SetCondition(s.lvcon) e2:SetValue(1800) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e2) end function s.lvop2(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c38495396.lua b/official/c38495396.lua index e902b82a55..f17233d7ee 100644 --- a/official/c38495396.lua +++ b/official/c38495396.lua @@ -24,7 +24,7 @@ function s.ovfilter(c,tp,xyzc) end function s.xyzop(e,tp,chk) if chk==0 then return true end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) return true end function s.thfilter(c) diff --git a/official/c38606913.lua b/official/c38606913.lua index 169bc38a05..efccfaed5f 100644 --- a/official/c38606913.lua +++ b/official/c38606913.lua @@ -93,7 +93,7 @@ function s.damact(e,tp,eg,ep,ev,re,r,rp) e2:SetLabelObject(tc) e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_LEAVE-RESET_TOGRAVE|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_LEAVE|RESET_TOGRAVE)|RESET_PHASE|PHASE_END,0,1) tc:CreateEffectRelation(e1) end end diff --git a/official/c40392714.lua b/official/c40392714.lua index 207298eff5..ba11444750 100644 --- a/official/c40392714.lua +++ b/official/c40392714.lua @@ -64,7 +64,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(800) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c40916023.lua b/official/c40916023.lua index 596beb8422..28a6e75e8b 100644 --- a/official/c40916023.lua +++ b/official/c40916023.lua @@ -72,7 +72,7 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_CHANGE_POSITION) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,1) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,1) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c40971261.lua b/official/c40971261.lua index 6f15e9d625..4d69044dbf 100644 --- a/official/c40971261.lua +++ b/official/c40971261.lua @@ -52,7 +52,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) end function s.regop(e,tp,eg,ep,ev,re,r,rp) if re:GetHandler():GetCode()==e:GetLabelObject():GetLabel() then - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) return true end end function s.damcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41114306.lua b/official/c41114306.lua index ba20b0f9b0..f1301e0cac 100644 --- a/official/c41114306.lua +++ b/official/c41114306.lua @@ -55,7 +55,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c41524885.lua b/official/c41524885.lua index 071435088d..556e4f2c57 100644 --- a/official/c41524885.lua +++ b/official/c41524885.lua @@ -47,7 +47,7 @@ s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsSetCard,1,nil,SET_EXOSISTER) then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END c:RegisterFlagEffect(id,reset,0,1) end end diff --git a/official/c42741437.lua b/official/c42741437.lua index a7ad3ece06..ab0b57dc77 100644 --- a/official/c42741437.lua +++ b/official/c42741437.lua @@ -50,7 +50,7 @@ s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsSetCard,1,nil,SET_EXOSISTER) then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) end end diff --git a/official/c46502744.lua b/official/c46502744.lua index 9be8628b1a..fa87fd3258 100644 --- a/official/c46502744.lua +++ b/official/c46502744.lua @@ -52,7 +52,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() if not c:IsRelateToEffect(e) then return end if Duel.SpecialSummonStep(c,0,tp,tp,false,false,POS_FACEUP)~=0 then - c:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,0,1) + c:RegisterFlagEffect(id+1,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),0,1) Duel.SpecialSummonComplete() end end diff --git a/official/c47942531.lua b/official/c47942531.lua index 3a4f7426d8..610fcd2755 100644 --- a/official/c47942531.lua +++ b/official/c47942531.lua @@ -27,7 +27,7 @@ function s.valcheck(e,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) end end diff --git a/official/c4998619.lua b/official/c4998619.lua index bbeefb6eca..36caf0143d 100644 --- a/official/c4998619.lua +++ b/official/c4998619.lua @@ -67,7 +67,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(3000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c5008836.lua b/official/c5008836.lua index 744bc1c525..2fec69476d 100644 --- a/official/c5008836.lua +++ b/official/c5008836.lua @@ -75,7 +75,7 @@ function s.valcheck(e,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_DEFENSE) diff --git a/official/c51126152.lua b/official/c51126152.lua index 0444d1ec48..85713d05c2 100644 --- a/official/c51126152.lua +++ b/official/c51126152.lua @@ -29,7 +29,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(0) c:RegisterEffect(e1) diff --git a/official/c51632798.lua b/official/c51632798.lua index 230833174b..1f678cd3b3 100644 --- a/official/c51632798.lua +++ b/official/c51632798.lua @@ -25,7 +25,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(1400) c:RegisterEffect(e1) diff --git a/official/c52707042.lua b/official/c52707042.lua index 889bb9b7c9..9c3a1d8b01 100644 --- a/official/c52707042.lua +++ b/official/c52707042.lua @@ -36,7 +36,7 @@ end s.listed_series={SET_LIBROMANCER} function s.matcheck(e,c) if c:GetMaterial():IsExists(Card.IsLocation,1,nil,LOCATION_MZONE) then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD) c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end diff --git a/official/c5309481.lua b/official/c5309481.lua index 49fea78138..58f6bde71c 100644 --- a/official/c5309481.lua +++ b/official/c5309481.lua @@ -27,11 +27,11 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_LEAVE-RESET_TOGRAVE) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_LEAVE|RESET_TOGRAVE)) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(e:GetHandler()) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_LEAVE-RESET_TOGRAVE) + e2:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_LEAVE|RESET_TOGRAVE)) tc:RegisterEffect(e2) end \ No newline at end of file diff --git a/official/c54343893.lua b/official/c54343893.lua index 67053411bf..4b663f1c59 100644 --- a/official/c54343893.lua +++ b/official/c54343893.lua @@ -29,6 +29,6 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_SET_BASE_DEFENSE) e2:SetValue(1200) - e2:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e2) end \ No newline at end of file diff --git a/official/c57270476.lua b/official/c57270476.lua index c599fb94ea..13ae98243a 100644 --- a/official/c57270476.lua +++ b/official/c57270476.lua @@ -26,7 +26,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_DRAW) e1:SetOperation(s.tgop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOHAND) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOHAND)) tc:RegisterEffect(e1) end end diff --git a/official/c57282724.lua b/official/c57282724.lua index 537970f8d7..6ab87e5ada 100644 --- a/official/c57282724.lua +++ b/official/c57282724.lua @@ -61,7 +61,7 @@ function s.matcheck(e,c) local g=c:GetMaterial() local tp=c:GetControler() if g:GetClassCount(Card.GetRace,c,SUMMON_TYPE_LINK,tp)==3 and g:GetClassCount(Card.GetAttribute,c,SUMMON_TYPE_LINK,tp)==3 then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD-RESET_LEAVE-RESET_TEMP_REMOVE,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_LEAVE|RESET_TEMP_REMOVE),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end function s.descon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c57996334.lua b/official/c57996334.lua index 07e958cb42..88095977b7 100644 --- a/official/c57996334.lua +++ b/official/c57996334.lua @@ -35,7 +35,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(4) c:RegisterEffect(e1) diff --git a/official/c61283655.lua b/official/c61283655.lua index 35a1233e2b..516540cc12 100644 --- a/official/c61283655.lua +++ b/official/c61283655.lua @@ -45,7 +45,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) end function s.regop(e,tp,eg,ep,ev,re,r,rp) if rp==tp or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) end function s.damcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c62541668.lua b/official/c62541668.lua index 4e74cff50d..3f0e075494 100644 --- a/official/c62541668.lua +++ b/official/c62541668.lua @@ -33,7 +33,7 @@ function s.ovfilter(c,tp,xyzc) end function s.xyzop(e,tp,chk) if chk==0 then return true end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) return true end function s.rmfilter(c) diff --git a/official/c64002884.lua b/official/c64002884.lua index 5cae2e0dc1..5dae045727 100644 --- a/official/c64002884.lua +++ b/official/c64002884.lua @@ -57,5 +57,5 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND,0,1,1,nil) Duel.ConfirmCards(1-tp,g) Duel.ShuffleHand(tp) - local hg=Duel.GetMatchingGroup(s.afilter,tp,LOCATION_HAND,0,nil,g:GetFirst():GetCode()):ForEach(function(tc) tc:UpdateLevel(-1,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END,e:GetHandler()) end) + local hg=Duel.GetMatchingGroup(s.afilter,tp,LOCATION_HAND,0,nil,g:GetFirst():GetCode()):ForEach(function(tc) tc:UpdateLevel(-1,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,e:GetHandler()) end) end \ No newline at end of file diff --git a/official/c6442944.lua b/official/c6442944.lua index f46bb5181d..6522272427 100644 --- a/official/c6442944.lua +++ b/official/c6442944.lua @@ -72,7 +72,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) e1:SetValue(4) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) @@ -80,6 +80,6 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e2:SetRange(LOCATION_MZONE) e2:SetValue(0) - e2:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e2) end \ No newline at end of file diff --git a/official/c64496451.lua b/official/c64496451.lua index 1bfceb6faf..d11ad1dade 100644 --- a/official/c64496451.lua +++ b/official/c64496451.lua @@ -87,7 +87,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCondition(s.lvcon) e1:SetValue(4) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) @@ -96,7 +96,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e2:SetRange(LOCATION_MZONE) e2:SetCondition(s.lvcon) e2:SetValue(1800) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e2) end function s.lvop2(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c64681432.lua b/official/c64681432.lua index 62b3d4a71e..66ef32463d 100644 --- a/official/c64681432.lua +++ b/official/c64681432.lua @@ -67,7 +67,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) end end function s.tgreg1(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET-RESET_TEMP_REMOVE-RESET_LEAVE|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TURN_SET|RESET_TEMP_REMOVE|RESET_LEAVE)|RESET_PHASE|PHASE_END,0,1) end function s.tgreg2(e,tp,eg,ep,ev,re,r,rp) e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) diff --git a/official/c65549080.lua b/official/c65549080.lua index 8a608afcc4..cde85fcecb 100644 --- a/official/c65549080.lua +++ b/official/c65549080.lua @@ -45,7 +45,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(1700) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end \ No newline at end of file diff --git a/official/c66165755.lua b/official/c66165755.lua index 743dc4f799..3fe2ca4264 100644 --- a/official/c66165755.lua +++ b/official/c66165755.lua @@ -44,7 +44,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(tc:GetTextAttack()*2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) --Cannot attack directly local e2=Effect.CreateEffect(e:GetHandler()) diff --git a/official/c67136033.lua b/official/c67136033.lua index a340b3d9ee..7121036a15 100644 --- a/official/c67136033.lua +++ b/official/c67136033.lua @@ -38,7 +38,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(1300) c:RegisterEffect(e1) diff --git a/official/c67196946.lua b/official/c67196946.lua index 3882ba4e15..a60e54a667 100644 --- a/official/c67196946.lua +++ b/official/c67196946.lua @@ -62,7 +62,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) e1:SetValue(-ct) tc:RegisterEffect(e1) end diff --git a/official/c675319.lua b/official/c675319.lua index 126772952e..52d9f8dbf0 100644 --- a/official/c675319.lua +++ b/official/c675319.lua @@ -68,7 +68,7 @@ function s.reptg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESREPLACE) local tg=Duel.SelectMatchingCard(tp,s.desfilter,tp,LOCATION_MZONE|LOCATION_HAND,0,1,1,nil,e,tp) Duel.SetTargetCard(tg) - tg:GetFirst():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + tg:GetFirst():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) tg:GetFirst():SetStatus(STATUS_DESTROY_CONFIRMED,true) return true else return false end diff --git a/official/c67556500.lua b/official/c67556500.lua index 8c47643566..09194b1f23 100644 --- a/official/c67556500.lua +++ b/official/c67556500.lua @@ -54,7 +54,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e3:SetCode(EFFECT_MUST_BE_MATERIAL) e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE) e3:SetTargetRange(1,0) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) e3:SetValue(REASON_SYNCHRO) c:RegisterEffect(e3) end diff --git a/official/c67949763.lua b/official/c67949763.lua index f8aa6f00bf..8b3c15f02e 100644 --- a/official/c67949763.lua +++ b/official/c67949763.lua @@ -71,7 +71,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) token:RegisterEffect(e3,true) if cr then token:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD,0,0,rfid) - tc:CreateRelation(token,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET) + tc:CreateRelation(token,RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) end end Duel.SpecialSummonComplete() diff --git a/official/c68881649.lua b/official/c68881649.lua index cc6f0f2f31..e534f70a8a 100644 --- a/official/c68881649.lua +++ b/official/c68881649.lua @@ -57,7 +57,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_PIERCE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end \ No newline at end of file diff --git a/official/c69838761.lua b/official/c69838761.lua index d23fc957cf..5242d93f44 100644 --- a/official/c69838761.lua +++ b/official/c69838761.lua @@ -37,7 +37,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(1800) c:RegisterEffect(e1) diff --git a/official/c7025445.lua b/official/c7025445.lua index 68638e16a7..0e36037088 100644 --- a/official/c7025445.lua +++ b/official/c7025445.lua @@ -53,7 +53,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-g:GetFirst():GetLevel()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c71406430.lua b/official/c71406430.lua index 21de276ba3..0e523f5bca 100644 --- a/official/c71406430.lua +++ b/official/c71406430.lua @@ -41,7 +41,7 @@ end s.listed_series={SET_LIBROMANCER} function s.matcheck(e,c) if c:GetMaterial():IsExists(Card.IsLocation,1,nil,LOCATION_MZONE) then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD + local reset=RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) end end diff --git a/official/c71564150.lua b/official/c71564150.lua index ebf9e7a38f..873b49e7a9 100644 --- a/official/c71564150.lua +++ b/official/c71564150.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) local e2=e1:Clone() diff --git a/official/c71652522.lua b/official/c71652522.lua index b32df6e3b4..8e3786d5d0 100644 --- a/official/c71652522.lua +++ b/official/c71652522.lua @@ -37,7 +37,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetOperation(s.ctop) e2:SetLabelObject(tc) Duel.RegisterEffect(e2,tp) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_BATTLE,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_BATTLE,0,1) end end function s.ctop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c74506079.lua b/official/c74506079.lua index 1148f185e5..43ef542a77 100644 --- a/official/c74506079.lua +++ b/official/c74506079.lua @@ -23,7 +23,7 @@ function s.matcheck(e,c) ae:SetType(EFFECT_TYPE_SINGLE) ae:SetCode(EFFECT_SET_ATTACK) ae:SetValue(ct*500) - ae:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + ae:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(ae) end if ct>=2 then diff --git a/official/c74841885.lua b/official/c74841885.lua index b39aef48da..71707e7552 100644 --- a/official/c74841885.lua +++ b/official/c74841885.lua @@ -41,7 +41,7 @@ function s.valcheck(e,c) e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SINGLE_RANGE) e0:SetRange(LOCATION_MZONE) e0:SetCode(3682106) - e0:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e0:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e0) end if lbl~=0 then @@ -61,7 +61,7 @@ function s.valcheck(e,c) e1:SetTargetRange(LOCATION_SZONE,LOCATION_SZONE) e1:SetTarget(s.distg) e1:SetLabel(lbl) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) --disable effect local e2=Effect.CreateEffect(c) @@ -70,7 +70,7 @@ function s.valcheck(e,c) e2:SetRange(LOCATION_MZONE) e2:SetLabel(lbl) e2:SetOperation(s.disop) - e2:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e2) if lbl&TYPE_TRAP~=0 then local e3=Effect.CreateEffect(c) @@ -80,7 +80,7 @@ function s.valcheck(e,c) e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE) e3:SetTarget(s.distg) e3:SetLabel(TYPE_TRAP) - e3:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e3) end end diff --git a/official/c74889525.lua b/official/c74889525.lua index 3e85583856..0aec360a04 100644 --- a/official/c74889525.lua +++ b/official/c74889525.lua @@ -69,7 +69,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc and tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.GetControl(tc,tp) then local c=e:GetHandler() - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END --Cannot attack this turn local e1=Effect.CreateEffect(c) e1:SetDescription(3206) diff --git a/official/c74937659.lua b/official/c74937659.lua index 971d1c7fb4..d7179f2516 100644 --- a/official/c74937659.lua +++ b/official/c74937659.lua @@ -45,7 +45,7 @@ function s.matcheck(e,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk*100) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.tgfilter(c) diff --git a/official/c76552147.lua b/official/c76552147.lua index f461eae1dc..bb79b84065 100644 --- a/official/c76552147.lua +++ b/official/c76552147.lua @@ -25,7 +25,7 @@ end function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsType,1,nil,TYPE_NORMAL) then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),0,1) end end function s.cfilter(c) diff --git a/official/c77387463.lua b/official/c77387463.lua index e96611b384..d6ae94b6ab 100644 --- a/official/c77387463.lua +++ b/official/c77387463.lua @@ -64,7 +64,7 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(1600) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c77901552.lua b/official/c77901552.lua index 35d92dd5e9..d9dab55b17 100644 --- a/official/c77901552.lua +++ b/official/c77901552.lua @@ -34,7 +34,7 @@ function s.hspop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) c:RegisterEffect(e1) end function s.spfilter(c,e,tp) diff --git a/official/c78135071.lua b/official/c78135071.lua index a1278ff770..852b5a5550 100644 --- a/official/c78135071.lua +++ b/official/c78135071.lua @@ -46,7 +46,7 @@ s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsSetCard,1,nil,SET_EXOSISTER) then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END c:RegisterFlagEffect(id,reset,0,1) end end diff --git a/official/c78509901.lua b/official/c78509901.lua index 97da820f03..9301cbe247 100644 --- a/official/c78509901.lua +++ b/official/c78509901.lua @@ -61,7 +61,7 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(2000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c78651105.lua b/official/c78651105.lua index 0de8ba2e51..f014df55e3 100644 --- a/official/c78651105.lua +++ b/official/c78651105.lua @@ -36,7 +36,7 @@ function s.ntop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetCode(EFFECT_SET_BASE_ATTACK) e1:SetValue(1900) c:RegisterEffect(e1) diff --git a/official/c79206925.lua b/official/c79206925.lua index 76a087817d..c05a35b42d 100644 --- a/official/c79206925.lua +++ b/official/c79206925.lua @@ -46,7 +46,7 @@ function s.matcheck(e,c) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetRange(LOCATION_MZONE) e1:SetValue(lv*100) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_UPDATE_DEFENSE) diff --git a/official/c79229522.lua b/official/c79229522.lua index 3eaab49bf8..55ebbf22e3 100644 --- a/official/c79229522.lua +++ b/official/c79229522.lua @@ -34,7 +34,7 @@ function s.contactop(g,tp,c) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_BASE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetValue(#g*1000) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c79852326.lua b/official/c79852326.lua index 878a51099f..8a5f3b31e8 100644 --- a/official/c79852326.lua +++ b/official/c79852326.lua @@ -34,7 +34,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCondition(s.damcon) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) - e1:SetReset(RESET_EVENT|RESETS_CANNOT_ACT-RESET_TOGRAVE-RESET_REMOVE) + e1:SetReset(RESET_EVENT|RESETS_CANNOT_ACT&~(RESET_TOGRAVE|RESET_REMOVE)) c:RegisterEffect(e1,true) Duel.SpecialSummonComplete() end diff --git a/official/c84171830.lua b/official/c84171830.lua index 378fd61e68..9201b79358 100644 --- a/official/c84171830.lua +++ b/official/c84171830.lua @@ -87,7 +87,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) g:GetFirst():RegisterEffect(e1) end end diff --git a/official/c84397023.lua b/official/c84397023.lua index a7f6666fa5..d4063321ed 100644 --- a/official/c84397023.lua +++ b/official/c84397023.lua @@ -26,7 +26,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(ct) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) g:GetFirst():RegisterEffect(e1) Duel.ShuffleHand(tp) end diff --git a/official/c85668449.lua b/official/c85668449.lua index 4b227296fc..85133bb5e7 100644 --- a/official/c85668449.lua +++ b/official/c85668449.lua @@ -49,7 +49,7 @@ function s.initial_effect(c) end s.counter_list={0x4} function s.esop(e,tp,eg,ep,ev,re,r,rp,c) - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) end function s.ctcon(e,tp,eg,ep,ev,re,r,rp) return eg:GetFirst():GetFlagEffect(id)~=0 diff --git a/official/c85679527.lua b/official/c85679527.lua index f6bc1d81dc..2c70974a77 100644 --- a/official/c85679527.lua +++ b/official/c85679527.lua @@ -57,7 +57,7 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(lv*200) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_DISABLE) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end diff --git a/official/c87116928.lua b/official/c87116928.lua index 9b76e405a3..8cd0ada8af 100644 --- a/official/c87116928.lua +++ b/official/c87116928.lua @@ -34,7 +34,7 @@ function s.contactop(g,tp,c) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_BASE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e1:SetValue(#g*1200) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c88106656.lua b/official/c88106656.lua index 65e1fc587b..bf982cb8ca 100644 --- a/official/c88106656.lua +++ b/official/c88106656.lua @@ -48,7 +48,7 @@ end s.listed_series={SET_LIBROMANCER} function s.matcheck(e,c) if c:GetMaterial():IsExists(Card.IsLocation,1,nil,LOCATION_MZONE) then - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD + local reset=RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end diff --git a/official/c88559132.lua b/official/c88559132.lua index 7b665dabfb..90b0c44649 100644 --- a/official/c88559132.lua +++ b/official/c88559132.lua @@ -36,7 +36,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) e:GetHandler():RegisterEffect(e1) g:DeleteGroup() end \ No newline at end of file diff --git a/official/c88757791.lua b/official/c88757791.lua index 79b1298659..76f86353bd 100644 --- a/official/c88757791.lua +++ b/official/c88757791.lua @@ -69,7 +69,7 @@ function s.scop(e,tp,eg,ep,ev,re,r,rp) end end function s.sumsuc(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TEMP_REMOVE-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TEMP_REMOVE|RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) end function s.indcon(e) local c=e:GetHandler() diff --git a/official/c89113320.lua b/official/c89113320.lua index be123240ce..fd147d9dac 100644 --- a/official/c89113320.lua +++ b/official/c89113320.lua @@ -44,7 +44,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c91135480.lua b/official/c91135480.lua index 3baf7d0c94..fa7880b565 100644 --- a/official/c91135480.lua +++ b/official/c91135480.lua @@ -74,7 +74,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) --Cannot activate its effects diff --git a/official/c91505214.lua b/official/c91505214.lua index 6d680bd49b..36391cca2f 100644 --- a/official/c91505214.lua +++ b/official/c91505214.lua @@ -46,7 +46,7 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp) end function s.regop(e,tp,eg,ep,ev,re,r,rp) if rp~=tp and re:IsMonsterEffect() and (re:GetActivateLocation()==LOCATION_GRAVE or re:GetActivateLocation()==LOCATION_HAND) then - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN,0,1) end end function s.damcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c94942656.lua b/official/c94942656.lua index a551d6e40a..8e503dbaf7 100644 --- a/official/c94942656.lua +++ b/official/c94942656.lua @@ -50,7 +50,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetCode(EVENT_DESTROYED) e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) - e3:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOGRAVE-RESET_LEAVE-RESET_REMOVE) + e3:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOGRAVE|RESET_LEAVE|RESET_REMOVE)) e3:SetCondition(s.spcon) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) @@ -61,7 +61,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e4:SetCode(EVENT_LEAVE_FIELD_P) e4:SetOperation(s.recordop) - e4:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOGRAVE-RESET_LEAVE-RESET_REMOVE) + e4:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOGRAVE|RESET_LEAVE|RESET_REMOVE)) e4:SetLabelObject(e3) c:RegisterEffect(e4) end diff --git a/official/c95403418.lua b/official/c95403418.lua index c2ad73673f..68d28fc529 100644 --- a/official/c95403418.lua +++ b/official/c95403418.lua @@ -80,7 +80,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(ct*1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_SET_DEFENSE) diff --git a/official/c95515518.lua b/official/c95515518.lua index c35d77d2b2..847419e951 100644 --- a/official/c95515518.lua +++ b/official/c95515518.lua @@ -106,7 +106,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) and Duel.Remove(tc,0,REASON_EFFECT|REASON_TEMPORARY)>0 then local ct=Duel.GetCurrentPhase()<=PHASE_STANDBY and 2 or 1 - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TEMP_REMOVE|RESET_PHASE|PHASE_STANDBY,0,ct) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TEMP_REMOVE)|RESET_PHASE|PHASE_STANDBY,0,ct) --Banish it until the Standby Phase of the next turn local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c97385276.lua b/official/c97385276.lua index 178ddb3317..be1c464df3 100644 --- a/official/c97385276.lua +++ b/official/c97385276.lua @@ -32,7 +32,7 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.spcon(e,c) @@ -47,6 +47,6 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(4) - e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE-RESET_TOFIELD) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_DISABLE&~RESET_TOFIELD)) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c98153934.lua b/official/c98153934.lua index 0bd4992427..3ba4c455aa 100644 --- a/official/c98153934.lua +++ b/official/c98153934.lua @@ -42,7 +42,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_SZONE) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetLabelObject(re) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_CHAIN) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_CHAIN) e1:SetCondition(s.damcon) e1:SetOperation(s.damop) c:RegisterEffect(e1) diff --git a/official/c98875863.lua b/official/c98875863.lua index fd8eda70f8..0d874451b7 100644 --- a/official/c98875863.lua +++ b/official/c98875863.lua @@ -48,7 +48,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) c:RegisterEffect(e1) end function s.tktg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160022039.lua b/rush/c160022039.lua index 1d8ce4ea7f..97a5e45685 100644 --- a/rush/c160022039.lua +++ b/rush/c160022039.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) end function s.matcheck(e,c) if #c:GetMaterial()>=2 then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end function s.condition(e,tp,eg,ep,ev,re,r,rp) From f7574eb6dc3cf036a3c7f5379105113183908fe6 Mon Sep 17 00:00:00 2001 From: Naim Date: Fri, 15 Aug 2025 08:40:00 -0300 Subject: [PATCH 3/5] Apply RESETS_STANDARD_PHASE_END to scripts changed in b47d942572f49517a0b6fce8b394ecd57e72fe10 --- official/c11443677.lua | 2 +- official/c12451640.lua | 4 ++-- official/c14577226.lua | 2 +- official/c164710.lua | 4 ++-- official/c17330916.lua | 2 +- official/c20188127.lua | 2 +- official/c20265095.lua | 3 +-- official/c23265313.lua | 4 ++-- official/c27552504.lua | 4 ++-- official/c28617139.lua | 4 ++-- official/c32065885.lua | 6 +++--- official/c37520316.lua | 2 +- official/c38495396.lua | 6 +++--- official/c38606913.lua | 2 +- official/c40916023.lua | 2 +- official/c41524885.lua | 3 +-- official/c42741437.lua | 3 +-- official/c52707042.lua | 3 +-- official/c62541668.lua | 2 +- official/c64002884.lua | 2 +- official/c64681432.lua | 4 ++-- official/c66165755.lua | 2 +- official/c67196946.lua | 2 +- official/c67556500.lua | 2 +- official/c71406430.lua | 3 +-- official/c71564150.lua | 2 +- official/c74889525.lua | 2 +- official/c77901552.lua | 2 +- official/c78135071.lua | 3 +-- official/c84171830.lua | 2 +- official/c84397023.lua | 2 +- official/c85668449.lua | 2 +- official/c88106656.lua | 3 +-- official/c88757791.lua | 2 +- official/c89113320.lua | 2 +- official/c91135480.lua | 2 +- official/c98875863.lua | 2 +- 37 files changed, 47 insertions(+), 54 deletions(-) diff --git a/official/c11443677.lua b/official/c11443677.lua index aa977cce6b..ee24c6fd2a 100644 --- a/official/c11443677.lua +++ b/official/c11443677.lua @@ -78,7 +78,7 @@ function s.fgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.IsExistingTarget(s.stfilter,tp,LOCATION_GRAVE,0,1,nil) and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TOGRAVE|RESET_REMOVE|RESET_LEAVE)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_TOGRAVE|RESET_REMOVE|RESET_LEAVE),0,1) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) local g=Duel.SelectTarget(tp,s.stfilter,tp,LOCATION_GRAVE,0,1,1,nil) Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g,1,0,0) diff --git a/official/c12451640.lua b/official/c12451640.lua index 885626a77a..0523aa7ae9 100644 --- a/official/c12451640.lua +++ b/official/c12451640.lua @@ -35,9 +35,9 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e2:SetOperation(s.thop2) e2:SetLabel(Duel.GetTurnCount()) if Duel.IsTurnPlayer(tp) then - e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END|RESET_SELF_TURN,2) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)|RESET_SELF_TURN,2) else - e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END|RESET_SELF_TURN) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)|RESET_SELF_TURN) end c:RegisterEffect(e2) end diff --git a/official/c14577226.lua b/official/c14577226.lua index 617951c03e..c35ad2c507 100644 --- a/official/c14577226.lua +++ b/official/c14577226.lua @@ -82,7 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH+EFFECT_FLAG_CLIENT_HINT) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c164710.lua b/official/c164710.lua index 27053f8d0a..bdd0d275f8 100644 --- a/official/c164710.lua +++ b/official/c164710.lua @@ -28,7 +28,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end local e2=Effect.CreateEffect(c) @@ -46,7 +46,7 @@ function s.hlvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c17330916.lua b/official/c17330916.lua index dff83de6ff..64d01a38bf 100644 --- a/official/c17330916.lua +++ b/official/c17330916.lua @@ -92,7 +92,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c20188127.lua b/official/c20188127.lua index f7e762e65c..75cd7a7ea4 100644 --- a/official/c20188127.lua +++ b/official/c20188127.lua @@ -30,7 +30,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c20265095.lua b/official/c20265095.lua index 72bcbcb5d9..28caf84a9a 100644 --- a/official/c20265095.lua +++ b/official/c20265095.lua @@ -70,14 +70,13 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) if c:IsRelateToEffect(e) and tc then local zone=c:GetLinkedZone()&ZONES_MMZ if Duel.GetControl(tc,tp,PHASE_END,1,zone)~=0 then - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END --Cannot attack local e1=Effect.CreateEffect(c) e1:SetDescription(3206) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(reset) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)) tc:RegisterEffect(e1) end end diff --git a/official/c23265313.lua b/official/c23265313.lua index 39390bcdaa..0a64817af8 100644 --- a/official/c23265313.lua +++ b/official/c23265313.lua @@ -23,7 +23,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end local e2=Effect.CreateEffect(c) @@ -44,7 +44,7 @@ function s.hlvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c27552504.lua b/official/c27552504.lua index 9b4cef1ff6..968956f848 100644 --- a/official/c27552504.lua +++ b/official/c27552504.lua @@ -41,7 +41,7 @@ function s.xyzop(e,tp,chk,mc) local tc=Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_HAND,0,nil):SelectUnselect(Group.CreateGroup(),tp,false,Xyz.ProcCancellable) if tc then Duel.SendtoGrave(tc,REASON_COST) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),0,1) return true else return false end end @@ -74,4 +74,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) if #g>0 then Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP) end -end +end \ No newline at end of file diff --git a/official/c28617139.lua b/official/c28617139.lua index 7498274e0e..2327b7bb96 100644 --- a/official/c28617139.lua +++ b/official/c28617139.lua @@ -71,7 +71,7 @@ function s.rvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end local e2=Effect.CreateEffect(c) @@ -93,7 +93,7 @@ function s.hlvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c32065885.lua b/official/c32065885.lua index e0f934123a..3c09c1c81b 100644 --- a/official/c32065885.lua +++ b/official/c32065885.lua @@ -40,17 +40,17 @@ function s.ctlop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),2) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) - e2:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,2) + e2:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),2) tc:RegisterEffect(e2) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_CANNOT_ATTACK) - e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,2) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),2) tc:RegisterEffect(e3) end end \ No newline at end of file diff --git a/official/c37520316.lua b/official/c37520316.lua index 5d10b9d32e..9f46436e60 100644 --- a/official/c37520316.lua +++ b/official/c37520316.lua @@ -24,7 +24,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) and Duel.GetControl(tc,tp,PHASE_END,1)~=0 then local e1=Effect.CreateEffect(c) - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) e1:SetReset(reset) diff --git a/official/c38495396.lua b/official/c38495396.lua index f17233d7ee..7e2f17f9ef 100644 --- a/official/c38495396.lua +++ b/official/c38495396.lua @@ -24,7 +24,7 @@ function s.ovfilter(c,tp,xyzc) end function s.xyzop(e,tp,chk) if chk==0 then return true end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),0,1) return true end function s.thfilter(c) @@ -40,7 +40,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.thop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then + if tc:IsRelateToEffect(e) then Duel.SendtoHand(tc,nil,REASON_EFFECT) end -end +end \ No newline at end of file diff --git a/official/c38606913.lua b/official/c38606913.lua index efccfaed5f..cbc6515ed5 100644 --- a/official/c38606913.lua +++ b/official/c38606913.lua @@ -93,7 +93,7 @@ function s.damact(e,tp,eg,ep,ev,re,r,rp) e2:SetLabelObject(tc) e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_LEAVE|RESET_TOGRAVE)|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_LEAVE|RESET_TOGRAVE),0,1) tc:CreateEffectRelation(e1) end end diff --git a/official/c40916023.lua b/official/c40916023.lua index 28a6e75e8b..8c1bd8c257 100644 --- a/official/c40916023.lua +++ b/official/c40916023.lua @@ -72,7 +72,7 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_CHANGE_POSITION) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,1) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),1) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c41524885.lua b/official/c41524885.lua index 556e4f2c57..57c88d0127 100644 --- a/official/c41524885.lua +++ b/official/c41524885.lua @@ -47,8 +47,7 @@ s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsSetCard,1,nil,SET_EXOSISTER) then - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END - c:RegisterFlagEffect(id,reset,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),0,1) end end function s.indval(e,re,rp) diff --git a/official/c42741437.lua b/official/c42741437.lua index ab0b57dc77..7aea162d8e 100644 --- a/official/c42741437.lua +++ b/official/c42741437.lua @@ -50,8 +50,7 @@ s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsSetCard,1,nil,SET_EXOSISTER) then - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END - c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) end end function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c52707042.lua b/official/c52707042.lua index 9c3a1d8b01..39dbd1fdc6 100644 --- a/official/c52707042.lua +++ b/official/c52707042.lua @@ -36,8 +36,7 @@ end s.listed_series={SET_LIBROMANCER} function s.matcheck(e,c) if c:GetMaterial():IsExists(Card.IsLocation,1,nil,LOCATION_MZONE) then - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD) - c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end function s.immcon(e) diff --git a/official/c62541668.lua b/official/c62541668.lua index 3f0e075494..f9c55f3c77 100644 --- a/official/c62541668.lua +++ b/official/c62541668.lua @@ -33,7 +33,7 @@ function s.ovfilter(c,tp,xyzc) end function s.xyzop(e,tp,chk) if chk==0 then return true end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),0,1) return true end function s.rmfilter(c) diff --git a/official/c64002884.lua b/official/c64002884.lua index 5dae045727..b60f91f5da 100644 --- a/official/c64002884.lua +++ b/official/c64002884.lua @@ -57,5 +57,5 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND,0,1,1,nil) Duel.ConfirmCards(1-tp,g) Duel.ShuffleHand(tp) - local hg=Duel.GetMatchingGroup(s.afilter,tp,LOCATION_HAND,0,nil,g:GetFirst():GetCode()):ForEach(function(tc) tc:UpdateLevel(-1,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,e:GetHandler()) end) + local hg=Duel.GetMatchingGroup(s.afilter,tp,LOCATION_HAND,0,nil,g:GetFirst():GetCode()):ForEach(function(tc) tc:UpdateLevel(-1,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),e:GetHandler()) end) end \ No newline at end of file diff --git a/official/c64681432.lua b/official/c64681432.lua index 66ef32463d..c4d7ad33cb 100644 --- a/official/c64681432.lua +++ b/official/c64681432.lua @@ -67,10 +67,10 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) end end function s.tgreg1(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TURN_SET|RESET_TEMP_REMOVE|RESET_LEAVE)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_TURN_SET|RESET_TEMP_REMOVE|RESET_LEAVE),0,1) end function s.tgreg2(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) end function s.tgcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 diff --git a/official/c66165755.lua b/official/c66165755.lua index 3fe2ca4264..209079c1ba 100644 --- a/official/c66165755.lua +++ b/official/c66165755.lua @@ -44,7 +44,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK) e1:SetValue(tc:GetTextAttack()*2) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) --Cannot attack directly local e2=Effect.CreateEffect(e:GetHandler()) diff --git a/official/c67196946.lua b/official/c67196946.lua index a60e54a667..30ea10c416 100644 --- a/official/c67196946.lua +++ b/official/c67196946.lua @@ -62,7 +62,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) e1:SetValue(-ct) tc:RegisterEffect(e1) end diff --git a/official/c67556500.lua b/official/c67556500.lua index 09194b1f23..36c2293b52 100644 --- a/official/c67556500.lua +++ b/official/c67556500.lua @@ -54,7 +54,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e3:SetCode(EFFECT_MUST_BE_MATERIAL) e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE) e3:SetTargetRange(1,0) - e3:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) + e3:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)) e3:SetValue(REASON_SYNCHRO) c:RegisterEffect(e3) end diff --git a/official/c71406430.lua b/official/c71406430.lua index 0e523f5bca..0d9281ca2c 100644 --- a/official/c71406430.lua +++ b/official/c71406430.lua @@ -41,8 +41,7 @@ end s.listed_series={SET_LIBROMANCER} function s.matcheck(e,c) if c:GetMaterial():IsExists(Card.IsLocation,1,nil,LOCATION_MZONE) then - local reset=RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD - c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) end end function s.matcon(e) diff --git a/official/c71564150.lua b/official/c71564150.lua index 873b49e7a9..83d6723715 100644 --- a/official/c71564150.lua +++ b/official/c71564150.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)) e1:SetValue(1) tc:RegisterEffect(e1) local e2=e1:Clone() diff --git a/official/c74889525.lua b/official/c74889525.lua index 0aec360a04..fb2ad61aeb 100644 --- a/official/c74889525.lua +++ b/official/c74889525.lua @@ -69,7 +69,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc and tc:IsRelateToEffect(e) and tc:IsFaceup() and Duel.GetControl(tc,tp) then local c=e:GetHandler() - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END + local reset=RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET) --Cannot attack this turn local e1=Effect.CreateEffect(c) e1:SetDescription(3206) diff --git a/official/c77901552.lua b/official/c77901552.lua index d9dab55b17..860d213740 100644 --- a/official/c77901552.lua +++ b/official/c77901552.lua @@ -34,7 +34,7 @@ function s.hspop(e,tp,eg,ep,ev,re,r,rp,c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.spfilter(c,e,tp) diff --git a/official/c78135071.lua b/official/c78135071.lua index 852b5a5550..3cdcd30e3b 100644 --- a/official/c78135071.lua +++ b/official/c78135071.lua @@ -46,8 +46,7 @@ s.listed_series={SET_EXOSISTER} function s.valcheck(e,c) local g=c:GetMaterial() if g:IsExists(Card.IsSetCard,1,nil,SET_EXOSISTER) then - local reset=RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END - c:RegisterFlagEffect(id,reset,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),0,1) end end function s.limcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c84171830.lua b/official/c84171830.lua index 9201b79358..77a053d88c 100644 --- a/official/c84171830.lua +++ b/official/c84171830.lua @@ -87,7 +87,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) g:GetFirst():RegisterEffect(e1) end end diff --git a/official/c84397023.lua b/official/c84397023.lua index d4063321ed..cf575e6c4f 100644 --- a/official/c84397023.lua +++ b/official/c84397023.lua @@ -26,7 +26,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(ct) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) g:GetFirst():RegisterEffect(e1) Duel.ShuffleHand(tp) end diff --git a/official/c85668449.lua b/official/c85668449.lua index 85133bb5e7..ab825ded44 100644 --- a/official/c85668449.lua +++ b/official/c85668449.lua @@ -49,7 +49,7 @@ function s.initial_effect(c) end s.counter_list={0x4} function s.esop(e,tp,eg,ep,ev,re,r,rp,c) - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD),0,1) end function s.ctcon(e,tp,eg,ep,ev,re,r,rp) return eg:GetFirst():GetFlagEffect(id)~=0 diff --git a/official/c88106656.lua b/official/c88106656.lua index bf982cb8ca..c7724534a7 100644 --- a/official/c88106656.lua +++ b/official/c88106656.lua @@ -48,8 +48,7 @@ end s.listed_series={SET_LIBROMANCER} function s.matcheck(e,c) if c:GetMaterial():IsExists(Card.IsLocation,1,nil,LOCATION_MZONE) then - local reset=RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD - c:RegisterFlagEffect(id,reset,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end function s.matcon(e) diff --git a/official/c88757791.lua b/official/c88757791.lua index 76f86353bd..6c65246aaa 100644 --- a/official/c88757791.lua +++ b/official/c88757791.lua @@ -69,7 +69,7 @@ function s.scop(e,tp,eg,ep,ev,re,r,rp) end end function s.sumsuc(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TEMP_REMOVE|RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_TEMP_REMOVE|RESET_TURN_SET),0,1) end function s.indcon(e) local c=e:GetHandler() diff --git a/official/c89113320.lua b/official/c89113320.lua index fd147d9dac..e47191b0f6 100644 --- a/official/c89113320.lua +++ b/official/c89113320.lua @@ -44,7 +44,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) tc:RegisterEffect(e1) end end diff --git a/official/c91135480.lua b/official/c91135480.lua index fa7880b565..8c15da7ad1 100644 --- a/official/c91135480.lua +++ b/official/c91135480.lua @@ -74,7 +74,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)) e1:SetValue(1) tc:RegisterEffect(e1) --Cannot activate its effects diff --git a/official/c98875863.lua b/official/c98875863.lua index 0d874451b7..c346d4e751 100644 --- a/official/c98875863.lua +++ b/official/c98875863.lua @@ -48,7 +48,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(-2) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TOFIELD)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TOFIELD)) c:RegisterEffect(e1) end function s.tktg(e,tp,eg,ep,ev,re,r,rp,chk) From f86fe37a6cb3de0988fd04e8e83d7d396b6385ad Mon Sep 17 00:00:00 2001 From: Naim Date: Fri, 15 Aug 2025 08:56:42 -0300 Subject: [PATCH 4/5] Apply RESETS_STANDARD_PHASE_END to scripts changed in aca70b0dca84d38f3729d359811dbeae46df6a5e --- official/c10000080.lua | 4 ++-- official/c1151281.lua | 2 +- official/c12451640.lua | 2 +- official/c14261867.lua | 2 +- official/c15383415.lua | 2 +- official/c16279989.lua | 2 +- official/c16509093.lua | 2 +- official/c2326738.lua | 2 +- official/c24101897.lua | 2 +- official/c2694423.lua | 2 +- official/c27491571.lua | 2 +- official/c3510565.lua | 2 +- official/c39711336.lua | 2 +- official/c40659562.lua | 2 +- official/c41039846.lua | 2 +- official/c41753322.lua | 2 +- official/c41872150.lua | 9 +++------ official/c42994702.lua | 2 +- official/c45159319.lua | 2 +- official/c45812361.lua | 2 +- official/c46925518.lua | 2 +- official/c47556396.lua | 2 +- official/c50485594.lua | 2 +- official/c51196805.lua | 2 +- official/c52323207.lua | 2 +- official/c53620899.lua | 2 +- official/c54490275.lua | 2 +- official/c54512827.lua | 2 +- official/c61318483.lua | 2 +- official/c63227401.lua | 4 ++-- official/c64804316.lua | 2 +- official/c68597372.lua | 2 +- official/c71415349.lua | 2 +- official/c72370114.lua | 2 +- official/c72913666.lua | 2 +- official/c75109441.lua | 2 +- official/c75209824.lua | 2 +- official/c75487237.lua | 2 +- official/c78202553.lua | 2 +- official/c78266168.lua | 2 +- official/c80885284.lua | 2 +- official/c81278754.lua | 2 +- official/c81907872.lua | 2 +- official/c84472026.lua | 2 +- official/c85463083.lua | 2 +- official/c89707961.lua | 2 +- official/c923596.lua | 2 +- official/c92693205.lua | 2 +- official/c92736188.lua | 2 +- official/c92970404.lua | 2 +- official/c9365703.lua | 2 +- official/c95218695.lua | 2 +- official/c98707192.lua | 2 +- 53 files changed, 57 insertions(+), 60 deletions(-) diff --git a/official/c10000080.lua b/official/c10000080.lua index 6fb9f38e3d..d8632da912 100644 --- a/official/c10000080.lua +++ b/official/c10000080.lua @@ -101,7 +101,7 @@ function s.ttop2(e,tp,eg,ep,ev,re,r,rp,c,minc,zone,relzone,exeff) end function s.retreg(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,2) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,2) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_PHASE+PHASE_END) @@ -123,7 +123,7 @@ function s.retop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(c:GetOwner()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) c:RegisterEffect(e1) end function s.filter(c,e,tp) diff --git a/official/c1151281.lua b/official/c1151281.lua index f4cf0fcbde..7af97bd4c2 100644 --- a/official/c1151281.lua +++ b/official/c1151281.lua @@ -65,7 +65,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c12451640.lua b/official/c12451640.lua index 0523aa7ae9..cc19d7e7bf 100644 --- a/official/c12451640.lua +++ b/official/c12451640.lua @@ -21,7 +21,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1) e1:SetTarget(s.thtg1) e1:SetOperation(s.thop1) - e1:SetReset(RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)) c:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) diff --git a/official/c14261867.lua b/official/c14261867.lua index a3e69ac309..8ec443f73b 100644 --- a/official/c14261867.lua +++ b/official/c14261867.lua @@ -24,7 +24,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c15383415.lua b/official/c15383415.lua index 8f32f55f82..2c558a30c9 100644 --- a/official/c15383415.lua +++ b/official/c15383415.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c16279989.lua b/official/c16279989.lua index 393513f4ac..0de397b3db 100644 --- a/official/c16279989.lua +++ b/official/c16279989.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c16509093.lua b/official/c16509093.lua index 32ec3fcc0e..a0725f8dd1 100644 --- a/official/c16509093.lua +++ b/official/c16509093.lua @@ -22,7 +22,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c2326738.lua b/official/c2326738.lua index f7dfddfb94..0d669b4b55 100644 --- a/official/c2326738.lua +++ b/official/c2326738.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c24101897.lua b/official/c24101897.lua index 8842427d9e..00f01a922a 100644 --- a/official/c24101897.lua +++ b/official/c24101897.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c2694423.lua b/official/c2694423.lua index 028b25c160..cbdbb2ca1f 100644 --- a/official/c2694423.lua +++ b/official/c2694423.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c27491571.lua b/official/c27491571.lua index 39db577929..f33a4e9243 100644 --- a/official/c27491571.lua +++ b/official/c27491571.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c3510565.lua b/official/c3510565.lua index cce478a621..3dd4b4924b 100644 --- a/official/c3510565.lua +++ b/official/c3510565.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c39711336.lua b/official/c39711336.lua index 04e5d8a541..a2a6e31997 100644 --- a/official/c39711336.lua +++ b/official/c39711336.lua @@ -38,7 +38,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c40659562.lua b/official/c40659562.lua index 46cd4bf76f..d8f320bd03 100644 --- a/official/c40659562.lua +++ b/official/c40659562.lua @@ -24,7 +24,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41039846.lua b/official/c41039846.lua index 73e49c6250..8fb5c975ce 100644 --- a/official/c41039846.lua +++ b/official/c41039846.lua @@ -31,7 +31,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41753322.lua b/official/c41753322.lua index e1ad389a4a..e462959973 100644 --- a/official/c41753322.lua +++ b/official/c41753322.lua @@ -69,7 +69,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c41872150.lua b/official/c41872150.lua index 0bf0aa5eaa..1f209c8d94 100644 --- a/official/c41872150.lua +++ b/official/c41872150.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) @@ -34,14 +34,11 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.ChangePosition(c,POS_FACEDOWN_DEFENSE) end end -function s.filter(c) - return c:IsSpellTrap() -end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) - if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and s.filter(chkc) end + if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and chkc:IsSpellTrap() end if chk==0 then return true end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) - local g=Duel.SelectTarget(tp,s.filter,tp,0,LOCATION_ONFIELD,1,1,nil) + local g=Duel.SelectTarget(tp,Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,1,1,nil) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,#g,0,0) end function s.desop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c42994702.lua b/official/c42994702.lua index 5808b61d50..6aa9d02bf9 100644 --- a/official/c42994702.lua +++ b/official/c42994702.lua @@ -15,7 +15,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.filter(c) diff --git a/official/c45159319.lua b/official/c45159319.lua index b2872b71d0..f1b4b31a08 100644 --- a/official/c45159319.lua +++ b/official/c45159319.lua @@ -15,7 +15,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c45812361.lua b/official/c45812361.lua index 253937df86..3a9c29aa30 100644 --- a/official/c45812361.lua +++ b/official/c45812361.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) c:RegisterEffect(e3) end function s.sumsuc(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 and Duel.IsPhase(PHASE_MAIN1) diff --git a/official/c46925518.lua b/official/c46925518.lua index efebd690c0..b6a96c8d97 100644 --- a/official/c46925518.lua +++ b/official/c46925518.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c47556396.lua b/official/c47556396.lua index 90726b99a3..9c44597092 100644 --- a/official/c47556396.lua +++ b/official/c47556396.lua @@ -78,7 +78,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c50485594.lua b/official/c50485594.lua index 6d31b5c0b3..535474c031 100644 --- a/official/c50485594.lua +++ b/official/c50485594.lua @@ -58,7 +58,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) Duel.ConfirmCards(1-tp,hg1) end function s.regop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) return e:GetHandler():GetFlagEffect(id)~=0 diff --git a/official/c51196805.lua b/official/c51196805.lua index 8c93dad797..280e13d769 100644 --- a/official/c51196805.lua +++ b/official/c51196805.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c52323207.lua b/official/c52323207.lua index c957ded290..f850b93939 100644 --- a/official/c52323207.lua +++ b/official/c52323207.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c53620899.lua b/official/c53620899.lua index 55861c24bf..138a46debb 100644 --- a/official/c53620899.lua +++ b/official/c53620899.lua @@ -36,7 +36,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c54490275.lua b/official/c54490275.lua index 37865a47fe..f66a91beed 100644 --- a/official/c54490275.lua +++ b/official/c54490275.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c54512827.lua b/official/c54512827.lua index 15b32640be..5f74143876 100644 --- a/official/c54512827.lua +++ b/official/c54512827.lua @@ -49,7 +49,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c61318483.lua b/official/c61318483.lua index 7ab33db183..18e1cf0c89 100644 --- a/official/c61318483.lua +++ b/official/c61318483.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c63227401.lua b/official/c63227401.lua index b736c8784e..428771bb9c 100644 --- a/official/c63227401.lua +++ b/official/c63227401.lua @@ -36,8 +36,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) then - tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) - tc:RegisterFlagEffect(0,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) + tc:RegisterFlagEffect(0,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_CHAIN_SOLVING) diff --git a/official/c64804316.lua b/official/c64804316.lua index 803550f420..0644527895 100644 --- a/official/c64804316.lua +++ b/official/c64804316.lua @@ -41,7 +41,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c68597372.lua b/official/c68597372.lua index 3cec48b4e3..0869266257 100644 --- a/official/c68597372.lua +++ b/official/c68597372.lua @@ -43,7 +43,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsFaceup() and tc:IsRelateToEffect(e) and tc:IsFaceup() then Duel.ChangePosition(tc,POS_FACEDOWN_DEFENSE) - tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_PHASE+PHASE_END) diff --git a/official/c71415349.lua b/official/c71415349.lua index add11fe519..8fa7b66bb7 100644 --- a/official/c71415349.lua +++ b/official/c71415349.lua @@ -23,7 +23,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c72370114.lua b/official/c72370114.lua index 55d9f5a07a..93bcefa0ca 100644 --- a/official/c72370114.lua +++ b/official/c72370114.lua @@ -26,7 +26,7 @@ s.listed_series={SET_GEARGIA} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c72913666.lua b/official/c72913666.lua index b3d698fd52..ee9654575b 100644 --- a/official/c72913666.lua +++ b/official/c72913666.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75109441.lua b/official/c75109441.lua index 007fe903a8..c82eeef4dd 100644 --- a/official/c75109441.lua +++ b/official/c75109441.lua @@ -22,7 +22,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75209824.lua b/official/c75209824.lua index 028014fe8d..03fac505c5 100644 --- a/official/c75209824.lua +++ b/official/c75209824.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c75487237.lua b/official/c75487237.lua index 4a7478c995..8509ec3b64 100644 --- a/official/c75487237.lua +++ b/official/c75487237.lua @@ -23,7 +23,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c78202553.lua b/official/c78202553.lua index 3cc27a69b4..0b23f9627b 100644 --- a/official/c78202553.lua +++ b/official/c78202553.lua @@ -69,7 +69,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c78266168.lua b/official/c78266168.lua index 861fe29752..30eac2fabb 100644 --- a/official/c78266168.lua +++ b/official/c78266168.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)|,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c80885284.lua b/official/c80885284.lua index c7ce6c9698..bdf0889a7e 100644 --- a/official/c80885284.lua +++ b/official/c80885284.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c81278754.lua b/official/c81278754.lua index 05042686a6..6c2c8e7848 100644 --- a/official/c81278754.lua +++ b/official/c81278754.lua @@ -26,7 +26,7 @@ s.listed_series={SET_FROG} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c81907872.lua b/official/c81907872.lua index 668c84b05c..a39923d9c6 100644 --- a/official/c81907872.lua +++ b/official/c81907872.lua @@ -37,7 +37,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c84472026.lua b/official/c84472026.lua index af6db3a21e..e5f417e929 100644 --- a/official/c84472026.lua +++ b/official/c84472026.lua @@ -38,7 +38,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c85463083.lua b/official/c85463083.lua index 94a6a4c0bd..a6148e1cef 100644 --- a/official/c85463083.lua +++ b/official/c85463083.lua @@ -40,7 +40,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c89707961.lua b/official/c89707961.lua index fe29d7fb50..9eb43461f1 100644 --- a/official/c89707961.lua +++ b/official/c89707961.lua @@ -37,7 +37,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c923596.lua b/official/c923596.lua index aefbc53af0..e36a23ae3a 100644 --- a/official/c923596.lua +++ b/official/c923596.lua @@ -27,7 +27,7 @@ s.listed_names={id} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c92693205.lua b/official/c92693205.lua index 88b74ab57e..3ce7a15efa 100644 --- a/official/c92693205.lua +++ b/official/c92693205.lua @@ -25,7 +25,7 @@ s.listed_series={SET_GEARGIA} function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c92736188.lua b/official/c92736188.lua index bda73ad628..d5ec9cf294 100644 --- a/official/c92736188.lua +++ b/official/c92736188.lua @@ -24,7 +24,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c92970404.lua b/official/c92970404.lua index 06f1c56169..6e0856c047 100644 --- a/official/c92970404.lua +++ b/official/c92970404.lua @@ -65,7 +65,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c9365703.lua b/official/c9365703.lua index 9bfc188229..7a76171d2d 100644 --- a/official/c9365703.lua +++ b/official/c9365703.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end function s.sumop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) end function s.dacon(e,tp,eg,ep,ev,re,r,rp) return Duel.IsPhase(PHASE_BATTLE_STEP) and Duel.GetCurrentChain()==0 diff --git a/official/c95218695.lua b/official/c95218695.lua index 26e2459dab..050b29b4b3 100644 --- a/official/c95218695.lua +++ b/official/c95218695.lua @@ -62,7 +62,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c98707192.lua b/official/c98707192.lua index 3303793515..eac2cfc233 100644 --- a/official/c98707192.lua +++ b/official/c98707192.lua @@ -39,7 +39,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) From a84e1a88ee002ad2cf6d10223767ebdf9e192043 Mon Sep 17 00:00:00 2001 From: Naim Date: Fri, 15 Aug 2025 09:06:33 -0300 Subject: [PATCH 5/5] fix --- official/c39980304.lua | 2 +- official/c39984786.lua | 2 +- official/c46565218.lua | 2 +- official/c59255742.lua | 2 +- official/c78266168.lua | 2 +- official/c93983867.lua | 2 +- official/c9720537.lua | 2 +- unofficial/c511001553.lua | 2 +- unofficial/c511002109.lua | 2 +- unofficial/c511005068.lua | 2 +- unofficial/c511009136.lua | 2 +- unofficial/c511600002.lua | 4 ++-- unofficial/c511600140.lua | 2 +- unofficial/c700000015.lua | 2 +- unofficial/c810000071.lua | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/official/c39980304.lua b/official/c39980304.lua index b784f870ff..9cfb442c0d 100644 --- a/official/c39980304.lua +++ b/official/c39980304.lua @@ -56,7 +56,7 @@ function s.chain_operation(e,te,tp,tc,mat,sumtype,sg,sumpos) Duel.BreakEffect() if sg then sg:AddCard(tc) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TURN_SET),0,1) + tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TURN_SET),0,1) else Duel.SpecialSummonStep(tc,sumtype,tp,tp,false,false,sumpos) tc:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),0,1) diff --git a/official/c39984786.lua b/official/c39984786.lua index d9fcc93685..cc818469b1 100644 --- a/official/c39984786.lua +++ b/official/c39984786.lua @@ -31,7 +31,7 @@ function s.valcheck(e,c) e1:SetCountLimit(1) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TURN_SET)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_TOFIELD|RESET_TURN_SET)) c:RegisterEffect(e1) end end diff --git a/official/c46565218.lua b/official/c46565218.lua index 8b710a90a3..8753b4a13a 100644 --- a/official/c46565218.lua +++ b/official/c46565218.lua @@ -27,7 +27,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1) e1:SetTarget(s.drtg) e1:SetOperation(s.drop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_LEAVE|RESET_TEMP_REMOVE|RESET_TURN_SET)|RESET_PHASE|PHASE_END) + e1:SetReset(RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_LEAVE|RESET_TEMP_REMOVE|RESET_TURN_SET)) c:RegisterEffect(e1) end function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c59255742.lua b/official/c59255742.lua index 79ecc09aab..15cf64985a 100644 --- a/official/c59255742.lua +++ b/official/c59255742.lua @@ -123,7 +123,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tc:GetOwner()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end end diff --git a/official/c78266168.lua b/official/c78266168.lua index 30eac2fabb..7fa56d9ca4 100644 --- a/official/c78266168.lua +++ b/official/c78266168.lua @@ -25,7 +25,7 @@ end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET)|,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD_PHASE_END&~RESET_TURN_SET),0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c93983867.lua b/official/c93983867.lua index bbe91c6417..8846ccdfcf 100644 --- a/official/c93983867.lua +++ b/official/c93983867.lua @@ -61,6 +61,6 @@ function s.retop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(c:GetOwner()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c9720537.lua b/official/c9720537.lua index b6b2a5b649..e781597536 100644 --- a/official/c9720537.lua +++ b/official/c9720537.lua @@ -26,7 +26,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tc:GetOwner()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end end diff --git a/unofficial/c511001553.lua b/unofficial/c511001553.lua index d873beac1d..4b76bb4c36 100644 --- a/unofficial/c511001553.lua +++ b/unofficial/c511001553.lua @@ -33,7 +33,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tc:GetOwner()) - e1:SetReset(RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TEMP_REMOVE+RESET_TURN_SET)) + e1:SetReset(RESET_EVENT+RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end tc=g:GetNext() diff --git a/unofficial/c511002109.lua b/unofficial/c511002109.lua index 3b9ee8a2cc..c40ac07fdb 100644 --- a/unofficial/c511002109.lua +++ b/unofficial/c511002109.lua @@ -117,7 +117,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tc:GetOwner()) - e1:SetReset(RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TEMP_REMOVE+RESET_TURN_SET)) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end end diff --git a/unofficial/c511005068.lua b/unofficial/c511005068.lua index 85ed4e8b8f..a3807df142 100644 --- a/unofficial/c511005068.lua +++ b/unofficial/c511005068.lua @@ -84,6 +84,6 @@ function s.con_op(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(rc:GetOwner()) - e1:SetReset(RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TEMP_REMOVE+RESET_TURN_SET)) + e1:SetReset(RESET_EVENT+RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) rc:RegisterEffect(e1) end \ No newline at end of file diff --git a/unofficial/c511009136.lua b/unofficial/c511009136.lua index 0ed7e99063..a84fbba48c 100644 --- a/unofficial/c511009136.lua +++ b/unofficial/c511009136.lua @@ -123,7 +123,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tc:GetOwner()) - e1:SetReset(RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TEMP_REMOVE+RESET_TURN_SET)) + e1:SetReset(RESET_EVENT+RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end end diff --git a/unofficial/c511600002.lua b/unofficial/c511600002.lua index 78de32518f..d612e993f0 100644 --- a/unofficial/c511600002.lua +++ b/unofficial/c511600002.lua @@ -121,7 +121,7 @@ function s.sptop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_UNCOPYABLE) e1:SetRange(LOCATION_MZONE) e1:SetValue(baseAtk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) + e1:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end if textDef~=-2 and textDef~=0 then @@ -140,7 +140,7 @@ function s.sptop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_UNCOPYABLE) e2:SetRange(LOCATION_MZONE) e2:SetValue(baseDef) - e2:SetReset(RESET_EVENT|RESETS_STANDARD-(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) + e2:SetReset(RESET_EVENT|RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e2) end end diff --git a/unofficial/c511600140.lua b/unofficial/c511600140.lua index 3bc1361efa..5a87e2a1b0 100644 --- a/unofficial/c511600140.lua +++ b/unofficial/c511600140.lua @@ -62,7 +62,7 @@ function s.spcon(e,c) return ct>6 end function s.spop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TURN_SET)+RESET_PHASE+PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_TOFIELD|RESET_TURN_SET),0,1) end function s.atcon(e,tp,eg,ep,ev,re,r,rp) if e:GetHandler():GetFlagEffect(id)~=0 then return false end diff --git a/unofficial/c700000015.lua b/unofficial/c700000015.lua index e013a7d0f7..9c1fc3e61f 100644 --- a/unofficial/c700000015.lua +++ b/unofficial/c700000015.lua @@ -42,6 +42,6 @@ function s.pzop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() if c:IsRelateToEffect(e) then Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true) - c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TURN_SET)+RESET_PHASE+PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD_PHASE_END&~(RESET_TOFIELD|RESET_TURN_SET),0,1) end end \ No newline at end of file diff --git a/unofficial/c810000071.lua b/unofficial/c810000071.lua index 5b6fb8d009..ee5122ab02 100644 --- a/unofficial/c810000071.lua +++ b/unofficial/c810000071.lua @@ -27,7 +27,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_CONTROL) e1:SetValue(tc:GetOwner()) - e1:SetReset(RESET_EVENT+RESETS_STANDARD-(RESET_TOFIELD+RESET_TEMP_REMOVE+RESET_TURN_SET)) + e1:SetReset(RESET_EVENT+RESETS_STANDARD&~(RESET_TOFIELD|RESET_TEMP_REMOVE|RESET_TURN_SET)) tc:RegisterEffect(e1) end tc=g:GetNext()