Commit ae99bb67 authored by mercury233's avatar mercury233

rename

parent 209c6457
......@@ -17,7 +17,7 @@ function s.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e2:SetCode(EFFECT_TREAT_AS_2_XMATERIAL)
e2:SetCode(EFFECT_DOUBLE_XMATERIAL)
e2:SetRange(LOCATION_MZONE)
e2:SetTarget(s.sxyzfilter)
e2:SetValue(id)
......
......@@ -18,7 +18,7 @@ function s.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e2:SetCode(EFFECT_TREAT_AS_2_XMATERIAL)
e2:SetCode(EFFECT_DOUBLE_XMATERIAL)
e2:SetRange(LOCATION_MZONE)
e2:SetTarget(s.sxyzfilter)
e2:SetValue(id)
......
......@@ -609,7 +609,7 @@ EFFECT_REPLACE_DAMAGE =371 --伤害由特定行动代替
EFFECT_XYZ_MIN_COUNT =372 --只能用在X只以上的超量召唤
EFFECT_SYNCHRO_LEVEL_EX =373 --支持使用没有等级的怪兽作为同调素材
EFFECT_RITUAL_LEVEL_EX =374 --支持使用没有等级的怪兽作为仪式素材
EFFECT_TREAT_AS_2_XMATERIAL =375 --需3只以上作素材的超量怪兽时可以作为2只数量
EFFECT_DOUBLE_XMATERIAL =375 --召唤需3只以上作素材的超量怪兽时可以作为2只数量的素材
EFFECT_FLAG_EFFECT =0x20000000 --标记类效果,即RegisterFlagEffect()创建的效果
--下面是诱发效果的诱发事件、时点 (如果是TYPE_SINGLE则自己发生以下事件后触发,如果TYPE_FIELD则场上任何卡发生以下事件都触发)
......
......@@ -479,7 +479,7 @@ function Auxiliary.Xyz2XMaterialFilter(c,xyzc,lv,f)
end
function Auxiliary.Xyz2XMaterialEffectFilter(c,xyzc,lv,f,tp,checked)
if not checked and not Auxiliary.Xyz2XMaterialFilter(c,xyzc,lv,f) then return false end
local e=c:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
local e=c:IsHasEffect(EFFECT_DOUBLE_XMATERIAL,tp)
if not e then return false end
local tg=e:GetTarget()
if tg and not tg(e,xyzc) then return false end
......@@ -496,7 +496,7 @@ function Auxiliary.Xyz2XMaterialGoal(g,tp,xyzc,minc)
local ct2=0
local limit_table={}
for c in Auxiliary.Next(g) do
local le=c:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
local le=c:IsHasEffect(EFFECT_DOUBLE_XMATERIAL,tp)
if le and not limit_table[le:GetValue()] then -- not fully implemented: assuming Hard once per turn effects
local tg=le:GetTarget()
if not tg or tg(le,xyzc) then
......@@ -626,14 +626,14 @@ function Auxiliary.Xyz2XMaterialOperation(tp,mg,xyzc,minct,maxct)
g=g:Select(tp,1,1,nil)
end
local tc=g:GetFirst()
local te=tc:IsHasEffect(EFFECT_TREAT_AS_2_XMATERIAL,tp)
local te=tc:IsHasEffect(EFFECT_DOUBLE_XMATERIAL,tp)
Duel.Hint(HINT_CARD,0,tc:GetCode())
te:UseCountLimit(tp)
sg:RemoveCard(tc)
minct=minct-2
end
end
---Xyz monster, any condition
---Xyz monster, any condition(level free)
---@param c Card
---@param f function|nil
---@param gf function|nil
......@@ -655,7 +655,7 @@ function Auxiliary.AddXyzProcedureLevelFree(c,f,gf,minc,maxc,alterf,alterdesc,al
e1:SetValue(SUMMON_TYPE_XYZ)
c:RegisterEffect(e1)
end
--Xyz Summon(level free)
-- not fully implemented: EFFECT_DOUBLE_XMATERIAL is not supported
function Auxiliary.XyzLevelFreeFilter(c,xyzc,f)
return (not c:IsOnField() or c:IsFaceup()) and c:IsCanBeXyzMaterial(xyzc) and (not f or f(c,xyzc))
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