diff --git a/official/c10045474.lua b/official/c10045474.lua index b50e9ff517..c0624d717d 100644 --- a/official/c10045474.lua +++ b/official/c10045474.lua @@ -39,13 +39,13 @@ function s.activate(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) local pos=Duel.GetChainInfo(0,CHAININFO_TARGET_PARAM) if c:IsRelateToEffect(e) and pos&POS_FACEDOWN>0 then diff --git a/official/c10140443.lua b/official/c10140443.lua index 92776a3975..0a008fb121 100644 --- a/official/c10140443.lua +++ b/official/c10140443.lua @@ -48,7 +48,7 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EVENT_PHASE|PHASE_STANDBY) local reset,reset_ct=RESET_PHASE|PHASE_STANDBY,1 local turn_ct=0 - if Duel.GetCurrentPhase()==PHASE_STANDBY then + if Duel.IsPhase(PHASE_STANDBY) then reset_ct=2 turn_ct=Duel.GetTurnCount() end diff --git a/official/c10632284.lua b/official/c10632284.lua index 2b4b7f5976..351165c67f 100644 --- a/official/c10632284.lua +++ b/official/c10632284.lua @@ -68,7 +68,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_RACE) e1:SetValue(rc) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end if tc:IsAttributeExcept(att) then @@ -77,7 +77,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_ATTRIBUTE) e1:SetValue(att) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c10666000.lua b/official/c10666000.lua index 016716a390..92ce9b70cb 100644 --- a/official/c10666000.lua +++ b/official/c10666000.lua @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) end) + e2:SetCondition(function(e) return e:GetHandler():IsXyzSummoned() end) e2:SetTarget(s.tgtg) e2:SetOperation(s.tgop) c:RegisterEffect(e2) diff --git a/official/c10774240.lua b/official/c10774240.lua index 8cf351b3eb..ceed5953b0 100644 --- a/official/c10774240.lua +++ b/official/c10774240.lua @@ -21,7 +21,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) end) + e2:SetCondition(function(e) return e:GetHandler():IsRitualSummoned() end) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) diff --git a/official/c10793085.lua b/official/c10793085.lua index 408972a5f8..bf946bc901 100644 --- a/official/c10793085.lua +++ b/official/c10793085.lua @@ -74,7 +74,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) elseif e:GetLabel()==2 and tc:IsFaceup() then Duel.NegateRelatedChain(tc,RESET_TURN_SET) @@ -82,7 +82,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_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c10804018.lua b/official/c10804018.lua index 16c78a51b5..04504950ee 100644 --- a/official/c10804018.lua +++ b/official/c10804018.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) end) + e1:SetCondition(function(e) return e:GetHandler():IsRitualSummoned() end) e1:SetTarget(s.drwtg) e1:SetOperation(s.drwop) c:RegisterEffect(e1) diff --git a/official/c12172567.lua b/official/c12172567.lua index 7c5861c026..b17b683a64 100644 --- a/official/c12172567.lua +++ b/official/c12172567.lua @@ -53,7 +53,7 @@ function s.ctop1(e,tp,eg,ep,ev,re,r,rp) end function s.ctcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_SYNCHRO) + return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSynchroSummoned() end function s.cttg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return false end diff --git a/official/c12421694.lua b/official/c12421694.lua index c3984ff625..3725467084 100644 --- a/official/c12421694.lua +++ b/official/c12421694.lua @@ -55,7 +55,7 @@ function s.naop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,ct) + e1:SetReset(RESETS_STANDARD_PHASE_END,ct) tc:RegisterEffect(e1) end end diff --git a/official/c12632096.lua b/official/c12632096.lua index 629755d2d6..a71640c81b 100644 --- a/official/c12632096.lua +++ b/official/c12632096.lua @@ -60,14 +60,14 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(4500) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Their names become "Neo Galaxy-Eyes Cipher Dragon" local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_CHANGE_CODE) e2:SetValue(id) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c12670770.lua b/official/c12670770.lua index 49d746bb0e..1180e8e53f 100644 --- a/official/c12670770.lua +++ b/official/c12670770.lua @@ -60,7 +60,7 @@ function s.acttg(e,tp,eg,ep,ev,re,r,rp,chk) and Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK) - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) c:RegisterFlagEffect(0,RESET_CHAIN,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) end end @@ -68,7 +68,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chk==0 then return e:GetHandler():GetFlagEffect(id)==0 and Duel.IsExistingMatchingCard(s.filter2,tp,LOCATION_DECK,0,1,nil) end Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end function s.operation(e,tp,eg,ep,ev,re,r,rp) if e:GetHandler():GetFlagEffect(id)==0 or not e:GetHandler():IsRelateToEffect(e) then return end diff --git a/official/c12890860.lua b/official/c12890860.lua index afb7df9ac7..17d20cb99b 100644 --- a/official/c12890860.lua +++ b/official/c12890860.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetRange(LOCATION_MZONE) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetValue(1) c:RegisterEffect(e1) --As long as no monsters on your field or GY share an original name with any monster on your opponent's field or GY, monsters you control cannot be destroyed by card effects diff --git a/official/c13291886.lua b/official/c13291886.lua index 7ede791bfb..ffc3649c26 100644 --- a/official/c13291886.lua +++ b/official/c13291886.lua @@ -79,7 +79,7 @@ function s.caop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) end diff --git a/official/c13302026.lua b/official/c13302026.lua index 2cbc36dde9..155de8962a 100644 --- a/official/c13302026.lua +++ b/official/c13302026.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) end function s.spcond(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsSummonType(SUMMON_TYPE_NORMAL) and not c:IsAttack(0) + return c:IsNormalSummoned() and not c:IsAttack(0) and (Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()) end function s.spfilter(c,e,tp) diff --git a/official/c13836592.lua b/official/c13836592.lua index 8b7616134d..052633713a 100644 --- a/official/c13836592.lua +++ b/official/c13836592.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e4:SetCode(EFFECT_IMMUNE_EFFECT) e4:SetRange(LOCATION_MZONE) - e4:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_NORMAL) end) + e4:SetCondition(function(e) return e:GetHandler():IsNormalSummoned() end) e4:SetValue(s.imnval) c:RegisterEffect(e4) --Gain 700 ATK @@ -62,7 +62,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) end end function s.imnval(e,te) - return te:IsMonsterEffect() and te:IsActivated() and te:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL) + return te:IsMonsterEffect() and te:IsActivated() and te:GetHandler():IsSpecialSummoned() end function s.atkop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c13935001.lua b/official/c13935001.lua index f017db68b2..ede6b64b11 100644 --- a/official/c13935001.lua +++ b/official/c13935001.lua @@ -38,7 +38,7 @@ s.listed_names={13935002} --Lunalight Token s.listed_series={SET_LUNALIGHT} --If fusion monster(s) were fusion summoned to your field function s.cfilter(c,e,tp) - return c:IsFaceup() and c:IsType(TYPE_FUSION) and c:IsControler(tp) and c:IsSummonType(SUMMON_TYPE_FUSION) + return c:IsFaceup() and c:IsType(TYPE_FUSION) and c:IsControler(tp) and c:IsFusionSummoned() and c:IsCanBeEffectTarget(e) end --If it ever happened diff --git a/official/c14108995.lua b/official/c14108995.lua index 374ff7e209..d0699e54c2 100644 --- a/official/c14108995.lua +++ b/official/c14108995.lua @@ -41,6 +41,6 @@ function s.repop(base,e,tp,eg,ep,ev,re,r,rp) if #{Duel.GetPlayerEffect(tp,CARD_VERNUSYLPH_COROLLA)}>1 then Duel.HintSelection(c,true) end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,nil,aux.Stringid(id,1)) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,nil,aux.Stringid(id,1)) Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD) end \ No newline at end of file diff --git a/official/c14307929.lua b/official/c14307929.lua index 7599236671..0de7d5e8ab 100644 --- a/official/c14307929.lua +++ b/official/c14307929.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetLabel()==1 end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() and e:GetLabel()==1 end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) diff --git a/official/c14529511.lua b/official/c14529511.lua index cd154630aa..3cedf528be 100644 --- a/official/c14529511.lua +++ b/official/c14529511.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,{id,1}) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e2:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e2:SetCost(s.opccost) e2:SetTarget(s.tgtg) e2:SetOperation(s.tgop) diff --git a/official/c15171722.lua b/official/c15171722.lua index 23d9f79bdc..2538c0ced5 100644 --- a/official/c15171722.lua +++ b/official/c15171722.lua @@ -51,7 +51,7 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) end function s.tgcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsSummonType(SUMMON_TYPE_NORMAL) or (c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:HasFlagEffect(id)) + return c:IsSummonType(SUMMON_TYPE_NORMAL) or (c:IsSpecialSummoned() and c:HasFlagEffect(id)) end function s.tgfilter(c) return c:IsMonster() and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_REPTILE|RACE_DINOSAUR) and c:IsAbleToGrave() diff --git a/official/c1528054.lua b/official/c1528054.lua index dddef6dbfa..d8cf6c38a0 100644 --- a/official/c1528054.lua +++ b/official/c1528054.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e2:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e2:SetTarget(s.settg) e2:SetOperation(s.setop) c:RegisterEffect(e2) diff --git a/official/c15613529.lua b/official/c15613529.lua index 0532eee9df..bd940c3e84 100644 --- a/official/c15613529.lua +++ b/official/c15613529.lua @@ -73,7 +73,7 @@ function s.gyspop(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(0,LOCATION_MZONE) e1:SetOwnerPlayer(tp) e1:SetCondition(function(e) return e:GetHandler():IsControler(e:GetOwnerPlayer()) end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_MUST_ATTACK_MONSTER) diff --git a/official/c16172067.lua b/official/c16172067.lua index 27d1d7b7ce..291c43ce0a 100644 --- a/official/c16172067.lua +++ b/official/c16172067.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) e1:SetCountLimit(1,id) - e1:SetCondition(function() return Duel.GetCurrentPhase()==PHASE_MAIN1 end) + e1:SetCondition(function() return Duel.IsPhase(PHASE_MAIN1) end) e1:SetTarget(s.destg) e1:SetOperation(s.desop) c:RegisterEffect(e1) diff --git a/official/c16240772.lua b/official/c16240772.lua index d4ad24a9ec..4f8a6824b5 100644 --- a/official/c16240772.lua +++ b/official/c16240772.lua @@ -41,7 +41,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetRange(LOCATION_MZONE) e1:SetValue(function(_e,te) return te:IsMonsterEffect() and te:GetOwner()~=_e:GetHandler() end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local resetcount=Duel.GetCurrentPhase()<=PHASE_STANDBY and 2 or 1 local prevturn=Duel.GetTurnCount() diff --git a/official/c16699558.lua b/official/c16699558.lua index d84dccca8e..d4cf48c3ac 100644 --- a/official/c16699558.lua +++ b/official/c16699558.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,{id,0}) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) end) + e2:SetCondition(function(e) return e:GetHandler():IsXyzSummoned() end) e2:SetTarget(s.negtg) e2:SetOperation(s.negop) c:RegisterEffect(e2) diff --git a/official/c16955631.lua b/official/c16955631.lua index 845d121c92..f47e8edc9f 100644 --- a/official/c16955631.lua +++ b/official/c16955631.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) end) + e2:SetCondition(function(e) return e:GetHandler():IsXyzSummoned() end) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) diff --git a/official/c17032740.lua b/official/c17032740.lua index e40a38e949..529107e78c 100644 --- a/official/c17032740.lua +++ b/official/c17032740.lua @@ -37,7 +37,7 @@ function s.retop(e,tp,eg,ep,ev,re,r,rp) Duel.ChangePosition(g,POS_FACEDOWN_DEFENSE) end function s.coincon(e,tp,eg,ep,ev,re,r,rp) - return Duel.GetCurrentPhase()==PHASE_MAIN1 + return Duel.IsPhase(PHASE_MAIN1) end function s.cointg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end @@ -55,12 +55,12 @@ function s.coinop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) 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_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end elseif total_heads==1 then diff --git a/official/c17688543.lua b/official/c17688543.lua index 64a223b236..23c65954c7 100644 --- a/official/c17688543.lua +++ b/official/c17688543.lua @@ -36,7 +36,7 @@ end function s.activate(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if not tc or not tc:IsRelateToEffect(e) then return end - local res=(Duel.GetCurrentPhase()==PHASE_STANDBY and Duel.GetTurnPlayer()==tp) and 2 or 1 + local res=(Duel.IsPhase(PHASE_STANDBY) and Duel.GetTurnPlayer()==tp) and 2 or 1 local turn_asc=(Duel.GetCurrentPhase()0 and atkc and atkc:IsFaceup() and atkc:IsControler(tp) then - atkc:UpdateAttack(atkc:GetBaseAttack(),RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,e:GetHandler()) + atkc:UpdateAttack(atkc:GetBaseAttack(),RESETS_STANDARD_PHASE_END,e:GetHandler()) end end \ No newline at end of file diff --git a/official/c19162134.lua b/official/c19162134.lua index 5c47ae1765..ae95eee888 100644 --- a/official/c19162134.lua +++ b/official/c19162134.lua @@ -101,11 +101,11 @@ function s.tossop(e,tp,eg,ep,ev,re,r,rp) local count=aux.GetCoinCountFromEv(ev) local flag_id=id+(ep==tp and 1 or 2) for i=1,count do - c:RegisterFlagEffect(flag_id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(flag_id,RESETS_STANDARD_PHASE_END,0,1) end if c:GetFlagEffect(flag_id)>=5 and c:GetFlagEffect(flag_id+2)==0 then s.draw(ep) - c:RegisterFlagEffect(flag_id+2,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(flag_id+2,RESETS_STANDARD_PHASE_END,0,1) end end function s.diceop(e,tp,eg,ep,ev,re,r,rp) @@ -114,26 +114,26 @@ function s.diceop(e,tp,eg,ep,ev,re,r,rp) local ct2=aux.GetDiceCountOppoFromEv(ev) if ep==tp then for i=1,ct1 do - c:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+1,RESETS_STANDARD_PHASE_END,0,1) end for i=1,ct2 do - c:RegisterFlagEffect(id+2,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+2,RESETS_STANDARD_PHASE_END,0,1) end else for i=1,ct2 do - c:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+1,RESETS_STANDARD_PHASE_END,0,1) end for i=1,ct1 do - c:RegisterFlagEffect(id+2,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+2,RESETS_STANDARD_PHASE_END,0,1) end end if c:GetFlagEffect(id+1)>=5 and c:GetFlagEffect(id+3)==0 then s.draw(tp~0) - c:RegisterFlagEffect(id+3,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+3,RESETS_STANDARD_PHASE_END,0,1) end if c:GetFlagEffect(id+2)>=5 and c:GetFlagEffect(id+4)==0 then s.draw(tp~1) - c:RegisterFlagEffect(id+4,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+4,RESETS_STANDARD_PHASE_END,0,1) end end function s.damcon(p) diff --git a/official/c19181420.lua b/official/c19181420.lua index 4dc0cbeebd..6b5fdd529e 100644 --- a/official/c19181420.lua +++ b/official/c19181420.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e2:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) @@ -68,7 +68,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_FUSION) + return c:IsPreviousLocation(LOCATION_MZONE) and c:IsFusionSummoned() end function s.spfilter(c,e,tp) return c:IsLevelBelow(6) and c:IsSetCard(SET_MEMENTO) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c19271881.lua b/official/c19271881.lua index 41ba716500..34b8dbe38c 100644 --- a/official/c19271881.lua +++ b/official/c19271881.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_GRAVE) e2:SetHintTiming(TIMING_END_PHASE,TIMING_END_PHASE) e2:SetCountLimit(1,id) - e2:SetCondition(function(_,tp) return Duel.HasFlagEffect(tp,id) and Duel.GetCurrentPhase()==PHASE_END end) + e2:SetCondition(function(_,tp) return Duel.HasFlagEffect(tp,id) and Duel.IsPhase(PHASE_END) end) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) @@ -67,7 +67,7 @@ function s.disop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c19671433.lua b/official/c19671433.lua index e0b8676b91..88e92327c6 100644 --- a/official/c19671433.lua +++ b/official/c19671433.lua @@ -75,7 +75,7 @@ function s.tunerop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c19974890.lua b/official/c19974890.lua index a8b2c9a862..e68de7a844 100644 --- a/official/c19974890.lua +++ b/official/c19974890.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) end function s.checkop(e,tp,eg,ep,ev,re,r,rp) for tc in eg:Iter() do - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.posfilter(c) diff --git a/official/c20127343.lua b/official/c20127343.lua index f34b9b282d..6deab26fd6 100644 --- a/official/c20127343.lua +++ b/official/c20127343.lua @@ -32,7 +32,7 @@ function s.attrop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_CHANGE_ATTRIBUTE) e1:SetValue(e:GetLabel()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c20426176.lua b/official/c20426176.lua index c1bcdff5fa..c7eb0378f2 100644 --- a/official/c20426176.lua +++ b/official/c20426176.lua @@ -61,7 +61,7 @@ function s.attrop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_CHANGE_ATTRIBUTE) e1:SetValue(attr) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.tdspfilter),tp,LOCATION_GRAVE,0,nil,e,tp,ft) diff --git a/official/c2089016.lua b/official/c2089016.lua index 683fe8d656..8f41072f32 100644 --- a/official/c2089016.lua +++ b/official/c2089016.lua @@ -54,7 +54,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(e:GetLabel()*-200) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c21105106.lua b/official/c21105106.lua index da2409b7d8..f205a09910 100644 --- a/official/c21105106.lua +++ b/official/c21105106.lua @@ -48,7 +48,7 @@ function s.ritual_custom_check(e,tp,g,c) return count==3 and class_count==3 and onfield_self_count==3,count>3 or class_count~=count or onfield_self_count~=count end function s.discon(e,tp,eg,ep,ev,re,r,rp) - return Duel.GetCurrentPhase()==PHASE_MAIN1 + return Duel.IsPhase(PHASE_MAIN1) end function s.cfilter(c) return c:IsSetCard(SET_NEKROZ) and c:IsSpell() and c:IsDiscardable() @@ -76,7 +76,7 @@ function s.sumlimit(e,c,sump,sumtype,sumpos,targetp,se) return c:IsLocation(LOCATION_EXTRA) end function s.rmcon(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) + return e:GetHandler():IsRitualSummoned() end function s.rmcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_NORMALSUMMON)==0 diff --git a/official/c21113684.lua b/official/c21113684.lua index cd1d28f577..6c1523510f 100644 --- a/official/c21113684.lua +++ b/official/c21113684.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e1:SetCategory(CATEGORY_COUNTER) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e1:SetCode(EVENT_SPSUMMON_SUCCESS) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.cntrtg) e1:SetOperation(s.cntrop) c:RegisterEffect(e1) diff --git a/official/c21364070.lua b/official/c21364070.lua index 40cb06d304..840aff3d65 100644 --- a/official/c21364070.lua +++ b/official/c21364070.lua @@ -109,7 +109,7 @@ function s.scop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LSCALE) e1:SetValue(11) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_CHANGE_RSCALE) diff --git a/official/c21368273.lua b/official/c21368273.lua index bd6eb9cf6e..f52467aef7 100644 --- a/official/c21368273.lua +++ b/official/c21368273.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) diff --git a/official/c21522601.lua b/official/c21522601.lua index 9f67c44a00..cf186c1605 100644 --- a/official/c21522601.lua +++ b/official/c21522601.lua @@ -51,7 +51,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(#g*1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_UPDATE_DEFENSE) diff --git a/official/c21903613.lua b/official/c21903613.lua index d4a3b8e922..d1ba1abde5 100644 --- a/official/c21903613.lua +++ b/official/c21903613.lua @@ -102,7 +102,7 @@ function s.lvop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) lc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c21915012.lua b/official/c21915012.lua index 676dcba682..dd005c0495 100644 --- a/official/c21915012.lua +++ b/official/c21915012.lua @@ -21,7 +21,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetLabelObject(e0) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetOperation(s.lvop) c:RegisterEffect(e1) --Gains ATK equal to its Level x 400 @@ -98,7 +98,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) end function s.damcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_SYNCHRO) and c:IsLocation(LOCATION_GRAVE) + return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSynchroSummoned() and c:IsLocation(LOCATION_GRAVE) and r&REASON_SYNCHRO>0 end function s.damtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c22091647.lua b/official/c22091647.lua index 4ae009189b..9adbdfd00b 100644 --- a/official/c22091647.lua +++ b/official/c22091647.lua @@ -50,7 +50,7 @@ end function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():GetFlagEffect(id)==0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_SZONE|LOCATION_GRAVE,0,1,nil,tp) end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_SZONE|LOCATION_GRAVE,0,1,1,nil,tp) Duel.Remove(g,POS_FACEUP,REASON_COST) diff --git a/official/c22390469.lua b/official/c22390469.lua index cc3fe0d9d0..9f7506a98d 100644 --- a/official/c22390469.lua +++ b/official/c22390469.lua @@ -45,7 +45,7 @@ function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) Duel.SetOperationInfo(0,CATEGORY_ATKCHANGE,e:GetHandler(),1,0,g:GetFirst():GetBaseAttack()) Duel.SetPossibleOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) --Register that this effect was activated this turn - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.atkop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c22435424.lua b/official/c22435424.lua index a53bc093ef..386cbdd22c 100644 --- a/official/c22435424.lua +++ b/official/c22435424.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) - Duel.AddCustomActivityCounter(id,ACTIVITY_SPSUMMON,function(c) return not c:IsSummonType(SUMMON_TYPE_RITUAL) or c:IsRace(RACE_MACHINE) end) + Duel.AddCustomActivityCounter(id,ACTIVITY_SPSUMMON,function(c) return not c:IsRitualSummoned() or c:IsRace(RACE_MACHINE) end) end s.listed_series={SET_DRYTRON} s.listed_names={id} diff --git a/official/c22723778.lua b/official/c22723778.lua index 1f2338d6c2..2dc42e08c7 100644 --- a/official/c22723778.lua +++ b/official/c22723778.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.destg) e1:SetOperation(s.desop) c:RegisterEffect(e1) @@ -52,7 +52,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) end function s.sucop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - if not c:IsSummonType(SUMMON_TYPE_FUSION) then return end + if not c:IsFusionSummoned() then return end --Its original ATK/DEF become the number of Fusion Materials x 1000 local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) @@ -83,7 +83,7 @@ function s.discop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET) e1:SetValue(aux.tgoval) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c22996376.lua b/official/c22996376.lua index 5daf1e0c52..7a903f47df 100644 --- a/official/c22996376.lua +++ b/official/c22996376.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetProperty(EFFECT_FLAG_CARD_TARGET) e3:SetCode(EVENT_SUMMON_SUCCESS) - e3:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_TRIBUTE) end) + e3:SetCondition(function(e) return e:GetHandler():IsTributeSummoned() end) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) c:RegisterEffect(e3) diff --git a/official/c23093373.lua b/official/c23093373.lua index aa7554c50f..34f17da141 100644 --- a/official/c23093373.lua +++ b/official/c23093373.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) local e3=e2:Clone() e3:SetCode(EVENT_SPSUMMON_SUCCESS) - e3:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM) end) + e3:SetCondition(function(e) return e:GetHandler():IsPendulumSummoned() end) c:RegisterEffect(e3) --Add itself to the hand local e4=Effect.CreateEffect(c) diff --git a/official/c23587624.lua b/official/c23587624.lua index f0bbc30730..3607053b7e 100644 --- a/official/c23587624.lua +++ b/official/c23587624.lua @@ -37,7 +37,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetValue(function(_e,_re) return _re:GetOwnerPlayer()==tp and _e:GetHandler()~=_re:GetHandler() end) e1:SetReset(RESET_EVENT|RESETS_STANDARD) sc:RegisterEffect(e1,true) - local reset_ct=(Duel.IsTurnPlayer(tp) or Duel.GetCurrentPhase()==PHASE_END) and 2 or 1 + local reset_ct=(Duel.IsTurnPlayer(tp) or Duel.IsPhase(PHASE_END)) and 2 or 1 --Shuffle it into the Deck during your opponent's next End Phase aux.DelayedOperation(sc,PHASE_END,id,e,tp,function(ag) Duel.SendtoDeck(ag,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) end,function() return Duel.IsTurnPlayer(1-tp) end,nil,reset_ct,aux.Stringid(id,1)) end diff --git a/official/c23746827.lua b/official/c23746827.lua index 60db5f34b7..c63a077325 100644 --- a/official/c23746827.lua +++ b/official/c23746827.lua @@ -42,7 +42,7 @@ function s.skop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET|EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_SKIP_M1) e1:SetTargetRange(0,1) - if Duel.IsTurnPlayer(1-tp) and Duel.GetCurrentPhase()==PHASE_MAIN1 then + if Duel.IsTurnPlayer(1-tp) and Duel.IsPhase(PHASE_MAIN1) then local turn=Duel.GetTurnCount() e1:SetCondition(function() return Duel.GetTurnCount()~=turn end) e1:SetReset(RESET_PHASE|PHASE_MAIN1|RESET_OPPO_TURN,2) diff --git a/official/c23965033.lua b/official/c23965033.lua index 55abc6e18e..4f815088e4 100644 --- a/official/c23965033.lua +++ b/official/c23965033.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) @@ -74,7 +74,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) end function s.atkcon(e) local c=e:GetHandler() - return c:IsSummonType(SUMMON_TYPE_FUSION) and c:HasFlagEffect(id) + return c:IsFusionSummoned() and c:HasFlagEffect(id) end function s.valcheck(e,c) local g=c:GetMaterial() diff --git a/official/c24634594.lua b/official/c24634594.lua index c288a0ca41..4fdf803998 100644 --- a/official/c24634594.lua +++ b/official/c24634594.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end function s.syncon(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) + return e:GetHandler():IsSynchroSummoned() end function s.gyfilter(c) return c:IsRace(RACE_INSECT|RACE_PLANT) and c:IsAbleToGrave() @@ -67,7 +67,7 @@ function s.tunop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c24696097.lua b/official/c24696097.lua index c76378c4fc..3adaead442 100644 --- a/official/c24696097.lua +++ b/official/c24696097.lua @@ -75,7 +75,7 @@ function s.mtop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_EXTRA_ATTACK) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(ct-1) c:RegisterEffect(e1) elseif ct==0 then @@ -83,7 +83,7 @@ function s.mtop(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_CANNOT_ATTACK) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e2) end end @@ -121,7 +121,7 @@ function s.daop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() if c:IsRelateToEffect(e) and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)~=0 then Duel.NegateAttack() - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,0) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,0) end end function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c24915933.lua b/official/c24915933.lua index cce7f08781..e6a5e89603 100644 --- a/official/c24915933.lua +++ b/official/c24915933.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.tgtg) e1:SetOperation(s.tgop) c:RegisterEffect(e1) diff --git a/official/c25415161.lua b/official/c25415161.lua index c63c508329..2fd1647a39 100644 --- a/official/c25415161.lua +++ b/official/c25415161.lua @@ -96,7 +96,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(-1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c2547033.lua b/official/c2547033.lua index cc7b3eb60c..eafa472a83 100644 --- a/official/c2547033.lua +++ b/official/c2547033.lua @@ -83,6 +83,6 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) if not re or not re:GetHandler():IsSetCard(SET_ALTERGEIST) then return end for ec in eg:Iter() do - ec:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + ec:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end \ No newline at end of file diff --git a/official/c25784595.lua b/official/c25784595.lua index d163031e15..b918cb0893 100644 --- a/official/c25784595.lua +++ b/official/c25784595.lua @@ -1,8 +1,8 @@ --- ボーン・デーモン --- Bone Archfiend +--ボーン・デーモン +--Bone Archfiend local s,id=GetID() function s.initial_effect(c) - -- Special Summon this card from your hand or GY + --Special Summon this card from your hand or GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - -- Increase or decrease a monster's Level by 1 + --Increase or decrease a monster's Level by 1 local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_TOGRAVE+CATEGORY_LVCHANGE) @@ -46,7 +46,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end local c=e:GetHandler() - -- Cannot Special Summon from the Extra Deck, except DARK Dragon Synchro Monsters + --Cannot Special Summon from the Extra Deck, except DARK Dragon Synchro Monsters local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,2)) e1:SetType(EFFECT_TYPE_FIELD) @@ -56,7 +56,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetTarget(s.splimit) e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) - -- Clock Lizard check + --Clock Lizard check aux.addTempLizardCheck(c,tp,s.lizfilter) end function s.splimit(e,c,sump,sumtype,sumpos,targetp) @@ -89,7 +89,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) {b2,aux.Stringid(id,4)}) if not op then return end local val=op==1 and 1 or -1 - -- Increase or decrease its Level by 1 + --Increase or decrease its Level by 1 local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) diff --git a/official/c25807544.lua b/official/c25807544.lua index b07312f602..d5f6b058bf 100644 --- a/official/c25807544.lua +++ b/official/c25807544.lua @@ -1,5 +1,5 @@ --大聖剣博物館 ---The Noble Arms Museum +--Noble Arms Museum --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) @@ -55,7 +55,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) end function s.thop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,nil,aux.Stringid(id,2)) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,nil,aux.Stringid(id,2)) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil) if #g>0 then diff --git a/official/c25862681.lua b/official/c25862681.lua index 1222945154..2bfb1f0a5b 100644 --- a/official/c25862681.lua +++ b/official/c25862681.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) e1:SetCountLimit(1,{id,0}) - e1:SetCondition(function() return Duel.GetCurrentPhase()==PHASE_MAIN1 end) + e1:SetCondition(function() return Duel.IsPhase(PHASE_MAIN1) end) e1:SetCost(s.spcost) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) diff --git a/official/c25919316.lua b/official/c25919316.lua index 52e7fa9172..3d233999f5 100644 --- a/official/c25919316.lua +++ b/official/c25919316.lua @@ -61,7 +61,7 @@ function s.extatkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_EXTRA_ATTACK) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Double battle damage if it battles a monster local e2=e1:Clone() diff --git a/official/c25926710.lua b/official/c25926710.lua index 07d1f1a4e2..7f39be9ff9 100644 --- a/official/c25926710.lua +++ b/official/c25926710.lua @@ -1,9 +1,9 @@ --- 古尖兵ケルベク --- Kelbek the Ancient Vanguard --- Scripted by Hatter +--古尖兵ケルベク +--Kelbek the Ancient Vanguard +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Special Summon this card + --Special Summon this card local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND) @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - -- Mill 5 cards from each Deck + --Mill 5 cards from each Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DECKDES) @@ -37,7 +37,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp) return eg:IsExists(s.spconfilter,1,nil,tp) end function s.thfilter(c) - return c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsAbleToHand() + return c:IsSpecialSummoned() and c:IsAbleToHand() end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.thfilter(chkc) end diff --git a/official/c26223582.lua b/official/c26223582.lua index b8a3994d3b..e5a40e53da 100644 --- a/official/c26223582.lua +++ b/official/c26223582.lua @@ -1,10 +1,10 @@ --- ブエリヤベース・ド・ヌーベルズ --- Buerillabaisse de Nouvelles --- Scripted by Satella +--ブエリヤベース・ド・ヌーベルズ +--Buerillabaisse de Nouvelles +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- Excavate the top 5 cards of your Deck + --Excavate the top 5 cards of your Deck local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) - -- Special Summon 1 Level 2 or 3 "Nouvelles" Ritual Monster + --Special Summon 1 Level 2 or 3 "Nouvelles" Ritual Monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_RELEASE+CATEGORY_SPECIAL_SUMMON) diff --git a/official/c26302107.lua b/official/c26302107.lua index f79e9a75c1..13edd51776 100644 --- a/official/c26302107.lua +++ b/official/c26302107.lua @@ -75,7 +75,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(-1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c26334139.lua b/official/c26334139.lua index 6b6537dde1..60107a46e5 100644 --- a/official/c26334139.lua +++ b/official/c26334139.lua @@ -1,5 +1,5 @@ --廻る罪宝 ---Sinful Spoils Cycle +--Sinful Spoils Subdual --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -59,7 +59,7 @@ function s.thspop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_TRIGGER) e1:SetCondition(function(e) return Duel.IsMainPhase() and e:GetHandler():IsControler(tp) end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) sc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c26400609.lua b/official/c26400609.lua index 2834738f2b..b09d96500e 100644 --- a/official/c26400609.lua +++ b/official/c26400609.lua @@ -70,7 +70,7 @@ function s.hspop(e,tp,eg,ep,ev,re,r,rp) end end function s.retcon(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsTurnPlayer(1-tp) and e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL) + return Duel.IsTurnPlayer(1-tp) and e:GetHandler():IsSpecialSummoned() end function s.rettg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end diff --git a/official/c26700718.lua b/official/c26700718.lua index f2ce46116b..4c98a89bdf 100644 --- a/official/c26700718.lua +++ b/official/c26700718.lua @@ -1,9 +1,9 @@ --- スネークアイ追走劇 --- Snake-Eye Dramatic Chase --- Scripted by Satellaa +--スネークアイ追走劇 +--Dramatic Snake-Eye Chase +--Scripted by Satellaa local s,id=GetID() function s.initial_effect(c) - -- Place 1 "Diabellestar" monster in its owner's Spell/Trap Zone + --Place 1 "Diabellestar" monster in its owner's Spell/Trap Zone local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_LEAVE_GRAVE) @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetTarget(s.pltg) e1:SetOperation(s.plop) c:RegisterEffect(e1) - -- Special Summon 1 monster that is treated as a Continuous Spell + --Special Summon 1 monster that is treated as a Continuous Spell local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) diff --git a/official/c26913989.lua b/official/c26913989.lua index 9e1f88a0db..fb5b7b9d08 100644 --- a/official/c26913989.lua +++ b/official/c26913989.lua @@ -1,5 +1,5 @@ --ガイストーチ・ゴーレム ---Geist Grinder Golem +--Geistgrinder Golem --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c26988374.lua b/official/c26988374.lua index f46fab49a9..0d80db8788 100644 --- a/official/c26988374.lua +++ b/official/c26988374.lua @@ -1,5 +1,5 @@ --魔鍵憑神－アシュタルトゥ ---Magikey Avatar - Astartu +--Magikey Deity - Ashtartu --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c27012717.lua b/official/c27012717.lua index 2fb359c903..f519294107 100644 --- a/official/c27012717.lua +++ b/official/c27012717.lua @@ -1,5 +1,5 @@ --猛虎モンフー ---Fierce Tiger Menghu +--Fierce Tiger Monghu --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c27012990.lua b/official/c27012990.lua index 049d7e7238..6d02db1d74 100644 --- a/official/c27012990.lua +++ b/official/c27012990.lua @@ -49,12 +49,12 @@ function s.atkcost(e,tp,eg,ep,ev,re,r,rp,chk) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_PHASE+PHASE_STANDBY) - if Duel.GetCurrentPhase()==PHASE_STANDBY then e1:SetLabel(Duel.GetTurnCount()) end + if Duel.IsPhase(PHASE_STANDBY) then e1:SetLabel(Duel.GetTurnCount()) end e1:SetLabelObject(g) e1:SetCountLimit(1) e1:SetCondition(s.retcon) e1:SetOperation(s.retop) - if Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_STANDBY then + if Duel.IsTurnPlayer(tp) and Duel.IsPhase(PHASE_STANDBY) then e1:SetReset(RESET_PHASE|PHASE_STANDBY|RESET_SELF_TURN,2) else e1:SetReset(RESET_PHASE|PHASE_STANDBY|RESET_SELF_TURN) @@ -86,7 +86,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(e:GetLabelObject():GetSum(Card.GetLink)*300) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c27015862.lua b/official/c27015862.lua index 97d76f718a..31cc00944c 100644 --- a/official/c27015862.lua +++ b/official/c27015862.lua @@ -1,9 +1,9 @@ --- ヴェーダ＝カーランタ --- Veda Kalantha --- Scripted by Satella +--ヴェーダ＝カーランタ +--Veda Kalanta +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) - -- Special Summon itself from your hand + --Special Summon itself from your hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - -- Destroy 1 monster your opponent controls + --Destroy 1 monster your opponent controls local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DESTROY+CATEGORY_ATKCHANGE) diff --git a/official/c27132400.lua b/official/c27132400.lua index b04f78ef55..8dbca37695 100644 --- a/official/c27132400.lua +++ b/official/c27132400.lua @@ -65,7 +65,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c27134209.lua b/official/c27134209.lua index ba0f0db786..937082c358 100644 --- a/official/c27134209.lua +++ b/official/c27134209.lua @@ -103,7 +103,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c27170599.lua b/official/c27170599.lua index 84c1ac414d..471ffc9790 100644 --- a/official/c27170599.lua +++ b/official/c27170599.lua @@ -44,13 +44,13 @@ function s.activate(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) --Cannot attack local e3=Effect.CreateEffect(c) @@ -58,12 +58,12 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e3:SetProperty(EFFECT_FLAG_CLIENT_HINT) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_CANNOT_ATTACK) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) if not tc:IsImmuneToEffect(e) then --Change Position during the End Phase local fid=c:GetFieldID() - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1,fid) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1,fid) local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e4:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) diff --git a/official/c27275398.lua b/official/c27275398.lua index 4dd4d195a8..3d50031ace 100644 --- a/official/c27275398.lua +++ b/official/c27275398.lua @@ -61,7 +61,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(500) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Cannot be destroyed by battle or card effects local e2=e1:Clone() diff --git a/official/c27337596.lua b/official/c27337596.lua index 6102aba83e..ff5430b0d0 100644 --- a/official/c27337596.lua +++ b/official/c27337596.lua @@ -27,7 +27,7 @@ function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) 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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) c:RemoveOverlayCard(tp,1,1,REASON_COST) end diff --git a/official/c27822206.lua b/official/c27822206.lua index 980543c5d9..2627e2b537 100644 --- a/official/c27822206.lua +++ b/official/c27822206.lua @@ -1,5 +1,5 @@ --幾星霜 ---The Passage of Stars and Frost +--Ages of Stars and Frost --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c27868563.lua b/official/c27868563.lua index a76b3d4822..bdcd6d6f90 100644 --- a/official/c27868563.lua +++ b/official/c27868563.lua @@ -1,5 +1,5 @@ --百鬼羅刹 神速ブーン ---Goblin Rider Boon the Machspeed +--Goblin Biker Boom Mach --Ashaki local s,id=GetID() function s.initial_effect(c) diff --git a/official/c27995943.lua b/official/c27995943.lua index b4e4c0aa68..746df67bc3 100644 --- a/official/c27995943.lua +++ b/official/c27995943.lua @@ -44,7 +44,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_SKIP_DP) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetTargetRange(1,0) - if Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_DRAW then + if Duel.IsTurnPlayer(tp) and Duel.IsPhase(PHASE_DRAW) then e1:SetReset(RESET_PHASE|PHASE_DRAW|RESET_SELF_TURN,2) else e1:SetReset(RESET_PHASE|PHASE_DRAW|RESET_SELF_TURN) diff --git a/official/c28112535.lua b/official/c28112535.lua index 88353e49e0..ee0b85f541 100644 --- a/official/c28112535.lua +++ b/official/c28112535.lua @@ -38,7 +38,7 @@ function s.atklimit(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e:GetHandler():RegisterEffect(e1) end function s.dircon(e) diff --git a/official/c28143384.lua b/official/c28143384.lua index 7733e592fb..ff5c94045e 100644 --- a/official/c28143384.lua +++ b/official/c28143384.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.tgtg) e1:SetOperation(s.tgop) c:RegisterEffect(e1) diff --git a/official/c28168628.lua b/official/c28168628.lua index 57d01aacca..c6faf866aa 100644 --- a/official/c28168628.lua +++ b/official/c28168628.lua @@ -1,5 +1,5 @@ --闘神の虚像 ---Rock of Vanquisher +--Rock of the Vanquisher --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c28189908.lua b/official/c28189908.lua index 18bd8d80e2..482f8d3112 100644 --- a/official/c28189908.lua +++ b/official/c28189908.lua @@ -1,5 +1,5 @@ --ＴＧ — ブレイクリミッター ---T.G. - Break Limiter +--T.G. Limiter Removal --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c28279365.lua b/official/c28279365.lua index 04c7d59e19..d968e1d6fd 100644 --- a/official/c28279365.lua +++ b/official/c28279365.lua @@ -1,5 +1,5 @@ --ブリンクアウト ---Blink-Out +--Blink Out --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c28497830.lua b/official/c28497830.lua index 3ff35b96a0..5052d42356 100644 --- a/official/c28497830.lua +++ b/official/c28497830.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) e1:SetLabel(id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.eqtg) e1:SetOperation(s.eqop) c:RegisterEffect(e1) @@ -55,7 +55,7 @@ function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAbleToChangeControler),tp,0,LOCATION_MZONE,1,nil) end Duel.SetOperationInfo(0,CATEGORY_EQUIP,nil,1,1-tp,LOCATION_MZONE) --Register that this effect was activated this turn - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.eqop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c28798938.lua b/official/c28798938.lua index 68da3681c2..620c64aea7 100644 --- a/official/c28798938.lua +++ b/official/c28798938.lua @@ -10,7 +10,7 @@ function s.initial_effect(c) local e1a=Effect.CreateEffect(c) e1a:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e1a:SetCode(EVENT_SPSUMMON_SUCCESS) - e1a:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1a:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1a:SetOperation(s.operation) c:RegisterEffect(e1a) --Material Check @@ -92,7 +92,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_FUSION) + return c:IsPreviousLocation(LOCATION_MZONE) and c:IsFusionSummoned() end function s.spfilter(c,e,tp) return c:IsCode(85360035,11759079) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) @@ -123,7 +123,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Cannot be destroyed by effects local e2=e1:Clone() diff --git a/official/c28803166.lua b/official/c28803166.lua index fd059545e4..d54c8d44a3 100644 --- a/official/c28803166.lua +++ b/official/c28803166.lua @@ -1,5 +1,5 @@ --紅涙の魔ラクリモーサ ---Lacrima the Scarlet Sorrow +--Lacrima the Crimson Tears --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c28954097.lua b/official/c28954097.lua index 1c1febfa16..cf41844458 100644 --- a/official/c28954097.lua +++ b/official/c28954097.lua @@ -1,5 +1,5 @@ --ミラー ソードナイト ---Mirror Swordsman +--Mirror Swordknight --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c28958464.lua b/official/c28958464.lua index 8f193cab0a..40d3a8d2e8 100644 --- a/official/c28958464.lua +++ b/official/c28958464.lua @@ -1,5 +1,5 @@ --マジックカード「死者蘇生」 ---Spell Card: "Monster Reborn" +--Spell Card "Monster Reborn" local s,id=GetID() function s.initial_effect(c) --Activate @@ -35,7 +35,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Cannot activate its effects this turn local e2=e1:Clone() diff --git a/official/c29111045.lua b/official/c29111045.lua index 19a92a9eab..5eee8cbb7d 100644 --- a/official/c29111045.lua +++ b/official/c29111045.lua @@ -1,5 +1,5 @@ --百鬼羅刹大収監 ---Goblin Biker Grand Imprisonment +--Goblin Biker Grand Breakout --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c29280200.lua b/official/c29280200.lua index 8f068e0be7..d3b47f14c6 100644 --- a/official/c29280200.lua +++ b/official/c29280200.lua @@ -1,5 +1,5 @@ --ＶＳＤｒ．マッドラヴ ---Vanquish Soul Dr. Madlove +--Vanquish Soul Dr. Mad Love --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c29301450.lua b/official/c29301450.lua index 90b85bbbe8..3ca130a684 100644 --- a/official/c29301450.lua +++ b/official/c29301450.lua @@ -1,5 +1,5 @@ --Ｓ：Ｐリトルナイト ---S:P Little Night +--S:P Little Knight --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and e:GetLabel()==1 end) + e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() and e:GetLabel()==1 end) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) c:RegisterEffect(e1) diff --git a/official/c29302858.lua b/official/c29302858.lua index d2abe53044..564f929c7e 100644 --- a/official/c29302858.lua +++ b/official/c29302858.lua @@ -95,7 +95,7 @@ function s.vsop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) elseif op==2 then local cg=c:GetColumnGroup():Match(Card.IsLocation,nil,LOCATION_MZONE) diff --git a/official/c29357687.lua b/official/c29357687.lua index 6435d525fe..828718d024 100644 --- a/official/c29357687.lua +++ b/official/c29357687.lua @@ -60,7 +60,7 @@ function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chk==0 then return Duel.IsExistingTarget(s.filter,tp,0,LOCATION_MZONE,1,nil) end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_NEGATE) local g=Duel.SelectTarget(tp,s.filter,tp,0,LOCATION_MZONE,1,1,nil) - if Duel.GetCurrentPhase()==PHASE_STANDBY then + if Duel.IsPhase(PHASE_STANDBY) then e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_STANDBY,EFFECT_FLAG_OATH,2,Duel.GetTurnCount()) else e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_STANDBY,EFFECT_FLAG_OATH,1) @@ -76,21 +76,21 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) if tc:IsType(TYPE_TRAPMONSTER) then local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetCode(EFFECT_DISABLE_TRAPMONSTER) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) end end diff --git a/official/c29423048.lua b/official/c29423048.lua index 378187b370..71658e0282 100644 --- a/official/c29423048.lua +++ b/official/c29423048.lua @@ -55,7 +55,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) if c:IsRelateToEffect(e) and Duel.SpecialSummonStep(c,0,tp,tp,false,false,POS_FACEUP) then local ct=Duel.GetMatchingGroupCount(aux.FaceupFilter(Card.IsMonster),tp,LOCATION_REMOVED,0,nil) if ct>0 then - c:UpdateAttack(ct*100,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + c:UpdateAttack(ct*100,RESETS_STANDARD_PHASE_END) end end Duel.SpecialSummonComplete() diff --git a/official/c29603180.lua b/official/c29603180.lua index 87a9230d00..847a2b3bda 100644 --- a/official/c29603180.lua +++ b/official/c29603180.lua @@ -41,7 +41,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end diff --git a/official/c30095833.lua b/official/c30095833.lua index 253dff1181..70243c03e5 100644 --- a/official/c30095833.lua +++ b/official/c30095833.lua @@ -73,7 +73,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) end function s.matcon(e) local c=e:GetHandler() - return c:IsStatus(STATUS_SPSUMMON_TURN) and c:IsSummonType(SUMMON_TYPE_XYZ) + return c:IsStatus(STATUS_SPSUMMON_TURN) and c:IsXyzSummoned() end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsFaceup() and chkc:IsAttackBelow(3000) end diff --git a/official/c30128445.lua b/official/c30128445.lua index c7ca760dfa..0a009b504f 100644 --- a/official/c30128445.lua +++ b/official/c30128445.lua @@ -1,10 +1,10 @@ --超越竜ドリルグナトゥス ---Transcendrake Drillgnathus +--Transcendosaurus Drillygnathus --scripted by Naim local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- Xyz Summon procedure + --Xyz Summon procedure Xyz.AddProcedure(c,nil,6,2) --Double damage when it doesn't have Xyz materials local e1=Effect.CreateEffect(c) diff --git a/official/c30291086.lua b/official/c30291086.lua index d6bc08f158..0802016924 100644 --- a/official/c30291086.lua +++ b/official/c30291086.lua @@ -1,9 +1,9 @@ --- メンタル・チューナー --- Mind Tuner --- Scripted by Hatter +--メンタル・チューナー +--Mental Tuner +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Change this card's level + --Change this card's level local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) diff --git a/official/c30327674.lua b/official/c30327674.lua index 15d0f97313..99c787dc5f 100644 --- a/official/c30327674.lua +++ b/official/c30327674.lua @@ -1,9 +1,9 @@ --- カオス・ウィッチ－混沌の魔女 --- Chaos Witch --- Scripted by Hatter +--カオス・ウィッチ－混沌の魔女 +--Chaos Witch +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Special Summon 2 "Black Beast Tokens" + --Special Summon 2 "Black Beast Tokens" local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN) @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetTarget(s.tktg) e1:SetOperation(s.tkop) c:RegisterEffect(e1) - -- Special Summon 2 "White Beast Tokens" + --Special Summon 2 "White Beast Tokens" local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN) @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetTarget(s.tktg) e2:SetOperation(s.tkop) c:RegisterEffect(e2) - -- Count Special Summoned monsters + --Count Special Summoned monsters Duel.AddCustomActivityCounter(id,ACTIVITY_SPSUMMON,s.ctfilter) end s.listed_names={id+1,id+2} @@ -47,7 +47,7 @@ function s.tkcost(e,tp,eg,ep,ev,re,r,rp,chk) return not blk or c:IsReleasable() end if blk then Duel.Release(c,REASON_COST) end - -- Cannot Special Summon monsters from the Extra Deck, except LIGHT or DARK Synchro monsters + --Cannot Special Summon monsters from the Extra Deck, except LIGHT or DARK Synchro monsters local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,2)) e1:SetType(EFFECT_TYPE_FIELD) @@ -57,7 +57,7 @@ function s.tkcost(e,tp,eg,ep,ev,re,r,rp,chk) e1:SetTargetRange(1,0) e1:SetTarget(function(_,c) return c:IsLocation(LOCATION_EXTRA) and not s.synfilter(c) end) Duel.RegisterEffect(e1,tp) - -- Clock Lizard check + --Clock Lizard check aux.addTempLizardCheck(c,tp,s.lizfilter) end function s.lizfilter(e,c) diff --git a/official/c30336082.lua b/official/c30336082.lua index 0648268a60..e9d7517008 100644 --- a/official/c30336082.lua +++ b/official/c30336082.lua @@ -1,5 +1,5 @@ --盃満ちる燦幻荘 ---Brimming Sangen Manor +--Sangen Summoning --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c30432463.lua b/official/c30432463.lua index f4104683ba..8d7d48c345 100644 --- a/official/c30432463.lua +++ b/official/c30432463.lua @@ -44,7 +44,7 @@ function s.initial_effect(c) e4:SetTarget(s.cptg) e4:SetOperation(s.cpop) c:RegisterEffect(e4) - -- Register flag on summon + --Register flag on summon aux.GlobalCheck(s,function() local ge1=Effect.CreateEffect(c) ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) @@ -115,7 +115,7 @@ function s.cpcost(e,tp,eg,ep,ev,re,r,rp,chk) end function s.cpfilter(c) return c:IsSetCard(SET_VAALMONICA) and (c:IsNormalSpell() or c:IsNormalTrap()) and c:IsAbleToRemoveAsCost() - -- and c:CheckActivateEffect(false,true,false) + --and c:CheckActivateEffect(false,true,false) end function s.cptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then diff --git a/official/c3048768.lua b/official/c3048768.lua index 891d3ef42e..0e2fea2c7a 100644 --- a/official/c3048768.lua +++ b/official/c3048768.lua @@ -133,7 +133,7 @@ function s.cpcost(e,tp,eg,ep,ev,re,r,rp,chk) end function s.cpfilter(c) return c:IsSetCard(SET_VAALMONICA) and (c:IsNormalSpell() or c:IsNormalTrap()) and c:IsAbleToRemoveAsCost() - -- and c:CheckActivateEffect(false,true,false) + --and c:CheckActivateEffect(false,true,false) end function s.cptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then diff --git a/official/c30765615.lua b/official/c30765615.lua index 6eac83a4eb..32a548a417 100644 --- a/official/c30765615.lua +++ b/official/c30765615.lua @@ -1,5 +1,5 @@ --百檎龍－リンゴヴルム ---Ringowurm the Hundred Apple Dragon +--Ringowurm, the Dragon Guarding the Hundred Apples --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) @@ -30,7 +30,7 @@ function s.initial_effect(c) end s.listed_names={id+1} function s.counterfilter(c) - return not (c:IsType(TYPE_SYNCHRO) and c:IsSummonType(SUMMON_TYPE_SYNCHRO)) + return not (c:IsType(TYPE_SYNCHRO) and c:IsSynchroSummoned()) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsNonEffectMonster),tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) diff --git a/official/c3084730.lua b/official/c3084730.lua index 61c2ffc6c2..7a6af7f091 100644 --- a/official/c3084730.lua +++ b/official/c3084730.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_EQUIP) e2:SetCode(EFFECT_UPDATE_ATTACK) - e2:SetCondition(function() return Duel.IsBattlePhase() or Duel.GetCurrentPhase()==PHASE_MAIN2 end) + e2:SetCondition(function() return Duel.IsBattlePhase() or Duel.IsPhase(PHASE_MAIN2) end) e2:SetValue(1500) c:RegisterEffect(e2) local e3=e2:Clone() diff --git a/official/c30907810.lua b/official/c30907810.lua index 1c22dff24f..7ea49fa9fd 100644 --- a/official/c30907810.lua +++ b/official/c30907810.lua @@ -3,7 +3,7 @@ --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) - -- Can be tribute Summoned using 1 "Magical Musket" monster + --Can be tribute Summoned using 1 "Magical Musket" monster local e1=aux.AddNormalSummonProcedure(c,true,true,1,1,SUMMON_TYPE_TRIBUTE,aux.Stringid(id,0),s.otfilter) --"Magical Musket" Spell/Traps can be activated from the hand local e2=Effect.CreateEffect(c) diff --git a/official/c30983281.lua b/official/c30983281.lua index a2a80ac6f9..35f2581259 100644 --- a/official/c30983281.lua +++ b/official/c30983281.lua @@ -1,5 +1,5 @@ --- アクセルシンクロ・スターダスト・ドラゴン --- Accel Synchro Stardust Dragon +--アクセルシンクロ・スターダスト・ドラゴン +--Accel Synchro Stardust Dragon local s,id=GetID() function s.initial_effect(c) --Synchro Summon procedure @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,{id,1}) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) diff --git a/official/c30989084.lua b/official/c30989084.lua index 5b8533af30..e2ee67ec94 100644 --- a/official/c30989084.lua +++ b/official/c30989084.lua @@ -1,5 +1,5 @@ --アロマリリス－ローズマリー ---Aromalylith Rosemary +--Aromalilith Rosemary --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c31006879.lua b/official/c31006879.lua index 5d5754c914..7c96d87fb0 100644 --- a/official/c31006879.lua +++ b/official/c31006879.lua @@ -1,5 +1,5 @@ --ライディング・デュエル！アクセラレーション！ ---Ready! Set! Duel! +--On Your Mark, Get Set, DUEL! local s,id=GetID() function s.initial_effect(c) --Search 1 "Synchron" monster diff --git a/official/c31149212.lua b/official/c31149212.lua index a6f2030ade..44b1ff70d4 100644 --- a/official/c31149212.lua +++ b/official/c31149212.lua @@ -1,9 +1,9 @@ --- クシャトリラ・ライズハート --- Kshatri-La Riseheart --- Scripted by Hatter +--クシャトリラ・ライズハート +--Kashtira Riseheart +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Special Summon this card + --Special Summon this card local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - -- Banish top 3 cards of opponent's Deck + --Banish top 3 cards of opponent's Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_REMOVE+CATEGORY_LVCHANGE) @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetTarget(s.rmtg) e2:SetOperation(s.rmop) c:RegisterEffect(e2) - -- Register flag on summon + --Register flag on summon aux.GlobalCheck(s,function() local ge1=Effect.CreateEffect(c) ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) @@ -56,7 +56,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end - -- Cannot Special Summon from the Extra Deck, except Xyz Monsters + --Cannot Special Summon from the Extra Deck, except Xyz Monsters local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,2)) e1:SetType(EFFECT_TYPE_FIELD) @@ -66,7 +66,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetTarget(function(_,c) return not c:IsType(TYPE_XYZ) and c:IsLocation(LOCATION_EXTRA) end) e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) - -- Clock Lizard check + --Clock Lizard check aux.addTempLizardCheck(c,tp,function(_,c) return not c:IsOriginalType(TYPE_XYZ) end) end function s.rmcostfilter(c) @@ -93,7 +93,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) Duel.DisableShuffleCheck() if Duel.Remove(g,POS_FACEDOWN,REASON_EFFECT)>0 and Duel.GetOperatedGroup():IsExists(s.rmfilter,1,nil) then local c=e:GetHandler() - -- Level becomes 7 + --Level becomes 7 local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) diff --git a/official/c3121655.lua b/official/c3121655.lua index 000d72df85..bfecf0852f 100644 --- a/official/c3121655.lua +++ b/official/c3121655.lua @@ -45,7 +45,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(800) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) at:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c31241087.lua b/official/c31241087.lua index 92e71bf6e3..91922a719a 100644 --- a/official/c31241087.lua +++ b/official/c31241087.lua @@ -1,17 +1,17 @@ --- 超越竜メテオロス --- Transcendrake Meteoros --- Scripted by Satella +--超越竜メテオロス +--Transcendosaurus Meteorus +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) c:EnableUnsummonable() - -- Must be Special Summoned by a card effect + --Must be Special Summoned by a card effect local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) e1:SetCode(EFFECT_SPSUMMON_CONDITION) e1:SetValue(function(_,se) return se:IsHasType(EFFECT_TYPE_ACTIONS) end) c:RegisterEffect(e1) - -- Special Summon this card from your hand + --Special Summon this card from your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY) @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) c:RegisterEffect(e2) - -- Send 1 Dinosaur monster from Deck to the GY + --Send 1 Dinosaur monster from Deck to the GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_TOGRAVE) @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetTarget(s.tgtg) e3:SetOperation(s.tgop) c:RegisterEffect(e3) - -- Shuffle 1 Normal Monster from your GY into the Deck and Special Summon this card + --Shuffle 1 Normal Monster from your GY into the Deck and Special Summon this card local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,2)) e4:SetCategory(CATEGORY_TODECK+CATEGORY_SPECIAL_SUMMON) diff --git a/official/c31313405.lua b/official/c31313405.lua index 3c60d43f06..032aa5d519 100644 --- a/official/c31313405.lua +++ b/official/c31313405.lua @@ -48,7 +48,7 @@ function s.matfilter(c,scard,sumtype,tp) end function s.descon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsReincarnationSummoned() and c:IsSummonType(SUMMON_TYPE_LINK) + return c:IsReincarnationSummoned() and c:IsLinkSummoned() end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) local g=Duel.GetMatchingGroup(nil,tp,0,LOCATION_ONFIELD,nil) diff --git a/official/c3149401.lua b/official/c3149401.lua index 3637f8c385..1d1d53606f 100644 --- a/official/c3149401.lua +++ b/official/c3149401.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) e1:SetRange(LOCATION_MZONE) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetValue(aux.indoval) c:RegisterEffect(e1) --Your opponent cannot target this Fusion Summoned card with card effects @@ -23,7 +23,7 @@ function s.initial_effect(c) --While you have 25 or more cards in your GY, this Fusion Summoned card gains 4500 ATK/DEF local e3=e1:Clone() e3:SetCode(EFFECT_UPDATE_ATTACK) - e3:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_GRAVE,0)>=25 end) + e3:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() and Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_GRAVE,0)>=25 end) e3:SetValue(4500) c:RegisterEffect(e3) local e4=e3:Clone() diff --git a/official/c31987203.lua b/official/c31987203.lua index 648c46d3e9..820cea2191 100644 --- a/official/c31987203.lua +++ b/official/c31987203.lua @@ -27,9 +27,9 @@ function s.initial_effect(c) c:RegisterEffect(e2) local e3=e2:Clone() e3:SetCode(EVENT_SPSUMMON_SUCCESS) - e3:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM) end) + e3:SetCondition(function(e) return e:GetHandler():IsPendulumSummoned() end) c:RegisterEffect(e3) - -- Place itself in Pendulum Zone if it is tributed + --Place itself in Pendulum Zone if it is tributed local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,2)) e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) diff --git a/official/c32036866.lua b/official/c32036866.lua index bf2f489b35..de24fe8df2 100644 --- a/official/c32036866.lua +++ b/official/c32036866.lua @@ -47,7 +47,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(3) tc:RegisterEffect(e1) end diff --git a/official/c32056070.lua b/official/c32056070.lua index 701ab4b7e5..116fcea13e 100644 --- a/official/c32056070.lua +++ b/official/c32056070.lua @@ -99,7 +99,7 @@ end function s.operation(c,tp,att) s.attr_list[tp]=s.attr_list[tp]|att for _,str in aux.GetAttributeStrings(att) do - c:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,str) + c:RegisterFlagEffect(0,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,str) end end function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk) @@ -115,7 +115,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(math.ceil(atk/2)) tc:RegisterEffect(e1) end @@ -135,21 +135,21 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) if tc:IsType(TYPE_TRAPMONSTER) then local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetCode(EFFECT_DISABLE_TRAPMONSTER) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) end end diff --git a/official/c32138660.lua b/official/c32138660.lua index 98f28431f5..c656a5ca97 100644 --- a/official/c32138660.lua +++ b/official/c32138660.lua @@ -1,5 +1,5 @@ --- レプティレス・メルジーヌ --- Reptilianne Melusine +--レプティレス・メルジーヌ +--Reptilianne Melusine local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -56,7 +56,7 @@ function s.matcheck(e,c) end function s.indcon(e) local c=e:GetHandler() - return c:IsSummonType(SUMMON_TYPE_SYNCHRO) and c:HasFlagEffect(id) + return c:IsSynchroSummoned() and c:HasFlagEffect(id) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) return rp==1-tp and re:IsMonsterEffect() @@ -85,7 +85,7 @@ end function s.thcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() return rp==1-tp and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) - and c:IsSummonType(SUMMON_TYPE_SYNCHRO) + and c:IsSynchroSummoned() end function s.thfilter(c) return c:IsRace(RACE_REPTILE) and c:IsAbleToHand() diff --git a/official/c32164201.lua b/official/c32164201.lua index c73f84dba5..46b7790fb0 100644 --- a/official/c32164201.lua +++ b/official/c32164201.lua @@ -95,7 +95,7 @@ end function s.negop(e,tp,eg,ep,ev,re,r,rp) local rc=re:GetHandler() if Duel.SelectYesNo(tp,aux.Stringid(id,2)) then - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) Duel.Hint(HINT_CARD,0,id) Duel.NegateEffect(ev) end diff --git a/official/c32278723.lua b/official/c32278723.lua index 0cff81030f..f9159b229e 100644 --- a/official/c32278723.lua +++ b/official/c32278723.lua @@ -1,5 +1,5 @@ --アクア・ジェット・サーフェス ---Surface Aqua Jet +--Aqua Jet Surface --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c32480825.lua b/official/c32480825.lua index 41f187d149..87e694e99f 100644 --- a/official/c32480825.lua +++ b/official/c32480825.lua @@ -1,5 +1,5 @@ --- ＴＧ マイティ・ストライカー --- T.G. Mighty Striker +--ＴＧ マイティ・ストライカー +--T.G. Mighty Striker local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e2:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) diff --git a/official/c3248469.lua b/official/c3248469.lua index a79425459c..8700747d5c 100644 --- a/official/c3248469.lua +++ b/official/c3248469.lua @@ -39,7 +39,7 @@ function s.excvtop(e,tp,eg,ep,ev,re,r,rp) local tc=g:FilterSelect(tp,s.setfilter,1,1,nil):GetFirst() if tc and Duel.SSet(tp,tc) then local fid=tc:GetFieldID() - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,2,fid) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,2,fid) --Send it to the GY during the next End Phase local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c32549749.lua b/official/c32549749.lua index 64083584e0..e18f7ee1fc 100644 --- a/official/c32549749.lua +++ b/official/c32549749.lua @@ -3,7 +3,7 @@ --scripted by Naim local s,id=GetID() function s.initial_effect(c) - -- Make a monster gain 800 ATK or Set or Equip a card from the GY + --Make a monster gain 800 ATK or Set or Equip a card from the GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_ACTIVATE) @@ -50,7 +50,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if e:GetLabel()==1 then local tc=Duel.GetFirstTarget() if tc:IsFaceup() and tc:IsRelateToEffect(e) then - tc:UpdateAttack(800,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,e:GetHandler()) + tc:UpdateAttack(800,RESETS_STANDARD_PHASE_END,e:GetHandler()) end else if Duel.GetLocationCount(tp,LOCATION_SZONE)==0 then return end diff --git a/official/c3259760.lua b/official/c3259760.lua index 5a4226a894..0ad4f50d86 100644 --- a/official/c3259760.lua +++ b/official/c3259760.lua @@ -28,7 +28,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) local e2=e1:Clone() @@ -40,10 +40,10 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetProperty(EFFECT_FLAG_CLIENT_HINT) e3:SetCode(EFFECT_CANNOT_BE_MATERIAL) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) e3:SetValue(aux.cannotmatfilter(SUMMON_TYPE_FUSION,SUMMON_TYPE_SYNCHRO,SUMMON_TYPE_XYZ,SUMMON_TYPE_LINK)) tc:RegisterEffect(e3) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.CanBeTributeOrMaterial(c) diff --git a/official/c32731036.lua b/official/c32731036.lua index aaa3adab8b..334d44b59e 100644 --- a/official/c32731036.lua +++ b/official/c32731036.lua @@ -1,5 +1,5 @@ --深淵の獣ルベリオン ---The Byssted Lubellion +--The Bystial Lubellion --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c32756828.lua b/official/c32756828.lua index c7df9b33f0..9b8cf3fa5b 100644 --- a/official/c32756828.lua +++ b/official/c32756828.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e3:SetRange(LOCATION_SZONE) e3:SetHintTiming(TIMING_END_PHASE) e3:SetCountLimit(1,id) - e3:SetCondition(function() return Duel.GetCurrentPhase()==PHASE_END end) + e3:SetCondition(function() return Duel.IsPhase(PHASE_END) end) e3:SetTarget(s.tftg) e3:SetOperation(s.tfop) c:RegisterEffect(e3) diff --git a/official/c32825095.lua b/official/c32825095.lua index 109779d786..3e2228d63e 100644 --- a/official/c32825095.lua +++ b/official/c32825095.lua @@ -27,7 +27,7 @@ function s.sumsuc(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.tnop(e,tp,eg,ep,ev,re,r,rp) @@ -39,7 +39,7 @@ function s.tnop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c32909498.lua b/official/c32909498.lua index f1dc5af7b3..3ab3dff0d9 100644 --- a/official/c32909498.lua +++ b/official/c32909498.lua @@ -1,9 +1,9 @@ --- クシャトリラ・フェンリル --- Kashtira Fenrir --- Scripted by Hatter +--クシャトリラ・フェンリル +--Kashtira Fenrir +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Special Summon this card + --Special Summon this card local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_UNCOPYABLE) @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_HAND) e1:SetCondition(s.spcon) c:RegisterEffect(e1) - -- Search 1 "Kashtira" monster + --Search 1 "Kashtira" monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -21,7 +21,7 @@ function s.initial_effect(c) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) - -- Banish 1 face card the opponent controls, face-down + --Banish 1 face card the opponent controls, face-down local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_REMOVE) diff --git a/official/c32991027.lua b/official/c32991027.lua index 967ca89bf3..41f34bd682 100644 --- a/official/c32991027.lua +++ b/official/c32991027.lua @@ -1,5 +1,5 @@ --氷結界の剣士 ゲオルギアス ---Georgius, Swordsman of the Ice Barrier +--Georgius, Swordman of the Ice Barrier --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c32991300.lua b/official/c32991300.lua index 913ea16eeb..b05c90b879 100644 --- a/official/c32991300.lua +++ b/official/c32991300.lua @@ -1,5 +1,5 @@ --刻まれし魔の神聖棺 ---Fiendsmith's Agnusdei +--Fiendsmith's Agnumday --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c33113958.lua b/official/c33113958.lua index a83e7b2c62..82a5501a9e 100644 --- a/official/c33113958.lua +++ b/official/c33113958.lua @@ -1,5 +1,5 @@ --リヴァーチュ・ドラゴン ---Levirtue Dragon +--LeVirtue Dragon --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c33202303.lua b/official/c33202303.lua index b6df448497..8d5139a978 100644 --- a/official/c33202303.lua +++ b/official/c33202303.lua @@ -75,7 +75,7 @@ function s.daop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c33325951.lua b/official/c33325951.lua index 0105bfb29a..d430b67cc9 100644 --- a/official/c33325951.lua +++ b/official/c33325951.lua @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL) end) + e2:SetCondition(function(e) return e:GetHandler():IsRitualSummoned() end) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) diff --git a/official/c33499794.lua b/official/c33499794.lua index 617f6c24d8..f847546478 100644 --- a/official/c33499794.lua +++ b/official/c33499794.lua @@ -1,5 +1,5 @@ --ネムレリア・レペッテ ---Nemleria Repette +--Nemleria Repeter --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c33750856.lua b/official/c33750856.lua index 3e8886229f..44cbc7cf24 100644 --- a/official/c33750856.lua +++ b/official/c33750856.lua @@ -62,7 +62,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) oc:RegisterEffect(e1) end --Cannot be destroyed by that battle diff --git a/official/c33907039.lua b/official/c33907039.lua index 8c5bf61084..de89ef51f0 100644 --- a/official/c33907039.lua +++ b/official/c33907039.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return Duel.GetCurrentPhase()==PHASE_MAIN1 and not Duel.CheckPhaseActivity() + return Duel.IsPhase(PHASE_MAIN1) and not Duel.CheckPhaseActivity() end function s.thfilter(c) return c:IsMonster() and c:IsAttack(0) and c:IsAbleToHand() diff --git a/official/c34001672.lua b/official/c34001672.lua index 2ee055350e..2ce024b5b6 100644 --- a/official/c34001672.lua +++ b/official/c34001672.lua @@ -1,5 +1,5 @@ --百鬼羅刹 巨魁ガボンガ ---Goblin Rider Big-Head Gabonga +--Goblin Biker Big Gabonga --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) end) + e1:SetCondition(function(e) return e:GetHandler():IsXyzSummoned() end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) diff --git a/official/c34034150.lua b/official/c34034150.lua index 32ac108e28..c1c490626e 100644 --- a/official/c34034150.lua +++ b/official/c34034150.lua @@ -1,5 +1,5 @@ --分裂するマザー・スパイダー ---Fissioning Mother Spider +--Mother Spider Splitter --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c34047456.lua b/official/c34047456.lua index fb9ac5e652..d486bca537 100644 --- a/official/c34047456.lua +++ b/official/c34047456.lua @@ -1,5 +1,5 @@ --ギガンティック・サンダークロス ---Gigantic Thunder Cross +--Gigantic Thundercross --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c34225426.lua b/official/c34225426.lua index 241a6a902f..743be8c948 100644 --- a/official/c34225426.lua +++ b/official/c34225426.lua @@ -1,5 +1,5 @@ --嫋々たる漣歌姫の壱世壊 ---Tearlaments Perlregia +--Tearlaments Perlegia --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c34235530.lua b/official/c34235530.lua index 7f61022c3d..134868a53d 100644 --- a/official/c34235530.lua +++ b/official/c34235530.lua @@ -1,5 +1,5 @@ --真魔六武衆－シエン ---Legendary Klesha Six Samurai - Shi En +--Legendary Lord Six Samurai - Shi En local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) diff --git a/official/c34323367.lua b/official/c34323367.lua index 6a48183d8c..ea169ef373 100644 --- a/official/c34323367.lua +++ b/official/c34323367.lua @@ -36,7 +36,7 @@ function s.initial_effect(c) e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetCode(EVENT_SPSUMMON_SUCCESS) e3:SetCountLimit(1,{id,2}) - e3:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_PENDULUM) end) + e3:SetCondition(function(e) return e:GetHandler():IsPendulumSummoned() end) e3:SetTarget(s.thtg) e3:SetOperation(s.thop) c:RegisterEffect(e3) diff --git a/official/c34446231.lua b/official/c34446231.lua index 2c52cc8b92..ff2923470b 100644 --- a/official/c34446231.lua +++ b/official/c34446231.lua @@ -84,7 +84,7 @@ function s.rmvop(e,tp,eg,ep,ev,re,r,rp) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return rp==1-tp and c:IsSummonType(SUMMON_TYPE_LINK) + return rp==1-tp and c:IsLinkSummoned() and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) end function s.spfilter(c,e,tp) diff --git a/official/c34447918.lua b/official/c34447918.lua index 93e32f72c7..518ab086a5 100644 --- a/official/c34447918.lua +++ b/official/c34447918.lua @@ -1,5 +1,5 @@ --六世壊他化自在天 ---Kshatri-La Papiyas +--Kashtiratheosis --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c34456146.lua b/official/c34456146.lua index 906dc9a366..e7a9704875 100644 --- a/official/c34456146.lua +++ b/official/c34456146.lua @@ -1,5 +1,5 @@ --慈愛の賢者－シエラ ---Love Magus - Ciela +--Sage of Benevolence - Ciela --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c34481518.lua b/official/c34481518.lua index e7701aef49..7d18f54f04 100644 --- a/official/c34481518.lua +++ b/official/c34481518.lua @@ -1,12 +1,12 @@ --- 魔頭砲グレンザウルス --- Grenosaurus Giga-Cannon --- Scripted by Satella +--魔頭砲グレンザウルス +--Grenosaurus Giga-Cannon +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- Xyz Summon procedure + --Xyz Summon procedure Xyz.AddProcedure(c,nil,4,2) - -- Inflict 1000 damage to your opp + --Inflict 1000 damage to your opp local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DAMAGE+CATEGORY_ATKCHANGE) @@ -18,7 +18,7 @@ function s.initial_effect(c) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) c:RegisterEffect(e1,false,REGISTER_FLAG_DETACH_XMAT) - -- Destroy 1 card on the field + --Destroy 1 card on the field local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE) @@ -67,7 +67,7 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) end function s.descon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_XYZ) + return c:IsPreviousLocation(LOCATION_MZONE) and c:IsXyzSummoned() end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsOnField() end diff --git a/official/c34541543.lua b/official/c34541543.lua index 33d26984db..ca121fd07d 100644 --- a/official/c34541543.lua +++ b/official/c34541543.lua @@ -1,5 +1,5 @@ --大陰陽師 タオ ---Tao the Great Chanter +--Master Tao the Chanter --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c34568783.lua b/official/c34568783.lua index e48bef1c85..314437f6c5 100644 --- a/official/c34568783.lua +++ b/official/c34568783.lua @@ -57,7 +57,7 @@ function s.attrop(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e2:SetCode(30765615) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e2) end function s.thcfilter(c) diff --git a/official/c34976176.lua b/official/c34976176.lua index 78b94d3c9f..6aaaa90959 100644 --- a/official/c34976176.lua +++ b/official/c34976176.lua @@ -1,9 +1,9 @@ --- ＢＦ－雪撃のチヌーク --- Blackwing - Chinook the Snowstrike --- Scripted by Hatter +--ＢＦ－雪撃のチヌーク +--Blackwing - Chinook the Snow Blast +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Send 1 "Blackwing" Synchro Monster or "Black-Winged Dragon" to the GY + --Send 1 "Blackwing" Synchro Monster or "Black-Winged Dragon" to the GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_ATKCHANGE+CATEGORY_DISABLE) @@ -49,18 +49,18 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) if #g<1 or Duel.SendtoGrave(g,REASON_EFFECT)<1 or not g:GetFirst():IsLocation(LOCATION_GRAVE) then return end local tc=Duel.GetFirstTarget() if tc:IsFaceup() and tc:IsRelateToEffect(e) then - -- Negate effects + --Negate effects Duel.NegateRelatedChain(tc,RESET_TURN_SET) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) tc:RegisterEffect(e2) - -- Reduce ATK + --Reduce ATK local e3=e1:Clone() e3:SetCode(EFFECT_UPDATE_ATTACK) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) diff --git a/official/c34995106.lua b/official/c34995106.lua index db43cd9c53..c34a78b8c2 100644 --- a/official/c34995106.lua +++ b/official/c34995106.lua @@ -57,7 +57,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1,{id,1}) e1:SetTarget(s.settg) e1:SetOperation(s.setop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end diff --git a/official/c35026117.lua b/official/c35026117.lua index 35644c8892..c8d1fc0db0 100644 --- a/official/c35026117.lua +++ b/official/c35026117.lua @@ -39,7 +39,7 @@ function s.disatt(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.plfilter(c) diff --git a/official/c35057188.lua b/official/c35057188.lua index 5c823585f0..4b6600ea41 100644 --- a/official/c35057188.lua +++ b/official/c35057188.lua @@ -1,5 +1,5 @@ --Ｂ・Ｆ－革命のグラン・パルチザン ---Battlewasp - Gran Partisan the Revolution +--Battlewasp - Grand Partisan the Revolution local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/official/c3507053.lua b/official/c3507053.lua index feb1f8d9aa..ee29a25401 100644 --- a/official/c3507053.lua +++ b/official/c3507053.lua @@ -71,7 +71,7 @@ function s.mvop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_EXTRA_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) end diff --git a/official/c35103106.lua b/official/c35103106.lua index 2f946313be..5dd13fdedf 100644 --- a/official/c35103106.lua +++ b/official/c35103106.lua @@ -1,5 +1,5 @@ --エヴォルカイザー・ラーズ ---Evolzar Razh +--Evolzar Lars --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -53,7 +53,7 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c35263180.lua b/official/c35263180.lua index 731945ea4f..d35981b7ce 100644 --- a/official/c35263180.lua +++ b/official/c35263180.lua @@ -1,5 +1,5 @@ --オオヤツ・ツマムヒメ ---Ooyatsu Tsumamuhime +--Seed-Spitting Saplings --Ashaki local s,id=GetID() function s.initial_effect(c) diff --git a/official/c35371948.lua b/official/c35371948.lua index d27d1e7682..56d71364a4 100644 --- a/official/c35371948.lua +++ b/official/c35371948.lua @@ -57,13 +57,13 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) c:ResetFlagEffect(id) tc:ResetFlagEffect(id) local fid=c:GetFieldID() - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1,fid) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1,fid) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1,fid) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1,fid) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_OWNER_RELATE) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetLabelObject(tc) e1:SetCondition(s.rcon) e1:SetValue(1) diff --git a/official/c35380371.lua b/official/c35380371.lua index 50ef400e12..9c61d67249 100644 --- a/official/c35380371.lua +++ b/official/c35380371.lua @@ -1,5 +1,5 @@ --氷結界に至る晶域 ---Frozen Domain Leading to the Ice Barrier +--Frozen Domain of the Ice Barrier --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c35569555.lua b/official/c35569555.lua index 8c0e9dcc72..e7d028c0ef 100644 --- a/official/c35569555.lua +++ b/official/c35569555.lua @@ -1,5 +1,5 @@ --凶導の聖告 ---Dogmatikatrix +--Dogmatikamatrix --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c35756798.lua b/official/c35756798.lua index 9a65202c9f..fe77a3f264 100644 --- a/official/c35756798.lua +++ b/official/c35756798.lua @@ -56,7 +56,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_EXTRA_ATTACK) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) if not s.archetypetest(tc) then return end if Duel.IsExistingMatchingCard(s.atkfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then diff --git a/official/c35834119.lua b/official/c35834119.lua index 718463900c..09bad28627 100644 --- a/official/c35834119.lua +++ b/official/c35834119.lua @@ -1,5 +1,5 @@ --灯魚 ---Fishlamp +--Fish Lamp --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c36368606.lua b/official/c36368606.lua index 693e807fc1..f465c37d00 100644 --- a/official/c36368606.lua +++ b/official/c36368606.lua @@ -39,7 +39,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if #g>0 and Duel.Destroy(g,REASON_EFFECT)>0 then local og=Duel.GetOperatedGroup() for tc in og:Iter() do - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end --Special Summon destroyed Cyberse Link Monsters during the End Phase local e1=Effect.CreateEffect(e:GetHandler()) @@ -97,7 +97,7 @@ function s.immop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetValue(function(e,re) return e:GetHandler()~=re:GetOwner() end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c36400569.lua b/official/c36400569.lua index 221c08c9c7..153f9bce7d 100644 --- a/official/c36400569.lua +++ b/official/c36400569.lua @@ -1,5 +1,5 @@ --傀儡遊儀－サービスト・パペット ---Servist Puppet +--Service Puppet Play --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c36429703.lua b/official/c36429703.lua index 5a1be4010a..7965b83d57 100644 --- a/official/c36429703.lua +++ b/official/c36429703.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) diff --git a/official/c36629635.lua b/official/c36629635.lua index 851a571e88..bed574566f 100644 --- a/official/c36629635.lua +++ b/official/c36629635.lua @@ -1,9 +1,9 @@ --- ダンディ・ホワイトライオン --- Dandy White Lion --- Scripted by Satella +--ダンディ・ホワイトライオン +--Dandy Whitelion +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) - -- Special Summon 3 "White Fluff Token" + --Special Summon 3 "White Fluff Token" local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -21,7 +21,7 @@ end s.listed_names={36629636} function s.tkcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetCustomActivityCount(id,tp,ACTIVITY_SPSUMMON)==0 end - -- Cannot Special Summon monsters from the Extra Deck + --Cannot Special Summon monsters from the Extra Deck local e1=Effect.CreateEffect(e:GetHandler()) e1:SetDescription(aux.Stringid(id,1)) e1:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c36848764.lua b/official/c36848764.lua index 7584769364..03e8ade416 100644 --- a/official/c36848764.lua +++ b/official/c36848764.lua @@ -1,9 +1,9 @@ --- スウィートルームメイド --- Sweet Room-Maid --- Scripted by Hatter +--スウィートルームメイド +--Sweet Roommaid +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Shuffle 1 card from either GY into the Deck + --Shuffle 1 card from either GY into the Deck local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TODECK) diff --git a/official/c36890111.lua b/official/c36890111.lua index abc3afba49..65ff00d68a 100644 --- a/official/c36890111.lua +++ b/official/c36890111.lua @@ -1,5 +1,5 @@ --地獄人形の館 ---Mansion of the Underworld Dolls +--Mansion of the Dreadful Dolls --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c36898537.lua b/official/c36898537.lua index d60ade309d..cea2bfa7a1 100644 --- a/official/c36898537.lua +++ b/official/c36898537.lua @@ -59,7 +59,7 @@ function s.valcheck(e,c) e:SetLabel(tpe) end function s.immcon(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) + return e:GetHandler():IsSynchroSummoned() and (e:GetLabelObject():GetLabel()&TYPE_NORMAL)~=0 end function s.immop(e,tp,eg,ep,ev,re,r,rp) @@ -73,7 +73,7 @@ function s.immop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetValue(s.efilter) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end @@ -81,7 +81,7 @@ function s.efilter(e,te) return te:GetOwner()~=e:GetOwner() end function s.negcon(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) + return e:GetHandler():IsSynchroSummoned() and (e:GetLabelObject():GetLabel()&TYPE_EFFECT)~=0 end function s.negtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) @@ -109,7 +109,7 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) end end function s.ctcon(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) + return e:GetHandler():IsSynchroSummoned() and (e:GetLabelObject():GetLabel()&TYPE_PENDULUM)~=0 end function s.cttg(e,tp,eg,ep,ev,re,r,rp,chk) @@ -128,7 +128,7 @@ function s.ctop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1,true) end end \ No newline at end of file diff --git a/official/c36920182.lua b/official/c36920182.lua index fcbf919b2a..5df61bed5f 100644 --- a/official/c36920182.lua +++ b/official/c36920182.lua @@ -1,5 +1,5 @@ --世壊同心 ---The Worlds as One +--Realm Resonance --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c3693034.lua b/official/c3693034.lua index 8ae9c4e782..2e5421eae8 100644 --- a/official/c3693034.lua +++ b/official/c3693034.lua @@ -56,12 +56,12 @@ 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_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc2: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_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc2:RegisterEffect(e2) end end diff --git a/official/c37261776.lua b/official/c37261776.lua index afd3e80af1..804af8594c 100644 --- a/official/c37261776.lua +++ b/official/c37261776.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) and e:GetLabel()>0 end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() and e:GetLabel()>0 end) e1:SetTarget(s.sumtg) e1:SetOperation(s.sumop) c:RegisterEffect(e1) @@ -99,5 +99,5 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) end function s.zeroatkcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsReincarnationSummoned() and c:IsSummonType(SUMMON_TYPE_FUSION) and Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL + return c:IsReincarnationSummoned() and c:IsFusionSummoned() and Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL end diff --git a/official/c37313338.lua b/official/c37313338.lua index 3aaee3db0a..83b42f2804 100644 --- a/official/c37313338.lua +++ b/official/c37313338.lua @@ -91,7 +91,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetLabelObject(sg) e1:SetCondition(s.thcon) e1:SetOperation(s.thop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESETS_STANDARD_PHASE_END,2) Duel.RegisterEffect(e1,tp) end function s.thcfilter(c,fid) diff --git a/official/c37351133.lua b/official/c37351133.lua index f35112b6f2..272445d97f 100644 --- a/official/c37351133.lua +++ b/official/c37351133.lua @@ -75,14 +75,14 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end \ No newline at end of file diff --git a/official/c37442336.lua b/official/c37442336.lua index f7a9104d95..7c46b54dd5 100644 --- a/official/c37442336.lua +++ b/official/c37442336.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e3:SetCode(EVENT_FREE_CHAIN) e3:SetRange(LOCATION_MZONE) e3:SetHintTiming(0,TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) - e3:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e3:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e3:SetCost(aux.bfgcost) e3:SetTarget(s.sptg) e3:SetOperation(s.spop) @@ -46,7 +46,7 @@ function s.negtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsOnField() and chkc:IsNegatable() end if chk==0 then return Duel.IsExistingTarget(Card.IsNegatable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end local c=e:GetHandler() - local ct=c:IsSummonType(SUMMON_TYPE_SYNCHRO) and c:GetMaterialCount() or 0 + local ct=c:IsSynchroSummoned() and c:GetMaterialCount() or 0 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_NEGATE) local g=Duel.SelectTarget(tp,Card.IsNegatable,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,ct+1,nil) Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,1,0,0) diff --git a/official/c37552929.lua b/official/c37552929.lua index 679c78a3b8..0ba5af0627 100644 --- a/official/c37552929.lua +++ b/official/c37552929.lua @@ -1,5 +1,5 @@ --ミレニアムーン・メイデン ---Millenniumoon Maiden +--Maiden of the Millennium Moon --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c37613663.lua b/official/c37613663.lua index bc06594311..9d26183f29 100644 --- a/official/c37613663.lua +++ b/official/c37613663.lua @@ -1,5 +1,5 @@ --千年の十字 ---Millennium Cross +--Millennium Ankh --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c37617348.lua b/official/c37617348.lua index 8920f6d781..171635913d 100644 --- a/official/c37617348.lua +++ b/official/c37617348.lua @@ -56,7 +56,7 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp) if not (re and re:GetHandler():IsSetCard(SET_RESCUE_ACE)) then return end local sg=eg:Filter(Card.IsType,nil,TYPE_QUICKPLAY|TYPE_TRAP) for ec in sg:Iter() do - ec:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + ec:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.cfilter(c) diff --git a/official/c37683441.lua b/official/c37683441.lua index 60bce3b3ac..0119e5760c 100644 --- a/official/c37683441.lua +++ b/official/c37683441.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) diff --git a/official/c38229962.lua b/official/c38229962.lua index 32bfcf856a..37ce9a2c8e 100644 --- a/official/c38229962.lua +++ b/official/c38229962.lua @@ -43,7 +43,7 @@ end s.listed_series={SET_BEETROOPER} function s.protcon(e) local c=e:GetHandler() - return c:IsSummonType(SUMMON_TYPE_LINK) and c:IsAttackBelow(3000) + return c:IsLinkSummoned() and c:IsAttackBelow(3000) end function s.spfilter(c,e,tp) return c:IsSetCard(SET_BEETROOPER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c38264974.lua b/official/c38264974.lua index 358d95964f..d7cb93058f 100644 --- a/official/c38264974.lua +++ b/official/c38264974.lua @@ -1,5 +1,5 @@ --幻想魔獣キマイラ ---Chimera the Illusion Magical Beast +--Chimera the Illusion Beast --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c38356857.lua b/official/c38356857.lua index 2d4b6bd353..8a8bbc64b8 100644 --- a/official/c38356857.lua +++ b/official/c38356857.lua @@ -1,11 +1,11 @@ --- グリム・リチュア --- Grim Gishki --- Scripted by Hatter +--グリム・リチュア +--Gishki Grimness +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Treat as entire tribute requirement + --Treat as entire tribute requirement Ritual.AddWholeLevelTribute(c,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER)) - -- Special Summon 1 "Gishki" monster + --Special Summon 1 "Gishki" monster local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -32,7 +32,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) end function s.spop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - -- Cannot declare attacks, except with Ritual Monsters + --Cannot declare attacks, except with Ritual Monsters local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) @@ -42,7 +42,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) aux.RegisterClientHint(c,nil,tp,1,0,aux.Stringid(id,1),nil) - -- Special Summon 1 "Gishki" monster from the deck + --Special Summon 1 "Gishki" monster from the deck if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp) diff --git a/official/c38511382.lua b/official/c38511382.lua index ab5127215a..cad56978bb 100644 --- a/official/c38511382.lua +++ b/official/c38511382.lua @@ -1,9 +1,9 @@ --- 裏切りの罪宝－シルウィア --- Sinful Spoils of Betrayal - Silvera --- Scripted by Satellaa +--裏切りの罪宝－シルウィア +--Sinful Spoils of Betrayal - Silvera +--Scripted by Satellaa local s,id=GetID() function s.initial_effect(c) - -- Negate the effects of 1 face-up card on the field + --Negate the effects of 1 face-up card on the field local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DISABLE) @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetTarget(s.distg) e1:SetOperation(s.disop) c:RegisterEffect(e1) - -- Negate the opponent's effect + --Negate the opponent's effect local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DISABLE) diff --git a/official/c38601126.lua b/official/c38601126.lua index 927a0278dc..a9981f13ae 100644 --- a/official/c38601126.lua +++ b/official/c38601126.lua @@ -82,7 +82,7 @@ function s.daop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c38745241.lua b/official/c38745241.lua index c819f22f38..f9a0802324 100644 --- a/official/c38745241.lua +++ b/official/c38745241.lua @@ -1,5 +1,5 @@ --ミニャーマドルチェ・ニャカロン ---Madolche Mewgnard Meowcaron +--Madolche Mini Meowcaroons --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) diff --git a/official/c38775407.lua b/official/c38775407.lua index 53d0823afa..a164d3c05a 100644 --- a/official/c38775407.lua +++ b/official/c38775407.lua @@ -1,5 +1,5 @@ --千年の眠りから覚めし原人 ---The Caveman that Awoke after a Millennium +--Sengenjin Wakes from a Millennium --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c38811586.lua b/official/c38811586.lua index 12d40f44b5..9e7eb49afc 100644 --- a/official/c38811586.lua +++ b/official/c38811586.lua @@ -1,5 +1,5 @@ --真炎竜アルビオン ---Albion the Incandescent Dragon +--Albion the Sanctifire Dragon --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c38910263.lua b/official/c38910263.lua index af405420a5..fa94081f91 100644 --- a/official/c38910263.lua +++ b/official/c38910263.lua @@ -1,5 +1,5 @@ --炎王獣ハヌマーン ---Fire King Avatar Hanuman +--Fire King Avatar Rangbali --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c39103226.lua b/official/c39103226.lua index e2acb9c4d8..3fc81086b3 100644 --- a/official/c39103226.lua +++ b/official/c39103226.lua @@ -1,9 +1,9 @@ --- 台貫計量 --- Weighbridge --- Scripted by Hatter +--台貫計量 +--Weighbridge +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Make opponent send monsters to the GY + --Make opponent send monsters to the GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOGRAVE) diff --git a/official/c39522887.lua b/official/c39522887.lua index b94a0c9e8b..1714876324 100644 --- a/official/c39522887.lua +++ b/official/c39522887.lua @@ -1,5 +1,5 @@ --ゴーティスの陰影スノーピオス ---Snopios, Shadow of the Ghoti +--Snopios, Shade of the Ghoti --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -70,7 +70,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) then - -- Banish it if it leaves the field + --Banish it if it leaves the field local e1=Effect.CreateEffect(e:GetHandler()) e1:SetDescription(3300) e1:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c39552584.lua b/official/c39552584.lua index 3ed956ee05..4ba23ffdf3 100644 --- a/official/c39552584.lua +++ b/official/c39552584.lua @@ -49,7 +49,7 @@ function s.repop(e,tp,eg,ep,ev,re,r,rp) end function s.spcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return rp==1-tp and c:IsSummonType(SUMMON_TYPE_FUSION) and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) + return rp==1-tp and c:IsFusionSummoned() and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) end function s.spfilter(c,e,tp) return c:IsFaceup() and c:IsCode(34230233) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c39643167.lua b/official/c39643167.lua index 323f24d6ed..1b9df929dd 100644 --- a/official/c39643167.lua +++ b/official/c39643167.lua @@ -1,5 +1,5 @@ --ウサミミ導師 ---Bunny Instruct-ear +--Bunny Ear Enthusiast --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c39767432.lua b/official/c39767432.lua index c2755972c5..dc61b7ff26 100644 --- a/official/c39767432.lua +++ b/official/c39767432.lua @@ -1,5 +1,5 @@ --セベクの魔導士 ---Sebek's Sorcerer +--Sorcerer of Sebek --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c39931513.lua b/official/c39931513.lua index 9256e125b0..85785c4bad 100644 --- a/official/c39931513.lua +++ b/official/c39931513.lua @@ -1,5 +1,5 @@ --天盃龍パイドラ ---Tenpai Dragon Baidora +--Tenpai Dragon Paidra --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c39943352.lua b/official/c39943352.lua index 297ccbb280..b60ed495c2 100644 --- a/official/c39943352.lua +++ b/official/c39943352.lua @@ -1,5 +1,5 @@ --液状巨人ダイダラタント ---Daidaratant the Liquid Giant +--Daidaratant the Ooze Giant --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c39967326.lua b/official/c39967326.lua index b4ee57249b..8d57fe584b 100644 --- a/official/c39967326.lua +++ b/official/c39967326.lua @@ -32,7 +32,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_ATTACK_ANNOUNCE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(e:GetHandler()) e2:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c40155014.lua b/official/c40155014.lua index dfcfe9f835..37081a3dc6 100644 --- a/official/c40155014.lua +++ b/official/c40155014.lua @@ -1,5 +1,5 @@ --騎士魔防陣 ---Centurion Phalanx +--Centur-Ion Phalanx --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c40380686.lua b/official/c40380686.lua index d8bf968cc1..d8113b9991 100644 --- a/official/c40380686.lua +++ b/official/c40380686.lua @@ -54,7 +54,7 @@ function s.chop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_RACE) e1:SetValue(decl) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) elseif op==1 and tc:IsAttributeExcept(decl) then -- Change attribute @@ -62,7 +62,7 @@ function s.chop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_ATTRIBUTE) e1:SetValue(decl) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c40460013.lua b/official/c40460013.lua index ecdd23b837..e789d0a016 100644 --- a/official/c40460013.lua +++ b/official/c40460013.lua @@ -1,9 +1,9 @@ -- --- Zalamander Catalyzer --- Scripted by Hatter +--Zalamander Catalyzer +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Special Summon and discard + --Special Summon and discard local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_HANDES) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - -- Add this card to the hand + --Add this card to the hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_TOHAND) diff --git a/official/c40551410.lua b/official/c40551410.lua index e2d49dea4a..162cf5e54f 100644 --- a/official/c40551410.lua +++ b/official/c40551410.lua @@ -1,5 +1,5 @@ --Ｒｅｃｅｔｔｅ ｄｅ Ｐｅｒｓｏｎｎｅｌ～賄いのレシピ～ ---Recette de Personnel - Cook's Recipe +--Recette de Personnel (Staff Recipe) --scripted by Raye local s,id=GetID() function s.initial_effect(c) diff --git a/official/c4059313.lua b/official/c4059313.lua index 380268a75a..e41cce1a33 100644 --- a/official/c4059313.lua +++ b/official/c4059313.lua @@ -30,7 +30,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if not tc then return end Duel.HintSelection(tc,true) if tc:GetFlagEffect(id)==0 then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,0)) --Unaffected by opponent's card effects local e1=Effect.CreateEffect(tc) e1:SetDescription(3110) @@ -39,7 +39,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetRange(LOCATION_MZONE) e1:SetValue(s.efilter) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Tribute any number of other monsters; gain ATK equal to the combined ATK of the tributed monsters local e2=Effect.CreateEffect(tc) @@ -50,7 +50,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetCondition(s.atkcon) e2:SetCost(s.atkcost) e2:SetOperation(s.atkop) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) --After damage calculation, send all opponent's monsters to GY local e3=Effect.CreateEffect(tc) @@ -60,7 +60,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e3:SetCondition(s.sendcon) e3:SetTarget(s.sendtg) e3:SetOperation(s.sendop) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) end end diff --git a/official/c40678060.lua b/official/c40678060.lua index 2f32f14b65..54e9250764 100644 --- a/official/c40678060.lua +++ b/official/c40678060.lua @@ -1,5 +1,5 @@ --天子の指輪 ---Angel Ring +--Angelica's Angelic Ring --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c40702028.lua b/official/c40702028.lua index 806fe5ada7..5cc1eaf265 100644 --- a/official/c40702028.lua +++ b/official/c40702028.lua @@ -1,5 +1,5 @@ --ＤＰＡジャンダムーア ---DPA Jeanne d’Moore +--DPH Gendamoore --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) diff --git a/official/c40785230.lua b/official/c40785230.lua index 81a8d5d847..f21121d8f2 100644 --- a/official/c40785230.lua +++ b/official/c40785230.lua @@ -1,5 +1,5 @@ --ヴェーダ＝ウパニシャッド ---Veda Upanishad +--Veda Kalarcanum --Scripted by Eerie Code local s,id=GetID() local COUNTER_VEDA=0x210 diff --git a/official/c40945356.lua b/official/c40945356.lua index 3ed3c50b07..2671ec94cd 100644 --- a/official/c40945356.lua +++ b/official/c40945356.lua @@ -68,7 +68,7 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetCode(EFFECT_UPDATE_ATTACK) e3:SetValue(1000) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) end end diff --git a/official/c41044418.lua b/official/c41044418.lua index 4dbb63d09e..21bc0d734b 100644 --- a/official/c41044418.lua +++ b/official/c41044418.lua @@ -93,7 +93,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) local g=eg:Filter(s.regfilter,nil,tp,re) if not g or #g==0 then return end for tc in g:Iter() do - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3)) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3)) end end function s.gyfilter(c) diff --git a/official/c41165831.lua b/official/c41165831.lua index cf15b68aac..fc8a9e0f46 100644 --- a/official/c41165831.lua +++ b/official/c41165831.lua @@ -47,7 +47,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)>0 and c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then - -- Cannot Special Summon non-Fiend monsters + --Cannot Special Summon non-Fiend monsters local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE) diff --git a/official/c41209827.lua b/official/c41209827.lua index 7109be126e..d299c3f09d 100644 --- a/official/c41209827.lua +++ b/official/c41209827.lua @@ -69,7 +69,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) end function s.copycost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():GetFlagEffect(id)==0 end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end function s.copyfilter(c) return c:IsFaceup() and c:IsLevelAbove(5) @@ -90,10 +90,10 @@ function s.copyop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_CHANGE_CODE) e1:SetValue(code) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) if not tc:IsType(TYPE_TRAPMONSTER) then - c:CopyEffect(code,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,1) + c:CopyEffect(code,RESETS_STANDARD_PHASE_END,1) end end end diff --git a/official/c41371602.lua b/official/c41371602.lua index fc28f3bbb8..88720c3e4d 100644 --- a/official/c41371602.lua +++ b/official/c41371602.lua @@ -1,5 +1,5 @@ --スタンドアップ・センチュリオン！ ---Stand-Up Centurion! +--Stand Up Centur-Ion! --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) @@ -45,7 +45,7 @@ end s.listed_series={SET_CENTURION} function s.reg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.indfilter(c) return c:IsFaceup() and c:IsOriginalType(TYPE_MONSTER) and c:IsSetCard(SET_CENTURION) diff --git a/official/c41373230.lua b/official/c41373230.lua index 57955939d8..4d20fdefb6 100644 --- a/official/c41373230.lua +++ b/official/c41373230.lua @@ -66,7 +66,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetValue(s.efilter) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.efilter(e,te) @@ -86,7 +86,7 @@ function s.regop2(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1,id) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.thfilter(c,e,tp,ft) diff --git a/official/c41442341.lua b/official/c41442341.lua index 90779cf53d..ac624f0a0b 100644 --- a/official/c41442341.lua +++ b/official/c41442341.lua @@ -48,7 +48,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) 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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c41443249.lua b/official/c41443249.lua index 73bf55bb18..42e2b4fe6c 100644 --- a/official/c41443249.lua +++ b/official/c41443249.lua @@ -1,5 +1,5 @@ --Ｒ－ＡＣＥプリベンター ---Rescue-Ace Preventer +--Rescue-ACE Preventer --scripted by fiftyfour local s,id=GetID() function s.initial_effect(c) diff --git a/official/c41463181.lua b/official/c41463181.lua index c87983876e..3a5a946240 100644 --- a/official/c41463181.lua +++ b/official/c41463181.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e1:SetTarget(s.tdtg) e1:SetOperation(s.tdop) c:RegisterEffect(e1) @@ -49,7 +49,7 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp) end function s.atkcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsReincarnationSummoned() and c:IsSummonType(SUMMON_TYPE_LINK) + return c:IsReincarnationSummoned() and c:IsLinkSummoned() end function s.filter1(c,tp) return c:IsMonster() and Duel.IsExistingTarget(s.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetAttack()) @@ -78,7 +78,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(gc:GetAttack()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c41773061.lua b/official/c41773061.lua index 8cf880a1b1..2b6cd096fd 100644 --- a/official/c41773061.lua +++ b/official/c41773061.lua @@ -1,5 +1,5 @@ --Ｖｏｉｃｉ ｌａ Ｃａｒｔｅ～メニューはこちら～ ---Voici la Carte - Here is the Menu +--Voici la Carte (Today's Menu) --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c41924516.lua b/official/c41924516.lua index b1dbaa35c4..c561e64115 100644 --- a/official/c41924516.lua +++ b/official/c41924516.lua @@ -1,5 +1,5 @@ --白き森の魔狼シルウィア ---Silvera, Witchwolf of the White Forest +--Silvera, Wolf Tamer of the White Forest --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c42097666.lua b/official/c42097666.lua index f2968eb06e..0559920a66 100644 --- a/official/c42097666.lua +++ b/official/c42097666.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e2:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e2:SetTarget(s.thtgtg) e2:SetOperation(s.thtgop) c:RegisterEffect(e2) diff --git a/official/c42141493.lua b/official/c42141493.lua index 1a6caa340c..50f20ebcdd 100644 --- a/official/c42141493.lua +++ b/official/c42141493.lua @@ -1,5 +1,5 @@ --マルチャミー・フワロス ---Mulcharmy Fuwaross +--Mulcharmy Fuwalos local s,id=GetID() function s.initial_effect(c) --Apply effects for the rest of the turn diff --git a/official/c42199039.lua b/official/c42199039.lua index 3200aa7c49..bf81d6fd42 100644 --- a/official/c42199039.lua +++ b/official/c42199039.lua @@ -58,7 +58,7 @@ function s.dtop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) ec:RegisterEffect(e1) end end diff --git a/official/c42201897.lua b/official/c42201897.lua index c79d778966..2bfaf643fa 100644 --- a/official/c42201897.lua +++ b/official/c42201897.lua @@ -1,5 +1,5 @@ --アザミナ・ハマルティア ---Azamina Hamartia +--Azamina Determination --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c42493140.lua b/official/c42493140.lua index c33df34c1f..47fa1486db 100644 --- a/official/c42493140.lua +++ b/official/c42493140.lua @@ -1,5 +1,5 @@ --従騎士トゥルーデア ---Centurion Trudea +--Centur-Ion Trudea --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c42548470.lua b/official/c42548470.lua index 678c1d4b90..2df1cf3abd 100644 --- a/official/c42548470.lua +++ b/official/c42548470.lua @@ -42,7 +42,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(lv1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc2:RegisterEffect(e1) if lv1atk[1-tp]) and tp or 1-tp if not Duel.IsExistingMatchingCard(Card.IsCanBeSpecialSummoned,p,LOCATION_HAND,0,1,nil,e,0,p,false,false) @@ -62,7 +62,7 @@ function s.rvop(e,tp,eg,ep,ev,re,r,rp) local sc=Duel.SelectMatchingCard(p,Card.IsCanBeSpecialSummoned,p,LOCATION_HAND,0,1,1,nil,e,0,p,false,false):GetFirst() if not sc then return end if Duel.SpecialSummonStep(sc,0,p,p,false,false,POS_FACEUP) then - -- Can attack directly + --Can attack directly local e1=Effect.CreateEffect(c) e1:SetDescription(3205) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) @@ -75,7 +75,7 @@ function s.rvop(e,tp,eg,ep,ev,re,r,rp) end function s.desregop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - -- Destroy all cards + --Destroy all cards local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,1)) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c43986064.lua b/official/c43986064.lua index f808dd4d51..230661965a 100644 --- a/official/c43986064.lua +++ b/official/c43986064.lua @@ -41,7 +41,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetRange(LOCATION_MZONE) e1:SetValue(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Cannot activate its effects local e2=Effect.CreateEffect(c) @@ -49,7 +49,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e2:SetCode(EFFECT_CANNOT_TRIGGER) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) --Cannot be destroyed by battle local e3=Effect.CreateEffect(c) @@ -58,14 +58,14 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e3:SetValue(1) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) --Halve battle damage local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE) e4:SetValue(HALF_DAMAGE) - e4:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e4:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e4) end end diff --git a/official/c44201739.lua b/official/c44201739.lua index 56943d2a69..9aa051730b 100644 --- a/official/c44201739.lua +++ b/official/c44201739.lua @@ -1,5 +1,5 @@ --ミラァと燐寸之仔 ---Mirah and Matchnoko +--Mira Match --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c44241999.lua b/official/c44241999.lua index d1af829b05..56f547e55e 100644 --- a/official/c44241999.lua +++ b/official/c44241999.lua @@ -1,5 +1,5 @@ --百鬼羅刹 グリアーレ三傑 ---Goblin Biker Grialle Trio +--Goblin Biker Troika Griare --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c44455560.lua b/official/c44455560.lua index 8462cd6cfe..fa6bf5f739 100644 --- a/official/c44455560.lua +++ b/official/c44455560.lua @@ -1,5 +1,5 @@ --炎王妃 ウルカニクス ---Fire King Consort Ulkanix +--Fire King Courtier Ulcanix --Scripted by DyXel local s,id=GetID() function s.initial_effect(c) diff --git a/official/c44508094.lua b/official/c44508094.lua index 1d1a16f5a3..56b6b76db8 100644 --- a/official/c44508094.lua +++ b/official/c44508094.lua @@ -48,7 +48,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then Duel.Destroy(eg,REASON_EFFECT) end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,0) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,0) end function s.sumtg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/official/c44553392.lua b/official/c44553392.lua index 729b033ae3..17db5c02ef 100644 --- a/official/c44553392.lua +++ b/official/c44553392.lua @@ -1,5 +1,5 @@ --識無辺世壊 ---World of Boundless Consciousness +--A Shattered, Colorless Realm --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c44760562.lua b/official/c44760562.lua index 85ec292183..142c8e002e 100644 --- a/official/c44760562.lua +++ b/official/c44760562.lua @@ -48,7 +48,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp):GetFirst() if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() - -- Increase its Level by 2 + --Increase its Level by 2 local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) diff --git a/official/c45001322.lua b/official/c45001322.lua index b20ebef60e..9aedb1cd92 100644 --- a/official/c45001322.lua +++ b/official/c45001322.lua @@ -55,7 +55,7 @@ function s.matcheck(e,c) end function s.matcon(e) local c=e:GetHandler() - return c:IsSummonType(SUMMON_TYPE_RITUAL) and c:HasFlagEffect(id) + return c:IsRitualSummoned() and c:HasFlagEffect(id) end function s.chainop(e,tp,eg,ep,ev,re,r,rp) e:GetHandler():RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD|RESET_CHAIN|RESET_TURN_SET,0,1) diff --git a/official/c45283341.lua b/official/c45283341.lua index 8479523a9f..613b80eb28 100644 --- a/official/c45283341.lua +++ b/official/c45283341.lua @@ -96,7 +96,7 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) local e2=Effect.CreateEffect(e:GetHandler()) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_SET_ATTACK_FINAL) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) e2:SetValue(atk) tc:RegisterEffect(e2) end diff --git a/official/c45464587.lua b/official/c45464587.lua index 94a341d1f1..a701bd5bd9 100644 --- a/official/c45464587.lua +++ b/official/c45464587.lua @@ -1,5 +1,5 @@ --ＧＰ－アニヒレーター ---Gold Pride - Annihilator +--Gold Pride - Eradicator --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -42,7 +42,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local g=Duel.SelectTarget(tp,aux.FaceupFilter(Card.IsType,TYPE_EXTRA),tp,LOCATION_MZONE,LOCATION_MZONE,1,ct,nil) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,#g,0,0) --Register that this effect was activated this turn - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.desop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetTargetCards(e) diff --git a/official/c45483489.lua b/official/c45483489.lua index 935a995ed2..e15f5edbd9 100644 --- a/official/c45483489.lua +++ b/official/c45483489.lua @@ -57,7 +57,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) e1:SetOperation(s.retop) e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1,fid) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1,fid) end function s.retcon(e,tp,eg,ep,ev,re,r,rp) local tc=e:GetLabelObject() diff --git a/official/c45663742.lua b/official/c45663742.lua index 0cab9e4064..f6e4d235c6 100644 --- a/official/c45663742.lua +++ b/official/c45663742.lua @@ -1,5 +1,5 @@ --スネークアイ・オーク ---Snake-Eye Oark +--Snake-Eye Oak --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c45943123.lua b/official/c45943123.lua index 90a1c25461..94a6999cd4 100644 --- a/official/c45943123.lua +++ b/official/c45943123.lua @@ -52,7 +52,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(dam) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c46261704.lua b/official/c46261704.lua index a93e48c4fe..314825bdf0 100644 --- a/official/c46261704.lua +++ b/official/c46261704.lua @@ -1,5 +1,5 @@ --ギャラクリボー ---Galactickuriboh +--Galactikuriboh --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c46396218.lua b/official/c46396218.lua index b5195f44a4..5e7fa71526 100644 --- a/official/c46396218.lua +++ b/official/c46396218.lua @@ -1,5 +1,5 @@ --背信聖徒シルヴィア ---Azamina Rhea Silvera +--Azamina Ilia Silvia --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c46485778.lua b/official/c46485778.lua index 12cd9c3214..3c0883f327 100644 --- a/official/c46485778.lua +++ b/official/c46485778.lua @@ -1,5 +1,5 @@ --ポワソニエル・ド・ヌーベルズ ---Poissoniere de Nouvelles +--Poissonniere de Nouvelles --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c46497537.lua b/official/c46497537.lua index 6d5ff3945b..f5671be189 100644 --- a/official/c46497537.lua +++ b/official/c46497537.lua @@ -1,5 +1,5 @@ --トン＝トン ---Ton-Ton +--Pig Iron vs. Pen Peg --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c46640168.lua b/official/c46640168.lua index 5f43bc80ba..4976a3e55b 100644 --- a/official/c46640168.lua +++ b/official/c46640168.lua @@ -1,5 +1,5 @@ --刻まれし魔ラクリモーサ ---Fiendsmith Lacrimosa +--Fiendsmith's Lacrima --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -22,7 +22,7 @@ function s.initial_effect(c) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET) e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCountLimit(1,id) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e2:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e2:SetTarget(s.thsptg) e2:SetOperation(s.thspop) c:RegisterEffect(e2) diff --git a/official/c46939151.lua b/official/c46939151.lua index 98f73a6c7c..b8e13112cf 100644 --- a/official/c46939151.lua +++ b/official/c46939151.lua @@ -1,9 +1,9 @@ --- 地縛囚人グランド・キーパー --- Earthbound Prisoner Ground Keeper --- Scripted by Satella +--地縛囚人グランド・キーパー +--Earthbound Prisoner Ground Keeper +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) - -- Special Summon 1 Level 5 or lower "Earthbound" monster from your Deck or GY + --Special Summon 1 Level 5 or lower "Earthbound" monster from your Deck or GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -17,7 +17,7 @@ function s.initial_effect(c) local e2=e1:Clone() e2:SetCode(EVENT_SPSUMMON_SUCCESS) c:RegisterEffect(e2) - -- "Earthbound" monsters you control cannot be destroyed by battle or card effects + --"Earthbound" monsters you control cannot be destroyed by battle or card effects local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_FIELD) e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) diff --git a/official/c46956301.lua b/official/c46956301.lua index 439e267332..de4884bfaf 100644 --- a/official/c46956301.lua +++ b/official/c46956301.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) diff --git a/official/c47028805.lua b/official/c47028805.lua index b002f0059f..32043511e2 100644 --- a/official/c47028805.lua +++ b/official/c47028805.lua @@ -1,5 +1,5 @@ --Ｌマジマージ ---Lil' Maji Mage +--L Magi Mergy --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c47132793.lua b/official/c47132793.lua index 5fdb0d6ea5..eef0a2950f 100644 --- a/official/c47132793.lua +++ b/official/c47132793.lua @@ -1,5 +1,5 @@ --征覇竜－ブレイズ ---Blaze, Supreme Ruler of Dragons +--Blaze, Supreme Ruler of all Dragons --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c47172959.lua b/official/c47172959.lua index 0962eed6be..5472a3f9be 100644 --- a/official/c47172959.lua +++ b/official/c47172959.lua @@ -1,5 +1,5 @@ --ユベル－Ｄａｓ Ｅｗｉｇ Ｌｉｅｂｅ Ｗäｃｈｔｅｒ ---Yubel - Das Ewig Liebe Wächter +--Yubel - The Loving Defender Forever --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_PLAYER_TARGET) e1:SetCode(EVENT_SPSUMMON_SUCCESS) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetTarget(s.damtg) e1:SetOperation(s.damop) c:RegisterEffect(e1) diff --git a/official/c47195442.lua b/official/c47195442.lua index 851a6320ab..21591c20e2 100644 --- a/official/c47195442.lua +++ b/official/c47195442.lua @@ -1,5 +1,5 @@ --四獣層ウォンキー ---Quartet Wonky +--Wonky Quartet --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -20,7 +20,7 @@ function s.initial_effect(c) e2:SetCategory(CATEGORY_CONTROL+CATEGORY_DAMAGE+CATEGORY_DESTROY) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e2:SetCode(EVENT_SPSUMMON_SUCCESS) - e2:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) end) + e2:SetCondition(function(e) return e:GetHandler():IsXyzSummoned() end) e2:SetTarget(s.atchtg) e2:SetOperation(s.atchop) c:RegisterEffect(e2) diff --git a/official/c47404795.lua b/official/c47404795.lua index 980baeda12..f42e4be4d1 100644 --- a/official/c47404795.lua +++ b/official/c47404795.lua @@ -1,12 +1,12 @@ --- 魔界劇団－スーパー・プロデューサー --- Abyss Actor - Super Producer --- Scripted by Hatter +--魔界劇団－スーパー・プロデューサー +--Abyss Actor - Super Producer +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- Link Summon procedure + --Link Summon procedure Link.AddProcedure(c,nil,2,2,s.lcheck) - -- Destroy 1 face-up card + --Destroy 1 face-up card local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) diff --git a/official/c47710198.lua b/official/c47710198.lua index 4b690617b9..d75b184344 100644 --- a/official/c47710198.lua +++ b/official/c47710198.lua @@ -1,5 +1,5 @@ --- 相剣大邪－七星龍淵 --- Swordsoul Sinister Sovereign - Qixing Longyuan +--相剣大邪－七星龍淵 +--Swordsoul Sinister Sovereign - Qixing Longyuan local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -57,7 +57,7 @@ function s.initial_effect(c) c:RegisterEffect(e3) end function s.cfilter(c,e,tp) - return c:IsFaceup() and c:IsType(TYPE_SYNCHRO) and c:IsSummonType(SUMMON_TYPE_SYNCHRO) + return c:IsFaceup() and c:IsType(TYPE_SYNCHRO) and c:IsSynchroSummoned() and c:IsRace(RACE_WYRM) and c:IsSummonPlayer(tp) end function s.drcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c47759571.lua b/official/c47759571.lua index 5490d0b03d..e073985e36 100644 --- a/official/c47759571.lua +++ b/official/c47759571.lua @@ -52,21 +52,21 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) --Change ATK to 0 local e3=Effect.CreateEffect(c) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_SET_ATTACK_FINAL) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) e3:SetValue(0) tc:RegisterEffect(e3) end @@ -83,7 +83,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1,{id,1}) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end diff --git a/official/c4786063.lua b/official/c4786063.lua index dd648dd76c..31473d3710 100644 --- a/official/c4786063.lua +++ b/official/c4786063.lua @@ -84,7 +84,7 @@ function s.defop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_DEFENSE) e1:SetValue(-800) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Cannot be destroyed by battle or card effects local e2=e1:Clone() diff --git a/official/c47921178.lua b/official/c47921178.lua index 178e910ac9..46932101c6 100644 --- a/official/c47921178.lua +++ b/official/c47921178.lua @@ -1,9 +1,9 @@ --- ＢＫ チーフセコンド --- Battlin’ Boxer Chief Second --- Scripted by Satella +--ＢＫ チーフセコンド +--Battlin' Boxer Chief Second +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) - -- Special Summon itself from your hand + --Special Summon itself from your hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_REMOVE) @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - -- Extra Normal Summon + --Extra Normal Summon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c47961342.lua b/official/c47961342.lua index 198fb42818..09ecc89d7c 100644 --- a/official/c47961342.lua +++ b/official/c47961342.lua @@ -1,9 +1,9 @@ --- 転轍地点 --- Switch Point --- Scripted by Hatter +--転轍地点 +--Switch Point +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Send monster(s) to the GY + --Send monster(s) to the GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOGRAVE) diff --git a/official/c48183890.lua b/official/c48183890.lua index ad08028368..cb65993f2c 100644 --- a/official/c48183890.lua +++ b/official/c48183890.lua @@ -1,21 +1,21 @@ --- アティプスの蟲惑魔 --- Traptrix Atypus --- Scripted by Hatter +--アティプスの蟲惑魔 +--Traptrix Atypus +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- 2+ monsters, including a Plant or Insect monster + --2+ monsters, including a Plant or Insect monster Link.AddProcedure(c,nil,2,3,s.lcheck) - -- Unaffected by Trap effects + --Unaffected by Trap effects local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetRange(LOCATION_MZONE) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end) + e1:SetCondition(function(e) return e:GetHandler():IsLinkSummoned() end) e1:SetValue(function(_,te) return te:IsTrapEffect() end) c:RegisterEffect(e1) - -- "Traptrix" monsters gain 1000 ATK + --"Traptrix" monsters gain 1000 ATK local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) e2:SetCode(EFFECT_UPDATE_ATTACK) @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,SET_TRAPTRIX)) e2:SetValue(1000) c:RegisterEffect(e2) - -- Negate effects of face-up cards + --Negate effects of face-up cards local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,0)) e3:SetCategory(CATEGORY_DISABLE+CATEGORY_REMOVE+CATEGORY_DESTROY) @@ -64,11 +64,11 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() for tc in g:Iter() do if tc:IsCanBeDisabledByEffect(e) then neg_chk=true end - -- Negate effects + --Negate effects local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c48386462.lua b/official/c48386462.lua index 1eba5de664..55eab8f545 100644 --- a/official/c48386462.lua +++ b/official/c48386462.lua @@ -1,5 +1,5 @@ --鳴いて時鳥 ---Singing Cuckoo +--The Cuckoo Commanded to Croon --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c48626373.lua b/official/c48626373.lua index 7d2df58d2a..1e71d760b8 100644 --- a/official/c48626373.lua +++ b/official/c48626373.lua @@ -1,12 +1,12 @@ --- クシャトリラ・アライズハート --- Kashtira Arise-Heart --- Scripted by Hatter +--クシャトリラ・アライズハート +--Kashtira Arise-Heart +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- 3 Level 7 monsters + --3 Level 7 monsters Xyz.AddProcedure(c,nil,7,3,s.xyzfilter,aux.Stringid(id,0),nil,s.xyzop) - -- Cards sent to the GY are banished instead + --Cards sent to the GY are banished instead local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE) @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetTargetRange(LOCATION_ALL,LOCATION_ALL) e1:SetValue(LOCATION_REMOVED) c:RegisterEffect(e1) - -- Attach 1 banished card + --Attach 1 banished card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetCost(s.ovcost) e2:SetOperation(s.ovop) c:RegisterEffect(e2) - -- Banish 1 card + --Banish 1 card local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) e3:SetCategory(CATEGORY_REMOVE) diff --git a/official/c48805472.lua b/official/c48805472.lua index df1a69e10c..46f56860f7 100644 --- a/official/c48805472.lua +++ b/official/c48805472.lua @@ -1,5 +1,5 @@ --調和の宝札 ---Traptrix Allure +--Traptantalizing Tune --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c49027020.lua b/official/c49027020.lua index 1298cd7723..f905b7f2b4 100644 --- a/official/c49027020.lua +++ b/official/c49027020.lua @@ -55,7 +55,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) end end function s.rmfilter(c) - return c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsAbleToRemove() + return c:IsSpecialSummoned() and c:IsAbleToRemove() end function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and s.rmfilter(chkc) end @@ -77,7 +77,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EVENT_PHASE|PHASE_STANDBY) local reset,reset_ct=RESET_PHASE|PHASE_STANDBY,1 local turn_ct=0 - if Duel.GetCurrentPhase()==PHASE_STANDBY then + if Duel.IsPhase(PHASE_STANDBY) then reset_ct=2 turn_ct=Duel.GetTurnCount() end diff --git a/official/c49109013.lua b/official/c49109013.lua index baf33e0f88..99e5c714b6 100644 --- a/official/c49109013.lua +++ b/official/c49109013.lua @@ -1,5 +1,5 @@ --魔星のウルカ ---Uruka the Magic Star +--Doomstar Ulka --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c49139666.lua b/official/c49139666.lua index a17fd799df..05129613bc 100644 --- a/official/c49139666.lua +++ b/official/c49139666.lua @@ -1,5 +1,5 @@ --異星戦隊 ビッグ・バン ---Estranger Big Bang +--E Stranger Big Bang --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c49161188.lua b/official/c49161188.lua index 1917e6b121..f8e666a6bd 100644 --- a/official/c49161188.lua +++ b/official/c49161188.lua @@ -99,7 +99,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(value/2) c:RegisterEffect(e1) end diff --git a/official/c49299410.lua b/official/c49299410.lua index 7255e23c61..3fea8745f5 100644 --- a/official/c49299410.lua +++ b/official/c49299410.lua @@ -1,5 +1,5 @@ --嗤う黒山羊 ---Rumpel Teufel +--The Black Goat Laughs --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c49689480.lua b/official/c49689480.lua index 5502935b63..fed926ecff 100644 --- a/official/c49689480.lua +++ b/official/c49689480.lua @@ -1,5 +1,5 @@ --クイーンマドルチェ・ティアラフレース ---Madolche Queen Tiara-a-la-Fraise +--Madolche Queen Tiarafraise --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c49867899.lua b/official/c49867899.lua index ba4d0e7ae8..1f36fe6573 100644 --- a/official/c49867899.lua +++ b/official/c49867899.lua @@ -1,5 +1,5 @@ --刻まれし魔の大聖棺 ---Fiendsmith Sequentia +--Fiendsmith's Sequence --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c49928686.lua b/official/c49928686.lua index 38496b5c8e..2f278b266a 100644 --- a/official/c49928686.lua +++ b/official/c49928686.lua @@ -52,7 +52,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(d:GetAttack()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) a:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_UPDATE_DEFENSE) diff --git a/official/c49930315.lua b/official/c49930315.lua index 8a144a6f3c..25f92b32b3 100644 --- a/official/c49930315.lua +++ b/official/c49930315.lua @@ -62,7 +62,7 @@ function s.tnop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c50042011.lua b/official/c50042011.lua index 1f3cab2b26..f5a9809370 100644 --- a/official/c50042011.lua +++ b/official/c50042011.lua @@ -1,5 +1,5 @@ --メメント・スリーピィ ---Mementotlan Mystical Sheep +--Mementotlan Shleepy --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c50134646.lua b/official/c50134646.lua index 5c267aa6cb..7de4149944 100644 --- a/official/c50134646.lua +++ b/official/c50134646.lua @@ -1,5 +1,5 @@ --目白圧し ---White-Eye Pressure +--Flock Together --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c50281477.lua b/official/c50281477.lua index e9140ac620..0580e518be 100644 --- a/official/c50281477.lua +++ b/official/c50281477.lua @@ -20,7 +20,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetRange(LOCATION_MZONE) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_NORMAL) end) + e1:SetCondition(function(e) return e:GetHandler():IsNormalSummoned() end) e1:SetValue(10) c:RegisterEffect(e1) --"Tistina" monster can make a second attack @@ -78,7 +78,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_EXTRA_ATTACK) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end --Can only attack with 1 monster this turn diff --git a/official/c50311058.lua b/official/c50311058.lua index d3ed9a7af1..d1119b826a 100644 --- a/official/c50311058.lua +++ b/official/c50311058.lua @@ -1,5 +1,5 @@ --百鬼羅刹大暴走 ---Goblin Rider Stampede +--Goblin Biker Grand Stampede --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c50357013.lua b/official/c50357013.lua index 165d00c56e..28c4d2c3b8 100644 --- a/official/c50357013.lua +++ b/official/c50357013.lua @@ -1,5 +1,5 @@ --十種神鏡陣 ---Mirror Formation of the Ten Sacred Treasures +--Tokusano Shinkyojin --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c50687050.lua b/official/c50687050.lua index 73e8030006..9129f918d4 100644 --- a/official/c50687050.lua +++ b/official/c50687050.lua @@ -1,5 +1,5 @@ --針淵のヴァリアンツ－アルクトスⅫ ---Vaylantz of the Wireframe Abyss - Arctus XII +--Arktos XII - Chronochasm Vaylantz --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) @@ -7,7 +7,7 @@ function s.initial_effect(c) Pendulum.AddProcedure(c,false) Fusion.AddProcMixN(c,true,true,aux.FilterBoolFunctionEx(s.ffilter),2) Fusion.AddContactProc(c,s.contactfil,s.contactop,s.splimit) - -- Special Summon self or move 1 "Valiants" monster + --Special Summon self or move 1 "Valiants" monster local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,{id,0}) e1:SetTarget(s.spmvtg) c:RegisterEffect(e1) - -- Switch the locations of 2 monsters + --Switch the locations of 2 monsters local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetType(EFFECT_TYPE_QUICK_O) @@ -26,7 +26,7 @@ function s.initial_effect(c) e2:SetTarget(s.chtg) e2:SetOperation(s.chop) c:RegisterEffect(e2) - -- Destroy 1 card on the field + --Destroy 1 card on the field local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) e3:SetCategory(CATEGORY_DESTROY) diff --git a/official/c50838440.lua b/official/c50838440.lua index 19797093bd..b45d789fbe 100644 --- a/official/c50838440.lua +++ b/official/c50838440.lua @@ -1,5 +1,5 @@ --三位一体 ---Three as One +--Three in One --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c51073802.lua b/official/c51073802.lua index 787b447771..543df43310 100644 --- a/official/c51073802.lua +++ b/official/c51073802.lua @@ -1,5 +1,5 @@ --マジェスペクター・ポーキュパイン ---Majespecter Porcupine - Yamaarashi +--Majespecter Porcupine - Yamarashi --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c51296484.lua b/official/c51296484.lua index d708086bb6..438fe5ebb9 100644 --- a/official/c51296484.lua +++ b/official/c51296484.lua @@ -1,5 +1,5 @@ --粛声の竜賢姫サフィラ ---Saffira, the Wise Silenforcer Queen +--Saffira, Dragon Queen of the Voiceless Voice --Ashaki local s,id=GetID() function s.initial_effect(c) diff --git a/official/c51303014.lua b/official/c51303014.lua index 4c0f22c45b..22b6b498b9 100644 --- a/official/c51303014.lua +++ b/official/c51303014.lua @@ -41,7 +41,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end if lv then @@ -52,7 +52,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_CLIENT_HINT) e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e2:SetValue(1) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c51473858.lua b/official/c51473858.lua index e5d013977e..ba6d3165d1 100644 --- a/official/c51473858.lua +++ b/official/c51473858.lua @@ -1,9 +1,9 @@ --- 百鬼羅刹 爆音クラッタ --- Goblin Rider Clutter the Noisy --- Scripted by Satellaa +--百鬼羅刹 爆音クラッタ +--Goblin Biker Clatter Sploder +--Scripted by Satellaa local s,id=GetID() function s.initial_effect(c) - -- Special Summon 1 "Goblin" monster from your GY + --Special Summon 1 "Goblin" monster from your GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -17,7 +17,7 @@ function s.initial_effect(c) local e2=e1:Clone() e2:SetCode(EVENT_SPSUMMON_SUCCESS) c:RegisterEffect(e2) - -- Special Summon itself from the GY + --Special Summon itself from the GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -60,7 +60,7 @@ function s.selfspop(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if Duel.RemoveOverlayCard(tp,1,1,1,1,REASON_EFFECT)>0 and c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then - -- Banish it when it leaves the field + --Banish it when it leaves the field local e1=Effect.CreateEffect(c) e1:SetDescription(3300) e1:SetType(EFFECT_TYPE_SINGLE) diff --git a/official/c51474037.lua b/official/c51474037.lua index df512235cf..ff7cebc8c8 100644 --- a/official/c51474037.lua +++ b/official/c51474037.lua @@ -67,7 +67,7 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) opp_c:RegisterEffect(e1) end end diff --git a/official/c51779204.lua b/official/c51779204.lua index d58cfb6a51..7e896b9233 100644 --- a/official/c51779204.lua +++ b/official/c51779204.lua @@ -32,14 +32,14 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if not tc:IsRelateToEffect(e) or tc:HasFlagEffect(id) then return end local c=e:GetHandler() - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) --Gains 1000 ATK local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCondition(s.effcon) e1:SetValue(1000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Opponent cannot activate cards or effects local e2=Effect.CreateEffect(c) @@ -50,7 +50,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetTargetRange(0,1) e2:SetCondition(s.effcon) e2:SetValue(1) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) --Deals piercing damage local e3=e1:Clone() diff --git a/official/c52038272.lua b/official/c52038272.lua index 81eda088af..52191d04ba 100644 --- a/official/c52038272.lua +++ b/official/c52038272.lua @@ -43,7 +43,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) 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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c52083044.lua b/official/c52083044.lua index 9c6d312ba1..cef42d2ef8 100644 --- a/official/c52083044.lua +++ b/official/c52083044.lua @@ -39,7 +39,7 @@ end function s.bop(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 - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) --Return the monster in the End Phase local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c52155219.lua b/official/c52155219.lua index d6cc8f7234..47154dcfc1 100644 --- a/official/c52155219.lua +++ b/official/c52155219.lua @@ -58,7 +58,7 @@ function s.immop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetValue(s.efilter) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c52254878.lua b/official/c52254878.lua index fb8c7a2600..8c5444f52b 100644 --- a/official/c52254878.lua +++ b/official/c52254878.lua @@ -1,5 +1,5 @@ --次元同異体ヴァリス ---Dimensional Isoallotope Varis +--Dimensional Allotrope Varis --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -35,7 +35,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if (not c:IsFaceup() and c:IsRelateToEffect(e)) then return end local rc,att=e:GetLabel() if c:IsDifferentRace(rc) then - -- Change monster type + --Change monster type local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_RACE) @@ -45,7 +45,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) c:RegisterEffect(e1) end if c:IsAttributeExcept(att) then - -- Change Attribute + --Change Attribute local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_CHANGE_ATTRIBUTE) diff --git a/official/c52382379.lua b/official/c52382379.lua index 41facc8e87..ef9f31de52 100644 --- a/official/c52382379.lua +++ b/official/c52382379.lua @@ -1,5 +1,5 @@ --ネムレリアの夢喰い－レヴェイユ ---Nemleria's Dreameater - Réveil +--Nemleria Dream Devourer - Reveil --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c52445243.lua b/official/c52445243.lua index acdbcf06b7..140856614d 100644 --- a/official/c52445243.lua +++ b/official/c52445243.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetLabel()>0 and e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetLabel()>0 and e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.efftg) e1:SetOperation(s.effop) c:RegisterEffect(e1) diff --git a/official/c52472775.lua b/official/c52472775.lua index 75eb432085..77f0490f4a 100644 --- a/official/c52472775.lua +++ b/official/c52472775.lua @@ -1,5 +1,5 @@ --粛声なる祈り ---Silenforcing Prayer +--Prayers of the Voiceless Voice --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c52553102.lua b/official/c52553102.lua index f2063c71b6..a5b3eff92a 100644 --- a/official/c52553102.lua +++ b/official/c52553102.lua @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) end) + e1:SetCondition(function(e) return e:GetHandler():IsSynchroSummoned() end) e1:SetTarget(s.settg) e1:SetOperation(s.setop) c:RegisterEffect(e1) diff --git a/official/c52575195.lua b/official/c52575195.lua index 17a82ce927..111b1f6e16 100644 --- a/official/c52575195.lua +++ b/official/c52575195.lua @@ -57,7 +57,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_REMOVED) e1:SetCountLimit(1) if Duel.GetTurnPlayer()==tp then - if Duel.GetCurrentPhase()==PHASE_DRAW then + if Duel.IsPhase(PHASE_DRAW) then e1:SetLabel(Duel.GetTurnCount()) else e1:SetLabel(Duel.GetTurnCount()+2) diff --git a/official/c52596406.lua b/official/c52596406.lua index 0a680f3117..8807b97f76 100644 --- a/official/c52596406.lua +++ b/official/c52596406.lua @@ -63,7 +63,7 @@ function s.tnop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c52601736.lua b/official/c52601736.lua index d5a0fbafbf..a914fa99c0 100644 --- a/official/c52601736.lua +++ b/official/c52601736.lua @@ -81,7 +81,7 @@ function s.daop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c52607696.lua b/official/c52607696.lua index 66f86c9a11..48cd21a460 100644 --- a/official/c52607696.lua +++ b/official/c52607696.lua @@ -1,5 +1,5 @@ --幻惑のバリア －ミラージュフォース－ ---Mirage Force +--Mirage Mirror Force --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c52645235.lua b/official/c52645235.lua index 16de37614b..2ee7b2ff6f 100644 --- a/official/c52645235.lua +++ b/official/c52645235.lua @@ -1,12 +1,12 @@ --- エピュアリィ・ハピネス --- Epurrely Happiness --- Scripted by Hatter +--エピュアリィ・ハピネス +--Epurrely Happiness +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- 2 Level 2 monsters + --2 Level 2 monsters Xyz.AddProcedure(c,nil,2,2) - -- Search 1 "Purrely" card + --Search 1 "Purrely" card local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_ATKCHANGE) @@ -16,13 +16,13 @@ function s.initial_effect(c) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) - -- Track if this card "battled" + --Track if this card "battled" local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e2:SetCode(EVENT_BATTLED) e2:SetOperation(function(e) e:GetHandler():RegisterFlagEffect(id,RESET_PHASE|PHASE_DAMAGE,0,1) end) c:RegisterEffect(e2) - -- Attach "Purrely" Quick-Play Spell + --Attach "Purrely" Quick-Play Spell local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_TOHAND) @@ -63,7 +63,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil):GetFirst() if not tc then return end Duel.HintSelection(tc,true) - -- Halve ATK + --Halve ATK local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) diff --git a/official/c52918032.lua b/official/c52918032.lua index 102f580828..cb7497c465 100644 --- a/official/c52918032.lua +++ b/official/c52918032.lua @@ -1,5 +1,5 @@ --メメント・ウラモン ---Memento Attic Ghost +--Mementotlan Ghattic --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c52945066.lua b/official/c52945066.lua index 198c6756f6..8e6f0fc621 100644 --- a/official/c52945066.lua +++ b/official/c52945066.lua @@ -47,13 +47,13 @@ function s.disop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil) if #g>0 and Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_MZONE,0,nil):IsExists(Card.IsLinkAbove,1,nil,2) then @@ -68,7 +68,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e3:SetRange(LOCATION_MZONE) e3:SetValue(s.efilter) e3:SetOwnerPlayer(tp) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) gc:RegisterEffect(e3) end end diff --git a/official/c53008933.lua b/official/c53008933.lua index 548aaa01be..bed8ff1395 100644 --- a/official/c53008933.lua +++ b/official/c53008933.lua @@ -1,5 +1,5 @@ --デーモンの光来 ---Archfiend's Arrival +--Archfiend's Advent --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c53085623.lua b/official/c53085623.lua index edaa0fc352..3f7dd8c906 100644 --- a/official/c53085623.lua +++ b/official/c53085623.lua @@ -1,5 +1,5 @@ --水精鱗の深影隊 ---Mermail Shadow Bodyguards +--Mermail Shadow Squad --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c53134520.lua b/official/c53134520.lua index 4ec6da5568..d7e3f0dde0 100644 --- a/official/c53134520.lua +++ b/official/c53134520.lua @@ -58,7 +58,7 @@ function s.mzthop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) sc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c53323475.lua b/official/c53323475.lua index 124d5a5622..af063ffa0d 100644 --- a/official/c53323475.lua +++ b/official/c53323475.lua @@ -1,5 +1,5 @@ --傀儡流儀－パペット・シャーク ---Puppet Shark Style +--Puppet Shark --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/official/c53329234.lua b/official/c53329234.lua index c9c7bc9e6c..0925b29fee 100644 --- a/official/c53329234.lua +++ b/official/c53329234.lua @@ -1,5 +1,5 @@ --微睡の罪宝－モーリアン ---Sinful Spoils of Dozing - Morrighan +--Sinful Spoils of Slumber - Morrian --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -29,7 +29,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end function s.posfilter(c) - return c:IsFaceup() and c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsCanTurnSet() + return c:IsFaceup() and c:IsSpecialSummoned() and c:IsCanTurnSet() end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and s.posfilter(chkc) end diff --git a/official/c53330789.lua b/official/c53330789.lua index 49bde0550d..896bb5b1d9 100644 --- a/official/c53330789.lua +++ b/official/c53330789.lua @@ -1,5 +1,5 @@ --ＶＳトリニティ・バースト ---Vanquish Soul - Trinity Burst +--Vanquish Soul Trinity Burst --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c53404966.lua b/official/c53404966.lua index 5f0c2b0386..221c7eccb6 100644 --- a/official/c53404966.lua +++ b/official/c53404966.lua @@ -1,5 +1,5 @@ --焔聖騎士－リッチャルデット ---Infernoble Knight - Ricciardetto +--Infernoble Knight Ricciardetto --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c53416326.lua b/official/c53416326.lua index 0c8bd5e26c..e33ffec86d 100644 --- a/official/c53416326.lua +++ b/official/c53416326.lua @@ -3,7 +3,7 @@ --scripted by Naim local s,id=GetID() function s.initial_effect(c) - -- Special Summon itself from the hand + --Special Summon itself from the hand local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_UNCOPYABLE) @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH) e1:SetCondition(s.spcon) c:RegisterEffect(e1) - -- Can be used as a non-Tuner for the Synchro Summon of a Plant/Insect monster + --Can be used as a non-Tuner for the Synchro Summon of a Plant/Insect monster local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE) diff --git a/official/c53545926.lua b/official/c53545926.lua index 2fc70f93a2..e687285f5b 100644 --- a/official/c53545926.lua +++ b/official/c53545926.lua @@ -1,5 +1,5 @@ --共闘闘君 ---Token Alliance +--Token Support --scripted by Naim local s,id=GetID() local TOKEN_ALLIANCE=id+1 diff --git a/official/c53577438.lua b/official/c53577438.lua index 95bc736d94..2fbf41dd94 100644 --- a/official/c53577438.lua +++ b/official/c53577438.lua @@ -68,9 +68,9 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_EXTRA_ATTACK_MONSTER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) - tc:RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) + tc:RegisterFlagEffect(0,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) end end diff --git a/official/c53618197.lua b/official/c53618197.lua index a115176b1d..331972536b 100644 --- a/official/c53618197.lua +++ b/official/c53618197.lua @@ -1,10 +1,10 @@ --- コンフィラス・ド・ヌーベルズ --- Confitras de Nouvelles --- Scripted by Satella +--コンフィラス・ド・ヌーベルズ +--Confiras de Nouvelles +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - -- Destroy 1 Spell/Trap on the field + --Destroy 1 Spell/Trap on the field local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) @@ -15,7 +15,7 @@ function s.initial_effect(c) e1:SetTarget(s.destg) e1:SetOperation(s.desop) c:RegisterEffect(e1) - -- Special Summon 1 Level 3 or 4 "Nouvelles" Ritual Monster + --Special Summon 1 Level 3 or 4 "Nouvelles" Ritual Monster local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_RELEASE+CATEGORY_SPECIAL_SUMMON) diff --git a/official/c53639887.lua b/official/c53639887.lua index a1b3dd9a59..e818e18228 100644 --- a/official/c53639887.lua +++ b/official/c53639887.lua @@ -1,5 +1,5 @@ --蛇眼神殿スネークアイ ---The Shrine of Serpentine Sight - Snake-Eye +--Divine Temple of the Snake-Eye --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c5376159.lua b/official/c5376159.lua index 574395d3b6..6606484cc9 100644 --- a/official/c5376159.lua +++ b/official/c5376159.lua @@ -59,7 +59,7 @@ function s.immop(tc,c) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetValue(s.efilter) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end function s.efilter(e,te) diff --git a/official/c53765052.lua b/official/c53765052.lua index 0ae16c1d6d..8c3592eb7b 100644 --- a/official/c53765052.lua +++ b/official/c53765052.lua @@ -1,5 +1,5 @@ --原罪のディアベルゼ ---Diabellze of the Original Sin +--Diabellze the Original Sinkeeper --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c53804307.lua b/official/c53804307.lua index fadb236a6e..89b367e220 100644 --- a/official/c53804307.lua +++ b/official/c53804307.lua @@ -71,7 +71,7 @@ function s.hspop(e,tp,eg,ep,ev,re,r,rp) end end function s.retcon(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsTurnPlayer(1-tp) and e:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL) + return Duel.IsTurnPlayer(1-tp) and e:GetHandler():IsSpecialSummoned() end function s.rettg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end diff --git a/official/c53971455.lua b/official/c53971455.lua index f858f2454e..c296673a8b 100644 --- a/official/c53971455.lua +++ b/official/c53971455.lua @@ -58,7 +58,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) dc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) @@ -78,7 +78,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1,id) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.spfilter(c,e,tp) diff --git a/official/c54126514.lua b/official/c54126514.lua index 0ee210565f..d8ba39df6a 100644 --- a/official/c54126514.lua +++ b/official/c54126514.lua @@ -1,5 +1,5 @@ --オルターガイスト・ペリネトレータ ---Altergeist Perinetrator +--Altergeist Peritrator --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c54261514.lua b/official/c54261514.lua index 548ba6bf11..fa15e7e044 100644 --- a/official/c54261514.lua +++ b/official/c54261514.lua @@ -1,5 +1,5 @@ --超獸の咆哮 ---Final Bringer's Bellow +--Final Bringer of the End Times --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c54475145.lua b/official/c54475145.lua index 939e5b52ec..0fef5fa268 100644 --- a/official/c54475145.lua +++ b/official/c54475145.lua @@ -1,5 +1,5 @@ --心宿りし青眼竜 ---Blue-Eyes of the Heart +--Heart of the Blue-Eyes --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c54550967.lua b/official/c54550967.lua index f49a343a59..bc6fa52c25 100644 --- a/official/c54550967.lua +++ b/official/c54550967.lua @@ -1,9 +1,9 @@ --- メメント・エンウィッチ --- Memento Fairwitch --- Scripted by Satellaa +--メメント・エンウィッチ +--Mementotlan Angwitch +--Scripted by Satellaa local s,id=GetID() function s.initial_effect(c) - -- Add 1 "Memento" monster from your Deck to your hand + --Add 1 "Memento" monster from your Deck to your hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -17,7 +17,7 @@ function s.initial_effect(c) local e2=e1:Clone() e2:SetCode(EVENT_SPSUMMON_SUCCESS) c:RegisterEffect(e2) - -- Special Summon 1 Level 2 or lower "Memento" monster from your GY + --Special Summon 1 Level 2 or lower "Memento" monster from your GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY) diff --git a/official/c54573517.lua b/official/c54573517.lua index 80cdf48963..ce10844812 100644 --- a/official/c54573517.lua +++ b/official/c54573517.lua @@ -1,5 +1,5 @@ --ＴＧ — オールクリア ---T.G. - All Clear +--T.G. All Clear --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c54670997.lua b/official/c54670997.lua index d4604d8022..b73e6032b5 100644 --- a/official/c54670997.lua +++ b/official/c54670997.lua @@ -1,9 +1,9 @@ --- ＧＰ－ベター・ラック --- Gold Pride - Better Luck Next Time! --- Scripted by Satella +--ＧＰ－ベター・ラック +--Gold Pride - Better Luck Next Time! +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) - -- Add 1 "Gold Pride" monster from your Deck to your hand + --Add 1 "Gold Pride" monster from your Deck to your hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH) e1:SetOperation(s.activate) c:RegisterEffect(e1) - -- Draw 1 card + --Draw 1 card local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DRAW) diff --git a/official/c54851325.lua b/official/c54851325.lua index 56c0a79106..b6347bdf59 100644 --- a/official/c54851325.lua +++ b/official/c54851325.lua @@ -1,5 +1,5 @@ --世壊賛歌 ---Planetary Eulogy +--Realm Eulogy --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c55272555.lua b/official/c55272555.lua index 1b75647900..91512bebe8 100644 --- a/official/c55272555.lua +++ b/official/c55272555.lua @@ -1,9 +1,9 @@ --- メメント・ホーン・ドラゴン --- Memento Horn Dragon --- Scripted by Satellaa +--メメント・ホーン・ドラゴン +--Mementotlan-Horned Dragon +--Scripted by Satellaa local s,id=GetID() function s.initial_effect(c) - -- Special Summon itself from the hand + --Special Summon itself from the hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_FIELD) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH) e1:SetCondition(s.spcon) c:RegisterEffect(e1) - -- Destroy 3 face-up cards on the field + --Destroy 3 face-up cards on the field local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DESTROY) diff --git a/official/c55276522.lua b/official/c55276522.lua index c3c010e676..dd22b700a0 100644 --- a/official/c55276522.lua +++ b/official/c55276522.lua @@ -1,5 +1,5 @@ --登竜華転生門 ---Ryu-Ge Warm Zone +--Ryu-Ge War Zone --Scripted by Eerie Code local s,id=GetID() function s.initial_effect(c) diff --git a/official/c55320758.lua b/official/c55320758.lua index 972bba500d..c986328264 100644 --- a/official/c55320758.lua +++ b/official/c55320758.lua @@ -1,5 +1,5 @@ --天上天下百鬼羅刹 ---Bad-Ass Goblin Bikers +--Goblin Bikers Gone Wild --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c55461744.lua b/official/c55461744.lua index c9d43c1c10..a3193a5ab8 100644 --- a/official/c55461744.lua +++ b/official/c55461744.lua @@ -1,5 +1,5 @@ --大翼のバフォメット ---Berfomet the Great Wings +--Big-Winged Berfomet --Scripted by Larry126 local s,id=GetID() function s.initial_effect(c) diff --git a/official/c55484152.lua b/official/c55484152.lua index 0ae8144f5b..fc6db3ee9c 100644 --- a/official/c55484152.lua +++ b/official/c55484152.lua @@ -1,5 +1,5 @@ --燦幻封炉 ---Sangen Fuuro +--Sangen Furo --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c55584558.lua b/official/c55584558.lua index 51c79614c1..cecd07171a 100644 --- a/official/c55584558.lua +++ b/official/c55584558.lua @@ -47,7 +47,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT+extraproperty) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESETS_STANDARD_PHASE_END,2) e1:SetValue(1) tc:RegisterEffect(e1) --Discard 1 card and Special Summon 1 "Purrely" monster from the Deck diff --git a/official/c55795155.lua b/official/c55795155.lua index e094ef9697..a17fbddb1b 100644 --- a/official/c55795155.lua +++ b/official/c55795155.lua @@ -110,7 +110,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_ATTACK_ALL) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c56146300.lua b/official/c56146300.lua index 37b8f74f93..d5891341a1 100644 --- a/official/c56146300.lua +++ b/official/c56146300.lua @@ -1,5 +1,5 @@ --Ｂ・Ｆ－猛撃のレイピア ---Battlewasp - Rapier the Furious +--Battlewasp - Rapier the Onslaught local s,id=GetID() function s.initial_effect(c) --Place 1 "Battlewasp - Wind" from your Deck face-up in your Spell & Trap Zone diff --git a/official/c56208713.lua b/official/c56208713.lua index 9add48f429..a6c4376e13 100644 --- a/official/c56208713.lua +++ b/official/c56208713.lua @@ -11,7 +11,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetCode(EFFECT_CANNOT_DISEFFECT) e1:SetRange(LOCATION_MZONE) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) end) + e1:SetCondition(function(e) return e:GetHandler():IsFusionSummoned() end) e1:SetValue(s.effval) c:RegisterEffect(e1) --Special Summon 1 "Melodious" monster from your Deck diff --git a/official/c56506740.lua b/official/c56506740.lua index 564010bc0b..e545c571b9 100644 --- a/official/c56506740.lua +++ b/official/c56506740.lua @@ -85,7 +85,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ACTIVATE) e1:SetTargetRange(1,0) - e1:SetValue(function(e,re,tp) return re:IsMonsterEffect() and re:GetHandler():IsSummonType(SUMMON_TYPE_SPECIAL) and re:GetHandler():IsLocation(LOCATION_MZONE) end) + e1:SetValue(function(e,re,tp) return re:IsMonsterEffect() and re:GetHandler():IsSpecialSummoned() and re:GetHandler():IsLocation(LOCATION_MZONE) end) e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end diff --git a/official/c56863746.lua b/official/c56863746.lua index d183b0b0e3..ee881b0f34 100644 --- a/official/c56863746.lua +++ b/official/c56863746.lua @@ -1,5 +1,5 @@ --竜儀巧－メテオニス＝ＤＡＤ ---Drytron Meteonis Alpha Draconids +--Drytron Meteonis DA Draconids --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -77,7 +77,7 @@ end function s.spcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() return rp==1-tp and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) - and c:IsSummonType(SUMMON_TYPE_RITUAL) + and c:IsRitualSummoned() end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 diff --git a/official/c57134592.lua b/official/c57134592.lua index ec0d9c3bfa..eadac32923 100644 --- a/official/c57134592.lua +++ b/official/c57134592.lua @@ -1,13 +1,13 @@ --- 転生炎獣レイジング・フェニックス --- Salamangreat Raging Phoenix --- Scripted by Satella +--転生炎獣レイジング・フェニックス +--Salamangreat Raging Phoenix +--Scripted by Satella local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() aux.EnableCheckReincarnation(c) - -- Link Summon procedure + --Link Summon procedure Link.AddProcedure(c,s.matfilter,2) - -- Add 1 "Salamangreat" card from your Deck to your hand + --Add 1 "Salamangreat" card from your Deck to your hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND) @@ -19,7 +19,7 @@ function s.initial_effect(c) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) - -- Special Summon itself + --Special Summon itself local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_ATKCHANGE) @@ -40,7 +40,7 @@ function s.matfilter(c,scard,sumtype,tp) end function s.thcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() - return c:IsReincarnationSummoned() and c:IsSummonType(SUMMON_TYPE_LINK) + return c:IsReincarnationSummoned() and c:IsLinkSummoned() end function s.thfilter(c) return c:IsSetCard(SET_SALAMANGREAT) and c:IsAbleToHand() @@ -82,7 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) then - -- Increase ATK + --Increase ATK local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) diff --git a/official/c57296396.lua b/official/c57296396.lua index adac298d9e..1a72b933bc 100644 --- a/official/c57296396.lua +++ b/official/c57296396.lua @@ -65,7 +65,7 @@ function s.atkdefop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(ct*-100) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_UPDATE_DEFENSE) diff --git a/official/c57357130.lua b/official/c57357130.lua index c42c784df8..7207404b21 100644 --- a/official/c57357130.lua +++ b/official/c57357130.lua @@ -1,5 +1,5 @@ --転生炎獣ウィーゼル ---Salamangreat Wheesel +--Salamangreat Weasel --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/official/c57722593.lua b/official/c57722593.lua index 10146df73e..49ca97a49c 100644 --- a/official/c57722593.lua +++ b/official/c57722593.lua @@ -54,7 +54,7 @@ function s.aclimop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c57736667.lua b/official/c57736667.lua index 905e7c9255..98765d1edb 100644 --- a/official/c57736667.lua +++ b/official/c57736667.lua @@ -4,13 +4,13 @@ local s,id=GetID() function s.initial_effect(c) aux.AddEquipProcedure(c) - -- Prevent destruction by effects + --Prevent destruction by effects local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_EQUIP) e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) e1:SetValue(1) c:RegisterEffect(e1) - -- Return 1 card on the field to the hand + --Return 1 card on the field to the hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_TOHAND) @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetTarget(s.thtg) e2:SetOperation(s.thop) c:RegisterEffect(e2) - -- Special Summon 1 "Mikanko" monster from the GY + --Special Summon 1 "Mikanko" monster from the GY local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -70,7 +70,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then local c=e:GetHandler() - -- Banish it when it leaves the field + --Banish it when it leaves the field local e1=Effect.CreateEffect(c) e1:SetDescription(3300) e1:SetType(EFFECT_TYPE_SINGLE) @@ -80,7 +80,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetValue(LOCATION_REMOVED) tc:RegisterEffect(e1,true) if c:IsRelateToEffect(e) and Duel.Equip(tp,c,tc) then - -- Equip limit + --Equip limit local e2=Effect.CreateEffect(tc) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) diff --git a/official/c57775790.lua b/official/c57775790.lua index 5e96424f99..e958ef8d0d 100644 --- a/official/c57775790.lua +++ b/official/c57775790.lua @@ -1,5 +1,5 @@ --魔轟神界の復活 ---Fablem Realm Resurrection +--Fabled Realm Resurrection --Scripted by The Razgriz local s,id=GetID() function s.initial_effect(c) @@ -51,7 +51,7 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp) end end function s.sumfilter(c,tp) - return c:IsSetCard(SET_FABLED) and c:IsType(TYPE_SYNCHRO) and c:IsSummonType(SUMMON_TYPE_SYNCHRO) and c:IsSummonPlayer(tp) + return c:IsSetCard(SET_FABLED) and c:IsType(TYPE_SYNCHRO) and c:IsSynchroSummoned() and c:IsSummonPlayer(tp) end function s.limcon(e,tp,eg,ep,ev,re,r,rp) return eg:IsExists(s.sumfilter,1,nil,tp) diff --git a/official/c57869175.lua b/official/c57869175.lua index d2c5644f4d..1e6d5b5be4 100644 --- a/official/c57869175.lua +++ b/official/c57869175.lua @@ -94,7 +94,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) if tc==e:GetHandler() then e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE|RESET_PHASE|PHASE_END) else - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) end if ch==1 then ct=-ct diff --git a/official/c57964143.lua b/official/c57964143.lua index 9c01ee48d4..e977173479 100644 --- a/official/c57964143.lua +++ b/official/c57964143.lua @@ -1,5 +1,5 @@ --白の仲裁 ---White Arbitration +--Arbitration of White --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -69,7 +69,7 @@ function s.tunerop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c58415502.lua b/official/c58415502.lua index 4c59b46837..3c1f3bf1af 100644 --- a/official/c58415502.lua +++ b/official/c58415502.lua @@ -1,9 +1,9 @@ --- ロイヤル・ストレート --- Royal Straight --- Scripted by Hatter +--ロイヤル・ストレート +--Royal Straight +--Scripted by Hatter local s,id=GetID() function s.initial_effect(c) - -- Send "Jack's Knight", "Queen's Knight", and "King's Knight" to the GY + --Send "Jack's Knight", "Queen's Knight", and "King's Knight" to the GY local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SPECIAL_SUMMON) diff --git a/official/c5861892.lua b/official/c5861892.lua index 693625bf75..4b21cba07e 100644 --- a/official/c5861892.lua +++ b/official/c5861892.lua @@ -122,7 +122,7 @@ function s.negtg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:GetFlagEffect(id)==0 end if c:IsHasEffect(EFFECT_REVERSE_UPDATE) then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0) if re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsDestructable() then diff --git a/official/c58707981.lua b/official/c58707981.lua index 8ed0ce26ad..981c266d47 100644 --- a/official/c58707981.lua +++ b/official/c58707981.lua @@ -1,5 +1,5 @@ --無孔砲塔－ディセイブラスター ---Deceiveblaster the Matchless Turret +--Disablaster the Negation Fortress --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/official/c58844135.lua b/official/c58844135.lua index 6558995f0c..b44bf72052 100644 --- a/official/c58844135.lua +++ b/official/c58844135.lua @@ -78,7 +78,7 @@ function s.gyop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetTargetCards(e) g:Match(aux.NOT(Card.IsImmuneToEffect),nil,e) for tc in g:Iter() do - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) --Send to GY local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c58858807.lua b/official/c58858807.lua index 1cab76a690..7140115d63 100644 --- a/official/c58858807.lua +++ b/official/c58858807.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCountLimit(1,id) - e1:SetCondition(function(e) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) end) + e1:SetCondition(function(e) return e:GetHandler():IsXyzSummoned() end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) diff --git a/official/c58884063.lua b/official/c58884063.lua index ad8dccf521..d36398e12b 100644 --- a/official/c58884063.lua +++ b/official/c58884063.lua @@ -45,7 +45,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local tc=Duel.SelectTarget(tp,nil,tp,0,LOCATION_MZONE,1,1,nil) Duel.SetOperationInfo(0,CATEGORY_DESTROY,tc,1,0,0) --Register that this effect was activated this turn - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.cfilter(c,tc,seq) if c:IsLocation(LOCATION_SZONE) then diff --git a/official/c59069885.lua b/official/c59069885.lua index 1ab4493f2b..24e2c1d0b4 100644 --- a/official/c59069885.lua +++ b/official/c59069885.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e2:SetRange(LOCATION_SZONE) e2:SetHintTiming(TIMING_END_PHASE) e2:SetCountLimit(1,{id,1}) - e2:SetCondition(function(e,tp) return Duel.GetCurrentPhase()==PHASE_END and Duel.IsExistingMatchingCard(s.deffilter,tp,LOCATION_MZONE,0,1,nil) end) + e2:SetCondition(function(e,tp) return Duel.IsPhase(PHASE_END) and Duel.IsExistingMatchingCard(s.deffilter,tp,LOCATION_MZONE,0,1,nil) end) e2:SetTarget(s.cttg) e2:SetOperation(s.ctop) c:RegisterEffect(e2) diff --git a/official/c59432181.lua b/official/c59432181.lua index 1b454af8da..6f8fac3d14 100644 --- a/official/c59432181.lua +++ b/official/c59432181.lua @@ -36,7 +36,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_ADD_CODE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(code1) e1:SetOperation(s.chngcon) tc:RegisterEffect(e1) diff --git a/official/c6004133.lua b/official/c6004133.lua index ae401bf9dd..f9d2c36bba 100644 --- a/official/c6004133.lua +++ b/official/c6004133.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) end s.listed_series={SET_ABYSS_ACTOR,SET_ABYSS_SCRIPT} function s.condition(e,tp,eg,ep,ev,re,r,rp) - return Duel.GetCurrentPhase()==PHASE_MAIN1 and not Duel.CheckPhaseActivity() + return Duel.IsPhase(PHASE_MAIN1) and not Duel.CheckPhaseActivity() end function s.thfilter(c) return c:IsAbleToHand() and (c:IsSetCard(SET_ABYSS_ACTOR) or (c:IsSpell() and c:IsSetCard(SET_ABYSS_SCRIPT))) diff --git a/official/c60162470.lua b/official/c60162470.lua index e5f923c321..2b5cf54b50 100644 --- a/official/c60162470.lua +++ b/official/c60162470.lua @@ -72,7 +72,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(e:GetLabelObject():GetLabel()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c60203670.lua b/official/c60203670.lua index 9dda98b7d6..5f446a635f 100644 --- a/official/c60203670.lua +++ b/official/c60203670.lua @@ -70,7 +70,7 @@ function s.tknop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_BE_MATERIAL) e1:SetValue(s.matlimit) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end --Special Summon 1 "Gold Pride Token" diff --git a/official/c60619435.lua b/official/c60619435.lua index dd1c907bfa..3c9e9464b8 100644 --- a/official/c60619435.lua +++ b/official/c60619435.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) end function s.actreg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.spfilter(c,e,tp) return c:IsRace(RACE_INSECT) and c:IsLevelBelow(6) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c60623203.lua b/official/c60623203.lua index d02eee5fbc..e9bad6f5bc 100644 --- a/official/c60623203.lua +++ b/official/c60623203.lua @@ -47,7 +47,7 @@ function s.activate(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c61070601.lua b/official/c61070601.lua index 0524993848..0435ca92f5 100644 --- a/official/c61070601.lua +++ b/official/c61070601.lua @@ -48,13 +48,13 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,ct) + e1:SetReset(RESETS_STANDARD_PHASE_END,ct) sc:RegisterEffect(e1) --Its effects are negated local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,ct) + e2:SetReset(RESETS_STANDARD_PHASE_END,ct) sc:RegisterEffect(e2) local e3=e2:Clone() e3:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c61397885.lua b/official/c61397885.lua index 72f87a0b98..4fc3d73179 100644 --- a/official/c61397885.lua +++ b/official/c61397885.lua @@ -62,7 +62,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(-1000) tc:RegisterEffect(e1) local e2=e1:Clone() @@ -72,13 +72,13 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_DISABLE) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) local e4=Effect.CreateEffect(c) e4:SetType(EFFECT_TYPE_SINGLE) e4:SetCode(EFFECT_DISABLE_EFFECT) e4:SetValue(RESET_TURN_SET) - e4:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e4:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e4) end end diff --git a/official/c61845881.lua b/official/c61845881.lua index 8f0384e83b..84af0f5dab 100644 --- a/official/c61845881.lua +++ b/official/c61845881.lua @@ -71,7 +71,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESETS_STANDARD_PHASE_END,2) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c62528292.lua b/official/c62528292.lua index 31d74df48a..6651fc447e 100644 --- a/official/c62528292.lua +++ b/official/c62528292.lua @@ -87,7 +87,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e2:SetCode(EVENT_ATTACK_ANNOUNCE) e2:SetTarget(s.destg) e2:SetOperation(s.desop) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c63144961.lua b/official/c63144961.lua index c6427c617a..9a943db111 100644 --- a/official/c63144961.lua +++ b/official/c63144961.lua @@ -69,7 +69,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DIRECT_ATTACK) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) elseif op==3 and Duel.IsAbleToEnterBP() then --Inflict damage each time it destroys a monster @@ -79,7 +79,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e3:SetCode(EVENT_BATTLE_DESTROYING) e3:SetCondition(aux.bdocon) e3:SetOperation(function(_,tp) Duel.Damage(1-tp,tc:GetBattleTarget():GetTextAttack(),REASON_EFFECT) end) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) end end diff --git a/official/c64881644.lua b/official/c64881644.lua index 322d3ce130..f70d9476ba 100644 --- a/official/c64881644.lua +++ b/official/c64881644.lua @@ -70,7 +70,7 @@ function s.tgatkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(sc:GetLevel()*200) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end function s.thfilter(c) diff --git a/official/c65892585.lua b/official/c65892585.lua index a3bca0c66f..f480ce593d 100644 --- a/official/c65892585.lua +++ b/official/c65892585.lua @@ -40,7 +40,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetPossibleOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK) --Register that this effect was activated this turn - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_OATH,1) end function s.tgfilter(c) return c:IsMonster() and c:IsSetCard(SET_GOLD_PRIDE) and c:IsAbleToGrave() diff --git a/official/c65898344.lua b/official/c65898344.lua index a9f354d52d..a8458c8991 100644 --- a/official/c65898344.lua +++ b/official/c65898344.lua @@ -54,7 +54,7 @@ end function s.rmop(e,tp,eg,ep,ev,re,r,rp) local tg=Duel.GetTargetCards(e) if #tg~=2 then return end - local reset_count=(Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_STANDBY) and 2 or 1 + local reset_count=(Duel.IsTurnPlayer(tp) and Duel.IsPhase(PHASE_STANDBY)) and 2 or 1 local turn_chk=Duel.GetTurnCount() aux.RemoveUntil(tg,nil,REASON_EFFECT,PHASE_STANDBY,id,e,tp, aux.DefaultFieldReturnOp, @@ -88,7 +88,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c66011101.lua b/official/c66011101.lua index 8e186678c1..523ddb230c 100644 --- a/official/c66011101.lua +++ b/official/c66011101.lua @@ -105,7 +105,7 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_SET_ATTACK_FINAL) e2:SetValue(tc:GetAttack()*2) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c66367984.lua b/official/c66367984.lua index 8f1b18d998..ddabe7eabd 100644 --- a/official/c66367984.lua +++ b/official/c66367984.lua @@ -42,7 +42,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) local tc=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_MZONE,0,1,1,nil):GetFirst() if Duel.Remove(tc,POS_FACEUP,REASON_COST+REASON_TEMPORARY)>0 then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) --Return it in the End Phase local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) diff --git a/official/c66401502.lua b/official/c66401502.lua index 93d870ee01..02eddaf0a3 100644 --- a/official/c66401502.lua +++ b/official/c66401502.lua @@ -88,7 +88,7 @@ function s.vsop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) elseif op==2 then local cg=c:GetColumnGroup():Match(Card.IsSpellTrap,nil) diff --git a/official/c66736715.lua b/official/c66736715.lua index 7ec00f734d..b290f828d5 100644 --- a/official/c66736715.lua +++ b/official/c66736715.lua @@ -91,9 +91,9 @@ function s.checkop(e,tp) e2:SetCondition(s.pencon2) e2:SetOperation(s.penop2) e2:SetValue(SUMMON_TYPE_PENDULUM) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) olpz:RegisterEffect(e2) - olpz:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + olpz:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.pencon1(e,c,og) diff --git a/official/c66848311.lua b/official/c66848311.lua index 0030895780..88d3c14740 100644 --- a/official/c66848311.lua +++ b/official/c66848311.lua @@ -72,7 +72,7 @@ function s.ctrlop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(-atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) ac:RegisterEffect(e1) end end diff --git a/official/c67030233.lua b/official/c67030233.lua index e4c62cb1c2..e019e459fc 100644 --- a/official/c67030233.lua +++ b/official/c67030233.lua @@ -85,12 +85,12 @@ function s.disop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) 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_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) if tc:IsImmuneToEffect(e1) or tc:IsImmuneToEffect(e2) or not c:IsRelateToEffect(e) or c:IsFacedown() then return end Duel.AdjustInstantly(tc) diff --git a/official/c67508932.lua b/official/c67508932.lua index cda35d76f1..2f63030ceb 100644 --- a/official/c67508932.lua +++ b/official/c67508932.lua @@ -57,9 +57,9 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) if Duel.Remove(g,POS_FACEUP,REASON_EFFECT)>0 then local og=Duel.GetOperatedGroup() for oc in og:Iter() do - oc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1,c:GetFieldID()) + oc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1,c:GetFieldID()) end - c:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id+1,RESETS_STANDARD_PHASE_END,0,1) end local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c68941332.lua b/official/c68941332.lua index 40c5ce5681..a1ed57b725 100644 --- a/official/c68941332.lua +++ b/official/c68941332.lua @@ -58,7 +58,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_TRIGGER) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Gain control of the target if e:GetLabel()==1 and tc:IsControlerCanBeChanged() and tc:IsControler(1-tp) then @@ -70,7 +70,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_CHANGE_RACE) e2:SetValue(RACE_PLANT) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c69120785.lua b/official/c69120785.lua index b3b6bb42c3..c46255a64f 100644 --- a/official/c69120785.lua +++ b/official/c69120785.lua @@ -88,7 +88,7 @@ function s.rmvop(e,tp,eg,ep,ev,re,r,rp) local fid=c:GetFieldID() local og=Duel.GetOperatedGroup() for oc in og:Iter() do - oc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,2,fid) + oc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,2,fid) end og:KeepAlive() --Return the banished cards to the Extra Deck diff --git a/official/c69133798.lua b/official/c69133798.lua index dca20c9f10..112a4c87ab 100644 --- a/official/c69133798.lua +++ b/official/c69133798.lua @@ -42,7 +42,7 @@ function s.cfilter(c) return c:IsRace(RACE_ZOMBIE) and not c:IsCode(id) end function s.thcon(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_MAIN1 and not Duel.CheckPhaseActivity() + return Duel.IsTurnPlayer(tp) and Duel.IsPhase(PHASE_MAIN1) and not Duel.CheckPhaseActivity() and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,2,nil) end function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c69811710.lua b/official/c69811710.lua index d95bb32a64..f965aeb9e9 100644 --- a/official/c69811710.lua +++ b/official/c69811710.lua @@ -51,7 +51,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end diff --git a/official/c69831560.lua b/official/c69831560.lua index 2ef8f9d8e9..663c074270 100644 --- a/official/c69831560.lua +++ b/official/c69831560.lua @@ -115,7 +115,7 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_CHANGE_POSITION) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_COPY_INHERIT+EFFECT_FLAG_CLIENT_HINT) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END|RESET_SELF_TURN,2) + e1:SetReset(RESETS_STANDARD_PHASE_END|RESET_SELF_TURN,2) c:RegisterEffect(e1) end function s.desop1(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c69931927.lua b/official/c69931927.lua index 1dc0c156fa..0c0355e6fc 100644 --- a/official/c69931927.lua +++ b/official/c69931927.lua @@ -60,7 +60,7 @@ function s.damcost(e,tp,eg,ep,ev,re,r,rp,chk) 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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e:GetHandler():RegisterEffect(e1) end function s.damtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c71222868.lua b/official/c71222868.lua index af8510763f..a4d97cdfa9 100644 --- a/official/c71222868.lua +++ b/official/c71222868.lua @@ -78,6 +78,6 @@ function s.copyop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if c:IsRelateToEffect(e) and c:IsFaceup() and tc:IsRelateToEffect(e) then local code=tc:GetOriginalCodeRule() - c:CopyEffect(code,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,1) + c:CopyEffect(code,RESETS_STANDARD_PHASE_END,1) end end diff --git a/official/c71797713.lua b/official/c71797713.lua index 798359981c..f44a7347ea 100644 --- a/official/c71797713.lua +++ b/official/c71797713.lua @@ -51,7 +51,7 @@ function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) fc=fg:Select(tp,1,1,nil) end Duel.Hint(HINT_CARD,0,fc:GetCode()) - fc:RegisterFlagEffect(CARD_ELEMENTAL_PLACE,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,0) + fc:RegisterFlagEffect(CARD_ELEMENTAL_PLACE,RESETS_STANDARD_PHASE_END,0,0) end local flag=0 if g:IsExists(s.regfilter,1,nil,ATTRIBUTE_EARTH|ATTRIBUTE_WIND) then flag=flag|0x1 end diff --git a/official/c71818935.lua b/official/c71818935.lua index 193fa0c810..be8889af8c 100644 --- a/official/c71818935.lua +++ b/official/c71818935.lua @@ -43,11 +43,11 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetAbsoluteRange(tp,1,0) e1:SetOperation(s.extracon) e1:SetValue(s.extraval) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) c:CreateEffectRelation(e1) tc:SetCardTarget(c) - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) end function s.extrafilter(c,tp) return c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) diff --git a/official/c71948047.lua b/official/c71948047.lua index ed4bbd41c1..da633125a9 100644 --- a/official/c71948047.lua +++ b/official/c71948047.lua @@ -49,7 +49,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(1500) tc:RegisterEffect(e1) local e2=e1:Clone() diff --git a/official/c72233469.lua b/official/c72233469.lua index 7003600ee1..f1d4d066c5 100644 --- a/official/c72233469.lua +++ b/official/c72233469.lua @@ -36,5 +36,5 @@ end function s.lpop(e,tp,eg,ep,ev,re,r,rp) Duel.SetLP(1-tp,Duel.GetLP(1-tp)-1000) Duel.Recover(tp,500,REASON_EFFECT) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,nil,aux.Stringid(id,1)) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,nil,aux.Stringid(id,1)) end \ No newline at end of file diff --git a/official/c7279373.lua b/official/c7279373.lua index ea14dc2a2d..566eaf3c54 100644 --- a/official/c7279373.lua +++ b/official/c7279373.lua @@ -60,7 +60,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_EXTRA_ATTACK_MONSTER) e1:SetValue(2) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end --Other monsters you control cannot attack for the rest of this turn diff --git a/official/c73061465.lua b/official/c73061465.lua index be5cbb3e81..20df985c3f 100644 --- a/official/c73061465.lua +++ b/official/c73061465.lua @@ -27,7 +27,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetTargetRange(1,1) e1:SetValue(s.tgval) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,3) + e1:SetReset(RESETS_STANDARD_PHASE_END,3) c:RegisterEffect(e1) end function s.tgval(e,re,rp) diff --git a/official/c73167098.lua b/official/c73167098.lua index 43c2bfe82c..8eb85dbb15 100644 --- a/official/c73167098.lua +++ b/official/c73167098.lua @@ -81,7 +81,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(ev) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c73421698.lua b/official/c73421698.lua index 081bf52918..a5610107bb 100644 --- a/official/c73421698.lua +++ b/official/c73421698.lua @@ -54,7 +54,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(500) tc:RegisterEffect(e1) end diff --git a/official/c73551138.lua b/official/c73551138.lua index 2d28fe7dc4..a7ac1e2645 100644 --- a/official/c73551138.lua +++ b/official/c73551138.lua @@ -75,6 +75,6 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SINGLE_RANGE) e1:SetCode(3682106) e1:SetRange(LOCATION_MZONE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e:GetHandler():RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c74689476.lua b/official/c74689476.lua index 14874798f9..e24a7a3b5e 100644 --- a/official/c74689476.lua +++ b/official/c74689476.lua @@ -74,6 +74,6 @@ end function s.disop(e,tp,eg,ep,ev,re,r,rp,chk) local tc=Duel.GetFirstTarget() if tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsDisabled() then - tc:NegateEffects(e:GetHandler(),RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + tc:NegateEffects(e:GetHandler(),RESETS_STANDARD_PHASE_END) end end \ No newline at end of file diff --git a/official/c7496001.lua b/official/c7496001.lua index 0539dcb207..ada992567e 100644 --- a/official/c7496001.lua +++ b/official/c7496001.lua @@ -51,7 +51,7 @@ function s.caop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_CANNOT_DISABLE) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1,true) end end diff --git a/official/c75147529.lua b/official/c75147529.lua index d60c80f328..c3582995f5 100644 --- a/official/c75147529.lua +++ b/official/c75147529.lua @@ -59,12 +59,12 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) e1:SetCountLimit(1) e1:SetLabel(Duel.GetTurnCount()) e1:SetLabelObject(tc) - if Duel.GetCurrentPhase()==PHASE_END and Duel.IsTurnPlayer(1-tp) then + if Duel.IsPhase(PHASE_END) and Duel.IsTurnPlayer(1-tp) then e1:SetLabel(Duel.GetTurnCount()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END|RESET_OPPO_TURN,2) + e1:SetReset(RESETS_STANDARD_PHASE_END|RESET_OPPO_TURN,2) else e1:SetLabel(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END|RESET_OPPO_TURN) + e1:SetReset(RESETS_STANDARD_PHASE_END|RESET_OPPO_TURN) end e1:SetCondition(s.retcon) e1:SetOperation(s.retop) diff --git a/official/c76685519.lua b/official/c76685519.lua index f82490f1f1..a60f37fecb 100644 --- a/official/c76685519.lua +++ b/official/c76685519.lua @@ -51,7 +51,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP,zone)>0 then if c:GetAttackAnnouncedCount()>0 then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end tc:CreateRelation(c,RESET_EVENT|RESETS_STANDARD) --The Special Summoned monster cannot attack @@ -70,7 +70,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e2:SetCode(EVENT_ATTACK_ANNOUNCE) e2:SetLabelObject(tc) e2:SetCondition(function(e) return e:GetLabelObject():IsRelateToCard(e:GetHandler()) end) - e2:SetOperation(function(e) e:GetLabelObject():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) end) + e2:SetOperation(function(e) e:GetLabelObject():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end) e2:SetReset(RESET_EVENT|RESETS_STANDARD) c:RegisterEffect(e2) end diff --git a/official/c76728962.lua b/official/c76728962.lua index 7f3608beac..a102394fcc 100644 --- a/official/c76728962.lua +++ b/official/c76728962.lua @@ -69,7 +69,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e:GetHandler():RegisterEffect(e1) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c77498348.lua b/official/c77498348.lua index 78ab719fc1..d735d1d9ba 100644 --- a/official/c77498348.lua +++ b/official/c77498348.lua @@ -64,7 +64,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) e:GetLabelObject():SetLabel(e:GetLabel()) end function s.rmcost(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.GetCurrentPhase()==PHASE_MAIN1 end + if chk==0 then return Duel.IsPhase(PHASE_MAIN1) end local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD) e1:SetCode(EFFECT_CANNOT_BP) diff --git a/official/c77765207.lua b/official/c77765207.lua index c2f4d7d45e..5d28f16b5c 100644 --- a/official/c77765207.lua +++ b/official/c77765207.lua @@ -41,7 +41,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) local sc=Duel.SelectMatchingCard(tp,s.plfilter,tp,LOCATION_DECK,0,1,1,nil):GetFirst() if sc and Duel.MoveToField(sc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then - sc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + sc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) local c=e:GetHandler() --Treat it as a Continuous Trap local e1=Effect.CreateEffect(c) diff --git a/official/c78144171.lua b/official/c78144171.lua index 2d0c763748..b94953d4a3 100644 --- a/official/c78144171.lua +++ b/official/c78144171.lua @@ -58,6 +58,6 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) 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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c78348934.lua b/official/c78348934.lua index 755835e0a5..b6150c4f80 100644 --- a/official/c78348934.lua +++ b/official/c78348934.lua @@ -58,7 +58,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_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(ct*500) tc:RegisterEffect(e1) local e2=e1:Clone() diff --git a/official/c7841112.lua b/official/c7841112.lua index fc35b9d030..539b8aaae6 100644 --- a/official/c7841112.lua +++ b/official/c7841112.lua @@ -91,12 +91,12 @@ function s.disop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) 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_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) Duel.MajesticCopy(c,tc) end @@ -110,7 +110,7 @@ function s.alop(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetTargetRange(1,1) e1:SetValue(s.aclimit) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e:GetHandler():RegisterEffect(e1) end end diff --git a/official/c78534861.lua b/official/c78534861.lua index e11856f229..4812299193 100644 --- a/official/c78534861.lua +++ b/official/c78534861.lua @@ -70,7 +70,7 @@ function s.distg(e,c) local bc=c:GetBattleTarget() if c:IsRelateToBattle() and bc and bc:IsControler(e:GetHandlerPlayer()) and bc:IsFaceup() and bc:IsSetCard({SET_SCARECLAW,SET_KASHTIRA}) then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1,fid) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1,fid) return true end return false diff --git a/official/c79523365.lua b/official/c79523365.lua index f15de53a90..7243855d10 100644 --- a/official/c79523365.lua +++ b/official/c79523365.lua @@ -63,7 +63,7 @@ function s.spop1(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c79552283.lua b/official/c79552283.lua index aae93eb4b2..9f4b2dea70 100644 --- a/official/c79552283.lua +++ b/official/c79552283.lua @@ -56,7 +56,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetRange(LOCATION_MZONE) e1:SetValue(function(_,c) return c:GetAttack()>c:GetDefense() and 0 or 1 end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end function s.cfilter(c) diff --git a/official/c79905468.lua b/official/c79905468.lua index 5edff00154..7a50238ff1 100644 --- a/official/c79905468.lua +++ b/official/c79905468.lua @@ -49,7 +49,7 @@ function s.atkdefop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(500) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,ct) + e1:SetReset(RESETS_STANDARD_PHASE_END,ct) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_UPDATE_DEFENSE) diff --git a/official/c80722024.lua b/official/c80722024.lua index 19957efe5e..c08a54f76f 100644 --- a/official/c80722024.lua +++ b/official/c80722024.lua @@ -78,7 +78,7 @@ function s.pdop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_PIERCE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c81000306.lua b/official/c81000306.lua index 898d6da221..383c786338 100644 --- a/official/c81000306.lua +++ b/official/c81000306.lua @@ -24,14 +24,14 @@ end function s.activate(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if not tc:IsRelateToEffect(e) or tc:HasFlagEffect(id) then return end - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,1)) local c=e:GetHandler() --Cannot be destroyed by battle local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Players take no battle damage from its attacks local e2=e1:Clone() @@ -46,7 +46,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e4:SetCode(EVENT_BATTLED) e4:SetOperation(s.desop) - e4:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e4:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e4) end function s.desop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c81146288.lua b/official/c81146288.lua index 1a52f20685..4e4c6da6d1 100644 --- a/official/c81146288.lua +++ b/official/c81146288.lua @@ -69,18 +69,18 @@ function s.disop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) 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_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) if tc:IsType(TYPE_TRAPMONSTER) then local e3=Effect.CreateEffect(c) e3:SetType(EFFECT_TYPE_SINGLE) e3:SetCode(EFFECT_DISABLE_TRAPMONSTER) - e3:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e3:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e3) end end diff --git a/official/c81470373.lua b/official/c81470373.lua index 21a64bed51..4c7b94e8e3 100644 --- a/official/c81470373.lua +++ b/official/c81470373.lua @@ -80,7 +80,7 @@ function s.plop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_UNCOPYABLE) e1:SetCode(EFFECT_SUMMON_PROC) e1:SetCondition(s.ntcon) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) local b1=c:IsAbleToGrave() local b2=c:IsSummonable(true,e1) diff --git a/official/c8152834.lua b/official/c8152834.lua index dc2d28f8a8..96b4c86831 100644 --- a/official/c8152834.lua +++ b/official/c8152834.lua @@ -27,7 +27,7 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp) local rc=re:GetHandler() local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION) if re:IsMonsterEffect() and rc:IsRelateToEffect(re) and loc==LOCATION_MZONE then - rc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + rc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.desfilter(c,tp) diff --git a/official/c81978611.lua b/official/c81978611.lua index 5b5ffcec91..461853db8e 100644 --- a/official/c81978611.lua +++ b/official/c81978611.lua @@ -59,7 +59,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_LEVEL_FINAL) e1:SetValue(lv) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c82105704.lua b/official/c82105704.lua index dd8b67c298..630dba9185 100644 --- a/official/c82105704.lua +++ b/official/c82105704.lua @@ -44,7 +44,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_INDESTRUCTABLE_COUNT) e1:SetCountLimit(1) e1:SetValue(s.indesval) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESETS_STANDARD_PHASE_END,2) tc:RegisterEffect(e1) --Discard 1 card and Special Summon 1 "Purrely" monster from the Deck if Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) diff --git a/official/c82134632.lua b/official/c82134632.lua index 3300b559e0..ef0c52b33f 100644 --- a/official/c82134632.lua +++ b/official/c82134632.lua @@ -55,6 +55,6 @@ function s.op(tc,c,atk) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atk) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end \ No newline at end of file diff --git a/official/c82308875.lua b/official/c82308875.lua index c361c8e9a7..e0e8d3d0f3 100644 --- a/official/c82308875.lua +++ b/official/c82308875.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(d1*700) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESETS_STANDARD_PHASE_END,2) c:RegisterEffect(e1) if d1+d2~=7 then return end --If the total roll is exactly 7, apply 1 effect diff --git a/official/c83533296.lua b/official/c83533296.lua index 0c2b3d4e4b..84fed5290d 100644 --- a/official/c83533296.lua +++ b/official/c83533296.lua @@ -75,7 +75,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end Duel.SpecialSummonComplete() diff --git a/official/c83589191.lua b/official/c83589191.lua index 5d81a655eb..c84595b6cc 100644 --- a/official/c83589191.lua +++ b/official/c83589191.lua @@ -50,7 +50,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(Duel.GetLP(p)) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end --Any damage your opponent takes is halved diff --git a/official/c83723605.lua b/official/c83723605.lua index b0569efe9b..5e773a41ae 100644 --- a/official/c83723605.lua +++ b/official/c83723605.lua @@ -54,7 +54,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) sc:RegisterEffect(e1) --Cannot be destroyed by battle this turn local e2=e1:Clone() diff --git a/official/c83962752.lua b/official/c83962752.lua index 9729154357..3b836483ca 100644 --- a/official/c83962752.lua +++ b/official/c83962752.lua @@ -121,7 +121,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetValue(1) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1,true) local e2=e1:Clone() e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) diff --git a/official/c84138874.lua b/official/c84138874.lua index 519b69b0fd..8900353842 100644 --- a/official/c84138874.lua +++ b/official/c84138874.lua @@ -68,7 +68,7 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) end end function s.tdcond(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsTurnPlayer(1-tp) and Duel.GetCurrentPhase()==PHASE_END + return Duel.IsTurnPlayer(1-tp) and Duel.IsPhase(PHASE_END) end function s.tdfilter(c) return c:IsSetCard(SET_VOLCANIC) and c:IsMonster() and c:IsFaceup() and c:IsAbleToDeck() diff --git a/official/c84281045.lua b/official/c84281045.lua index 3a88b8c9fd..47140e1a13 100644 --- a/official/c84281045.lua +++ b/official/c84281045.lua @@ -73,7 +73,7 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(1200) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end elseif op==2 then diff --git a/official/c85407683.lua b/official/c85407683.lua index 4305270d1e..ff776c0505 100644 --- a/official/c85407683.lua +++ b/official/c85407683.lua @@ -45,7 +45,7 @@ function s.indesval(e,re,r,rp) end end function s.tdcond(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_END + return Duel.IsTurnPlayer(tp) and Duel.IsPhase(PHASE_END) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,CARD_VISAS_STARFROST),tp,LOCATION_ONFIELD,0,1,nil) end function s.tdfilter(c,tohand) diff --git a/official/c85747929.lua b/official/c85747929.lua index b6e510e381..ff85c9bf4b 100644 --- a/official/c85747929.lua +++ b/official/c85747929.lua @@ -107,7 +107,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(lv) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c86066372.lua b/official/c86066372.lua index 979bd7afce..4eca3cd340 100644 --- a/official/c86066372.lua +++ b/official/c86066372.lua @@ -118,6 +118,6 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) end s.attr_list[tp]=s.attr_list[tp]|att for _,str in aux.GetAttributeStrings(att) do - e:GetHandler():RegisterFlagEffect(0,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,str) + e:GetHandler():RegisterFlagEffect(0,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,str) end end \ No newline at end of file diff --git a/official/c86379342.lua b/official/c86379342.lua index adcce85ebf..94a4c49491 100644 --- a/official/c86379342.lua +++ b/official/c86379342.lua @@ -71,7 +71,7 @@ function s.negop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c863795.lua b/official/c863795.lua index a2879f67dd..6098d93857 100644 --- a/official/c863795.lua +++ b/official/c863795.lua @@ -68,7 +68,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetValue(4) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c86784733.lua b/official/c86784733.lua index 4ad98ece77..48a6f8f7d9 100644 --- a/official/c86784733.lua +++ b/official/c86784733.lua @@ -45,7 +45,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_LEVEL) e1:SetValue(tc:GetOriginalLevel()) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c87676171.lua b/official/c87676171.lua index 9a7bd89912..e63f0c03b2 100644 --- a/official/c87676171.lua +++ b/official/c87676171.lua @@ -69,7 +69,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(2000) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,2) + e1:SetReset(RESETS_STANDARD_PHASE_END,2) c:RegisterEffect(e1) end end diff --git a/official/c87837090.lua b/official/c87837090.lua index 8f597388c9..2b40502ea9 100644 --- a/official/c87837090.lua +++ b/official/c87837090.lua @@ -58,7 +58,7 @@ function s.nonatkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,Duel.IsTurnPlayer(tp) and 2 or 1) + e1:SetReset(RESETS_STANDARD_PHASE_END,Duel.IsTurnPlayer(tp) and 2 or 1) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c88190790.lua b/official/c88190790.lua index d4e5af7fe6..e8814c4970 100644 --- a/official/c88190790.lua +++ b/official/c88190790.lua @@ -44,7 +44,7 @@ function s.maop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_EXTRA_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(1) tc:RegisterEffect(e1) end diff --git a/official/c88890658.lua b/official/c88890658.lua index 086e3c08a9..b06be3798b 100644 --- a/official/c88890658.lua +++ b/official/c88890658.lua @@ -50,13 +50,13 @@ function s.negop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end --Tribute as many monsters as possible diff --git a/official/c89423971.lua b/official/c89423971.lua index 0519396602..54644ecfde 100644 --- a/official/c89423971.lua +++ b/official/c89423971.lua @@ -43,7 +43,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH+EFFECT_FLAG_CLIENT_HINT) e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) diff --git a/official/c8953369.lua b/official/c8953369.lua index 2116400f40..55362f98a7 100644 --- a/official/c8953369.lua +++ b/official/c8953369.lua @@ -94,14 +94,14 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end \ No newline at end of file diff --git a/official/c89662401.lua b/official/c89662401.lua index 9478d8426b..00f09084d6 100644 --- a/official/c89662401.lua +++ b/official/c89662401.lua @@ -71,12 +71,12 @@ end function s.caop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() if tc:IsFacedown() and tc:IsRelateToEffect(e) then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,2)) --Cannot be activated this turn local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CANNOT_TRIGGER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c89789152.lua b/official/c89789152.lua index 06b1d3a86f..b03cf0084a 100644 --- a/official/c89789152.lua +++ b/official/c89789152.lua @@ -42,7 +42,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetValue(s.efilter) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) --Cannot be destroyed by battle local e2=Effect.CreateEffect(c) @@ -51,7 +51,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e2:SetValue(1) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c90673288.lua b/official/c90673288.lua index c751fbef67..e11ab9e367 100644 --- a/official/c90673288.lua +++ b/official/c90673288.lua @@ -24,7 +24,7 @@ function s.initial_effect(c) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e3:SetCode(EVENT_SPSUMMON_SUCCESS) - e3:SetOperation(function(e) e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) end) + e3:SetOperation(function(e) e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end) c:RegisterEffect(e3) --Search 1 "Sky Striker" Spell local e4=Effect.CreateEffect(c) diff --git a/official/c90681088.lua b/official/c90681088.lua index 493968f1ef..789ec51c15 100644 --- a/official/c90681088.lua +++ b/official/c90681088.lua @@ -77,7 +77,7 @@ function s.threg(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() if not c:IsLocation(LOCATION_GRAVE) then return end local turn_ct=Duel.GetTurnCount() - local ct=Duel.GetCurrentPhase()==PHASE_STANDBY and 2 or 1 + local ct=Duel.IsPhase(PHASE_STANDBY) and 2 or 1 --Add this card from your GY to your hand local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,2)) diff --git a/official/c9069157.lua b/official/c9069157.lua index 7652a473df..fd79eac5bc 100644 --- a/official/c9069157.lua +++ b/official/c9069157.lua @@ -94,7 +94,7 @@ function s.limop(e,tp,eg,ep,ev,re,r,rp) if Duel.GetCurrentChain()==0 then Duel.SetChainLimitTillChainEnd(s.chainlm) elseif Duel.GetCurrentChain()==1 then - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetCode(EVENT_CHAINING) diff --git a/official/c90965652.lua b/official/c90965652.lua index a202917445..343afdd6da 100644 --- a/official/c90965652.lua +++ b/official/c90965652.lua @@ -90,12 +90,12 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(0) tc1:RegisterEffect(e1) if not tc1:IsAttack(0) then return end local tc2=(sg-tc1):GetFirst() if not tc2 or tc2:IsImmuneToEffect(e) then return end --Increase ATK - tc2:UpdateAttack(tc1:GetBaseAttack(),RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,c) + tc2:UpdateAttack(tc1:GetBaseAttack(),RESETS_STANDARD_PHASE_END,c) end \ No newline at end of file diff --git a/official/c91073013.lua b/official/c91073013.lua index 8ebb415bf5..09a591df3a 100644 --- a/official/c91073013.lua +++ b/official/c91073013.lua @@ -104,7 +104,7 @@ function s.vsop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetRange(LOCATION_MZONE) e1:SetValue(function(e,te) return te:IsActivated() and te:GetOwnerPlayer()~=e:GetHandlerPlayer() end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) elseif op==2 then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/official/c91512835.lua b/official/c91512835.lua index f4b9c3641f..964faa6a0e 100644 --- a/official/c91512835.lua +++ b/official/c91512835.lua @@ -60,7 +60,7 @@ function s.value(e,c) return Duel.GetMatchingGroupCount(aux.FaceupFilter(Card.IsRace,RACE_INSECT),0,LOCATION_MZONE,LOCATION_MZONE,nil)*200 end function s.regop(e,tp,eg,ep,ev,re,r,rp) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end diff --git a/official/c91706817.lua b/official/c91706817.lua index 9f9f0616a4..5060a4ed90 100644 --- a/official/c91706817.lua +++ b/official/c91706817.lua @@ -58,14 +58,14 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET) - e2:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e2:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e2) end end diff --git a/official/c91880660.lua b/official/c91880660.lua index af0d6896c2..8e738c509a 100644 --- a/official/c91880660.lua +++ b/official/c91880660.lua @@ -50,7 +50,7 @@ function s.exctop(e,tp,eg,ep,ev,re,r,rp) Duel.ConfirmDecktop(tp,ct) --Register a flag if 9+ cards were excavated if ct>=9 then - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end local thg=Duel.GetDecktopGroup(tp,ct) local decrease=0 diff --git a/official/c91957038.lua b/official/c91957038.lua index 919ae41b47..25e07186e7 100644 --- a/official/c91957038.lua +++ b/official/c91957038.lua @@ -63,7 +63,7 @@ function s.damcon(e) end function s.damval(e,re,val,r,rp,rc) if r&(REASON_BATTLE|REASON_EFFECT)>0 then - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) Duel.Hint(HINT_CARD,0,id) return 0 end diff --git a/official/c92607427.lua b/official/c92607427.lua index 1e0d1f16c7..3352468e55 100644 --- a/official/c92607427.lua +++ b/official/c92607427.lua @@ -49,7 +49,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EVENT_BATTLE_DESTROYING) e1:SetCondition(s.chainatkcon) e1:SetOperation(function() Duel.ChainAttack() end) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end --You cannot declare attacks except with that monster diff --git a/official/c93729896.lua b/official/c93729896.lua index 7a3d949cca..a96b5545ef 100644 --- a/official/c93729896.lua +++ b/official/c93729896.lua @@ -110,7 +110,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) g:DeleteGroup() end ) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end diff --git a/official/c94016752.lua b/official/c94016752.lua index c8270d6d1d..3fd7b51753 100644 --- a/official/c94016752.lua +++ b/official/c94016752.lua @@ -41,7 +41,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(sc,true) local code=sc:GetCode() if Duel.SendtoGrave(sc,REASON_RULE,PLAYER_NONE,1-tp)>0 then - sc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + sc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) --Cannot activate the monster effects of that monster or monsters with that name local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_FIELD) diff --git a/official/c94185340.lua b/official/c94185340.lua index aaacf87dea..09b59129f3 100644 --- a/official/c94185340.lua +++ b/official/c94185340.lua @@ -52,7 +52,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) 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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) sc:RegisterEffect(e1,true) end end diff --git a/official/c94303232.lua b/official/c94303232.lua index e91ccb98b1..142ea02745 100644 --- a/official/c94303232.lua +++ b/official/c94303232.lua @@ -40,7 +40,7 @@ end function s.checkop(e,tp,eg,ep,ev,re,r,rp) for tc in eg:Iter() do if tc:IsPreviousPosition(POS_FACEUP_ATTACK) and tc:IsPosition(POS_FACEUP_DEFENSE) then - tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + tc:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end end diff --git a/official/c95243515.lua b/official/c95243515.lua index 92613d9074..460db4244e 100644 --- a/official/c95243515.lua +++ b/official/c95243515.lua @@ -75,7 +75,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c95453143.lua b/official/c95453143.lua index fa6aa2f444..ad3e241d58 100644 --- a/official/c95453143.lua +++ b/official/c95453143.lua @@ -43,11 +43,11 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetCode(EFFECT_CHANGE_CODE) e1:SetValue(code) c:RegisterEffect(e1) - c:CopyEffect(code,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,1) + c:CopyEffect(code,RESETS_STANDARD_PHASE_END,1) end end function s.thcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c95973569.lua b/official/c95973569.lua index afee1caf1d..e6709bdfba 100644 --- a/official/c95973569.lua +++ b/official/c95973569.lua @@ -78,7 +78,7 @@ function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local g=Duel.SelectTarget(tp,s.rmfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0) --Register each time that the effect is used - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end function s.rmop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() diff --git a/official/c96945958.lua b/official/c96945958.lua index 98e84d76c0..45c21d48f8 100644 --- a/official/c96945958.lua +++ b/official/c96945958.lua @@ -74,7 +74,7 @@ function s.adop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(800) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c9709452.lua b/official/c9709452.lua index 9078ebdafc..071a398f91 100644 --- a/official/c9709452.lua +++ b/official/c9709452.lua @@ -31,7 +31,7 @@ function s.initial_effect(c) e2a:SetCode(EVENT_BATTLE_DESTROYING) e2a:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2a:SetCondition(aux.bdcon) - e2a:SetOperation(function(e) e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) end) + e2a:SetOperation(function(e) e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end) c:RegisterEffect(e2a) end function s.abdcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c97489701.lua b/official/c97489701.lua index 31bd2bf351..dd7adfd244 100644 --- a/official/c97489701.lua +++ b/official/c97489701.lua @@ -72,7 +72,7 @@ function s.naop(e,tp,eg,ep,ev,re,r,rp,chk) Duel.NegateAttack() local c=e:GetHandler() if c:IsRelateToEffect(e) and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)~=0 then - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/official/c97783338.lua b/official/c97783338.lua index 345fbdd410..6ad4efba2c 100644 --- a/official/c97783338.lua +++ b/official/c97783338.lua @@ -60,7 +60,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetValue(0) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end end diff --git a/official/c98049934.lua b/official/c98049934.lua index 9e4598ed20..19fec5647e 100644 --- a/official/c98049934.lua +++ b/official/c98049934.lua @@ -60,7 +60,7 @@ function s.negop(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_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) local e2=e1:Clone() e2:SetCode(EFFECT_DISABLE_EFFECT) diff --git a/official/c98684051.lua b/official/c98684051.lua index b393ec3210..58cdc03407 100644 --- a/official/c98684051.lua +++ b/official/c98684051.lua @@ -69,7 +69,7 @@ function s.tnop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_ADD_TYPE) e1:SetValue(TYPE_TUNER) - e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END) + e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) end end \ No newline at end of file diff --git a/official/c98715423.lua b/official/c98715423.lua index 4b13dc89ea..27072f9e68 100644 --- a/official/c98715423.lua +++ b/official/c98715423.lua @@ -105,7 +105,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) Duel.RegisterEffect(e1,tp) end function s.drawcheck(e,tp,eg,ep,ev,re,r,rp) - if Duel.GetCurrentPhase()==PHASE_DRAW and (r&REASON_RULE)==REASON_RULE and #eg>0 then + if Duel.IsPhase(PHASE_DRAW) and (r&REASON_RULE)==REASON_RULE and #eg>0 then Duel.ConfirmCards(tp,eg) local dg=eg:Filter(Card.IsCode,nil,e:GetLabel()) if #dg>0 then @@ -115,7 +115,7 @@ function s.drawcheck(e,tp,eg,ep,ev,re,r,rp) end end function s.checkop(e,tp,eg,ep,ev,re,r,rp) - if Duel.GetCurrentPhase()==PHASE_DRAW and (r&REASON_RULE)==REASON_RULE then + if Duel.IsPhase(PHASE_DRAW) and (r&REASON_RULE)==REASON_RULE then Duel.RegisterFlagEffect(ep,id,RESET_PHASE|PHASE_STANDBY,0,1) end end \ No newline at end of file diff --git a/official/c99064191.lua b/official/c99064191.lua index 6054cc1fe3..eaca5ca4c8 100644 --- a/official/c99064191.lua +++ b/official/c99064191.lua @@ -37,7 +37,7 @@ function s.target1(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_DESTROY,tc,1,0,0) end e:SetLabel(1) - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end end function s.activate1(e,tp,eg,ep,ev,re,r,rp) @@ -64,7 +64,7 @@ function s.target2(e,tp,eg,ep,ev,re,r,rp,chk) if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0) end - e:GetHandler():RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END,0,1) + e:GetHandler():RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END,0,1) end function s.activate2(e,tp,eg,ep,ev,re,r,rp) if not e:GetHandler():IsRelateToEffect(e) then return end diff --git a/official/c99585850.lua b/official/c99585850.lua index d03e7b640e..c68997078e 100644 --- a/official/c99585850.lua +++ b/official/c99585850.lua @@ -89,13 +89,13 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp,chk) local og=Duel.GetOperatedGroup() if og:IsContains(c) then local ct=1 - if Duel.IsTurnPlayer(tp) and Duel.GetCurrentPhase()==PHASE_END then + if Duel.IsTurnPlayer(tp) and Duel.IsPhase(PHASE_END) then ct=2 e:GetLabelObject():SetLabel(Duel.GetTurnCount()) else e:GetLabelObject():SetLabel(0) end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_END|RESET_SELF_TURN,0,ct) + c:RegisterFlagEffect(id,RESETS_STANDARD_PHASE_END|RESET_SELF_TURN,0,ct) end end end