diff --git a/game/modules/tome/data/zones/gorbat-pride/npcs.lua b/game/modules/tome/data/zones/gorbat-pride/npcs.lua
index 93f59b430814285fa7195a670f437269dd5ad018..548a7f461980f1b847e1acceb670ea5f26499491 100644
--- a/game/modules/tome/data/zones/gorbat-pride/npcs.lua
+++ b/game/modules/tome/data/zones/gorbat-pride/npcs.lua
@@ -61,28 +61,28 @@ newEntity{ base="BASE_NPC_ORC_GORBAT", define_as = "GORBAT",
 	equilibrium_regen = -8,
 
 	resolvers.talents{
-		[Talents.T_NATURE_TOUCH]=5,
+		[Talents.T_NATURE_TOUCH]={base=5, every=6, max=7},
 
-		[Talents.T_ICE_BREATH]=10,
-		[Talents.T_FIRE_BREATH]=10,
-		[Talents.T_SAND_BREATH]=10,
+		[Talents.T_ICE_BREATH]={base=10, every=6, max=12},
+		[Talents.T_FIRE_BREATH]={base=10, every=6, max=12},
+		[Talents.T_SAND_BREATH]={base=10, every=6, max=12},
 
-		[Talents.T_ICY_SKIN]=5,
-		[Talents.T_ICE_CLAW]=7,
+		[Talents.T_ICY_SKIN]={base=5, every=6, max=7},
+		[Talents.T_ICE_CLAW]={base=7, every=6, max=10},
 
-		[Talents.T_BELLOWING_ROAR]=7,
-		[Talents.T_WING_BUFFET]=5,
-		[Talents.T_ACIDIC_SKIN]=7,
+		[Talents.T_BELLOWING_ROAR]={base=7, every=6, max=10},
+		[Talents.T_WING_BUFFET]={base=5, every=6, max=7},
+		[Talents.T_ACIDIC_SKIN]={base=7, every=6, max=10},
 
-		[Talents.T_WARPER]=7,
-		[Talents.T_RITCH_FLAMESPITTER]=10,
-		[Talents.T_RESILIENCE]=5,
+		[Talents.T_WARPER]={base=7, every=6, max=10},
+		[Talents.T_RITCH_FLAMESPITTER]={base=10, every=6, max=12},
+		[Talents.T_RESILIENCE]={base=5, every=6, max=7},
 
-		[Talents.T_HOWL]=5,
+		[Talents.T_HOWL]={base=5, every=6, max=7},
 
-		[Talents.T_DISARM]=5,
-		[Talents.T_WEAPON_COMBAT]=7,
-		[Talents.T_WEAPONS_MASTERY]=5,
+		[Talents.T_DISARM]={base=5, every=6, max=7},
+		[Talents.T_WEAPON_COMBAT]={base=7, every=4, max=10},
+		[Talents.T_WEAPONS_MASTERY]={base=6, every=4, max=10},
 
 		[Talents.T_MASSIVE_ARMOUR_TRAINING]=5,
 	},
diff --git a/game/modules/tome/data/zones/grushnak-pride/npcs.lua b/game/modules/tome/data/zones/grushnak-pride/npcs.lua
index 8df57a765dc50c4baac3a12d8514f13e78561d77..bc1e2866df25ce66c460b43e704e16570d52cb37 100644
--- a/game/modules/tome/data/zones/grushnak-pride/npcs.lua
+++ b/game/modules/tome/data/zones/grushnak-pride/npcs.lua
@@ -69,25 +69,25 @@ newEntity{ base="BASE_NPC_ORC_GRUSHNAK", define_as = "GRUSHNAK",
 	},
 
 	resolvers.talents{
-		[Talents.T_WEAPON_COMBAT]=10,
-		[Talents.T_MASSIVE_ARMOUR_TRAINING]=10,
-		[Talents.T_WEAPONS_MASTERY]=10,
-		[Talents.T_RUSH]=5,
-		[Talents.T_BATTLE_CALL]=5,
-		[Talents.T_SHIELD_PUMMEL]=4,
-		[Talents.T_OVERPOWER]=5,
-		[Talents.T_ASSAULT]=3,
-		[Talents.T_SHIELD_EXPERTISE]=5,
-		[Talents.T_BATTLE_SHOUT]=3,
-		[Talents.T_SHIELD_WALL]=5,
-		[Talents.T_SHATTERING_SHOUT]=5,
-		[Talents.T_BATTLE_CRY]=5,
-		[Talents.T_ONSLAUGHT]=5,
-		[Talents.T_SECOND_WIND]=5,
-		[Talents.T_JUGGERNAUT]=5,
-		[Talents.T_UNSTOPPABLE]=5,
-		[Talents.T_MORTAL_TERROR]=3,
-		[Talents.T_BLOODBATH]=5,
+		[Talents.T_WEAPON_COMBAT]={base=10, every=6, max=13},
+		[Talents.T_MASSIVE_ARMOUR_TRAINING]={base=10, every=6, max=13},
+		[Talents.T_WEAPONS_MASTERY]={base=10, every=6, max=13},
+		[Talents.T_RUSH]={base=5, every=6, max=7},
+		[Talents.T_BATTLE_CALL]={base=5, every=6, max=7},
+		[Talents.T_SHIELD_PUMMEL]={base=4, every=6, max=6},
+		[Talents.T_OVERPOWER]={base=5, every=6, max=7},
+		[Talents.T_ASSAULT]={base=3, every=6, max=6},
+		[Talents.T_SHIELD_EXPERTISE]={base=5, every=6, max=7},
+		[Talents.T_BATTLE_SHOUT]={base=3, every=6, max=6},
+		[Talents.T_SHIELD_WALL]={base=5, every=6, max=7},
+		[Talents.T_SHATTERING_SHOUT]={base=5, every=6, max=7},
+		[Talents.T_BATTLE_CRY]={base=5, every=6, max=7},
+		[Talents.T_ONSLAUGHT]={base=5, every=6, max=7},
+		[Talents.T_SECOND_WIND]={base=5, every=6, max=7},
+		[Talents.T_JUGGERNAUT]={base=5, every=6, max=7},
+		[Talents.T_UNSTOPPABLE]={base=5, every=6, max=7},
+		[Talents.T_MORTAL_TERROR]={base=3, every=6, max=6},
+		[Talents.T_BLOODBATH]={base=5, every=6, max=7},
 	},
 	resolvers.sustains_at_birth(),
 
diff --git a/game/modules/tome/data/zones/halfling-ruins/npcs.lua b/game/modules/tome/data/zones/halfling-ruins/npcs.lua
index 5ea1c3dc2c3c10a733f611294e3986d87cd03fda..63c94e416400daef33e26ffc2a06b4f6020961f5 100644
--- a/game/modules/tome/data/zones/halfling-ruins/npcs.lua
+++ b/game/modules/tome/data/zones/halfling-ruins/npcs.lua
@@ -49,18 +49,18 @@ newEntity{ define_as="SUBJECT_Z",
 	},
 
 	resolvers.talents{
-		[Talents.T_DUAL_WEAPON_DEFENSE]=3,
-		[Talents.T_DUAL_WEAPON_TRAINING]=3,
-		[Talents.T_FLURRY]=3,
-		[Talents.T_DIRTY_FIGHTING]=3,
-		[Talents.T_LETHALITY]=3,
-		[Talents.T_WEAPON_COMBAT]=2,
-		[Talents.T_KNIFE_MASTERY]=6,
-		[Talents.T_SHADOW_COMBAT]=5,
-		[Talents.T_SHADOWSTEP]=1,
+		[Talents.T_DUAL_WEAPON_DEFENSE]={base=3, every=8, max=6},
+		[Talents.T_DUAL_WEAPON_TRAINING]={base=3, every=8, max=6},
+		[Talents.T_FLURRY]={base=3, every=8, max=6},
+		[Talents.T_DIRTY_FIGHTING]={base=3, every=8, max=6},
+		[Talents.T_LETHALITY]={base=3, every=8, max=6},
+		[Talents.T_WEAPON_COMBAT]={base=2, every=6, max=9},
+		[Talents.T_KNIFE_MASTERY]={base=2, every=6, max=9},
+		[Talents.T_SHADOW_COMBAT]={base=5, every=8, max=7},
+		[Talents.T_SHADOWSTEP]={base=1, every=6, max=5},
 		[Talents.T_PHASE_DOOR]=3,
-		[Talents.T_SECOND_WIND]=4,
-		[Talents.T_DARK_TENDRILS]=2,
+		[Talents.T_SECOND_WIND]={base=4, every=8, max=6},
+		[Talents.T_DARK_TENDRILS]={base=2, every=8, max=5},
 	},
 	resolvers.inscriptions(1, {"manasurge rune"}),
 	resolvers.inscriptions(1, "infusion"),
diff --git a/game/modules/tome/data/zones/mark-spellblaze/npcs.lua b/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
index 6ca5b98498f4eeb7ecc8a207e51facfd704c126e..63f1d49a9a9fa874bfe802ec39f3940490f4db62 100644
--- a/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
+++ b/game/modules/tome/data/zones/mark-spellblaze/npcs.lua
@@ -31,7 +31,7 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
 	allow_infinite_dungeon = true,
 	name = "Grand Corruptor", color=colors.VIOLET, unique = true,
 	desc = [[An elven corruptor, drawn to these blighted lands.]],
-	level_range = {30, nil}, exp_worth = 1,
+	level_range = {25, nil}, exp_worth = 1,
 	rank = 3.5,
 	vim_regen = 40,
 	max_vim = 800,
@@ -48,20 +48,20 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER", define_as = "GRAND_CORRUPTOR",
 	silence_immune = 0.5,
 
 	resolvers.talents{
-		[Talents.T_BONE_SHIELD]=3,
-		[Talents.T_BLOOD_SPRAY]=4,
-		[Talents.T_SOUL_ROT]=3,
-		[Talents.T_BLOOD_GRASP]=4,
-		[Talents.T_BLOOD_BOIL]=3,
-		[Talents.T_BLOOD_FURY]=4,
-		[Talents.T_BONE_SPEAR]=3,
-		[Talents.T_VIRULENT_DISEASE]=5,
-		[Talents.T_DARKFIRE]=4,
-		[Talents.T_FLAME_OF_URH_ROK]=5,
-		[Talents.T_DEMON_PLANE]=5,
-		[Talents.T_CYST_BURST]=4,
-		[Talents.T_BURNING_HEX]=5,
-		[Talents.T_WRAITHFORM]=5,
+		[Talents.T_BONE_SHIELD]={base=3, every=5, max=6},
+		[Talents.T_BLOOD_SPRAY]={base=4, every=5, max=7},
+		[Talents.T_SOUL_ROT]={base=3, every=5, max=6},
+		[Talents.T_BLOOD_GRASP]={base=4, every=5, max=7},
+		[Talents.T_BLOOD_BOIL]={base=3, every=5, max=6},
+		[Talents.T_BLOOD_FURY]={base=4, every=5, max=7},
+		[Talents.T_BONE_SPEAR]={base=3, every=5, max=6},
+		[Talents.T_VIRULENT_DISEASE]={base=5, every=5, max=8},
+		[Talents.T_DARKFIRE]={base=4, every=5, max=7},
+		[Talents.T_FLAME_OF_URH_ROK]={base=5, every=5, max=8},
+		[Talents.T_DEMON_PLANE]={base=5, every=5, max=8},
+		[Talents.T_CYST_BURST]={base=4, every=5, max=7},
+		[Talents.T_BURNING_HEX]={base=5, every=5, max=8},
+		[Talents.T_WRAITHFORM]={base=5, every=5, max=8},
 	},
 	resolvers.sustains_at_birth(),
 
diff --git a/game/modules/tome/data/zones/maze/npcs.lua b/game/modules/tome/data/zones/maze/npcs.lua
index d07af1ce4ddc651e6f4beb32afeca35623209601..4818594351c7292e3a5869d204fc25aac0f0b4b7 100644
--- a/game/modules/tome/data/zones/maze/npcs.lua
+++ b/game/modules/tome/data/zones/maze/npcs.lua
@@ -56,13 +56,13 @@ newEntity{ define_as = "MINOTAUR_MAZE",
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_HEAVY_ARMOUR_TRAINING]=1,
-		[Talents.T_STAMINA_POOL]=1,
-		[Talents.T_WARSHOUT]=1,
-		[Talents.T_STUNNING_BLOW]=1,
-		[Talents.T_SUNDER_ARMOUR]=1,
-		[Talents.T_SUNDER_ARMS]=1,
-		[Talents.T_CRUSH]=1,
+		[Talents.T_HEAVY_ARMOUR_TRAINING]={base=1, every=6, max=5},
+		[Talents.T_STAMINA_POOL]={base=1, every=6, max=5},
+		[Talents.T_WARSHOUT]={base=1, every=6, max=5},
+		[Talents.T_STUNNING_BLOW]={base=1, every=6, max=5},
+		[Talents.T_SUNDER_ARMOUR]={base=1, every=6, max=5},
+		[Talents.T_SUNDER_ARMS]={base=1, every=6, max=5},
+		[Talents.T_CRUSH]={base=1, every=6, max=5},
 	},
 
 	autolevel = "warrior",
