Merge branch 'conveyance_revision' into 'master'

Revise Conveyance

1. slightly reduce the mana cost of Phase Door, it's somewhat too much for a basic mobility talent;
2. remove the 35% failure rate of teleport, increase the mana cost, cooldown and reduce accuracy instead;
3. makes it possible to open vaults while Probability Travel is sustained

btw, makes Body of Stone not break when bumping to attack others.

See merge request !782

@@ -1390,29 +1390,34 @@ function _M:move(x, y, force)
 			end
 		end
 
+		local can_move = true
 		-- Sleeping?  Do nothing..
 		if not force and self:attr("sleep") and not self:attr("lucid_dreamer") then
 			game.logPlayer(self, "You are asleep and unable to move!")
-		-- Encased in ice, attack the ice
+			can_move = false
+			-- Encased in ice, attack the ice
 		elseif not force and self:attr("encased_in_ice") then
 			self:attackTarget(self)
 			moved = true
-		-- Should we prob travel through walls ?
+			can_move = false
+			-- Should we prob travel through walls ?
 		elseif not force and self:attr("prob_travel") and not self:attr("prob_travel_deny") and game.level.map:checkEntity(x, y, Map.TERRAIN, "block_move", self) then
-			moved = self:probabilityTravel(x, y, self:attr("prob_travel"))
-			if self:attr("prob_travel_penalty") then
+			moved = self:probabilityTravel(x, y, self:attr("prob_travel")) and (self.x ~= ox or self.y ~= oy)
+			if moved and self:attr("prob_travel_penalty") then
 				local d = core.fov.distance(ox, oy, self.x, self.y)
 				self:setEffect(self.EFF_PROB_TRAVEL_UNSTABLE, d * self:attr("prob_travel_penalty"), {})
 			end
+			can_move = not moved
+		end
 		-- Never move but tries to attack ? ok
-		elseif not force and self:attr("never_move") then
+		if not moved and can_move and not force and self:attr("never_move") then
 			-- A bit weird, but this simple asks the collision code to detect an attack
 			if not game.level.map:checkAllEntities(x, y, "block_move", self, true) then
 				game.logPlayer(self, "You are unable to move!")
 			end
-		else
-			moved = engine.Actor.move(self, x, y, force)
+			can_move = false
 		end
+		moved = moved or (can_move and engine.Actor.move(self, x, y, force))
 		if not force and moved and (self.x ~= ox or self.y ~= oy) and not self.did_energy then
 			local eff = self:hasEffect(self.EFF_CURSE_OF_SHROUDS)
 			if eff then eff.moved = true end
@@ -1475,7 +1480,7 @@ function _M:move(x, y, force)
 		t.curseFloor(self, t, x, y)
 	end
 
-	if moved and self:isTalentActive(self.T_BODY_OF_STONE) and not self:attr("preserve_body_of_stone") then
+	if moved and ox and oy and (ox ~= self.x or oy ~= self.y) and self:isTalentActive(self.T_BODY_OF_STONE) and not self:attr("preserve_body_of_stone") then
 		self:forceUseTalent(self.T_BODY_OF_STONE, {ignore_energy=true})
 	end
 

@@ -68,7 +68,7 @@ newTalent{
 	require = spells_req1,
 	points = 5,
 	random_ego = "utility",
-	mana = function(self, t) return self:attr("phase_door_force_precise") and 1 or 30 end,
+	mana = function(self, t) return self:attr("phase_door_force_precise") and 1 or 20 end,
 	cooldown = function(self, t) return self:attr("phase_door_force_precise") and 3 or 12 end,
 	tactical = teleport_tactical,
 	getRange = function(self, t) return self:combatLimit(self:combatTalentSpellDamage(t, 10, 15), 40, 4, 0, 13.4, 9.4) end, -- Limit to range 40
@@ -88,7 +88,7 @@ newTalent{
 				 _, _, _, tx, ty = self:canProject(tg, tx, ty)
 				if tx then
 					target = game.level.map(tx, ty, Map.ACTOR)
-					if ai_target and target ~= aitarget then target = self end
+					if not self:playerControlled() and aitarget and target ~= aitarget then target = self end
 				end
 			end
 		end
@@ -173,12 +173,12 @@ newTalent{
 	require = spells_req2,
 	points = 5,
 	random_ego = "utility",
-	mana = 20,
-	cooldown = 30,
+	mana = 30,
+	cooldown = 50,
 	tactical = teleport_tactical,
 	getRange = function(self, t) return 100 + self:combatSpellpower(1) end,
 	range = function(self, t) return self:getTalentLevel(t) >= 4 and 10 or 0 end, -- for targeting enemies
-	getRadius = function(self, t) return math.ceil(self:combatTalentLimit(t, 0, 19, 12)) end, -- Limit > 0
+	getRadius = function(self, t) return math.round(self:combatTalentLimit(t, 5, 30, 18)) end, -- Limit > 5
 	minRange = 15,
 	
 	is_teleport = true,
@@ -242,13 +242,6 @@ newTalent{
 			if not x then return nil end
 			_, _, _, x, y = self:canProject(tg, x, y)
 			range = radius
-			-- Check LOS
-			-- Should this even be able to fizzle? The point of teleport is to go far away, i.e. out of line of sight, and teleport isn't particularly accurate anyway 
-			if not self:hasLOS(x, y) and rng.percent(35 + (game.level.map.attrs(self.x, self.y, "control_teleport_fizzle") or 0)) then
-				game.logPlayer(self, "The targetted teleport fizzles and works randomly!")
-				x, y = self.x, self.y
-				range = t.getRange(self, t)
-			end
 			local _ _, x, y = self:canProject(tg, x, y)
 			game.level.map:particleEmitter(target.x, target.y, 1, "teleport")
 			newpos = target:teleportRandom(x, y, range)
@@ -277,7 +270,6 @@ newTalent{
 		return ([[Teleports you randomly within a large range (%d).
 		At level 4, it allows you to specify which creature to teleport. You need to bypass spell save with your spellpower to teleport hostile creatures.
 		At level 5, it allows you to choose the target area (radius %d).
-		If the target area is not in line of sight, there is a chance the spell will partially fail and teleport the target randomly.
 		Random teleports have a minimum range of %d.
 		The range will increase with your Spellpower.]]):tformat(range, radius, t.minRange)
 	end,