diff --git a/archetype_setcode_constants.lua b/archetype_setcode_constants.lua index 8c2860d5c9..c2fc4763a1 100644 --- a/archetype_setcode_constants.lua +++ b/archetype_setcode_constants.lua @@ -596,8 +596,8 @@ SET_DOOM_KING = 0x1c8 --Released but the official English name is unconfirmed SET_MAGNIFISTORM = 0x1c9 SET_DOOM_Z = 0x1cb ---Pre-release archetypes SET_HECAHANDS = 0x1cc SET_ENNEACRAFT = 0x1cd SET_KILLER_TUNE = 0x1ce +--Pre-release archetypes SET_ECCLESIA = 0x1cf diff --git a/pre-release/c100446040.lua b/official/c14442329.lua similarity index 96% rename from pre-release/c100446040.lua rename to official/c14442329.lua index a7a37fc0d3..bf170706e8 100644 --- a/pre-release/c100446040.lua +++ b/official/c14442329.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetCode(EFFECT_UPDATE_ATTACK) e2:SetRange(LOCATION_FZONE) e2:SetTargetRange(LOCATION_MZONE,0) - e2:SetTarget(aux.TargetBoolFunction(Card.IsCode,100446038)) + e2:SetTarget(aux.TargetBoolFunction(Card.IsCode,41069676)) e2:SetValue(3300) e2:SetCondition(function(e) return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsType,TYPE_TUNER),e:GetHandlerPlayer(),0,LOCATION_MZONE|LOCATION_GRAVE,1,nil) end) c:RegisterEffect(e2) @@ -39,7 +39,7 @@ function s.initial_effect(c) e3:SetOperation(s.thspop) c:RegisterEffect(e3) end -s.listed_names={100446038} --"Killer Tune Loudness War" +s.listed_names={41069676} --"Killer Tune Loudness War" s.listed_series={SET_KILLER_TUNE} function s.costfilter(c,e,tp) return c:IsType(TYPE_TUNER) and Duel.IsExistingMatchingCard(s.thspfilter,tp,LOCATION_DECK,0,1,nil,e,tp,Duel.GetMZoneCount(tp,c)>0) diff --git a/pre-release/c100446037.lua b/official/c15665977.lua similarity index 96% rename from pre-release/c100446037.lua rename to official/c15665977.lua index 0fe90c700b..d87127abbf 100644 --- a/pre-release/c100446037.lua +++ b/official/c15665977.lua @@ -5,7 +5,7 @@ local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() --Synchro Summon procedure: "Killer Tune Reco" + 1+ Tuners - Synchro.AddProcedure(c,aux.FALSE,1,1,s.tunerfilter,1,99,aux.FilterSummonCode(100446033)) + Synchro.AddProcedure(c,aux.FALSE,1,1,s.tunerfilter,1,99,aux.FilterSummonCode(89392810)) --Gains 300 ATK for each Tuner in the GYs local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) @@ -45,8 +45,8 @@ function s.initial_effect(c) e4:SetValue(s.valcheck) c:RegisterEffect(e4) end -s.listed_names={100446033} --"Killer Tune Reco" -s.material={100446033} --"Killer Tune Reco" +s.listed_names={89392810} --"Killer Tune Reco" +s.material={89392810} function s.tunerfilter(c,scard,sumtype,tp) return c:IsType(TYPE_TUNER,scard,sumtype,tp) or c:IsHasEffect(EFFECT_CAN_BE_TUNER) end diff --git a/pre-release/c100446034.lua b/official/c16387555.lua similarity index 100% rename from pre-release/c100446034.lua rename to official/c16387555.lua diff --git a/pre-release/c100446031.lua b/official/c16509007.lua similarity index 100% rename from pre-release/c100446031.lua rename to official/c16509007.lua diff --git a/pre-release/c100446024.lua b/official/c17621695.lua similarity index 100% rename from pre-release/c100446024.lua rename to official/c17621695.lua diff --git a/pre-release/c100446008.lua b/official/c20415050.lua similarity index 100% rename from pre-release/c100446008.lua rename to official/c20415050.lua diff --git a/pre-release/c100446005.lua b/official/c21637502.lua similarity index 100% rename from pre-release/c100446005.lua rename to official/c21637502.lua diff --git a/pre-release/c100446021.lua b/official/c28454232.lua similarity index 100% rename from pre-release/c100446021.lua rename to official/c28454232.lua diff --git a/pre-release/c100446018.lua b/official/c29570824.lua similarity index 100% rename from pre-release/c100446018.lua rename to official/c29570824.lua diff --git a/pre-release/c100446011.lua b/official/c29792472.lua similarity index 100% rename from pre-release/c100446011.lua rename to official/c29792472.lua diff --git a/pre-release/c100200278.lua b/official/c30394645.lua similarity index 100% rename from pre-release/c100200278.lua rename to official/c30394645.lua diff --git a/pre-release/c100446002.lua b/official/c32759190.lua similarity index 100% rename from pre-release/c100446002.lua rename to official/c32759190.lua diff --git a/pre-release/c100446041.lua b/official/c40847034.lua similarity index 100% rename from pre-release/c100446041.lua rename to official/c40847034.lua diff --git a/pre-release/c100446038.lua b/official/c41069676.lua similarity index 100% rename from pre-release/c100446038.lua rename to official/c41069676.lua diff --git a/pre-release/c100446035.lua b/official/c42781164.lua similarity index 100% rename from pre-release/c100446035.lua rename to official/c42781164.lua diff --git a/pre-release/c100446032.lua b/official/c43904702.lua similarity index 100% rename from pre-release/c100446032.lua rename to official/c43904702.lua diff --git a/pre-release/c100446025.lua b/official/c54020393.lua similarity index 100% rename from pre-release/c100446025.lua rename to official/c54020393.lua diff --git a/pre-release/c100446022.lua b/official/c54842941.lua similarity index 100% rename from pre-release/c100446022.lua rename to official/c54842941.lua diff --git a/pre-release/c100446019.lua b/official/c55965529.lua similarity index 100% rename from pre-release/c100446019.lua rename to official/c55965529.lua diff --git a/pre-release/c100446016.lua b/official/c56187077.lua similarity index 100% rename from pre-release/c100446016.lua rename to official/c56187077.lua diff --git a/pre-release/c100446009.lua b/official/c57809669.lua similarity index 95% rename from pre-release/c100446009.lua rename to official/c57809669.lua index d52350ff00..e933f573d5 100644 --- a/pre-release/c100446009.lua +++ b/official/c57809669.lua @@ -47,7 +47,7 @@ function s.effcost(e,tp,eg,ep,ev,re,r,rp,chk) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsSetCard,SET_HECAHANDS),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingTarget(aux.AND(Card.IsSpellTrap,Card.IsAbleToHand),tp,0,LOCATION_ONFIELD,1,nil) - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,0) if chk==0 then return b1 or b2 end end @@ -58,7 +58,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local b1=(cost_skip or not Duel.HasFlagEffect(tp,id)) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsSetCard,SET_HECAHANDS),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingTarget(aux.AND(Card.IsSpellTrap,Card.IsAbleToHand),tp,0,LOCATION_ONFIELD,1,nil) - local b2=(cost_skip or not Duel.HasFlagEffect(tp,id+100)) + local b2=(cost_skip or not Duel.HasFlagEffect(tp,id+1)) and Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,0) if chk==0 then e:SetLabel(0) return b1 or b2 end local op=Duel.SelectEffect(tp, @@ -75,7 +75,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) elseif op==2 then e:SetCategory(CATEGORY_FUSION_SUMMON) e:SetProperty(0) - if not cost_skip then Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1) end + if not cost_skip then Duel.RegisterFlagEffect(tp,id+1,RESET_PHASE|PHASE_END,0,1) end Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,1) end end diff --git a/pre-release/c100446006.lua b/official/c67021206.lua similarity index 100% rename from pre-release/c100446006.lua rename to official/c67021206.lua diff --git a/pre-release/c100446003.lua b/official/c68144894.lua similarity index 100% rename from pre-release/c100446003.lua rename to official/c68144894.lua diff --git a/pre-release/c100446039.lua b/official/c78058681.lua similarity index 100% rename from pre-release/c100446039.lua rename to official/c78058681.lua diff --git a/pre-release/c100446026.lua b/official/c80015408.lua similarity index 100% rename from pre-release/c100446026.lua rename to official/c80015408.lua diff --git a/pre-release/c100446023.lua b/official/c81237046.lua similarity index 100% rename from pre-release/c100446023.lua rename to official/c81237046.lua diff --git a/pre-release/c100446020.lua b/official/c82359538.lua similarity index 98% rename from pre-release/c100446020.lua rename to official/c82359538.lua index 2d7888f14c..92aff6b7c9 100644 --- a/pre-release/c100446020.lua +++ b/official/c82359538.lua @@ -188,7 +188,7 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) --If a chain link is resolving, register a flag to deal the damage after it local c=e:GetHandler() for i=1,ct do - c:RegisterFlagEffect(id+100,RESET_CHAIN,0,1) + c:RegisterFlagEffect(id+1,RESET_CHAIN,0,1) end else --If a chain is not resolving, deal the damage right away @@ -197,10 +197,10 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) end end function s.chainsolvedop(e,tp,eg,ep,ev,re,r,rp) - local ct=e:GetHandler():GetFlagEffect(id+100) + local ct=e:GetHandler():GetFlagEffect(id+1) if ct>0 then Duel.Hint(HINT_CARD,1-tp,id) Duel.Damage(1-tp,ct*900,REASON_EFFECT) - e:GetHandler():ResetFlagEffect(id+100) + e:GetHandler():ResetFlagEffect(id+1) end end \ No newline at end of file diff --git a/pre-release/c100446036.lua b/official/c88170262.lua similarity index 97% rename from pre-release/c100446036.lua rename to official/c88170262.lua index 9f36023ca9..52ca6e0cc4 100644 --- a/pre-release/c100446036.lua +++ b/official/c88170262.lua @@ -5,7 +5,7 @@ local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() --Synchro Summon procedure: "Killer Tune Mix" + 1+ Tuners - Synchro.AddProcedure(c,aux.FALSE,1,1,s.tunerfilter,1,99,aux.FilterSummonCode(100446031)) + Synchro.AddProcedure(c,aux.FALSE,1,1,s.tunerfilter,1,99,aux.FilterSummonCode(16509007)) --Gains 1500 ATK while your opponent has a Tuner in their field or GY local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) @@ -36,8 +36,8 @@ function s.initial_effect(c) e4:SetValue(s.valcheck) c:RegisterEffect(e4) end -s.listed_names={100446031} --"Killer Tune Mix" -s.material={100446031} --"Killer Tune Mix" +s.listed_names={16509007} --"Killer Tune Mix" +s.material={16509007} function s.tunerfilter(c,scard,sumtype,tp) return c:IsType(TYPE_TUNER,scard,sumtype,tp) or c:IsHasEffect(EFFECT_CAN_BE_TUNER) end diff --git a/pre-release/c100446033.lua b/official/c89392810.lua similarity index 100% rename from pre-release/c100446033.lua rename to official/c89392810.lua diff --git a/pre-release/c100446017.lua b/official/c92171126.lua similarity index 100% rename from pre-release/c100446017.lua rename to official/c92171126.lua diff --git a/pre-release/c100446010.lua b/official/c93294363.lua similarity index 100% rename from pre-release/c100446010.lua rename to official/c93294363.lua diff --git a/pre-release/c100446007.lua b/official/c94410955.lua similarity index 100% rename from pre-release/c100446007.lua rename to official/c94410955.lua diff --git a/pre-release/c100446004.lua b/official/c95132593.lua similarity index 100% rename from pre-release/c100446004.lua rename to official/c95132593.lua diff --git a/pre-release/c100446001.lua b/official/c95365081.lua similarity index 100% rename from pre-release/c100446001.lua rename to official/c95365081.lua