@@ -103,14 +103,14 @@ newEntity{ base = "BASE_NPC_SPIDER", define_as = "NIMISIL",
 	inc_damage = {all=40},
 
 	resolvers.talents{
-		[Talents.T_SPIDER_WEB]=5,
-		[Talents.T_LAY_WEB]=5,
-		[Talents.T_PHASE_DOOR]=5,
+		[Talents.T_SPIDER_WEB]={base=5, every=5, max=7},
+		[Talents.T_LAY_WEB]={base=5, every=5, max=7},
+		[Talents.T_PHASE_DOOR]={base=5, every=5, max=7},
 
-		[Talents.T_HYMN_OF_MOONLIGHT]=4,
-		[Talents.T_MOONLIGHT_RAY]=5,
-		[Talents.T_SHADOW_BLAST]=5,
+		[Talents.T_HYMN_OF_MOONLIGHT]={base=5, every=5, max=7},
+		[Talents.T_MOONLIGHT_RAY]={base=5, every=5, max=7},
+		[Talents.T_SHADOW_BLAST]={base=5, every=5, max=7},
 
-		[Talents.T_SEARING_LIGHT]=4,
+		[Talents.T_SEARING_LIGHT]={base=5, every=5, max=7},
 	},
 }
diff --git a/game/modules/tome/data/zones/old-forest/npcs.lua b/game/modules/tome/data/zones/old-forest/npcs.lua
index b8a07504a2c1da12677d39a13ac87d6f63aa62af..eae45d871c55adaa304b0f8a9adf88521858c855 100644
--- a/game/modules/tome/data/zones/old-forest/npcs.lua
+++ b/game/modules/tome/data/zones/old-forest/npcs.lua
@@ -46,7 +46,7 @@ newEntity{ define_as = "WRATHROOT",
 	instakill_immune = 1,
 	move_others=true,
 
-	combat = { dam=27, atk=10, apr=0, dammod={str=1.2} },
+	combat = { dam=resolvers.levelup(27, 1, 0.8), atk=10, apr=0, dammod={str=1.2} },
 
 	resists = { [DamageType.FIRE] = -50 },
 
@@ -55,12 +55,10 @@ newEntity{ define_as = "WRATHROOT",
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_STAMINA_POOL]=1, [Talents.T_STUN]=2,
-
-		[Talents.T_MANA_POOL]=1,
-		[Talents.T_ICE_STORM]=1,
-		[Talents.T_TIDAL_WAVE]=1,
-		[Talents.T_FREEZE]=2,
+		[Talents.T_STUN]={base=2, every=6, max=6},
+		[Talents.T_ICE_STORM]={base=1, every=6, max=6},
+		[Talents.T_TIDAL_WAVE]={base=1, every=6, max=6},
+		[Talents.T_FREEZE]={base=2, every=6, max=6},
 	},
 
 	autolevel = "caster",
