Skip to content

Y
ygopro-scripts-888
Commit 7ae36bd8 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'upstream/master' into mc_master

parents f16704c1 2427e7f9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
c276357.lua
View file @ 7ae36bd8
...@@ -51,7 +51,7 @@ function c276357.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,7 +51,7 @@ function c276357.activate(e,tp,eg,ep,ev,re,r,rp)
end end
function c276357.filter(c,tp) function c276357.filter(c,tp)
return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP) return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
and c:IsControler(tp) and c:IsType(TYPE_SPIRIT) and c:IsControler(tp) and c:GetPreviousTypeOnField()&TYPE_SPIRIT>0
end end
function c276357.descon(e,tp,eg,ep,ev,re,r,rp) function c276357.descon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c276357.filter,1,nil,tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED) return eg:IsExists(c276357.filter,1,nil,tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
......
c79194594.lua
View file @ 7ae36bd8
...@@ -65,7 +65,7 @@ function c79194594.immop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,7 +65,7 @@ function c79194594.immop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetCode(EFFECT_IMMUNE_EFFECT)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
......
c8802510.lua
View file @ 7ae36bd8
...@@ -26,7 +26,7 @@ function c8802510.initial_effect(c) ...@@ -26,7 +26,7 @@ function c8802510.initial_effect(c)
end end
function c8802510.cfilter(c,tp) function c8802510.cfilter(c,tp)
return c:IsFaceup() and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousLocation(LOCATION_MZONE) return c:IsFaceup() and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousLocation(LOCATION_MZONE)
and bit.band(c:GetPreviousRaceOnField(),RACE_PSYCHO)~=0 and c:IsPreviousControler(tp) and bit.band(c:GetPreviousRaceOnField(),RACE_PSYCHO)~=0 and c:IsPreviousControler(tp) and c:IsRace(RACE_PSYCHO)
end 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)
......
c92394653.lua
View file @ 7ae36bd8
...@@ -29,7 +29,7 @@ end ...@@ -29,7 +29,7 @@ end
c92394653.has_text_type=TYPE_SPIRIT c92394653.has_text_type=TYPE_SPIRIT
function c92394653.filter(c,tp) function c92394653.filter(c,tp)
return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP) return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
and c:IsControler(tp) and c:IsType(TYPE_SPIRIT) and c:IsControler(tp) and c:GetPreviousTypeOnField()&TYPE_SPIRIT>0
end end
function c92394653.condition(e,tp,eg,ep,ev,re,r,rp) function c92394653.condition(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c92394653.filter,1,nil,tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED) return eg:IsExists(c92394653.filter,1,nil,tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
......
c93483212.lua
View file @ 7ae36bd8
...@@ -50,11 +50,11 @@ function c93483212.imop(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,11 +50,11 @@ function c93483212.imop(e,tp,eg,ep,ev,re,r,rp)
if c:IsFaceup() and c:IsRelateToEffect(e) then if c:IsFaceup() and c:IsRelateToEffect(e) then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetCode(EFFECT_IMMUNE_EFFECT)
e1:SetValue(c93483212.imfilter) e1:SetValue(c93483212.imfilter)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
c:RegisterEffect(e1) c:RegisterEffect(e1)
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