Arcane Blades lost the Divination tree in favour of the Aegis tree

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

game/modules/tome/class/Player.lua

@@ -681,6 +681,7 @@ function _M:playerPickup()
 		local titleupdator = self:getEncumberTitleUpdator("Pickup")
 		local d d = self:showPickupFloor(titleupdator(), nil, function(o, item)
 			self:pickupFloor(item, true)
+			d:select(d.c_list.list[d.c_list.sel])
 			self.changed = true
 			d:updateTitle(titleupdator())
 			d:used()

game/modules/tome/data/birth/classes/warrior.lua

@@ -146,7 +146,7 @@ newBirthDescriptor{
 		["spell/fire"]={true, 0.2},
 		["spell/air"]={true, 0.2},
 		["spell/conveyance"]={false, 0.2},
-		["spell/divination"]={false, 0.2},
+		["spell/aegis"]={false, 0.2},
 		["spell/enhancement"]={true, 0.2},
 		["technique/2hweapon-cripple"]={true, 0.1},
 		["technique/combat-techniques-active"]={true, 0.1},

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

@@ -72,9 +72,7 @@ newEntity{ base = "BASE_NPC_TROLL",
 	rarity = 1,
 	max_life = resolvers.rngavg(120,140),
 	combat_armor = 7, combat_def = 0,
-	resolvers.talents{
-	[Talents.T_FEED]=5,[Talents.T_FEED_STRENGTHS]=5,
-	[Talents.T_STUN]={base=1, every=7, max=5}, [Talents.T_KNOCKBACK]={base=1, every=7, max=5}, },
+	resolvers.talents{[Talents.T_STUN]={base=1, every=7, max=5}, [Talents.T_KNOCKBACK]={base=1, every=7, max=5}, },
 }
 
 newEntity{ base = "BASE_NPC_TROLL",

game/modules/tome/data/talents/cunning/dirty.lua

@@ -86,17 +86,19 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+		local tx, ty, sx, sy = target.x, target.y, self.x, self.y
 		local hitted = self:attackTarget(target, nil, 0, true)
 
 		if hitted then
 			self:setEffect(self.EFF_EVASION, t.getDuration(self, t), {chance=50})
 
 			-- Displace
-			local tx, ty, sx, sy = target.x, target.y, self.x, self.y
-			target.x = nil target.y = nil
 			self.x = nil self.y = nil
-			target:move(sx, sy, true)
 			self:move(tx, ty, true)
+			if not target.dead then
+				target.x = nil target.y = nil
+				target:move(sx, sy, true)
+			end
 		end
 
 		return true