Skip to content

P
pre-release-database-cdb
Commit 9b5d9734 authored by fallenstardust's avatar fallenstardust
Browse files
Options

Merge branch 'master' of https://code.mycard.moe/mycard/pre-release-database-cdb

parents 47c36543 346ff4d8
Pipeline #25851 passed with stages
          in 1 minute and 8 seconds
          Show whitespace changes
          Inline Side-by-side
          Showing with 48 additions and 51 deletions
          .gitlab-ci.yml
          View file @ 9b5d9734
          ...@@ -53,7 +53,7 @@ merge_databases: ...@@ -53,7 +53,7 @@ merge_databases:
          FIELDS: 'name,desc,overallString,picUrl' FIELDS: 'name,desc,overallString,picUrl'
          GIT_DEPTH: '1000' GIT_DEPTH: '1000'
          OUTPUT_FILENAME: test-release.json OUTPUT_FILENAME: test-release.json
          REF_COMMIT: '1.70' # 更新的时候改这里，修改成上一个tag的版本号 REF_COMMIT: '1.71' # 更新的时候改这里，修改成上一个tag的版本号
          script: script:
          - apt update;apt -y install wget - apt update;apt -y install wget
          - currentPath=$PWD - currentPath=$PWD
          ......
          script/c101205025.lua
          View file @ 9b5d9734
          ...@@ -7,7 +7,7 @@ function s.initial_effect(c) ...@@ -7,7 +7,7 @@ function s.initial_effect(c)
          e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
          e1:SetCode(EVENT_TO_GRAVE) e1:SetCode(EVENT_TO_GRAVE)
          e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
          e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
          e1:SetCountLimit(1,id) e1:SetCountLimit(1,id)
          e1:SetCondition(s.spcon) e1:SetCondition(s.spcon)
          e1:SetTarget(s.sptg) e1:SetTarget(s.sptg)
          ...@@ -27,7 +27,7 @@ function s.initial_effect(c) ...@@ -27,7 +27,7 @@ function s.initial_effect(c)
          c:RegisterEffect(e2) c:RegisterEffect(e2)
          end end
          function s.cfilter(c) function s.cfilter(c)
          return c:IsPreviousLocation(LOCATION_MZONE+LOCATION_HAND) and c:GetOriginalRace()&RACE_THUNDER==RACE_THUNDER return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE+LOCATION_HAND) and c:GetOriginalRace()&RACE_THUNDER==RACE_THUNDER and c:GetOriginalType()&TYPE_MONSTER==TYPE_MONSTER
          end end
          function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
          return eg:IsExists(s.cfilter,1,nil) return eg:IsExists(s.cfilter,1,nil)
          ......
          script/c101205026.lua
          View file @ 9b5d9734
          ...@@ -6,7 +6,8 @@ function s.initial_effect(c) ...@@ -6,7 +6,8 @@ function s.initial_effect(c)
          e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
          e1:SetCode(EVENT_CHAIN_SOLVING) e1:SetCode(EVENT_CHAIN_SOLVING)
          e1:SetRange(LOCATION_PZONE) e1:SetRange(LOCATION_PZONE)
          e1:SetOperation(s.disoperation) e1:SetCondition(s.discon)
          e1:SetOperation(s.disop)
          c:RegisterEffect(e1) c:RegisterEffect(e1)
          local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
          e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
          ...@@ -21,7 +22,8 @@ function s.initial_effect(c) ...@@ -21,7 +22,8 @@ function s.initial_effect(c)
          e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
          e3:SetCode(EVENT_CHAIN_SOLVING) e3:SetCode(EVENT_CHAIN_SOLVING)
          e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
          e3:SetOperation(s.disoperation) e3:SetCondition(s.discon)
          e3:SetOperation(s.disop)
          c:RegisterEffect(e3) c:RegisterEffect(e3)
          local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
          e4:SetDescription(aux.Stringid(id,0)) e4:SetDescription(aux.Stringid(id,0))
          ...@@ -33,12 +35,17 @@ function s.initial_effect(c) ...@@ -33,12 +35,17 @@ function s.initial_effect(c)
          e4:SetOperation(s.penop) e4:SetOperation(s.penop)
          c:RegisterEffect(e4) c:RegisterEffect(e4)
          end end
          function s.disoperation(e,tp,eg,ep,ev,re,r,rp) function s.discon(e,tp,eg,ep,ev,re,r,rp)
          local g=e:GetHandler():GetColumnGroup() local c=e:GetHandler()
          local tl=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION) local op,loc,seq2=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
          if bit.band(tl,LOCATION_ONFIELD)~=0 and g:IsContains(re:GetHandler()) then local seq1=aux.MZoneSequence(c:GetSequence())
          seq2=aux.MZoneSequence(seq2)
          return bit.band(loc,LOCATION_ONFIELD)~=0
          and (op==1-tp and seq1==4-seq2 or op==tp and seq1==seq2)
          end
          function s.disop(e,tp,eg,ep,ev,re,r,rp)
          Duel.Hint(HINT_CARD,0,id)
          Duel.NegateEffect(ev) Duel.NegateEffect(ev)
          end
          end end
          function s.hspzone(tp) function s.hspzone(tp)
          local zone=0 local zone=0
          ......
          script/c101205041.lua
          View file @ 9b5d9734
          ...@@ -31,7 +31,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -31,7 +31,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
          return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
          end end
          function s.spfilter(c,e,tp) function s.spfilter(c,e,tp)
          return c:IsLevelBelow(4) and c:IsRace(RACE_CYBERSE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) return c:IsLevel(4) and c:IsRace(RACE_CYBERSE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
          end end
          function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
          if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
          ...@@ -40,7 +40,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -40,7 +40,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
          end end
          function s.spop(e,tp,eg,ep,ev,re,r,rp) function s.spop(e,tp,eg,ep,ev,re,r,rp)
          local c=e:GetHandler() local c=e:GetHandler()
          if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
          Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
          local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
          local tc=g:GetFirst() local tc=g:GetFirst()
          ...@@ -58,6 +58,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,6 +58,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
          tc:RegisterEffect(e2) tc:RegisterEffect(e2)
          Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
          end end
          end
          local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
          e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
          e3:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON) e3:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
          ...@@ -72,7 +73,7 @@ function s.splimit(e,c) ...@@ -72,7 +73,7 @@ function s.splimit(e,c)
          end end
          function s.cfilter(c,tp) function s.cfilter(c,tp)
          local bc=c:GetBattleTarget() local bc=c:GetBattleTarget()
          return c:IsRace(RACE_CYBERSE) and c:IsControler(tp) or (bc and bc:IsRace(RACE_CYBERSE) and c:IsControler(tp)) return (c:IsRace(RACE_CYBERSE) and c:IsControler(tp) or (bc and bc:IsRace(RACE_CYBERSE) and bc:IsControler(tp))) and (not bc or c:GetControler()~=bc:GetControler())
          end end
          function s.damcon(e,tp,eg,ep,ev,re,r,rp) function s.damcon(e,tp,eg,ep,ev,re,r,rp)
          return ep~=tp and eg:IsExists(s.cfilter,1,nil,tp) return ep~=tp and eg:IsExists(s.cfilter,1,nil,tp)
          ......
          script/c101205045.lua
          View file @ 9b5d9734
          ...@@ -37,10 +37,10 @@ function s.discon2(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,10 +37,10 @@ function s.discon2(e,tp,eg,ep,ev,re,r,rp)
          return e:GetHandler():GetOverlayGroup():IsExists(Card.IsRace,1,nil,RACE_ILLUSION) return e:GetHandler():GetOverlayGroup():IsExists(Card.IsRace,1,nil,RACE_ILLUSION)
          end end
          function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
          if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and aux.NegateAnyFilter(chkc) end if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and aux.NegateMonsterFilter(chkc) end
          if chk==0 then return Duel.IsExistingTarget(aux.NegateAnyFilter,tp,0,LOCATION_MZONE,1,nil) end if chk==0 then return Duel.IsExistingTarget(aux.NegateMonsterFilter,tp,0,LOCATION_MZONE,1,nil) end
          Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
          local g=Duel.SelectTarget(tp,aux.NegateAnyFilter,tp,0,LOCATION_MZONE,1,1,nil) local g=Duel.SelectTarget(tp,aux.NegateMonsterFilter,tp,0,LOCATION_MZONE,1,1,nil)
          Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,1,0,0)
          end end
          function s.disop(e,tp,eg,ep,ev,re,r,rp) function s.disop(e,tp,eg,ep,ev,re,r,rp)
          ...@@ -52,24 +52,17 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,24 +52,17 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
          e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
          e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
          e1:SetCode(EFFECT_DISABLE) e1:SetCode(EFFECT_DISABLE)
          e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
          tc:RegisterEffect(e1) tc:RegisterEffect(e1)
          local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
          e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
          e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
          e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetCode(EFFECT_DISABLE_EFFECT)
          e2:SetValue(RESET_TURN_SET) e2:SetValue(RESET_TURN_SET)
          e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD)
          tc:RegisterEffect(e2) tc:RegisterEffect(e2)
          if tc:IsType(TYPE_TRAPMONSTER) then if tc:GetBattledGroupCount()>0 and tc:IsControlerCanBeChanged() and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
          local e3=Effect.CreateEffect(c) Duel.BreakEffect()
          e3:SetType(EFFECT_TYPE_SINGLE)
          e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
          e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
          e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
          tc:RegisterEffect(e3)
          end
          if tc:GetBattledGroupCount()>0 and c:IsControlerCanBeChanged() and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
          Duel.GetControl(tc,tp,PHASE_END,1) Duel.GetControl(tc,tp,PHASE_END,1)
          end end
          end end
          ......
          script/c101205051.lua
          View file @ 9b5d9734
          ...@@ -44,12 +44,9 @@ end ...@@ -44,12 +44,9 @@ end
          function s.cfilter(c,sp) function s.cfilter(c,sp)
          return c:IsSummonPlayer(sp) and c:IsFaceup() return c:IsSummonPlayer(sp) and c:IsFaceup()
          end end
          function s.lpcon(e,tp,eg,ep,ev,re,r,rp)
          return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2)
          and eg:IsExists(s.cfilter,1,nil,1-tp)
          end
          function s.lpcon1(e,tp,eg,ep,ev,re,r,rp) function s.lpcon1(e,tp,eg,ep,ev,re,r,rp)
          return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2)
          and eg:IsExists(s.cfilter,1,nil,1-tp)
          and (not re:IsHasType(EFFECT_TYPE_ACTIONS) or re:IsHasType(EFFECT_TYPE_CONTINUOUS)) and (not re:IsHasType(EFFECT_TYPE_ACTIONS) or re:IsHasType(EFFECT_TYPE_CONTINUOUS))
          end end
          function s.lpop1(e,tp,eg,ep,ev,re,r,rp) function s.lpop1(e,tp,eg,ep,ev,re,r,rp)
          ...@@ -59,6 +56,7 @@ function s.lpop1(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,6 +56,7 @@ function s.lpop1(e,tp,eg,ep,ev,re,r,rp)
          end end
          function s.regcon(e,tp,eg,ep,ev,re,r,rp) function s.regcon(e,tp,eg,ep,ev,re,r,rp)
          return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2)
          and eg:IsExists(s.cfilter,1,nil,1-tp)
          and re:IsHasType(EFFECT_TYPE_ACTIONS) and not re:IsHasType(EFFECT_TYPE_CONTINUOUS) and re:IsHasType(EFFECT_TYPE_ACTIONS) and not re:IsHasType(EFFECT_TYPE_CONTINUOUS)
          end end
          function s.regop(e,tp,eg,ep,ev,re,r,rp) function s.regop(e,tp,eg,ep,ev,re,r,rp)
          ...@@ -78,6 +76,7 @@ end ...@@ -78,6 +76,7 @@ end
          function s.lpop2(e,tp,eg,ep,ev,re,r,rp) function s.lpop2(e,tp,eg,ep,ev,re,r,rp)
          e:GetHandler():ResetFlagEffect(id) e:GetHandler():ResetFlagEffect(id)
          local lg=e:GetLabelObject():GetLabelObject() local lg=e:GetLabelObject():GetLabelObject()
          lg=lg:Filter(Card.IsLocation,nil,LOCATION_MZONE)
          local rnum=lg:GetSum(Card.GetAttack) local rnum=lg:GetSum(Card.GetAttack)
          local g=Group.CreateGroup() local g=Group.CreateGroup()
          g:KeepAlive() g:KeepAlive()
          ...@@ -111,8 +110,5 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -111,8 +110,5 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
          e1:SetValue(e:GetLabel()) e1:SetValue(e:GetLabel())
          e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
          c:RegisterEffect(e1) c:RegisterEffect(e1)
          local e2=e1:Clone()
          e2:SetCode(EFFECT_UPDATE_DEFENSE)
          c:RegisterEffect(e2)
          end end
          end end
          \ No newline at end of file
          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