Skip to content

Y
ygopro
Commit de83d390 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

Merge pull request #720 from salix5/patch 

fix
parents ef7053b6 bce3370d
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 57 deletions
script/c1845204.lua
View file @ de83d390
......@@ -41,9 +41,10 @@ function c1845204.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetCode(EVENT_PHASE+PHASE_END)
e2:SetCountLimit(1)
e2:SetRange(LOCATION_MZONE)
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e2:SetReset(RESET_EVENT+0x1fe0000)
e2:SetOperation(c1845204.desop)
tc:RegisterEffect(e2)
tc:RegisterEffect(e2,true)
tc:CompleteProcedure()
end
end
......
script/c22993208.lua
View file @ de83d390
......@@ -36,23 +36,25 @@ function c22993208.activate(e,tp,eg,ep,ev,re,r,rp)
if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetCode(EFFECT_DISABLE)
e1:SetReset(RESET_EVENT+0x1fe0000)
tc:RegisterEffect(e1)
tc:RegisterEffect(e1,true)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+0x1fe0000)
tc:RegisterEffect(e2)
tc:RegisterEffect(e2,true)
local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetRange(LOCATION_MZONE)
e3:SetCode(EVENT_PHASE+PHASE_END)
e3:SetOperation(c22993208.desop)
e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e3:SetReset(RESET_EVENT+0x1fe0000)
e3:SetCountLimit(1)
tc:RegisterEffect(e3)
tc:RegisterEffect(e3,true)
end
Duel.SpecialSummonComplete()
end
......
script/c23681456.lua
View file @ de83d390
......@@ -8,6 +8,10 @@ function c23681456.initial_effect(c)
e1:SetTarget(c23681456.target)
e1:SetOperation(c23681456.operation)
c:RegisterEffect(e1)
if not c23681456.global_check then
c23681456.global_check=true
c23681456.count=0
end
end
function c23681456.filter(c,e,tp)
return c:IsSetCard(0x71) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
......@@ -23,30 +27,33 @@ function c23681456.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c23681456.filter,tp,LOCATION_HAND,0,1,ft,nil,e,tp)
if g:GetCount()>0 then
c23681456.count=c23681456.count+1
local tc=g:GetFirst()
local id=c23681456.count*100000000+23681456
while tc do
Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)
tc:RegisterFlagEffect(23681456,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
tc:RegisterFlagEffect(id,RESET_EVENT+0x1fe0000,0,1)
tc=g:GetNext()
end
Duel.SpecialSummonComplete()
g:KeepAlive()
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetCountLimit(1)
e1:SetLabelObject(g)
e1:SetLabel(id)
e1:SetOperation(c23681456.retop)
e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
end
function c23681456.retfilter(c)
return c:GetFlagEffect(23681456)>0
function c23681456.retfilter(c,id)
return c:GetFlagEffect(id)>0
end
function c23681456.retop(e,tp,eg,ep,ev,re,r,rp)
local g=e:GetLabelObject()
local tg=g:Filter(c23681456.retfilter,nil)
g:DeleteGroup()
Duel.SendtoDeck(tg,nil,2,REASON_EFFECT)
local id=e:GetLabel()
local g=Duel.GetMatchingGroup(c23681456.retfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil,id)
if g:GetCount()>0 then
Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
else
e:Reset()
end
end
script/c31386180.lua
View file @ de83d390
......@@ -53,7 +53,7 @@ end
function c31386180.desop(e,tp,eg,ep,ev,re,r,rp)
if e:GetHandler():GetOverlayCount()==0 then return end
local tc=Duel.GetFirstTarget()
if tc and tc:IsRelateToEffect(e) then
if tc and tc:IsRelateToEffect(e) and tc:IsControler(1-tp) then
Duel.Destroy(tc,REASON_EFFECT)
end
end
......
script/c34680482.lua
View file @ de83d390
......@@ -55,7 +55,6 @@ function c34680482.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if tc then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
tc:RegisterFlagEffect(34680482,RESET_EVENT+0x1fe0000,0,1)
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
......@@ -64,22 +63,21 @@ function c34680482.spop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e1)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetRange(LOCATION_MZONE)
e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e2:SetCode(EVENT_PHASE+PHASE_END)
e2:SetLabel(Duel.GetTurnCount())
e2:SetLabelObject(tc)
e2:SetCondition(c34680482.tdcon)
e2:SetOperation(c34680482.tdop)
e2:SetReset(RESET_PHASE+PHASE_END+RESET_SELF_TURN,2)
e2:SetReset(RESET_EVENT+0x1fe0000)
e2:SetCountLimit(1)
Duel.RegisterEffect(e2,tp)
tc:RegisterEffect(e2)
end
end
function c34680482.tdcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnCount()~=e:GetLabel() and Duel.GetTurnPlayer()==tp
return Duel.GetTurnCount()==e:GetLabel()+2
end
function c34680482.tdop(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject()
if tc:GetFlagEffect(34680482)>0 then
Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)
end
Duel.SendtoDeck(e:GetHandler(),nil,2,REASON_EFFECT)
e:Reset()
end
script/c48716527.lua
View file @ de83d390
......@@ -17,7 +17,6 @@ function c48716527.initial_effect(c)
--
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetCode(EVENT_PHASE+PHASE_END)
e3:SetCountLimit(1)
e3:SetRange(LOCATION_SZONE)
......
script/c61258740.lua
View file @ de83d390
......@@ -39,6 +39,6 @@ function c61258740.tgop(e,tp,eg,ep,ev,re,r,rp)
ct=ct+1
c:SetTurnCounter(ct)
if ct==3 then
Duel.SendtoGrave(c,REASON_EFFECT)
Duel.SendtoGrave(c,REASON_RULE)
end
end
script/c65450690.lua
View file @ de83d390
......@@ -32,8 +32,9 @@ function c65450690.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetCode(EFFECT_CANNOT_ATTACK)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e1:SetReset(RESET_EVENT+0x1fe0000)
tc:RegisterEffect(e1,true)
local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
......@@ -41,7 +42,7 @@ function c65450690.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetRange(LOCATION_MZONE)
e2:SetCode(EVENT_PHASE+PHASE_END)
e2:SetOperation(c65450690.desop)
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e2:SetReset(RESET_EVENT+0x1fe0000)
e2:SetCountLimit(1)
tc:RegisterEffect(e2,true)
end
......
script/c67173574.lua
View file @ de83d390
......@@ -64,7 +64,7 @@ function c67173574.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
end
function c67173574.filter(c)
return c:IsFaceup() and (c:GetAttack()>0 or not c:IsDisabled())
return c:IsFaceup() and c:GetAttack()>0
end
function c67173574.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c67173574.filter(chkc) end
......@@ -75,7 +75,7 @@ end
function c67173574.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() then
if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:GetAttack()>0 and tc:IsControler(1-tp) then
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL)
......
script/c72029628.lua
View file @ de83d390
......@@ -70,7 +70,7 @@ function c72029628.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetRange(LOCATION_MZONE)
e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetOperation(c72029628.desop)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e1:SetReset(RESET_EVENT+0x1fe0000)
e1:SetCountLimit(1)
tc:RegisterEffect(e1)
end
......
script/c7935043.lua
View file @ de83d390
......@@ -16,14 +16,14 @@ function c7935043.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_PHASE+PHASE_END)
e1:SetValue(1)
Duel.RegisterEffect(e1,tp)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
e1:SetTarget(c7935043.tg)
e1:SetTargetRange(LOCATION_MZONE,0)
e1:SetReset(RESET_PHASE+PHASE_END)
e1:SetValue(1)
Duel.RegisterEffect(e1,tp)
local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
e2:SetTarget(c7935043.tg)
e2:SetTargetRange(LOCATION_MZONE,0)
e2:SetReset(RESET_PHASE+PHASE_END)
e2:SetValue(1)
Duel.RegisterEffect(e2,tp)
end
function c7935043.tg(e,c)
return c:IsLevelBelow(3) and c:IsAttribute(ATTRIBUTE_WATER)
......
script/c85080444.lua
View file @ de83d390
......@@ -42,25 +42,21 @@ end
function c85080444.indcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()~=tp
end
function c85080444.filter(c)
function c85080444.tg(e,c)
return c:IsFaceup() and c:IsSetCard(0x97)
end
function c85080444.indop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetMatchingGroup(c85080444.filter,tp,LOCATION_MZONE,0,nil)
local tc=g:GetFirst()
while tc do
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetValue(c85080444.tgvalue)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1)
local e2=e1:Clone()
e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
tc:RegisterEffect(e2)
tc=g:GetNext()
end
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
e1:SetTarget(c85080444.tg)
e1:SetTargetRange(LOCATION_MZONE,0)
e1:SetReset(RESET_PHASE+PHASE_END)
e1:SetValue(c85080444.tgvalue)
Duel.RegisterEffect(e1,tp)
local e2=e1:Clone()
e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
Duel.RegisterEffect(e2,tp)
end
function c85080444.tgvalue(e,re,rp)
return rp~=e:GetHandlerPlayer()
......
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