Fix weapon damage on early NPCs

One consequence of the weapon formula and mastery changes is that the first weapon mastery point is worth far more.  This is good for PCs, but a little over the top on some starting NPCs.

As it turns out this works out well since the weapon NPCs are still stronger than other early things just by virtue of the fact that get to use gear.

game/modules/tome/data/general/npcs/elven-warrior.lua

@@ -42,7 +42,7 @@ newEntity{
 	open_door = true,
 
 	resolvers.racial(),
-	resolvers.talents{ [Talents.T_ARMOUR_TRAINING]=3, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=1, every=10, max=5} },
+	resolvers.talents{ [Talents.T_ARMOUR_TRAINING]=3, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=0, every=10, max=5} },
 
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=3, },

game/modules/tome/data/general/npcs/skeleton.lua

@@ -107,7 +107,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
 	max_life = resolvers.rngavg(90,100),
 	combat_armor = 5, combat_def = 1,
 	resolvers.equip{ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true} },
-	resolvers.talents{ [Talents.T_STUNNING_BLOW]={base=1, every=7, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=1, every=10, max=5}, },
+	resolvers.talents{ [Talents.T_STUNNING_BLOW]={base=1, every=7, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_WEAPONS_MASTERY]={base=0, every=10, max=5}, },
 	ai_state = { talent_in=2, },
 }
 
@@ -118,7 +118,7 @@ newEntity{ base = "BASE_NPC_SKELETON",
 	rarity = 3,
 	max_life = resolvers.rngavg(70,80),
 	combat_armor = 5, combat_def = 1,
-	resolvers.talents{ [Talents.T_BOW_MASTERY]={base=1, every=10, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_SHOOT]=1, },
+	resolvers.talents{ [Talents.T_BOW_MASTERY]={base=0, every=10, max=5}, [Talents.T_WEAPON_COMBAT]={base=1, every=10, max=5}, [Talents.T_SHOOT]=1, },
 	ai_state = { talent_in=1, },
 
 	autolevel = "archer",

game/modules/tome/data/general/npcs/yaech.lua

@@ -56,7 +56,7 @@ newEntity{ base = "BASE_NPC_YAECH",
 	},
 	resolvers.talents{
 		[Talents.T_KINETIC_SHIELD]={base=1, every=15, max=3},
-		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=10, max=5},
 	},
 }
 
@@ -70,7 +70,7 @@ newEntity{ base = "BASE_NPC_YAECH",
 		{type="weapon", subtype="trident", autoreq=true, special_rarity="trident_rarity"},
 	},
 	resolvers.talents{
-		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=10, max=5},
 		[Talents.T_MINDHOOK]={base=1, every=7, max=5},
 		[Talents.T_PERFECT_CONTROL]={base=2, every=7, max=5},
 	},
@@ -90,7 +90,7 @@ newEntity{ base = "BASE_NPC_YAECH",
 		[Talents.T_KINETIC_AURA]={base=1, every=7, max=5},
 		[Talents.T_CHARGED_AURA]={base=1, every=7, max=5},
 		[Talents.T_KINETIC_SHIELD]={base=2, every=7, max=5},
-		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=10, max=5},
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=10, max=5},
 	},
 }
 

game/modules/tome/data/zones/murgol-lair/npcs.lua

@@ -112,7 +112,7 @@ newEntity{ base = "BASE_NPC_NAGA", define_as = "NAGA_TIDEWARDEN",
 		{type="weapon", subtype="trident", autoreq=true, force_drop=true, special_rarity="trident_rarity"},
 	},
 	resolvers.talents{
-		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=8, max=6},
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=8, max=6},
 		[Talents.T_SPIT_POISON]={base=1, every=10, max=5},
 	},
 }
@@ -181,7 +181,7 @@ newEntity{ base="BASE_NPC_NAGA", define_as = "NASHVA",
 		[Talents.T_SPIT_POISON]={base=2, every=10, max=5},
 		[Talents.T_CHARGE_LEECH]={base=2, every=10, max=5},
 		[Talents.T_DISTORTION_BOLT]={base=2, every=10, max=5},
-		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=1, every=8, max=6},
+		[Talents.T_EXOTIC_WEAPONS_MASTERY]={base=0, every=8, max=6},
 	},
 	resolvers.inscriptions(1, {"movement infusion"}),
 

game/modules/tome/data/zones/reknor-escape/npcs.lua

@@ -20,7 +20,15 @@
 load("/data/general/npcs/rodent.lua", rarity(0))
 load("/data/general/npcs/vermin.lua", rarity(2))
 load("/data/general/npcs/molds.lua", rarity(1))
-load("/data/general/npcs/orc.lua", function(e) if e.level_range and e.level_range[1] == 10 then e.level_range[1] = 1 e.start_level = 1 end end) -- Make orcs lower level, not a problem we have norgan to help!
+load("/data/general/npcs/orc.lua", function(e)
+	if e.level_range and e.level_range[1] == 10 then
+		e.level_range[1] = 1 
+		e.start_level = 1
+		e.on_added_to_level = function(self)  -- Avoid the frontloading of the new weapon mastery formula but don't impact Orcs later
+			self.talents.T_WEAPONS_MASTERY = nil
+			self.talents.T_BOW_MASTERY = nil
+		end
+	end end) -- Make orcs lower level, not a problem we have norgan to help!
 load("/data/general/npcs/snake.lua", rarity(2))
 
 load("/data/general/npcs/all.lua", rarity(4, 35))
@@ -62,7 +70,6 @@ newEntity{ define_as = "BROTOQ",
 		[Talents.T_CARRIER]=1,
 		[Talents.T_ACID_BLOOD]=1,
 		[Talents.T_REND]=2,
-		[Talents.T_WEAPONS_MASTERY]=1,
 	},
 	resolvers.inscriptions(1, {"wild infusion"}),