Fix Firebird (GOAT)

Author: edo9300

goat/c504700005.lua

@@ -33,7 +33,7 @@ function s.initial_effect(c)
 end
 s.listed_names={27288416}
 function s.cfilter(c,tp)
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
+	return not c:IsReason(REASON_BATTLE) and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
 		and c:IsPreviousControler(tp) and c:IsRace(RACE_FAIRY)
 end
 function s.regcon(e,tp,eg,ep,ev,re,r,rp)

goat/c504700097.lua

@@ -20,7 +20,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function s.cfilter(c)
-	return not c:IsBattleDestroyed() and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
+	return not c:IsReason(REASON_BATTLE) and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP)
 		and (c:GetPreviousRaceOnField()&RACE_BEAST)~=0
 end
 function s.atkcon(e,tp,eg,ep,ev,re,r,rp)

goat/c504700151.lua

@@ -16,11 +16,11 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()
 	e2:SetCode(EVENT_BATTLED)
-	e2:SetCondition(s.atkcon)
+	e2:SetCondition(s.atkcon2)
 	c:RegisterEffect(e2)
 end
 function s.cfilter(c,tp)
-	return not c:IsBattleDestroyed() and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE)
+	return not c:IsReason(REASON_BATTLE) and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE)
 		and c:IsPreviousPosition(POS_FACEUP) and (c:GetPreviousRaceOnField()&RACE_WINGEDBEAST)~=0
 end
 function s.atkcon(e,tp,eg,ep,ev,re,r,rp)