Commit c4217596895aed8c8361579d7bcdb98276f4dff5

Authored by dg
1 parent 6c30cc46

New tiles for some artifacts


git-svn-id: http://svn.net-core.org/repos/t-engine4@2883 51575b47-30f0-44d4-a5cc-537603b46e54
... ... @@ -110,15 +110,41 @@ function _M:display(dispx, dispy)
110 110 end
111 111
112 112 if self.target_type.ball and self.target_type.ball > 0 then
113   - core.fov.calc_circle(radius_x, radius_y, game.level.map.w, game.level.map.h, self.target_type.ball, function(_, px, py)
114   - 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)
115   - if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
116   - end, function()end, nil)
  113 + core.fov.calc_circle(
  114 + radius_x,
  115 + radius_y,
  116 + game.level.map.w,
  117 + game.level.map.h,
  118 + self.target_type.ball,
  119 + function(_, px, py)
  120 + if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
  121 + end,
  122 + function(_, px, py)
  123 + self.sg:toScreen(self.display_x + (px - game.level.map.mx) * self.tile_w * Map.zoom,
  124 + self.display_y + (py - game.level.map.my) * self.tile_h * Map.zoom,
  125 + self.tile_w * Map.zoom,
  126 + self.tile_h * Map.zoom)
  127 + end,
  128 + nil)
117 129 elseif self.target_type.cone and self.target_type.cone > 0 then
118   - 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)
119   - 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)
120   - if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
121   - end, function()end, nil)
  130 + core.fov.calc_beam(
  131 + radius_x,
  132 + radius_y,
  133 + game.level.map.w,
  134 + game.level.map.h,
  135 + self.target_type.cone,
  136 + initial_dir,
  137 + self.target_type.cone_angle,
  138 + function(_, px, py)
  139 + if self.target_type.block_radius and self.target_type:block_radius(px, py) then return true end
  140 + end,
  141 + function(_, px, py)
  142 + self.sg:toScreen(self.display_x + (px - game.level.map.mx) * self.tile_w * Map.zoom,
  143 + self.display_y + (py - game.level.map.my) * self.tile_h * Map.zoom,
  144 + self.tile_w * Map.zoom,
  145 + self.tile_h * Map.zoom)
  146 + end,
  147 + nil)
122 148 end
123 149
124 150 self.display_x, self.display_y = ox, oy
... ...
... ... @@ -75,7 +75,7 @@ newEntity{ define_as = "ORB_MANY_WAYS",
75 75 unided_name = "swirling orb",
76 76 name = "Orb of Many Ways",
77 77 level_range = {30, 30},
78   - display = "*", color=colors.VIOLET, image = "object/pearl.png",
  78 + display = "*", color=colors.VIOLET, image = "object/artifact/orb_many_ways.png",
79 79 encumber = 1,
80 80 desc = [[The orb projects images of distant places, some that seem to be not of this world, switching rapidly.
81 81 If used near a portal it could probably activate it.]],
... ... @@ -110,7 +110,7 @@ newEntity{ define_as = "ORB_MANY_WAYS_DEMON",
110 110 unided_name = "swirling orb", identified=true,
111 111 name = "Orb of Many Ways",
112 112 level_range = {30, 30},
113   - display = "*", color=colors.VIOLET, image = "object/pearl.png",
  113 + display = "*", color=colors.VIOLET, image = "object/artifact/orb_many_ways.png",
114 114 encumber = 1,
115 115 desc = [[The orb projects images of distant places, some that seem to be not of this world, switching rapidly.
116 116 If used near a portal it could probably activate it.]],
... ... @@ -155,7 +155,7 @@ newEntity{ define_as = "ORB_UNDEATH",
155 155 unided_name = "orb of command",
156 156 name = "Orb of Undeath (Orb of Command)",
157 157 level_range = {50, 50},
158   - display = "*", color=colors.VIOLET, image = "object/pearl.png",
  158 + display = "*", color=colors.VIOLET, image = "object/artifact/orb_undeath.png",
159 159 encumber = 1,
160 160 desc = [[Dark visions fill your mind as you lift the orb. It is cold to the touch.]],
161 161
... ... @@ -184,7 +184,7 @@ newEntity{ define_as = "ORB_DRAGON",
184 184 unided_name = "orb of command",
185 185 name = "Dragon Orb (Orb of Command)",
186 186 level_range = {50, 50},
187   - display = "*", color=colors.VIOLET, image = "object/pearl.png",
  187 + display = "*", color=colors.VIOLET, image = "object/artifact/orb_dragon.png",
188 188 encumber = 1,
189 189 desc = [[This orb is warm to the touch.]],
190 190
... ... @@ -270,7 +270,7 @@ newEntity{ define_as = "ORB_SCRYING",
270 270 type = "jewelry", subtype="orb",
271 271 unided_name = "orb of scrying",
272 272 name = "Orb of Scrying",
273   - display = "*", color=colors.VIOLET, image = "object/ruby.png",
  273 + display = "*", color=colors.VIOLET, image = "object/artifact/orb_scrying.png",
274 274 encumber = 1,
275 275 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.]],
276 276
... ... @@ -299,7 +299,7 @@ newEntity{ base = "BASE_WAND",
299 299 power_source = {unknown=true, arcane=false},
300 300 define_as = "ROD_OF_RECALL",
301 301 unided_name = "unstable wand", identified=true, force_lore_artifact=true,
302   - name = "Rod of Recall", color=colors.LIGHT_BLUE, unique=true,
  302 + name = "Rod of Recall", color=colors.LIGHT_BLUE, unique=true, image = "object/artifact/rod_of_recall.png",
303 303 desc = [[This rod is made entirely of voratun, infused with raw magical energies it can bend space itself.
304 304 You have heard of such items before, they are very useful to adventurers, allowing faster travel.]],
305 305 cost = 0, quest=true,
... ...