diff --git a/archetype_setcode_constants.lua b/archetype_setcode_constants.lua index 56870cdfb9..7facafc918 100644 --- a/archetype_setcode_constants.lua +++ b/archetype_setcode_constants.lua @@ -589,12 +589,13 @@ SET_TELEPORT = 0x1c5 SET_POWER_PATRON = 0x1c6 SET_ARTMAGE = 0x1c7 SET_RB = 0x1ca ---Released but the official English name is unconfirmed SET_DRAGONTAIL = 0x1c0 SET_YUMMY = 0x1c1 SET_K9 = 0x1c4 ---Pre-release archetypes SET_DOOM_KING = 0x1c8 SET_MAGNIFISTORM = 0x1c9 SET_DOOM_Z = 0x1cb +--Released but the official English name is unconfirmed +-- +--Pre-release archetypes SET_HECATONCHEIRE = 0x1cc diff --git a/pre-release/c101302024.lua b/official/c10966439.lua similarity index 100% rename from pre-release/c101302024.lua rename to official/c10966439.lua diff --git a/pre-release/c101302021.lua b/official/c11688916.lua similarity index 100% rename from pre-release/c101302021.lua rename to official/c11688916.lua diff --git a/pre-release/c101302018.lua b/official/c12800564.lua similarity index 100% rename from pre-release/c101302018.lua rename to official/c12800564.lua diff --git a/pre-release/c101302078.lua b/official/c16693934.lua similarity index 100% rename from pre-release/c101302078.lua rename to official/c16693934.lua diff --git a/pre-release/c101302015.lua b/official/c16922142.lua similarity index 100% rename from pre-release/c101302015.lua rename to official/c16922142.lua diff --git a/pre-release/c101302075.lua b/official/c17719582.lua similarity index 100% rename from pre-release/c101302075.lua rename to official/c17719582.lua diff --git a/pre-release/c101302027.lua b/official/c19743887.lua similarity index 100% rename from pre-release/c101302027.lua rename to official/c19743887.lua diff --git a/pre-release/c101302063.lua b/official/c20508881.lua similarity index 92% rename from pre-release/c101302063.lua rename to official/c20508881.lua index f682f289f3..5f736e2b45 100644 --- a/pre-release/c101302063.lua +++ b/official/c20508881.lua @@ -33,8 +33,9 @@ function s.thfilter(c) return c:IsCode(CARD_MYSTICAL_SPACE_TYPHOON) and c:IsAbleToHand() end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) - local b1=Duel.IsPlayerCanDraw(tp,2) and not Duel.HasFlagEffect(tp,id) - local b2=Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil) and not Duel.HasFlagEffect(tp,id+100) + local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsPlayerCanDraw(tp,2) + local b2=not Duel.HasFlagEffect(tp,id+1) + and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil) if chk==0 then return b1 or b2 end local op=Duel.SelectEffect(tp, {b1,aux.Stringid(id,2)}, @@ -47,7 +48,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,1,tp,1) elseif op==2 then e:SetCategory(CATEGORY_SEARCH+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_TOHAND,nil,1,tp,LOCATION_DECK|LOCATION_GRAVE) end end diff --git a/pre-release/c101302103.lua b/official/c20715411.lua similarity index 100% rename from pre-release/c101302103.lua rename to official/c20715411.lua diff --git a/pre-release/c101302060.lua b/official/c21720439.lua similarity index 100% rename from pre-release/c101302060.lua rename to official/c21720439.lua diff --git a/pre-release/c101302012.lua b/official/c27755794.lua similarity index 100% rename from pre-release/c101302012.lua rename to official/c27755794.lua diff --git a/pre-release/c101302072.lua b/official/c28531163.lua similarity index 78% rename from pre-release/c101302072.lua rename to official/c28531163.lua index 8aedb5a596..592176dffd 100644 --- a/pre-release/c101302072.lua +++ b/official/c28531163.lua @@ -2,9 +2,9 @@ --Apocaries --scripted by Naim local s,id=GetID() -local COUNTER_C=0x215 +local COUNTER_CARIES=0x215 function s.initial_effect(c) - c:EnableCounterPermit(COUNTER_C) + c:EnableCounterPermit(COUNTER_CARIES) --When this card is activated: Place C Counters on this card equal to the number of cards your opponent controls local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetCode(EVENT_FREE_CHAIN) e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH) e1:SetTarget(s.target) - e1:SetOperation(function(e,tp) e:GetHandler():AddCounter(COUNTER_C,Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)) end) + e1:SetOperation(function(e,tp) e:GetHandler():AddCounter(COUNTER_CARIES,Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)) end) c:RegisterEffect(e1) --Apply effects to a target based on the number of C Counters removed from this card local e2=Effect.CreateEffect(c) @@ -25,29 +25,29 @@ function s.initial_effect(c) e2:SetOperation(s.effop) c:RegisterEffect(e2) end -s.counter_place_list={COUNTER_C} +s.counter_place_list={COUNTER_CARIES} function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() local ct=Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD) - if chk==0 then return ct>0 and Duel.IsCanAddCounter(tp,COUNTER_C,ct,c) end - Duel.SetOperationInfo(0,CATEGORY_COUNTER,c,1,COUNTER_C,ct) + if chk==0 then return ct>0 and Duel.IsCanAddCounter(tp,COUNTER_CARIES,ct,c) end + Duel.SetOperationInfo(0,CATEGORY_COUNTER,c,1,COUNTER_CARIES,ct) end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() and chkc:IsControler(1-tp) end - if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,COUNTER_C,1,REASON_COST) + if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,COUNTER_CARIES,1,REASON_COST) and Duel.IsExistingTarget(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO) local tc=Duel.SelectTarget(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil):GetFirst() - local b1=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_C,1,REASON_COST) - local b2=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_C,2,REASON_COST) and not tc:IsAttack(0) - local b3=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_C,3,REASON_COST) and tc:IsNegatableMonster() - local b4=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_C,4,REASON_COST) + local b1=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_CARIES,1,REASON_COST) + local b2=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_CARIES,2,REASON_COST) and not tc:IsAttack(0) + local b3=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_CARIES,3,REASON_COST) and tc:IsNegatableMonster() + local b4=Duel.IsCanRemoveCounter(tp,1,0,COUNTER_CARIES,4,REASON_COST) local ct=Duel.SelectEffect(tp, {b1,aux.Stringid(id,2)}, {b2,aux.Stringid(id,3)}, {b3,aux.Stringid(id,4)}, {b4,aux.Stringid(id,5)}) - Duel.RemoveCounter(tp,1,1,COUNTER_C,ct,REASON_COST) + Duel.RemoveCounter(tp,1,1,COUNTER_CARIES,ct,REASON_COST) e:SetLabel(ct) if (ct==1 or ct==2) then e:SetCategory(CATEGORY_ATKCHANGE) diff --git a/pre-release/c101302069.lua b/official/c28653611.lua similarity index 95% rename from pre-release/c101302069.lua rename to official/c28653611.lua index efb0942d57..da3cfdc777 100644 --- a/pre-release/c101302069.lua +++ b/official/c28653611.lua @@ -23,7 +23,7 @@ function s.effcost(e,tp,eg,ep,ev,re,r,rp,chk) e:SetLabel(-100) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Duel.CheckReleaseGroupCost(tp,nil,1,false,aux.ReleaseCheckMMZ,nil) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND|LOCATION_DECK|LOCATION_GRAVE,0,1,nil,e,tp) if chk==0 then return b1 or b2 end @@ -40,7 +40,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local cost_skip=e:GetLabel()~=-100 local b1=(cost_skip or not Duel.HasFlagEffect(tp,id)) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,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 (not cost_skip or Duel.GetLocationCount(tp,LOCATION_MZONE)>0) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND|LOCATION_DECK|LOCATION_GRAVE,0,1,nil,e,tp) if chk==0 then e:SetLabel(0) return b1 or b2 end @@ -62,7 +62,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetPossibleOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) elseif op==2 then e:SetCategory(CATEGORY_SPECIAL_SUMMON) - 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 Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND|LOCATION_DECK|LOCATION_GRAVE) end end diff --git a/pre-release/c101302009.lua b/official/c28877382.lua similarity index 100% rename from pre-release/c101302009.lua rename to official/c28877382.lua diff --git a/pre-release/c101302006.lua b/official/c29099860.lua similarity index 100% rename from pre-release/c101302006.lua rename to official/c29099860.lua diff --git a/pre-release/c101302066.lua b/official/c29876299.lua similarity index 96% rename from pre-release/c101302066.lua rename to official/c29876299.lua index ec3cab8c80..78d4e249f7 100644 --- a/pre-release/c101302066.lua +++ b/official/c29876299.lua @@ -64,7 +64,7 @@ end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsPlayerCanDraw(tp,2) - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Duel.IsExistingMatchingCard(Card.IsReleasableByEffect,tp,0,LOCATION_MZONE,1,nil) if chk==0 then return b1 or b2 end local op=Duel.SelectEffect(tp, @@ -77,7 +77,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,1,tp,2) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,1,tp,1) 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_RELEASE) Duel.SetOperationInfo(0,CATEGORY_RELEASE,nil,1,1-tp,LOCATION_MZONE) end diff --git a/pre-release/c101302107.lua b/official/c30998403.lua similarity index 100% rename from pre-release/c101302107.lua rename to official/c30998403.lua diff --git a/pre-release/c101302046.lua b/official/c31010081.lua similarity index 100% rename from pre-release/c101302046.lua rename to official/c31010081.lua diff --git a/pre-release/c101302106.lua b/official/c32232538.lua similarity index 100% rename from pre-release/c101302106.lua rename to official/c32232538.lua diff --git a/pre-release/c101302057.lua b/official/c32442017.lua similarity index 100% rename from pre-release/c101302057.lua rename to official/c32442017.lua diff --git a/pre-release/c101302108.lua b/official/c32665564.lua similarity index 100% rename from pre-release/c101302108.lua rename to official/c32665564.lua diff --git a/pre-release/c101302037.lua b/official/c33171768.lua similarity index 100% rename from pre-release/c101302037.lua rename to official/c33171768.lua diff --git a/pre-release/c101302051.lua b/official/c33781156.lua similarity index 100% rename from pre-release/c101302051.lua rename to official/c33781156.lua diff --git a/pre-release/c101302040.lua b/official/c33955120.lua similarity index 100% rename from pre-release/c101302040.lua rename to official/c33955120.lua diff --git a/official/c36849933.lua b/official/c36849933.lua index 4d19417b92..b35510b798 100644 --- a/official/c36849933.lua +++ b/official/c36849933.lua @@ -28,11 +28,11 @@ function s.initial_effect(c) e2:SetCondition(function() return Duel.IsMainPhase() end) e2:SetTarget(Ritual.Target(ritual_params)) e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) - local c=e:GetHandler() - if c:IsRelateToEffect(e) and c:IsControler(tp) then - Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) - end - end) + local c=e:GetHandler() + if c:IsRelateToEffect(e) and c:IsControler(tp) then + Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) + end + end) c:RegisterEffect(e2) end s.listed_series={SET_MEGALITH} diff --git a/pre-release/c100200277.lua b/official/c40725446.lua similarity index 98% rename from pre-release/c100200277.lua rename to official/c40725446.lua index 65c6173297..34770c3d24 100644 --- a/pre-release/c100200277.lua +++ b/official/c40725446.lua @@ -1,5 +1,5 @@ --熒焅聖 アレクゥス ---Alekus the Shining Stunner Saint +--Arequus the Shining Mars Saint --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/pre-release/c101302079.lua b/official/c42091632.lua similarity index 100% rename from pre-release/c101302079.lua rename to official/c42091632.lua diff --git a/pre-release/c101302034.lua b/official/c44293356.lua similarity index 100% rename from pre-release/c101302034.lua rename to official/c44293356.lua diff --git a/pre-release/c101302031.lua b/official/c45016904.lua similarity index 100% rename from pre-release/c101302031.lua rename to official/c45016904.lua diff --git a/pre-release/c101302028.lua b/official/c46148485.lua similarity index 100% rename from pre-release/c101302028.lua rename to official/c46148485.lua diff --git a/pre-release/c101302022.lua b/official/c47082621.lua similarity index 100% rename from pre-release/c101302022.lua rename to official/c47082621.lua diff --git a/pre-release/c101302025.lua b/official/c47960073.lua similarity index 100% rename from pre-release/c101302025.lua rename to official/c47960073.lua diff --git a/pre-release/c101302076.lua b/official/c53813120.lua similarity index 100% rename from pre-release/c101302076.lua rename to official/c53813120.lua diff --git a/pre-release/c101302016.lua b/official/c53927851.lua similarity index 100% rename from pre-release/c101302016.lua rename to official/c53927851.lua diff --git a/pre-release/c101302013.lua b/official/c54143349.lua similarity index 100% rename from pre-release/c101302013.lua rename to official/c54143349.lua diff --git a/pre-release/c101302010.lua b/official/c54265980.lua similarity index 100% rename from pre-release/c101302010.lua rename to official/c54265980.lua diff --git a/pre-release/c101302109.lua b/official/c54936778.lua similarity index 100% rename from pre-release/c101302109.lua rename to official/c54936778.lua diff --git a/pre-release/c101302007.lua b/official/c55088578.lua similarity index 100% rename from pre-release/c101302007.lua rename to official/c55088578.lua diff --git a/pre-release/c101302070.lua b/official/c55158350.lua similarity index 100% rename from pre-release/c101302070.lua rename to official/c55158350.lua diff --git a/pre-release/c101302067.lua b/official/c56870908.lua similarity index 100% rename from pre-release/c101302067.lua rename to official/c56870908.lua diff --git a/pre-release/c101302019.lua b/official/c58205203.lua similarity index 100% rename from pre-release/c101302019.lua rename to official/c58205203.lua diff --git a/pre-release/c101302042.lua b/official/c5848934.lua similarity index 100% rename from pre-release/c101302042.lua rename to official/c5848934.lua diff --git a/pre-release/c101302053.lua b/official/c6260560.lua similarity index 100% rename from pre-release/c101302053.lua rename to official/c6260560.lua diff --git a/official/c63056220.lua b/official/c63056220.lua index b087fe523f..c1eef2d0a6 100644 --- a/official/c63056220.lua +++ b/official/c63056220.lua @@ -25,11 +25,11 @@ function s.initial_effect(c) e2:SetCountLimit(1,id) e2:SetTarget(Ritual.Target(ritual_params)) e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) - local c=e:GetHandler() - if c:IsRelateToEffect(e) and c:IsControler(tp) then - Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) - end - end) + local c=e:GetHandler() + if c:IsRelateToEffect(e) and c:IsControler(tp) then + Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) + end + end) c:RegisterEffect(e2) end s.listed_series={SET_MEGALITH} diff --git a/pre-release/c101302039.lua b/official/c6560411.lua similarity index 100% rename from pre-release/c101302039.lua rename to official/c6560411.lua diff --git a/pre-release/c101302064.lua b/official/c66092596.lua similarity index 100% rename from pre-release/c101302064.lua rename to official/c66092596.lua diff --git a/pre-release/c101302004.lua b/official/c66100116.lua similarity index 100% rename from pre-release/c101302004.lua rename to official/c66100116.lua diff --git a/pre-release/c101302061.lua b/official/c67115133.lua similarity index 89% rename from pre-release/c101302061.lua rename to official/c67115133.lua index f86aad1ed9..60275297c2 100644 --- a/pre-release/c101302061.lua +++ b/official/c67115133.lua @@ -34,8 +34,10 @@ function s.thfilter2(c) return c:IsCode(CARD_MYSTICAL_SPACE_TYPHOON) and c:IsAbleToHand() end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) - local b1=Duel.IsExistingMatchingCard(s.thfilter1,tp,LOCATION_DECK,0,1,nil) and not Duel.HasFlagEffect(tp,id) - local b2=Duel.IsExistingMatchingCard(s.thfilter2,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil) and not Duel.HasFlagEffect(tp,id+100) + local b1=not Duel.HasFlagEffect(tp,id) + and Duel.IsExistingMatchingCard(s.thfilter1,tp,LOCATION_DECK,0,1,nil) + local b2=not Duel.HasFlagEffect(tp,id+1) + and Duel.IsExistingMatchingCard(s.thfilter2,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil) if chk==0 then return b1 or b2 end local op=Duel.SelectEffect(tp, {b1,aux.Stringid(id,2)}, @@ -45,7 +47,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.RegisterFlagEffect(tp,id,RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) 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) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK|LOCATION_GRAVE) end end diff --git a/pre-release/c101302101.lua b/official/c67322708.lua similarity index 100% rename from pre-release/c101302101.lua rename to official/c67322708.lua diff --git a/pre-release/c101302047.lua b/official/c67515699.lua similarity index 100% rename from pre-release/c101302047.lua rename to official/c67515699.lua diff --git a/pre-release/c101302044.lua b/official/c68231287.lua similarity index 100% rename from pre-release/c101302044.lua rename to official/c68231287.lua diff --git a/pre-release/c101302058.lua b/official/c68831625.lua similarity index 100% rename from pre-release/c101302058.lua rename to official/c68831625.lua diff --git a/pre-release/c101302055.lua b/official/c69053263.lua similarity index 100% rename from pre-release/c101302055.lua rename to official/c69053263.lua diff --git a/pre-release/c101302052.lua b/official/c69176851.lua similarity index 100% rename from pre-release/c101302052.lua rename to official/c69176851.lua diff --git a/pre-release/c101302041.lua b/official/c69453825.lua similarity index 100% rename from pre-release/c101302041.lua rename to official/c69453825.lua diff --git a/pre-release/c101302105.lua b/official/c70576413.lua similarity index 100% rename from pre-release/c101302105.lua rename to official/c70576413.lua diff --git a/pre-release/c101302104.lua b/official/c71398055.lua similarity index 100% rename from pre-release/c101302104.lua rename to official/c71398055.lua diff --git a/pre-release/c101302032.lua b/official/c71410542.lua similarity index 100% rename from pre-release/c101302032.lua rename to official/c71410542.lua diff --git a/pre-release/c101302029.lua b/official/c72632190.lua similarity index 100% rename from pre-release/c101302029.lua rename to official/c72632190.lua diff --git a/pre-release/c101302026.lua b/official/c73355772.lua similarity index 100% rename from pre-release/c101302026.lua rename to official/c73355772.lua diff --git a/pre-release/c101302050.lua b/official/c7382007.lua similarity index 100% rename from pre-release/c101302050.lua rename to official/c7382007.lua diff --git a/pre-release/c101302036.lua b/official/c7782069.lua similarity index 100% rename from pre-release/c101302036.lua rename to official/c7782069.lua diff --git a/pre-release/c101302077.lua b/official/c80208225.lua similarity index 93% rename from pre-release/c101302077.lua rename to official/c80208225.lua index 5397fa9375..51518b6236 100644 --- a/pre-release/c101302077.lua +++ b/official/c80208225.lua @@ -1,9 +1,9 @@ --星辰の刺毒 ---Dragontail Sting +--Dracotail Sting --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) - --Banish 1 monster and/or 1 Spell/Trap from your opponent's GY, then you can place 1 "Dragontail" card from your GY or banishment on the bottom of the Deck, except "Dragontail Sting", then draw 1 card + --Banish 1 monster and/or 1 Spell/Trap from your opponent's GY, then you can place 1 "Dracotail" card from your GY or banishment on the bottom of the Deck, except "Dracotail Sting", then draw 1 card local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_REMOVE+CATEGORY_TODECK+CATEGORY_DRAW) @@ -11,9 +11,9 @@ function s.initial_effect(c) e1:SetProperty(EFFECT_FLAG_CARD_TARGET) e1:SetCode(EVENT_FREE_CHAIN) e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH) - e1:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) e1:SetTarget(s.target) e1:SetOperation(s.activate) + e1:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) c:RegisterEffect(e1) end s.listed_series={SET_DRAGONTAIL} diff --git a/pre-release/c101302074.lua b/official/c80320877.lua similarity index 100% rename from pre-release/c101302074.lua rename to official/c80320877.lua diff --git a/pre-release/c101302014.lua b/official/c80538047.lua similarity index 100% rename from pre-release/c101302014.lua rename to official/c80538047.lua diff --git a/pre-release/c101302071.lua b/official/c81143465.lua similarity index 100% rename from pre-release/c101302071.lua rename to official/c81143465.lua diff --git a/pre-release/c101302011.lua b/official/c81650695.lua similarity index 98% rename from pre-release/c101302011.lua rename to official/c81650695.lua index 94fc2ca5b1..eddadf272d 100644 --- a/pre-release/c101302011.lua +++ b/official/c81650695.lua @@ -37,7 +37,7 @@ function s.initial_effect(c) c:RegisterEffect(e3) end s.listed_series={SET_DOOM_Z} -s.listed_names={101302044} --"Jupiter the Power Patron of Destruction" +s.listed_names={68231287} --"Jupiter the Power Patron of Destruction" function s.xyzmatfilter(c,e,tp) local mustg=aux.GetMustBeMaterialGroup(tp,Group.FromCards(c),tp,nil,nil,REASON_XYZ) return #mustg<=1 and c:IsFaceup() and c:IsType(TYPE_EFFECT) and c:HasLevel() diff --git a/pre-release/c101302023.lua b/official/c84477320.lua similarity index 93% rename from pre-release/c101302023.lua rename to official/c84477320.lua index 705dd90a04..f8280f0ebc 100644 --- a/pre-release/c101302023.lua +++ b/official/c84477320.lua @@ -1,9 +1,9 @@ --星辰響手プリクル ---Dragontail Phrixl +--Dracotail Phrixl --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) - --Special Summon 1 "Dragontail" monster from your GY, then return 1 monster you control to the hand + --Special Summon 1 "Dracotail" monster from your GY, then return 1 monster you control to the hand local e1a=Effect.CreateEffect(c) e1a:SetDescription(aux.Stringid(id,0)) e1a:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND) @@ -17,7 +17,7 @@ function s.initial_effect(c) local e1b=e1a:Clone() e1b:SetCode(EVENT_SPSUMMON_SUCCESS) c:RegisterEffect(e1b) - --Set 1 "Dragontail" Spell/Trap from your Deck + --Set 1 "Dracotail" Spell/Trap from your Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) diff --git a/pre-release/c101302020.lua b/official/c84693918.lua similarity index 100% rename from pre-release/c101302020.lua rename to official/c84693918.lua diff --git a/pre-release/c101302017.lua b/official/c85315450.lua similarity index 100% rename from pre-release/c101302017.lua rename to official/c85315450.lua diff --git a/pre-release/c101302033.lua b/official/c8805661.lua similarity index 88% rename from pre-release/c101302033.lua rename to official/c8805661.lua index 36a5722bba..9dd7f92fa0 100644 --- a/pre-release/c101302033.lua +++ b/official/c8805661.lua @@ -35,7 +35,12 @@ function s.initial_effect(c) e2:SetCondition(function() return Duel.IsMainPhase() end) e2:SetCost(Cost.HardOncePerChain(id)) e2:SetTarget(Ritual.Target(ritual_params)) - e2:SetOperation(s.ritop(Ritual.Operation(ritual_params))) + e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) + local c=e:GetHandler() + if c:IsRelateToEffect(e) and c:IsControler(tp) then + Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) + end + end) c:RegisterEffect(e2) end s.listed_series={SET_MEGALITH} @@ -54,12 +59,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(g) Duel.SendtoHand(g,nil,REASON_EFFECT) end -end -function s.ritop(default_operation) - return function(e,tp,eg,ep,ev,re,r,rp) - local c=e:GetHandler() - if c:IsRelateToEffect(e) and c:IsControler(tp) then - default_operation(e,tp,eg,ep,ev,re,r,rp) - end - end -end +end \ No newline at end of file diff --git a/pre-release/c101302080.lua b/official/c89086647.lua similarity index 100% rename from pre-release/c101302080.lua rename to official/c89086647.lua diff --git a/official/c90444325.lua b/official/c90444325.lua index 53b4b02e62..3221e49699 100644 --- a/official/c90444325.lua +++ b/official/c90444325.lua @@ -25,11 +25,11 @@ function s.initial_effect(c) e2:SetCountLimit(1,id) e2:SetTarget(Ritual.Target(ritual_params)) e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp) - local c=e:GetHandler() - if c:IsRelateToEffect(e) and c:IsControler(tp) then - Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) - end - end) + local c=e:GetHandler() + if c:IsRelateToEffect(e) and c:IsControler(tp) then + Ritual.Operation(ritual_params)(e,tp,eg,ep,ev,re,r,rp) + end + end) c:RegisterEffect(e2) end s.listed_series={SET_MEGALITH} diff --git a/pre-release/c101302068.lua b/official/c92269002.lua similarity index 96% rename from pre-release/c101302068.lua rename to official/c92269002.lua index 3d101069b1..aebc6bf5a8 100644 --- a/pre-release/c101302068.lua +++ b/official/c92269002.lua @@ -32,7 +32,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local rg=Duel.GetMatchingGroup(s.spcostfilter,tp,LOCATION_MZONE|LOCATION_GRAVE,0,nil) local lg=Duel.GetMatchingGroup(s.spfilter,tp,LOCATION_EXTRA,0,nil,e,tp,g) local _,min_link=lg:GetMinGroup(Card.GetLink) - local b2=not Duel.HasFlagEffect(tp,id+100) and min_link and min_link<=#rg + local b2=not Duel.HasFlagEffect(tp,id+1) and min_link and min_link<=#rg if chk==0 then return b1 or b2 end local op=Duel.SelectEffect(tp, {b1,aux.Stringid(id,1)}, @@ -43,7 +43,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) 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_SPECIAL_SUMMON) local link_map={} for lc in lg:Iter() do diff --git a/pre-release/c101302008.lua b/official/c92472273.lua similarity index 100% rename from pre-release/c101302008.lua rename to official/c92472273.lua diff --git a/pre-release/c101302005.lua b/official/c92595825.lua similarity index 100% rename from pre-release/c101302005.lua rename to official/c92595825.lua diff --git a/pre-release/c101302102.lua b/official/c93317313.lua similarity index 100% rename from pre-release/c101302102.lua rename to official/c93317313.lua diff --git a/pre-release/c101302065.lua b/official/c93481594.lua similarity index 94% rename from pre-release/c101302065.lua rename to official/c93481594.lua index 1b968a6e77..c591638ca9 100644 --- a/pre-release/c101302065.lua +++ b/official/c93481594.lua @@ -21,12 +21,12 @@ function s.spfilter(c,e,tp) return c:IsSetCard(SET_SOLFACHORD) and c:IsType(TYPE_PENDULUM) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) - local b1=not Duel.HasFlagEffect(tp,id+100) + local b1=not Duel.HasFlagEffect(tp,id+1) and Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,e:GetHandler(),REASON_EFFECT) and Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil):GetClassCount(Card.GetScale)>=2 - local b2=not Duel.HasFlagEffect(tp,id+200) + local b2=not Duel.HasFlagEffect(tp,id+2) and Pendulum.PlayerCanGainAdditionalPendulumSummon(tp,id) - local b3=not Duel.HasFlagEffect(tp,id+300) + local b3=not Duel.HasFlagEffect(tp,id+3) and Duel.GetLocationCount(tp,LOCATION_MZONE)>=2 and not Duel.IsPlayerAffectedByEffect(tp,CARD_BLUEEYES_SPIRIT) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_PZONE,0,2,nil,e,tp) @@ -36,7 +36,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) {b2,aux.Stringid(id,2)}, {b3,aux.Stringid(id,3)}) e:SetLabel(op) - Duel.RegisterFlagEffect(tp,id+op*100,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+op,RESET_PHASE|PHASE_END,0,1) if op==1 then e:SetCategory(CATEGORY_HANDES+CATEGORY_TOHAND+CATEGORY_SEARCH) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1) @@ -82,4 +82,4 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) end end -end \ No newline at end of file +end diff --git a/pre-release/c101302062.lua b/official/c94103142.lua similarity index 89% rename from pre-release/c101302062.lua rename to official/c94103142.lua index ebf57437bf..0ed8c8d078 100644 --- a/pre-release/c101302062.lua +++ b/official/c94103142.lua @@ -33,8 +33,10 @@ function s.thfilter(c) return c:IsCode(CARD_MYSTICAL_SPACE_TYPHOON) and c:IsAbleToHand() end function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) - local b1=Duel.IsExistingMatchingCard(s.tgfilter,tp,LOCATION_DECK,0,1,nil) and not Duel.HasFlagEffect(tp,id) - local b2=Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil) and not Duel.HasFlagEffect(tp,id+100) + local b1=not Duel.HasFlagEffect(tp,id) + and Duel.IsExistingMatchingCard(s.tgfilter,tp,LOCATION_DECK,0,1,nil) + local b2=not Duel.HasFlagEffect(tp,id+1) + and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil) if chk==0 then return b1 or b2 end local op=Duel.SelectEffect(tp, {b1,aux.Stringid(id,2)}, @@ -46,7 +48,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK) elseif op==2 then e:SetCategory(CATEGORY_SEARCH+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_TOHAND,nil,1,tp,LOCATION_DECK|LOCATION_GRAVE) end end diff --git a/pre-release/c101302059.lua b/official/c94326720.lua similarity index 100% rename from pre-release/c101302059.lua rename to official/c94326720.lua diff --git a/pre-release/c101302048.lua b/official/c94503794.lua similarity index 100% rename from pre-release/c101302048.lua rename to official/c94503794.lua diff --git a/pre-release/c101302056.lua b/official/c95448372.lua similarity index 100% rename from pre-release/c101302056.lua rename to official/c95448372.lua diff --git a/pre-release/c101302045.lua b/official/c95626382.lua similarity index 100% rename from pre-release/c101302045.lua rename to official/c95626382.lua diff --git a/pre-release/c101302030.lua b/official/c9627299.lua similarity index 100% rename from pre-release/c101302030.lua rename to official/c9627299.lua