Skip to content

Y
ygopro-scripts
Commit 6c5eac35 authored by nekrozar's avatar nekrozar Committed by GitHub
Browse files
Options

fix & update (#1177) 

https://github.com/Fluorohydride/ygopro-core/pull/212
parent 934859ac
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 19 deletions
c3611830.lua
View file @ 6c5eac35
...@@ -66,11 +66,12 @@ function c3611830.descost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -66,11 +66,12 @@ function c3611830.descost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.RemoveCounter(tp,1,0,0x1,6,REASON_COST) Duel.RemoveCounter(tp,1,0,0x1,6,REASON_COST)
end end
function c3611830.cfilter(c) function c3611830.cfilter(c)
return c:IsCanAddCounter(0x1,1) return c:IsCanAddCounter(0x1)
end end
function c3611830.destg(e,tp,eg,ep,ev,re,r,rp,chk) function c3611830.destg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
and Duel.IsCanAddCounter(tp,0x1,1,c)
and Duel.IsExistingMatchingCard(c3611830.cfilter,tp,LOCATION_ONFIELD,0,1,nil) end and Duel.IsExistingMatchingCard(c3611830.cfilter,tp,LOCATION_ONFIELD,0,1,nil) end
local g=Duel.GetMatchingGroup(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) local g=Duel.GetMatchingGroup(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
......
c38325384.lua
View file @ 6c5eac35
...@@ -51,7 +51,7 @@ function c38325384.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,7 +51,7 @@ function c38325384.spcon(e,tp,eg,ep,ev,re,r,rp)
return rp==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp return rp==1-tp and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp
end end
function c38325384.spfilter(c,e,tp) function c38325384.spfilter(c,e,tp)
return c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsCanAddCounter(0x1) and Duel.IsCanAddCounter(tp,0x1,1,c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c38325384.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c38325384.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
......
c39000945.lua
View file @ 6c5eac35
...@@ -66,12 +66,12 @@ function c39000945.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -66,12 +66,12 @@ function c39000945.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveCounter(tp,0x1,3,REASON_COST) e:GetHandler():RemoveCounter(tp,0x1,3,REASON_COST)
end end
function c39000945.spfilter(c,e,tp) function c39000945.spfilter(c,e,tp)
return c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsCanAddCounter(0x1) and Duel.IsCanAddCounter(tp,0x1,1,c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c39000945.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c39000945.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>=2 and not Duel.IsPlayerAffectedByEffect(tp,59822133) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>=2 and not Duel.IsPlayerAffectedByEffect(tp,59822133)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsCanAddCounter(tp,0x1,1,c)
and Duel.IsExistingMatchingCard(c39000945.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(c39000945.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_HAND+LOCATION_PZONE) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_HAND+LOCATION_PZONE)
end end
......
c54965929.lua
View file @ 6c5eac35
...@@ -49,7 +49,7 @@ function c54965929.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,7 @@ function c54965929.spcon(e,tp,eg,ep,ev,re,r,rp)
return not Duel.IsExistingMatchingCard(nil,tp,LOCATION_PZONE,0,1,e:GetHandler()) return not Duel.IsExistingMatchingCard(nil,tp,LOCATION_PZONE,0,1,e:GetHandler())
end end
function c54965929.spfilter(c,e,tp) function c54965929.spfilter(c,e,tp)
return c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsCanAddCounter(0x1) and Duel.IsCanAddCounter(tp,0x1,1,c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c54965929.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c54965929.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler() local c=e:GetHandler()
......
c66104644.lua
View file @ 6c5eac35
...@@ -78,13 +78,13 @@ function c66104644.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -78,13 +78,13 @@ function c66104644.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveCounter(tp,0x1,3,REASON_COST) e:GetHandler():RemoveCounter(tp,0x1,3,REASON_COST)
end end
function c66104644.spfilter(c,e,tp) function c66104644.spfilter(c,e,tp)
return c:IsFaceup() and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsFaceup() and c:IsCanAddCounter(0x1) and Duel.IsCanAddCounter(tp,0x1,1,c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c66104644.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c66104644.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
if chk==0 then return Duel.GetLocationCountFromEx(tp)>=1 and Duel.GetLocationCount(tp,LOCATION_MZONE)>=1 if chk==0 then return Duel.GetLocationCountFromEx(tp)>=1 and Duel.GetLocationCount(tp,LOCATION_MZONE)>=1
and Duel.GetUsableMZoneCount(tp)>=2 and not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.GetUsableMZoneCount(tp)>=2 and not Duel.IsPlayerAffectedByEffect(tp,59822133)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsCanAddCounter(tp,0x1,1,c)
and Duel.IsExistingMatchingCard(c66104644.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(c66104644.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_EXTRA+LOCATION_PZONE) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_EXTRA+LOCATION_PZONE)
end end
...@@ -120,7 +120,7 @@ function c66104644.spcost2(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -120,7 +120,7 @@ function c66104644.spcost2(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.RemoveCounter(tp,1,0,0x1,3,REASON_COST) Duel.RemoveCounter(tp,1,0,0x1,3,REASON_COST)
end end
function c66104644.spfilter2(c,e,tp) function c66104644.spfilter2(c,e,tp)
return c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsCanAddCounter(0x1) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c66104644.sptg2(e,tp,eg,ep,ev,re,r,rp,chk) function c66104644.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
......
c83269557.lua
View file @ 6c5eac35
--ダーク・ヴァルキリア --ダーク・ヴァルキリア
function c83269557.initial_effect(c) function c83269557.initial_effect(c)
c:EnableCounterPermit(0x1,LOCATION_MZONE,aux.IsDualState)
aux.EnableDualAttribute(c) aux.EnableDualAttribute(c)
--counter permit
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_COUNTER_PERMIT+0x1)
e1:SetValue(LOCATION_MZONE)
e1:SetCondition(aux.IsDualState)
c:RegisterEffect(e1)
--atk up --atk up
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
......
c92559258.lua
View file @ 6c5eac35
...@@ -75,12 +75,12 @@ function c92559258.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -75,12 +75,12 @@ function c92559258.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveCounter(tp,0x1,3,REASON_COST) e:GetHandler():RemoveCounter(tp,0x1,3,REASON_COST)
end end
function c92559258.spfilter(c,e,tp) function c92559258.spfilter(c,e,tp)
return c:IsAttackAbove(1000) and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsAttackAbove(1000) and c:IsCanAddCounter(0x1) and Duel.IsCanAddCounter(tp,0x1,1,c) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c92559258.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c92559258.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>=2 and not Duel.IsPlayerAffectedByEffect(tp,59822133) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>=2 and not Duel.IsPlayerAffectedByEffect(tp,59822133)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsCanAddCounter(tp,0x1,1,c)
and Duel.IsExistingMatchingCard(c92559258.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(c92559258.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_DECK+LOCATION_PZONE) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_DECK+LOCATION_PZONE)
end end
......
c94599451.lua
View file @ 6c5eac35
...@@ -47,7 +47,7 @@ function c94599451.ctop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c94599451.ctop(e,tp,eg,ep,ev,re,r,rp)
end end
function c94599451.thfilter1(c,tp) function c94599451.thfilter1(c,tp)
local lv=c:GetLevel() local lv=c:GetLevel()
return (c:IsLocation(LOCATION_DECK) or (c:IsFaceup() and c:IsType(TYPE_PENDULUM))) and lv>0 and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) return (c:IsLocation(LOCATION_DECK) or (c:IsFaceup() and c:IsType(TYPE_PENDULUM))) and lv>0 and c:IsCanAddCounter(0x1)
and Duel.IsCanRemoveCounter(tp,1,0,0x1,lv,REASON_COST) and c:IsAbleToHand() and Duel.IsCanRemoveCounter(tp,1,0,0x1,lv,REASON_COST) and c:IsAbleToHand()
end end
function c94599451.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c94599451.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -72,7 +72,7 @@ function c94599451.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -72,7 +72,7 @@ function c94599451.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA)
end end
function c94599451.thfilter2(c,lv) function c94599451.thfilter2(c,lv)
return (c:IsLocation(LOCATION_DECK) or (c:IsFaceup() and c:IsType(TYPE_PENDULUM))) and c:IsCanAddCounter(0x1,1,false,LOCATION_MZONE) return (c:IsLocation(LOCATION_DECK) or (c:IsFaceup() and c:IsType(TYPE_PENDULUM))) and c:IsCanAddCounter(0x1)
and c:IsLevel(lv) and c:IsAbleToHand() and c:IsLevel(lv) and c:IsAbleToHand()
end end
function c94599451.thop(e,tp,eg,ep,ev,re,r,rp) function c94599451.thop(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