diff --git a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
index c5da6d3a04a932cf57cb84faed18f4e9b8d6bdb2..ef6a38125a3e9b5a06f72463b07ff20eea555ad6 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
@@ -75,11 +75,11 @@ newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "RAK_SHOR",
 	resolvers.talents{
 		[Talents.T_SUMMON]=1,
 
-		[Talents.T_SOUL_ROT]=5,
-		[Talents.T_BLOOD_GRASP]=5,
-		[Talents.T_CURSE_OF_VULNERABILITY]=5,
-		[Talents.T_BONE_SHIELD]=8,
-		[Talents.T_BLOOD_SPRAY]=5,
+		[Talents.T_SOUL_ROT]={base=5, every=6, max=8},
+		[Talents.T_BLOOD_GRASP]={base=5, every=6, max=8},
+		[Talents.T_CURSE_OF_VULNERABILITY]={base=5, every=6, max=8},
+		[Talents.T_BONE_SHIELD]={base=8, every=8, max=11},
+		[Talents.T_BLOOD_SPRAY]={base=5, every=6, max=8},
 	},
 	resolvers.sustains_at_birth(),
 
diff --git a/game/modules/tome/data/zones/reknor/npcs.lua b/game/modules/tome/data/zones/reknor/npcs.lua
index 0ac6ce42fbccf0595062bba629902bb97cb7988e..5ed056872369d96be62836ad2bd1477e677f3370 100644
--- a/game/modules/tome/data/zones/reknor/npcs.lua
+++ b/game/modules/tome/data/zones/reknor/npcs.lua
@@ -56,26 +56,26 @@ newEntity{ define_as = "GOLBUG",
 	see_invisible = 5,
 
 	resolvers.talents{
-		[Talents.T_HEAVY_ARMOUR_TRAINING]=1,
-		[Talents.T_MASSIVE_ARMOUR_TRAINING]=3,
-		[Talents.T_WEAPON_COMBAT]=6,
-		[Talents.T_WEAPONS_MASTERY]=6,
-		[Talents.T_SHIELD_PUMMEL]=4,
-		[Talents.T_RUSH]=4,
-		[Talents.T_RIPOSTE]=4,
-		[Talents.T_BLINDING_SPEED]=4,
-		[Talents.T_OVERPOWER]=3,
-		[Talents.T_ASSAULT]=3,
-		[Talents.T_SHIELD_WALL]=3,
-		[Talents.T_SHIELD_EXPERTISE]=2,
-
-		[Talents.T_BELLOWING_ROAR]=3,
-		[Talents.T_WING_BUFFET]=2,
-		[Talents.T_FIRE_BREATH]=4,
-
-		[Talents.T_ICE_CLAW]=3,
-		[Talents.T_ICY_SKIN]=4,
-		[Talents.T_ICE_BREATH]=4,
+		[Talents.T_HEAVY_ARMOUR_TRAINING]={base=1, every=6, max=5},
+		[Talents.T_MASSIVE_ARMOUR_TRAINING]={base=3, every=6, max=5},
+		[Talents.T_WEAPON_COMBAT]={base=6, every=5, max=10},
+		[Talents.T_WEAPONS_MASTERY]={base=6, every=5, max=10},
+		[Talents.T_SHIELD_PUMMEL]={base=4, every=5, max=6},
+		[Talents.T_RUSH]={base=4, every=5, max=6},
+		[Talents.T_RIPOSTE]={base=4, every=5, max=6},
+		[Talents.T_BLINDING_SPEED]={base=4, every=5, max=6},
+		[Talents.T_OVERPOWER]={base=3, every=5, max=5},
+		[Talents.T_ASSAULT]={base=3, every=5, max=5},
+		[Talents.T_SHIELD_WALL]={base=3, every=5, max=5},
+		[Talents.T_SHIELD_EXPERTISE]={base=2, every=5, max=5},
+
+		[Talents.T_BELLOWING_ROAR]={base=3, every=5, max=5},
+		[Talents.T_WING_BUFFET]={base=2, every=5, max=5},
+		[Talents.T_FIRE_BREATH]={base=4, every=5, max=7},
+
+		[Talents.T_ICE_CLAW]={base=3, every=5, max=5},
+		[Talents.T_ICY_SKIN]={base=4, every=5, max=7},
+		[Talents.T_ICE_BREATH]={base=4, every=5, max=7},
 	},
 	resolvers.sustains_at_birth(),
 
@@ -179,14 +179,14 @@ newEntity{ define_as = "LITHFENGEL", -- Lord of Ash; backup guardian
 	resolvers.drops{chance=100, nb=1, {defined="RESONATING_DIAMOND_WEST"} },
 
 	resolvers.talents{
-		[Talents.T_ROTTING_DISEASE]=5,
-		[Talents.T_DECREPITUDE_DISEASE]=5,
-		[Talents.T_WEAKNESS_DISEASE]=5,
-		[Talents.T_CATALEPSY]=5,
-		[Talents.T_RUSH]=5,
-		[Talents.T_MORTAL_TERROR]=5,
+		[Talents.T_ROTTING_DISEASE]={base=5, every=6, max=8},
+		[Talents.T_DECREPITUDE_DISEASE]={base=5, every=6, max=8},
+		[Talents.T_WEAKNESS_DISEASE]={base=5, every=6, max=8},
+		[Talents.T_CATALEPSY]={base=5, every=6, max=8},
+		[Talents.T_RUSH]={base=5, every=6, max=8},
+		[Talents.T_MORTAL_TERROR]={base=5, every=6, max=8},
 		[Talents.T_WEAPON_COMBAT]=10,
-		[Talents.T_WEAPONS_MASTERY]=6,
+		[Talents.T_WEAPONS_MASTERY]={base=5, every=6, max=10},
 	},
 	resolvers.sustains_at_birth(),
 
diff --git a/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua b/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
index d278d3f698a54bee0e5336df3e2d5e7a309a403f..ddc9d2a60c5ef17b6d4e4ef5ff68ccaaad2bf697 100644
--- a/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
+++ b/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
@@ -111,15 +111,15 @@ newEntity{ define_as = "KOR_FURY",
 	resolvers.drops{chance=100, nb=3, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_MANATHRUST]=5,
-		[Talents.T_FREEZE]=5,
-		[Talents.T_TIDAL_WAVE]=5,
-		[Talents.T_ICE_STORM]=5,
-		[Talents.T_BURNING_HEX]=5,
-		[Talents.T_EMPATHIC_HEX]=5,
-		[Talents.T_CURSE_OF_DEATH]=5,
-		[Talents.T_CURSE_OF_IMPOTENCE]=5,
-		[Talents.T_VIRULENT_DISEASE]=5,
+		[Talents.T_MANATHRUST]={base=5, every=6, max=8},
+		[Talents.T_FREEZE]={base=5, every=6, max=8},
+		[Talents.T_TIDAL_WAVE]={base=5, every=6, max=8},
+		[Talents.T_ICE_STORM]={base=5, every=6, max=8},
+		[Talents.T_BURNING_HEX]={base=5, every=6, max=8},
+		[Talents.T_EMPATHIC_HEX]={base=5, every=6, max=8},
+		[Talents.T_CURSE_OF_DEATH]={base=5, every=6, max=8},
+		[Talents.T_CURSE_OF_IMPOTENCE]={base=5, every=6, max=8},
+		[Talents.T_VIRULENT_DISEASE]={base=5, every=6, max=8},
 	},
 
 	autolevel = "caster",
diff --git a/game/modules/tome/data/zones/sandworm-lair/npcs.lua b/game/modules/tome/data/zones/sandworm-lair/npcs.lua
index 82ed46ac8a959da2b73870edb4b9ffbab4b43ec1..0f1e804b4327be3846c468a685b2fd60849253e8 100644
--- a/game/modules/tome/data/zones/sandworm-lair/npcs.lua
+++ b/game/modules/tome/data/zones/sandworm-lair/npcs.lua
@@ -80,12 +80,10 @@ newEntity{ define_as = "SANDWORM_QUEEN",
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_STAMINA_POOL]=1,
-		[Talents.T_MANA_POOL]=1,
 		[Talents.T_SUMMON]=1,
-		[Talents.T_CRAWL_POISON]=5,
-		[Talents.T_CRAWL_ACID]=3,
-		[Talents.T_SAND_BREATH]=4,
+		[Talents.T_CRAWL_POISON]={base=5, every=6, max=8},
+		[Talents.T_CRAWL_ACID]={base=3, every=6, max=7},
+		[Talents.T_SAND_BREATH]={base=4, every=6, max=8},
 	},
 
 	summon = {
diff --git a/game/modules/tome/data/zones/tannen-tower/npcs.lua b/game/modules/tome/data/zones/tannen-tower/npcs.lua
index 0a5c63ab2bf1e262d80f0310cf878180ef6a4278..bf2c45731dd8677e0dde0b5c5cb88f5318281144 100644
--- a/game/modules/tome/data/zones/tannen-tower/npcs.lua
+++ b/game/modules/tome/data/zones/tannen-tower/npcs.lua
@@ -60,15 +60,15 @@ newEntity{ define_as = "TANNEN",
 	resists = { [DamageType.ACID] = 100, },
 
 	resolvers.talents{
-		[Talents.T_THROW_BOMB]=4,
-		[Talents.T_CHANNEL_STAFF]=5,
-		[Talents.T_STAFF_MASTERY]=5,
-		[Talents.T_ALCHEMIST_PROTECTION]=5,
-		[Talents.T_SHOCKWAVE_BOMB]=4,
-		[Talents.T_HEAT]=4,
-		[Talents.T_BODY_OF_FIRE]=3,
-		[Talents.T_ACID_INFUSION]=5,
-		[Talents.T_STONE_TOUCH]=3,
+		[Talents.T_THROW_BOMB]={base=4, every=6, max=9},
+		[Talents.T_CHANNEL_STAFF]={base=5, every=5, max=9},
+		[Talents.T_STAFF_MASTERY]={base=5, every=5, max=9},
+		[Talents.T_ALCHEMIST_PROTECTION]={base=5, every=5, max=9},
+		[Talents.T_SHOCKWAVE_BOMB]={base=4, every=6, max=9},
+		[Talents.T_HEAT]={base=4, every=6, max=9},
+		[Talents.T_BODY_OF_FIRE]={base=3, every=5, max=9},
+		[Talents.T_ACID_INFUSION]={base=5, every=5, max=9},
+		[Talents.T_STONE_TOUCH]={base=3, every=5, max=9},
 	},
 
 	resolvers.generic(function(self)
@@ -120,6 +120,11 @@ It is so huge that it blocks sight beyond it.]],
 		[Talents.T_WEAPON_COMBAT]=7,
 		[Talents.T_POISON_BREATH]=6,
 		[Talents.T_WEAPONS_MASTERY]=11,
+		[Talents.T_GOLEM_BEAM]={base=5, every=5, max=9},
+		[Talents.T_GOLEM_ARCANE_PULL]={base=3, every=5, max=6},
+		[Talents.T_GOLEM_POUND]={base=3, every=5, max=6},
+		[Talents.T_GOLEM_CRUSH]={base=3, every=5, max=6},
+		[Talents.T_GOLEM_REFLECTIVE_SKIN]={base=3, every=5, max=6},
 	},
 	resolvers.drops{chance=100, nb=1, {defined="RESONATING_DIAMOND_WEST2"} },
 
diff --git a/game/modules/tome/data/zones/temple-of-creation/npcs.lua b/game/modules/tome/data/zones/temple-of-creation/npcs.lua
index a109c9a323d6f4d88f0544f3f1133c5ad94564bd..5e52a4a46706f7119d0a75265b614a8df2170fbf 100644
--- a/game/modules/tome/data/zones/temple-of-creation/npcs.lua
+++ b/game/modules/tome/data/zones/temple-of-creation/npcs.lua
@@ -61,17 +61,17 @@ newEntity{ define_as = "SLASUL",
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_WEAPON_COMBAT]=6,
-		[Talents.T_WEAPONS_MASTERY]=6,
-		[Talents.T_SHIELD_EXPERTISE]=3,
-		[Talents.T_SHIELD_PUMMEL]=2,
+		[Talents.T_WEAPON_COMBAT]={base=6, every=6, max=10},
+		[Talents.T_WEAPONS_MASTERY]={base=6, every=6, max=10},
+		[Talents.T_SHIELD_EXPERTISE]={base=3, every=7, max=6},
+		[Talents.T_SHIELD_PUMMEL]={base=2, every=7, max=6},
 		[Talents.T_RIPOSTE]=5,
-		[Talents.T_BLINDING_SPEED]=3,
+		[Talents.T_BLINDING_SPEED]={base=3, every=7, max=6},
 		[Talents.T_PERFECT_STRIKE]=5,
 
-		[Talents.T_SPIT_POISON]=5,
+		[Talents.T_SPIT_POISON]={base=5, every=5, max=9},
 
-		[Talents.T_HEAL]=5,
+		[Talents.T_HEAL]={base=6, every=7, max=7},
 		[Talents.T_UTTERCOLD]=5,
 		[Talents.T_ICE_SHARDS]=5,
 		[Talents.T_FREEZE]=3,
diff --git a/game/modules/tome/data/zones/trollmire/npcs.lua b/game/modules/tome/data/zones/trollmire/npcs.lua
index ea93332798a7ab49dcf9155c98df8a17a9140330..68ce8027f5cb91358f6ef4b5698e765bf1d99f36 100644
--- a/game/modules/tome/data/zones/trollmire/npcs.lua
+++ b/game/modules/tome/data/zones/trollmire/npcs.lua
@@ -100,25 +100,25 @@ newEntity{ define_as = "ALUIN",
 
 	resolvers.talents{
 		[Talents.T_MASSIVE_ARMOUR_TRAINING]=5,
-		[Talents.T_WEAPON_COMBAT]=6,
-		[Talents.T_WEAPONS_MASTERY]=6,
-		[Talents.T_RUSH]=4,
+		[Talents.T_WEAPON_COMBAT]={base=5, every=5, max=10},
+		[Talents.T_WEAPONS_MASTERY]={base=5, every=5, max=10},
+		[Talents.T_RUSH]={base=4, every=7, max=6},
 
-		[Talents.T_ENRAGE]=3,
-		[Talents.T_SUPPRESSION]=4,
-		[Talents.T_BLINDSIDE]=4,
-		[Talents.T_GLOOM]=4,
-		[Talents.T_WEAKNESS]=4,
-		[Talents.T_TORMENT]=4,
-		[Talents.T_LIFE_LEECH]=4,
+		[Talents.T_ENRAGE]={base=3, every=7, max=5},
+		[Talents.T_SUPPRESSION]={base=4, every=7, max=6},
+		[Talents.T_BLINDSIDE]={base=4, every=7, max=6},
+		[Talents.T_GLOOM]={base=4, every=7, max=6},
+		[Talents.T_WEAKNESS]={base=4, every=7, max=6},
+		[Talents.T_TORMENT]={base=4, every=7, max=6},
+		[Talents.T_LIFE_LEECH]={base=4, every=7, max=6},
 
-		[Talents.T_CHANT_OF_LIGHT]=5,
-		[Talents.T_SEARING_LIGHT]=5,
-		[Talents.T_MARTYRDOM]=5,
-		[Talents.T_BARRIER]=5,
-		[Talents.T_WEAPON_OF_LIGHT]=5,
-		[Talents.T_CRUSADE]=8,
-		[Talents.T_FIREBEAM]=7,
+		[Talents.T_CHANT_OF_LIGHT]={base=5, every=7, max=7},
+		[Talents.T_SEARING_LIGHT]={base=5, every=7, max=7},
+		[Talents.T_MARTYRDOM]={base=5, every=7, max=7},
+		[Talents.T_BARRIER]={base=5, every=7, max=7},
+		[Talents.T_WEAPON_OF_LIGHT]={base=5, every=7, max=7},
+		[Talents.T_CRUSADE]={base=8, every=7, max=10},
+		[Talents.T_FIREBEAM]={base=7, every=7, max=9},
 	},
 	resolvers.sustains_at_birth(),
 
diff --git a/game/modules/tome/data/zones/valley-moon/npcs.lua b/game/modules/tome/data/zones/valley-moon/npcs.lua
index d684467d8fe8f88d567a5dde778043185f891c81..3f830f0440cc893b7a712c016162ffa24ceebf13 100644
--- a/game/modules/tome/data/zones/valley-moon/npcs.lua
+++ b/game/modules/tome/data/zones/valley-moon/npcs.lua
@@ -49,15 +49,15 @@ newEntity{ define_as = "CORRUPTED_DAELACH",
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
 	resolvers.talents{
-		[Talents.T_FIREBEAM]=5,
+		[Talents.T_FIREBEAM]={base=5, every=7, max=7},
 		[Talents.T_DARKNESS]=3,
-		[Talents.T_FLAME]=5,
-		[Talents.T_POISON_BREATH]=5,
-		[Talents.T_FIRE_BREATH]=5,
-		[Talents.T_GLOOM]=5,
+		[Talents.T_FLAME]={base=5, every=7, max=7},
+		[Talents.T_POISON_BREATH]={base=5, every=7, max=7},
+		[Talents.T_FIRE_BREATH]={base=5, every=7, max=7},
+		[Talents.T_GLOOM]={base=5, every=7, max=7},
 		[Talents.T_RUSH]=5,
 		[Talents.T_WEAPON_COMBAT]=10,
-		[Talents.T_EXOTIC_WEAPONS_MASTERY]=7,
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=7, every=5, max=12},
 	},
 	resolvers.sustains_at_birth(),
 
diff --git a/game/modules/tome/data/zones/vor-armoury/npcs.lua b/game/modules/tome/data/zones/vor-armoury/npcs.lua
index 2546c939c27652cd4cb062cf574c1ae2e3376a30..4dbc307d5ae52d7eadd979f9f249fa83fe83c918 100644
--- a/game/modules/tome/data/zones/vor-armoury/npcs.lua
+++ b/game/modules/tome/data/zones/vor-armoury/npcs.lua
@@ -66,12 +66,12 @@ newEntity{ base="BASE_NPC_ORC_GRUSHNAK", define_as = "GNARG",
 
 	resolvers.talents{
 		[Talents.T_RUSH]=5,
-		[Talents.T_WARSHOUT]=5,
-		[Talents.T_STUNNING_BLOW]=5,
-		[Talents.T_SUNDER_ARMOUR]=5,
-		[Talents.T_SLOW_MOTION]=5,
-		[Talents.T_SHATTERING_SHOUT]=5,
-		[Talents.T_SECOND_WIND]=5,
+		[Talents.T_WARSHOUT]={base=5, every=7, max=7},
+		[Talents.T_STUNNING_BLOW]={base=5, every=7, max=7},
+		[Talents.T_SUNDER_ARMOUR]={base=5, every=7, max=7},
+		[Talents.T_SLOW_MOTION]={base=5, every=7, max=7},
+		[Talents.T_SHATTERING_SHOUT]={base=5, every=7, max=7},
+		[Talents.T_SECOND_WIND]={base=5, every=7, max=7},
 	},
 	resolvers.sustains_at_birth(),
 }
diff --git a/game/modules/tome/data/zones/vor-pride/npcs.lua b/game/modules/tome/data/zones/vor-pride/npcs.lua
index 8e87740f9503f439402fd50e819591157b8abfad..eeefcb3e4deb4116615b72c3e494ca1d8398c22f 100644
--- a/game/modules/tome/data/zones/vor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/vor-pride/npcs.lua
@@ -58,26 +58,28 @@ newEntity{ base="BASE_NPC_ORC_VOR", define_as = "VOR",
 	resolvers.drops{chance=100, nb=1, {defined="NOTE_LORE"} },
 	resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
 
+	in_damages = {all=25},
+
 	resolvers.talents{
-		[Talents.T_FLAME]=5,
-		[Talents.T_FLAMESHOCK]=5,
-		[Talents.T_FIREFLASH]=5,
-		[Talents.T_INFERNO]=5,
-		[Talents.T_BLASTWAVE]=5,
-		[Talents.T_CLEANSING_FLAMES]=5,
-		[Talents.T_BURNING_WAKE]=5,
+		[Talents.T_FLAME]={base=5, every=7, max=7},
+		[Talents.T_FLAMESHOCK]={base=5, every=7, max=7},
+		[Talents.T_FIREFLASH]={base=5, every=7, max=7},
+		[Talents.T_INFERNO]={base=5, every=7, max=7},
+		[Talents.T_BLASTWAVE]={base=5, every=7, max=7},
+		[Talents.T_CLEANSING_FLAMES]={base=5, every=7, max=7},
+		[Talents.T_BURNING_WAKE]={base=5, every=7, max=7},
 
-		[Talents.T_FREEZE]=5,
-		[Talents.T_ICE_STORM]=5,
-		[Talents.T_TIDAL_WAVE]=5,
-		[Talents.T_ICE_SHARDS]=5,
-		[Talents.T_FROZEN_GROUND]=5,
+		[Talents.T_FREEZE]={base=5, every=7, max=7},
+		[Talents.T_ICE_STORM]={base=5, every=7, max=7},
+		[Talents.T_TIDAL_WAVE]={base=5, every=7, max=7},
+		[Talents.T_ICE_SHARDS]={base=5, every=7, max=7},
+		[Talents.T_FROZEN_GROUND]={base=5, every=7, max=7},
 
-		[Talents.T_LIGHTNING]=5,
-		[Talents.T_CHAIN_LIGHTNING]=5,
+		[Talents.T_LIGHTNING]={base=5, every=7, max=7},
+		[Talents.T_CHAIN_LIGHTNING]={base=5, every=7, max=7},
 
-		[Talents.T_SPELL_SHAPING]=5,
-		[Talents.T_ESSENCE_OF_SPEED]=1,
+		[Talents.T_SPELL_SHAPING]={base=5, every=7, max=7},
+		[Talents.T_ESSENCE_OF_SPEED]={base=1, every=6, max=7},
 	},
 	resolvers.sustains_at_birth(),