diff --git a/archetype_setcode_constants.lua b/archetype_setcode_constants.lua index 39eec58db9..c49451c073 100644 --- a/archetype_setcode_constants.lua +++ b/archetype_setcode_constants.lua @@ -604,13 +604,13 @@ SET_END_OF_THE_WORLD = 0x1d1 SET_FAIRY_TAIL = 0x1d2 SET_ELFNOTE = 0x1d0 SET_GMX = 0x1d4 ---Released but the official English name is unconfirmed SET_CLOWN_CREW = 0x1d3 -SET_DARK_TUNER = 0x1d5 ---Pre-release archetypes SET_BLITZCLIQUE = 0x1d6 SET_THEOREALIZE = 0x1d7 SET_ALEISTER = 0x1d8 +--Released but the official English name is unconfirmed +SET_DARK_TUNER = 0x1d5 +--Pre-release archetypes SET_WHITE_KNIGHT_NIGHT = 0x1d9 SET_DAEDALUS = 0x1da SET_ASUTRA = 0x1db diff --git a/card_counter_constants.lua b/card_counter_constants.lua index 93b8fd80c2..8763607e1c 100644 --- a/card_counter_constants.lua +++ b/card_counter_constants.lua @@ -50,6 +50,7 @@ CARD_GRANDPA_DEMETTO = 44190146 CARD_HARMONIC_OSCILLATION = 31531170 CARD_HARPIE_LADY = 76812113 CARD_HARPIE_LADY_SISTERS = 12206212 +CARD_HIDEOUT_IN_THE_SKY_COULOMB = 37654623 CARD_INFERNOBLE_CHARLES = 77656797 CARD_INVOCATION = 74063034 CARD_JACK_KNIGHT = 90876561 @@ -61,6 +62,7 @@ CARD_KING_KNIGHT = 64788463 CARD_KING_SARCOPHAGUS = 16528181 CARD_KURIBOH = 40640057 CARD_LABRYNTH_LABYRINTH = 33407125 +CARD_LIGHT_AND_DARKNESS_RITUAL = 33599853 CARD_LIGHT_BARRIER = 73206827 CARD_MACRO_COSMOS = 30241314 CARD_MAGICAL_MIDBREAKER = 71650854 @@ -94,7 +96,6 @@ CARD_REGULUS_THE_PRINCE_OF_ENDYMION = 96228804 CARD_REVEALER_ICEBARRIER = 18319762 CARD_REVERSAL_OF_FATE = 36690018 CARD_RIKKA_KONKON = 76869711 -CARD_RITUAL_OF_LIGHT_AND_DARKNESS = 101305044 CARD_SALAMANGREAT_SANCTUARY = 1295111 CARD_SANCTUARY_SKY = 56433456 CARD_SANGA_OF_THE_THUNDER = 25955164 diff --git a/pre-release/c101305080.lua b/official/c10307853.lua similarity index 100% rename from pre-release/c101305080.lua rename to official/c10307853.lua diff --git a/pre-release/c101305077.lua b/official/c10529441.lua similarity index 92% rename from pre-release/c101305077.lua rename to official/c10529441.lua index c9ad7a2821..1ed0c62546 100644 --- a/pre-release/c101305077.lua +++ b/official/c10529441.lua @@ -19,13 +19,12 @@ function s.initial_effect(c) ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) ge1:SetCode(EVENT_SPSUMMON_SUCCESS) ge1:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) - for p=0,1 do - if eg:IsExists(Card.IsSummonPlayer,1,nil,p) then - Duel.RegisterFlagEffect(p,id,RESET_PHASE|PHASE_END,0,1) - end - end - end - ) + for p=0,1 do + if eg:IsExists(Card.IsSummonPlayer,1,nil,p) then + Duel.RegisterFlagEffect(p,id,RESET_PHASE|PHASE_END,0,1) + end + end + end) Duel.RegisterEffect(ge1,0) end) end diff --git a/pre-release/c101305017.lua b/official/c10673071.lua similarity index 100% rename from pre-release/c101305017.lua rename to official/c10673071.lua diff --git a/pre-release/c101305074.lua b/official/c11642993.lua similarity index 100% rename from pre-release/c101305074.lua rename to official/c11642993.lua diff --git a/pre-release/c101305014.lua b/official/c11895663.lua similarity index 100% rename from pre-release/c101305014.lua rename to official/c11895663.lua diff --git a/pre-release/c101305049.lua b/official/c1259915.lua similarity index 85% rename from pre-release/c101305049.lua rename to official/c1259915.lua index ad41f083d0..32e9554083 100644 --- a/pre-release/c101305049.lua +++ b/official/c1259915.lua @@ -1,5 +1,5 @@ --三幻魔の霹靂 ---Skyfire of the Sacred Beast +--Sacred Beasts Thunderclap --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -8,7 +8,7 @@ function s.initial_effect(c) e0:SetType(EFFECT_TYPE_ACTIVATE) e0:SetCode(EVENT_FREE_CHAIN) c:RegisterEffect(e0) - --During your Main Phase: You can place 2 "Skyfire of the Sacred Beast" from your hand, Deck, and/or GY face-up on your field, then you can reveal 1 Level 10 "Sacred Beast" monster in your hand, then place 1 "Fallen Paradise of the Sacred Beasts" from your Deck face-up in your Field Zone + --During your Main Phase: You can place 2 "Sacred Beasts Thunderclap" from your hand, Deck, and/or GY face-up on your field, then you can reveal 1 Level 10 "Sacred Beast" monster in your hand, then place 1 "Fallen Paradise of the Sacred Beasts" from your Deck face-up in your Field Zone local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) @@ -30,7 +30,7 @@ function s.initial_effect(c) e2:SetOperation(s.thop) c:RegisterEffect(e2) end -s.listed_names={id,101305048} --"Fallen Paradise of the Sacred Beasts" +s.listed_names={id,65861210} --"Fallen Paradise of the Sacred Beasts" s.listed_series={SET_SACRED_BEAST} function s.selfplfilter(c,tp) return c:IsCode(id) and not c:IsForbidden() and c:CheckUniqueOnField(tp) @@ -43,7 +43,7 @@ function s.revealfilter(c) return c:IsLevel(10) and c:IsSetCard(SET_SACRED_BEAST) and not c:IsPublic() end function s.fieldplfilter(c,tp) - return c:IsCode(101305048) and not c:IsForbidden() and c:CheckUniqueOnField(tp) + return c:IsCode(65861210) and not c:IsForbidden() and c:CheckUniqueOnField(tp) end function s.plop(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_SZONE)<2 then return end diff --git a/pre-release/c101305026.lua b/official/c18616294.lua similarity index 100% rename from pre-release/c101305026.lua rename to official/c18616294.lua diff --git a/pre-release/c101305023.lua b/official/c18738846.lua similarity index 100% rename from pre-release/c101305023.lua rename to official/c18738846.lua diff --git a/pre-release/c101305020.lua b/official/c19951423.lua similarity index 100% rename from pre-release/c101305020.lua rename to official/c19951423.lua diff --git a/pre-release/c101305071.lua b/official/c22404570.lua similarity index 100% rename from pre-release/c101305071.lua rename to official/c22404570.lua diff --git a/pre-release/c101305008.lua b/official/c22734799.lua similarity index 100% rename from pre-release/c101305008.lua rename to official/c22734799.lua diff --git a/pre-release/c101305011.lua b/official/c22912101.lua similarity index 100% rename from pre-release/c101305011.lua rename to official/c22912101.lua diff --git a/pre-release/c101305068.lua b/official/c23526128.lua similarity index 100% rename from pre-release/c101305068.lua rename to official/c23526128.lua diff --git a/pre-release/c101305046.lua b/official/c2372506.lua similarity index 97% rename from pre-release/c101305046.lua rename to official/c2372506.lua index e73647c470..7bdaea1c5b 100644 --- a/pre-release/c101305046.lua +++ b/official/c2372506.lua @@ -14,12 +14,12 @@ function s.initial_effect(c) e1:SetOperation(s.spop) c:RegisterEffect(e1) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS,id} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL,id} function s.spcon(e,tp,eg,ep,ev,re,r,rp) return rp==1-tp and (re:IsMonsterEffect() or (re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsNormalSpellTrap())) end function s.setfilter(c) - return c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and c:IsCanTurnSet() + return c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and c:IsCanTurnSet() end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then diff --git a/pre-release/c101305005.lua b/official/c23856331.lua similarity index 100% rename from pre-release/c101305005.lua rename to official/c23856331.lua diff --git a/pre-release/c101305002.lua b/official/c24088928.lua similarity index 96% rename from pre-release/c101305002.lua rename to official/c24088928.lua index 920f417ac2..1e037454af 100644 --- a/pre-release/c101305002.lua +++ b/official/c24088928.lua @@ -27,9 +27,9 @@ function s.initial_effect(c) e2:SetOperation(s.thop) c:RegisterEffect(e2) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.rescon(sg,e,tp,mg) - return sg:IsExists(Card.ListsCode,1,nil,CARD_RITUAL_OF_LIGHT_AND_DARKNESS) + return sg:IsExists(Card.ListsCode,1,nil,CARD_LIGHT_AND_DARKNESS_RITUAL) end function s.tdsptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return false end diff --git a/pre-release/c101305062.lua b/official/c24461358.lua similarity index 100% rename from pre-release/c101305062.lua rename to official/c24461358.lua diff --git a/pre-release/c101305065.lua b/official/c24749710.lua similarity index 90% rename from pre-release/c101305065.lua rename to official/c24749710.lua index 27a67882b4..c1d198869a 100644 --- a/pre-release/c101305065.lua +++ b/official/c24749710.lua @@ -34,17 +34,17 @@ function s.initial_effect(c) e2:SetOperation(s.spop) c:RegisterEffect(e2) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.opccost1(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return not Duel.HasFlagEffect(tp,id) end - Duel.RegisterFlagEffect(tp,id+100,RESET_CHAIN,0,1) + Duel.RegisterFlagEffect(tp,id+1,RESET_CHAIN,0,1) end function s.opccost2(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return not Duel.HasFlagEffect(tp,id+100) end + if chk==0 then return not Duel.HasFlagEffect(tp,id+1) end Duel.RegisterFlagEffect(tp,id,RESET_CHAIN,0,1) end function s.thfilter(c) - return c:IsMonster() and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and c:IsAbleToHand() + return c:IsMonster() and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) 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 @@ -65,7 +65,7 @@ function s.spcostfilter(c,e,tp) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp,c:GetCode()) end function s.spfilter(c,e,tp,code) - return c:IsMonster() and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and not c:IsCode(code) + return c:IsMonster() and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and not c:IsCode(code) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) end function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/pre-release/c101305059.lua b/official/c25687946.lua similarity index 100% rename from pre-release/c101305059.lua rename to official/c25687946.lua diff --git a/pre-release/c101305042.lua b/official/c30109445.lua similarity index 95% rename from pre-release/c101305042.lua rename to official/c30109445.lua index 3ec097b153..09550a8987 100644 --- a/pre-release/c101305042.lua +++ b/official/c30109445.lua @@ -28,7 +28,7 @@ end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingMatchingCard(aux.AND(Card.IsLinkMonster,Card.IsFaceup,Card.IsAbleToExtra),tp,LOCATION_MZONE|LOCATION_GRAVE,LOCATION_MZONE|LOCATION_GRAVE,1,nil) - local b2=not Duel.HasFlagEffect(tp,id+100) and ((Duel.IsPlayerCanDraw(tp) + local b2=not Duel.HasFlagEffect(tp,id+1) and ((Duel.IsPlayerCanDraw(tp) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_HAND,0,1,nil)) or (Duel.IsPlayerCanDraw(1-tp) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,0,LOCATION_HAND,1,nil))) if chk==0 then return b1 or b2 end @@ -41,7 +41,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) e:SetCategory(CATEGORY_TOEXTRA) Duel.SetOperationInfo(0,CATEGORY_TOEXTRA,nil,1,PLAYER_ALL,LOCATION_MZONE|LOCATION_GRAVE) elseif op==2 then - Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+1,RESET_PHASE|PHASE_END,0,1) e:SetCategory(CATEGORY_TODECK|CATEGORY_DRAW) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,PLAYER_ALL,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,PLAYER_ALL,1) diff --git a/pre-release/c101305039.lua b/official/c31822037.lua similarity index 100% rename from pre-release/c101305039.lua rename to official/c31822037.lua diff --git a/pre-release/c101305036.lua b/official/c32044675.lua similarity index 100% rename from pre-release/c101305036.lua rename to official/c32044675.lua diff --git a/pre-release/c101305033.lua b/official/c33166263.lua similarity index 100% rename from pre-release/c101305033.lua rename to official/c33166263.lua diff --git a/pre-release/c101305044.lua b/official/c33599853.lua similarity index 70% rename from pre-release/c101305044.lua rename to official/c33599853.lua index 2dc15d5147..7648b3f85b 100644 --- a/pre-release/c101305044.lua +++ b/official/c33599853.lua @@ -5,12 +5,19 @@ local s,id=GetID() function s.initial_effect(c) --Ritual Summon 1 "Black Chaos the Dark Chaos Magician" or "Black Luster Soldier - Soldier of Light and Darkness" from your hand, by Tributing monsters from your hand or field, and/or banishing monsters from your GY, whose total Levels equal or exceed its Level Ritual.AddProcGreater{ - handler=c, - filter=function(c) return c:IsCode(101305027,101305028) end, - extrafil=function(e,tp) return Duel.GetMatchingGroup(aux.AND(Card.HasLevel,Card.IsAbleToRemove),tp,LOCATION_GRAVE,0,nil) end, - extratg=s.extratg, - desc=aux.Stringid(id,0) - } + handler=c, + filter=function(c) + return c:IsCode(44001993,70405001) + end, + extrafil=function(e,tp) + return Duel.GetMatchingGroup(aux.AND(Card.HasLevel,Card.IsAbleToRemove),tp,LOCATION_GRAVE,0,nil) + end, + extratg=function(e,tp,eg,ep,ev,re,r,rp,chk) + if chk==0 then return true end + Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE) + end, + desc=aux.Stringid(id,0) + } --If this card is in your GY: You can add both this card and 1 card that mentions "Ritual of Light and Darkness" from your GY to your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) @@ -22,13 +29,10 @@ function s.initial_effect(c) e2:SetOperation(s.thop) c:RegisterEffect(e2) end -s.listed_names={101305027,101305028,CARD_RITUAL_OF_LIGHT_AND_DARKNESS} --"Black Chaos the Dark Chaos Magician", "Black Luster Soldier - Soldier of Light and Darkness" -function s.extratg(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return true end - Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE) -end +s.listed_names={44001993,70405001,CARD_LIGHT_AND_DARKNESS_RITUAL} +--"Magician of Dark Chaos - Black Chaos", "Black Luster Soldier - Soldier of Light and Darkness" function s.thfilter(c) - return c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and c:IsAbleToHand() + return c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and c:IsAbleToHand() end function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/pre-release/c101305056.lua b/official/c36709484.lua similarity index 100% rename from pre-release/c101305056.lua rename to official/c36709484.lua diff --git a/pre-release/c101305053.lua b/official/c37432075.lua similarity index 96% rename from pre-release/c101305053.lua rename to official/c37432075.lua index f38f3053a5..46b18e2b09 100644 --- a/pre-release/c101305053.lua +++ b/official/c37432075.lua @@ -5,10 +5,10 @@ local s,id=GetID() function s.initial_effect(c) --Fusion Summon 1 Fusion Monster from your Extra Deck, using monsters you control. If Summoning an "Invoked" Fusion Monster this way, you can also return banished monsters to the GY as material local e1=Fusion.CreateSummonEff({ - handler=c, - matfilter=Fusion.OnFieldMat, - extrafil=s.fextra, - }) + handler=c, + matfilter=Fusion.OnFieldMat, + extrafil=s.fextra, + }) e1:SetCountLimit(1,{id,0}) e1:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) c:RegisterEffect(e1) diff --git a/pre-release/c101305050.lua b/official/c37654623.lua similarity index 83% rename from pre-release/c101305050.lua rename to official/c37654623.lua index f3876dae39..9377b5d4d5 100644 --- a/pre-release/c101305050.lua +++ b/official/c37654623.lua @@ -2,7 +2,7 @@ --Kowloon, Citadel of the Sky --scripted by pyrQ local s,id=GetID() -local TOKEN_MECHBEAST=id+100 +local TOKEN_MECH_BEAST=id+1 function s.initial_effect(c) --Activate local e0=Effect.CreateEffect(c) @@ -21,7 +21,7 @@ function s.initial_effect(c) local e1b=e1a:Clone() e1b:SetCode(EFFECT_UPDATE_DEFENSE) c:RegisterEffect(e1b) - --During your Main Phase: You can Special Summon 1 "Mechbeast Token" (Machine/EARTH/Level 6/ATK 2000/DEF 2000) to your opponent's field, and if you do, add 1 "Blitzclique" monster from your Deck to your hand + --During your Main Phase: You can Special Summon 1 "Mech Beast Token" (Machine/EARTH/Level 6/ATK 2000/DEF 2000) to your opponent's field, and if you do, add 1 "Blitzclique" monster from your Deck to your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN+CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -45,14 +45,14 @@ function s.initial_effect(c) e3:SetOperation(s.selfthop) c:RegisterEffect(e3) end -s.listed_names={TOKEN_MECHBEAST} +s.listed_names={TOKEN_MECH_BEAST} s.listed_series={SET_BLITZCLIQUE} function s.thfilter(c) return c:IsSetCard(SET_BLITZCLIQUE) and c:IsMonster() and c:IsAbleToHand() end function s.tokentg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 - and Duel.IsPlayerCanSpecialSummonMonster(tp,TOKEN_MECHBEAST,0,TYPES_TOKEN,2000,2000,6,RACE_MACHINE,ATTRIBUTE_EARTH,POS_FACEUP,1-tp) + and Duel.IsPlayerCanSpecialSummonMonster(tp,TOKEN_MECH_BEAST,0,TYPES_TOKEN,2000,2000,6,RACE_MACHINE,ATTRIBUTE_EARTH,POS_FACEUP,1-tp) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,0) Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,tp,0) @@ -61,8 +61,8 @@ end function s.tokenop(e,tp,eg,ep,ev,re,r,rp) local opp=1-tp if Duel.GetLocationCount(opp,LOCATION_MZONE)<=0 - or not Duel.IsPlayerCanSpecialSummonMonster(tp,TOKEN_MECHBEAST,0,TYPES_TOKEN,2000,2000,6,RACE_MACHINE,ATTRIBUTE_EARTH,POS_FACEUP,opp) then return end - local token=Duel.CreateToken(tp,TOKEN_MECHBEAST) + or not Duel.IsPlayerCanSpecialSummonMonster(tp,TOKEN_MECH_BEAST,0,TYPES_TOKEN,2000,2000,6,RACE_MACHINE,ATTRIBUTE_EARTH,POS_FACEUP,opp) then return end + local token=Duel.CreateToken(tp,TOKEN_MECH_BEAST) if Duel.SpecialSummon(token,0,tp,opp,false,false,POS_FACEUP)>0 then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil) diff --git a/pre-release/c101305047.lua b/official/c38776201.lua similarity index 100% rename from pre-release/c101305047.lua rename to official/c38776201.lua diff --git a/pre-release/c101305052.lua b/official/c433377.lua similarity index 100% rename from pre-release/c101305052.lua rename to official/c433377.lua diff --git a/pre-release/c101305030.lua b/official/c43989315.lua similarity index 80% rename from pre-release/c101305030.lua rename to official/c43989315.lua index 5e522227ea..6794954088 100644 --- a/pre-release/c101305030.lua +++ b/official/c43989315.lua @@ -22,13 +22,19 @@ function s.initial_effect(c) c:RegisterEffect(e1) --If this card is in your GY: You can Fusion Summon 1 "Invoked" Fusion Monster from your Extra Deck, by banishing its materials from your field and/or GY, including this card in the GY local fusion_params={ - fusfilter=function(c) return c:IsSetCard(SET_INVOKED) end, - matfilter=aux.FALSE, - extrafil=s.fextra, - extraop=Fusion.BanishMaterial, - gc=Fusion.ForcedHandler, - extratg=s.extratg - } + fusfilter=function(c) return c:IsSetCard(SET_INVOKED) end, + matfilter=aux.FALSE, + extrafil=function(e,tp,mg) + local locations=not Duel.IsPlayerAffectedByEffect(tp,CARD_SPIRIT_ELIMINATION) and (LOCATION_MZONE|LOCATION_GRAVE) or LOCATION_MZONE + return Duel.GetMatchingGroup(Fusion.IsMonsterFilter(Card.IsAbleToRemove),tp,locations,0,nil) + end, + extraop=Fusion.BanishMaterial, + gc=Fusion.ForcedHandler, + extratg=function(e,tp,eg,ep,ev,re,r,rp,chk) + if chk==0 then return true end + Duel.SetOperationInfo(0,CATEGORY_REMOVE,e:GetHandler(),1,tp,LOCATION_MZONE|LOCATION_GRAVE) + end + } local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON) @@ -59,12 +65,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) tc:NegateEffects(e:GetHandler()) end Duel.SpecialSummonComplete() -end -function s.fextra(e,tp,mg) - local locations=not Duel.IsPlayerAffectedByEffect(tp,CARD_SPIRIT_ELIMINATION) and (LOCATION_MZONE|LOCATION_GRAVE) or LOCATION_MZONE - return Duel.GetMatchingGroup(Fusion.IsMonsterFilter(Card.IsAbleToRemove),tp,locations,0,nil) -end -function s.extratg(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return true end - Duel.SetOperationInfo(0,CATEGORY_REMOVE,e:GetHandler(),1,tp,LOCATION_MZONE|LOCATION_GRAVE) end \ No newline at end of file diff --git a/pre-release/c101305027.lua b/official/c44001993.lua similarity index 98% rename from pre-release/c101305027.lua rename to official/c44001993.lua index 21a55560c6..88767c4c26 100644 --- a/pre-release/c101305027.lua +++ b/official/c44001993.lua @@ -52,7 +52,7 @@ function s.initial_effect(c) e4:SetOperation(s.banop) c:RegisterEffect(e4) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.immval(e,re) if not (re:IsActivated() and e:GetOwnerPlayer()==1-re:GetOwnerPlayer()) then return false end if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return true end diff --git a/pre-release/c101305024.lua b/official/c45223540.lua similarity index 100% rename from pre-release/c101305024.lua rename to official/c45223540.lua diff --git a/pre-release/c101305018.lua b/official/c46072770.lua similarity index 100% rename from pre-release/c101305018.lua rename to official/c46072770.lua diff --git a/pre-release/c101305041.lua b/official/c4611341.lua similarity index 97% rename from pre-release/c101305041.lua rename to official/c4611341.lua index adc39be30f..0326e41a09 100644 --- a/pre-release/c101305041.lua +++ b/official/c4611341.lua @@ -37,6 +37,8 @@ function s.initial_effect(c) e2:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) c:RegisterEffect(e2) end +s.listed_series={SET_S_FORCE} +s.material_setcode={SET_S_FORCE} function s.lcheck(g,lc,sumtype,tp) return g:IsExists(Card.IsSetCard,1,nil,SET_S_FORCE,lc,sumtype,tp) end diff --git a/pre-release/c101305021.lua b/official/c46955132.lua similarity index 100% rename from pre-release/c101305021.lua rename to official/c46955132.lua diff --git a/pre-release/c101305078.lua b/official/c47914440.lua similarity index 100% rename from pre-release/c101305078.lua rename to official/c47914440.lua diff --git a/pre-release/c101305003.lua b/official/c50073633.lua similarity index 93% rename from pre-release/c101305003.lua rename to official/c50073633.lua index 72f52e8d3e..80b6230a93 100644 --- a/pre-release/c101305003.lua +++ b/official/c50073633.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetOperation(s.spop) c:RegisterEffect(e2) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return not Duel.IsExistingMatchingCard(Card.IsPublic,tp,LOCATION_HAND,0,1,nil) end Duel.SetPossibleOperationInfo(0,CATEGORY_DRAW,nil,0,tp,3) @@ -50,7 +50,7 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetFieldGroup(tp,LOCATION_HAND,0) Duel.ConfirmCards(1-tp,g) Duel.ShuffleHand(tp) - if g:IsExists(Card.ListsCode,1,nil,CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and Duel.IsPlayerCanDraw(tp,3) + if g:IsExists(Card.ListsCode,1,nil,CARD_LIGHT_AND_DARKNESS_RITUAL) and Duel.IsPlayerCanDraw(tp,3) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) and Duel.Draw(tp,3,REASON_EFFECT)==3 then Duel.ShuffleHand(tp) Duel.BreakEffect() @@ -78,7 +78,7 @@ function s.sprestrictionop(e,tp,eg,ep,ev,re,r,rp) aux.addTempLizardCheck(c,tp) end function s.spfilter(c,e,tp) - return c:IsRitualMonster() and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and c:IsCanBeSpecialSummoned(e,0,tp,false,true) + return c:IsRitualMonster() and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and c:IsCanBeSpecialSummoned(e,0,tp,false,true) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetMZoneCount(tp,e:GetHandler())>0 diff --git a/pre-release/c101305066.lua b/official/c50147815.lua similarity index 100% rename from pre-release/c101305066.lua rename to official/c50147815.lua diff --git a/pre-release/c101305006.lua b/official/c50251045.lua similarity index 100% rename from pre-release/c101305006.lua rename to official/c50251045.lua diff --git a/pre-release/c101305063.lua b/official/c51869363.lua similarity index 100% rename from pre-release/c101305063.lua rename to official/c51869363.lua diff --git a/pre-release/c101305035.lua b/official/c5559570.lua similarity index 100% rename from pre-release/c101305035.lua rename to official/c5559570.lua diff --git a/pre-release/c101305015.lua b/official/c57294268.lua similarity index 100% rename from pre-release/c101305015.lua rename to official/c57294268.lua diff --git a/pre-release/c101305075.lua b/official/c58036097.lua similarity index 100% rename from pre-release/c101305075.lua rename to official/c58036097.lua diff --git a/pre-release/c101305038.lua b/official/c5833929.lua similarity index 100% rename from pre-release/c101305038.lua rename to official/c5833929.lua diff --git a/pre-release/c101305072.lua b/official/c58809685.lua similarity index 99% rename from pre-release/c101305072.lua rename to official/c58809685.lua index 0815a0e642..173421f18a 100644 --- a/pre-release/c101305072.lua +++ b/official/c58809685.lua @@ -2,7 +2,7 @@ --Elfnotes: Quatrain of Succession --scripted by pyrQ local s,id=GetID() -local TOKEN_ELFNOTE_SERAPHIM=id+100 +local TOKEN_ELFNOTE_SERAPHIM=id+1 function s.initial_effect(c) --Activate local e0=Effect.CreateEffect(c) diff --git a/pre-release/c101305012.lua b/official/c58916810.lua similarity index 100% rename from pre-release/c101305012.lua rename to official/c58916810.lua diff --git a/pre-release/c101305009.lua b/official/c59138498.lua similarity index 100% rename from pre-release/c101305009.lua rename to official/c59138498.lua diff --git a/pre-release/c101305069.lua b/official/c59921227.lua similarity index 97% rename from pre-release/c101305069.lua rename to official/c59921227.lua index d923307b42..d8445c352e 100644 --- a/pre-release/c101305069.lua +++ b/official/c59921227.lua @@ -46,7 +46,7 @@ function s.initial_effect(c) e3:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) c:RegisterEffect(e3) end -s.listed_names={101305050} --"Kowloon, Citadel of the Sky" +s.listed_names={CARD_HIDEOUT_IN_THE_SKY_COULOMB} s.listed_series={SET_BLITZCLIQUE} function s.thunderthcostfilter(c,tp) return c:IsSetCard(SET_BLITZCLIQUE) and c:IsAbleToDeckAsCost() and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) @@ -81,7 +81,7 @@ function s.thunderthop(e,tp,eg,ep,ev,re,r,rp) end end function s.blitzthfilter(c) - return ((c:IsSetCard(SET_BLITZCLIQUE) and c:IsSpell()) or c:IsCode(101305050)) and c:IsAbleToHand() + return ((c:IsSetCard(SET_BLITZCLIQUE) and c:IsSpell()) or c:IsCode(CARD_HIDEOUT_IN_THE_SKY_COULOMB)) and c:IsAbleToHand() end function s.blitzthtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.blitzthfilter,tp,LOCATION_DECK,0,1,nil) end diff --git a/pre-release/c101305060.lua b/official/c61082944.lua similarity index 100% rename from pre-release/c101305060.lua rename to official/c61082944.lua diff --git a/pre-release/c101305057.lua b/official/c62104532.lua similarity index 100% rename from pre-release/c101305057.lua rename to official/c62104532.lua diff --git a/pre-release/c101305054.lua b/official/c63926180.lua similarity index 92% rename from pre-release/c101305054.lua rename to official/c63926180.lua index 5653501e97..96c5648aee 100644 --- a/pre-release/c101305054.lua +++ b/official/c63926180.lua @@ -13,16 +13,16 @@ function s.initial_effect(c) e1:SetOperation(s.effop) c:RegisterEffect(e1) end -s.listed_names={101305016} --"Aiwass the Spirit of the Law" +s.listed_names={84288367} --"Aiwass, Divine Spirit of the Law" s.listed_series={SET_ALEISTER} function s.spfilter(c,e,tp) - return c:IsCode(101305016) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) + return c:IsCode(84288367) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end function s.tgbanfilter(c) return c:IsSetCard(SET_ALEISTER) and c:IsMonster() and (c:IsAbleToGrave() or c:IsAbleToRemove()) end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) - --● Special Summon 1 "Aiwass the Spirit of the Law" from your Deck or GY + --● Special Summon 1 "Aiwass, Divine Spirit of the Law" from your Deck or GY local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil,e,tp) --● Send to the GY, or banish, 1 "Aleister" monster from your Deck @@ -50,7 +50,7 @@ end function s.effop(e,tp,eg,ep,ev,re,r,rp) local op=e:GetLabel() if op==1 then - --● Special Summon 1 "Aiwass the Spirit of the Law" from your Deck or GY + --● Special Summon 1 "Aiwass, Divine Spirit of the Law" from your Deck or GY if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.spfilter),tp,LOCATION_DECK|LOCATION_GRAVE,0,1,1,nil,e,tp) diff --git a/pre-release/c101305051.lua b/official/c64049762.lua similarity index 100% rename from pre-release/c101305051.lua rename to official/c64049762.lua diff --git a/pre-release/c101305048.lua b/official/c65861210.lua similarity index 100% rename from pre-release/c101305048.lua rename to official/c65861210.lua diff --git a/pre-release/c101305040.lua b/official/c67216732.lua similarity index 100% rename from pre-release/c101305040.lua rename to official/c67216732.lua diff --git a/pre-release/c101305032.lua b/official/c6772168.lua similarity index 97% rename from pre-release/c101305032.lua rename to official/c6772168.lua index c70e46e034..bd48cac2e8 100644 --- a/pre-release/c101305032.lua +++ b/official/c6772168.lua @@ -4,7 +4,7 @@ local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - --Fusion Naterials: 1 "Aleister" monster + 1 DARK or WATER monster + --Fusion Materials: 1 "Aleister" monster + 1 DARK or WATER monster Fusion.AddProcMix(c,true,true,aux.FilterBoolFunctionEx(Card.IsSetCard,SET_ALEISTER),aux.FilterBoolFunctionEx(Card.IsAttribute,ATTRIBUTE_DARK|ATTRIBUTE_WATER)) --While this card is in the Main Monster Zone, your opponent's monsters cannot target monsters for attacks, except this one local e1=Effect.CreateEffect(c) diff --git a/pre-release/c101305031.lua b/official/c70383419.lua similarity index 96% rename from pre-release/c101305031.lua rename to official/c70383419.lua index 6356aa58a3..b45fc25b2c 100644 --- a/pre-release/c101305031.lua +++ b/official/c70383419.lua @@ -32,9 +32,9 @@ function s.initial_effect(c) end s.listed_series={SET_ALEISTER} s.material_setcode={SET_ALEISTER} -s.listed_names={101305017,101305070} --"Virakam the Artificial Spirit", "Magical Name - "Rosa Mundi"" +s.listed_names={10673071,86319972} --"Virakam, the Divine Spirit of Artifice", "Gamma Summon" function s.thfilter(c) - return c:IsCode(101305017,101305070) and c:IsAbleToHand() + return c:IsCode(10673071,86319972) 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/c101305028.lua b/official/c70405001.lua similarity index 98% rename from pre-release/c101305028.lua rename to official/c70405001.lua index 3660da9d87..f94107a2e5 100644 --- a/pre-release/c101305028.lua +++ b/official/c70405001.lua @@ -42,7 +42,7 @@ function s.initial_effect(c) e4:SetOperation(s.atkop) c:RegisterEffect(e4) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.immval(e,re) if not (re:IsActivated() and e:GetOwnerPlayer()==1-re:GetOwnerPlayer()) then return false end if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return true end diff --git a/pre-release/c101305025.lua b/official/c71222649.lua similarity index 100% rename from pre-release/c101305025.lua rename to official/c71222649.lua diff --git a/pre-release/c101305043.lua b/official/c7594154.lua similarity index 100% rename from pre-release/c101305043.lua rename to official/c7594154.lua diff --git a/pre-release/c101305045.lua b/official/c75983808.lua similarity index 94% rename from pre-release/c101305045.lua rename to official/c75983808.lua index 77f7a2dc73..c004cae124 100644 --- a/pre-release/c101305045.lua +++ b/official/c75983808.lua @@ -25,7 +25,7 @@ function s.initial_effect(c) e2:SetOperation(s.spop) c:RegisterEffect(e2) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.thdesconfilter(c,tp) return c:IsControler(tp) and c:IsOnField() and c:IsAbleToHand() end @@ -45,7 +45,7 @@ function s.thconfilter(c,re,tp) return c:IsRelateToEffect(re) and c:IsControler(tp) end function s.handspfilter(c,e,tp,code) - return c:IsMonster() and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and not c:IsCode(code) + return c:IsMonster() and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and not c:IsCode(code) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) end function s.thdesop(e,tp,eg,ep,ev,re,r,rp) @@ -81,7 +81,7 @@ function s.thdesop(e,tp,eg,ep,ev,re,r,rp) end end function s.ritualspfilter(c,e,tp) - return c:IsRitualMonster() and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and c:IsCanBeSpecialSummoned(e,0,tp,false,true) + return c:IsRitualMonster() and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and c:IsCanBeSpecialSummoned(e,0,tp,false,true) 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/pre-release/c101305037.lua b/official/c78449284.lua similarity index 100% rename from pre-release/c101305037.lua rename to official/c78449284.lua diff --git a/pre-release/c101305029.lua b/official/c7894706.lua similarity index 100% rename from pre-release/c101305029.lua rename to official/c7894706.lua diff --git a/pre-release/c101305034.lua b/official/c79561872.lua similarity index 100% rename from pre-release/c101305034.lua rename to official/c79561872.lua diff --git a/pre-release/c101305022.lua b/official/c82344137.lua similarity index 100% rename from pre-release/c101305022.lua rename to official/c82344137.lua diff --git a/pre-release/c101305079.lua b/official/c83319154.lua similarity index 100% rename from pre-release/c101305079.lua rename to official/c83319154.lua diff --git a/pre-release/c101305019.lua b/official/c83566725.lua similarity index 100% rename from pre-release/c101305019.lua rename to official/c83566725.lua diff --git a/pre-release/c101305076.lua b/official/c84031736.lua similarity index 100% rename from pre-release/c101305076.lua rename to official/c84031736.lua diff --git a/pre-release/c101305016.lua b/official/c84288367.lua similarity index 100% rename from pre-release/c101305016.lua rename to official/c84288367.lua diff --git a/pre-release/c101305013.lua b/official/c84401954.lua similarity index 97% rename from pre-release/c101305013.lua rename to official/c84401954.lua index 60965c86a4..c4e8b6fb29 100644 --- a/pre-release/c101305013.lua +++ b/official/c84401954.lua @@ -29,7 +29,7 @@ function s.initial_effect(c) e2:SetOperation(s.thop) c:RegisterEffect(e2) end -s.listed_names={101305050} --Kowloon, Citadel of the Sky +s.listed_names={CARD_HIDEOUT_IN_THE_SKY_COULOMB} s.listed_series={SET_BLITZCLIQUE} function s.desfilter(c,tp) return c:IsSpellTrap() and Duel.GetMZoneCount(tp,c)>0 @@ -67,7 +67,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) Duel.RegisterEffect(e1,tp) end function s.thfilter(c) - return ((c:IsSetCard(SET_BLITZCLIQUE) and c:IsSpell()) or c:IsCode(101305050)) and c:IsAbleToHand() + return ((c:IsSetCard(SET_BLITZCLIQUE) and c:IsSpell()) or c:IsCode(CARD_HIDEOUT_IN_THE_SKY_COULOMB)) 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/c101305073.lua b/official/c85257384.lua similarity index 100% rename from pre-release/c101305073.lua rename to official/c85257384.lua diff --git a/pre-release/c101305010.lua b/official/c85523502.lua similarity index 100% rename from pre-release/c101305010.lua rename to official/c85523502.lua diff --git a/pre-release/c101305067.lua b/official/c86132414.lua similarity index 100% rename from pre-release/c101305067.lua rename to official/c86132414.lua diff --git a/pre-release/c101305070.lua b/official/c86319972.lua similarity index 100% rename from pre-release/c101305070.lua rename to official/c86319972.lua diff --git a/pre-release/c101305007.lua b/official/c96345184.lua similarity index 100% rename from pre-release/c101305007.lua rename to official/c96345184.lua diff --git a/pre-release/c101305064.lua b/official/c97254001.lua similarity index 100% rename from pre-release/c101305064.lua rename to official/c97254001.lua diff --git a/pre-release/c101305004.lua b/official/c97462632.lua similarity index 96% rename from pre-release/c101305004.lua rename to official/c97462632.lua index d3db506d7e..a1f2b7dd38 100644 --- a/pre-release/c101305004.lua +++ b/official/c97462632.lua @@ -18,9 +18,9 @@ function s.initial_effect(c) --For the Ritual Summon of exactly 1 Level 8 Ritual Monster with a card effect that requires use of monsters, this card can be used as the entire Tribute Ritual.AddWholeLevelTribute(c,aux.FilterBoolFunction(Card.IsLevel,8)) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.setfilter(c) - return (c:IsQuickPlaySpell() or c:IsTrap()) and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and c:IsSSetable() + return (c:IsQuickPlaySpell() or c:IsTrap()) and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and c:IsSSetable() end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=true diff --git a/pre-release/c101305061.lua b/official/c98476659.lua similarity index 100% rename from pre-release/c101305061.lua rename to official/c98476659.lua diff --git a/pre-release/c101305001.lua b/official/c98684220.lua similarity index 95% rename from pre-release/c101305001.lua rename to official/c98684220.lua index bbfe73b131..5fa00010f0 100644 --- a/pre-release/c101305001.lua +++ b/official/c98684220.lua @@ -45,7 +45,7 @@ function s.initial_effect(c) e3:SetOperation(s.rmop) c:RegisterEffect(e3) end -s.listed_names={CARD_RITUAL_OF_LIGHT_AND_DARKNESS} +s.listed_names={CARD_LIGHT_AND_DARKNESS_RITUAL} function s.spconfilter(c) return c:IsRace(RACE_SPELLCASTER|RACE_WARRIOR) and c:IsRitualMonster() and c:IsAbleToDeckAsCost() end @@ -76,7 +76,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,c) end end function s.plfilter(c,tp) - return c:IsContinuousTrap() and c:ListsCode(CARD_RITUAL_OF_LIGHT_AND_DARKNESS) and not c:IsForbidden() and c:CheckUniqueOnField(tp) + return c:IsContinuousTrap() and c:ListsCode(CARD_LIGHT_AND_DARKNESS_RITUAL) and not c:IsForbidden() and c:CheckUniqueOnField(tp) end function s.pltg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 diff --git a/pre-release/c101305058.lua b/official/c99199231.lua similarity index 100% rename from pre-release/c101305058.lua rename to official/c99199231.lua diff --git a/pre-release/c101305055.lua b/official/c99311889.lua similarity index 100% rename from pre-release/c101305055.lua rename to official/c99311889.lua diff --git a/pre-release/c101305127.lua b/pre-release/c101305127.lua deleted file mode 100644 index e8cd3d508a..0000000000 --- a/pre-release/c101305127.lua +++ /dev/null @@ -1,3 +0,0 @@ ---黒き混沌の魔術師ブラック・カオス ---Black Chaos the Dark Chaos Magician -Duel.LoadCardScriptAlias(101305027) \ No newline at end of file diff --git a/pre-release/c101305128.lua b/pre-release/c101305128.lua deleted file mode 100644 index da3294bfb0..0000000000 --- a/pre-release/c101305128.lua +++ /dev/null @@ -1,3 +0,0 @@ ---光と闇の戦士カオス・ソルジャー ---Black Luster Soldier - Soldier of Light and Darkness -Duel.LoadCardScriptAlias(101305028) \ No newline at end of file diff --git a/pre-release/c101305129.lua b/pre-release/c101305129.lua deleted file mode 100644 index ad7d79c3f4..0000000000 --- a/pre-release/c101305129.lua +++ /dev/null @@ -1,3 +0,0 @@ ---混沌の三幻魔 ---Phantasmal Sacred Beasts of Chaos -Duel.LoadCardScriptAlias(101305029) \ No newline at end of file