Fix Trap Priming

@@ -26,7 +26,7 @@ local base_chat
 local function generate_traps()
 	local answers = {{_t"[Cancel]", tier=0}}
 		for i, tid in pairs(trapping_tids) do
-			local t = npc:getTalentFromId(tid)
+			local t = player:getTalentFromId(tid)
 			local tier = t.trap_mastery_level
 			local canlearn, unlearnable = player:canLearnTalent(t)
 			if t.allow_primed_trigger and tier <= chat_level then -- trap can be primed

@@ -167,7 +167,7 @@ newTalent{
 					end
 				end,
 				dig = function(src, x, y, old)
-					game.level:removeEntity(old)
+					game.level:removeEntity(old, true)
 					return nil, old.old_feat
 				end,
 				summoner_gain_exp = true,

@@ -3600,6 +3600,7 @@ newEffect{
 	on_timeout = function(self, eff)
 		local severed = false
 		local src = eff.src or self
+		if src:attr("dead") or not src.x then return end
 		if core.fov.distance(self.x, self.y, src.x, src.y) >= eff.free or src.dead or not game.level:hasEntity(src) then severed = true end
 		if rng.percent(eff.free_chance) then severed = true end
 

@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
 short_name = "tome"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "https://te4.org/"
-version = {1,7,3}
-engine = {1,7,3,"te4"}
+version = {1,7,4}
+engine = {1,7,4,"te4"}
 description = [[
 Welcome to Maj'Eyal.