Commit e0c45a7c authored by salix5's avatar salix5

fix

parent e255830f
...@@ -55,7 +55,7 @@ function c11662742.dmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,7 +55,7 @@ function c11662742.dmop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetControler()~=ep then return end if c:GetControler()~=ep then return end
if bit.band(r,REASON_BATTLE)~=0 then if bit.band(r,REASON_BATTLE)~=0 then
c:RegisterFlagEffect(11662742,RESET_PHASE+RESET_DAMAGE,0,0) c:RegisterFlagEffect(11662742,RESET_PHASE+RESET_DAMAGE,0,1)
elseif Duel.GetCurrentPhase()==PHASE_DAMAGE and not Duel.IsDamageCalculated() then elseif Duel.GetCurrentPhase()==PHASE_DAMAGE and not Duel.IsDamageCalculated() then
c:RegisterFlagEffect(11662743,RESET_PHASE+RESET_DAMAGE,0,1) c:RegisterFlagEffect(11662743,RESET_PHASE+RESET_DAMAGE,0,1)
end end
......
...@@ -11,7 +11,7 @@ function c26920296.initial_effect(c) ...@@ -11,7 +11,7 @@ function c26920296.initial_effect(c)
e2:SetDescription(aux.Stringid(26920296,0)) e2:SetDescription(aux.Stringid(26920296,0))
e2:SetCategory(CATEGORY_DRAW) e2:SetCategory(CATEGORY_DRAW)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DELAY)
e2:SetCode(EVENT_TO_GRAVE) e2:SetCode(EVENT_TO_GRAVE)
e2:SetRange(LOCATION_FZONE) e2:SetRange(LOCATION_FZONE)
e2:SetCountLimit(1) e2:SetCountLimit(1)
...@@ -48,12 +48,12 @@ end ...@@ -48,12 +48,12 @@ end
function c26920296.cfilter(c,type) function c26920296.cfilter(c,type)
return c:IsFaceup() and c:IsType(type) return c:IsFaceup() and c:IsType(type)
end end
function c26920296.drcfilter(c) function c26920296.drcfilter(c,tp)
return c:IsPreviousLocation(LOCATION_HAND+LOCATION_MZONE) and c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT) return c:IsPreviousLocation(LOCATION_HAND+LOCATION_MZONE) and c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT) and c:GetPreviousControler()==tp
end end
function c26920296.drcon(e,tp,eg,ep,ev,re,r,rp) function c26920296.drcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c26920296.cfilter,tp,LOCATION_MZONE,0,1,nil,TYPE_FUSION) return Duel.IsExistingMatchingCard(c26920296.cfilter,tp,LOCATION_MZONE,0,1,nil,TYPE_FUSION)
and eg:IsExists(c26920296.drcfilter,1,nil) and eg:IsExists(c26920296.drcfilter,1,nil,tp)
end end
function c26920296.drtg(e,tp,eg,ep,ev,re,r,rp,chk) function c26920296.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
......
...@@ -2,26 +2,28 @@ ...@@ -2,26 +2,28 @@
function c44811425.initial_effect(c) function c44811425.initial_effect(c)
--flip --flip
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FLIP+EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e1:SetOperation(c44811425.flipop) e1:SetOperation(c44811425.flipop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--draw
local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(44811425,0))
e2:SetCategory(CATEGORY_DRAW)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e2:SetRange(LOCATION_MZONE)
e2:SetCountLimit(1)
e2:SetCode(EVENT_PHASE+PHASE_END)
e2:SetCondition(c44811425.drcon)
e2:SetTarget(c44811425.drtg)
e2:SetOperation(c44811425.drop)
c:RegisterEffect(e2)
end end
function c44811425.flipop(e,tp,eg,ep,ev,re,r,rp) function c44811425.flipop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() e:GetHandler():RegisterFlagEffect(44811425,RESET_EVENT+0x1fc0000,0,1)
if c:IsFaceup() and c:IsRelateToEffect(e) then end
local e1=Effect.CreateEffect(c) function c44811425.drcon(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(44811425,0)) return e:GetHandler():GetFlagEffect(44811425)~=0
e1:SetCategory(CATEGORY_DRAW)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1)
e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetTarget(c44811425.drtg)
e1:SetOperation(c44811425.drop)
e1:SetReset(RESET_EVENT+0x1fe0000)
c:RegisterEffect(e1)
end
end end
function c44811425.drtg(e,tp,eg,ep,ev,re,r,rp,chk) function c44811425.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c58551308.initial_effect(c) function c58551308.initial_effect(c)
--flip effect --flip effect
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e1:SetOperation(c58551308.flipop) e1:SetOperation(c58551308.flipop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--special summon --special summon
...@@ -19,7 +19,7 @@ end ...@@ -19,7 +19,7 @@ end
function c58551308.flipop(e,tp,eg,ep,ev,re,r,rp) function c58551308.flipop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) then if c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) then
c:RegisterFlagEffect(58551308,RESET_EVENT+0x57a0000,0,0) c:RegisterFlagEffect(58551308,RESET_EVENT+0x57a0000,0,1)
end end
end end
function c58551308.filter(c,e,tp) function c58551308.filter(c,e,tp)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c84932271.initial_effect(c) function c84932271.initial_effect(c)
--flip effect --flip effect
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e1:SetOperation(c84932271.flipop) e1:SetOperation(c84932271.flipop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--special summon --special summon
...@@ -19,7 +19,7 @@ end ...@@ -19,7 +19,7 @@ end
function c84932271.flipop(e,tp,eg,ep,ev,re,r,rp) function c84932271.flipop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) then if c:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) then
c:RegisterFlagEffect(84932271,RESET_EVENT+0x17a0000+RESET_PHASE+PHASE_END,0,0) c:RegisterFlagEffect(84932271,RESET_EVENT+0x17a0000+RESET_PHASE+PHASE_END,0,1)
end end
end end
function c84932271.spcon(e,tp,eg,ep,ev,re,r,rp) function c84932271.spcon(e,tp,eg,ep,ev,re,r,rp)
......
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