Skip to content

Y
ygopro-scripts
Commit db119265 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

update

parent 84595533
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 22 deletions
c11082056.lua
View file @ db119265
...@@ -24,15 +24,12 @@ function c11082056.spfilter(c,e,tp,code) ...@@ -24,15 +24,12 @@ function c11082056.spfilter(c,e,tp,code)
return c:IsType(TYPE_FUSION) and c.material_trap and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and code==c.material_trap return c:IsType(TYPE_FUSION) and c.material_trap and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and code==c.material_trap
end end
function c11082056.target(e,tp,eg,ep,ev,re,r,rp,chk) function c11082056.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE) and Duel.IsExistingMatchingCard(c11082056.tgfilter,tp,LOCATION_HAND+LOCATION_SZONE,0,1,nil,e,tp) end
return ft2>0 and Duel.IsExistingMatchingCard(c11082056.tgfilter,tp,LOCATION_HAND+LOCATION_SZONE,0,1,nil,e,tp)
end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end end
function c11082056.activate(e,tp,eg,ep,ev,re,r,rp) function c11082056.activate(e,tp,eg,ep,ev,re,r,rp)
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE) if Duel.GetLocationCountFromEx(tp)<=0 then return end
if ft2<=0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local g=Duel.SelectMatchingCard(tp,c11082056.tgfilter,tp,LOCATION_HAND+LOCATION_SZONE,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,c11082056.tgfilter,tp,LOCATION_HAND+LOCATION_SZONE,0,1,1,nil,e,tp)
local tc=g:GetFirst() local tc=g:GetFirst()
......
c13166648.lua
View file @ db119265
...@@ -20,15 +20,12 @@ function c13166648.filter(c,e,tp) ...@@ -20,15 +20,12 @@ function c13166648.filter(c,e,tp)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c13166648.target(e,tp,eg,ep,ev,re,r,rp,chk) function c13166648.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE) and Duel.IsExistingMatchingCard(c13166648.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
return ft2>0 and Duel.IsExistingMatchingCard(c13166648.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp)
end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end end
function c13166648.activate(e,tp,eg,ep,ev,re,r,rp) function c13166648.activate(e,tp,eg,ep,ev,re,r,rp)
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE) if Duel.GetLocationCountFromEx(tp)<=0 then return end
if ft2<=0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c13166648.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,c13166648.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
local tc=g:GetFirst() local tc=g:GetFirst()
......
c13331639.lua
View file @ db119265
...@@ -376,19 +376,17 @@ function c13331639.spfilter(c,e,tp) ...@@ -376,19 +376,17 @@ function c13331639.spfilter(c,e,tp)
end end
function c13331639.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c13331639.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE)
local loc=0 local loc=0
if ft1>0 then loc=loc+LOCATION_DECK end if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then loc=loc+LOCATION_DECK end
if ft2>0 then loc=loc+LOCATION_EXTRA end if Duel.GetLocationCountFromEx(tp)>0 then loc=loc+LOCATION_EXTRA end
return loc~=0 and Duel.IsExistingMatchingCard(c13331639.spfilter,tp,loc,0,1,nil,e,tp) return loc~=0 and Duel.IsExistingMatchingCard(c13331639.spfilter,tp,loc,0,1,nil,e,tp)
end end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA)
end end
function c13331639.spop(e,tp,eg,ep,ev,re,r,rp) function c13331639.spop(e,tp,eg,ep,ev,re,r,rp)
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE)
local loc=0 local loc=0
if ft1>0 then loc=loc+LOCATION_DECK end if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then loc=loc+LOCATION_DECK end
if ft2>0 then loc=loc+LOCATION_EXTRA end if Duel.GetLocationCountFromEx(tp)>0 then loc=loc+LOCATION_EXTRA end
if loc==0 then return end if loc==0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c13331639.spfilter,tp,loc,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,c13331639.spfilter,tp,loc,0,1,1,nil,e,tp)
......
utility.lua
View file @ db119265
...@@ -1559,10 +1559,9 @@ function Auxiliary.PendCondition() ...@@ -1559,10 +1559,9 @@ function Auxiliary.PendCondition()
local lscale=c:GetLeftScale() local lscale=c:GetLeftScale()
local rscale=rpz:GetRightScale() local rscale=rpz:GetRightScale()
if lscale>rscale then lscale,rscale=rscale,lscale end if lscale>rscale then lscale,rscale=rscale,lscale end
local ft1,ft2=Duel.GetLocationCount(tp,LOCATION_MZONE)
local loc=0 local loc=0
if ft1>0 then loc=loc+LOCATION_HAND end if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then loc=loc+LOCATION_HAND end
if ft2>0 then loc=loc+LOCATION_EXTRA end if Duel.GetLocationCountFromEx(tp)>0 then loc=loc+LOCATION_EXTRA end
if loc==0 then return false end if loc==0 then return false end
local g=nil local g=nil
if og then if og then
...@@ -1579,7 +1578,9 @@ function Auxiliary.PendOperation() ...@@ -1579,7 +1578,9 @@ function Auxiliary.PendOperation()
local lscale=c:GetLeftScale() local lscale=c:GetLeftScale()
local rscale=rpz:GetRightScale() local rscale=rpz:GetRightScale()
if lscale>rscale then lscale,rscale=rscale,lscale end if lscale>rscale then lscale,rscale=rscale,lscale end
local ft1,ft2,ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft1=Duel.GetLocationCount(tp,LOCATION_MZONE)
local ft2=Duel.GetLocationCountFromEx(tp)
local ft=Duel.GetUsableMZoneCount(tp)
if Duel.IsPlayerAffectedByEffect(tp,59822133) then if Duel.IsPlayerAffectedByEffect(tp,59822133) then
if ft1>0 then ft1=1 end if ft1>0 then ft1=1 end
if ft2>0 then ft2=1 end if ft2>0 then ft2=1 end
......
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