update

for Fluorohydride/ygopro-core@f87e668

c28355718.lua

@@ -33,7 +33,11 @@ function c28355718.regop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCondition(c28355718.spcon)
 		e1:SetTarget(c28355718.sptg)
 		e1:SetOperation(c28355718.spop)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,1)
+		if Duel.GetTurnPlayer()==tp then
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,2)
+		else
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,1)
+		end
 		c:RegisterEffect(e1)
 	end
 end

c34294855.lua

@@ -36,7 +36,7 @@ function c34294855.regcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsLocation(LOCATION_GRAVE)
 end
 function c34294855.regop(e,tp,eg,ep,ev,re,r,rp)
-	e:GetHandler():RegisterFlagEffect(34294855,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY,0,1)
+	e:GetHandler():RegisterFlagEffect(34294855,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,2)
 end
 function c34294855.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetFlagEffect(34294855)>0

c51644030.lua

@@ -66,11 +66,7 @@ function c51644030.atkop2(e,tp,eg,ep,ev,re,r,rp)
 				e2:SetLabelObject(c)
 				e2:SetCondition(c51644030.retcon)
 				e2:SetOperation(c51644030.retop)
-				if Duel.GetCurrentPhase()<=PHASE_STANDBY then
-					e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY,2)
-				else
-					e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_STANDBY)
-				end
+				e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2)
 				Duel.RegisterEffect(e2,tp)
 			end
 		end

c75745607.lua

@@ -25,7 +25,7 @@ function c75745607.hdreg(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_PREDRAW)
-	e1:SetReset(RESET_PHASE+PHASE_DRAW)
+	e1:SetReset(RESET_PHASE+PHASE_END,2)
 	e1:SetOperation(c75745607.hdop)
 	Duel.RegisterEffect(e1,tp)
 end