Commit d2d390d2 authored by DailyShana's avatar DailyShana Committed by GitHub

update ダーク・フュージョン and related cards (#1432)

parent 385ad82b
...@@ -18,7 +18,7 @@ function c12071500.filter1(c,e) ...@@ -18,7 +18,7 @@ function c12071500.filter1(c,e)
end end
function c12071500.filter2(c,e,tp,m,f,chkf) function c12071500.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and c.dark_calling and (not f or f(c)) return c:IsType(TYPE_FUSION) and c.dark_calling and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION+0x10,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,true,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function c12071500.filter3(c) function c12071500.filter3(c)
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
...@@ -70,11 +70,11 @@ function c12071500.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,11 +70,11 @@ function c12071500.activate(e,tp,eg,ep,ev,re,r,rp)
tc:SetMaterial(mat1) tc:SetMaterial(mat1)
Duel.Remove(mat1,POS_FACEUP,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION) Duel.Remove(mat1,POS_FACEUP,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
Duel.BreakEffect() Duel.BreakEffect()
Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION+0x10,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,true,false,POS_FACEUP)
else else
local mat2=Duel.SelectFusionMaterial(tp,tc,mg3,nil,chkf) local mat2=Duel.SelectFusionMaterial(tp,tc,mg3,nil,chkf)
local fop=ce:GetOperation() local fop=ce:GetOperation()
fop(ce,e,tp,tc,mat2,SUMMON_TYPE_FUSION+0x10) fop(ce,e,tp,tc,mat2,SUMMON_TYPE_FUSION)
end end
tc:CompleteProcedure() tc:CompleteProcedure()
end end
......
...@@ -35,7 +35,7 @@ end ...@@ -35,7 +35,7 @@ end
c13293158.material_setcode=0x8 c13293158.material_setcode=0x8
c13293158.dark_calling=true c13293158.dark_calling=true
function c13293158.splimit(e,se,sp,st) function c13293158.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c13293158.aclimit(e,re,tp) function c13293158.aclimit(e,re,tp)
......
...@@ -26,7 +26,7 @@ end ...@@ -26,7 +26,7 @@ end
c21947653.material_setcode=0x8 c21947653.material_setcode=0x8
c21947653.dark_calling=true c21947653.dark_calling=true
function c21947653.splimit(e,se,sp,st) function c21947653.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c21947653.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c21947653.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -31,7 +31,7 @@ end ...@@ -31,7 +31,7 @@ end
c22160245.material_setcode=0x8 c22160245.material_setcode=0x8
c22160245.dark_calling=true c22160245.dark_calling=true
function c22160245.splimit(e,se,sp,st) function c22160245.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c22160245.damtg(e,tp,eg,ep,ev,re,r,rp,chk) function c22160245.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -36,7 +36,7 @@ end ...@@ -36,7 +36,7 @@ end
c50282757.material_setcode=0x8 c50282757.material_setcode=0x8
c50282757.dark_calling=true c50282757.dark_calling=true
function c50282757.splimit(e,se,sp,st) function c50282757.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c50282757.condition(e,tp,eg,ep,ev,re,r,rp) function c50282757.condition(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -29,7 +29,7 @@ function c58332301.initial_effect(c) ...@@ -29,7 +29,7 @@ function c58332301.initial_effect(c)
end end
c58332301.dark_calling=true c58332301.dark_calling=true
function c58332301.splimit(e,se,sp,st) function c58332301.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c58332301.atkop(e,tp,eg,ep,ev,re,r,rp) function c58332301.atkop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -35,7 +35,7 @@ end ...@@ -35,7 +35,7 @@ end
c86165817.material_setcode=0x8 c86165817.material_setcode=0x8
c86165817.dark_calling=true c86165817.dark_calling=true
function c86165817.splimit(e,se,sp,st) function c86165817.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c86165817.matfilter(c) function c86165817.matfilter(c)
......
...@@ -36,7 +36,7 @@ end ...@@ -36,7 +36,7 @@ end
c86676862.material_setcode=0x8 c86676862.material_setcode=0x8
c86676862.dark_calling=true c86676862.dark_calling=true
function c86676862.splimit(e,se,sp,st) function c86676862.splimit(e,se,sp,st)
return st==SUMMON_TYPE_FUSION+0x10 return se:GetHandler():IsCode(94820406)
or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION or Duel.IsPlayerAffectedByEffect(sp,72043279) and st&SUMMON_TYPE_FUSION==SUMMON_TYPE_FUSION
end end
function c86676862.ffilter(c) function c86676862.ffilter(c)
......
...@@ -14,7 +14,7 @@ function c94820406.filter1(c,e) ...@@ -14,7 +14,7 @@ function c94820406.filter1(c,e)
end end
function c94820406.filter2(c,e,tp,m,f,chkf) function c94820406.filter2(c,e,tp,m,f,chkf)
return c:IsType(TYPE_FUSION) and c:IsRace(RACE_FIEND) and (not f or f(c)) return c:IsType(TYPE_FUSION) and c:IsRace(RACE_FIEND) and (not f or f(c))
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION+0x10,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 c94820406.target(e,tp,eg,ep,ev,re,r,rp,chk) function c94820406.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
...@@ -58,11 +58,11 @@ function c94820406.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,11 +58,11 @@ function c94820406.activate(e,tp,eg,ep,ev,re,r,rp)
tc:SetMaterial(mat1) tc:SetMaterial(mat1)
Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION) Duel.SendtoGrave(mat1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
Duel.BreakEffect() Duel.BreakEffect()
Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION+0x10,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
else else
local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf) local mat2=Duel.SelectFusionMaterial(tp,tc,mg2,nil,chkf)
local fop=ce:GetOperation() local fop=ce:GetOperation()
fop(ce,e,tp,tc,mat2,SUMMON_TYPE_FUSION+0x10) fop(ce,e,tp,tc,mat2,SUMMON_TYPE_FUSION)
end end
tc:CompleteProcedure() tc:CompleteProcedure()
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
......
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