dreaming my dreammmmmsss

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

game/modules/tome/class/Game.lua

@@ -1213,7 +1213,7 @@ function _M:setupCommands()
 			end end
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
-			self:changeLevel(1, "noxious-caldera")
+			self:changeLevel(1, "dreams")
 --			FINISH CALDERA
 do return end
 			self:registerDialog(require("mod.dialogs.DownloadCharball").new())

game/modules/tome/class/Player.lua

@@ -327,6 +327,7 @@ function _M:updateMainShader()
 		-- Moving Blur shader
 		if self:attr("invisible") then game.fbo_shader:setUniform("motionblur", 3)
 		elseif self:attr("lightning_speed") then game.fbo_shader:setUniform("motionblur", 2)
+		elseif game.level and game.level.data and game.level.data.motionblur then game.fbo_shader:setUniform("motionblur", game.level.data.motionblur)
 		else game.fbo_shader:setUniform("motionblur", 0) -- Disable
 		end
 	end

game/modules/tome/class/generator/map/Caldera.lua

@@ -78,7 +78,35 @@ function _M:generate(lev, old_lev)
 		octave = data.octave or 4,
 	}, "water", "grass")
 
+	local sx, sy, ex, ey = 1, 1, 1, 1
+
+	local sl = {}
+	for i = 1, self.map.w -2 do
+		for j = 1, self.map.h - 2 do
+			if not self.map:checkEntity(i, j, Map.TERRAIN, "block_move") then sl[#sl+1] = {x=i, y=j} end
+		end
+		if #sl > 0 then break end
+	end
+	if #sl > 0 then
+		local s = rng.table(sl)
+		sx, sy = s.x, s.y
+	end
+
+	local el = {}
+	for i = self.map.w -2, 1, -1 do
+		for j = 1, self.map.h - 2 do
+			if not self.map:checkEntity(i, j, Map.TERRAIN, "block_move") then el[#el+1] = {x=i, y=j} end
+		end
+		if #el > 0 then break end
+	end
+	if #el > 0 then
+		local s = rng.table(el)
+		ex, ey = s.x, s.y
+	end
+
+	self.map(sx, sy, Map.TERRAIN, self:resolve("up"))
+	self.map(sx, sy, Map.TERRAIN, self:resolve("down"))
+
 	-- Make stairs
-	local spots = {}
-	return 1,1,1,1, spots
+	return sx, sy, ex, ey, self.spots
 end

game/modules/tome/data/achievements/quests.lua

@@ -279,3 +279,20 @@ newAchievement{
 	show = "name",
 	desc = [[Destroy the naga portal in the slazish fens and be caught in the aftereffect.]],
 }
+newAchievement{
+	name = "Dreams of loneliness", id = "ALL_DREAMS",
+	show = "full",
+	desc = [[Experience and complete all the dreams in the Dogroth Caldera.]],
+	mode = "world",
+	can_gain = function(self, who, kind)
+		self[kind] = true
+		if self.mice then return true end
+	end,
+	track = function(self)
+		return tstring{tostring((self.mice and 1 or 0))," / 1"}
+	end,
+	on_gain = function(_, src, personal)
+		game:setAllowedBuild("psionic")
+		game:setAllowedBuild("psionic_solipsist", true)
+	end,
+}

game/modules/tome/data/general/npcs/feline.lua

@@ -26,6 +26,7 @@ newEntity{
 	autolevel = "rogue",
 	size_category = 2,
 	rank = 2,
+	infravision = 10,
 	global_speed_base = 1.25,
 	type = "animal", subtype="feline",
 	ai = "dumb_talented_simple", ai_state = { ai_move="move_dmap", talent_in=2, },

game/modules/tome/data/talents/cunning/stealth.lua

@@ -28,7 +28,7 @@ newTalent{
 	no_energy = true,
 	tactical = { BUFF = 3 },
 	getStealthPower = function(self, t) return 4 + self:getCun(10, true) * self:getTalentLevel(t) end,
-	getRadius = function(self, t) return math.floor(10 - self:getTalentLevel(t) * 1.1) end,
+	getRadius = function(self, t) return math.max(0, math.floor(10 - self:getTalentLevel(t) * 1.1)) end,
 	on_pre_use = function(self, t, silent)
 		if self:isTalentActive(t.id) then return true end
 		local armor = self:getInven("BODY") and self:getInven("BODY")[1]
@@ -112,11 +112,17 @@ newTalent{
 		self.hide_chance = t.getChance(self, t)
 		self:useTalent(self.T_STEALTH)
 		self.hide_chance = nil
+
+		for uid, e in pairs(game.level.entities) do
+			if e.ai_target and e.ai_target.actor == self then e:setTarget(nil) end
+		end
+
 		return true
 	end,
 	info = function(self, t)
 		local chance = t.getChance(self, t)
-		return ([[You have learned how to be stealthy even when in plain sight of your foes, with a %d%% chance of success. This also resets the cooldown of your stealth talent.]]):
+		return ([[You have learned how to be stealthy even when in plain sight of your foes, with a %d%% chance of success. This also resets the cooldown of your stealth talent.
+		All creatures currently following you will loose all track.]]):
 		format(chance)
 	end,
 }

game/modules/tome/data/talents/psionic/slumber.lua

@@ -214,11 +214,6 @@ newTalent{
 			end
 
 			game.logPlayer(game.player, "#LIGHT_BLUE#You are taken to the Dreamscape!")
-
-			-- Learn about solipsists
-			if target == game.player then
-				game:setAllowedBuild("psionic_solipsist", true)
-			end
 		end)
 
 		local power = self:mindCrit(t.getPower(self, t))

game/modules/tome/data/zones/dreams/grids.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/grids/basic.lua")
+load("/data/general/grids/mountain.lua")
+load("/data/general/grids/jungle.lua")
+load("/data/general/grids/water.lua")
+
+newEntity{
+	define_as = "DREAM_END",
+	type = "floor", subtype = "grass",
+	name = "Dream Portal", image = "terrain/jungle/jungle_grass_floor_01.png", add_mos = {{image="terrain/demon_portal.png"}},
+	display = '<', color_r=255, color_g=0, color_b=255,
+	always_remember = true,
+	notice = true,
+	on_move = function(self, x, y, who)
+		if who and who.summoner then
+			who.success = true
+			who:die(who)
+		end
+	end,
+}

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

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/npcs/feline.lua", function(m)
+	m.level_range = {1,1}
+	m.max_life = 30
+	for i, e in ipairs(m) do
+		if type(e) == "table" and e.__resolver == "talents" then
+			local nt = {}
+			for tid, d in pairs(e[1]) do
+				if tid == m.T_RUSH then nt[m.T_NIMBLE_MOVEMENTS] = d
+				else nt[tid] = d
+				end
+			end
+			e[1] = nt
+		end
+	end
+end)

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

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/objects/objects-maj-eyal.lua")

game/modules/tome/data/zones/dreams/traps.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+load("/data/general/traps/natural_forest.lua")

game/modules/tome/data/zones/dreams/zone.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return {
+	name = "Dreams",
+	display_name = function(x, y)
+		if game.level.level == 1 then return "Dream of vulnerability" end
+		return "Dream ???"
+	end,
+	variable_zone_name = true,
+	level_range = {25, 35},
+	level_scheme = "player",
+	max_level = 1,
+	decay = {300, 800},
+	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	ambient_music = "Woods of Eremae.ogg",
+	min_material_level = 3,
+	max_material_level = 3,
+	generator =  {
+	},
+	levels =
+	{
+		[1] = {
+			motionblur = 2,
+			width = 48, height = 48,
+			color_shown = {0.9, 0.7, 0.4, 1},
+			color_obscure = {0.9*0.6, 0.7*0.6, 0.4*0.6, 0.6},
+			generator = {
+				map = {
+					class = "engine.generator.map.Maze",
+					up = "FLOOR",
+					down = "DREAM_END",
+					wall = "JUNGLE_TREE",
+					floor = "JUNGLE_GRASS",
+					widen_w = 3, widen_h = 3,
+					force_last_stair = true,
+				},
+				actor = {
+					class = "mod.class.generator.actor.Random",
+					nb_npc = {40, 40},
+					filter = {type="feline"},
+					randelite = 0,
+				},
+				object = {
+					class = "engine.generator.object.Random",
+					nb_object = {0, 0},
+				},
+				trap = {
+					class = "engine.generator.trap.Random",
+					nb_trap = {0, 0},
+				},
+			}
+		},
+	},
+
+	on_enter = function(lev, old_lev)
+		-- Dream of vulnerability
+		if lev == 1 then
+			local f = require("mod.class.Player").new{
+				name = "frail mice", image = "npc/vermin_rodent_giant_white_mouse.png",
+				type = "vermin", subtype = "rodent",
+				display = "r", color=colors.WHITE,
+				body = { INVEN = 10 },
+				infravision = 10,
+				sound_moam = {"creatures/rats/rat_hurt_%d", 1, 2},
+				sound_die = {"creatures/rats/rat_die_%d", 1, 2},
+				sound_random = {"creatures/rats/rat_%d", 1, 3},
+				stats = { str=8, dex=15, mag=3, con=5, cun=15, },
+				combat = {sound="creatures/rats/rat_attack", dam=5, atk=0, apr=10 },
+				combat_armor = 1, combat_def = 1,
+				rank = 1,
+				movement_speed = 1.4,
+				size_category = 1,
+				level_range = {1, 1}, exp_worth = 1,
+				max_life = 10,
+				resolvers.talents{
+					T_STEALTH = 8,
+					T_SHADOWSTRIKE = 5,
+					T_HIDE_IN_PLAIN_SIGHT = 15,
+					T_EVASION = 30,
+					T_NIMBLE_MOVEMENTS = 3,
+					T_PIERCING_SIGHT = 30,
+				},
+				on_die = function(self)
+					game.level:addEntity(self.summoner)
+					game:onTickEnd(function()
+						game:changeLevel(1, "noxious-caldera")
+						if self.success then
+							world:gainAchievement("ALL_DREAMS", self.summoner, "mice")
+						else
+							game.player:takeHit(game.player.life * 2 / 3, game.player)
+						end
+					end)
+				end,
+			}
+			f:resolve()
+			f:resolve(nil, true)
+			f.summoner = game.player
+
+			local oldp = game.player
+			game.party:addMember(f, {temporary_level=1, control="full"})
+			f.x = game.player.x
+			f.y = game.player.y
+			game.party:setPlayer(f, true)
+			game.level:addEntity(f)
+			game.level.map:remove(f.x, f.y, engine.Map.ACTOR)
+			game.level:removeEntity(oldp)
+			f:move(f.x, f.y, true)
+			f.energy.value = 1000
+			game.paused = true
+			game.player:updateMainShader()
+		end
+	end,
+}

game/modules/tome/data/zones/eidolon-plane/zone.lua

@@ -138,6 +138,7 @@ return {
 			-- Reload MOs
 			game.level.map:redisplay()
 			game.level.map:recreate()
+			game.uiset:setupMinimap(game.level)
 
 			for uid, act in pairs(game.level.entities) do
 				if act.setEffect then

game/modules/tome/data/zones/noxious-caldera/zone.lua

@@ -19,55 +19,54 @@
 
 return {
 	name = "Noxious Caldera",
+	display_name = function(x, y) return "Dogroth Caldera" end,
+	variable_zone_name = true,
 	level_range = {25, 35},
 	level_scheme = "player",
 	max_level = 1,
 	decay = {300, 800},
 	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	persistent = "zone",
 	width = 70, height = 70,
---	all_remembered = true,
 	all_lited = true,
 	day_night = true,
-	persistent = "zone",
 	color_shown = {0.9, 0.7, 0.4, 1},
 	color_obscure = {0.9*0.6, 0.7*0.6, 0.4*0.6, 0.6},
 	ambient_music = "Woods of Eremae.ogg",
 	min_material_level = 3,
 	max_material_level = 3,
 	generator =  {
-		map = {
-			class = "mod.class.generator.map.Caldera",
-			mountain = "MOUNTAIN_WALL",
-			tree = "JUNGLE_TREE",
-			grass = "JUNGLE_GRASS",
-			water = "POISON_DEEP_WATER",
-		},
-		actor = {
-			class = "mod.class.generator.actor.Random",
-			nb_npc = {20, 30},
-			filters = { {max_ood=2}, },
-			guardian = "",
-		},
-		object = {
-			class = "engine.generator.object.Random",
-			nb_object = {6, 9},
-			filters = { {type="gem"} }
-		},
-		trap = {
-			class = "engine.generator.trap.Random",
-			nb_trap = {9, 15},
-		},
 	},
 	levels =
 	{
 		[1] = {
-			generator = { map = {
-				up = "JUNGLE_UP_WILDERNESS",
-			}, },
+			generator = {
+				map = {
+					class = "mod.class.generator.map.Caldera",
+					mountain = "MOUNTAIN_WALL",
+					tree = "JUNGLE_TREE",
+					grass = "JUNGLE_GRASS",
+					water = "POISON_DEEP_WATER",
+					up = "JUNGLE_GRASS_UP_WILDERNESS",
+				},
+				actor = {
+					class = "mod.class.generator.actor.Random",
+					nb_npc = {40, 40},
+					guardian = "",
+				},
+				object = {
+					class = "engine.generator.object.Random",
+					nb_object = {6, 9},
+					filters = { {type="gem"} }
+				},
+				trap = {
+					class = "engine.generator.trap.Random",
+					nb_trap = {9, 15},
+				},
+			},
+			post_process = function(level)
+				game.state:makeWeather(level, 6, {max_nb=15, chance=1, dir=120, speed={0.1, 0.9}, alpha={0.2, 0.4}, particle_name="weather/grey_cloud_%02d"})
+			end,
 		},
 	},
-
-	post_process = function(level)
-		game.state:makeWeather(level, 6, {max_nb=15, chance=1, dir=120, speed={0.1, 0.9}, alpha={0.2, 0.4}, particle_name="weather/grey_cloud_%02d"})
-	end,
 }