diff --git a/card_counter_constants.lua b/card_counter_constants.lua index fb0709ba11..65be965fec 100644 --- a/card_counter_constants.lua +++ b/card_counter_constants.lua @@ -53,7 +53,7 @@ CARD_LABRYNTH_LABYRINTH = 33407125 CARD_LIGHT_BARRIER = 73206827 CARD_MAGICAL_MIDBREAKER = 71650854 CARD_MAX_METALMORPH = 89812483 -CARD_MEDIUS_THE_INNOCENT = 101301008 +CARD_MEDIUS_THE_INNOCENT = 97556336 CARD_MEMENTOAL_TECUHTLICA = 23288411 CARD_MILLENNIUM_CROSS = 37613663 CARD_MONSTER_REBORN = 83764718 diff --git a/pre-release/c101301057.lua b/official/c1122030.lua similarity index 94% rename from pre-release/c101301057.lua rename to official/c1122030.lua index 65c8dbaaa4..116b03221c 100644 --- a/pre-release/c101301057.lua +++ b/official/c1122030.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e3:SetOperation(function(e) Duel.SendtoGrave(e:GetHandler(),REASON_EFFECT|REASON_REPLACE) end) c:RegisterEffect(e3) end -s.listed_names={CARD_MEDIUS_THE_INNOCENT,101301054} --"Artmegia the Academy City of Divine Arts" +s.listed_names={CARD_MEDIUS_THE_INNOCENT,74733322} --"Artmegia the Academy City of Divine Arts" s.listed_series={SET_ARTMEGIA} function s.thfilter(c) return c:IsCode(CARD_MEDIUS_THE_INNOCENT) and c:IsAbleToHand() @@ -69,7 +69,7 @@ function s.fusmatop(e,tp,eg,ep,ev,re,r,rp) end end function s.repfilter(c,tp) - return c:IsCode(101301054) and c:IsFaceup() and c:IsControler(tp) and c:IsOnField() + return c:IsCode(74733322) and c:IsFaceup() and c:IsControler(tp) and c:IsOnField() and c:IsReason(REASON_EFFECT) and not c:IsReason(REASON_REPLACE) end function s.reptg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/pre-release/c101301050.lua b/official/c12067160.lua similarity index 99% rename from pre-release/c101301050.lua rename to official/c12067160.lua index 876ebc6f46..70c240b355 100644 --- a/pre-release/c101301050.lua +++ b/official/c12067160.lua @@ -56,4 +56,4 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() local rc=re:GetHandler() return re:IsMonsterEffect() and rc:IsRelateToEffect(re) and c:GetLinkedGroup():IsContains(rc) and not c:IsStatus(STATUS_BATTLE_DESTROYED) -end +end \ No newline at end of file diff --git a/pre-release/c101208095.lua b/official/c12210097.lua similarity index 100% rename from pre-release/c101208095.lua rename to official/c12210097.lua diff --git a/pre-release/c101208081.lua b/official/c12500059.lua similarity index 100% rename from pre-release/c101208081.lua rename to official/c12500059.lua diff --git a/pre-release/c101208084.lua b/official/c12888461.lua similarity index 100% rename from pre-release/c101208084.lua rename to official/c12888461.lua diff --git a/pre-release/c101301047.lua b/official/c13289758.lua similarity index 99% rename from pre-release/c101301047.lua rename to official/c13289758.lua index c9088c6131..6caa0667df 100644 --- a/pre-release/c101301047.lua +++ b/official/c13289758.lua @@ -57,4 +57,4 @@ function s.detachop(e,tp,eg,ep,ev,re,r,rp) if c:IsRelateToEffect(e) and c:GetOverlayCount()>0 then c:RemoveOverlayCard(tp,1,1,REASON_EFFECT) end -end +end \ No newline at end of file diff --git a/pre-release/c101208092.lua b/official/c13332685.lua similarity index 100% rename from pre-release/c101208092.lua rename to official/c13332685.lua diff --git a/pre-release/c101301044.lua b/official/c14301396.lua similarity index 100% rename from pre-release/c101301044.lua rename to official/c14301396.lua diff --git a/pre-release/c101208089.lua b/official/c14554127.lua similarity index 100% rename from pre-release/c101208089.lua rename to official/c14554127.lua diff --git a/pre-release/c101301041.lua b/official/c15123983.lua similarity index 100% rename from pre-release/c101301041.lua rename to official/c15123983.lua diff --git a/pre-release/c101301038.lua b/official/c16246535.lua similarity index 100% rename from pre-release/c101301038.lua rename to official/c16246535.lua diff --git a/pre-release/c101208087.lua b/official/c1665819.lua similarity index 100% rename from pre-release/c101208087.lua rename to official/c1665819.lua diff --git a/pre-release/c101301078.lua b/official/c22377092.lua similarity index 100% rename from pre-release/c101301078.lua rename to official/c22377092.lua diff --git a/pre-release/c101301053.lua b/official/c2344618.lua similarity index 100% rename from pre-release/c101301053.lua rename to official/c2344618.lua diff --git a/pre-release/c101301075.lua b/official/c23599634.lua similarity index 100% rename from pre-release/c101301075.lua rename to official/c23599634.lua diff --git a/pre-release/c101301072.lua b/official/c23611122.lua similarity index 100% rename from pre-release/c101301072.lua rename to official/c23611122.lua diff --git a/pre-release/c101301012.lua b/official/c23829452.lua similarity index 95% rename from pre-release/c101301012.lua rename to official/c23829452.lua index e03567ba74..9a23093f39 100644 --- a/pre-release/c101301012.lua +++ b/official/c23829452.lua @@ -1,7 +1,6 @@ --アルトメギアの獄神獣 --Imprisoned Deity Beast of Artmegia --scripted by Naim -local CARD_NERVA=101301033 local s,id=GetID() function s.initial_effect(c) --You cannot Special Summon from the Extra Deck, except Fusion Monsters @@ -41,9 +40,9 @@ function s.initial_effect(c) c:RegisterEffect(e3) end s.listed_series={SET_ARTMEGIA} -s.listed_names={CARD_NERVA} +s.listed_names={53589300} --"Nerva the Imprisoned Deity of Creation" function s.fusionfilter(c) - return c:IsSetCard(SET_ARTMEGIA) or c:IsCode(CARD_NERVA) + return c:IsSetCard(SET_ARTMEGIA) or c:IsCode(53589300) end function s.thfilter(c,tp) return c:IsSetCard(SET_ARTMEGIA) and c:IsSpellTrap() and c:IsAbleToHand() diff --git a/pre-release/c101301035.lua b/official/c26462013.lua similarity index 100% rename from pre-release/c101301035.lua rename to official/c26462013.lua diff --git a/pre-release/c101301032.lua b/official/c27184601.lua similarity index 100% rename from pre-release/c101301032.lua rename to official/c27184601.lua diff --git a/pre-release/c101301029.lua b/official/c28306253.lua similarity index 100% rename from pre-release/c101301029.lua rename to official/c28306253.lua diff --git a/pre-release/c101301023.lua b/official/c29251488.lua similarity index 100% rename from pre-release/c101301023.lua rename to official/c29251488.lua diff --git a/pre-release/c101301026.lua b/official/c29439831.lua similarity index 100% rename from pre-release/c101301026.lua rename to official/c29439831.lua diff --git a/pre-release/c101301020.lua b/official/c30373970.lua similarity index 100% rename from pre-release/c101301020.lua rename to official/c30373970.lua diff --git a/pre-release/c101301017.lua b/official/c31596518.lua similarity index 100% rename from pre-release/c101301017.lua rename to official/c31596518.lua diff --git a/pre-release/c101301069.lua b/official/c34433770.lua similarity index 100% rename from pre-release/c101301069.lua rename to official/c34433770.lua diff --git a/pre-release/c101301009.lua b/official/c34541940.lua similarity index 100% rename from pre-release/c101301009.lua rename to official/c34541940.lua diff --git a/pre-release/c101301066.lua b/official/c35550352.lua similarity index 100% rename from pre-release/c101301066.lua rename to official/c35550352.lua diff --git a/pre-release/c101301006.lua b/official/c35763582.lua similarity index 100% rename from pre-release/c101301006.lua rename to official/c35763582.lua diff --git a/pre-release/c101301003.lua b/official/c35886170.lua similarity index 100% rename from pre-release/c101301003.lua rename to official/c35886170.lua diff --git a/pre-release/c101301014.lua b/official/c36218106.lua similarity index 100% rename from pre-release/c101301014.lua rename to official/c36218106.lua diff --git a/pre-release/c101301060.lua b/official/c36494597.lua similarity index 100% rename from pre-release/c101301060.lua rename to official/c36494597.lua diff --git a/pre-release/c100295101.lua b/official/c36608728.lua similarity index 100% rename from pre-release/c100295101.lua rename to official/c36608728.lua diff --git a/pre-release/c101301063.lua b/official/c36672909.lua similarity index 100% rename from pre-release/c101301063.lua rename to official/c36672909.lua diff --git a/pre-release/c101301056.lua b/official/c37517035.lua similarity index 100% rename from pre-release/c101301056.lua rename to official/c37517035.lua diff --git a/pre-release/c101208090.lua b/official/c40543231.lua similarity index 100% rename from pre-release/c101208090.lua rename to official/c40543231.lua diff --git a/pre-release/c101301048.lua b/official/c40673853.lua similarity index 100% rename from pre-release/c101301048.lua rename to official/c40673853.lua diff --git a/pre-release/c101301045.lua b/official/c40706444.lua similarity index 100% rename from pre-release/c101301045.lua rename to official/c40706444.lua diff --git a/pre-release/c101301042.lua b/official/c41522092.lua similarity index 97% rename from pre-release/c101301042.lua rename to official/c41522092.lua index bf35039bb8..266cb5dd20 100644 --- a/pre-release/c101301042.lua +++ b/official/c41522092.lua @@ -50,7 +50,7 @@ function s.initial_effect(c) end s.xyz_number=0 function s.xyzcheck(g,tp,xyz) - local mg=g:Filter(function(c) return not c:IsHasEffect(511001175) end,nil) + local mg=g:Filter(function(c) return not c:IsHasEffect(EFFECT_EQUIP_SPELL_XYZ_MAT) end,nil) return mg:GetClassCount(Card.GetRank)==1 end function s.ctcon(e,tp,eg,ep,ev,re,r,rp) @@ -83,4 +83,4 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp) e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) c:RegisterEffect(e2) end -end +end \ No newline at end of file diff --git a/pre-release/c101208088.lua b/official/c47060528.lua similarity index 100% rename from pre-release/c101208088.lua rename to official/c47060528.lua diff --git a/pre-release/c101301059.lua b/official/c483.lua similarity index 100% rename from pre-release/c101301059.lua rename to official/c483.lua diff --git a/pre-release/c101301055.lua b/official/c48739627.lua similarity index 100% rename from pre-release/c101301055.lua rename to official/c48739627.lua diff --git a/pre-release/c101208085.lua b/official/c48882106.lua similarity index 100% rename from pre-release/c101208085.lua rename to official/c48882106.lua diff --git a/pre-release/c101301051.lua b/official/c49451215.lua similarity index 100% rename from pre-release/c101301051.lua rename to official/c49451215.lua diff --git a/pre-release/c101208096.lua b/official/c49604192.lua similarity index 90% rename from pre-release/c101208096.lua rename to official/c49604192.lua index 72630e939c..583fc46fcf 100644 --- a/pre-release/c101208096.lua +++ b/official/c49604192.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetOperation(s.rmop) c:RegisterEffect(e1) end -s.listed_names={19899073,55397172,101208092} +s.listed_names={19899073,55397172,13332685} --"Ame no Murakumo no Mitsurugi", "Futsu no Mitama no Mitsurugi", "Ame no Habakiri no Mitsurugi" s.listed_series={SET_MITSURUGI} function s.rmconfilter(c) @@ -26,8 +26,8 @@ function s.rmcostrescon(sg) return sg:GetClassCount(Card.GetOriginalCodeRule)==3 end function s.rmcost(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.CheckReleaseGroupCost(tp,Card.IsOriginalCodeRule,3,false,s.rmcostrescon,nil,19899073,55397172,101208092) end - local g=Duel.SelectReleaseGroupCost(tp,Card.IsOriginalCodeRule,3,3,false,s.rmcostrescon,nil,19899073,55397172,101208092) + if chk==0 then return Duel.CheckReleaseGroupCost(tp,Card.IsOriginalCodeRule,3,false,s.rmcostrescon,nil,19899073,55397172,13332685) end + local g=Duel.SelectReleaseGroupCost(tp,Card.IsOriginalCodeRule,3,3,false,s.rmcostrescon,nil,19899073,55397172,13332685) Duel.Release(g,REASON_COST) end function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/pre-release/c101208093.lua b/official/c49721684.lua similarity index 89% rename from pre-release/c101208093.lua rename to official/c49721684.lua index 560d150f15..a441101396 100644 --- a/pre-release/c101208093.lua +++ b/official/c49721684.lua @@ -21,10 +21,10 @@ function s.initial_effect(c) e2:SetOperation(s.tdop) c:RegisterEffect(e2) end -s.listed_names={19899073,55397172,101208092} +s.listed_names={19899073,55397172,13332685} --"Ame no Murakumo no Mitsurugi", "Futsu no Mitama no Mitsurugi", "Ame no Habakiri no Mitsurugi" function s.tdconfilter(c,tp) - return c:IsPreviousCodeOnField(19899073,55397172,101208092) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp) + return c:IsPreviousCodeOnField(19899073,55397172,13332685) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_ONFIELD) end function s.tdcon(e,tp,eg,ep,ev,re,r,rp) diff --git a/pre-release/c101208082.lua b/official/c49904658.lua similarity index 100% rename from pre-release/c101208082.lua rename to official/c49904658.lua diff --git a/pre-release/c101301039.lua b/official/c52644170.lua similarity index 100% rename from pre-release/c101301039.lua rename to official/c52644170.lua diff --git a/pre-release/c101301036.lua b/official/c53466722.lua similarity index 100% rename from pre-release/c101301036.lua rename to official/c53466722.lua diff --git a/pre-release/c101301033.lua b/official/c53589300.lua similarity index 100% rename from pre-release/c101301033.lua rename to official/c53589300.lua diff --git a/pre-release/c101301030.lua b/official/c54701958.lua similarity index 99% rename from pre-release/c101301030.lua rename to official/c54701958.lua index 72a73eb799..91b6525030 100644 --- a/pre-release/c101301030.lua +++ b/official/c54701958.lua @@ -56,4 +56,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) if #g>0 then Duel.Destroy(g,REASON_EFFECT) end -end +end \ No newline at end of file diff --git a/pre-release/c101301027.lua b/official/c55423549.lua similarity index 100% rename from pre-release/c101301027.lua rename to official/c55423549.lua diff --git a/pre-release/c101301079.lua b/official/c58761791.lua similarity index 100% rename from pre-release/c101301079.lua rename to official/c58761791.lua diff --git a/pre-release/c101301076.lua b/official/c59983249.lua similarity index 88% rename from pre-release/c101301076.lua rename to official/c59983249.lua index ca280da32c..33b7421772 100644 --- a/pre-release/c101301076.lua +++ b/official/c59983249.lua @@ -39,19 +39,19 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) local b1=(cost_skip or not Duel.HasFlagEffect(tp,id)) and Duel.IsExistingMatchingCard(nil,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) --Destroy up to 2 Spells/Traps on the field - local b2=(cost_skip or not Duel.HasFlagEffect(tp,id+100)) + local b2=(cost_skip or not Duel.HasFlagEffect(tp,id+1)) and Duel.IsExistingMatchingCard(Card.IsSpellTrap,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) --Discard 1 random card from your opponent's hand - local b3=(cost_skip or not Duel.HasFlagEffect(tp,id+200)) + local b3=(cost_skip or not Duel.HasFlagEffect(tp,id+2)) and Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,0,LOCATION_HAND,1,nil,REASON_EFFECT) --Destroy 1 face-down card on the field - local b4=(cost_skip or not Duel.HasFlagEffect(tp,id+300)) + local b4=(cost_skip or not Duel.HasFlagEffect(tp,id+3)) and Duel.IsExistingMatchingCard(Card.IsFacedown,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) --Place 1 card on the field on top of the Deck - local b5=(cost_skip or not Duel.HasFlagEffect(tp,id+400)) + local b5=(cost_skip or not Duel.HasFlagEffect(tp,id+4)) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) --Banish 1 card on the field - local b6=(cost_skip or not Duel.HasFlagEffect(tp,id+500)) + local b6=(cost_skip or not Duel.HasFlagEffect(tp,id+5)) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) if chk==0 then e:SetLabel(0) return Duel.IsExistingMatchingCard(Card.IsTributeSummoned,tp,LOCATION_MZONE,0,1,nil) and (b1 or b2 or b3 or b4 or b5 or b6) end @@ -72,29 +72,29 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) elseif op==2 then --Destroy up to 2 Spells/Traps on the field e:SetCategory(CATEGORY_DESTROY) - 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 local g=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,tp,0) elseif op==3 then --Discard 1 random card from your opponent's hand e:SetCategory(CATEGORY_HANDES) - if not cost_skip then Duel.RegisterFlagEffect(tp,id+200,RESET_PHASE|PHASE_END,0,1) end + if not cost_skip then Duel.RegisterFlagEffect(tp,id+2,RESET_PHASE|PHASE_END,0,1) end Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,1) elseif op==4 then --Destroy 1 face-down card on the field e:SetCategory(CATEGORY_DESTROY) - if not cost_skip then Duel.RegisterFlagEffect(tp,id+300,RESET_PHASE|PHASE_END,0,1) end + if not cost_skip then Duel.RegisterFlagEffect(tp,id+3,RESET_PHASE|PHASE_END,0,1) end local g=Duel.GetMatchingGroup(Card.IsFacedown,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,tp,0) elseif op==5 then --Place 1 card on the field on top of the Deck e:SetCategory(CATEGORY_TODECK) - if not cost_skip then Duel.RegisterFlagEffect(tp,id+400,RESET_PHASE|PHASE_END,0,1) end + if not cost_skip then Duel.RegisterFlagEffect(tp,id+4,RESET_PHASE|PHASE_END,0,1) end Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_ONFIELD) elseif op==6 then --Banish 1 card on the field e:SetCategory(CATEGORY_REMOVE) - if not cost_skip then Duel.RegisterFlagEffect(tp,id+500,RESET_PHASE|PHASE_END,0,1) end + if not cost_skip then Duel.RegisterFlagEffect(tp,id+5,RESET_PHASE|PHASE_END,0,1) end Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_ONFIELD) end end diff --git a/pre-release/c101301073.lua b/official/c60600821.lua similarity index 100% rename from pre-release/c101301073.lua rename to official/c60600821.lua diff --git a/pre-release/c101301010.lua b/official/c60946049.lua similarity index 100% rename from pre-release/c101301010.lua rename to official/c60946049.lua diff --git a/pre-release/c101301007.lua b/official/c61168637.lua similarity index 100% rename from pre-release/c101301007.lua rename to official/c61168637.lua diff --git a/pre-release/c101301070.lua b/official/c61822419.lua similarity index 100% rename from pre-release/c101301070.lua rename to official/c61822419.lua diff --git a/pre-release/c101301067.lua b/official/c61944066.lua similarity index 94% rename from pre-release/c101301067.lua rename to official/c61944066.lua index 1d825591b1..e170655ffd 100644 --- a/pre-release/c101301067.lua +++ b/official/c61944066.lua @@ -32,7 +32,7 @@ function s.initial_effect(c) e3a:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_LVCHANGE) e3a:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3a:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) - e3a:SetCode(EVENT_CUSTOM+id+1) + e3a:SetCode(EVENT_CUSTOM+id) e3a:SetRange(LOCATION_SZONE) e3a:SetCountLimit(1) e3a:SetCondition(function() return not Duel.IsPhase(PHASE_DAMAGE) end) @@ -42,7 +42,7 @@ function s.initial_effect(c) local g=Group.CreateGroup() g:KeepAlive() e3a:SetLabelObject(g) - --Register your Special Summoned Ritual monsters + --Register your Special Summoned Ritual Monsters local e3b=Effect.CreateEffect(c) e3b:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e3b:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) @@ -113,13 +113,13 @@ function s.regsumop(e,tp,eg,ep,ev,re,r,rp) local tg=eg:Filter(s.lvfilter,nil,e,tp) if #tg>0 then for tc in tg:Iter() do - tc:RegisterFlagEffect(id+1,RESET_CHAIN,0,1) + tc:RegisterFlagEffect(id,RESET_CHAIN,0,1) end local g=e:GetLabelObject():GetLabelObject() if Duel.GetCurrentChain()==0 then g:Clear() end g:Merge(tg) - g:Remove(function(c) return c:GetFlagEffect(id+1)==0 end,nil) + g:Remove(function(c) return c:GetFlagEffect(id)==0 end,nil) e:GetLabelObject():SetLabelObject(g) - Duel.RaiseSingleEvent(e:GetHandler(),EVENT_CUSTOM+id+1,e,0,tp,tp,0) + Duel.RaiseSingleEvent(e:GetHandler(),EVENT_CUSTOM+id,e,0,tp,tp,0) end end \ No newline at end of file diff --git a/pre-release/c101301001.lua b/official/c62006866.lua similarity index 100% rename from pre-release/c101301001.lua rename to official/c62006866.lua diff --git a/pre-release/c101301015.lua b/official/c62606805.lua similarity index 100% rename from pre-release/c101301015.lua rename to official/c62606805.lua diff --git a/pre-release/c101301064.lua b/official/c62767644.lua similarity index 100% rename from pre-release/c101301064.lua rename to official/c62767644.lua diff --git a/pre-release/c101301004.lua b/official/c62880279.lua similarity index 100% rename from pre-release/c101301004.lua rename to official/c62880279.lua diff --git a/pre-release/c101301061.lua b/official/c63899196.lua similarity index 100% rename from pre-release/c101301061.lua rename to official/c63899196.lua diff --git a/pre-release/c101301024.lua b/official/c66646087.lua similarity index 100% rename from pre-release/c101301024.lua rename to official/c66646087.lua diff --git a/pre-release/c101301018.lua b/official/c67584223.lua similarity index 100% rename from pre-release/c101301018.lua rename to official/c67584223.lua diff --git a/pre-release/c101301021.lua b/official/c67768675.lua similarity index 100% rename from pre-release/c101301021.lua rename to official/c67768675.lua diff --git a/pre-release/c101301058.lua b/official/c74011784.lua similarity index 88% rename from pre-release/c101301058.lua rename to official/c74011784.lua index ec94753398..cce5fb2177 100644 --- a/pre-release/c101301058.lua +++ b/official/c74011784.lua @@ -27,25 +27,25 @@ function s.initial_effect(c) e2:SetOperation(s.negop) c:RegisterEffect(e2) end -s.listed_names={CARD_MEDIUS_THE_INNOCENT,101301054,id} --"Artmegia the Academy City of Divine Arts" +s.listed_names={CARD_MEDIUS_THE_INNOCENT,74733322,id} --"Artmegia the Academy City of Divine Arts" s.listed_series={SET_ARTMEGIA} function s.plthfilter(c,tohand_chk) - return (c:IsCode(101301054) and not c:IsForbidden()) or (tohand_chk and c:IsSetCard(SET_ARTMEGIA) and c:IsAbleToHand() and c:IsLocation(LOCATION_DECK) and not c:IsCode(id)) + return (c:IsCode(74733322) and not c:IsForbidden()) or (tohand_chk and c:IsSetCard(SET_ARTMEGIA) and c:IsAbleToHand() and c:IsLocation(LOCATION_DECK) and not c:IsCode(id)) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then - local tohand_chk=Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,101301054),tp,LOCATION_ONFIELD,0,1,nil) + local tohand_chk=Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,74733322),tp,LOCATION_ONFIELD,0,1,nil) return Duel.IsExistingMatchingCard(s.plthfilter,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil,tohand_chk) end Duel.SetPossibleOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) end function s.activate(e,tp,eg,ep,ev,re,r,rp) - local tohand_chk=Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,101301054),tp,LOCATION_ONFIELD,0,1,nil) + local tohand_chk=Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,74733322),tp,LOCATION_ONFIELD,0,1,nil) local hint_desc=tohand_chk and aux.Stringid(id,2) or HINTMSG_TOFIELD Duel.Hint(HINT_SELECTMSG,tp,hint_desc) local sc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.plthfilter),tp,LOCATION_DECK|LOCATION_GRAVE,0,1,1,nil,tohand_chk):GetFirst() if not sc then return end - if sc:IsCode(101301054) then + if sc:IsCode(74733322) then if not tohand_chk then Duel.MoveToField(sc,tp,tp,LOCATION_FZONE,POS_FACEUP,true) else diff --git a/pre-release/c101208086.lua b/official/c74271714.lua similarity index 100% rename from pre-release/c101208086.lua rename to official/c74271714.lua diff --git a/pre-release/c101301054.lua b/official/c74733322.lua similarity index 100% rename from pre-release/c101301054.lua rename to official/c74733322.lua diff --git a/pre-release/c101208083.lua b/official/c75493362.lua similarity index 100% rename from pre-release/c101208083.lua rename to official/c75493362.lua diff --git a/pre-release/c101301052.lua b/official/c75956913.lua similarity index 100% rename from pre-release/c101301052.lua rename to official/c75956913.lua diff --git a/pre-release/c101301049.lua b/official/c76072561.lua similarity index 100% rename from pre-release/c101301049.lua rename to official/c76072561.lua diff --git a/pre-release/c101208094.lua b/official/c76725398.lua similarity index 100% rename from pre-release/c101208094.lua rename to official/c76725398.lua diff --git a/pre-release/c101208091.lua b/official/c76948970.lua similarity index 100% rename from pre-release/c101208091.lua rename to official/c76948970.lua diff --git a/pre-release/c101301046.lua b/official/c77894049.lua similarity index 94% rename from pre-release/c101301046.lua rename to official/c77894049.lua index d67eceb3a6..714abbcf78 100644 --- a/pre-release/c101301046.lua +++ b/official/c77894049.lua @@ -45,19 +45,19 @@ function s.initial_effect(c) Duel.RegisterEffect(ge1,0) end) end -s.listed_names={28168628} -- "Rock of the Vanquisher" +s.listed_names={28168628} --"Rock of the Vanquisher" s.listed_series={SET_VANQUISH_SOUL} function s.regop(e,tp,eg,ep,ev,re,r,rp) local a,b=Duel.GetBattleMonster(0) if (a and a:IsSetCard(SET_VANQUISH_SOUL)) or (b and b:IsSetCard(SET_VANQUISH_SOUL)) then - Duel.RegisterFlagEffect(0,id+100,RESET_PHASE|PHASE_END,0,1) + Duel.RegisterFlagEffect(0,id+1,RESET_PHASE|PHASE_END,0,1) end end function s.ovfilter(c,tp,lc) return (c:IsSetCard(SET_VANQUISH_SOUL,lc,SUMMON_TYPE_XYZ,tp) or c:IsCode(28168628)) and c:IsFaceup() end function s.xyzop(e,tp,chk) - if chk==0 then return not Duel.HasFlagEffect(tp,id) and Duel.HasFlagEffect(0,id+100) end + if chk==0 then return not Duel.HasFlagEffect(tp,id) and Duel.HasFlagEffect(0,id+1) end return Duel.RegisterFlagEffect(tp,id,RESET_PHASE|PHASE_END,EFFECT_FLAG_OATH,1) end function s.attrcon(attr) @@ -77,4 +77,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(g) Duel.Destroy(g,REASON_EFFECT) end -end +end \ No newline at end of file diff --git a/pre-release/c101301034.lua b/official/c80073414.lua similarity index 100% rename from pre-release/c101301034.lua rename to official/c80073414.lua diff --git a/pre-release/c101301031.lua b/official/c81196066.lua similarity index 100% rename from pre-release/c101301031.lua rename to official/c81196066.lua diff --git a/pre-release/c101301005.lua b/official/c8379983.lua similarity index 100% rename from pre-release/c101301005.lua rename to official/c8379983.lua diff --git a/pre-release/c101301080.lua b/official/c85150300.lua similarity index 100% rename from pre-release/c101301080.lua rename to official/c85150300.lua diff --git a/pre-release/c101301040.lua b/official/c88139289.lua similarity index 100% rename from pre-release/c101301040.lua rename to official/c88139289.lua diff --git a/pre-release/c101301043.lua b/official/c88917691.lua similarity index 100% rename from pre-release/c101301043.lua rename to official/c88917691.lua diff --git a/pre-release/c101301037.lua b/official/c89851827.lua similarity index 100% rename from pre-release/c101301037.lua rename to official/c89851827.lua diff --git a/pre-release/c101301028.lua b/official/c91818544.lua similarity index 100% rename from pre-release/c101301028.lua rename to official/c91818544.lua diff --git a/pre-release/c101301025.lua b/official/c92034192.lua similarity index 100% rename from pre-release/c101301025.lua rename to official/c92034192.lua diff --git a/pre-release/c101301013.lua b/official/c9213491.lua similarity index 100% rename from pre-release/c101301013.lua rename to official/c9213491.lua diff --git a/pre-release/c101301062.lua b/official/c9283801.lua similarity index 100% rename from pre-release/c101301062.lua rename to official/c9283801.lua diff --git a/pre-release/c101301022.lua b/official/c93156774.lua similarity index 100% rename from pre-release/c101301022.lua rename to official/c93156774.lua diff --git a/pre-release/c101301002.lua b/official/c9491461.lua similarity index 100% rename from pre-release/c101301002.lua rename to official/c9491461.lua diff --git a/pre-release/c101301019.lua b/official/c94979322.lua similarity index 100% rename from pre-release/c101301019.lua rename to official/c94979322.lua diff --git a/pre-release/c101301016.lua b/official/c95091919.lua similarity index 100% rename from pre-release/c101301016.lua rename to official/c95091919.lua diff --git a/pre-release/c101301077.lua b/official/c95382988.lua similarity index 100% rename from pre-release/c101301077.lua rename to official/c95382988.lua diff --git a/pre-release/c101301074.lua b/official/c96004535.lua similarity index 100% rename from pre-release/c101301074.lua rename to official/c96004535.lua diff --git a/pre-release/c101301071.lua b/official/c97227123.lua similarity index 100% rename from pre-release/c101301071.lua rename to official/c97227123.lua diff --git a/pre-release/c101301011.lua b/official/c97434754.lua similarity index 100% rename from pre-release/c101301011.lua rename to official/c97434754.lua diff --git a/pre-release/c101301008.lua b/official/c97556336.lua similarity index 100% rename from pre-release/c101301008.lua rename to official/c97556336.lua diff --git a/pre-release/c101301068.lua b/official/c98349765.lua similarity index 91% rename from pre-release/c101301068.lua rename to official/c98349765.lua index ad046860b4..ec23534ec6 100644 --- a/pre-release/c101301068.lua +++ b/official/c98349765.lua @@ -26,10 +26,10 @@ function s.effcost(e,tp,eg,ep,ev,re,r,rp,chk) e:SetLabel(-100) local b1=not Duel.HasFlagEffect(tp,id) and Duel.IsExistingTarget(aux.AND(Card.IsAttackPos,Card.IsCanChangePosition),tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) - local b2=not Duel.HasFlagEffect(tp,id+100) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 + local b2=not Duel.HasFlagEffect(tp,id+1) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsSetCard,SET_SUPER_QUANT),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) - local b3=not Duel.HasFlagEffect(tp,id+200) + local b3=not Duel.HasFlagEffect(tp,id+2) and (e:GetHandler():IsLocation(LOCATION_SZONE) or Duel.GetLocationCount(tp,LOCATION_SZONE)>=2) and Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil) if chk==0 then return b1 or b2 or b3 end @@ -39,11 +39,11 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local cost_skip=e:GetLabel()~=-100 local b1=(cost_skip or not Duel.HasFlagEffect(tp,id)) and Duel.IsExistingTarget(aux.AND(Card.IsAttackPos,Card.IsCanChangePosition),tp,LOCATION_MZONE,LOCATION_MZONE,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 Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsSetCard,SET_SUPER_QUANT),tp,LOCATION_MZONE,0,1,nil))) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) - local b3=(cost_skip or not Duel.HasFlagEffect(tp,id+200)) + local b3=(cost_skip or not Duel.HasFlagEffect(tp,id+2)) and (not e:IsHasType(EFFECT_TYPE_ACTIVATE) or e:GetHandler():IsLocation(LOCATION_SZONE) or Duel.GetLocationCount(tp,LOCATION_SZONE)>=2) and Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil) if chk==0 then e:SetLabel(0) return b1 or b2 or b3 end @@ -62,12 +62,12 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) elseif op==2 then e:SetCategory(CATEGORY_SPECIAL_SUMMON) e:SetProperty(0) - 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_DECK) elseif op==3 then e:SetCategory(0) e:SetProperty(0) - if not cost_skip then Duel.RegisterFlagEffect(tp,id+200,RESET_PHASE|PHASE_END,0,1) end + if not cost_skip then Duel.RegisterFlagEffect(tp,id+2,RESET_PHASE|PHASE_END,0,1) end end end function s.effop(e,tp,eg,ep,ev,re,r,rp) diff --git a/pre-release/c101301065.lua b/official/c99161253.lua similarity index 100% rename from pre-release/c101301065.lua rename to official/c99161253.lua