Merge branch 'master' into NPCObjectUse

game/modules/tome/data/factions.lua

@@ -19,37 +19,38 @@
 
 -- CSV export
 local src = [[
-,Enemies,Undead,Allied Kingdoms,Shalore,Thalore,Iron Throne,The Way,Angolwen,Keepers of Reality,Dreadfell,,Temple of Creation|H,Water lair|H,Assassin lair|H,Rhalore,Zigur,,Vargh Republic,Sunwall,Orc Pride,,Sandworm Burrowers,Victim,Slavers,,Sorcerers,Fearscape,,Sher'Tul,Cosmic Fauna
-Enemies,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Undead,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Allied Kingdoms,-1,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Shalore,-1,-1,0.5,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Thalore,-1,-1,0.7,0.2,,,,,,,,,,,,,,,,,,,,,,,,,,
-Iron Throne,-1,-1,0.2,0.2,0.2,,,,,,,,,,,,,,,,,,,,,,,,,
-The Way,-1,-1,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,
-Angolwen,-1,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Keepers of Reality,-1,-1,,,,,,0,2,,,,,,,,,,,,,,,,,,,,,,
-Dreadfell,,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Temple of Creation|H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Water lair|H,-1,,,,,,,,,,,-1,,,,,,,,,,,,,,,,,,
-Assassin lair|H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Rhalore,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,-1,-1,,,,,,,,,,,,,,,,
-Zigur,-1,-1,1,1,1,1,0.2,-1,0,-1,,,,,-1,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Vargh Republic,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,,-1,-1,-1,,,,,,,,,,,,,,
-Sunwall,-1,-1,,,,,,,,-1,,,,-1,-1,,,-1,,,,,,,,,,,,
-Orc Pride,,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,-1,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Sandworm Burrowers,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Victim,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Slavers,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Sorcerers,,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,-1,1,,,,,,,,,,
-Fearscape,,-1,-1,-1,-1,-1,-1,-1,-1,,,-1,-1,-1,-1,-1,,-1,-1,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-Sher'Tul,,,,,,,,,,,,,,,,,,,,,,,,,,,-1,,,
-Cosmic Fauna,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,-1,-1,-1,-1,,-1,-1,-1,,-1,-1,-1,,-1,-1,,-1,
+,Enemies,Undead,Allied Kingdoms,Shalore,Thalore,Iron Throne,The Way,Angolwen,Keepers of Reality,Dreadfell,,Temple of Creation|H,Water lair|H,Assassin lair|H,Rhalore,Zigur,,Vargh Republic,Sunwall,Orc Pride,,Sandworm Burrowers,Victim,Slavers,,Sorcerers,Fearscape,,Sher'Tul,Cosmic Fauna,Horrors
+Enemies,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Undead,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Allied Kingdoms,-1,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Shalore,-1,-1,0.5,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Thalore,-1,-1,0.7,0.2,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Iron Throne,-1,-1,0.2,0.2,0.2,,,,,,,,,,,,,,,,,,,,,,,,,,
+The Way,-1,-1,0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,
+Angolwen,-1,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Keepers of Reality,-1,-1,,,,,,0.2,,,,,,,,,,,,,,,,,,,,,,,
+Dreadfell,,-1,-1,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Temple of Creation|H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Water lair|H,-1,,,,,,,,,,,-1,,,,,,,,,,,,,,,,,,,
+Assassin lair|H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Rhalore,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,-1,-1,,,,,,,,,,,,,,,,,
+Zigur,-1,-1,1,1,1,1,0.2,-1,0,-1,,,,,-1,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Vargh Republic,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,,-1,-1,-1,,,,,,,,,,,,,,,
+Sunwall,-1,-1,,,,,,,,-1,,,,-1,-1,,,-1,,,,,,,,,,,,,
+Orc Pride,,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,-1,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Sandworm Burrowers,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Victim,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Slavers,-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Sorcerers,,-1,-1,-1,-1,-1,-1,-1,-1,-1,,,,,-1,-1,,-1,-1,1,,,,,,,,,,,
+Fearscape,,-1,-1,-1,-1,-1,-1,-1,-1,,,-1,-1,-1,-1,-1,,-1,-1,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Sher'Tul,,,,,,,,,,,,,,,,,,,,,,,,,,,-1,,,,
+Cosmic Fauna,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,-1,-1,-1,-1,-1,,-1,-1,-1,,-1,-1,-1,,-1,-1,,-1,,
+Horrors,,-1,-1,-1,-1,-1,-1,-1,-1,,,-1,-1,-1,-1,-1,,-1,-1,-1,,,-1,-1,,-1,-1,,,-1,
 ]]
 
 local facts = {}

