1145141919810

expansions/script/c16114208.lua

 --恶魔仙精 贝拉冬娜
 xpcall(function() require("expansions/script/c16199990") end,function() require("script/c16199990") end)
-local m,cm=rk.set(16114208,"FAIRY",1,)
+local m,cm=rk.set(16114208,"FAIRY",1)
 function cm.initial_effect(c)
 	c:SetSPSummonOnce(m)
 	c:EnableReviveLimit()

expansions/script/c16114235.lua

@@ -48,7 +48,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 			local rc=g:GetFirst()
 			Duel.SpecialSummon(rc,0,tp,tp,true,true,POS_FACEUP)
 			rc:CompleteProcedure()
-			Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)
+			Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)
 		end
 	end
 end

expansions/script/c16120003.lua

@@ -3,7 +3,7 @@ local m=16120003
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	aux.AddCodeList(c,16120010)
-   c:EnableReviveLimit()
+	c:EnableReviveLimit()
 	--disable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)

expansions/script/c16120010.lua

@@ -29,8 +29,8 @@ function cm.filter(c,e,tp,m)
 			return false
 	end
 	local num=c:GetLevel()+c:GetRank()
-	return c:IsCanBeSpecialSummoned(e,b,tp,false,true) and (c:IsLevelAbove(1) or c:IsRankAbove(1)) and m:CheckWithSumEqual(cm.sumfun,num,1,m:GetCount()) and (c:IsLocation(LOCATION_DECK) and Duel.GetMZoneCount(tp)>0
-			or c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0)
+	return c:IsCanBeSpecialSummoned(e,b,tp,false,true) and (c:IsLevelAbove(1) or c:IsRankAbove(1)) and m:CheckWithSumEqual(cm.sumfun,num,1,m:GetCount()) and ((c:IsLocation(LOCATION_DECK) and Duel.GetMZoneCount(tp)>0)
+			or (c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0))
 end
 function cm.sumfun(c)
 	return c:GetLevel()+c:GetRank()+c:GetLink()
@@ -56,7 +56,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local mg=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_GRAVE+LOCATION_HAND+LOCATION_MZONE,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local tg=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,mg)
+	local tg=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_EXTRA+LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp,mg)
 	if tg:GetCount()>0 then
 		local tc=tg:GetFirst()
 		local num=tc:GetLevel()+tc:GetRank()