Skip to content

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

Merge pull request #676 from salix5/patch 

fix
parents 36183223 0deb045c
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 58 deletions
script/c1005587.lua
View file @ 20309d99
...@@ -31,12 +31,14 @@ function c1005587.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -31,12 +31,14 @@ function c1005587.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
tc=g:Select(tp,1,1,nil):GetFirst() tc=g:Select(tp,1,1,nil):GetFirst()
end end
local e1=Effect.CreateEffect(e:GetHandler()) if not tc:IsDisabled() then
e1:SetType(EFFECT_TYPE_SINGLE) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetCode(EFFECT_DISABLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetCode(EFFECT_DISABLE)
tc:RegisterEffect(e1) e1:SetReset(RESET_EVENT+0x1fe0000)
Duel.AdjustInstantly() tc:RegisterEffect(e1)
Duel.NegateRelatedChain(tc,RESET_TURN_SET) Duel.AdjustInstantly()
Duel.Destroy(tc,REASON_EFFECT) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
Duel.Destroy(tc,REASON_EFFECT)
end
end end
script/c1639384.lua
View file @ 20309d99
...@@ -33,22 +33,20 @@ function c1639384.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -33,22 +33,20 @@ function c1639384.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) then if tc:IsFaceup() and tc:IsRelateToEffect(e) then
if not tc:IsDisabled() then Duel.NegateRelatedChain(tc,RESET_TURN_SET)
Duel.NegateRelatedChain(tc,RESET_TURN_SET) local e1=Effect.CreateEffect(c)
local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetCode(EFFECT_DISABLE) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END) tc:RegisterEffect(e1)
tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c)
local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET)
e2:SetValue(RESET_TURN_SET) e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END) tc:RegisterEffect(e2)
tc:RegisterEffect(e2)
end
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE) e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE)
......
script/c29616929.lua
View file @ 20309d99
...@@ -39,8 +39,11 @@ function c29616929.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -39,8 +39,11 @@ function c29616929.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function c29616929.activate(e,tp,eg,ep,ev,re,r,rp) function c29616929.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) local tc=re:GetHandler()
if re:GetHandler():IsRelateToEffect(re) then if not tc:IsDisabled() then
Duel.Destroy(eg,REASON_EFFECT) Duel.NegateEffect(ev)
if tc:IsRelateToEffect(re) then
Duel.Destroy(eg,REASON_EFFECT)
end
end end
end end
script/c42752141.lua
View file @ 20309d99
--エヴォルカイザー·ドルカ --エヴォルカイザー・ドルカ
function c42752141.initial_effect(c) function c42752141.initial_effect(c)
--xyz summon --xyz summon
aux.AddXyzProcedure(c,aux.XyzFilterFunctionF(c,aux.FilterBoolFunction(Card.IsRace,RACE_DINOSAUR),4),2) aux.AddXyzProcedure(c,aux.XyzFilterFunctionF(c,aux.FilterBoolFunction(Card.IsRace,RACE_DINOSAUR),4),2)
...@@ -28,13 +28,13 @@ end ...@@ -28,13 +28,13 @@ end
function c42752141.target(e,tp,eg,ep,ev,re,r,rp,chk) function c42752141.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then if re:GetHandler():IsDestructable() and (re:GetActivateLocation()==LOCATION_EXTRA or re:GetHandler():IsRelateToEffect(re)) then
Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
end end
end end
function c42752141.operation(e,tp,eg,ep,ev,re,r,rp) function c42752141.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateActivation(ev) Duel.NegateActivation(ev)
if re:GetHandler():IsRelateToEffect(re) then if re:GetActivateLocation()==LOCATION_EXTRA or re:GetHandler():IsRelateToEffect(re) then
Duel.Destroy(eg,REASON_EFFECT) Duel.Destroy(eg,REASON_EFFECT)
end end
end end
script/c49010598.lua
View file @ 20309d99
...@@ -21,13 +21,13 @@ end ...@@ -21,13 +21,13 @@ end
function c49010598.target(e,tp,eg,ep,ev,re,r,rp,chk) function c49010598.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then if re:GetHandler():IsDestructable() and (re:GetActivateLocation()==LOCATION_EXTRA or re:GetHandler():IsRelateToEffect(re)) then
Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
end end
end end
function c49010598.activate(e,tp,eg,ep,ev,re,r,rp) function c49010598.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateActivation(ev) Duel.NegateActivation(ev)
if re:GetHandler():IsRelateToEffect(re) then if re:GetActivateLocation()==LOCATION_EXTRA or re:GetHandler():IsRelateToEffect(re) then
Duel.Destroy(eg,REASON_EFFECT) Duel.Destroy(eg,REASON_EFFECT)
end end
end end
script/c56840427.lua
View file @ 20309d99
...@@ -28,10 +28,11 @@ function c56840427.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,10 +28,11 @@ function c56840427.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and c:IsFaceup() then if c:IsRelateToEffect(e) and c:IsFaceup() then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(500) e1:SetValue(500)
e1:SetReset(RESET_EVENT+0x1ff0000+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
c:RegisterEffect(e1) c:RegisterEffect(e1)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
local g=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil) local g=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil)
......
script/c58120309.lua
View file @ 20309d99
...@@ -24,16 +24,20 @@ end ...@@ -24,16 +24,20 @@ end
function c58120309.target(e,tp,eg,ep,ev,re,r,rp,chk) function c58120309.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DISABLE,eg,1,0,0)
if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then if re:GetHandler():IsDestructable() and (re:GetActivateLocation()==LOCATION_EXTRA or re:GetHandler():IsRelateToEffect(re)) then
Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
end end
end end
function c58120309.activate(e,tp,eg,ep,ev,re,r,rp) function c58120309.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) local tc=re:GetHandler()
if re:GetHandler():IsRelateToEffect(re) and Duel.Destroy(eg,REASON_EFFECT)~=0 then if not tc:IsDisabled() then
local sc=Duel.GetFirstMatchingCard(c58120309.sfilter,tp,LOCATION_EXTRA,0,nil,e,tp) Duel.NegateEffect(ev)
if sc and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(58120309,0)) then if (re:GetActivateLocation()==LOCATION_EXTRA or tc:IsRelateToEffect(re)) and Duel.Destroy(eg,REASON_EFFECT)~=0 then
Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP) local sc=Duel.GetFirstMatchingCard(c58120309.sfilter,tp,LOCATION_EXTRA,0,nil,e,tp)
if sc and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(58120309,0)) then
Duel.BreakEffect()
Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP)
end
end end
end end
end end
script/c68836428.lua
View file @ 20309d99
...@@ -46,7 +46,7 @@ function c68836428.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -46,7 +46,7 @@ function c68836428.cost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST) e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
end end
function c68836428.filter(c) function c68836428.filter(c)
return c:IsFaceup() return c:IsFaceup() and (c:IsType(TYPE_EFFECT) or c:GetAttack()>0)
end end
function c68836428.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c68836428.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c68836428.filter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and c68836428.filter(chkc) end
...@@ -58,23 +58,22 @@ function c68836428.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,23 +58,22 @@ function c68836428.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) then if tc:IsFaceup() and tc:IsRelateToEffect(e) then
if not tc:IsDisabled() then Duel.NegateRelatedChain(tc,RESET_TURN_SET)
Duel.NegateRelatedChain(tc,RESET_TURN_SET) local e1=Effect.CreateEffect(c)
local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetCode(EFFECT_DISABLE) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END) tc:RegisterEffect(e1)
tc:RegisterEffect(e1) local e2=Effect.CreateEffect(c)
local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetValue(RESET_TURN_SET)
e2:SetValue(RESET_TURN_SET) e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END)
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END) tc:RegisterEffect(e2)
tc:RegisterEffect(e2)
end
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_UPDATE_ATTACK) e3:SetCode(EFFECT_UPDATE_ATTACK)
e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
......
script/c78474168.lua
View file @ 20309d99
...@@ -36,7 +36,7 @@ end ...@@ -36,7 +36,7 @@ end
function c78474168.activate(e,tp,eg,ep,ev,re,r,rp) function c78474168.activate(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() then if tc:IsRelateToEffect(e) and tc:IsFaceup() and not tc:IsDisabled() then
Duel.NegateRelatedChain(tc,RESET_TURN_SET) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c82732705.lua
View file @ 20309d99
...@@ -17,7 +17,7 @@ function c82732705.initial_effect(c) ...@@ -17,7 +17,7 @@ function c82732705.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c82732705.disable(e,c) function c82732705.disable(e,c)
return c:IsType(TYPE_EFFECT) return c:IsType(TYPE_EFFECT) or bit.band(c:GetOriginalType(),TYPE_EFFECT)==TYPE_EFFECT
end end
function c82732705.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c82732705.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckLPCost(tp,1000) end if chk==0 then return Duel.CheckLPCost(tp,1000) end
......
script/c86686671.lua
View file @ 20309d99
...@@ -69,6 +69,7 @@ function c86686671.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -69,6 +69,7 @@ function c86686671.activate(e,tp,eg,ep,ev,re,r,rp)
if op~=0 then if op~=0 then
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
if op==2 then Duel.BreakEffect() end
Duel.SendtoDeck(tc,nil,2,REASON_EFFECT) Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)
end end
end 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