Commit 0c3fc674 authored by Huangnan's avatar Huangnan

Merge branch 'new-fusion-fix-shaddol' into 'master'

fix: shaddol fusion spell should only fusion shaddol

See merge request !205
parents 3c532fec 0d1fdc92
Pipeline #37217 failed with stages
in 4 minutes and 13 seconds
...@@ -8,7 +8,7 @@ function s.initial_effect(c) ...@@ -8,7 +8,7 @@ function s.initial_effect(c)
c:RegisterEffect(e0) c:RegisterEffect(e0)
--fusion summon --fusion summon
local e1=FusionSpell.CreateSummonEffect(c,{ local e1=FusionSpell.CreateSummonEffect(c,{
fuslimit=s.fuslimit, fusfilter=s.fusfilter,
pre_select_mat_location=LOCATION_MZONE|LOCATION_GRAVE, pre_select_mat_location=LOCATION_MZONE|LOCATION_GRAVE,
mat_operation_code_map={ mat_operation_code_map={
{ [LOCATION_REMOVED] = FusionSpell.FUSION_OPERATION_GRAVE }, { [LOCATION_REMOVED] = FusionSpell.FUSION_OPERATION_GRAVE },
...@@ -26,7 +26,7 @@ function s.initial_effect(c) ...@@ -26,7 +26,7 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.fuslimit(c) function s.fusfilter(c)
return c:IsSetCard(0x9d) return c:IsSetCard(0x9d)
end end
......
...@@ -3,7 +3,7 @@ local s,id,o=GetID() ...@@ -3,7 +3,7 @@ local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--Activate --Activate
local e1=FusionSpell.CreateSummonEffect(c,{ local e1=FusionSpell.CreateSummonEffect(c,{
fuslimit=s.fuslimit, fusfilter=s.fusfilter,
pre_select_mat_location=s.pre_select_mat_location, pre_select_mat_location=s.pre_select_mat_location,
}) })
e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON+CATEGORY_DECKDES) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON+CATEGORY_DECKDES)
...@@ -11,7 +11,7 @@ function s.initial_effect(c) ...@@ -11,7 +11,7 @@ function s.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.fuslimit(c) function s.fusfilter(c)
return c:IsSetCard(0x9d) return c:IsSetCard(0x9d)
end end
......
...@@ -19,7 +19,7 @@ function s.initial_effect(c) ...@@ -19,7 +19,7 @@ function s.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--spsummon --spsummon
local e3=FusionSpell.CreateSummonEffect(c,{ local e3=FusionSpell.CreateSummonEffect(c,{
fuslimit=s.fuslimit, fusfilter=s.fusfilter,
gc=s.gc gc=s.gc
}) })
e3:SetType(EFFECT_TYPE_IGNITION) e3:SetType(EFFECT_TYPE_IGNITION)
...@@ -63,7 +63,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -63,7 +63,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.fuslimit(c) function s.fusfilter(c)
return c:IsSetCard(0x9d) return c:IsSetCard(0x9d)
end end
......
...@@ -3,12 +3,13 @@ local s,id,o=GetID() ...@@ -3,12 +3,13 @@ local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--Activate --Activate
local e1=FusionSpell.CreateSummonEffect(c,{ local e1=FusionSpell.CreateSummonEffect(c,{
fuslimit=s.fuslimit, fusfilter=s.fusfilter,
}) })
e1:SetHintTiming(0,TIMING_END_PHASE) e1:SetHintTiming(0,TIMING_END_PHASE)
e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH) e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function s.fuslimit(c)
function s.fusfilter(c)
return c:IsSetCard(0x9d) return c:IsSetCard(0x9d)
end end
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