diff --git a/pre-release/c101301084.lua b/official/c18988396.lua similarity index 100% rename from pre-release/c101301084.lua rename to official/c18988396.lua diff --git a/pre-release/c101301081.lua b/official/c19000848.lua similarity index 96% rename from pre-release/c101301081.lua rename to official/c19000848.lua index cf76d0be32..0cfd8696e8 100644 --- a/pre-release/c101301081.lua +++ b/official/c19000848.lua @@ -35,7 +35,7 @@ function s.initial_effect(c) e3:SetOperation(s.thop) c:RegisterEffect(e3) end -s.listed_names={101301083} --"Mutiny in the Sky" +s.listed_names={71593652} --"Mutiny in the Sky" function s.disfilter(c) return c:IsRace(RACE_FIEND) and c:IsType(TYPE_EFFECT) and c:IsNegatableMonster() end @@ -62,7 +62,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) end end function s.thfilter(c) - return c:IsCode(101301083) and c:IsAbleToHand() + return c:IsCode(71593652) 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/c101301094.lua b/official/c32216688.lua similarity index 100% rename from pre-release/c101301094.lua rename to official/c32216688.lua diff --git a/pre-release/c101301091.lua b/official/c33438265.lua similarity index 100% rename from pre-release/c101301091.lua rename to official/c33438265.lua diff --git a/pre-release/c101301088.lua b/official/c43150717.lua similarity index 100% rename from pre-release/c101301088.lua rename to official/c43150717.lua diff --git a/pre-release/c101301085.lua b/official/c44376395.lua similarity index 100% rename from pre-release/c101301085.lua rename to official/c44376395.lua diff --git a/pre-release/c101301082.lua b/official/c45409943.lua similarity index 100% rename from pre-release/c101301082.lua rename to official/c45409943.lua diff --git a/pre-release/c101301096.lua b/official/c5109321.lua similarity index 100% rename from pre-release/c101301096.lua rename to official/c5109321.lua diff --git a/pre-release/c101301090.lua b/official/c6043161.lua similarity index 100% rename from pre-release/c101301090.lua rename to official/c6043161.lua diff --git a/pre-release/c101301093.lua b/official/c6821579.lua similarity index 100% rename from pre-release/c101301093.lua rename to official/c6821579.lua diff --git a/pre-release/c101301089.lua b/official/c70659412.lua similarity index 100% rename from pre-release/c101301089.lua rename to official/c70659412.lua diff --git a/pre-release/c101301083.lua b/official/c71593652.lua similarity index 100% rename from pre-release/c101301083.lua rename to official/c71593652.lua diff --git a/pre-release/c101301087.lua b/official/c7166709.lua similarity index 97% rename from pre-release/c101301087.lua rename to official/c7166709.lua index 30ed6052bb..c902f1bc78 100644 --- a/pre-release/c101301087.lua +++ b/official/c7166709.lua @@ -33,8 +33,8 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() local b1=c:IsLocation(LOCATION_HAND) and not Duel.HasFlagEffect(tp,id) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) - local b2=c:IsLocation(LOCATION_GRAVE) and not Duel.HasFlagEffect(tp,id+100) and c:IsAbleToHand() - local b3=c:IsLocation(LOCATION_GRAVE) and not Duel.HasFlagEffect(tp,id+200) + local b2=c:IsLocation(LOCATION_GRAVE) and not Duel.HasFlagEffect(tp,id+1) and c:IsAbleToHand() + local b3=c:IsLocation(LOCATION_GRAVE) and not Duel.HasFlagEffect(tp,id+2) and c:IsAbleToRemove() and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,c) if chk==0 then return b1 or b2 or b3 end local op=Duel.SelectEffect(tp, @@ -42,7 +42,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) {b2,aux.Stringid(id,3)}, {b3,aux.Stringid(id,4)}) Duel.SetTargetParam(op) - Duel.RegisterFlagEffect(tp,id+(op-1)*100,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(tp,id+op-1,RESET_PHASE|PHASE_END,0,1) if op==1 then e:SetCategory(CATEGORY_SPECIAL_SUMMON) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,tp,0) diff --git a/pre-release/c101301086.lua b/official/c71771004.lua similarity index 98% rename from pre-release/c101301086.lua rename to official/c71771004.lua index 097e6665c9..b308795de3 100644 --- a/pre-release/c101301086.lua +++ b/official/c71771004.lua @@ -2,7 +2,7 @@ --Readying of Rites --scripted by pyrQ local s,id=GetID() -local TOKEN_SACIFICIAL_OFFERING=id+100 +local TOKEN_SACIFICIAL_OFFERING=id+1 function s.initial_effect(c) --Add 1 Fiend Ritual Monster from your Deck to your hand, then if you added a Pendulum Monster, you can Special Summon 1 "Sacrificial Offering Token" (Fiend/DARK/Level 1/ATK 300/DEF 300) local e1=Effect.CreateEffect(c) diff --git a/pre-release/c101301095.lua b/official/c78710386.lua similarity index 100% rename from pre-release/c101301095.lua rename to official/c78710386.lua diff --git a/pre-release/c101301092.lua b/official/c79436874.lua similarity index 100% rename from pre-release/c101301092.lua rename to official/c79436874.lua