Skip to content

Y
ygopro-scripts-888
Commit 5d667bfc authored by wind2009's avatar wind2009
Browse files
Options

Merge branch 'master' into mc_master

parents 41bf9cd3 2bf900bb
Pipeline #37593 failed with stages
        Show whitespace changes
        Inline Side-by-side
        Showing with 31 additions and 30 deletions
        c58570206.lua
        View file @ 5d667bfc
        ...@@ -85,7 +85,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -85,7 +85,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
        Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
        local tg=sg:Select(tp,1,1,nil) local tg=sg:Select(tp,1,1,nil)
        local tc=tg:GetFirst() local tc=tg:GetFirst()
        if not tc then return end if tc then
        if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or ce and not Duel.SelectYesNo(tp,ce:GetDescription())) then if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or ce and not Duel.SelectYesNo(tp,ce:GetDescription())) then
        aux.FCheckAdditional=s.fcheck1(ct) aux.FCheckAdditional=s.fcheck1(ct)
        aux.FGoalCheckAdditional=s.fcheck2 aux.FGoalCheckAdditional=s.fcheck2
        ...@@ -116,6 +116,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -116,6 +116,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
        end end
        Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
        tc:CompleteProcedure() tc:CompleteProcedure()
        end
        aux.FCheckAdditional=nil aux.FCheckAdditional=nil
        aux.FGoalCheckAdditional=nil aux.FGoalCheckAdditional=nil
        end end
        c61944066.lua
        View file @ 5d667bfc
        ...@@ -54,7 +54,7 @@ function s.cfilter2(c) ...@@ -54,7 +54,7 @@ function s.cfilter2(c)
        return c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT) return c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT)
        end end
        function s.lpcon(e,tp,eg,ep,ev,re,r,rp) function s.lpcon(e,tp,eg,ep,ev,re,r,rp)
        return re:GetHandler():IsAllTypes(TYPE_RITUAL+TYPE_MONSTER) return re and re:GetHandler():IsAllTypes(TYPE_RITUAL+TYPE_MONSTER)
        and eg:IsExists(s.cfilter2,1,nil) and eg:IsExists(s.cfilter2,1,nil)
        end end
        function s.lpop(e,tp,eg,ep,ev,re,r,rp) function s.lpop(e,tp,eg,ep,ev,re,r,rp)
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment