Commit d0066f54 authored by Nemo Ma's avatar Nemo Ma

fix

parent 4f336b25
...@@ -64,13 +64,13 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,13 +64,13 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,2) c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,2)
else else
e2:SetReset(RESET_PHASE+PHASE_BATTLE_START) e2:SetReset(RESET_PHASE+PHASE_BATTLE_START)
c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,1) c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,1,c:GetFieldID())
end end
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
end end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp) function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
e:Reset() e:Reset()
return false return false
else else
......
...@@ -70,7 +70,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,7 +70,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp) function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
e:Reset() e:Reset()
return false return false
else else
......
...@@ -79,7 +79,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,7 +79,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp) function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
e:Reset() e:Reset()
return false return false
else else
......
...@@ -103,7 +103,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -103,7 +103,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp) function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
e:Reset() e:Reset()
return false return false
else else
......
...@@ -65,7 +65,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,7 +65,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp) function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
e:Reset() e:Reset()
return false return false
else else
......
...@@ -66,7 +66,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,7 +66,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp) function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
e:Reset() e:Reset()
return false return false
else else
......
--lavafissure of dragon palace --lavafissure of dragon palace
--21.12.25 --21.12.25
local m=11451651 local cm,m=GetID()
local cm=_G["c"..m]
function cm.initial_effect(c) function cm.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -45,12 +44,12 @@ function cm.initial_effect(c) ...@@ -45,12 +44,12 @@ function cm.initial_effect(c)
Duel.RegisterEffect(ge2,0) Duel.RegisterEffect(ge2,0)
local ge3=ge2:Clone() local ge3=ge2:Clone()
ge3:SetCode(EVENT_CHAIN_NEGATED) ge3:SetCode(EVENT_CHAIN_NEGATED)
c:RegisterEffect(ge3,0) Duel.RegisterEffect(ge3,0)
local ge4=ge1:Clone() local ge4=ge1:Clone()
ge4:SetCode(EVENT_CHAIN_NEGATED) ge4:SetCode(EVENT_CHAIN_NEGATED)
ge4:SetCondition(cm.rscon) ge4:SetCondition(cm.rscon)
ge4:SetOperation(cm.reset) ge4:SetOperation(cm.reset)
c:RegisterEffect(ge4,0) Duel.RegisterEffect(ge4,0)
end end
end end
function cm.check(e,tp,eg,ep,ev,re,r,rp) function cm.check(e,tp,eg,ep,ev,re,r,rp)
......
--天球流转的羽之隙 --天球流转的羽之隙
local m=11451741 local cm,m=GetID()
local cm=_G["c"..m]
function cm.initial_effect(c) function cm.initial_effect(c)
--activate --activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -45,12 +44,12 @@ function cm.initial_effect(c) ...@@ -45,12 +44,12 @@ function cm.initial_effect(c)
Duel.RegisterEffect(ge2,0) Duel.RegisterEffect(ge2,0)
local ge3=ge2:Clone() local ge3=ge2:Clone()
ge3:SetCode(EVENT_CHAIN_NEGATED) ge3:SetCode(EVENT_CHAIN_NEGATED)
c:RegisterEffect(ge3,0) Duel.RegisterEffect(ge3,0)
local ge4=ge1:Clone() local ge4=ge1:Clone()
ge4:SetCode(EVENT_CHAIN_NEGATED) ge4:SetCode(EVENT_CHAIN_NEGATED)
ge4:SetCondition(cm.rscon) ge4:SetCondition(cm.rscon)
ge4:SetOperation(cm.reset) ge4:SetOperation(cm.reset)
c:RegisterEffect(ge4,0) Duel.RegisterEffect(ge4,0)
end end
end end
function cm.check(e,tp,eg,ep,ev,re,r,rp) function cm.check(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -48,7 +48,6 @@ function c117066828.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,7 +48,6 @@ function c117066828.operation(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject() local tc=e:GetLabelObject()
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:SetCategory(CATEGORY_ATKCHANGE)
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_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
...@@ -67,7 +66,6 @@ function c117066828.efop(e,tp,eg,ep,ev,re,r,rp) ...@@ -67,7 +66,6 @@ function c117066828.efop(e,tp,eg,ep,ev,re,r,rp)
local rc=c:GetReasonCard() local rc=c:GetReasonCard()
local e1=Effect.CreateEffect(rc) local e1=Effect.CreateEffect(rc)
e1:SetDescription(aux.Stringid(117066828,0)) e1:SetDescription(aux.Stringid(117066828,0))
e1:SetCategory(CATEGORY_ATKCHANGE)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCode(EVENT_SPSUMMON_SUCCESS)
e1:SetCondition(c117066828.atkcon) e1:SetCondition(c117066828.atkcon)
......
...@@ -11,7 +11,7 @@ function cm.initial_effect(c) ...@@ -11,7 +11,7 @@ function cm.initial_effect(c)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCode(EFFECT_CANNOT_TRIGGER) e1:SetCode(EFFECT_CANNOT_TRIGGER)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetTargetRange(0,LOCATION_MZONE) e1:SetTargetRange(0,LOCATION_MZONE+LOCATION_GRAVE)
e1:SetTarget(cm.actfilter) e1:SetTarget(cm.actfilter)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--atk change --atk change
......
...@@ -39,6 +39,7 @@ function c67200437.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,6 +39,7 @@ function c67200437.spop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.SelectMatchingCard(tp,c67200437.pfilter,tp,LOCATION_HAND,0,1,1,nil,tp) local g=Duel.SelectMatchingCard(tp,c67200437.pfilter,tp,LOCATION_HAND,0,1,1,nil,tp)
if g:GetCount()>0 then if g:GetCount()>0 then
if Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)~=0 then if Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)~=0 then
if g:GetFirst():AddCounter(0x671,2)~=0 then
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT) e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
...@@ -49,5 +50,6 @@ function c67200437.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,5 +50,6 @@ function c67200437.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
end end
end
end end
...@@ -73,7 +73,7 @@ function cm.gyfilter(c) ...@@ -73,7 +73,7 @@ function cm.gyfilter(c)
return c:IsRace(RACE_PSYCHO) and c:IsAbleToDeck() return c:IsRace(RACE_PSYCHO) and c:IsAbleToDeck()
end end
function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.gyfilter,tp,LOCATION_REMOVED,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(cm.gyfilter,tp,LOCATION_REMOVED,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.IsPlayerCanDraw(1-tp,1) end
Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_REMOVED) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_REMOVED)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
......
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