game/modules/tome/data/general/npcs/bone-giant.lua

@@ -34,10 +34,11 @@ newEntity{
 	max_stamina = 90,
 	rank = 2,
 	size_category = 4,
+	movement_speed = 1.5,
 
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=2, },
-	stats = { str=20, dex=52, mag=16, con=16 },
+	stats = { str=20, dex=12, mag=16, con=16 },
 
 	resists = { [DamageType.PHYSICAL] = 20, [DamageType.BLIGHT] = 20, [DamageType.COLD] = 50, },
 
@@ -72,7 +73,7 @@ newEntity{ base = "BASE_NPC_BONE_GIANT",
 	name = "eternal bone giant", color=colors.GREY,
 	desc = [[A towering creature, made from the bones of hundreds of dead bodies. It is covered by an unholy aura.]],
 	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_giant_eternal_bone_giant.png", display_h=2, display_y=-1}}},
-	level_range = {33, nil}, exp_worth = 1,
+	level_range = {30, nil}, exp_worth = 1,
 	rarity = 3,
 	max_life = resolvers.rngavg(100,120),
 	combat_armor = 40, combat_def = 20,

game/modules/tome/data/general/npcs/horror-corrupted.lua

@@ -27,6 +27,7 @@ newEntity{
 	body = { INVEN = 10 },
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=3, },
+	faction = "horrors",
 
 	combat_armor = 0, combat_def = 0,
 	combat = { atk=2, dammod={str=0.6} },

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

@@ -29,6 +29,7 @@ newEntity{
 	body = { INVEN = 10 },
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=3, },
+	faction = "horrors",
 
 	stats = { str=20, dex=20, wil=20, mag=20, con=20, cun=20 },
 	combat_armor = 5, combat_def = 10,

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

@@ -29,6 +29,7 @@ newEntity{
 	body = { INVEN = 10 },
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_complex", talent_in=3, },
+	faction = "horrors",
 
 	stats = { str=20, dex=20, wil=20, mag=20, con=20, cun=20 },
 	combat_armor = 5, combat_def = 10,

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

@@ -57,6 +57,7 @@ newEntity{
 
 newEntity{ base = "BASE_NPC_SKELETON",
 	name = "degenerated skeleton warrior", color=colors.WHITE, image="npc/degenerated_skeleton_warrior.png",
+	desc=[[A haphazard collection of crumbling bones, with jerky movements that remind you of a child playing with a marionette.  It only has one arm, but that's all it needs to hold a sword.]],
 	level_range = {1, 18}, exp_worth = 1,
 	rarity = 1,
 	resolvers.equip{ {type="weapon", subtype="greatsword", forbid_power_source={antimagic=true}, autoreq=true} },
@@ -65,25 +66,29 @@ newEntity{ base = "BASE_NPC_SKELETON",
 }
 
 newEntity{ base = "BASE_NPC_SKELETON",
-	name = "skeleton warrior", color=colors.SLATE, image="npc/skeleton_warrior.png",
-	level_range = {3, nil}, exp_worth = 1,
-	rarity = 1,
-	max_life = resolvers.rngavg(90,100),
+	name = "degenerated skeleton archer", color=colors.UMBER,
+	desc=[[A frail skeleton; just about the only bones that aren't cracked are its arms.  It's missing a hand, but a notch has been carved into its wrist to let it pull back a bowstring regardless.]],
+	level_range = {3, 20}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(70,80),
 	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_SHOOT]=1, },
 	ai_state = { talent_in=1, },
+
+	autolevel = "archer",
+	resolvers.equip{ {type="weapon", subtype="longbow", forbid_power_source={antimagic=true}, autoreq=true, ego_chance=-1000}, {type="ammo", subtype="arrow", forbid_power_source={antimagic=true}, autoreq=true, ego_chance=-1000} },
 }
 
 newEntity{ base = "BASE_NPC_SKELETON",
 	name = "skeleton mage", color=colors.LIGHT_RED, image="npc/skeleton_mage.png",
-	level_range = {4, nil}, exp_worth = 1,
+	desc=[[Given its condition, you're less inclined to think this skeleton knows proper spells, rather than simply disgorging its magical energy as it breaks down.  This doesn't make it much less dangerous to be around, mind you.]],
+	level_range = {5, 25}, exp_worth = 1,
 	rarity = 3,
 	max_life = resolvers.rngavg(50,60),
 	max_mana = resolvers.rngavg(70,80),
 	combat_armor = 3, combat_def = 1,
 	stats = { str=10, dex=12, cun=14, mag=14, con=10 },
-	resolvers.talents{ [Talents.T_FLAME]={base=1, every=7, max=5}, [Talents.T_MANATHRUST]={base=2, every=7, max=5} },
+	resolvers.talents{ [Talents.T_FLAME]={base=1, every=7, max=5}, [Talents.T_MANATHRUST]={base=1, every=7, max=5} },
 
 	resolvers.equip{ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true} },
 
@@ -92,9 +97,22 @@ newEntity{ base = "BASE_NPC_SKELETON",
 	ingredient_on_death = "SKELETON_MAGE_SKULL",
 }
 
+newEntity{ base = "BASE_NPC_SKELETON",
+	name = "skeleton warrior", color=colors.SLATE, image="npc/skeleton_warrior.png",
+	desc=[[The forces binding this skeleton together are resilient enough to let it hold a shield and swing a weapon as well as it could have in life.  It's still wearing its old armor, in rusty but servicable condition.]],
+	level_range = {7, nil}, exp_worth = 1,
+	rarity = 1,
+	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}, },
+	ai_state = { talent_in=2, },
+}
+
 newEntity{ base = "BASE_NPC_SKELETON",
 	name = "skeleton archer", color=colors.UMBER, image="npc/skeleton_archer.png",
-	level_range = {5, nil}, exp_worth = 1,
+	desc=[[Nobody scavenged the high-quality bow from this archer before it was raised from the dead.  You're about to wish the world had more grave-robbers.]],
+	level_range = {9, nil}, exp_worth = 1,
 	rarity = 3,
 	max_life = resolvers.rngavg(70,80),
 	combat_armor = 5, combat_def = 1,
@@ -106,25 +124,27 @@ newEntity{ base = "BASE_NPC_SKELETON",
 }
 
 newEntity{ base = "BASE_NPC_SKELETON",
-	name = "skeleton master archer", color=colors.LIGHT_UMBER, image="npc/master_skeleton_archer.png",
-	level_range = {15, nil}, exp_worth = 1,
-	rarity = 5,
-	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, [Talents.T_PINNING_SHOT]=3, [Talents.T_CRIPPLING_SHOT]=3, },
-	ai_state = { talent_in=1, },
-	rank = 3,
+	name = "skeleton magus", color=colors.LIGHT_RED,
+	desc=[[This skeleton has been imbued with far more magical energy than normal, and serves as a conduit of its master's spellcasting prowess.]],
+	level_range = {11, nil}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(50,60),
+	max_mana = resolvers.rngavg(70,80),
+	combat_armor = 3, combat_def = 1,
+	stats = { str=10, dex=12, cun=16, mag=18, con=10 },
+	resolvers.talents{ [Talents.T_FLAME]={base=2, every=7, max=5}, [Talents.T_MANATHRUST]={base=2, every=7, max=5}, [Talents.T_ARCANE_POWER]={base=2, every=7, max=5} },
 
-	ai = "tactical",
-	ai_tactic = resolvers.tactic"ranged",
+	resolvers.equip{ {type="weapon", subtype="staff", forbid_power_source={antimagic=true}, autoreq=true} },
 
-	autolevel = "archer",
-	resolvers.equip{ {type="weapon", subtype="longbow", forbid_power_source={antimagic=true}, autoreq=true}, {type="ammo", subtype="arrow", forbid_power_source={antimagic=true}, autoreq=true} },
+	autolevel = "caster",
+	ai = "dumb_talented_simple", ai_state = { talent_in=2, },
+	ingredient_on_death = "SKELETON_MAGE_SKULL",
 }
 
 newEntity{ base = "BASE_NPC_SKELETON",
 	name = "armoured skeleton warrior", color=colors.STEEL_BLUE, image="npc/armored_skeleton_warrior.png",
-	level_range = {10, nil}, exp_worth = 1,
+	desc=[[It feels no pain.  It moves with fluidity and strength that would tear natural muscles apart.  It must be from a fresh corpse, since its bones, armor, and weapon are all in pristine condition.  And it's furious.]],
+	level_range = {13, nil}, exp_worth = 1,
 	rarity = 5,
 	max_life = resolvers.rngavg(90,100),
 	combat_armor = 5, combat_def = 1,
@@ -144,5 +164,57 @@ newEntity{ base = "BASE_NPC_SKELETON",
 		[Talents.T_DISARM]={base=3, every=7, max=7},
 	},
 	resolvers.equip{ {type="weapon", subtype="longsword", forbid_power_source={antimagic=true}, autoreq=true}, {type="armor", subtype="shield", forbid_power_source={antimagic=true}, autoreq=true}, {type="armor", subtype="heavy", forbid_power_source={antimagic=true}, autoreq=true} },
+	ai_state = { talent_in=2, },
+}
+
+newEntity{ base = "BASE_NPC_SKELETON",
+	name = "skeleton master archer", color=colors.LIGHT_UMBER, image="npc/master_skeleton_archer.png",
+	desc=[[This skeleton can fire arrows and nock new ones with blinding speed.  Arcane forces pull its bones with unnatural precision - its arms will never tremble or get tired.]],
+	level_range = {15, nil}, exp_worth = 1,
+	rarity = 5,
+	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, [Talents.T_PINNING_SHOT]={base=1, every=10, max=5}, [Talents.T_CRIPPLING_SHOT]={base=1, every=10, max=5}, },
 	ai_state = { talent_in=1, },
+	rank = 3,
+
+	ai = "tactical",
+	ai_tactic = resolvers.tactic"ranged",
+
+	autolevel = "archer",
+	resolvers.equip{ {type="weapon", subtype="longbow", forbid_power_source={antimagic=true}, autoreq=true}, {type="ammo", subtype="arrow", forbid_power_source={antimagic=true}, autoreq=true} },
+}
+
+newEntity{ base = "BASE_NPC_SKELETON",
+	name = "skeleton assassin", color=colors.DARK_BLUE,
+	desc=[[Most skeletons announce their presence with a chorus of rattling bones; this one's been charred black and has enough cartilage between its joints to muffle its approach.  The first you'll see of it will be the flash of its blade.]],
+	level_range = {20, nil}, exp_worth = 1,
+	rarity = 15,
+	max_life = resolvers.rngavg(90,100),
+	combat_armor = 5, combat_def = 1,
+	rank = 3,
+
+	ai = "tactical",
+	ai_tactic = resolvers.tactic"melee",
+	ai_state = { talent_in=2, },
+	
+	resolvers.inscriptions(1, "rune"),
+	resolvers.talents{
+		[Talents.T_DUAL_WEAPON_DEFENSE]={base=1, every=10, max=7},
+		[Talents.T_DUAL_WEAPON_TRAINING]={base=1, every=10, max=7},
+		[Talents.T_FLURRY]={base=1, every=10, max=7},
+		[Talents.T_DIRTY_FIGHTING]={base=1, every=10, max=7},
+		[Talents.T_LETHALITY]={base=1, every=10, max=7},
+		[Talents.T_WEAPON_COMBAT]={base=1, every=10, max=7},
+		[Talents.T_KNIFE_MASTERY]={base=1, every=10, max=7},
+		[Talents.T_SHADOW_COMBAT]={base=1, every=10, max=7},
+		[Talents.T_SHADOWSTEP]={base=1, every=10, max=7},
+		[Talents.T_STEALTH]={base=2, every=10, max=7},
+	},
+	
+	resolvers.equip{
+		{type="weapon", subtype="dagger", autoreq=true, forbid_power_source={antimagic=true}},
+		{type="weapon", subtype="dagger", autoreq=true, forbid_power_source={antimagic=true}},
+		{type="armor", subtype="light", autoreq=true, forbid_power_source={antimagic=true}},
+	},
 }

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

@@ -62,21 +62,21 @@ newEntity{
 newEntity{ base = "BASE_NPC_VAMPIRE",
 	name = "lesser vampire", color=colors.SLATE, image = "npc/lesser_vampire.png",
 	desc=[[This vampire has only just begun its new life. It has not yet fathomed its newfound power, yet it still has a thirst for blood.]],
-	level_range = {15, nil}, exp_worth = 1,
+	level_range = {10, nil}, exp_worth = 1,
 	rarity = 1,
 	max_life = resolvers.rngavg(40,50),
 	combat_armor = 7, combat_def = 6,
 
 	resolvers.talents{
 		[Talents.T_STUN]={base=1, every=7, max=5},
-		[Talents.T_INVOKE_DARKNESS]={base=3, every=7, max=5},
+		[Talents.T_INVOKE_DARKNESS]={base=2, every=7, max=5},
 	},
 }
 
 newEntity{ base = "BASE_NPC_VAMPIRE",
 	name = "vampire", color=colors.SLATE, image = "npc/vampire.png",
 	desc=[[It is a humanoid with an aura of power. You notice a sharp set of front teeth.]],
-	level_range = {20, nil}, exp_worth = 1,
+	level_range = {15, nil}, exp_worth = 1,
 	rarity = 1,
 	max_life = resolvers.rngavg(70,80),
 	combat_armor = 9, combat_def = 6,
@@ -93,7 +93,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE",
 	name = "master vampire", color=colors.GREEN, image = "npc/master_vampire.png",
 	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/master_vampire.png", display_h=2, display_y=-1}}},
 	desc=[[It is a humanoid form dressed in robes. Power emanates from its chilling frame.]],
-	level_range = {23, nil}, exp_worth = 1,
+	level_range = {20, nil}, exp_worth = 1,
 	rarity = 1,
 	max_life = resolvers.rngavg(80,90),
 	combat_armor = 10, combat_def = 8,
@@ -111,7 +111,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE",
 	name = "elder vampire", color=colors.RED, image = "npc/elder_vampire.png",
 	desc=[[A terrible robed undead figure, this creature has existed in its unlife for many centuries by stealing the life of others.
 It can summon the very shades of its victims from beyond the grave to come enslaved to its aid.]],
-	level_range = {26, nil}, exp_worth = 1,
+	level_range = {25, nil}, exp_worth = 1,
 	rarity = 1,
 	max_life = resolvers.rngavg(90,100),
 	combat_armor = 12, combat_def = 10,

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

@@ -47,7 +47,7 @@ newEntity{
 
 	open_door = true,
 
-	resolvers.tmasteries{ ["technique/other"]=0.3, ["spell/air"]=0.3, ["spell/fire"]=0.3 },
+	resolvers.tmasteries{ ["technique/other"]=0.3, ["spell/air"]=0.3, ["spell/fire"]=0.3, ["spell/water"]=0.3 },
 	resolvers.sustains_at_birth(),
 
 	resists = { [DamageType.COLD] = 80, [DamageType.FIRE] = 20, [DamageType.LIGHTNING] = 40, [DamageType.PHYSICAL] = 35, [DamageType.LIGHT] = -50, },
@@ -71,7 +71,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
 	combat_armor = 7, combat_def = 6,
 
 	resolvers.talents{
-		[Talents.T_FLAMESHOCK]={base=1, every=5, max=5}, [Talents.T_LIGHTNING]={base=1, every=5, max=5}, [Talents.T_GLACIAL_VAPOUR]={base=1, every=5, max=5},
+		[Talents.T_FLAME]={base=1, every=5, max=5}, [Talents.T_LIGHTNING]={base=1, every=5, max=5}, [Talents.T_GLACIAL_VAPOUR]={base=1, every=5, max=5},
 		[Talents.T_MIND_DISRUPTION]={base=1, every=5, max=5},
 	},
 }
@@ -93,12 +93,12 @@ newEntity{ base = "BASE_NPC_WIGHT",
 	name = "barrow wight", color=colors.LIGHT_RED, image="npc/barrow_wight.png",
 	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/barrow_wight.png", display_h=2, display_y=-1}}},
 	desc=[[It is a ghostly nightmare of an entity.]],
-	level_range = {25, nil}, exp_worth = 1,
+	level_range = {28, nil}, exp_worth = 1,
 	rarity = 2,
 	max_life = resolvers.rngavg(80,90),
 	combat_armor = 10, combat_def = 8,
 
-	resolvers.talents{ [Talents.T_FLAMESHOCK]={base=3, every=5, max=7}, [Talents.T_LIGHTNING]={base=3, every=5, max=7}, [Talents.T_GLACIAL_VAPOUR]={base=3, every=5, max=7},
+	resolvers.talents{ [Talents.T_FLAMESHOCK]={base=3, every=5, max=7}, [Talents.T_CHAIN_LIGHTNING]={base=3, every=5, max=7}, [Talents.T_GLACIAL_VAPOUR]={base=3, every=5, max=7},
 		[Talents.T_MIND_DISRUPTION]={base=3, every=5, max=7},
 	},
 }
@@ -107,7 +107,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
 	name = "emperor wight", color=colors.RED, image="npc/emperor_wight.png",
 	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/emperor_wight.png", display_h=2, display_y=-1}}},
 	desc=[[Your life force is torn from your body as this powerful unearthly being approaches.]],
-	level_range = {30, nil}, exp_worth = 1,
+	level_range = {36, nil}, exp_worth = 1,
 	rarity = 5,
 	rank = 3,
 	max_life = resolvers.rngavg(100,150),
@@ -119,7 +119,7 @@ newEntity{ base = "BASE_NPC_WIGHT",
 	make_escort = {
 		{type="undead", subtype="wight", number=resolvers.mbonus(2, 2)},
 	},
-	resolvers.talents{ [Talents.T_FLAMESHOCK]={base=3, every=5, max=7}, [Talents.T_LIGHTNING]={base=4, every=5, max=8}, [Talents.T_GLACIAL_VAPOUR]={base=3, every=5, max=7}, [Talents.T_THUNDERSTORM]={base=2, every=5, max=7},
+	resolvers.talents{ [Talents.T_FLAMESHOCK]={base=3, every=5, max=7}, [Talents.T_CHAIN_LIGHTNING]={base=4, every=5, max=8}, [Talents.T_FREEZE]={base=3, every=5, max=7}, [Talents.T_THUNDERSTORM]={base=2, every=5, max=7},
 		[Talents.T_MIND_DISRUPTION]={base=4, every=5, max=8},
 	},
 }