Added some missing tiles

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

game/modules/tome/data/general/grids/water.lua

@@ -143,22 +143,15 @@ newEntity{ base="WATER_BASE",
 }
 
 -----------------------------------------
--- Water/sand
+-- Poison water
 -----------------------------------------
 
-for i = 1, 9 do for j = 1, 1 do
-	if i ~= 5 then newEntity{base="WATER_BASE", define_as = "WATER_SAND_"..i..j, image="terrain/water_sand_"..i.."_"..j..".png"} end
-end end
-newEntity{base="WATER_BASE", define_as = "WATER_SAND_1I", image="terrain/water_sand_1i_1.png"}
-newEntity{base="WATER_BASE", define_as = "WATER_SAND_3I", image="terrain/water_sand_3i_1.png"}
-newEntity{base="WATER_BASE", define_as = "WATER_SAND_7I", image="terrain/water_sand_7i_1.png"}
-newEntity{base="WATER_BASE", define_as = "WATER_SAND_9I", image="terrain/water_sand_9i_1.png"}
-
 newEntity{
 	define_as = "POISON_DEEP_WATER",
-	name = "poisoned deep water", image = "terrain/water_floor.png",
+	type = "floor", subtype = "water",
+	name = "poisoned deep water", image = "terrain/poisoned_water_01.png",
 	display = '~', color=colors.YELLOW_GREEN, back_color=colors.DARK_GREEN,
-	add_displays = class:makeWater(true, "poison_"),
+--	add_displays = class:makeWater(true, "poison_"),
 	always_remember = true,
 	air_level = -5, air_condition="water",
 
@@ -169,7 +162,9 @@ newEntity{
 		local dam = DT:get(DT.POISON).projector(self, x, y, DT.POISON, rng.range(self.mindam, self.maxdam))
 		if dam > 0 then game.logPlayer(who, "The water poisons you!") end
 	end,
+	nice_tiler = { method="replace", base={"POISON_DEEP_WATER", 100, 1, 6}},
 }
+for i = 1, 6 do newEntity{ base="POISON_DEEP_WATER", define_as = "POISON_DEEP_WATER"..i, image = "terrain/poisoned_water_0"..i..".png" } end
 
 
 -----------------------------------------

game/modules/tome/data/zones/briagh-lair/objects.lua

@@ -22,6 +22,7 @@ load("/data/general/objects/objects-far-east.lua")
 newEntity{ base = "BASE_GEM",
 	define_as = "RESONATING_DIAMOND", no_unique_lore=true,
 	name = "Resonating Diamond", color=colors.VIOLET, quest=true, unique=true, identified=true,
+	image = "object/artifact/resonating_diamond.png",
 	material_level = 5,
 
 	on_pickup = function(self, who)

game/modules/tome/data/zones/dreadfell/npcs.lua

@@ -117,6 +117,7 @@ newEntity{ define_as = "PALE_DRAKE",
 	type = "undead", subtype = "skeleton", unique = true,
 	name = "Pale Drake",
 	display = "s", color=colors.VIOLET,
+	resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/undead_skeleton_pale_drake.png", display_h=2, display_y=-1}}},
 	desc = [[A malevolent skeleton archmage that has taken control of the Dreadfell since the Master's demise.]],
 	level_range = {40, nil}, exp_worth = 3,
 	max_life = 450, life_rating = 21, fixed_rating = true,

game/modules/tome/data/zones/reknor/objects.lua

@@ -33,6 +33,7 @@ newEntity{ base = "BASE_SCROLL", define_as = "NOTE_FROM_LAST_HOPE",
 newEntity{ base = "BASE_GEM",
 	define_as = "RESONATING_DIAMOND_WEST",
 	name = "Resonating Diamond", color=colors.VIOLET, quest=true, unique="Resonating Diamond West", identified=true, no_unique_lore=true,
+	image = "object/artifact/resonating_diamond.png",
 	material_level = 5,
 
 	on_drop = function(self, who)

game/modules/tome/data/zones/ruined-dungeon/grids.lua

@@ -70,7 +70,7 @@ newEntity{
 
 newEntity{
 	define_as = "PORTAL",
-	name = "orb", image = "terrain/maze_floor.png", add_mos={{image = "object/egg_dragons_egg_03_64.png"}},
+	name = "orb", image = "terrain/maze_floor.png", add_displays={class.new{z=18, image = "terrain/pedestal_orb_04.png", display_h=2, display_y=-1}},
 	display = '*', color=colors.VIOLET, back_color=colors.DARK_GREY,
 	force_clone=true,
 	always_remember = true,

game/modules/tome/data/zones/slime-tunnels/grids.lua

@@ -23,22 +23,22 @@ load("/data/general/grids/slime.lua")
 
 newEntity{
 	define_as = "ORB_DRAGON",
-	name = "orb pedestal (dragon)", image = "terrain/orb_pedestal.png",
+	name = "orb pedestal (dragon)", image = "terrain/slime_floor.png", add_displays={class.new{image = "terrain/pedestal_01.png", display_h=2, display_y=-1}},
 	display = '_', color_r=255, color_g=255, color_b=255, back_color=colors.LIGHT_RED,
 }
 newEntity{
 	define_as = "ORB_UNDEATH",
-	name = "orb pedestal (undeath)", image = "terrain/orb_pedestal.png",
+	name = "orb pedestal (undeath)", image = "terrain/slime_floor.png", add_displays={class.new{image = "terrain/pedestal_01.png", display_h=2, display_y=-1}},
 	display = '_', color_r=255, color_g=255, color_b=255, back_color=colors.LIGHT_RED,
 }
 newEntity{
 	define_as = "ORB_ELEMENTS",
-	name = "orb pedestal (elements)", image = "terrain/orb_pedestal.png",
+	name = "orb pedestal (elements)", image = "terrain/slime_floor.png", add_displays={class.new{image = "terrain/pedestal_01.png", display_h=2, display_y=-1}},
 	display = '_', color_r=255, color_g=255, color_b=255, back_color=colors.LIGHT_RED,
 }
 newEntity{
 	define_as = "ORB_DESTRUCTION",
-	name = "orb pedestal (destruction)", image = "terrain/orb_pedestal.png",
+	name = "orb pedestal (destruction)", image = "terrain/slime_floor.png", add_displays={class.new{image = "terrain/pedestal_01.png", display_h=2, display_y=-1}},
 	display = '_', color_r=255, color_g=255, color_b=255, back_color=colors.LIGHT_RED,
 }
 

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

@@ -24,6 +24,7 @@ local Stats = require "engine.interface.ActorStats"
 newEntity{ base = "BASE_GEM",
 	define_as = "RESONATING_DIAMOND_WEST2",
 	name = "Resonating Diamond", color=colors.VIOLET, quest=true, unique="Resonating Diamond West2", identified=true, no_unique_lore=true,
+	image = "object/artifact/resonating_diamond.png",
 	material_level = 5,
 
 	on_drop = function(self, who)

game/modules/tome/data/zones/valley-moon/grids.lua

@@ -25,12 +25,14 @@ load("/data/general/grids/mountain.lua")
 newEntity{
 	define_as = "MOONSTONE",
 	name = "moonstone",
-	image = "terrain/moonstone.png",
+	image = "terrain/grass.png",
 	display = '&', color=colors.GREY, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	does_block_move = true,
 	block_sight = true,
+	nice_tiler = { method="replace", base={"MOONSTONE", 100, 1, 8}},
 }
+for i = 1, 8 do newEntity{ base="MOONSTONE", define_as = "MOONSTONE"..i, add_displays={class.new{image = "terrain/moonstone_0"..i..".png", display_h=2, display_y=-1}}} end
 
 newEntity{
 	type = "floor", subtype = "grass",