diff --git a/pre-release/c100200270.lua b/official/c1035143.lua similarity index 100% rename from pre-release/c100200270.lua rename to official/c1035143.lua diff --git a/pre-release/c100442002.lua b/official/c1498449.lua similarity index 100% rename from pre-release/c100442002.lua rename to official/c1498449.lua diff --git a/pre-release/c100442041.lua b/official/c26585784.lua similarity index 100% rename from pre-release/c100442041.lua rename to official/c26585784.lua diff --git a/pre-release/c100442038.lua b/official/c27308231.lua similarity index 100% rename from pre-release/c100442038.lua rename to official/c27308231.lua diff --git a/pre-release/c100442035.lua b/official/c27420823.lua similarity index 100% rename from pre-release/c100442035.lua rename to official/c27420823.lua diff --git a/pre-release/c100442032.lua b/official/c28642461.lua similarity index 100% rename from pre-release/c100442032.lua rename to official/c28642461.lua diff --git a/pre-release/c100442025.lua b/official/c29369059.lua similarity index 91% rename from pre-release/c100442025.lua rename to official/c29369059.lua index f291f9ebe1..bdf0c75f83 100644 --- a/pre-release/c100442025.lua +++ b/official/c29369059.lua @@ -33,9 +33,9 @@ function s.effcost(e,tp,eg,ep,ev,re,r,rp,chk) local g=Duel.GetMatchingGroup(s.monoppthfilter,tp,LOCATION_MZONE,LOCATION_ONFIELD,nil,e,tp) local b1=not Duel.HasFlagEffect(tp,id) and #g>=4 and aux.SelectUnselectGroup(g,e,tp,4,4,s.rescon,0) - 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(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,1,nil,e,tp) - local b3=not Duel.HasFlagEffect(tp,id+200) + local b3=not Duel.HasFlagEffect(tp,id+2) and Duel.IsExistingMatchingCard(s.fieldspellthfilter,tp,LOCATION_ONFIELD|LOCATION_GRAVE,0,1,nil) if chk==0 then return b1 or b2 or b3 end end @@ -45,9 +45,9 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) local g=Duel.GetMatchingGroup(s.monoppthfilter,tp,LOCATION_MZONE,LOCATION_ONFIELD,nil,e,tp) local b1=not Duel.HasFlagEffect(tp,id) and #g>=4 and aux.SelectUnselectGroup(g,e,tp,4,4,s.rescon,0) - 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(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,1,nil,e,tp) - local b3=not Duel.HasFlagEffect(tp,id+200) + local b3=not Duel.HasFlagEffect(tp,id+2) and Duel.IsExistingMatchingCard(s.fieldspellthfilter,tp,LOCATION_ONFIELD|LOCATION_GRAVE,0,1,nil) if chk==0 then e:SetLabel(0) return b1 or b2 or b3 end local op=Duel.SelectEffect(tp, @@ -65,12 +65,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_HAND|LOCATION_GRAVE) elseif op==3 then e:SetCategory(CATEGORY_TOHAND) 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 Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_ONFIELD|LOCATION_GRAVE) end end diff --git a/pre-release/c100442022.lua b/official/c30581601.lua similarity index 100% rename from pre-release/c100442022.lua rename to official/c30581601.lua diff --git a/pre-release/c100442016.lua b/official/c31425736.lua similarity index 100% rename from pre-release/c100442016.lua rename to official/c31425736.lua diff --git a/pre-release/c100442019.lua b/official/c31603289.lua similarity index 100% rename from pre-release/c100442019.lua rename to official/c31603289.lua diff --git a/pre-release/c100442009.lua b/official/c32548318.lua similarity index 100% rename from pre-release/c100442009.lua rename to official/c32548318.lua diff --git a/pre-release/c100200268.lua b/official/c336601.lua similarity index 100% rename from pre-release/c100200268.lua rename to official/c336601.lua diff --git a/pre-release/c100442006.lua b/official/c33760966.lua similarity index 97% rename from pre-release/c100442006.lua rename to official/c33760966.lua index 9951df0149..c93e7545a9 100644 --- a/pre-release/c100442006.lua +++ b/official/c33760966.lua @@ -48,7 +48,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) @@ -76,12 +76,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/c100200269.lua b/official/c37720300.lua similarity index 100% rename from pre-release/c100200269.lua rename to official/c37720300.lua diff --git a/pre-release/c100442018.lua b/official/c4215180.lua similarity index 100% rename from pre-release/c100442018.lua rename to official/c4215180.lua diff --git a/pre-release/c100442003.lua b/official/c44482554.lua similarity index 100% rename from pre-release/c100442003.lua rename to official/c44482554.lua diff --git a/pre-release/c100442039.lua b/official/c53792930.lua similarity index 100% rename from pre-release/c100442039.lua rename to official/c53792930.lua diff --git a/pre-release/c100442011.lua b/official/c5431722.lua similarity index 100% rename from pre-release/c100442011.lua rename to official/c5431722.lua diff --git a/pre-release/c100442036.lua b/official/c54919528.lua similarity index 100% rename from pre-release/c100442036.lua rename to official/c54919528.lua diff --git a/pre-release/c100442033.lua b/official/c55031170.lua similarity index 100% rename from pre-release/c100442033.lua rename to official/c55031170.lua diff --git a/pre-release/c100409002.lua b/official/c613013.lua similarity index 100% rename from pre-release/c100409002.lua rename to official/c613013.lua diff --git a/pre-release/c100442008.lua b/official/c6153210.lua similarity index 100% rename from pre-release/c100442008.lua rename to official/c6153210.lua diff --git a/pre-release/c100442026.lua b/official/c65853758.lua similarity index 100% rename from pre-release/c100442026.lua rename to official/c65853758.lua diff --git a/pre-release/c100442023.lua b/official/c66975205.lua similarity index 100% rename from pre-release/c100442023.lua rename to official/c66975205.lua diff --git a/pre-release/c100442020.lua b/official/c67098897.lua similarity index 100% rename from pre-release/c100442020.lua rename to official/c67098897.lua diff --git a/pre-release/c100442017.lua b/official/c68810435.lua similarity index 100% rename from pre-release/c100442017.lua rename to official/c68810435.lua diff --git a/pre-release/c100442010.lua b/official/c69932023.lua similarity index 100% rename from pre-release/c100442010.lua rename to official/c69932023.lua diff --git a/pre-release/c100442004.lua b/official/c70871153.lua similarity index 100% rename from pre-release/c100442004.lua rename to official/c70871153.lua diff --git a/pre-release/c100409001.lua b/official/c73129314.lua similarity index 100% rename from pre-release/c100409001.lua rename to official/c73129314.lua diff --git a/pre-release/c100442005.lua b/official/c7375867.lua similarity index 100% rename from pre-release/c100442005.lua rename to official/c7375867.lua diff --git a/pre-release/c100200267.lua b/official/c74941992.lua similarity index 100% rename from pre-release/c100200267.lua rename to official/c74941992.lua diff --git a/pre-release/c100442001.lua b/official/c75003700.lua similarity index 100% rename from pre-release/c100442001.lua rename to official/c75003700.lua diff --git a/pre-release/c100442007.lua b/official/c79755671.lua similarity index 96% rename from pre-release/c100442007.lua rename to official/c79755671.lua index c0731aa61d..55ded37dde 100644 --- a/pre-release/c100442007.lua +++ b/official/c79755671.lua @@ -41,7 +41,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) @@ -78,12 +78,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/c100442040.lua b/official/c80181649.lua similarity index 100% rename from pre-release/c100442040.lua rename to official/c80181649.lua diff --git a/pre-release/c100442037.lua b/official/c90303227.lua similarity index 100% rename from pre-release/c100442037.lua rename to official/c90303227.lua diff --git a/pre-release/c100442034.lua b/official/c91025875.lua similarity index 100% rename from pre-release/c100442034.lua rename to official/c91025875.lua diff --git a/pre-release/c100442031.lua b/official/c92248362.lua similarity index 100% rename from pre-release/c100442031.lua rename to official/c92248362.lua diff --git a/pre-release/c100442021.lua b/official/c93192592.lua similarity index 100% rename from pre-release/c100442021.lua rename to official/c93192592.lua diff --git a/pre-release/c100442024.lua b/official/c93360904.lua similarity index 100% rename from pre-release/c100442024.lua rename to official/c93360904.lua