diff --git a/lib/spell/effect.lua b/lib/spell/effect.lua
index 3fe36a1..68672b9 100644
--- a/lib/spell/effect.lua
+++ b/lib/spell/effect.lua
@@ -27,13 +27,13 @@ effect.__index = effect
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>, boolean
-function effect:beforeBirth(owner, intensity) return taskUtils.wait {}, true end
+function effect:beforeBirth(owner, intensity) return taskUtils.fromValue(), true end
 
 --- Срабатывает после применения эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterBirth(owner, intensity) return taskUtils.wait {} end
+function effect:afterBirth(owner, intensity) return taskUtils.fromValue() end
 
 --- Срабатывает перед смертью владельца эффекта
 ---
@@ -41,13 +41,13 @@ function effect:afterBirth(owner, intensity) return taskUtils.wait {} end
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>, boolean
-function effect:beforeDeath(owner, intensity) return taskUtils.wait {}, true end
+function effect:beforeDeath(owner, intensity) return taskUtils.fromValue(), true end
 
 --- Срабатывает после смерти владельца эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterDeath(owner, intensity) return taskUtils.wait {} end
+function effect:afterDeath(owner, intensity) return taskUtils.fromValue() end
 
 --- Срабатывает перед ходом владельца эффекта
 ---
@@ -55,13 +55,13 @@ function effect:afterDeath(owner, intensity) return taskUtils.wait {} end
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>, boolean
-function effect:beforeTurn(owner, intensity) return taskUtils.wait {}, true end
+function effect:beforeTurn(owner, intensity) return taskUtils.fromValue(), true end
 
 --- Срабатывает после хода владельца эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterTurn(owner, intensity) return taskUtils.wait {} end
+function effect:afterTurn(owner, intensity) return taskUtils.fromValue() end
 
 --- Срабатывает перед кастом заклинания владельцем эффекта
 ---
@@ -69,13 +69,13 @@ function effect:afterTurn(owner, intensity) return taskUtils.wait {} end
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>, boolean
-function effect:beforeCast(owner, intensity) return taskUtils.wait {}, true end
+function effect:beforeCast(owner, intensity) return taskUtils.fromValue(), true end
 
 --- Срабатывает после каста заклинания владельцем эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterCast(owner, intensity) return taskUtils.wait {} end
+function effect:afterCast(owner, intensity) return taskUtils.fromValue() end
 
 --- Срабатывает перед нанесением урона владельцем эффекта
 ---
@@ -84,13 +84,13 @@ function effect:afterCast(owner, intensity) return taskUtils.wait {} end
 --- @param intensity integer
 --- @param damage integer
 --- @return Task<nil>, integer
-function effect:beforeAttack(owner, intensity, damage) return taskUtils.wait {}, damage end
+function effect:beforeAttack(owner, intensity, damage) return taskUtils.fromValue(), damage end
 
 --- Срабатывает после нанесения урона владельцем эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterAttack(owner, intensity) return taskUtils.wait {} end
+function effect:afterAttack(owner, intensity) return taskUtils.fromValue() end
 
 --- Срабатывает перед получением урона владельцем эффекта
 ---
@@ -99,13 +99,13 @@ function effect:afterAttack(owner, intensity) return taskUtils.wait {} end
 --- @param intensity integer
 --- @param damage integer
 --- @return Task<nil>, integer
-function effect:beforeDamage(owner, intensity, damage) return taskUtils.wait {}, damage end
+function effect:beforeDamage(owner, intensity, damage) return taskUtils.fromValue(), damage end
 
 --- Срабатывает после получения урона владельцем эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterDamage(owner, intensity) return taskUtils.wait {} end
+function effect:afterDamage(owner, intensity) return taskUtils.fromValue() end
 
 --- Срабатывает перед регенерацией здоровья владельцем эффекта
 ---
@@ -114,13 +114,13 @@ function effect:afterDamage(owner, intensity) return taskUtils.wait {} end
 --- @param intensity integer
 --- @param amountHp integer кол-во хп для регена
 --- @return Task<nil>, integer
-function effect:beforeRegeneration(owner, intensity, amountHp) return taskUtils.wait {}, amountHp end
+function effect:beforeRegeneration(owner, intensity, amountHp) return taskUtils.fromValue(), amountHp end
 
 --- Срабатывает после регенерации здоровья владельцем эффекта
 --- @param owner Character
 --- @param intensity integer
 --- @return Task<nil>
-function effect:afterRegeneration(owner, intensity) return taskUtils.wait {} end
+function effect:afterRegeneration(owner, intensity) return taskUtils.fromValue() end
 
 function effect:update(dt) end