Skip to content

Y
ygopro-222DIY-cards
Commit 7246385a authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:purerosefallen/ygopro-222DIY-cards

parents 2821437d 2d6d9217
Show whitespace changes
Inline Side-by-side
Showing with 1089 additions and 1088 deletions
expansions/lflist.conf
View file @ 7246385a
......@@ -92,6 +92,13 @@
09980276 1 --不死姬·吸血姬
09980312 2 --是非曲直厅之主
09980518 1 --石头巨像·加里奥
09980251 0 --异界女神动员
09980266 0 --不死姬·羽衣之狐
09980431 0 --AgitΩ·骑士踢
09980439 0 --降临卡片·最终降临
09980440 0 --降临卡片·防御降临
09980444 0 --降临卡片·抢夺降临
#101
10102004 1 --圣谕舞姬 珍妮丝
......@@ -206,7 +213,7 @@
14801375 0 --光之国
14801377 0 --奥特竞技场
14801389 0 --奥特战士 父子的牵绊
17082102 0 --路西法
#150
#154
......@@ -238,6 +245,7 @@
17050908 1 --戈耳工的试炼
17050901 0 --斯忒诺
#180
18004008 0 --性感手枪拔枪术
18005010 0 --封锁的拟魂
......@@ -589,6 +597,7 @@
77702001 0 --初音未来的暴走
#77702007 1 --楽園図
#77709006 1 --Figure
77765910 0 --难题 龙颈之玉 五色的弹丸
#800
#810
......
expansions/script/c12011017.lua
View file @ 7246385a
......@@ -65,6 +65,7 @@ function c12011017.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=tg:GetFirst()
if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
local mat1=Duel.SelectFusionMaterial(tp,tc,mg1,nil,chkf)
e:SetLabel(mat1:GetCount())
tc:SetMaterial(mat1)
Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
Duel.BreakEffect()
......@@ -76,7 +77,7 @@ function c12011017.activate(e,tp,eg,ep,ev,re,r,rp)
end
tc:CompleteProcedure()
Duel.BreakEffect()
local cs=mat1:GetCount()
local cs=e:GetLabel()
local sg=Duel.GetMatchingGroup(c12011017.thfilter,tp,LOCATION_DECK,0,nil)
if ( not tc:IsType(TYPE_EFFECT) ) and sg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(12011017,3)) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
......
expansions/script/c47530012.lua
View file @ 7246385a
......@@ -8,12 +8,12 @@ function c47530012.initial_effect(c)
--todeck
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(47530012,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOGRAVE+CATEGORY_TOKEN)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
e1:SetType(EFFECT_TYPE_QUICK_O)
e1:SetRange(LOCATION_MZONE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1)
e1:SetCost(c47530012.cost)
e1:SetCost(c47530012.tkcost)
e1:SetTarget(c47530012.tktg)
e1:SetOperation(c47530012.tkop)
c:RegisterEffect(e1)
......@@ -29,20 +29,17 @@ function c47530012.initial_effect(c)
c:RegisterEffect(e2)
end
function c47530012.cfilter(c)
return c:IsType(TYPE_MONSTER) and c:IsAbleToDeckAsCost() and c:IsRace(RACE_MACHINE)
return c:IsAbleToDeckAsCost() and c:IsRace(RACE_MACHINE)
end
function c47530012.cost(e,tp,eg,ep,ev,re,r,rp,chk)
function c47530012.tkcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c47530012.cfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,c47530012.cfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
if g:GetFirst():IsLocation(LOCATION_REMOVED) and g:GetFirst():IsFacedown() then
Duel.ConfirmCards(1-tp,g)
end
Duel.SendtoDeck(g,nil,2,REASON_COST)
end
function c47530012.tktg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.IsPlayerCanSpecialSummonMonster(tp,47531012,0,0x4011,0,0,1,RACE_CYBERSE,ATTRIBUTE_LIGHT) end
and Duel.IsPlayerCanSpecialSummonMonster(tp,47531012,0,0x4011,0,0,1,RACE_MACHINE,ATTRIBUTE_LIGHT) end
Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
end
......
expansions/script/c47530026.lua
View file @ 7246385a
......@@ -127,7 +127,7 @@ function c47530026.setfilter(c)
end
function c47530026.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
if chk==0 then return c:IsSummonable(true,nil,1) or c:IsMSetable(true,nil,1) end
if chk==0 then return c:IsSummonable(true,nil,1) and Duel.IsExistingMatchingCard(c47530026.setfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_SUMMON,c,1,0,0)
end
function c47530026.sumop(e,tp,eg,ep,ev,re,r,rp)
......@@ -135,7 +135,7 @@ function c47530026.sumop(e,tp,eg,ep,ev,re,r,rp)
if not c:IsRelateToEffect(e) then return end
if Duel.Summon(tp,c,true,nil,1)~=0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
local g=Duel.SelectMatchingCard(tp,c47530026.setfilter,tp,LOCATION_DECK,0,1,1,nil,false)
local g=Duel.SelectMatchingCard(tp,c47530026.setfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,false)
if g:GetCount()>0 then
Duel.SSet(tp,g:GetFirst())
Duel.ConfirmCards(1-tp,g)
......
expansions/script/c47530027.lua
View file @ 7246385a
......@@ -17,6 +17,7 @@ function c47530027.initial_effect(c)
e2:SetType(EFFECT_TYPE_QUICK_O)
e2:SetRange(LOCATION_PZONE)
e2:SetCode(EVENT_FREE_CHAIN)
e2:SetCountLimit(1)
e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e2:SetTarget(c47530027.sumtg)
e2:SetOperation(c47530027.sumop)
......@@ -124,31 +125,24 @@ function c47530027.psplimit(e,c)
return not c:IsRace(RACE_MACHINE)
end
function c47530027.setfilter(c)
return c47530027.IsZEON(c) and c:IsType(TYPE_TRAP) and c:IsType(TYPE_COUNTER)
return c47530027.IsZEON(c) and c:IsType(TYPE_TRAP) and c:IsType(TYPE_COUNTER) and c:IsSSetable()
end
function c47530027.sumtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
if chk==0 then return c:IsSummonable(true,nil,1) or c:IsMSetable(true,nil,1) end
if chk==0 then return c:IsSummonable(true,nil,1) and Duel.IsExistingMatchingCard(c47530027.setfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_SUMMON,c,1,0,0)
end
function c47530027.sumop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if not c:IsRelateToEffect(e) then return end
local pos=0
if c:IsSummonable(true,nil,1) then pos=pos+POS_FACEUP_ATTACK end
if c:IsMSetable(true,nil,1) then pos=pos+POS_FACEDOWN_DEFENSE end
if pos==0 then return end
if Duel.SelectPosition(tp,c,pos)==POS_FACEUP_ATTACK then
Duel.Summon(tp,c,true,nil,1)
else
Duel.MSet(tp,c,true,nil,1)
end
if Duel.Summon(tp,c,true,nil,1)~=0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
local g=Duel.SelectMatchingCard(tp,c47530027.setfilter,tp,LOCATION_DECK,0,1,1,nil,false)
local g=Duel.SelectMatchingCard(tp,c47530027.setfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,false)
if g:GetCount()>0 then
Duel.SSet(tp,g:GetFirst())
Duel.ConfirmCards(1-tp,g)
end
end
end
function c47530027.otfilter(c)
return c:GetSummonLocation()==LOCATION_EXTRA and c:IsRace(RACE_MACHINE)
......
expansions/script/c65050026.lua
View file @ 7246385a
......@@ -76,8 +76,8 @@ function c65050026.tdcostfil(c)
return c:IsAbleToGraveAsCost() and c:IsType(TYPE_NORMAL) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
end
function c65050026.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65050026.costfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050026.costfil,tp,LOCATION_EXTRA,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c65050026.tdcostfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050026.tdcostfil,tp,LOCATION_EXTRA,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST)
end
function c65050026.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c65050027.lua
View file @ 7246385a
......@@ -37,8 +37,8 @@ function c65050027.tdcostfil(c)
return c:IsAbleToGraveAsCost() and c:IsType(TYPE_NORMAL) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
end
function c65050027.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65050027.costfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050027.costfil,tp,LOCATION_EXTRA,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c65050027.tdcostfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050027.tdcostfil,tp,LOCATION_EXTRA,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST)
end
function c65050027.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c65050028.lua
View file @ 7246385a
......@@ -46,8 +46,8 @@ function c65050028.tdcostfil(c)
return c:IsAbleToGraveAsCost() and c:IsType(TYPE_NORMAL) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
end
function c65050028.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65050028.costfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050028.costfil,tp,LOCATION_EXTRA,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c65050028.tdcostfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050028.tdcostfil,tp,LOCATION_EXTRA,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST)
end
function c65050028.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c65050029.lua
View file @ 7246385a
......@@ -70,8 +70,8 @@ function c65050029.tdcostfil(c)
return c:IsAbleToGraveAsCost() and c:IsType(TYPE_NORMAL) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
end
function c65050029.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65050029.costfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050029.costfil,tp,LOCATION_EXTRA,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c65050029.tdcostfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050029.tdcostfil,tp,LOCATION_EXTRA,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST)
end
function c65050029.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c65050030.lua
View file @ 7246385a
......@@ -65,8 +65,8 @@ function c65050030.tdcostfil(c)
return c:IsAbleToGraveAsCost() and c:IsType(TYPE_NORMAL) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
end
function c65050030.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65050030.costfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050030.costfil,tp,LOCATION_EXTRA,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c65050030.tdcostfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050030.tdcostfil,tp,LOCATION_EXTRA,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST)
end
function c65050030.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c65050031.lua
View file @ 7246385a
......@@ -72,8 +72,8 @@ function c65050031.tdcostfil(c)
return c:IsAbleToGraveAsCost() and c:IsType(TYPE_NORMAL) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
end
function c65050031.tdcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65050031.costfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050031.costfil,tp,LOCATION_EXTRA,0,1,1,nil)
if chk==0 then return Duel.IsExistingMatchingCard(c65050031.tdcostfil,tp,LOCATION_EXTRA,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c65050031.tdcostfil,tp,LOCATION_EXTRA,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST)
end
function c65050031.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c75646502.lua
View file @ 7246385a
......@@ -11,7 +11,7 @@ function c75646502.initial_effect(c)
e1:SetRange(LOCATION_MZONE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1,75646502)
e1:SetCondition(c18940556.condition)
e1:SetCondition(c75646502.condition)
e1:SetTarget(c75646502.target)
e1:SetOperation(c75646502.operation)
c:RegisterEffect(e1)
......
update/filelist.txt
View file @ 7246385a
ygopro.exe 44e30d7dddeffa0acba31435632a7c80
ygopro.exe 44e30d7dddeffa0acba31435632a7c80
deck/2019.6.8_new_card1.ydk 6112722b7b9a6b4618c6923786fa7b49
deck/2019.6.8_new_card2.ydk b7b42b082ea473bb3934982ae9cf6a7d
deck/2019.6.8_new_card3.ydk 042b34e4671b1e326082460f68a5590f
......@@ -7,7 +7,7 @@ deck/2019.6.8_new_card5.ydk 3552c713927f7c4e38e0c883210d63bd
deck/2019.6.8_new_card6.ydk cb6d0fa9ffd37fa9be52ba48b41b0992
deck/2019.6.8_new_card7.ydk 5511a5f23236c723140693cf3cd0cf01
expansions/222DIY.cdb 7d5a270ea6aa44fe56866dc7ac9c5351
expansions/lflist.conf db8f62dadd719d43cb79cc136a15f980
expansions/lflist.conf a0e5c8c0aa96a7169324d5bf7eab2c5f
expansions/strings.conf ffdc5173327cd91803c7345f5d1c62fc
expansions/pics/08209710.jpg ed0e60085631bfa641ffeebd6abbd910
expansions/pics/1000360.jpg d1aa6f44fcd413402141a6bf4b886c2a
......
update/version.txt
View file @ 7246385a
2019/6/9 14:19:06
\ No newline at end of file
2019/6/17 20:16:06
\ 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