Forbid dreamscape/fearscape on summons

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

game/modules/tome/class/FortressPC.lua

@@ -232,9 +232,12 @@ function _M:moveEngineMove(x, y, force)
 end
 
 function _M:takeControl(from)
-	game.party:addMember(self, {temporary_level=1, control="full"})
-	game.party:setPlayer(self, true)
-	game.level.map:remove(from.x, from.y, engine.Map.ACTOR)
+	game:onTickEnd(function()
+		game.party:addMember(self, {temporary_level=1, control="full"})
+		game.party:setPlayer(self, true)
+		game.level.map:remove(from.x, from.y, engine.Map.ACTOR)
+		from:attr("dont_act", 1)
+	end)
 end
 
 --- Checks if something bumps in us

game/modules/tome/data/talents/corruptions/shadowflame.lua

@@ -141,7 +141,7 @@ newTalent{
 			game.logPlayer(self, "This spell can not be cast here.")
 			return
 		end
-		if not self:canBe("planechange") then
+		if not self:canBe("planechange") or target.summon_time or target.summon then
 			game.logPlayer(self, "The spell fizzles...")
 			return
 		end

game/modules/tome/data/talents/misc/misc.lua

@@ -315,9 +315,12 @@ newTalent{
 	no_unlearn_last = true,
 	action = function(self, t)
 		if game.level.map:checkAllEntities(self.x, self.y, "block_move") then game.log("You can not teleport there.") return true end
-		game.party:removeMember(self, true)
-		game.party:findSuitablePlayer()
-		game.player:move(self.x, self.y, true)
+		game:onTickEnd(function()
+			game.party:removeMember(self, true)
+			game.party:findSuitablePlayer()
+			game.player:move(self.x, self.y, true)
+			game.player:attr("dont_act", -1)
+		end)
 		return true
 	end,
 	info = [[Use the onboard short-range teleport of the Fortress to beam down to the surface.]]

game/modules/tome/data/talents/psionic/slumber.lua

@@ -139,8 +139,8 @@ newTalent{
 			game.logPlayer(self, "This talent can not be used here.")
 			return
 		end
-		if not self:canBe("planechange") then
-			game.logPlayer(self, "The effect fizzles...")
+		if not self:canBe("planechange") or target.summon_time or target.summon then
+			game.logPlayer(self, "The spell fizzles...")
 			return
 		end