New tiles for some artifacts

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

game/engines/default/engine/Target.lua

@@ -110,15 +110,41 @@ function _M:display(dispx, dispy)
 	end
 
 	if self.target_type.ball and self.target_type.ball > 0 then
-		core.fov.calc_circle(radius_x, radius_y, game.level.map.w, game.level.map.h, self.target_type.ball, function(_, px, py)
-			self.sg:toScreen(self.display_x + (px - game.level.map.mx) * self.tile_w * Map.zoom, self.display_y + (py - game.level.map.my) * self.tile_h * Map.zoom, self.tile_w * Map.zoom, self.tile_h * Map.zoom)
-			if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
-		end, function()end, nil)
+		core.fov.calc_circle(
+			radius_x,
+			radius_y,
+			game.level.map.w,
+			game.level.map.h,
+			self.target_type.ball,
+			function(_, px, py)
+				if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
+			end,
+			function(_, px, py)
+				self.sg:toScreen(self.display_x + (px - game.level.map.mx) * self.tile_w * Map.zoom,
+				self.display_y + (py - game.level.map.my) * self.tile_h * Map.zoom,
+				self.tile_w * Map.zoom,
+				self.tile_h * Map.zoom)
+			end,
+		nil)
 	elseif self.target_type.cone and self.target_type.cone > 0 then
-		core.fov.calc_beam(radius_x, radius_y, game.level.map.w, game.level.map.h, self.target_type.cone, initial_dir, self.target_type.cone_angle, function(_, px, py)
-			self.sg:toScreen(self.display_x + (px - game.level.map.mx) * self.tile_w * Map.zoom, self.display_y + (py - game.level.map.my) * self.tile_h * Map.zoom, self.tile_w * Map.zoom, self.tile_h * Map.zoom)
-			if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
-		end, function()end, nil)
+		core.fov.calc_beam(
+			radius_x,
+			radius_y,
+			game.level.map.w,
+			game.level.map.h,
+			self.target_type.cone,
+			initial_dir,
+			self.target_type.cone_angle,
+			function(_, px, py)
+				if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
+			end,
+			function(_, px, py)
+				self.sg:toScreen(self.display_x + (px - game.level.map.mx) * self.tile_w * Map.zoom,
+				self.display_y + (py - game.level.map.my) * self.tile_h * Map.zoom,
+				self.tile_w * Map.zoom,
+				self.tile_h * Map.zoom)
+			end,
+		nil)
 	end
 
 	self.display_x, self.display_y = ox, oy

game/modules/tome/data/general/objects/quest-artifacts.lua

@@ -75,7 +75,7 @@ newEntity{ define_as = "ORB_MANY_WAYS",
 	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 be not of this world, switching rapidly.
 If used near a portal it could probably activate it.]],
@@ -110,7 +110,7 @@ newEntity{ define_as = "ORB_MANY_WAYS_DEMON",
 	unided_name = "swirling orb", identified=true,
 	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 be not of this world, switching rapidly.
 If used near a portal it could probably activate it.]],
@@ -155,7 +155,7 @@ newEntity{ define_as = "ORB_UNDEATH",
 	unided_name = "orb of command",
 	name = "Orb of Undeath (Orb of Command)",
 	level_range = {50, 50},
-	display = "*", color=colors.VIOLET, image = "object/pearl.png",
+	display = "*", color=colors.VIOLET, image = "object/artifact/orb_undeath.png",
 	encumber = 1,
 	desc = [[Dark visions fill your mind as you lift the orb. It is cold to the touch.]],
 
@@ -184,7 +184,7 @@ newEntity{ define_as = "ORB_DRAGON",
 	unided_name = "orb of command",
 	name = "Dragon Orb (Orb of Command)",
 	level_range = {50, 50},
-	display = "*", color=colors.VIOLET, image = "object/pearl.png",
+	display = "*", color=colors.VIOLET, image = "object/artifact/orb_dragon.png",
 	encumber = 1,
 	desc = [[This orb is warm to the touch.]],
 
@@ -270,7 +270,7 @@ newEntity{ define_as = "ORB_SCRYING",
 	type = "jewelry", subtype="orb",
 	unided_name = "orb of scrying",
 	name = "Orb of Scrying",
-	display = "*", color=colors.VIOLET, image = "object/ruby.png",
+	display = "*", color=colors.VIOLET, image = "object/artifact/orb_scrying.png",
 	encumber = 1,
 	desc = [[This orb was given to you by Elisa the Halfling scryer. It will automatically identify normal and rare items for you and can be activated to contact Elisa for rarer items.]],
 
@@ -299,7 +299,7 @@ newEntity{ base = "BASE_WAND",
 	power_source = {unknown=true, arcane=false},
 	define_as = "ROD_OF_RECALL",
 	unided_name = "unstable wand", identified=true, force_lore_artifact=true,
-	name = "Rod of Recall", color=colors.LIGHT_BLUE, unique=true,
+	name = "Rod of Recall", color=colors.LIGHT_BLUE, unique=true, image = "object/artifact/rod_of_recall.png",
 	desc = [[This rod is made entirely of voratun, infused with raw magical energies it can bend space itself.
 You have heard of such items before, they are very useful to adventurers, allowing faster travel.]],
 	cost = 0, quest=true,