minor format

e6637ac6 · mercury233 · 7c9180d4 · e6637ac6 · e6637ac6
Commit e6637ac6 authored Jan 23, 2024 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

c66431519.lua c66431519.lua +4 -2

c90681088.lua c90681088.lua +3 -2

No files found.
--- a/c66431519.lua
+++ b/c66431519.lua
@@ -32,8 +32,10 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function s.cfilter(c,tp,se)
-	return c:IsPreviousControler(tp) and not c:IsPreviousLocation(LOCATION_SZONE) and c:GetOriginalAttribute()==ATTRIBUTE_FIRE
+	return c:IsPreviousControler(tp) and not c:IsPreviousLocation(LOCATION_SZONE)
-		and c:IsReason(REASON_BATTLE+REASON_EFFECT) and (se==nil or c:GetReasonEffect()~=se) and (c:IsPreviousLocation(LOCATION_MZONE) or c:GetOriginalType()&TYPE_MONSTER~=0)
+		and (c:IsPreviousLocation(LOCATION_MZONE) or c:GetOriginalType()&TYPE_MONSTER~=0)
+		and c:GetOriginalAttribute()==ATTRIBUTE_FIRE and c:IsReason(REASON_BATTLE+REASON_EFFECT)
+		and (se==nil or c:GetReasonEffect()~=se)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

--- a/c90681088.lua
+++ b/c90681088.lua
@@ -49,8 +49,9 @@ function s.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function s.cfilter(c,tp)
-	return c:IsPreviousControler(tp) and not c:IsPreviousLocation(LOCATION_SZONE) and c:GetOriginalAttribute()==ATTRIBUTE_FIRE
+	return c:IsPreviousControler(tp) and not c:IsPreviousLocation(LOCATION_SZONE)
-		and c:IsReason(REASON_BATTLE+REASON_EFFECT) and (c:IsPreviousLocation(LOCATION_MZONE) or c:GetOriginalType()&TYPE_MONSTER~=0)
+		and (c:IsPreviousLocation(LOCATION_MZONE) or c:GetOriginalType()&TYPE_MONSTER~=0)
+		and c:GetOriginalAttribute()==ATTRIBUTE_FIRE and c:IsReason(REASON_BATTLE+REASON_EFFECT)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilter,1,nil,tp)