Minor events should correctly appear in ASCII mode

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

game/modules/tome/data/general/events/antimagic-bush.lua

@@ -24,8 +24,11 @@ if not x then return false end
 local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "antimagic bush"
 g.display='~' g.color_r=0 g.color_g=255 g.color_b=100 g.notice = true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/antimagic_bush.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/antimagic_bush.png", z=5}
+end
 g.nice_tiler = nil
 game.zone:addEntity(game.level, g, "terrain", x, y)
 

game/modules/tome/data/general/events/bligthed-soil.lua

@@ -24,8 +24,11 @@ if not x then return false end
 local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "blighted soil"
 g.display='~' g.color_r=0 g.color_g=255 g.color_b=0 g.notice = true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/blight_root.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/blight_root.png", z=5}
+end
 g.nice_tiler = nil
 game.zone:addEntity(game.level, g, "terrain", x, y)
 

game/modules/tome/data/general/events/damp-cave.lua

@@ -79,8 +79,11 @@ local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "damp cave"
 g.display='>' g.color_r=0 g.color_g=0 g.color_b=255 g.notice = true
 g.change_level=1 g.change_zone=id g.glow=true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/crystal_ladder_down.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/crystal_ladder_down.png", z=5}
+end
 g.nice_tiler = nil
 g:initGlow()
 g.real_change = changer

game/modules/tome/data/general/events/drake-cave.lua

@@ -86,8 +86,11 @@ local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "intimidating cave"
 g.display='>' g.color_r=0 g.color_g=0 g.color_b=255 g.notice = true
 g.change_level=1 g.change_zone=id g.glow=true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/crystal_ladder_down.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/crystal_ladder_down.png", z=5}
+end
 g.nice_tiler = nil
 g:initGlow()
 g.dragon_kind = kind

game/modules/tome/data/general/events/fearscape-portal.lua

@@ -135,8 +135,11 @@ local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "fearscape invasion portal"
 g.display='&' g.color_r=0 g.color_g=0 g.color_b=255 g.notice = true
 g.change_level=1 g.change_zone=id g.glow=true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/demon_portal3.png"}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/demon_portal3.png"}
+end
 g.nice_tiler = nil
 g:initGlow()
 g.real_change = changer

game/modules/tome/data/general/events/font-life.lua

@@ -24,8 +24,11 @@ if not x then return false end
 local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "font of life"
 g.display='&' g.color_r=0 g.color_g=255 g.color_b=0 g.notice = true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/terrain_pot_03_01_64.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/terrain_pot_03_01_64.png", z=5}
+end
 g.nice_tiler = nil
 game.zone:addEntity(game.level, g, "terrain", x, y)
 
@@ -43,5 +46,5 @@ for x, yy in pairs(grids) do for y, _ in pairs(yy) do
 	g.on_stand = g.on_stand or on_stand
 	game.zone:addEntity(game.level, g, "terrain", x, y)
 end end
-
+game.log("==== FONT at %dx%d", x,y)
 return true

game/modules/tome/data/general/events/glimmerstone.lua

@@ -25,8 +25,11 @@ local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g = require("engine.Object").new(g)
 g.name = "glimmerstone"
 g.display='&' g.color_r=255 g.color_g=255 g.color_b=255 g.notice = true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/moonstone_05.png", display_w=0.5, display_x=0.25, z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/moonstone_05.png", display_w=0.5, display_x=0.25, z=5}
+end
 g.nice_tiler = nil
 g.act = function(self)
 	local grids = core.fov.circle_grids(x, y, rng.range(1, 2), "block_move")

game/modules/tome/data/general/events/glowing-chest.lua

@@ -53,8 +53,11 @@ end
 local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "glowing chest"
 g.display='~' g.color_r=255 g.color_g=215 g.color_b=0 g.notice = true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="object/chest3.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="object/chest3.png", z=5}
+end
 g.nice_tiler = nil
 g.chest_item = o
 g.chest_guards = ms

game/modules/tome/data/general/events/naga-portal.lua

