Skip to content

Y
ygopro-scripts
Commit 4efbe792 authored by DailyShana's avatar DailyShana
Browse files
Options

fix 

effect only disable monster effect do not remove TYPE_TRAPMONSTER
parent 9c71d738
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 82 deletions
c10045474.lua
View file @ 4efbe792
...@@ -26,8 +26,7 @@ end ...@@ -26,8 +26,7 @@ end
function c10045474.activate(e,tp,eg,ep,ev,re,r,rp) function c10045474.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:IsFaceup() and not tc:IsDisabled()) or tc:IsType(TYPE_TRAPMONSTER)) if tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) 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)
...@@ -40,14 +39,6 @@ function c10045474.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,14 +39,6 @@ function c10045474.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetValue(RESET_TURN_SET) e2:SetValue(RESET_TURN_SET)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
if tc:IsType(TYPE_TRAPMONSTER) then
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3)
end
if not c:IsStatus(STATUS_ACT_FROM_HAND) and c:IsLocation(LOCATION_SZONE) then if not c:IsStatus(STATUS_ACT_FROM_HAND) and c:IsLocation(LOCATION_SZONE) then
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_FIELD) e4:SetType(EFFECT_TYPE_FIELD)
......
c12219047.lua
View file @ 4efbe792
...@@ -63,13 +63,6 @@ function c12219047.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,13 +63,6 @@ function c12219047.operation(e,tp,eg,ep,ev,re,r,rp)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
e3:SetValue(0) e3:SetValue(0)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
if tc:IsType(TYPE_TRAPMONSTER) then
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e4)
end
end end
end end
function c12219047.condition2(e,tp,eg,ep,ev,re,r,rp) function c12219047.condition2(e,tp,eg,ep,ev,re,r,rp)
......
c12615446.lua
View file @ 4efbe792
...@@ -57,13 +57,6 @@ function c12615446.posop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,13 +57,6 @@ function c12615446.posop(e,tp,eg,ep,ev,re,r,rp)
e2:SetValue(RESET_TURN_SET) e2:SetValue(RESET_TURN_SET)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
if tc:IsType(TYPE_TRAPMONSTER) then
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3)
end
end end
end end
function c12615446.xyzcon(e,tp,eg,ep,ev,re,r,rp) function c12615446.xyzcon(e,tp,eg,ep,ev,re,r,rp)
......
c15844566.lua
View file @ 4efbe792
...@@ -37,7 +37,7 @@ end ...@@ -37,7 +37,7 @@ end
function c15844566.disop(e,tp,eg,ep,ev,re,r,rp) function c15844566.disop(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 not tc:IsDisabled()) or tc:IsType(TYPE_TRAPMONSTER)) and tc:IsRelateToEffect(e) then if tc:IsFaceup() and tc:IsRelateToEffect(e) 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)
...@@ -52,14 +52,6 @@ function c15844566.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,14 +52,6 @@ function c15844566.disop(e,tp,eg,ep,ev,re,r,rp)
e2:SetValue(RESET_TURN_SET) e2:SetValue(RESET_TURN_SET)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
if tc:IsType(TYPE_TRAPMONSTER) then
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3)
end
end end
end end
function c15844566.atkcon(e,tp,eg,ep,ev,re,r,rp) function c15844566.atkcon(e,tp,eg,ep,ev,re,r,rp)
......
c43436049.lua
View file @ 4efbe792
...@@ -47,13 +47,6 @@ function c43436049.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,13 +47,6 @@ function c43436049.operation(e,tp,eg,ep,ev,re,r,rp)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
if tc:IsType(TYPE_TRAPMONSTER) then
local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3)
end
tc=g:GetNext() tc=g:GetNext()
end end
end end
c51570882.lua
View file @ 4efbe792
...@@ -69,13 +69,6 @@ function c51570882.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -69,13 +69,6 @@ function c51570882.disop(e,tp,eg,ep,ev,re,r,rp)
e3:SetValue(RESET_TURN_SET) e3:SetValue(RESET_TURN_SET)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
if tc:IsType(TYPE_TRAPMONSTER) then
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e4)
end
end end
end end
function c51570882.spcon(e,tp,eg,ep,ev,re,r,rp) function c51570882.spcon(e,tp,eg,ep,ev,re,r,rp)
......
c58074177.lua
View file @ 4efbe792
...@@ -96,13 +96,6 @@ function c58074177.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -96,13 +96,6 @@ function c58074177.disop(e,tp,eg,ep,ev,re,r,rp)
e3:SetValue(RESET_TURN_SET) e3:SetValue(RESET_TURN_SET)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
if tc:IsType(TYPE_TRAPMONSTER) then
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e4)
end
end end
end end
function c58074177.descon(e,tp,eg,ep,ev,re,r,rp) function c58074177.descon(e,tp,eg,ep,ev,re,r,rp)
......
c69868555.lua
View file @ 4efbe792
...@@ -71,13 +71,6 @@ function c69868555.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,13 +71,6 @@ function c69868555.disop(e,tp,eg,ep,ev,re,r,rp)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
if tc:IsType(TYPE_TRAPMONSTER) then
local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3)
end
tc=g:GetNext() tc=g:GetNext()
end end
end end
......
c90036274.lua
View file @ 4efbe792
...@@ -101,13 +101,6 @@ function c90036274.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -101,13 +101,6 @@ function c90036274.disop(e,tp,eg,ep,ev,re,r,rp)
e3:SetValue(RESET_TURN_SET) e3:SetValue(RESET_TURN_SET)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
if tc:IsType(TYPE_TRAPMONSTER) then
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e4)
end
end end
end end
function c90036274.pencon(e,tp,eg,ep,ev,re,r,rp) function c90036274.pencon(e,tp,eg,ep,ev,re,r,rp)
......
c93356623.lua
View file @ 4efbe792
...@@ -54,12 +54,5 @@ function c93356623.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -54,12 +54,5 @@ function c93356623.activate(e,tp,eg,ep,ev,re,r,rp)
e3:SetValue(RESET_TURN_SET) e3:SetValue(RESET_TURN_SET)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
if tc:IsType(TYPE_TRAPMONSTER) then
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e4)
end
end end
end end
c99185129.lua
View file @ 4efbe792
...@@ -88,12 +88,5 @@ function c99185129.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,12 +88,5 @@ function c99185129.operation(e,tp,eg,ep,ev,re,r,rp)
e3:SetValue(RESET_TURN_SET) e3:SetValue(RESET_TURN_SET)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
if tc:IsType(TYPE_TRAPMONSTER) then
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e4)
end
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