Commit 06eefdb6 authored by Amiya's avatar Amiya

修复

parent 47f546a5
Pipeline #39378 passed with stages
in 1 minute and 49 seconds
...@@ -15,6 +15,7 @@ function s.initial_effect(c) ...@@ -15,6 +15,7 @@ function s.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_SUMMON_SUCCESS) e2:SetCode(EVENT_SUMMON_SUCCESS)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,id) e2:SetCountLimit(1,id)
e2:SetTarget(s.sptg) e2:SetTarget(s.sptg)
e2:SetOperation(s.spop) e2:SetOperation(s.spop)
...@@ -78,8 +79,7 @@ end ...@@ -78,8 +79,7 @@ end
function s.cfop(e,tp,eg,ep,ev,re,r,rp) function s.cfop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND) local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
if g:GetCount()>0 then if g:GetCount()>0 then
local cg=g:Filter(s.cffilter,nil) Duel.ConfirmCards(tp,g)
Duel.ConfirmCards(tp,cg)
Duel.ShuffleHand(1-tp) Duel.ShuffleHand(1-tp)
end end
end end
...@@ -19,13 +19,13 @@ function s.initial_effect(c) ...@@ -19,13 +19,13 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_SPSUMMON_SUCCESS) e2:SetCode(EVENT_CHAINING)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCondition(s.descon2) e2:SetCondition(s.descon2)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--double damage --double damage
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetType(EFFECT_TYPE_XMATERIAL)
e3:SetCode(EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE) e3:SetCode(EFFECT_CHANGE_INVOLVING_BATTLE_DAMAGE)
e3:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE)) e3:SetValue(aux.ChangeBattleDamage(1,DOUBLE_DAMAGE))
e3:SetCondition(s.dmcon) e3:SetCondition(s.dmcon)
...@@ -33,7 +33,8 @@ function s.initial_effect(c) ...@@ -33,7 +33,8 @@ function s.initial_effect(c)
Duel.AddCustomActivityCounter(id,ACTIVITY_CHAIN,s.chainfilter) Duel.AddCustomActivityCounter(id,ACTIVITY_CHAIN,s.chainfilter)
end end
function s.chainfilter(re,tp,cid) function s.chainfilter(re,tp,cid)
return not re:IsActiveType(TYPE_MONSTER) local loc=Duel.GetChainInfo(cid,CHAININFO_TRIGGERING_LOCATION)
return not (re:IsActiveType(TYPE_MONSTER) and loc&(LOCATION_HAND|LOCATION_GRAVE)>0)
end end
function s.descon1(e,tp,eg,ep,ev,re,r,rp) function s.descon1(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
......
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