diff --git a/pre-release/c101303036.lua b/official/c10136446.lua similarity index 98% rename from pre-release/c101303036.lua rename to official/c10136446.lua index 614782b6e1..a73288e72a 100644 --- a/pre-release/c101303036.lua +++ b/official/c10136446.lua @@ -1,5 +1,5 @@ --黄昏の堕天使ルシファー ---Lucifer, Darklord of the Evening Twilight +--Darklord Eveningstar --Scripted by The Razgriz local s,id=GetID() function s.initial_effect(c) diff --git a/pre-release/c101303019.lua b/official/c10426067.lua similarity index 100% rename from pre-release/c101303019.lua rename to official/c10426067.lua diff --git a/pre-release/c101303080.lua b/official/c11035075.lua similarity index 100% rename from pre-release/c101303080.lua rename to official/c11035075.lua diff --git a/pre-release/c101303016.lua b/official/c11248645.lua similarity index 100% rename from pre-release/c101303016.lua rename to official/c11248645.lua diff --git a/pre-release/c101303033.lua b/official/c11852093.lua similarity index 100% rename from pre-release/c101303033.lua rename to official/c11852093.lua diff --git a/pre-release/c101303077.lua b/official/c12157563.lua similarity index 100% rename from pre-release/c101303077.lua rename to official/c12157563.lua diff --git a/pre-release/c101303027.lua b/official/c12197223.lua similarity index 100% rename from pre-release/c101303027.lua rename to official/c12197223.lua diff --git a/pre-release/c101303013.lua b/official/c12375297.lua similarity index 96% rename from pre-release/c101303013.lua rename to official/c12375297.lua index 386e4dc2a1..5b3951b0b2 100644 --- a/pre-release/c101303013.lua +++ b/official/c12375297.lua @@ -41,7 +41,7 @@ function s.initial_effect(c) c:RegisterEffect(e3) end s.listed_series={SET_ELVENNOTES} -s.listed_names={101303039} --"Junora the Power Patron of Tuning" +s.listed_names={5914858} --"Junora the Power Patron of Tuning" function s.lvfilter(c) return c:IsSequence(2) and c:HasLevel() and c:IsFaceup() end @@ -54,7 +54,7 @@ function s.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) Duel.SetPossibleOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) end function s.synchrofilter(c) - return (c:IsSetCard(SET_ELVENNOTES) or c:IsCode(101303039)) and c:IsSynchroSummonable() + return (c:IsSetCard(SET_ELVENNOTES) or c:IsCode(5914858)) and c:IsSynchroSummonable() end function s.lvop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() diff --git a/pre-release/c101303030.lua b/official/c12975671.lua similarity index 100% rename from pre-release/c101303030.lua rename to official/c12975671.lua diff --git a/pre-release/c101303074.lua b/official/c13379114.lua similarity index 100% rename from pre-release/c101303074.lua rename to official/c13379114.lua diff --git a/pre-release/c101303010.lua b/official/c13597785.lua similarity index 100% rename from pre-release/c101303010.lua rename to official/c13597785.lua diff --git a/pre-release/c101303025.lua b/official/c19304410.lua similarity index 100% rename from pre-release/c101303025.lua rename to official/c19304410.lua diff --git a/pre-release/c101303007.lua b/official/c23219323.lua similarity index 100% rename from pre-release/c101303007.lua rename to official/c23219323.lua diff --git a/pre-release/c101303072.lua b/official/c24092792.lua similarity index 100% rename from pre-release/c101303072.lua rename to official/c24092792.lua diff --git a/pre-release/c101303004.lua b/official/c24431911.lua similarity index 93% rename from pre-release/c101303004.lua rename to official/c24431911.lua index 533119654a..63348121b9 100644 --- a/pre-release/c101303004.lua +++ b/official/c24431911.lua @@ -43,13 +43,13 @@ function s.initial_effect(c) e2:SetHintTiming(0,TIMING_STANDBY_PHASE|TIMING_MAIN_END|TIMINGS_CHECK_MONSTER_E) c:RegisterEffect(e2) end -s.listed_names={101303005,101303006} --"Magnet Warrior Σ+", "Magnet Warrior Σ-" +s.listed_names={51826619,87814728} --"Magnet Warrior Σ+", "Magnet Warrior Σ-" s.listed_series={SET_MAGNET_WARRIOR_SIGMA} function s.selfspcostfilter(c) - return c:IsCode(101303005,101303006) and (c:IsFaceup() or not c:IsOnField()) and c:IsAbleToRemoveAsCost() and aux.SpElimFilter(c,true,true) + return c:IsCode(51826619,87814728) and (c:IsFaceup() or not c:IsOnField()) and c:IsAbleToRemoveAsCost() and aux.SpElimFilter(c,true,true) end function s.rescon(sg,e,tp,mg) - return Duel.GetMZoneCount(tp,sg)>0 and sg:IsExists(Card.IsCode,1,nil,101303005) and sg:IsExists(Card.IsCode,1,nil,101303006) + return Duel.GetMZoneCount(tp,sg)>0 and sg:IsExists(Card.IsCode,1,nil,51826619) and sg:IsExists(Card.IsCode,1,nil,87814728) end function s.selfspcon(e,c) if c==nil then return true end diff --git a/pre-release/c101303068.lua b/official/c25224340.lua similarity index 100% rename from pre-release/c101303068.lua rename to official/c25224340.lua diff --git a/pre-release/c101303101.lua b/official/c25554552.lua similarity index 100% rename from pre-release/c101303101.lua rename to official/c25554552.lua diff --git a/pre-release/c101303065.lua b/official/c25940932.lua similarity index 96% rename from pre-release/c101303065.lua rename to official/c25940932.lua index bc37e88825..4aeef6b1ff 100644 --- a/pre-release/c101303065.lua +++ b/official/c25940932.lua @@ -35,7 +35,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=not Duel.HasFlagEffect(tp,id) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) - local b2=not Duel.HasFlagEffect(tp,id+100) + 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, @@ -48,7 +48,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE) 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/c101303061.lua b/official/c26162470.lua similarity index 100% rename from pre-release/c101303061.lua rename to official/c26162470.lua diff --git a/pre-release/c101303051.lua b/official/c2725599.lua similarity index 100% rename from pre-release/c101303051.lua rename to official/c2725599.lua diff --git a/pre-release/c101303058.lua b/official/c27285068.lua similarity index 100% rename from pre-release/c101303058.lua rename to official/c27285068.lua diff --git a/pre-release/c101303046.lua b/official/c30064423.lua similarity index 91% rename from pre-release/c101303046.lua rename to official/c30064423.lua index 8867453c5c..3458b5e2eb 100644 --- a/pre-release/c101303046.lua +++ b/official/c30064423.lua @@ -42,21 +42,21 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,1,c) --Shuffle all Spells and Traps on the field into the Deck - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Duel.IsExistingMatchingCard(aux.AND(Card.IsSpellTrap,Card.IsAbleToDeck),tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) --Look at your opponent's Extra Deck and banish 1 card from it - local b3=not Duel.HasFlagEffect(tp,id+200) + local b3=not Duel.HasFlagEffect(tp,id+2) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,1,nil) if chk==0 then return (b1 or b2 or b3) end if not Duel.HasFlagEffect(tp,id) then local g=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,c) Duel.SetPossibleOperationInfo(0,CATEGORY_TODECK,g,#g,tp,0) end - if not Duel.HasFlagEffect(tp,id+100) then + if not Duel.HasFlagEffect(tp,id+1) then local g=Duel.GetMatchingGroup(aux.AND(Card.IsSpellTrap,Card.IsAbleToDeck),tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) Duel.SetPossibleOperationInfo(0,CATEGORY_TODECK,g,#g,tp,0) end - if not Duel.HasFlagEffect(tp,id+200) then + if not Duel.HasFlagEffect(tp,id+2) then local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,nil,tp) Duel.SetPossibleOperationInfo(0,CATEGORY_REMOVE,g,#g,tp,0) end @@ -66,9 +66,9 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) local exc=c:IsRelateToEffect(e) and c or nil local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,1,exc) - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Duel.IsExistingMatchingCard(aux.AND(Card.IsSpellTrap,Card.IsAbleToDeck),tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) - local b3=not Duel.HasFlagEffect(tp,id+200) + local b3=not Duel.HasFlagEffect(tp,id+2) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,1,nil) if not (b1 or b2 or b3) then return end local op=Duel.SelectEffect(tp, @@ -82,12 +82,12 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp) Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) elseif op==2 then --Shuffle all Spells and Traps on the field into the Deck - Duel.RegisterFlagEffect(tp,id+100,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+1,RESET_PHASE|PHASE_END,0,1) local g=Duel.GetMatchingGroup(aux.AND(Card.IsSpellTrap,Card.IsAbleToDeck),tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) elseif op==3 then --Look at your opponent's Extra Deck and banish 1 card from it - Duel.RegisterFlagEffect(tp,id+200,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+2,RESET_PHASE|PHASE_END,0,1) local g=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA) Duel.ConfirmCards(tp,g) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) diff --git a/pre-release/c100444219.lua b/official/c30271097.lua similarity index 100% rename from pre-release/c100444219.lua rename to official/c30271097.lua diff --git a/pre-release/c101303043.lua b/official/c31286915.lua similarity index 100% rename from pre-release/c101303043.lua rename to official/c31286915.lua diff --git a/pre-release/c101303055.lua b/official/c38007649.lua similarity index 100% rename from pre-release/c101303055.lua rename to official/c38007649.lua diff --git a/pre-release/c101303107.lua b/official/c38129297.lua similarity index 94% rename from pre-release/c101303107.lua rename to official/c38129297.lua index 9c63c53d33..37528efbf8 100644 --- a/pre-release/c101303107.lua +++ b/official/c38129297.lua @@ -55,7 +55,7 @@ function s.effcost(fusion_params,ritual_params) e:SetLabel(-100) local b1=not Duel.HasFlagEffect(tp,id) and Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,0) - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Ritual.Target(ritual_params)(e,tp,eg,ep,ev,re,r,rp,0) if chk==0 then return b1 or b2 end end @@ -65,7 +65,7 @@ function s.efftg(fusion_params,ritual_params) local cost_skip=e:GetLabel()~=-100 local b1=(cost_skip or not Duel.HasFlagEffect(tp,id)) and Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,0) - local b2=(cost_skip or not Duel.HasFlagEffect(tp,id+100)) + local b2=(cost_skip or not Duel.HasFlagEffect(tp,id+1)) and Ritual.Target(ritual_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, @@ -78,7 +78,7 @@ function s.efftg(fusion_params,ritual_params) Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,1) elseif op==2 then e:SetCategory(CATEGORY_REMOVE+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 Ritual.Target(ritual_params)(e,tp,eg,ep,ev,re,r,rp,1) end end diff --git a/pre-release/c101303049.lua b/official/c39341885.lua similarity index 100% rename from pre-release/c101303049.lua rename to official/c39341885.lua diff --git a/pre-release/c101303106.lua b/official/c3957130.lua similarity index 94% rename from pre-release/c101303106.lua rename to official/c3957130.lua index 77a56dcdbb..283aada7e0 100644 --- a/pre-release/c101303106.lua +++ b/official/c3957130.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) e2:SetOperation(s.desop) c:RegisterEffect(e2) end -s.listed_names={67526112,20071842,101303107} --"Rapid Trigger", "Heavy Interlock", "Double Trigger" +s.listed_names={67526112,20071842,38129297} --"Rapid Trigger", "Heavy Interlock", "Double Trigger" s.listed_series={SET_ROKKET} function s.matfilter(c,sc,st,tp) return c:IsAttribute(ATTRIBUTE_DARK,sc,st,tp) and c:IsRace(RACE_DRAGON,sc,st,tp) @@ -39,7 +39,7 @@ function s.matcheck(g,lc,sumtype,tp) return g:IsExists(Card.IsSetCard,1,nil,SET_ROKKET,lc,sumtype,tp) end function s.deckthfilter(c) - return c:IsCode(67526112,20071842,101303107) and c:IsAbleToHand() + return c:IsCode(67526112,20071842,38129297) and c:IsAbleToHand() end function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.deckthfilter,tp,LOCATION_DECK,0,1,nil) end diff --git a/pre-release/c101303045.lua b/official/c4079728.lua similarity index 100% rename from pre-release/c101303045.lua rename to official/c4079728.lua diff --git a/pre-release/c101303022.lua b/official/c41516133.lua similarity index 100% rename from pre-release/c101303022.lua rename to official/c41516133.lua diff --git a/pre-release/c101303037.lua b/official/c42125140.lua similarity index 96% rename from pre-release/c101303037.lua rename to official/c42125140.lua index 1ea215b012..e533fd1665 100644 --- a/pre-release/c101303037.lua +++ b/official/c42125140.lua @@ -39,7 +39,7 @@ function s.initial_effect(c) c:RegisterEffect(e3) local e4=e3:Clone() e4:SetCode(EVENT_CHAINING) - e4:SetOperation(function(e) e:GetHandler():ResetFlagEffect(id+100) end) + e4:SetOperation(function(e) e:GetHandler():ResetFlagEffect(id+1) end) c:RegisterEffect(e4) local e5=e4:Clone() e5:SetCode(EVENT_CHAIN_SOLVED) @@ -74,12 +74,12 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() local ct=eg:FilterCount(Card.IsMonster,nil) if ct==0 or eg:IsContains(c) then return end - if ct>=2 or c:HasFlagEffect(id+100) then + if ct>=2 or c:HasFlagEffect(id+1) then Duel.RaiseSingleEvent(c,EVENT_CUSTOM+id,re,r,rp,ep,ev) end local eff=Duel.GetChainInfo(0,CHAININFO_TRIGGERING_EFFECT) if eff then - c:RegisterFlagEffect(id+100,RESET_EVENT|RESETS_STANDARD|RESET_CHAIN,0,1) + c:RegisterFlagEffect(id+1,RESET_EVENT|RESETS_STANDARD|RESET_CHAIN,0,1) end end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/pre-release/c101303040.lua b/official/c42302563.lua similarity index 100% rename from pre-release/c101303040.lua rename to official/c42302563.lua diff --git a/pre-release/c101303026.lua b/official/c46708514.lua similarity index 100% rename from pre-release/c101303026.lua rename to official/c46708514.lua diff --git a/pre-release/c101303034.lua b/official/c47247792.lua similarity index 100% rename from pre-release/c101303034.lua rename to official/c47247792.lua diff --git a/pre-release/c101303023.lua b/official/c47425162.lua similarity index 100% rename from pre-release/c101303023.lua rename to official/c47425162.lua diff --git a/pre-release/c101303017.lua b/official/c47647354.lua similarity index 100% rename from pre-release/c101303017.lua rename to official/c47647354.lua diff --git a/pre-release/c101303031.lua b/official/c48469380.lua similarity index 98% rename from pre-release/c101303031.lua rename to official/c48469380.lua index 04ecd84df4..9f241c11e1 100644 --- a/pre-release/c101303031.lua +++ b/official/c48469380.lua @@ -48,7 +48,7 @@ function s.initial_effect(c) e4:SetOperation(s.spop) c:RegisterEffect(e4) end -s.listed_names={101303059} --"Throne of Archfiends" +s.listed_names={63679166} --"Throne of Archfiends" function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local c=e:GetHandler() if chkc then return c:IsOnField() and c:IsSpellTrap() and c:IsFaceup() and chkc~=c end diff --git a/pre-release/c101303042.lua b/official/c4891376.lua similarity index 100% rename from pre-release/c101303042.lua rename to official/c4891376.lua diff --git a/pre-release/c101303064.lua b/official/c4909946.lua similarity index 100% rename from pre-release/c101303064.lua rename to official/c4909946.lua diff --git a/pre-release/c101303028.lua b/official/c49181828.lua similarity index 100% rename from pre-release/c101303028.lua rename to official/c49181828.lua diff --git a/pre-release/c101303078.lua b/official/c49652661.lua similarity index 100% rename from pre-release/c101303078.lua rename to official/c49652661.lua diff --git a/pre-release/c101303071.lua b/official/c50590801.lua similarity index 100% rename from pre-release/c101303071.lua rename to official/c50590801.lua diff --git a/pre-release/c101303008.lua b/official/c50604072.lua similarity index 100% rename from pre-release/c101303008.lua rename to official/c50604072.lua diff --git a/pre-release/c101303021.lua b/official/c5121528.lua similarity index 100% rename from pre-release/c101303021.lua rename to official/c5121528.lua diff --git a/pre-release/c101303102.lua b/official/c51548207.lua similarity index 100% rename from pre-release/c101303102.lua rename to official/c51548207.lua diff --git a/pre-release/c101303069.lua b/official/c51612489.lua similarity index 100% rename from pre-release/c101303069.lua rename to official/c51612489.lua diff --git a/pre-release/c101303005.lua b/official/c51826619.lua similarity index 100% rename from pre-release/c101303005.lua rename to official/c51826619.lua diff --git a/pre-release/c101303066.lua b/official/c52335937.lua similarity index 100% rename from pre-release/c101303066.lua rename to official/c52335937.lua diff --git a/pre-release/c101303062.lua b/official/c53557529.lua similarity index 100% rename from pre-release/c101303062.lua rename to official/c53557529.lua diff --git a/pre-release/c101303014.lua b/official/c58769832.lua similarity index 100% rename from pre-release/c101303014.lua rename to official/c58769832.lua diff --git a/pre-release/c101303039.lua b/official/c5914858.lua similarity index 100% rename from pre-release/c101303039.lua rename to official/c5914858.lua diff --git a/pre-release/c101303075.lua b/official/c59374259.lua similarity index 100% rename from pre-release/c101303075.lua rename to official/c59374259.lua diff --git a/pre-release/c101303011.lua b/official/c59581480.lua similarity index 100% rename from pre-release/c101303011.lua rename to official/c59581480.lua diff --git a/pre-release/c101303059.lua b/official/c63679166.lua similarity index 90% rename from pre-release/c101303059.lua rename to official/c63679166.lua index da75a04c5a..605329a22c 100644 --- a/pre-release/c101303059.lua +++ b/official/c63679166.lua @@ -14,12 +14,12 @@ function s.initial_effect(c) e1:SetCode(EVENT_PHASE+PHASE_STANDBY) e1:SetRange(LOCATION_GRAVE|LOCATION_REMOVED) e1:SetCountLimit(1,id) - e1:SetCondition(function(e,tp) return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,101303031),tp,LOCATION_EXTRA,0,1,nil) end) + e1:SetCondition(function(e,tp) return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,48469380),tp,LOCATION_EXTRA,0,1,nil) end) e1:SetTarget(s.thtg) e1:SetOperation(s.thop) c:RegisterEffect(e1) end -s.listed_names={101303031} --"Doom Emperor Archfiend" +s.listed_names={48469380} --"Doom Emperor Archfiend" s.listed_series={SET_ARCHFIEND} function s.ritualmonsterfilter(c) return c:IsSetCard(SET_ARCHFIEND) and c:IsRitualMonster() and (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) diff --git a/pre-release/c101303056.lua b/official/c64491754.lua similarity index 100% rename from pre-release/c101303056.lua rename to official/c64491754.lua diff --git a/pre-release/c101303053.lua b/official/c65514302.lua similarity index 94% rename from pre-release/c101303053.lua rename to official/c65514302.lua index 40df14d555..1bb7fc9277 100644 --- a/pre-release/c101303053.lua +++ b/official/c65514302.lua @@ -33,7 +33,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingMatchingCard(s.magnetthfilter,tp,LOCATION_DECK,0,1,nil) --Add 1 Level 8 "Magna Warrior" monster from your Deck to your hand - local b2=not Duel.HasFlagEffect(tp,id+100) + local b2=not Duel.HasFlagEffect(tp,id+1) and Duel.IsExistingMatchingCard(s.magnathfilter,tp,LOCATION_DECK,0,1,nil) --Fusion Summon 1 Rock Fusion Monster from your Extra Deck, by shuffling Rock monsters from your hand, field, GY, and/or banishment into the Deck local fusion_params={ @@ -42,7 +42,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) extrafil=s.fextra, extraop=Fusion.ShuffleMaterial } - local b3=not Duel.HasFlagEffect(tp,id+200) + local b3=not Duel.HasFlagEffect(tp,id+2) and Fusion.SummonEffTG(fusion_params)(e,tp,eg,ep,ev,re,r,rp,0) if chk==0 then return b1 or b2 or b3 end local op=Duel.SelectEffect(tp, @@ -56,11 +56,11 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) elseif op==2 then e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) - 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) elseif op==3 then e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON+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,1,tp,LOCATION_HAND|LOCATION_MZONE|LOCATION_GRAVE|LOCATION_REMOVED) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) end diff --git a/pre-release/c101303105.lua b/official/c66452432.lua similarity index 100% rename from pre-release/c101303105.lua rename to official/c66452432.lua diff --git a/pre-release/c101303050.lua b/official/c66736884.lua similarity index 100% rename from pre-release/c101303050.lua rename to official/c66736884.lua diff --git a/pre-release/c101303024.lua b/official/c73819701.lua similarity index 100% rename from pre-release/c101303024.lua rename to official/c73819701.lua diff --git a/pre-release/c101303035.lua b/official/c74631897.lua similarity index 100% rename from pre-release/c101303035.lua rename to official/c74631897.lua diff --git a/pre-release/c100444241.lua b/official/c76666602.lua similarity index 98% rename from pre-release/c100444241.lua rename to official/c76666602.lua index 2ee3928018..c421869c19 100644 --- a/pre-release/c100444241.lua +++ b/official/c76666602.lua @@ -1,5 +1,5 @@ --聖痕喰らいし竜 ---The Stigmata-Devouring Dragon +--The Dragon that Devours the Dogma --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/pre-release/c101303044.lua b/official/c77675029.lua similarity index 100% rename from pre-release/c101303044.lua rename to official/c77675029.lua diff --git a/pre-release/c101303041.lua b/official/c78397661.lua similarity index 100% rename from pre-release/c101303041.lua rename to official/c78397661.lua diff --git a/pre-release/c101303020.lua b/official/c78910832.lua similarity index 100% rename from pre-release/c101303020.lua rename to official/c78910832.lua diff --git a/pre-release/c101303038.lua b/official/c79519259.lua similarity index 100% rename from pre-release/c101303038.lua rename to official/c79519259.lua diff --git a/pre-release/c101303018.lua b/official/c84031359.lua similarity index 99% rename from pre-release/c101303018.lua rename to official/c84031359.lua index be406f58ef..3d5d4c5f3f 100644 --- a/pre-release/c101303018.lua +++ b/official/c84031359.lua @@ -2,7 +2,7 @@ --Darklord Gulgalta --scripted by Naim local s,id=GetID() -local TOKEN_DARKLORD=id+100 +local TOKEN_DARKLORD=id+1 function s.initial_effect(c) --You can only Special Summon "Darklord Gulgalta(s)" once per turn c:SetSPSummonOnce(id) diff --git a/pre-release/c101303104.lua b/official/c84464389.lua similarity index 100% rename from pre-release/c101303104.lua rename to official/c84464389.lua diff --git a/pre-release/c101303015.lua b/official/c85154941.lua similarity index 100% rename from pre-release/c101303015.lua rename to official/c85154941.lua diff --git a/pre-release/c101303029.lua b/official/c85586937.lua similarity index 100% rename from pre-release/c101303029.lua rename to official/c85586937.lua diff --git a/pre-release/c101303079.lua b/official/c85640370.lua similarity index 100% rename from pre-release/c101303079.lua rename to official/c85640370.lua diff --git a/pre-release/c101303012.lua b/official/c85976588.lua similarity index 100% rename from pre-release/c101303012.lua rename to official/c85976588.lua diff --git a/pre-release/c101303009.lua b/official/c86098176.lua similarity index 100% rename from pre-release/c101303009.lua rename to official/c86098176.lua diff --git a/pre-release/c101303076.lua b/official/c86762958.lua similarity index 100% rename from pre-release/c101303076.lua rename to official/c86762958.lua diff --git a/pre-release/c101303108.lua b/official/c87607094.lua similarity index 100% rename from pre-release/c101303108.lua rename to official/c87607094.lua diff --git a/pre-release/c101303006.lua b/official/c87814728.lua similarity index 100% rename from pre-release/c101303006.lua rename to official/c87814728.lua diff --git a/pre-release/c101303073.lua b/official/c87985506.lua similarity index 90% rename from pre-release/c101303073.lua rename to official/c87985506.lua index 3e5f7b26dd..1cfe0dc4b8 100644 --- a/pre-release/c101303073.lua +++ b/official/c87985506.lua @@ -16,9 +16,9 @@ function s.initial_effect(c) c:RegisterEffect(e1) end s.listed_series={SET_ARCHFIEND} -s.listed_names={101303014,101303015,101303016} --"Royal Archfiend", "Duke Archfiend", "Highness Archfiend" +s.listed_names={58769832,85154941,11248645} --"Royal Archfiend", "Duke Archfiend", "Highness Archfiend" function s.spfilter(c,e,tp,ex_chk) - return ((c:IsLevelBelow(7) and c:IsSetCard(SET_ARCHFIEND)) or (ex_chk and c:IsCode(101303014,101303015,101303016))) + return ((c:IsLevelBelow(7) and c:IsSetCard(SET_ARCHFIEND)) or (ex_chk and c:IsCode(58769832,85154941,11248645))) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end function s.archritfilter(c) @@ -34,7 +34,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) end function s.rescon(ex_chk) return function(sg,e,tp,mg) - return #sg==1 or (ex_chk and #sg<=3 and sg:FilterCount(Card.IsCode,nil,101303014,101303015,101303016)==#sg and sg:GetClassCount(Card.GetCode)==#sg) + return #sg==1 or (ex_chk and #sg<=3 and sg:FilterCount(Card.IsCode,nil,58769832,85154941,11248645)==#sg and sg:GetClassCount(Card.GetCode)==#sg) end end function s.activate(e,tp,eg,ep,ev,re,r,rp) diff --git a/pre-release/c101303060.lua b/official/c90764871.lua similarity index 100% rename from pre-release/c101303060.lua rename to official/c90764871.lua diff --git a/pre-release/c101303057.lua b/official/c90880453.lua similarity index 100% rename from pre-release/c101303057.lua rename to official/c90880453.lua diff --git a/pre-release/c101303054.lua b/official/c91002901.lua similarity index 100% rename from pre-release/c101303054.lua rename to official/c91002901.lua diff --git a/pre-release/c101303067.lua b/official/c98829635.lua similarity index 100% rename from pre-release/c101303067.lua rename to official/c98829635.lua diff --git a/pre-release/c101303103.lua b/official/c98937206.lua similarity index 100% rename from pre-release/c101303103.lua rename to official/c98937206.lua diff --git a/pre-release/c101303063.lua b/official/c99941223.lua similarity index 98% rename from pre-release/c101303063.lua rename to official/c99941223.lua index e9c462fcbb..36bc1fcae5 100644 --- a/pre-release/c101303063.lua +++ b/official/c99941223.lua @@ -1,5 +1,5 @@ --佚楽の堕天使 ---Darklord Pleasure +--Darklord Dance --Scripted by The Razgriz local s,id=GetID() function s.initial_effect(c)