Emotes look and disappear nicer

Rat Lich event stairs have a few rats near them


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

game/engines/default/engine/Emote.lua

@@ -63,6 +63,11 @@ function _M:generate()
 end
 
 function _M:display(x, y)
-	self:drawFrame(self.frame, x, y)
-	self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3])
+	local a = 1
+	if self.dur < 10 then
+		a = (self.dur) / 10
+	end
+
+	self:drawFrame(self.frame, x, y, 1, 1, 1, a * 0.7)
+	self.tex[1]:toScreenFull(x-frame_ox1, y-frame_oy1, self.rw, self.rh, self.tex[2], self.tex[3], 1, 1, 1, a)
 end

game/modules/tome/class/Game.lua

@@ -1254,7 +1254,7 @@ function _M:setupCommands()
 			end end
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
-			local f, err = loadfile("/data/general/events/old-battle-field.lua")
+			local f, err = loadfile("/data/general/events/rat-lich.lua")
 			print(f, err)
 			setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
 			print(pcall(f))

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

@@ -159,4 +159,14 @@ g.change_level_check = function(self)
 end
 game.zone:addEntity(game.level, g, "terrain", x, y)
 
+-- Pop undead rats at the stairs
+local npcs = mod.class.NPC:loadList{"/data/general/npcs/undead-rat.lua"}
+for z = 1, 3 do
+	local m = game.zone:makeEntity(game.level, "actor", {base_list=npcs, name="skeletal rat"}, nil, true)
+	local i, j = util.findFreeGrid(x, y, 10, true, {[engine.Map.ACTOR]=true})
+	if i and j and m then
+		game.zone:addEntity(game.level, m, "actor", i, j)
+	end
+end
+
 return true