Commit 0d4e8ee7 authored by salix5's avatar salix5

Merge pull request #1463 from DailyShana/patch-4

fix
parents e766642c ec9ba954
...@@ -15,7 +15,8 @@ function c15978426.initial_effect(c) ...@@ -15,7 +15,8 @@ function c15978426.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c15978426.filter(c,tohand) function c15978426.filter(c,tohand)
return c:IsSetCard(0x9f) and c:IsType(TYPE_MONSTER) and (c:IsAbleToGrave() or (tohand and c:IsAbleToHand())) return c:IsSetCard(0x9f) and not c:IsCode(15978426) and c:IsType(TYPE_MONSTER)
and (c:IsAbleToGrave() or (tohand and c:IsAbleToHand()))
end end
function c15978426.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) function c15978426.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
......
...@@ -20,7 +20,7 @@ function c41141943.initial_effect(c) ...@@ -20,7 +20,7 @@ function c41141943.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--special summon --special summon
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DRAW)
e3:SetType(EFFECT_TYPE_IGNITION) e3:SetType(EFFECT_TYPE_IGNITION)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetCountLimit(1,41141943) e3:SetCountLimit(1,41141943)
......
...@@ -27,10 +27,12 @@ function c48144509.filter2(c,e,tp,m,f,chkf) ...@@ -27,10 +27,12 @@ function c48144509.filter2(c,e,tp,m,f,chkf)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function c48144509.filter3(c,e,tp,m,f,chkf) function c48144509.filter3(c,e,tp,m,f,chkf)
local mg=m:Clone()
mg:RemoveCard(c)
if c:IsType(TYPE_FUSION) and c:IsRace(RACE_DRAGON) and (not f or f(c)) if c:IsType(TYPE_FUSION) and c:IsRace(RACE_DRAGON) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) then and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) then
if c.check_fusion_material_48144509 then return c.check_fusion_material_48144509(m,chkf) end if c.check_fusion_material_48144509 then return c.check_fusion_material_48144509(mg,chkf) end
return c:CheckFusionMaterial(m,nil,chkf) return c:CheckFusionMaterial(mg,nil,chkf)
else return false end else return false end
end end
function c48144509.target(e,tp,eg,ep,ev,re,r,rp,chk) function c48144509.target(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -78,6 +80,7 @@ function c48144509.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -78,6 +80,7 @@ function c48144509.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local tg=sg:Select(tp,1,1,nil) local tg=sg:Select(tp,1,1,nil)
local tc=tg:GetFirst() local tc=tg:GetFirst()
mg1:RemoveCard(tc)
if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then if sg1:IsContains(tc) and (sg2==nil or not sg2:IsContains(tc) or not Duel.SelectYesNo(tp,ce:GetDescription())) then
local mat1=nil local mat1=nil
if tc.select_fusion_material_48144509 then if tc.select_fusion_material_48144509 then
......
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