Fix Tentacle Grab using old Grapple code and revise a bit

@@ -528,7 +528,7 @@ newTalent{
 	requires_target = true,
 	target = function(self, t) return {type="bolt", range=self:getTalentRange(t), talent=t} end,
 	getDamage = function(self, t) return self:combatTalentMindDamage(t, 5, 70) end,
-	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
+	getDuration = function(self, t) return 5 end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
 		local x, y = self:getTarget(tg)
@@ -537,7 +537,6 @@ newTalent{
 		local crit = self:mindCrit(1)
 
 		if target:canBe("pin") and self:checkHit(self:combatMindpower(), target:combatPhysicalResist()) then
-			target:setEffect(target.EFF_GRAPPLED, t.getDuration(self, t), {src=self, power=t.getDamage(self, t)/2 * crit})
 			self:project(tg, x, y, function(px, py)
 
 				target:pull(self.x, self.y, tg.range)
@@ -558,7 +557,7 @@ newTalent{
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local duration = t.getDuration(self, t)
-		return ([[Grab a target and drag it to your side, holding it down and strangling it for %d turns.
+		return ([[Grab a target and drag it to your side, holding it in place and silencing non-undead and creatures that need to breathe for %d turns.
 		The grab will also deal %0.2f slime damage per turn.
 		The damage will increase with your Mindpower.]]):
 		format(duration, damDesc(self, DamageType.SLIME, damage))

@@ -1469,19 +1469,24 @@ newEffect{
 	desc = "Crushing Hold",
 	long_desc = function(self, eff) return ("The target is being crushed and suffers %d damage each turn"):format(eff.power) end,
 	type = "physical",
-	subtype = { grapple=true },
+	subtype = { grapple=true, pin=true },
 	status = "detrimental",
 	parameters = { power=1 },
 	on_gain = function(self, err) return "#Target# is being crushed.", "+Crushing Hold" end,
 	on_lose = function(self, err) return "#Target# has escaped the crushing hold.", "-Crushing Hold" end,
 	on_timeout = function(self, eff)
-		local p = self:hasEffect(self.EFF_GRAPPLED)
-		if core.fov.distance(self.x, self.y, eff.src.x, eff.src.y) > 1 or eff.src.dead or not game.level:hasEntity(eff.src) or not (p and p.src == eff.src) then
+		if core.fov.distance(self.x, self.y, eff.src.x, eff.src.y) > 1 or eff.src.dead or not game.level:hasEntity(eff.src) then
 			self:removeEffect(self.EFF_CRUSHING_HOLD)
+		elseif eff.damtype then
+			local type = eff.damtype
+			DamageType:get(DamageType[type]).projector(eff.src or self, self.x, self.y, DamageType[type], eff.power)
 		else
 			DamageType:get(DamageType.PHYSICAL).projector(eff.src or self, self.x, self.y, DamageType.PHYSICAL, eff.power)
 		end
 	end,
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "never_move", 1)
+	end,
 }
 
 newEffect{
@@ -1489,14 +1494,13 @@ newEffect{
 	desc = "Strangle Hold",
 	long_desc = function(self, eff) return ("The target is being strangled and may not cast spells and suffers %d damage each turn."):format(eff.power) end,
 	type = "physical",
-	subtype = { grapple=true, silence=true },
+	subtype = { grapple=true, pin=true, silence=true },
 	status = "detrimental",
 	parameters = { power=1 },
 	on_gain = function(self, err) return "#Target# is being strangled.", "+Strangle Hold" end,
 	on_lose = function(self, err) return "#Target# has escaped the strangle hold.", "-Strangle Hold" end,
 	on_timeout = function(self, eff)
-		local p = self:hasEffect(self.EFF_GRAPPLED)
-		if core.fov.distance(self.x, self.y, eff.src.x, eff.src.y) > 1 or eff.src.dead or not game.level:hasEntity(eff.src) or not (p and p.src == eff.src) then
+		if core.fov.distance(self.x, self.y, eff.src.x, eff.src.y) > 1 or eff.src.dead or not game.level:hasEntity(eff.src) then
 			self:removeEffect(self.EFF_STRANGLE_HOLD)
 		elseif eff.damtype then
 			local type = eff.damtype
@@ -1506,10 +1510,10 @@ newEffect{
 		end
 	end,
 	activate = function(self, eff)
-		eff.tmpid = self:addTemporaryValue("silence", 1)
+		self:effectTemporaryValue(eff, "silence", 1)
+		self:effectTemporaryValue(eff, "never_move", 1)
 	end,
 	deactivate = function(self, eff)
-		self:removeTemporaryValue("silence", eff.tmpid)
 	end,
 }