diff --git a/archetype_setcode_constants.lua b/archetype_setcode_constants.lua index b97def174d..2103c6fad5 100644 --- a/archetype_setcode_constants.lua +++ b/archetype_setcode_constants.lua @@ -606,6 +606,6 @@ SET_ELFNOTE = 0x1d0 SET_GMX = 0x1d4 --Released but the official English name is unconfirmed SET_CLOWN_CREW = 0x1d3 ---Pre-release archetypes SET_DARK_TUNER = 0x1d5 +--Pre-release archetypes SET_BLITZCLIQUE = 0x1d6 diff --git a/pre-release/c100452028.lua b/official/c13203964.lua similarity index 100% rename from pre-release/c100452028.lua rename to official/c13203964.lua diff --git a/pre-release/c100452025.lua b/official/c14425515.lua similarity index 100% rename from pre-release/c100452025.lua rename to official/c14425515.lua diff --git a/pre-release/c100452022.lua b/official/c15141103.lua similarity index 100% rename from pre-release/c100452022.lua rename to official/c15141103.lua diff --git a/pre-release/c100452019.lua b/official/c26364381.lua similarity index 99% rename from pre-release/c100452019.lua rename to official/c26364381.lua index ee5ce7fb95..97c6da341f 100644 --- a/pre-release/c100452019.lua +++ b/official/c26364381.lua @@ -2,7 +2,7 @@ --Demiurge Ema --scripted by Naim local s,id=GetID() -local TOKEN_HOMUNCULUS=id+100 +local TOKEN_HOMUNCULUS=id+1 function s.initial_effect(c) --You can send 4 monsters with 2400 or more ATK and 1000 DEF from your hand, Deck, and/or face-up field to the GY; Special Summon this card from your hand local e1=Effect.CreateEffect(c) diff --git a/pre-release/c100452016.lua b/official/c27096833.lua similarity index 100% rename from pre-release/c100452016.lua rename to official/c27096833.lua diff --git a/pre-release/c100452013.lua b/official/c27118421.lua similarity index 100% rename from pre-release/c100452013.lua rename to official/c27118421.lua diff --git a/pre-release/c100452010.lua b/official/c28331069.lua similarity index 100% rename from pre-release/c100452010.lua rename to official/c28331069.lua diff --git a/pre-release/c100452007.lua b/official/c29053656.lua similarity index 100% rename from pre-release/c100452007.lua rename to official/c29053656.lua diff --git a/pre-release/c100452004.lua b/official/c30275298.lua similarity index 100% rename from pre-release/c100452004.lua rename to official/c30275298.lua diff --git a/pre-release/c100452001.lua b/official/c30397786.lua similarity index 100% rename from pre-release/c100452001.lua rename to official/c30397786.lua diff --git a/pre-release/c100452026.lua b/official/c41424250.lua similarity index 100% rename from pre-release/c100452026.lua rename to official/c41424250.lua diff --git a/pre-release/c100452023.lua b/official/c51546708.lua similarity index 100% rename from pre-release/c100452023.lua rename to official/c51546708.lua diff --git a/pre-release/c100452020.lua b/official/c52768390.lua similarity index 99% rename from pre-release/c100452020.lua rename to official/c52768390.lua index 7ccdd809c5..d7163d2f5b 100644 --- a/pre-release/c100452020.lua +++ b/official/c52768390.lua @@ -2,7 +2,7 @@ --Dark Creator --scripted by Naim local s,id=GetID() -local TOKEN_DARK_CREATOR=id+100 +local TOKEN_DARK_CREATOR=id+1 function s.initial_effect(c) --You can Special Summon this card (from your hand) by Tributing 2 Fiend and/or Fairy monsters local e1=Effect.CreateEffect(c) diff --git a/pre-release/c100452017.lua b/official/c53481938.lua similarity index 100% rename from pre-release/c100452017.lua rename to official/c53481938.lua diff --git a/pre-release/c100452014.lua b/official/c54603525.lua similarity index 100% rename from pre-release/c100452014.lua rename to official/c54603525.lua diff --git a/pre-release/c100452011.lua b/official/c54725177.lua similarity index 100% rename from pre-release/c100452011.lua rename to official/c54725177.lua diff --git a/pre-release/c100452008.lua b/official/c65541655.lua similarity index 100% rename from pre-release/c100452008.lua rename to official/c65541655.lua diff --git a/pre-release/c100452005.lua b/official/c66664203.lua similarity index 100% rename from pre-release/c100452005.lua rename to official/c66664203.lua diff --git a/pre-release/c100452002.lua b/official/c67886895.lua similarity index 100% rename from pre-release/c100452002.lua rename to official/c67886895.lua diff --git a/pre-release/c100452027.lua b/official/c87818869.lua similarity index 100% rename from pre-release/c100452027.lua rename to official/c87818869.lua diff --git a/pre-release/c100452024.lua b/official/c88931417.lua similarity index 100% rename from pre-release/c100452024.lua rename to official/c88931417.lua diff --git a/pre-release/c100452021.lua b/official/c89753095.lua similarity index 100% rename from pre-release/c100452021.lua rename to official/c89753095.lua diff --git a/pre-release/c100452018.lua b/official/c89875646.lua similarity index 94% rename from pre-release/c100452018.lua rename to official/c89875646.lua index 4ca3b09c07..3cf7674171 100644 --- a/pre-release/c100452018.lua +++ b/official/c89875646.lua @@ -22,10 +22,10 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) --● Shuffle 1 Dragon monster from your GY into the Deck, then you can Special Summon 1 "Rokket" monster with a different name from your Deck local b1=not Duel.HasFlagEffect(tp,id) and #dg>=1 --● Shuffle 2 Dragon monsters from your GY into the Deck, then add 1 Field Spell from your GY to your hand - local b2=not Duel.HasFlagEffect(tp,id+100) and #dg>=2 + local b2=not Duel.HasFlagEffect(tp,id+1) and #dg>=2 and Duel.IsExistingMatchingCard(aux.AND(Card.IsFieldSpell,Card.IsAbleToHand),tp,LOCATION_GRAVE,0,1,nil) --● Shuffle 3 Dragon monsters from your GY into the Deck, then shuffle up to 3 monsters from your opponent's GY into the Deck - local b3=not Duel.HasFlagEffect(tp,id+200) and #dg>=3 + local b3=not Duel.HasFlagEffect(tp,id+2) and #dg>=3 and Duel.IsExistingMatchingCard(aux.AND(Card.IsMonster,Card.IsAbleToDeck),tp,0,LOCATION_GRAVE,1,nil) if chk==0 then return b1 or b2 or b3 end local op=Duel.SelectEffect(tp, @@ -40,12 +40,12 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetPossibleOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK) elseif op==2 then e:SetCategory(CATEGORY_TODECK+CATEGORY_TOHAND) - Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+1,RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,2,tp,LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE) elseif op==3 then e:SetCategory(CATEGORY_TODECK) - Duel.RegisterFlagEffect(tp,id+200,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+2,RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,4,PLAYER_ALL,LOCATION_GRAVE) end end diff --git a/pre-release/c100452015.lua b/official/c90091224.lua similarity index 100% rename from pre-release/c100452015.lua rename to official/c90091224.lua diff --git a/pre-release/c100452012.lua b/official/c91714772.lua similarity index 100% rename from pre-release/c100452012.lua rename to official/c91714772.lua diff --git a/pre-release/c100452006.lua b/official/c92058902.lua similarity index 100% rename from pre-release/c100452006.lua rename to official/c92058902.lua diff --git a/pre-release/c100452009.lua b/official/c92936364.lua similarity index 100% rename from pre-release/c100452009.lua rename to official/c92936364.lua diff --git a/pre-release/c100452003.lua b/official/c93871599.lua similarity index 100% rename from pre-release/c100452003.lua rename to official/c93871599.lua