fix ヴォルカニック・デビル and E-HERO マリシャス・デビル (#2634)

close #2633

c32543380.lua

@@ -16,6 +16,7 @@ function c32543380.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_MUST_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(c32543380.bpcon)
 	e2:SetTargetRange(0,LOCATION_MZONE)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -55,6 +56,9 @@ function c32543380.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=e:GetLabelObject()
 	Duel.SendtoGrave(g,REASON_SPSUMMON)
 end
+function c32543380.bpcon(e)
+	return Duel.IsTurnPlayer(1-e:GetHandlerPlayer()) and Duel.IsBattlePhase()
+end
 function c32543380.atklimit(e,c)
 	return c==e:GetHandler()
 end

c86676862.lua

@@ -26,6 +26,7 @@ function c86676862.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_MUST_ATTACK)
 	e4:SetRange(LOCATION_MZONE)
+	e4:SetCondition(c86676862.poscon)
 	e4:SetTargetRange(0,LOCATION_MZONE)
 	c:RegisterEffect(e4)
 	local e5=e4:Clone()
@@ -39,9 +40,7 @@ function c86676862.ffilter(c)
 	return c:IsRace(RACE_FIEND) and c:IsLevelAbove(6)
 end
 function c86676862.poscon(e)
-	local ph=Duel.GetCurrentPhase()
-	return Duel.GetTurnPlayer()~=e:GetHandler():GetControler()
-		and ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
+	return Duel.IsTurnPlayer(1-e:GetHandlerPlayer()) and Duel.IsBattlePhase()
 end
 function c86676862.atklimit(e,c)
 	return c==e:GetHandler()