Commit 14320f47 authored by Amiya's avatar Amiya

修复

parent d648c8e0
No preview for this file type
...@@ -103,7 +103,7 @@ function s.codeop(e,tp,eg,ep,ev,re,r,rp) ...@@ -103,7 +103,7 @@ function s.codeop(e,tp,eg,ep,ev,re,r,rp)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CHANGE_CODE) e1:SetCode(EFFECT_CHANGE_CODE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
e1:SetValue(id+o) e1:SetValue(id+o)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
......
...@@ -64,7 +64,7 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,7 +64,7 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp)
return not eg:IsContains(e:GetHandler()) and eg:IsExists(s.cfilter,1,nil,tp) return not eg:IsContains(e:GetHandler()) and eg:IsExists(s.cfilter,1,nil,tp)
end end
function s.disfilter(c) function s.disfilter(c)
return aux.NegateEffectMonsterFilter(c) and not c:IsCode(101304116) return aux.NegateEffectMonsterFilter(c) or not c:IsCode(101304116)
end end
function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.disfilter(chkc) end if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.disfilter(chkc) end
...@@ -75,25 +75,29 @@ end ...@@ -75,25 +75,29 @@ end
function s.disop(e,tp,eg,ep,ev,re,r,rp) function s.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 tc:IsRelateToChain() and tc:IsCanBeDisabledByEffect(e) then if tc:IsFaceup() and tc:IsRelateToChain() then
Duel.NegateRelatedChain(tc,RESET_TURN_SET) if tc:IsCanBeDisabledByEffect(e) then
local e1=Effect.CreateEffect(c) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
e1:SetType(EFFECT_TYPE_SINGLE) local e1=Effect.CreateEffect(c)
e1:SetCode(EFFECT_DISABLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetCode(EFFECT_DISABLE)
tc:RegisterEffect(e1) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
local e2=Effect.CreateEffect(c) tc:RegisterEffect(e1)
e2:SetType(EFFECT_TYPE_SINGLE) local e2=Effect.CreateEffect(c)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetValue(RESET_TURN_SET) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+RESETS_STANDARD) e2:SetValue(RESET_TURN_SET)
tc:RegisterEffect(e2) e2:SetReset(RESET_EVENT+RESETS_STANDARD)
local e3=Effect.CreateEffect(c) tc:RegisterEffect(e2)
e3:SetType(EFFECT_TYPE_SINGLE) end
e3:SetCode(EFFECT_CHANGE_CODE) if not c:IsCode(101304116) then
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) local e3=Effect.CreateEffect(c)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetValue(101304116) e3:SetCode(EFFECT_CHANGE_CODE)
tc:RegisterEffect(e3) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetReset(RESET_EVENT+RESETS_STANDARD)
e3:SetValue(101304116)
tc:RegisterEffect(e3)
end
end end
end end
\ No newline at end of file
...@@ -48,7 +48,7 @@ function s.initial_effect(c) ...@@ -48,7 +48,7 @@ function s.initial_effect(c)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function s.mfilter(c,e,sp) function s.mfilter(c,e,sp)
return c:IsSetCard(0x2db) and c:IsFusionAttribute(ATTRIBUTE_LIGHT) return c:IsFusionSetCard(0x2db) and c:IsFusionAttribute(ATTRIBUTE_LIGHT)
end end
function s.descon(e,tp,eg,ep,ev,re,r,rp) function s.descon(e,tp,eg,ep,ev,re,r,rp)
return e:GetLabel()==1 and e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION) return e:GetLabel()==1 and e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
......
...@@ -37,7 +37,7 @@ function s.thfilter(c) ...@@ -37,7 +37,7 @@ function s.thfilter(c)
end end
function s.activate(e,tp,eg,ep,ev,re,r,rp) function s.activate(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK+LOCATION_REMOVED,0,nil) local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK+LOCATION_REMOVED,0,nil)
if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg=g:Select(tp,1,1,nil) local sg=g:Select(tp,1,1,nil)
Duel.SendtoHand(sg,nil,REASON_EFFECT) Duel.SendtoHand(sg,nil,REASON_EFFECT)
...@@ -48,7 +48,7 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,7 +48,7 @@ function s.discon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(Card.IsSummonPlayer,1,nil,1-tp) return eg:IsExists(Card.IsSummonPlayer,1,nil,1-tp)
end end
function s.disfilter(c) function s.disfilter(c)
return aux.NegateEffectMonsterFilter(c) and not c:IsCode(101304116) return aux.NegateEffectMonsterFilter(c) or not c:IsCode(101304116)
end end
function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.disfilter(chkc) end if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_MZONE) and s.disfilter(chkc) end
...@@ -59,25 +59,29 @@ end ...@@ -59,25 +59,29 @@ end
function s.disop(e,tp,eg,ep,ev,re,r,rp) function s.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 tc:IsRelateToChain() and tc:IsCanBeDisabledByEffect(e) then if tc:IsFaceup() and tc:IsRelateToChain() then
Duel.NegateRelatedChain(tc,RESET_TURN_SET) if tc:IsCanBeDisabledByEffect(e) then
local e1=Effect.CreateEffect(c) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
e1:SetType(EFFECT_TYPE_SINGLE) local e1=Effect.CreateEffect(c)
e1:SetCode(EFFECT_DISABLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetCode(EFFECT_DISABLE)
tc:RegisterEffect(e1) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
local e2=Effect.CreateEffect(c) tc:RegisterEffect(e1)
e2:SetType(EFFECT_TYPE_SINGLE) local e2=Effect.CreateEffect(c)
e2:SetCode(EFFECT_DISABLE_EFFECT) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetValue(RESET_TURN_SET) e2:SetCode(EFFECT_DISABLE_EFFECT)
e2:SetReset(RESET_EVENT+RESETS_STANDARD) e2:SetValue(RESET_TURN_SET)
tc:RegisterEffect(e2) e2:SetReset(RESET_EVENT+RESETS_STANDARD)
local e3=Effect.CreateEffect(c) tc:RegisterEffect(e2)
e3:SetType(EFFECT_TYPE_SINGLE) end
e3:SetCode(EFFECT_CHANGE_CODE) if not c:IsCode(101304116) then
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) local e3=Effect.CreateEffect(c)
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetValue(101304116) e3:SetCode(EFFECT_CHANGE_CODE)
tc:RegisterEffect(e3) e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e3:SetReset(RESET_EVENT+RESETS_STANDARD)
e3:SetValue(101304116)
tc:RegisterEffect(e3)
end
end end
end end
\ No newline at end of file
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