diff --git a/archetype_setcode_constants.lua b/archetype_setcode_constants.lua index d31b80a8fe..21f28daa1f 100644 --- a/archetype_setcode_constants.lua +++ b/archetype_setcode_constants.lua @@ -601,8 +601,8 @@ SET_HECAHANDS = 0x1cc SET_ENNEACRAFT = 0x1cd SET_KEWL_TUNE = 0x1ce SET_ECCLESIA = 0x1cf +SET_END_OF_THE_WORLD = 0x1d1 --Released but the official English name is unconfirmed SET_ELVENNOTES = 0x1d0 --Pre-release archetypes -SET_END_OF_THE_WORLD = 0x1d1 SET_FAIRY_TAIL = 0x1d2 diff --git a/card_counter_constants.lua b/card_counter_constants.lua index e64b663099..3f986f48ec 100644 --- a/card_counter_constants.lua +++ b/card_counter_constants.lua @@ -86,7 +86,7 @@ CARD_R_ACE_HYDRANT = 37617348 CARD_RA = 10000010 CARD_RED_DRAGON_ARCHFIEND = 70902743 CARD_REDEYES_B_DRAGON = 74677422 -CARD_REGULUS_THE_PRINCE_OF_ENDYMION = 100200282 +CARD_REGULUS_THE_PRINCE_OF_ENDYMION = 96228804 CARD_REVEALER_ICEBARRIER = 18319762 CARD_REVERSAL_OF_FATE = 36690018 CARD_RIKKA_KONKON = 76869711 diff --git a/pre-release/c100449003.lua b/official/c21501961.lua similarity index 100% rename from pre-release/c100449003.lua rename to official/c21501961.lua diff --git a/pre-release/c100448002.lua b/official/c30138615.lua similarity index 100% rename from pre-release/c100448002.lua rename to official/c30138615.lua diff --git a/pre-release/c100449101.lua b/official/c30875635.lua similarity index 100% rename from pre-release/c100449101.lua rename to official/c30875635.lua diff --git a/pre-release/c100450001.lua b/official/c32126000.lua similarity index 100% rename from pre-release/c100450001.lua rename to official/c32126000.lua diff --git a/pre-release/c100450019.lua b/official/c34041788.lua similarity index 100% rename from pre-release/c100450019.lua rename to official/c34041788.lua diff --git a/pre-release/c100450016.lua b/official/c35167375.lua similarity index 99% rename from pre-release/c100450016.lua rename to official/c35167375.lua index da85699c15..5b6a5072ac 100644 --- a/pre-release/c100450016.lua +++ b/official/c35167375.lua @@ -2,7 +2,7 @@ --Surprise Fusion --scripted by pyrQ local s,id=GetID() -local TOKEN_SURPRISE=id+100 +local TOKEN_SURPRISE=id+1 function s.initial_effect(c) --Make 1 face-up monster you control become the declared Type and Attribute, then you can Fusion Summon 1 Fusion Monster from your Extra Deck, using monsters you control, including the targeted monster local e1=Effect.CreateEffect(c) diff --git a/pre-release/c100450013.lua b/official/c35989913.lua similarity index 100% rename from pre-release/c100450013.lua rename to official/c35989913.lua diff --git a/pre-release/c100448001.lua b/official/c3739500.lua similarity index 100% rename from pre-release/c100448001.lua rename to official/c3739500.lua diff --git a/pre-release/c100448005.lua b/official/c39016067.lua similarity index 100% rename from pre-release/c100448005.lua rename to official/c39016067.lua diff --git a/pre-release/c100450010.lua b/official/c46001505.lua similarity index 100% rename from pre-release/c100450010.lua rename to official/c46001505.lua diff --git a/pre-release/c100450002.lua b/official/c53770666.lua similarity index 98% rename from pre-release/c100450002.lua rename to official/c53770666.lua index cb85936edf..8416cdc13b 100644 --- a/pre-release/c100450002.lua +++ b/official/c53770666.lua @@ -2,7 +2,7 @@ --Armament Reincarnation --scripted by pyrQ local s,id=GetID() -local TOKEN_ARMAMENT_REINCARNATION=id+100 +local TOKEN_ARMAMENT_REINCARNATION=id+1 function s.initial_effect(c) --Special Summon "Armament Reincarnation Tokens" (Warrior/LIGHT/Level 1/ATK 500/DEF 500) up to the number of Equip Spells, and Traps with an effect that equip themselves to a monster, in your GY, then you can destroy as many cards in your Spell & Trap Zone as possible, including this card, then Set as many Equip Spells, and Traps with an effect that equip themselves to a monster, as possible from your GY local e1=Effect.CreateEffect(c) diff --git a/pre-release/c100450005.lua b/official/c561300.lua similarity index 100% rename from pre-release/c100450005.lua rename to official/c561300.lua diff --git a/pre-release/c100449004.lua b/official/c58995660.lua similarity index 100% rename from pre-release/c100449004.lua rename to official/c58995660.lua diff --git a/pre-release/c100449001.lua b/official/c59011257.lua similarity index 95% rename from pre-release/c100449001.lua rename to official/c59011257.lua index 5215734582..2b9c655718 100644 --- a/pre-release/c100449001.lua +++ b/official/c59011257.lua @@ -84,14 +84,14 @@ function s.ctrlop(e,tp,eg,ep,ev,re,r,rp) if tc and tc:IsRelateToEffect(e) and Duel.GetControl(c,tc:GetControler()) and c:IsFaceup() then c:SetCardTarget(tc) local fid=c:GetFieldID() - tc:RegisterFlagEffect(id+100,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),EFFECT_FLAG_CLIENT_HINT,1,fid,aux.Stringid(id,1)) + tc:RegisterFlagEffect(id+1,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET),EFFECT_FLAG_CLIENT_HINT,1,fid,aux.Stringid(id,1)) --That monster cannot be Tributed nor used as material for a Fusion, Synchro, Xyz or Link Summon while this monster is face-up on the field local e1a=Effect.CreateEffect(c) e1a:SetType(EFFECT_TYPE_FIELD) e1a:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1a:SetCode(EFFECT_UNRELEASABLE_SUM) e1a:SetRange(LOCATION_MZONE) - e1a:SetTarget(function(e,c) return c:GetFlagEffectLabel(id+100)==fid end) + e1a:SetTarget(function(e,c) return c:GetFlagEffectLabel(id+1)==fid end) e1a:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE) e1a:SetValue(1) e1a:SetReset(RESET_EVENT|RESETS_STANDARD) diff --git a/pre-release/c100450020.lua b/official/c60439482.lua similarity index 100% rename from pre-release/c100450020.lua rename to official/c60439482.lua diff --git a/pre-release/c100450017.lua b/official/c61151074.lua similarity index 100% rename from pre-release/c100450017.lua rename to official/c61151074.lua diff --git a/pre-release/c100450009.lua b/official/c613496.lua similarity index 100% rename from pre-release/c100450009.lua rename to official/c613496.lua diff --git a/pre-release/c100448006.lua b/official/c65400671.lua similarity index 100% rename from pre-release/c100448006.lua rename to official/c65400671.lua diff --git a/pre-release/c100448003.lua b/official/c66122213.lua similarity index 100% rename from pre-release/c100448003.lua rename to official/c66122213.lua diff --git a/pre-release/c100450004.lua b/official/c66206748.lua similarity index 100% rename from pre-release/c100450004.lua rename to official/c66206748.lua diff --git a/pre-release/c100450014.lua b/official/c72374522.lua similarity index 100% rename from pre-release/c100450014.lua rename to official/c72374522.lua diff --git a/pre-release/c100450008.lua b/official/c73218792.lua similarity index 100% rename from pre-release/c100450008.lua rename to official/c73218792.lua diff --git a/pre-release/c100450011.lua b/official/c73496100.lua similarity index 100% rename from pre-release/c100450011.lua rename to official/c73496100.lua diff --git a/pre-release/c100450018.lua b/official/c7656689.lua similarity index 100% rename from pre-release/c100450018.lua rename to official/c7656689.lua diff --git a/pre-release/c100450015.lua b/official/c8778267.lua similarity index 100% rename from pre-release/c100450015.lua rename to official/c8778267.lua diff --git a/pre-release/c100450007.lua b/official/c91215724.lua similarity index 100% rename from pre-release/c100450007.lua rename to official/c91215724.lua diff --git a/pre-release/c100448004.lua b/official/c92517928.lua similarity index 100% rename from pre-release/c100448004.lua rename to official/c92517928.lua diff --git a/pre-release/c100450006.lua b/official/c93023136.lua similarity index 100% rename from pre-release/c100450006.lua rename to official/c93023136.lua diff --git a/pre-release/c100449005.lua b/official/c94384774.lua similarity index 97% rename from pre-release/c100449005.lua rename to official/c94384774.lua index 22a5d6fce4..4f5b13ab73 100644 --- a/pre-release/c100449005.lua +++ b/official/c94384774.lua @@ -2,8 +2,8 @@ --Ebisu Shinsen Matsuri --scripted by pyrQ local s,id=GetID() -local TOKEN_SHINSEN=id+100 -local TOKEN_EBISU=id+200 +local TOKEN_SHINSEN=id+1 +local TOKEN_EBISU=id+2 function s.initial_effect(c) --Activate local e0=Effect.CreateEffect(c) @@ -38,7 +38,7 @@ function s.initial_effect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetCode(EVENT_PHASE+PHASE_BATTLE_START) e2:SetRange(LOCATION_SZONE) - e2:SetCondition(function(e) return not e:GetHandler():HasFlagEffect(id+100) end) + e2:SetCondition(function(e) return not e:GetHandler():HasFlagEffect(id+1) end) e2:SetTarget(s.ebisusptg) e2:SetOperation(s.ebisuspop) c:RegisterEffect(e2) @@ -95,7 +95,7 @@ function s.ebisusptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return #g>0 and Duel.GetMZoneCount(tp,g)>0 and Duel.IsPlayerCanSpecialSummonMonster(tp,TOKEN_EBISU,0,TYPES_TOKEN,-2,-2,7,RACE_FAIRY,ATTRIBUTE_WATER) end local c=e:GetHandler() - c:RegisterFlagEffect(id+100,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_BATTLE,0,1) + c:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_BATTLE,0,1) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g+c,#g+1,tp,0) Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,tp,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,0) diff --git a/pre-release/c100449002.lua b/official/c95506252.lua similarity index 100% rename from pre-release/c100449002.lua rename to official/c95506252.lua diff --git a/pre-release/c100450003.lua b/official/c95915457.lua similarity index 97% rename from pre-release/c100450003.lua rename to official/c95915457.lua index 2ddfb09739..29b7472624 100644 --- a/pre-release/c100450003.lua +++ b/official/c95915457.lua @@ -27,7 +27,7 @@ function s.initial_effect(c) e2:SetOperation(s.thop) c:RegisterEffect(e2) end -s.listed_names={100450002} --"Armament Reincarnation" +s.listed_names={53770666} --"Armament Reincarnation" function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) end @@ -66,7 +66,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) end end function s.thfilter(c) - return c:IsCode(100450002) and c:IsAbleToHand() + return c:IsCode(53770666) and c:IsAbleToHand() end function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end diff --git a/pre-release/c100450012.lua b/official/c9591819.lua similarity index 100% rename from pre-release/c100450012.lua rename to official/c9591819.lua diff --git a/pre-release/c100200282.lua b/official/c96228804.lua similarity index 100% rename from pre-release/c100200282.lua rename to official/c96228804.lua