Allow to disable the background animation onthe main menu

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

game/engines/default/engine/ui/Dialog.lua

@@ -27,7 +27,7 @@ module(..., package.seeall, class.inherit(Base))
 --- Requests a simple, press any key, dialog
 function _M:simplePopup(title, text, fct, no_leave)
 	local w, h = self.font:size(text:removeColorCodes())
-	local tw, th = self.font:size(title:removeColorCodes())
+	local tw, th = self.font_bold:size(title:removeColorCodes())
 	local d = new(title, math.max(w, tw) + 20, h + 75)
 	d:loadUI{{left = 3, top = 3, ui=require("engine.ui.Textzone").new{width=w+10, height=h+5, text=text}}}
 	if not no_leave then
@@ -60,7 +60,7 @@ end
 --- Requests a simple yes-no dialog
 function _M:yesnoPopup(title, text, fct, yes_text, no_text)
 	local w, h = self.font:size(text:removeColorCodes())
-	local tw, th = self.font:size(title:removeColorCodes())
+	local tw, th = self.font_bold:size(title:removeColorCodes())
 	local d = new(title, math.max(w, tw) + 35, h + 75)
 
 --	d.key:addBind("EXIT", function() game:unregisterDialog(d) fct(false) end)
@@ -164,8 +164,12 @@ function _M:generate()
 	s:drawColorStringBlended(self.font, self.title, (self.w - tw) / 2, 4, 255,255,255)
 	self.font:setStyle("normal")
 
