Skip to content

Y
ygopro-222DIY-cards
Commit 4f4a84a4 authored by Huangnan's avatar Huangnan
Browse files
Options

fix &update ci

parent 4d253bfc
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 42 deletions
.gitlab-ci.yml
View file @ 4f4a84a4
...@@ -84,6 +84,6 @@ upload_to_minio: ...@@ -84,6 +84,6 @@ upload_to_minio:
- pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli - pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli
- cp dist/archive/ygopro-FiNALE-DIY-cards.zip dist/archive/ygopro-FiNALE-DIY-cards-$CURRENT_UPDATE_DATE.zip - cp dist/archive/ygopro-FiNALE-DIY-cards.zip dist/archive/ygopro-FiNALE-DIY-cards-$CURRENT_UPDATE_DATE.zip
- cp dist/archive/ygopro-FiNALE-DIY-update.zip dist/archive/ygopro-FiNALE-DIY-update-$CURRENT_UPDATE_DATE.zip - cp dist/archive/ygopro-FiNALE-DIY-update.zip dist/archive/ygopro-FiNALE-DIY-update-$CURRENT_UPDATE_DATE.zip
- aws s3 --endpoint=https://minio.moenext.com:9000 sync dist/ s3://mycard/ygopro-222DIY > /dev/null - aws s3 --endpoint=https://cdn02.moenext.com sync dist/ s3://mycard/ygopro-222DIY > /dev/null
only: only:
- master - master
expansions/script/c18700388.lua
View file @ 4f4a84a4
...@@ -27,7 +27,7 @@ function cm.initial_effect(c) ...@@ -27,7 +27,7 @@ function cm.initial_effect(c)
e3:SetCategory(CATEGORY_DESTROY) e3:SetCategory(CATEGORY_DESTROY)
e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetType(EFFECT_TYPE_QUICK_O)
e3:SetCode(EVENT_CHAINING) e3:SetCode(EVENT_CHAINING)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_GRAVE)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET) e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
e3:SetCost(aux.bfgcost) e3:SetCost(aux.bfgcost)
e3:SetCountLimit(1,m+2) e3:SetCountLimit(1,m+2)
......
expansions/script/c18700468.lua
View file @ 4f4a84a4
...@@ -84,11 +84,14 @@ end ...@@ -84,11 +84,14 @@ end
function cm.spop(e,tp,eg,ep,ev,re,r,rp) function cm.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_SZONE+LOCATION_GRAVE,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_SZONE+LOCATION_GRAVE,0,1,1,nil,e,tp)
if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)~=0 and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)~=0 then
local tc=g:GetFirst() local tc=g:GetFirst()
local at=Duel.GetAttacker() local ph=Duel.GetCurrentPhase()
if at:IsAttackable() and not at:IsImmuneToEffect(e) then if ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
Duel.CalculateDamage(at,tc) local at=Duel.GetAttacker()
if at:IsAttackable() and not at:IsImmuneToEffect(e) then
Duel.CalculateDamage(at,tc)
end
end end
end end
end end
......
expansions/script/c23100119.lua
View file @ 4f4a84a4
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
function c23100119.initial_effect(c) function c23100119.initial_effect(c)
c:EnableReviveLimit() c:EnableReviveLimit()
--Cannot special summon --Cannot special summon
local e1=Effect.CreateEffect(c) local e0=Effect.CreateEffect(c)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
e1:SetType(EFFECT_TYPE_SINGLE) e0:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SPSUMMON_CONDITION) e0:SetCode(EFFECT_SPSUMMON_CONDITION)
e1:SetValue(aux.FALSE) e0:SetValue(aux.FALSE)
c:RegisterEffect(e1) c:RegisterEffect(e0)
--add counter --add counter
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(23100119,0)) e1:SetDescription(aux.Stringid(23100119,0))
...@@ -27,34 +27,34 @@ function c23100119.initial_effect(c) ...@@ -27,34 +27,34 @@ function c23100119.initial_effect(c)
e2:SetValue(c23100119.atkfilter) e2:SetValue(c23100119.atkfilter)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--indes --indes
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
e1:SetRange(LOCATION_MZONE)
e1:SetTargetRange(LOCATION_ONFIELD,0)
e1:SetTarget(aux.TargetBoolFunction(Card.IsCode,23100081,23100097))
e1:SetValue(1)
c:RegisterEffect(e1)
local e2=e1:Clone()
e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
c:RegisterEffect(e2)
local e3=e1:Clone()
e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
c:RegisterEffect(e3)
--immune
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetType(EFFECT_TYPE_FIELD)
e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetCode(EFFECT_IMMUNE_EFFECT) e3:SetTargetRange(LOCATION_ONFIELD,0)
e3:SetValue(c23100119.efilter) e3:SetTarget(aux.TargetBoolFunction(Card.IsCode,23100081,23100097))
e3:SetValue(1)
c:RegisterEffect(e3) c:RegisterEffect(e3)
local e1=Effect.CreateEffect(c) local e4=e3:Clone()
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) e4:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) c:RegisterEffect(e4)
e1:SetCode(EVENT_SPSUMMON_SUCCESS) local e5=e3:Clone()
e1:SetOperation(c23100119.bgmop) e5:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
c:RegisterEffect(e1) c:RegisterEffect(e5)
--immune
local e6=Effect.CreateEffect(c)
e6:SetType(EFFECT_TYPE_SINGLE)
e6:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e6:SetRange(LOCATION_MZONE)
e6:SetCode(EFFECT_IMMUNE_EFFECT)
e6:SetValue(c23100119.efilter)
c:RegisterEffect(e6)
local e7=Effect.CreateEffect(c)
e7:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e7:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
e7:SetCode(EVENT_SPSUMMON_SUCCESS)
e7:SetOperation(c23100119.bgmop)
c:RegisterEffect(e7)
end end
function c23100119.bgmop(e,tp,eg,ep,ev,re,r,rp) function c23100119.bgmop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_MUSIC,0,aux.Stringid(23100119,0)) Duel.Hint(HINT_MUSIC,0,aux.Stringid(23100119,0))
......
expansions/script/c23100122.lua
View file @ 4f4a84a4
...@@ -56,13 +56,13 @@ function c23100122.spfilter2(c,e,tp) ...@@ -56,13 +56,13 @@ function c23100122.spfilter2(c,e,tp)
end end
function c23100122.sptg2(e,tp,eg,ep,ev,re,r,rp,chk) function c23100122.sptg2(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
and Duel.IsExistingMatchingCard(c23100122.spfilter2,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(c23100122.spfilter2,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_DECK,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_DECK)
end end
function c23100122.spop2(e,tp,eg,ep,ev,re,r,rp) function c23100122.spop2(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c23100122.spfilter2),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c23100122.spfilter2),tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil,e,tp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end end
......
expansions/script/c79100340.lua
View file @ 4f4a84a4
...@@ -3,11 +3,11 @@ function c79100340.initial_effect(c) ...@@ -3,11 +3,11 @@ function c79100340.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCodeFun(c,79100260,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3a11),1,true,true) aux.AddFusionProcCodeFun(c,79100260,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3a11),1,true,true)
aux.EnableChangeCode(c,79100260,LOCATION_MZONE+LOCATION_REMOVED) aux.EnableChangeCode(c,79100260,LOCATION_MZONE+LOCATION_GRAVE)
--destroy --destroy
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(79100340,0)) e1:SetDescription(aux.Stringid(79100340,0))
e1:SetCategory(CATEGORY_DESTROY+CATEGORY_GRAVE) e1:SetCategory(CATEGORY_DESTROY+CATEGORY_REMOVE)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCode(EVENT_SPSUMMON_SUCCESS)
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY)
......
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