byd

expansions/script/c65700055.lua

@@ -6,9 +6,15 @@ function cm.initial_effect(c)
 	aux.AddCodeList(c,65700005)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(aux.IsCodeListed,65700005),cm.matfilter,true)
+	aux.AddFusionProcFun2(c,cm.ffilter,cm.matfilter,true)
 	aux.AddContactFusionProcedure(c,Card.IsAbleToGraveAsCost,LOCATION_MZONE,0,Duel.SendtoGrave,REASON_COST)
-	
+	--spsummon condition
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e0:SetValue(cm.exsplimit)
+	c:RegisterEffect(e0)
 	--spsummon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -65,7 +71,12 @@ end
 
 
 
-
+function cm.exsplimit(e,se,sp,st)
+	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)
+end
 function cm.matfilter(c)
 	return c:IsSummonLocation(LOCATION_EXTRA) and c:IsLocation(LOCATION_MZONE)
+end
+function cm.ffilter(c)
+	return aux.FilterBoolFunction(aux.IsCodeListed,65700005) and c:IsType(TYPE_MONSTER)
 end
\ No newline at end of file

expansions/script/c65700085.lua

@@ -4,6 +4,9 @@ local cm=_G["c"..m]
 cm.name="撕裂之兽 戴娜"
 function cm.initial_effect(c)
 	aux.AddCodeList(c,65700005)
+	aux.AddCodeList(c,65700080)
+	--change name
+	aux.EnableChangeCode(c,65700080,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_EXTRA)
 	--fusion material
 	c:EnableReviveLimit()
 	aux.AddFusionProcFun2(c,cm.mfilter1,cm.mfilter2,true)
@@ -94,8 +97,8 @@ end
 
 
 function cm.mfilter1(c)
-	return c:IsRace(RACE_BEAST) and c:GetAttack()>=400
+	return c:IsRace(RACE_BEAST) and c:GetAttack()>=400 and c:IsType(TYPE_MONSTER)
 end
 function cm.mfilter2(c)
-	return c:IsRace(RACE_FAIRY) or c:IsRace(RACE_WARRIOR)
+	return c:IsRace(RACE_FAIRY) or c:IsRace(RACE_WARRIOR) and c:IsType(TYPE_MONSTER)
 end
\ No newline at end of file