@@ -101,12 +101,15 @@ local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "naga invasion coral portal"
 g.display='&' g.color_r=0 g.color_g=0 g.color_b=255 g.notice = true
 g.change_level=1 g.change_zone=id g.glow=true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{z=18, image="terrain/naga_portal.png", display_h=2, display_y=-1, embed_particles = {
-	{name="naga_portal_smoke", rad=2, args={smoke="particles_images/smoke_whispery_bright"}},
-	{name="naga_portal_smoke", rad=2, args={smoke="particles_images/smoke_heavy_bright"}},
-	{name="naga_portal_smoke", rad=2, args={smoke="particles_images/smoke_dark"}},
-}}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{z=18, image="terrain/naga_portal.png", display_h=2, display_y=-1, embed_particles = {
+		{name="naga_portal_smoke", rad=2, args={smoke="particles_images/smoke_whispery_bright"}},
+		{name="naga_portal_smoke", rad=2, args={smoke="particles_images/smoke_heavy_bright"}},
+		{name="naga_portal_smoke", rad=2, args={smoke="particles_images/smoke_dark"}},
+	}}
+end
 g.nice_tiler = nil
 g:initGlow()
 g.real_change = changer

game/modules/tome/data/general/events/old-battle-field.lua

@@ -116,8 +116,11 @@ if tries < 100 then
 		local g = game.level.map(p.x, p.y, engine.Map.TERRAIN):cloneFull()
 		g.name = "grave"
 		g.display='&' g.color_r=255 g.color_g=255 g.color_b=255 g.notice = true
-		g.add_displays = g.add_displays or {}
-		g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/grave_unopened_0"..rng.range(1,3).."_64.png", display_y=-1, display_h=2}
+		g:removeAllMOs()
+		if engine.Map.tiles.nicer_tiles then
+			g.add_displays = g.add_displays or {}
+			g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/grave_unopened_0"..rng.range(1,3).."_64.png", display_y=-1, display_h=2}
+		end
 		g.nice_tiler = nil
 		g.block_move = function(self, x, y, who, act, couldpass)
 			if not who or not who.player or not act then return false end

game/modules/tome/data/general/events/rat-lich.lua

@@ -142,8 +142,11 @@ local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 g.name = "forsaken crypt"
 g.display='>' g.color_r=0 g.color_g=0 g.color_b=255 g.notice = true
 g.change_level=1 g.change_zone=id g.glow=true
-g.add_displays = g.add_displays or {}
-g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/crystal_ladder_down.png", z=5}
+g:removeAllMOs()
+if engine.Map.tiles.nicer_tiles then
+	g.add_displays = g.add_displays or {}
+	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/crystal_ladder_down.png", z=5}
+end
 g.nice_tiler = nil
 g:initGlow()
 g.real_change = changer

game/modules/tome/data/general/events/tombstones.lua

@@ -31,8 +31,11 @@ if tries < 100 then
 	local g = game.level.map(x, y, engine.Map.TERRAIN):cloneFull()
 	g.name = "grave"
 	g.display='&' g.color_r=255 g.color_g=255 g.color_b=255 g.notice = true
-	g.add_displays = g.add_displays or {}
-	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/grave_unopened_0"..rng.range(1,3).."_64.png", display_y=-1, display_h=2}
+	g:removeAllMOs()
+	if engine.Map.tiles.nicer_tiles then
+		g.add_displays = g.add_displays or {}
+		g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/grave_unopened_0"..rng.range(1,3).."_64.png", display_y=-1, display_h=2}
+	end
 	g.nice_tiler = nil
 	g.block_move = function(self, x, y, who, act, couldpass)
 		if not who or not who.player or not act then return false end

game/modules/tome/data/general/events/weird-pedestals.lua

@@ -44,8 +44,11 @@ for i = 1, 3 do
 	local g = game.level.map(i, j, engine.Map.TERRAIN):cloneFull()
 	g.name = "weird pedestal"
 	g.display='&' g.color_r=255 g.color_g=255 g.color_b=255 g.notice = true
-	g.add_displays = g.add_displays or {}
-	g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/pedestal_01.png", display_y=-1, display_h=2}
+	g:removeAllMOs()
+	if engine.Map.tiles.nicer_tiles then
+		g.add_displays = g.add_displays or {}
+		g.add_displays[#g.add_displays+1] = mod.class.Grid.new{image="terrain/pedestal_01.png", display_y=-1, display_h=2}
+	end
 	g.nice_tiler = nil
 	g.x = i
 	g.y = j

game/modules/tome/data/talents/spells/stone-alchemy.lua

@@ -145,8 +145,8 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Imbue a body armour with a gem, granting it additional powers.
-		You can only imbue items once, and it is permanent.]])
+		return ([[Imbue %s with a gem (up to tier %d), granting it additional powers.
+		You can only imbue items once, and it is permanent.]]):format(self:knowTalent(self.T_CRAFTY_HANDS) and "a body armour, a belt or head piece" or "a body armour", self:getTalentLevelRaw(t))
 	end,
 }
 newTalent{