fixes

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

game/modules/tome/class/generator/actor/ValleyMoon.lua

@@ -52,9 +52,9 @@ function _M:tick()
 	-- Fire a light AOE, healing allies damaging demons
 	if _M.limmir and not _M.limmir.dead and game.turn % 100 == 0 then
 		game.logSeen(_M.limmir, "Limmir summons a blast of holy light!")
-		local rad = math.ceil(2 + (500 - self.level.turn_counter / 10) / 20)
+		local rad = 2
 		local dam = 50 + (500 - self.level.turn_counter / 10) / 7
-		local grids = _M.limmir:project({type="ball", radius=rad}, _M.limmir.x, _M.limmir.y, DamageType.HOLY_LIGHT, dam)
+		local grids = _M.limmir:project({type="ball", radius=rad, friendlyfire=false}, _M.limmir.x, _M.limmir.y, DamageType.HOLY_LIGHT, dam)
 		game.level.map:particleEmitter(_M.limmir.x, _M.limmir.y, rad, "sunburst", {radius=rad, grids=grids, tx=_M.limmir.x, ty=_M.limmir.y})
 	end
 end

game/modules/tome/data/chats/istari-fight.lua

@@ -34,17 +34,16 @@ local function aeryn_dead(npc, player) return not aeryn_alive(npc, player) end
 local function aeryn_comes(npc, player)
 	local x, y = util.findFreeGrid(player.x, player.y, 1, true, {[engine.Map.ACTOR]=true})
 	local aeryn = game.zone:makeEntityByName(game.level, "actor", "HIGH_SUN_PALADIN_AERYN")
-	game.zone:addEntity(game.level, aeryn, "actor", x, y)
-	game.player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "aeryn-helps")
-	game.logPlayer(player, "High Sun Paladin Aeryn appears next to you!")
+	if aeryn then
+		game.zone:addEntity(game.level, aeryn, "actor", x, y)
+		game.player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "aeryn-helps")
+		game.logPlayer(player, "High Sun Paladin Aeryn appears next to you!")
 
-	-- She starts at 60% life
-	aeryn.life = aeryn.max_life * 0.6
-
-	-- The istari focus her first
-	for uid, e in pairs(game.level.entities) do
-		if e.define_as and (e.define_as == "ALATAR" or e.define_as == "PALLANDO") then
-			e:setTarget(aeryn)
+		-- The istari focus her first
+		for uid, e in pairs(game.level.entities) do
+			if e.define_as and (e.define_as == "ALATAR" or e.define_as == "PALLANDO") then
+				e:setTarget(aeryn)
+			end
 		end
 	end
 end

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

@@ -26,9 +26,9 @@ defineTile('T', "TREE")
 defineTile('#', "MOUNTAIN_WALL")
 defineTile('M', "MOONSTONE")
 
-addSpot({4, 14}, "portal", "demon")
-addSpot({7, 45}, "portal", "demon")
-addSpot({47, 27}, "portal", "demon")
+addSpot({22, 21}, "portal", "demon")
+addSpot({24, 29}, "portal", "demon")
+addSpot({29, 26}, "portal", "demon")
 
 startx = 45
 starty = 1
@@ -48,22 +48,22 @@ return [[
 ##T............~~~~~~~~~~~~~~~~~~~~.............##
 ###.........TT..~~~~~~~~~~~~~~~~~~~~~.........T.##
 ###....TT....TT.~~~~~~~~~~~~~~~~~~~~~....T....T.##
-###.&..........TT~~~~~~~~~~~~~~~~~~~~...........##
+###............TT~~~~~~~~~~~~~~~~~~~~...........##
 ###..............~~~~~~~~~~~~~~~~~~~~...........##
 ###......TTT....~~~~~~~~~~~~~~~~~~~~.....T......##
 ###......T...~~~~~~~~~~~~~~~~~~~~~~~.....TTT...###
 #T#..........~~~~~~~~~~~~~~~~~~~~~~......TT....###
 ###........~~~~~~~~~~~~~~~~~~~~~~~~~......TT...###
 ###........~~~~~~~~~~~~~~~~~~~~~~~~~...........###
-###........~~~~~~~~~~~"""~~~~~~~~~~~~~........T###
+###........~~~~~~~~~~~&""~~~~~~~~~~~~~........T###
 ###..TT...~~~~~~~~~~~"""""""~~~~~~~~~~....T.T..###
 ###.TT...~~~~~~~~~~~~""""M"""~~~~~.~~.......TT####
 ###......~~~~~~~~~~~~"""".""""~~~~............####
 ###............~~~~~~"""""""""~~~~~....TT.....####
-###.TTT.......~~~~~~~"""""""""~~~~~~~.........####
-####..T......~~~~~~~~~~"""""""~~~~~~~..........&##
+###.TTT.......~~~~~~~""""""""&~~~~~~~.........####
+####..T......~~~~~~~~~~"""""""~~~~~~~...........##
 ####.........~~~~~~~~~~~""""""~~~~~~~.TTTT..TT..##
-#####.........~~~~~~~~~~"""~~~~~~~~~~......TT...##
+#####.........~~~~~~~~~~&""~~~~~~~~~~......TT...##
 #####..........~~~~~~~~~~~~~~~~~~~~~~~~~........##
 #####.....T....~~~~~~~~~~~~~~~~~~~~~~~~~........##
 ####......T....~~~~~~~~~~~~~~~~~~~~~~~~.......T###
@@ -79,7 +79,7 @@ return [[
 ##................T..........T........T....T....##
 ##...T................................TT......T..#
 ###.........T................TT...............T..#
-###....&..............T.......T............T...###
+###...................T.......T............T...###
 ####.........................................#####
 #######.........T........T.............###########
 #####################........#####################

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

@@ -25,9 +25,10 @@ return {
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
 	width = 250, height = 30,
-	all_remembered = true,
-	all_lited = true,
+--	all_remembered = true,
+--	all_lited = true,
 	persistant = "zone",
+	ambiant_music = "Thrall's Theme.ogg",
 	no_level_connectivity = true,
 	generator =  {
 		map = {