Summons can not be summoned through walls

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

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

@@ -86,7 +86,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 

game/modules/tome/data/talents/gifts/summon-distance.lua

@@ -239,7 +239,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -344,7 +344,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -443,7 +443,7 @@ newTalent{
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
 		target = game.level.map(tx, ty, Map.ACTOR)
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 
 		if target == self then target = nil end
 
@@ -579,7 +579,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 

game/modules/tome/data/talents/gifts/summon-melee.lua

@@ -46,7 +46,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -139,7 +139,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -241,7 +241,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -341,7 +341,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 

game/modules/tome/data/talents/gifts/summon-utility.lua

@@ -124,7 +124,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -227,7 +227,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 

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

@@ -332,7 +332,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 
@@ -787,7 +787,7 @@ newTalent{
 		local tg = {type="bolt", nowarning=true, range=self:getTalentRange(t), nolock=true, talent=t}
 		local tx, ty, target = self:getTarget(tg)
 		if not tx or not ty then return nil end
-		local _ _, tx, ty = self:canProject(tg, tx, ty)
+		local _ _, _, _, tx, ty = self:canProject(tg, tx, ty)
 		target = game.level.map(tx, ty, Map.ACTOR)
 		if target == self then target = nil end
 

game/modules/tome/data/zones/tannen-tower/objects.lua

@@ -71,7 +71,7 @@ newEntity{ define_as = "ORB_MANY_WAYS2",
 	unided_name = "swirling orb",
 	name = "Orb of Many Ways",
 	level_range = {30, 30},
-	display = "*", color=colors.VIOLET, image = "object/pearl.png",
+	display = "*", color=colors.VIOLET, image = "object/artifact/orb_many_ways.png",
 	encumber = 1,
 	desc = [[The orb projects images of distant places, some that seem to not be of this world, switching rapidly.
 If used near a portal it could probably activate it.]],