add fusion attribute

5485784e · DailyShana · 75cb4af5 · 5485784e · 5485784e · 5485784e
Commit 5485784e authored Nov 15, 2016 by DailyShana
28 changed files
--- a/c12307878.lua
+++ b/c12307878.lua
@@ -2,7 +2,7 @@
 function c12307878.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_FIRE),1,true,true)
+	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_FIRE),1,true,true)
 	--atk
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

--- a/c13529466.lua
+++ b/c13529466.lua
@@ -2,7 +2,7 @@
 function c13529466.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),1,true,true)
+	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),1,true,true)
 	--activate limit
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)

--- a/c16304628.lua
+++ b/c16304628.lua
@@ -2,7 +2,7 @@
 function c16304628.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_EARTH),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_EARTH),true)
 	--atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(16304628,0))

--- a/c19261966.lua
+++ b/c19261966.lua
@@ -41,7 +41,7 @@ function c19261966.ffilter1(c)
 	return c:IsFusionSetCard(0x9d)
 end
 function c19261966.ffilter2(c)
-	return c:IsAttribute(ATTRIBUTE_WATER) or c:IsHasEffect(4904633)
+	return c:IsFusionAttribute(ATTRIBUTE_WATER) or c:IsHasEffect(4904633)
 end
 function c19261966.exfilter(c,g)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)

--- a/c1945387.lua
+++ b/c1945387.lua
@@ -2,7 +2,7 @@
 function c1945387.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_FIRE),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_FIRE),true)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

--- a/c20366274.lua
+++ b/c20366274.lua
@@ -52,7 +52,7 @@ function c20366274.ffilter1(c)
 	return c:IsFusionSetCard(0x9d)
 end
 function c20366274.ffilter2(c)
-	return c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsHasEffect(4904633)
+	return c:IsFusionAttribute(ATTRIBUTE_LIGHT) or c:IsHasEffect(4904633)
 end
 function c20366274.exfilter(c,g)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)

--- a/c22061412.lua
+++ b/c22061412.lua
@@ -2,7 +2,7 @@
 function c22061412.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_LIGHT),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_LIGHT),true)
 	--tohand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(22061412,0))

--- a/c25586143.lua
+++ b/c25586143.lua
@@ -2,7 +2,7 @@
 function c25586143.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x10f3),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x10f3),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),true)
 	--remove
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(25586143,0))

--- a/c30757127.lua
+++ b/c30757127.lua
@@ -20,7 +20,7 @@ function c30757127.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c30757127.ffilter(c)
-	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsType(TYPE_EFFECT)
+	return c:IsFusionAttribute(ATTRIBUTE_DARK) and c:IsType(TYPE_EFFECT)
 end
 function c30757127.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()

--- a/c3113836.lua
+++ b/c3113836.lua
@@ -2,7 +2,7 @@
 function c3113836.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x1047),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_LIGHT),false)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x1047),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_LIGHT),false)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

--- a/c33574806.lua
+++ b/c33574806.lua
@@ -2,7 +2,7 @@
 function c33574806.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_DARK),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_DARK),true)
 	--spsummon condition
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)

--- a/c3642509.lua
+++ b/c3642509.lua
@@ -2,7 +2,7 @@
 function c3642509.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_WIND),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x3008),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_WIND),true)
 	--atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(3642509,0))

--- a/c40854197.lua
+++ b/c40854197.lua
@@ -2,7 +2,7 @@
 function c40854197.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x8),aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER),true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x8),aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_WATER),true)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

--- a/c41209827.lua
+++ b/c41209827.lua
@@ -38,7 +38,7 @@ function c41209827.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c41209827.ffilter(c)
-	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsLocation(LOCATION_MZONE) and not c:IsType(TYPE_TOKEN)
+	return c:IsFusionAttribute(ATTRIBUTE_DARK) and c:IsLocation(LOCATION_MZONE) and not c:IsType(TYPE_TOKEN)
 end
 function c41209827.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION

--- a/c48424886.lua
+++ b/c48424886.lua
@@ -44,7 +44,7 @@ function c48424886.ffilter1(c)
 	return c:IsFusionSetCard(0x9d)
 end
 function c48424886.ffilter2(c)
-	return c:IsAttribute(ATTRIBUTE_FIRE) or c:IsHasEffect(4904633)
+	return c:IsFusionAttribute(ATTRIBUTE_FIRE) or c:IsHasEffect(4904633)
 end
 function c48424886.exfilter(c,g)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)

--- a/c48791583.lua
+++ b/c48791583.lua
@@ -2,5 +2,5 @@
 function c48791583.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_EARTH),1,true,true)
+	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_EARTH),1,true,true)
 end
--- a/c49513164.lua
+++ b/c49513164.lua
@@ -2,7 +2,7 @@
 function c49513164.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_WIND),1,true,true)
+	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_WIND),1,true,true)
 	--position
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(49513164,0))

--- a/c51570882.lua
+++ b/c51570882.lua
@@ -33,7 +33,7 @@ function c51570882.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c51570882.ffilter2(c)
-	return c:GetOriginalLevel()>=8 and c:IsAttribute(ATTRIBUTE_DARK)
+	return c:GetOriginalLevel()>=8 and c:IsFusionAttribute(ATTRIBUTE_DARK)
 end
 function c51570882.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)

--- a/c59255742.lua
+++ b/c59255742.lua
@@ -43,7 +43,7 @@ function c59255742.initial_effect(c)
 end
 c59255742.miracle_synchro_fusion=true
 function c59255742.ffilter(c)
-	return c:IsAttribute(ATTRIBUTE_EARTH) and c:IsRace(RACE_WARRIOR) and c:IsType(TYPE_SYNCHRO)
+	return c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsRace(RACE_WARRIOR) and c:IsType(TYPE_SYNCHRO)
 end
 function c59255742.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

