Commit 1e30b6be authored by Nemo Ma's avatar Nemo Ma

fix

parent d27a29b1
...@@ -25,7 +25,7 @@ function cm.initial_effect(c) ...@@ -25,7 +25,7 @@ function cm.initial_effect(c)
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCode(EVENT_SPSUMMON_SUCCESS)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,m+1) e2:SetCountLimit(1,9919001)
e2:SetCondition(cm.spcon2) e2:SetCondition(cm.spcon2)
e2:SetTarget(cm.eqtg) e2:SetTarget(cm.eqtg)
e2:SetOperation(cm.eqop) e2:SetOperation(cm.eqop)
...@@ -37,7 +37,7 @@ function cm.initial_effect(c) ...@@ -37,7 +37,7 @@ function cm.initial_effect(c)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_TO_GRAVE) e3:SetCode(EVENT_TO_GRAVE)
e3:SetCountLimit(1,m) e3:SetCountLimit(1,9919002)
e3:SetCondition(cm.thcon) e3:SetCondition(cm.thcon)
e3:SetTarget(cm.thtg) e3:SetTarget(cm.thtg)
e3:SetOperation(cm.thop) e3:SetOperation(cm.thop)
...@@ -64,7 +64,7 @@ function cm.ssop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,7 +64,7 @@ function cm.ssop(e,tp,eg,ep,ev,re,r,rp)
end end
function cm.spcon2(e,tp,eg,ep,ev,re,r,rp) function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return re and cm.AShapeShifter(re) return re and cm.AShapeShifter(re:GetHandler())
end end
function cm.eqfilter(c) function cm.eqfilter(c)
return c:IsRace(RACE_PSYCHO) and c:IsAttribute(ATTRIBUTE_DARK) and not c:IsForbidden() return c:IsRace(RACE_PSYCHO) and c:IsAttribute(ATTRIBUTE_DARK) and not c:IsForbidden()
......
...@@ -69,16 +69,15 @@ function c40008621.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -69,16 +69,15 @@ function c40008621.spop2(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c40008621.condition(e,tp,eg,ep,ev,re,r,rp) function c40008621.condition(e,tp,eg,ep,ev,re,r,rp)
return (re:IsHasType(EFFECT_TYPE_ACTIVATE) or re:IsActiveType(TYPE_MONSTER)) local c=e:GetHandler()
and re:GetHandler()~=e:GetHandler() and re:GetHandler():IsLocation(LOCATION_ONFIELD) and Duel.IsChainNegatable(ev) return not c:IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev) and re:GetHandler()~=c
and bit.band(Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION),LOCATION_ONFIELD)~=0
end end
function c40008621.condition2(e,tp,eg,ep,ev,re,r,rp) function c40008621.condition2(e,tp,eg,ep,ev,re,r,rp)
if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end
if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end
local g=Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS) local tg=Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS)
if not g or g:GetCount()~=1 then return false end return tg and tg:IsExists(Card.IsOnField,1,nil) and Duel.IsChainNegatable(ev)
local tc=g:GetFirst()
local c=e:GetHandler()
return not c:IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev)
end end
function c40008621.target(e,tp,eg,ep,ev,re,r,rp,chk) function c40008621.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -2,6 +2,7 @@ local m=7409000 ...@@ -2,6 +2,7 @@ local m=7409000
local cm=_G["c"..m] local cm=_G["c"..m]
cm.name="真爆裂模式" cm.name="真爆裂模式"
function cm.initial_effect(c) function cm.initial_effect(c)
aux.EnableExtraDeckSummonCountLimit()
aux.AddCodeList(c,80280737) aux.AddCodeList(c,80280737)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
......
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