Fix 星霜の魔術師－アストログラフ・マジシャン

script/c100256015.lua

@@ -67,8 +67,8 @@ function s.pop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.desfilter(c,tp)
-	return c:IsPreviousControler(tp) and (c:GetOriginalType()&TYPE_MONSTER~=0 or c:IsPreviousLocation(LOCATION_MZONE))
-		and c:IsPreviousPosition(POS_FACEUP) and c:IsReason(REASON_BATTLE+REASON_EFFECT)
+	return c:IsPreviousControler(tp) and c:IsPreviousPosition(POS_FACEUP) and c:IsReason(REASON_BATTLE+REASON_EFFECT)
+		and (c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsPreviousLocation(LOCATION_ONFIELD) or c:IsPreviousLocation(LOCATION_MZONE))
 end
 function s.spcon1(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.desfilter,1,nil,tp)

script/c100256018.lua

@@ -80,7 +80,7 @@ function s.cfilter2(c,e,tp,lg)
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp,c:GetRace(),c:GetType())
 end
 function s.spfilter(c,e,tp,rac,type)
-	return c:IsType(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_RITUAL) 
+	return c:IsType(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_RITUAL)
 		and c:GetType()&type&(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_RITUAL)==0
 		and c:IsRace(rac)
 		and c:IsCanBeSpecialSummoned(e,0,tp,false,false)