-	self.mouse:registerZone(0, 0, gamew, gameh, function(button, x, y, xrel, yrel, bx, by, event) if button == "left" and event == "button" then  self.key:triggerVirtual("EXIT") end end)
-	self.mouse:registerZone(self.display_x, self.display_y, self.w, self.h, function(...) self:mouseEvent(...) end)
+	if self.absolute then
+		self.mouse:registerZone(0, 0, gamew, gameh, function(button, x, y, xrel, yrel, bx, by, event) self:mouseEvent(button, x, y, xrel, yrel, bx - self.display_x, by - self.display_y, event) end)
+	else
+		self.mouse:registerZone(0, 0, gamew, gameh, function(button, x, y, xrel, yrel, bx, by, event) if button == "left" and event == "button" then  self.key:triggerVirtual("EXIT") end end)
+		self.mouse:registerZone(self.display_x, self.display_y, self.w, self.h, function(...) self:mouseEvent(...) end)
+	end
 	self.key.receiveKey = function(_, ...) self:keyEvent(...) end
 	self.key:addCommand("_TAB", function(...) self.key:triggerVirtual("MOVE_DOWN") end)
 	self.key:addBinds{
@@ -204,13 +208,17 @@ function _M:setupUI(resizex, resizey, on_resize)
 		local addw, addh = 0, 0
 
 		for i, ui in ipairs(self.uis) do
-			if ui.top then mh = math.max(mh, ui.top + ui.ui.h + (ui.padding_h or 0))
-			elseif ui.bottom then addh = math.max(addh, ui.bottom + ui.ui.h + (ui.padding_h or 0))
+			if not ui.absolute then
+				if ui.top then mh = math.max(mh, ui.top + ui.ui.h + (ui.padding_h or 0))
+				elseif ui.bottom then addh = math.max(addh, ui.bottom + ui.ui.h + (ui.padding_h or 0))
+				end
 			end
 
 --		print("ui", ui.left, ui.right, ui.ui.w)
-			if ui.left then mw = math.max(mw, ui.left + ui.ui.w + (ui.padding_w or 0))
-			elseif ui.right then addw = math.max(addw, ui.right + ui.ui.w + (ui.padding_w or 0))
+			if not ui.absolute then
+				if ui.left then mw = math.max(mw, ui.left + ui.ui.w + (ui.padding_w or 0))
+				elseif ui.right then addw = math.max(addw, ui.right + ui.ui.w + (ui.padding_w or 0))
+				end
 			end
 		end
 --		print("===", mw, addw)
@@ -226,15 +234,32 @@ function _M:setupUI(resizex, resizey, on_resize)
 	end
 
 	for i, ui in ipairs(self.uis) do
-		local ux, uy = self.ix, self.iy
+		local ux, uy
+
+		if not ui.absolute then
+			ux, uy = self.ix, self.iy
+
+			if ui.top then uy = uy + ui.top
+			elseif ui.bottom then uy = uy + self.ih - ui.bottom - ui.ui.h
+			elseif ui.vcenter then uy = uy + math.floor(self.ih / 2) + ui.vcenter - ui.ui.h / 2 end
 
-		if ui.top then uy = uy + ui.top
-		elseif ui.bottom then uy = uy + self.ih - ui.bottom - ui.ui.h
-		elseif ui.vcenter then uy = uy + math.floor(self.ih / 2) + ui.vcenter - ui.ui.h / 2 end
+			if ui.left then ux = ux + ui.left
+			elseif ui.right then ux = ux + self.iw - ui.right - ui.ui.w
+			elseif ui.hcenter then ux = ux + math.floor(self.iw / 2) + ui.hcenter - ui.ui.w / 2 end
+		else
+			ux, uy = 0, 0
+
+			if ui.top then uy = uy + ui.top
+			elseif ui.bottom then uy = uy + game.h - ui.bottom - ui.ui.h
+			elseif ui.vcenter then uy = uy + math.floor(game.h / 2) + ui.vcenter - ui.ui.h / 2 end
 
-		if ui.left then ux = ux + ui.left
-		elseif ui.right then ux = ux + self.iw - ui.right - ui.ui.w
-		elseif ui.hcenter then ux = ux + math.floor(self.iw / 2) + ui.hcenter - ui.ui.w / 2 end
+			if ui.left then ux = ux + ui.left
+			elseif ui.right then ux = ux + game.w - ui.right - ui.ui.w
+			elseif ui.hcenter then ux = ux + math.floor(game.w / 2) + ui.hcenter - ui.ui.w / 2 end
+
+			ux = ux - self.display_x
+			uy = uy - self.display_y
+		end
 
 		ui.x = ux
 		ui.y = uy

game/engines/default/engine/ui/Textzone.lua

@@ -26,12 +26,14 @@ module(..., package.seeall, class.inherit(Base, Focusable))
 
 function _M:init(t)
 	self.text = assert(t.text, "no textzone text")
+	if t.auto_width then t.width = 1 end
 	self.w = assert(t.width, "no list width")
 	if t.auto_height then t.height = 1 end
 	self.h = assert(t.height, "no list height")
 	self.scrollbar = t.scrollbar
 	self.no_color_bleed = t.no_color_bleed
 	self.auto_height = t.auto_height
+	self.auto_width = t.auto_width
 
 	Base.init(self, t)
 end
@@ -40,7 +42,13 @@ function _M:generate()
 	self.mouse:reset()
 	self.key:reset()
 
-	local list = self.text:splitLines(self.w, self.font)
+	local list
+	if not self.auto_width then
+		list = self.text:splitLines(self.w, self.font)
+	else
+		list = {self.text}
+		self.w = self.font:size(self.text:removeColorCodes())
+	end
 	self.scroll = 1
 	self.max = #list
 

game/modules/boot/class/Game.lua

@@ -52,6 +52,7 @@ function _M:init()
 
 	self.refuse_threads = true
 	self.normal_key = self.key
+	self.stopped = config.settings.boot_menu_background
 
 	self:loaded()
 end
@@ -78,9 +79,6 @@ function _M:run()
 	self.mod_list = Module:listModules()
 	self.save_list = Module:listSavefiles()
 
-	self:checkLogged()
-	self:engineVersion()
-
 	-- Setup display
 	self:registerDialog(MainMenu.new())
 
@@ -168,10 +166,6 @@ function _M:checkLogged()
 	end
 end
 
-function _M:engineVersion()
-	self.s_version = core.display.drawStringBlendedNewSurface(self.profile_font, ("T-Engine4 version: %d.%d.%d"):format(engine.version[1], engine.version[2], engine.version[3]), 185, 225, 0)
-end
-
 function _M:newGame()
 	self.player = Player.new{name=self.player_name, game_ender=true}
 	Map:setViewerActor(self.player)
@@ -246,6 +240,7 @@ function _M:getPlayer()
 end
 
 function _M:tick()
+	if self.stopped then return end
 	if self.level then
 		engine.GameEnergyBased.tick(self)
 		-- Fun stuff: this can make the game realtime, although callit it in display() will make it work better
@@ -269,6 +264,14 @@ function _M:display()
 	-- If switching resolution, blank everything but the dialog
 	if self.change_res_dialog then engine.GameEnergyBased.display(self) return end
 
+	-- If background anim is stopped, thigns are much simplied
+	if self.stopped then
+		self.tooltip:display()
+		self.tooltip:toScreen(5, 5)
+		engine.GameEnergyBased.display(self)
+		return
+	end
+
 	-- Display using Framebuffer, so that we can use shaders and all
 	if self.fbo then self.fbo:use(true) end
 
@@ -298,13 +301,6 @@ function _M:display()
 --		core.display.drawQuad(0, 0, game.w, game.h, 128, 128, 128, 128)
 	end
 
-	if self.s_log then
-		local w, h = self.s_log:getSize()
-		self.s_log:toScreen(self.w - w, self.h - h)
-	end
---	local w, h = self.s_version:getSize()
---	self.s_version:toScreen(0, self.h - h)
-
 	self.tooltip:display()
 	self.tooltip:toScreen(5, 5)
 

game/modules/boot/dialogs/MainMenu.lua

@@ -20,11 +20,14 @@
 require "engine.class"
 local Dialog = require "engine.ui.Dialog"
 local List = require "engine.ui.List"
+local Button = require "engine.ui.Button"
+local Textzone = require "engine.ui.Textzone"
 
 module(..., package.seeall, class.inherit(Dialog))
 
 function _M:init()
 	Dialog.init(self, "Main Menu", 300, 400, 450, 50)
+	self.absolute = true
 
 	self.list = {
 		{name="New Game", fct=function() game:registerDialog(require("mod.dialogs.NewGame").new()) end},
@@ -43,14 +46,33 @@ function _M:init()
 		{name="Exit", fct=function() game:onQuit() end},
 	}
 
+	self.c_background = Button.new{text=game.stopped and "Enable background" or "Disable background", width=150, fct=function() self:switchBackground() end}
+	self.c_version = Textzone.new{auto_width=true, auto_height=true, text=("#{bold}##B9E100#T-Engine4 version: %d.%d.%d"):format(engine.version[1], engine.version[2], engine.version[3])}
+
+	if profile.auth then
+		self.logged_url = "http://te4.org/players/"..profile.auth.page
+		local str = "#FFFF00#Online Profile: "..profile.auth.name.."[#LIGHT_BLUE##{underline}#"..self.logged_url.."#LAST##{normal}#]"
+		self.c_auth = Textzone.new{auto_width=true, auto_height=true, text=str}
+	end
+
 	self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) end, font={"/data/font/VeraBd.ttf", 16}}
 
 	self:loadUI{
 		{left=0, top=0, ui=self.c_list},
+		{left=0, bottom=0, absolute=true, ui=self.c_background},
+		{right=0, top=0, absolute=true, ui=self.c_version},
+		self.c_auth and {right=0, bottom=0, absolute=true, ui=self.c_auth} or nil,
 	}
 	self:setupUI(false, true)
 end
 
+function _M:switchBackground()
+	game.stopped = not game.stopped
+	game:saveSettings("boot_menu_background", ("boot_menu_background = %s\n"):format(tostring(game.stopped)))
+	self.c_background.text = game.stopped and "Enable background" or "Disable background"
+	self.c_background:generate()
+end
+
 function _M:on_recover_focus()
 	game:unregisterDialog(self)
 	local d = new()

game/modules/tome/data/quests/escort-duty.lua

@@ -250,7 +250,7 @@ desc = function(self, who)
 		if self.abandoned then
 			desc[#desc+1] = "You abandonned "..self.kind.name.." to death."
 		else
-			desc[#desc+1] = "You failed to protect the "..self.kind.name.." from death by "..self.killing_npc.."."
+			desc[#desc+1] = "You failed to protect the "..self.kind.name.." from death by "..(self.killing_npc or "???").."."
 		end
 	else
 		desc[#desc+1] = "Escort the "..self.kind.name.." to the recall portal on level "..self.level_name.."."