Skip to content

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

fix

parent 9278ea7f
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
script/c17390179.lua
View file @ abb66085
...@@ -6,8 +6,5 @@ function c17390179.initial_effect(c) ...@@ -6,8 +6,5 @@ function c17390179.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetOperation(c17390179.op)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c17390179.op(e,tp,eg,ep,ev,re,r,rp)
end
script/c64726269.lua
View file @ abb66085
...@@ -43,13 +43,8 @@ function c64726269.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,13 +43,8 @@ function c64726269.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
end end
<<<<<<< HEAD:script/c64726269.lua
function c64726269.effcon(e,tp,eg,ep,ev,re,r,rp) function c64726269.effcon(e,tp,eg,ep,ev,re,r,rp)
return r==REASON_XYZ and e:GetHandler():GetReasonCard():GetMaterial():IsExists(Card.IsLocation,3,nil,LOCATION_MZONE)
=======
function c64226269.effcon(e,tp,eg,ep,ev,re,r,rp)
return r==REASON_XYZ and e:GetHandler():GetReasonCard():GetMaterial():IsExists(Card.IsPreviousLocation,3,nil,LOCATION_MZONE) return r==REASON_XYZ and e:GetHandler():GetReasonCard():GetMaterial():IsExists(Card.IsPreviousLocation,3,nil,LOCATION_MZONE)
>>>>>>> fix:script/c64226269.lua
end end
function c64726269.effop(e,tp,eg,ep,ev,re,r,rp) function c64726269.effop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
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