Skip to content

Y
ygopro-scripts-888
Commit 6082ca73 authored by Chrono-Genex's avatar Chrono-Genex Committed by GitHub
Browse files
Options

fix (#1734)

parent d506b960
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 58 deletions
c18716735.lua
View file @ 6082ca73
...@@ -22,7 +22,6 @@ function c18716735.initial_effect(c) ...@@ -22,7 +22,6 @@ function c18716735.initial_effect(c)
e2:SetCode(EVENT_DESTROYED) e2:SetCode(EVENT_DESTROYED)
e2:SetCountLimit(1,18716735) e2:SetCountLimit(1,18716735)
e2:SetCondition(c18716735.regcon) e2:SetCondition(c18716735.regcon)
e2:SetTarget(c18716735.regtg)
e2:SetOperation(c18716735.regop) e2:SetOperation(c18716735.regop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
...@@ -59,12 +58,6 @@ end ...@@ -59,12 +58,6 @@ end
function c18716735.regcon(e,tp,eg,ep,ev,re,r,rp) function c18716735.regcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_EFFECT+REASON_BATTLE)~=0 and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) return bit.band(r,REASON_EFFECT+REASON_BATTLE)~=0 and e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
end end
function c18716735.thfilter(c)
return c:IsSetCard(0xe1) and c:IsType(TYPE_MONSTER)
end
function c18716735.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c18716735.thfilter,tp,LOCATION_DECK,0,1,nil) end
end
function c18716735.regop(e,tp,eg,ep,ev,re,r,rp) function c18716735.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
...@@ -75,16 +68,16 @@ function c18716735.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -75,16 +68,16 @@ function c18716735.regop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_PHASE+PHASE_END) e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c18716735.thfilter2(c) function c18716735.thfilter(c)
return c18716735.thfilter(c) and c:IsAbleToHand() return c:IsSetCard(0xe1) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
end end
function c18716735.thcon(e,tp,eg,ep,ev,re,r,rp) function c18716735.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c18716735.thfilter2,tp,LOCATION_DECK,0,1,nil) return Duel.IsExistingMatchingCard(c18716735.thfilter,tp,LOCATION_DECK,0,1,nil)
end end
function c18716735.thop(e,tp,eg,ep,ev,re,r,rp) function c18716735.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,18716735) Duel.Hint(HINT_CARD,0,18716735)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c18716735.thfilter2,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c18716735.thfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
......
c5506791.lua
View file @ 6082ca73
...@@ -9,7 +9,6 @@ function c5506791.initial_effect(c) ...@@ -9,7 +9,6 @@ function c5506791.initial_effect(c)
e2:SetCode(EVENT_SUMMON_SUCCESS) e2:SetCode(EVENT_SUMMON_SUCCESS)
e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP) e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
e2:SetCountLimit(1,5506791) e2:SetCountLimit(1,5506791)
e2:SetTarget(c5506791.regtg)
e2:SetOperation(c5506791.regop) e2:SetOperation(c5506791.regop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=e2:Clone() local e3=e2:Clone()
...@@ -35,9 +34,6 @@ end ...@@ -35,9 +34,6 @@ end
function c5506791.thfilter(c) function c5506791.thfilter(c)
return c:IsSetCard(0xd0) and c:IsAbleToHand() return c:IsSetCard(0xd0) and c:IsAbleToHand()
end end
function c5506791.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
end
function c5506791.regop(e,tp,eg,ep,ev,re,r,rp) function c5506791.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
......
c595626.lua
View file @ 6082ca73
...@@ -23,7 +23,6 @@ function c595626.initial_effect(c) ...@@ -23,7 +23,6 @@ function c595626.initial_effect(c)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,595627) e2:SetCountLimit(1,595627)
e2:SetCondition(c595626.thcon) e2:SetCondition(c595626.thcon)
e2:SetTarget(c595626.thtg)
e2:SetOperation(c595626.thop) e2:SetOperation(c595626.thop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
...@@ -80,9 +79,6 @@ end ...@@ -80,9 +79,6 @@ end
function c595626.thfilter(c) function c595626.thfilter(c)
return c:IsCode(83764718) and c:IsAbleToHand() return c:IsCode(83764718) and c:IsAbleToHand()
end end
function c595626.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,83764718) end
end
function c595626.thop(e,tp,eg,ep,ev,re,r,rp) function c595626.thop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
......
c65472618.lua
View file @ 6082ca73
...@@ -19,7 +19,6 @@ function c65472618.initial_effect(c) ...@@ -19,7 +19,6 @@ function c65472618.initial_effect(c)
e3:SetCode(EVENT_DESTROYED) e3:SetCode(EVENT_DESTROYED)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCondition(c65472618.regcon) e3:SetCondition(c65472618.regcon)
e3:SetTarget(c65472618.regtg)
e3:SetOperation(c65472618.regop) e3:SetOperation(c65472618.regop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
...@@ -55,12 +54,6 @@ function c65472618.regcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,12 +54,6 @@ function c65472618.regcon(e,tp,eg,ep,ev,re,r,rp)
return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE)
and (c:IsReason(REASON_EFFECT) and rp==1-tp or c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp)) and (c:IsReason(REASON_EFFECT) and rp==1-tp or c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp))
end end
function c65472618.thfilter(c)
return c:IsAttackBelow(2000) and c:IsRace(RACE_WARRIOR+RACE_SPELLCASTER) and not c:IsCode(65472618)
end
function c65472618.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c65472618.thfilter,tp,LOCATION_DECK,0,1,nil) end
end
function c65472618.regop(e,tp,eg,ep,ev,re,r,rp) function c65472618.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
...@@ -72,15 +65,15 @@ function c65472618.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,15 +65,15 @@ function c65472618.regop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c65472618.thfilter2(c) function c65472618.thfilter2(c)
return c65472618.thfilter(c) and c:IsAbleToHand() return c:IsAttackBelow(2000) and c:IsRace(RACE_WARRIOR+RACE_SPELLCASTER) and not c:IsCode(65472618) and c:IsAbleToHand()
end end
function c65472618.thcon(e,tp,eg,ep,ev,re,r,rp) function c65472618.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c65472618.thfilter2,tp,LOCATION_DECK,0,1,nil) return Duel.IsExistingMatchingCard(c65472618.thfilter,tp,LOCATION_DECK,0,1,nil)
end end
function c65472618.thop(e,tp,eg,ep,ev,re,r,rp) function c65472618.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,65472618) Duel.Hint(HINT_CARD,0,65472618)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c65472618.thfilter2,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c65472618.thfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
......
c79206925.lua
View file @ 6082ca73
...@@ -33,7 +33,6 @@ function c79206925.initial_effect(c) ...@@ -33,7 +33,6 @@ function c79206925.initial_effect(c)
e4:SetType(EFFECT_TYPE_IGNITION) e4:SetType(EFFECT_TYPE_IGNITION)
e4:SetRange(LOCATION_MZONE) e4:SetRange(LOCATION_MZONE)
e4:SetCountLimit(1,79206925) e4:SetCountLimit(1,79206925)
e4:SetTarget(c79206925.regtg)
e4:SetOperation(c79206925.regop) e4:SetOperation(c79206925.regop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
...@@ -63,12 +62,6 @@ end ...@@ -63,12 +62,6 @@ end
function c79206925.indtg(e,c) function c79206925.indtg(e,c)
return c==e:GetHandler() or c:IsLocation(LOCATION_FZONE) return c==e:GetHandler() or c:IsLocation(LOCATION_FZONE)
end end
function c79206925.thfilter(c)
return (c:IsSetCard(0x2e) and c:IsType(TYPE_MONSTER)) or c:IsSetCard(0x91)
end
function c79206925.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c79206925.thfilter,tp,LOCATION_DECK,0,1,nil) end
end
function c79206925.regop(e,tp,eg,ep,ev,re,r,rp) function c79206925.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
...@@ -79,16 +72,16 @@ function c79206925.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,16 +72,16 @@ function c79206925.regop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_PHASE+PHASE_END) e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c79206925.thfilter2(c) function c79206925.thfilter(c)
return c79206925.thfilter(c) and c:IsAbleToHand() return (c:IsSetCard(0x2e) and c:IsType(TYPE_MONSTER)) or c:IsSetCard(0x91) and c:IsAbleToHand()
end end
function c79206925.thcon(e,tp,eg,ep,ev,re,r,rp) function c79206925.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c79206925.thfilter2,tp,LOCATION_DECK,0,1,nil) return Duel.IsExistingMatchingCard(c79206925.thfilter,tp,LOCATION_DECK,0,1,nil)
end end
function c79206925.thop(e,tp,eg,ep,ev,re,r,rp) function c79206925.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,79206925) Duel.Hint(HINT_CARD,0,79206925)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c79206925.thfilter2,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c79206925.thfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
......
c8802510.lua
View file @ 6082ca73
...@@ -21,7 +21,6 @@ function c8802510.initial_effect(c) ...@@ -21,7 +21,6 @@ function c8802510.initial_effect(c)
e2:SetCode(EVENT_REMOVE) e2:SetCode(EVENT_REMOVE)
e2:SetCountLimit(1,8802510) e2:SetCountLimit(1,8802510)
e2:SetCondition(c8802510.regcon) e2:SetCondition(c8802510.regcon)
e2:SetTarget(c8802510.regtg)
e2:SetOperation(c8802510.regop) e2:SetOperation(c8802510.regop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
...@@ -32,9 +31,6 @@ end ...@@ -32,9 +31,6 @@ end
function c8802510.regcon(e,tp,eg,ep,ev,re,r,rp) function c8802510.regcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c8802510.cfilter,1,nil,tp) return eg:IsExists(c8802510.cfilter,1,nil,tp)
end end
function c8802510.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_DECK,0,1,nil,0xc1) end
end
function c8802510.regop(e,tp,eg,ep,ev,re,r,rp) function c8802510.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
......
c88722973.lua
View file @ 6082ca73
...@@ -10,7 +10,6 @@ function c88722973.initial_effect(c) ...@@ -10,7 +10,6 @@ function c88722973.initial_effect(c)
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:SetCondition(c88722973.regcon) e1:SetCondition(c88722973.regcon)
e1:SetTarget(c88722973.regtg)
e1:SetOperation(c88722973.regop) e1:SetOperation(c88722973.regop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--spsummon --spsummon
...@@ -28,9 +27,6 @@ end ...@@ -28,9 +27,6 @@ end
function c88722973.regcon(e,tp,eg,ep,ev,re,r,rp) function c88722973.regcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
end end
function c88722973.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_DECK,0,1,nil,TYPE_PENDULUM) end
end
function c88722973.regop(e,tp,eg,ep,ev,re,r,rp) function c88722973.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
......
c93169863.lua
View file @ 6082ca73
...@@ -8,7 +8,6 @@ function c93169863.initial_effect(c) ...@@ -8,7 +8,6 @@ function c93169863.initial_effect(c)
e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetCode(EVENT_SUMMON_SUCCESS)
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY)
e1:SetCountLimit(1,93169863) e1:SetCountLimit(1,93169863)
e1:SetTarget(c93169863.regtg)
e1:SetOperation(c93169863.regop) e1:SetOperation(c93169863.regop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
...@@ -26,15 +25,9 @@ function c93169863.initial_effect(c) ...@@ -26,15 +25,9 @@ function c93169863.initial_effect(c)
e3:SetOperation(c93169863.spop) e3:SetOperation(c93169863.spop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c93169863.thfilter1(c) function c93169863.thfilter(c)
return c:IsLevelAbove(5) and c:IsAttribute(ATTRIBUTE_WATER)
end
function c93169863.thfilter2(c)
return c:IsLevelAbove(5) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToHand() return c:IsLevelAbove(5) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToHand()
end end
function c93169863.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c93169863.thfilter1,tp,LOCATION_DECK,0,1,nil) end
end
function c93169863.regop(e,tp,eg,ep,ev,re,r,rp) function c93169863.regop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
...@@ -46,12 +39,12 @@ function c93169863.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -46,12 +39,12 @@ function c93169863.regop(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function c93169863.thcon(e,tp,eg,ep,ev,re,r,rp) function c93169863.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c93169863.thfilter2,tp,LOCATION_DECK,0,1,nil) return Duel.IsExistingMatchingCard(c93169863.thfilter,tp,LOCATION_DECK,0,1,nil)
end end
function c93169863.thop(e,tp,eg,ep,ev,re,r,rp) function c93169863.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,93169863) Duel.Hint(HINT_CARD,0,93169863)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c93169863.thfilter2,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c93169863.thfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
......
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