Angolwen is now popualted with NPCs

git-svn-id: http://svn.net-core.org/repos/t-engine4@2163 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Actor.lua

@@ -1350,7 +1350,7 @@ function _M:preUseTalent(ab, silent, fake)
 		return false
 	end
 
-	if not self:enoughEnergy() then return false end
+	if not self:enoughEnergy() and not fake then return false end
 
 	if ab.mode == "sustained" then
 		if ab.sustain_mana and self.max_mana < ab.sustain_mana and not self:isTalentActive(ab.id) then

game/modules/tome/class/NPC.lua

@@ -118,7 +118,7 @@ function _M:onTakeHit(value, src)
 		-- Call for help if we become hostile
 		for i = 1, #self.fov.actors_dist do
 			local act = self.fov.actors_dist[i]
-			if act and act ~= self and self:reactionToward(act) > 0 and not act.dead then
+			if act and act ~= self and self:reactionToward(act) > 0 and not act.dead and act.checkAngered then
 				act:checkAngered(src, false, -50)
 			end
 		end
@@ -140,7 +140,7 @@ function _M:die(src)
 		-- Call for help if we become hostile
 		for i = 1, #self.fov.actors_dist do
 			local act = self.fov.actors_dist[i]
-			if act and act ~= self and act:reactionToward(rsrc) >= 0 and self:reactionToward(act) > 0 and not act.dead then
+			if act and act ~= self and act:reactionToward(rsrc) >= 0 and self:reactionToward(act) > 0 and not act.dead and act.checkAngered then
 				act:checkAngered(src, false, -101)
 			end
 		end

game/modules/tome/data/zones/town-angolwen/npcs.lua

@@ -39,6 +39,7 @@ newEntity{ define_as = "SUPREME_ARCHMAGE_LINANIIL",
 	teleport_immune = 1,
 	move_others=true,
 	combat_spellpower = 30,
+	anger_emote = "Remove @himher@!",
 
 	open_door = true,
 
@@ -79,3 +80,97 @@ newEntity{ define_as = "SUPREME_ARCHMAGE_LINANIIL",
 
 	can_talk = "angolwen-leader",
 }
+
+newEntity{
+	define_as = "BASE_NPC_ANGOLWEN_TOWN",
+	type = "humanoid", subtype = "human",
+	display = "p", color=colors.WHITE,
+	faction = "angolwen",
+	anger_emote = "Catch @himher@!",
+
+	combat = { dam=resolvers.rngavg(1,2), atk=2, apr=0, dammod={str=0.4} },
+
+	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, QUIVER=1 },
+	lite = 3,
+
+	life_rating = 11,
+	rank = 2,
+	size_category = 3,
+
+	open_door = true,
+
+	autolevel = "caster",
+	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=3, },
+	energy = { mod=1 },
+	stats = { str=8, dex=8, mag=16, wil=18, con=10 },
+}
+
+newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
+	name = "apprentice mage", color=colors.RED,
+	desc = [[An apprentice, learning the ways of the arcane arts.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(70,80),
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+		{type="armor", subtype="cloth", autoreq=true},
+	},
+	combat_armor = 2, combat_def = 0,
+	resolvers.talents{ [Talents.T_MANATHRUST]=2, [Talents.T_FREEZE]=1, },
+}
+
+newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
+	name = "pyromancer", color=colors.LIGHT_RED,
+	desc = [[An archmage specialized in fire magic.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(70,80),
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+		{type="armor", subtype="cloth", autoreq=true},
+	},
+	combat_armor = 2, combat_def = 0,
+	resolvers.talents{ [Talents.T_FLAME]=3, [Talents.T_WILDFIRE]=3, [Talents.T_DANCING_FIRES]=3, [Talents.T_BLASTWAVE]=3, },
+}
+
+newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
+	name = "cryomancer", color=colors.LIGHT_BLUE,
+	desc = [[An archmage specialized in ice magic.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(70,80),
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+		{type="armor", subtype="cloth", autoreq=true},
+	},
+	combat_armor = 2, combat_def = 0,
+	resolvers.talents{ [Talents.T_ICE_SHARDS]=3, [Talents.T_UTTERCOLD]=3, [Talents.T_FREEZE]=3, [Talents.T_FROZEN_GROUND]=3, },
+}
+
+newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
+	name = "geomancer", color=colors.UMBER,
+	desc = [[An archmage specialized in earth magic.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(70,80),
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+		{type="armor", subtype="cloth", autoreq=true},
+	},
+	combat_armor = 2, combat_def = 0,
+	resolvers.talents{ [Talents.T_EARTHEN_MISSILES]=3, [Talents.T_CRYSTALLINE_FOCUS]=3, [Talents.T_BODY_OF_STONE]=3, [Talents.T_STRIKE]=3, },
+}
+
+newEntity{ base = "BASE_NPC_ANGOLWEN_TOWN",
+	name = "tempest", color=colors.WHITE,
+	desc = [[An archmage specialized in lightning magic.]],
+	level_range = {1, nil}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(70,80),
+	resolvers.equip{
+		{type="weapon", subtype="staff", autoreq=true},
+		{type="armor", subtype="cloth", autoreq=true},
+	},
+	combat_armor = 2, combat_def = 0,
+	resolvers.talents{ [Talents.T_LIGHTNING]=3, [Talents.T_TEMPEST]=3, [Talents.T_HURRICANE]=3, [Talents.T_SHOCK]=3, },
+}

game/modules/tome/data/zones/town-angolwen/zone.lua

@@ -19,6 +19,7 @@
 
 return {
 	name = "Angolwen",
+	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	level_range = {20, 20},
 	max_level = 1,
 	width = 50, height = 50,
@@ -35,7 +36,7 @@ return {
 		},
 		actor = {
 			class = "engine.generator.actor.Random",
-			nb_npc = {0, 0},
+			nb_npc = {10, 10},
 		},
 		object = {
 			class = "engine.generator.object.Random",