--- a/c72378329.lua
+++ b/c72378329.lua
@@ -37,7 +37,7 @@ function c72378329.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c72378329.ffilter(c)
-	return c:IsRace(RACE_DRAGON) and c:IsAttribute(ATTRIBUTE_DARK)
+	return c:IsRace(RACE_DRAGON) and c:IsFusionAttribute(ATTRIBUTE_DARK)
 end
 function c72378329.splimit(e,se,sp,st)
 	return bit.band(st,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION

--- a/c74009824.lua
+++ b/c74009824.lua
@@ -43,7 +43,7 @@ function c74009824.ffilter1(c)
 	return c:IsFusionSetCard(0x9d)
 end
 function c74009824.ffilter2(c)
-	return c:IsAttribute(ATTRIBUTE_WIND) or c:IsHasEffect(4904633)
+	return c:IsFusionAttribute(ATTRIBUTE_WIND) or c:IsHasEffect(4904633)
 end
 function c74009824.exfilter(c,g)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)

--- a/c74822425.lua
+++ b/c74822425.lua
@@ -45,7 +45,7 @@ function c74822425.ffilter1(c)
 	return c:IsFusionSetCard(0x9d)
 end
 function c74822425.ffilter2(c)
-	return c:IsAttribute(ATTRIBUTE_EARTH) or c:IsHasEffect(4904633)
+	return c:IsFusionAttribute(ATTRIBUTE_EARTH) or c:IsHasEffect(4904633)
 end
 function c74822425.exfilter(c,g)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)

--- a/c75286621.lua
+++ b/c75286621.lua
@@ -2,7 +2,7 @@
 function c75286621.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_LIGHT),1,true,true)
+	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_LIGHT),1,true,true)
 	--negate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(75286621,0))

--- a/c85908279.lua
+++ b/c85908279.lua
@@ -2,7 +2,7 @@
 function c85908279.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsAttribute,ATTRIBUTE_WATER),1,true,true)
+	aux.AddFusionProcCodeFun(c,86120751,aux.FilterBoolFunction(Card.IsFusionAttribute,ATTRIBUTE_WATER),1,true,true)
 	--cannot target
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)

--- a/c89181134.lua
+++ b/c89181134.lua
 --捕食植物サンデウ・キンジー
--The 'EFFECT_CHANGE_FUSION_ATTRIBUTE' effect is temporary
 function c89181134.initial_effect(c)
 	--fusattribute
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
-	if EFFECT_CHANGE_FUSION_ATTRIBUTE then
-		e1:SetCode(EFFECT_CHANGE_FUSION_ATTRIBUTE)
-	else
-		e1:SetCode(EFFECT_CHANGE_ATTRIBUTE)
-	end
-	e1:SetValue(ATTRIBUTE_DARK)
+	e1:SetCode(EFFECT_CHANGE_FUSION_ATTRIBUTE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetTarget(c89181134.attrtg)
+	e1:SetValue(c89181134.attrval)
 	c:RegisterEffect(e1)
 	--fusion summon
 	local e2=Effect.CreateEffect(c)
@@ -28,6 +23,11 @@ end
 function c89181134.attrtg(e,c)
 	return c:GetCounter(0x1041)>0
 end
+function c89181134.attrval(e,c,rp)
+	if rp==e:GetHandlerPlayer() then
+		return ATTRIBUTE_DARK
+	else return c:GetAttribute() end
+end
 function c89181134.filter0(c,tp)
 	return c:IsCanBeFusionMaterial() and (c:IsControler(tp) or (c:IsFaceup() and c:GetCounter(0x1041)>0))
 end

--- a/c90555947.lua
+++ b/c90555947.lua
@@ -19,7 +19,7 @@ function c90555947.initial_effect(c)
 end
 c90555947.miracle_synchro_fusion=true
 function c90555947.ffilter(c)
-	return c:IsAttribute(ATTRIBUTE_EARTH) and c:IsType(TYPE_SYNCHRO)
+	return c:IsFusionAttribute(ATTRIBUTE_EARTH) and c:IsType(TYPE_SYNCHRO)
 end
 function c90555947.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end

--- a/c94977269.lua
+++ b/c94977269.lua
@@ -50,7 +50,7 @@ function c94977269.ffilter1(c)
 	return c:IsFusionSetCard(0x9d)
 end
 function c94977269.ffilter2(c)
-	return c:IsAttribute(ATTRIBUTE_DARK) or c:IsHasEffect(4904633)
+	return c:IsFusionAttribute(ATTRIBUTE_DARK) or c:IsHasEffect(4904633)
 end
 function c94977269.exfilter(c,g)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial() and not g:IsContains(c)

--- a/constant.lua
+++ b/constant.lua
@@ -493,6 +493,9 @@ EFFECT_PATRICIAN_OF_DARKNESS	=345	--由對手選擇攻擊對象(黑暗貴族)
 EFFECT_EXTRA_ATTACK_MONSTER		=346	--對怪獸攻擊X次
 EFFECT_UNION_STATUS				=347	--同盟状态
 EFFECT_OLDUNION_STATUS			=348	--旧同盟状态
+EFFECT_ADD_FUSION_ATTRIBUTE		=349	--reserve
+EFFECT_REMOVE_FUSION_ATTRIBUTE	=350	--reserve
+EFFECT_CHANGE_FUSION_ATTRIBUTE	=351	--用作融合素材时的属性

 --下面是诱发效果的诱发事件、时点 （如果是TYPE_SINGLE则自己发生以下事件后触发，如果TYPE_FIELD则场上任何卡发生以下事件都触发）
 EVENT_STARTUP					=1000	--游戏开始时