From 6afb50cf435a61cf8eff55ad02aaecfbaec5b3c1 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 22 Sep 2010 18:11:33 +0000
Subject: [PATCH] Activated fullscreen framebuffer Low HP will now colorize the
corners of the screen in red (only for comptuers supporting FBO)
git-svn-id: http://svn.net-core.org/repos/t-engine4@1286 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/class/Game.lua | 21 +++++++++++++------
.../modules/tome/data/quests/start-undead.lua | 2 +-
.../data/zones/paths-of-the-dead/zone.lua | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index e296f67974..f0522b8ffe 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -56,7 +56,6 @@ local Tooltip = require "engine.Tooltip"
local Calendar = require "engine.Calendar"
local Dialog = require "engine.Dialog"
-local QuitDialog = require "mod.dialogs.Quit"
local MapMenu = require "mod.dialogs.MapMenu"
module(..., package.seeall, class.inherit(engine.GameTurnBased, engine.interface.GameMusic, engine.interface.GameSound, engine.interface.GameTargeting))
@@ -240,9 +239,9 @@ function _M:setupDisplayMode()
self:saveSettings("tome.gfxmode", ("tome.gfxmode = %d\n"):format(self.gfxmode))
-- Create the framebuffer
--- self.fbo = core.display.newFBO(Map.viewport.width, Map.viewport.height)
--- if self.fbo then self.fbo_shader = Shader.new("main_fbo") end
--- game.fbo_shader:setUniform("blur", 3)
+ self.fbo = core.display.newFBO(Map.viewport.width, Map.viewport.height)
+ if self.fbo then self.fbo_shader = Shader.new("main_fbo") end
+-- game.fbo_shader:setUniform("blur", 1)
-- game.fbo_shader:setUniform("colorize", {1,0.3,0})
end
@@ -806,8 +805,18 @@ function _M:onQuit()
self.player:restStop("quitting")
if not self.quit_dialog and not self.player.dead then
- self.quit_dialog = QuitDialog.new()
- self:registerDialog(self.quit_dialog)
+ self.quit_dialog = Dialog:yesnoPopup(" Save and exit? ", "Save and exit?", function(ok)
+ if ok then
+ local d = engine.Dialog:simplePopup("Quitting...", "Quitting...")
+ d.__show_popup = false
+ core.display.forceRedraw()
+
+ -- savefile_pipe is created as a global by the engine
+ savefile_pipe:push(self.save_name, "game", self)
+ util.showMainMenu()
+ end
+ self.quit_dialog = nil
+ end)
end
end
diff --git a/game/modules/tome/data/quests/start-undead.lua b/game/modules/tome/data/quests/start-undead.lua
index 04cba0b06e..423ad003c4 100644
--- a/game/modules/tome/data/quests/start-undead.lua
+++ b/game/modules/tome/data/quests/start-undead.lua
@@ -20,7 +20,7 @@
name = "The rotting stench of the dead"
desc = function(self, who)
local desc = {}
- desc[#desc+1] = "You have been ressurected as an undead by some dark powers."
+ desc[#desc+1] = "You have been resurrected as an undead by some dark powers."
desc[#desc+1] = "However the ritual failed in some way and you retain your own mind, you need to get out of this dark place and try to carve a place for yourself in the world."
if self:isCompleted("black-cloak") then
desc[#desc+1] = "You have found a very special cloak that will help you walk among the living without trouble."
diff --git a/game/modules/tome/data/zones/paths-of-the-dead/zone.lua b/game/modules/tome/data/zones/paths-of-the-dead/zone.lua
index 7f9e393cb3..5db23a0a5b 100644
--- a/game/modules/tome/data/zones/paths-of-the-dead/zone.lua
+++ b/game/modules/tome/data/zones/paths-of-the-dead/zone.lua
@@ -24,7 +24,7 @@ return {
max_level = 8,
decay = {300, 800},
actor_adjust_level = function(zone, level, e) return 1 + zone.max_level - (zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2)) end,
- level_adjust_level = function(zone, level) print("=============", zone.base_level + (zone.max_level - level.level)) return zone.base_level + (zone.max_level - level.level) end,
+ level_adjust_level = function(zone, level) return zone.base_level + (zone.max_level - level.level) end,
width = 50, height = 50,
-- all_remembered = true,
-- all_lited = true,
--
GitLab