Factorized module instanciation/savefile loading into Module:instanciate()

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

game/engine/Module.lua

@@ -19,6 +19,8 @@
 
 require "engine.class"
 local lanes = require "lanes"
+local Dialog = require "engine.Dialog"
+local Savefile = require "engine.Savefile"
 
 --- Handles dialog windows
 module(..., package.seeall, class.make)
@@ -134,6 +136,47 @@ function _M:listSavefiles()
 	return mods
 end
 
+--- Instanciate the given module, loading it and creating a new game / loading an existing one
+-- @param mod the module definition as given by Module:loadDefinition()
+-- @param name the savefile name
+-- @param new_game true if the game must be created (aka new character)
+function _M:instanciate(mod, name, new_game)
+	local popup = Dialog:simplePopup("Loading module", "Please wait while loading the game module...")
+	core.display.forceRedraw()
+
+	profile.generic.modules_loaded = profile.generic.modules_loaded or {}
+	profile.generic.modules_loaded[mod.short_name] = (profile.generic.modules_loaded[mod.short_name] or 0) + 1
+	profile:saveGenericProfile("modules_loaded", profile.generic.modules_loaded)
+
+	-- Ok run the module
+	local M, W = mod.load()
+	_G.game = M.new()
+	_G.game:setPlayerName(name)
+
+	-- Load the world, or make a new one
+	if W then
+		local save = Savefile.new("")
+		_G.world = save:loadWorld()
+		save:close()
+		if not _G.world then
+			_G.world = W.new()
+		end
+		_G.world:run()
+	end
+
+	-- Load the savefile if it exists, or create a new one if not (or if requested)
+	local save = engine.Savefile.new(_G.game.save_name)
+	if save:check() and not new_game then
+		_G.game = save:loadGame()
+	else
+		save:delete()
+	end
+	save:close()
+
+	-- And now run it!
+	_G.game:run()
+end
+
 --- Setup write dir for a module
 -- Static
 function _M:setupWrite(mod)

game/modules/tome/data/chats/message-minas-tirith.lua

@@ -23,7 +23,7 @@ I followed in the trail of bodies you left, you sure are impressive. We are luck
 But enough talk, take this message, now I must go.
 #LIGHT_GREEN#He gives you a sealed scroll and vanishes in the shadows.#LAST#]],
 	answers = {
-		{"Thank you for your courrage.", action=function(npc, player)
+		{"Thank you for your courage.", action=function(npc, player)
 			local o, item, inven_id = npc:findInAllInventories("Sealed Scroll of Minas Tirith")
 			if o then
 				npc:removeObject(inven_id, item, true)

game/modules/tome/data/general/objects/lites.lua

@@ -44,7 +44,7 @@ newEntity{ base = "BASE_LITE",
 	name = "dwarven lantern", color=colors.LIGHT_UMBER,
 	desc = [[Made by the Dwarves, this lantern provides light in the darkest recesses of the earth.]],
 	level_range = {20, 35},
-	rarity = 3,
+	rarity = 10,
 	encumber = 1,
 	cost = 2,
 	material_level = 3,
@@ -55,10 +55,10 @@ newEntity{ base = "BASE_LITE",
 }
 
 newEntity{ base = "BASE_LITE",
-	name = "faenorian lamp", color=colors.GOLD,
-	desc = [[Made by the descendants of the Noldo craftsman, this lamp contains a part of the flame which burned inside Feanor.]],
+	name = "fëanorian lamp", color=colors.GOLD,
+	desc = [[Made by the descendants of the Noldo craftsman, this lamp contains a part of the flame which burned inside Fëanor.]],
 	level_range = {35, 50},
-	rarity = 3,
+	rarity = 12,
 	encumber = 1,
 	cost = 4,
 	material_level = 5,

game/special/mainmenu/class/Game.lua

@@ -121,34 +121,7 @@ function _M:commandLineArgs(args)
 	if req_mod then
 		local mod = self.mod_list[req_mod]
 		if mod then
-			profile.generic.modules_loaded = profile.generic.modules_loaded or {}
-			profile.generic.modules_loaded[req_mod] = (profile.generic.modules_loaded[req_mod] or 0) + 1
-			profile:saveGenericProfile("modules_loaded", profile.generic.modules_loaded)
-
-			local M, W = mod.load()
-			_G.game = M.new()
-
-			-- Load the world, or make a new one
-			if W then
-				local save = Savefile.new("")
-				_G.world = save:loadWorld()
-				save:close()
-				if not _G.world then
-					_G.world = W.new()
-				end
-				_G.world:run()
-			end
-
-			-- Delete the corresponding savefile if any
-			if req_save then _G.game:setPlayerName(req_save) end
-			local save = engine.Savefile.new(_G.game.save_name)
-			if save:check() and not req_new then
-				_G.game = save:loadGame()
-			else
-				save:delete()
-			end
-			save:close()
-			_G.game:run()
+			Module:instanciate(mod, req_save or "player", req_new)
 		else
 			print("Error: module "..req_mod.." not found!")
 		end
@@ -310,23 +283,7 @@ function _M:selectStepLoad()
 
 		for j, save in ipairs(mod.savefiles) do
 			save.fct = function()
-				local M, W = mod.load()
-
-				-- Load the world, or make a new one
-				if W then
-					local save = Savefile.new("")
-					_G.world = save:loadWorld()
-					save:close()
-					if not _G.world then
-						_G.world = W.new()
-					end
-					_G.world:run()
-				end
-
-				local save = Savefile.new(save.short_name)
-				_G.game = save:loadGame()
-				save:close()
-				_G.game:run()
+				Module:instanciate(mod, save.name, false)
 			end
 			save.onSelect = function()
 				display_module.title = save.name

game/special/mainmenu/dialogs/EnterName.lua

@@ -18,8 +18,8 @@
 -- darkgod@te4.org
 
 require "engine.class"
-require "engine.Dialog"
-local Savefile = require "engine.Savefile"
+local Module = require "engine.Module"
+local Dialog = require "engine.Dialog"
 
 module(..., package.seeall, class.inherit(engine.Dialog))
 
@@ -31,34 +31,7 @@ function _M:init(runmod)
 		_RETURN = function()
 			if self.name:len() >= 2 then
 				game:unregisterDialog(self)
-
-				profile.generic.modules_loaded = profile.generic.modules_loaded or {}
-				profile.generic.modules_loaded[self.runmod.short_name] = (profile.generic.modules_loaded[self.runmod.short_name] or 0) + 1
-				profile:saveGenericProfile("modules_loaded", profile.generic.modules_loaded)
-
-				-- Ok run the module
-				local M, W = self.runmod.load()
-				_G.game = M.new()
-				_G.game:setPlayerName(self.name)
-
-				-- Load the world, or make a new one
-				if W then
-					local save = Savefile.new("")
-					_G.world = save:loadWorld()
-					save:close()
-					if not _G.world then
-						_G.world = W.new()
-					end
-					_G.world:run()
-				end
-
-				-- Delete the corresponding savefile if any
-				local save = engine.Savefile.new(_G.game.save_name)
-				save:delete()
-				save:close()
-
-				-- And now run it!
-				_G.game:run()
+				Module:instanciate(self.runmod, self.name, true)
 			else
 				engine.Dialog:simplePopup("Error", "Character name must be between 2 and 25 characters.")
 			end