fniish tutorial

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

game/engines/default/engine/Game.lua

@@ -254,7 +254,7 @@ end
 --- Called when screen resolution changes
 function _M:onResolutionChange()
 	self.w, self.h = core.display.size()
-	self:saveSettings("resolution", ("window.size = %dx%d\n"):format(self.w, self.h))
+	self:saveSettings("resolution", ("window.size = '%dx%d'\n"):format(self.w, self.h))
 end
 
 --- Requests the game to save

game/engines/default/engine/init.lua

@@ -75,7 +75,7 @@ key:setCurrent()
 game = false
 
 -- Setup resolution
-engine.Game:setResolution(config.settings.window.size)
+engine.Game:setResolution(config.settings.window.size, true)
 
 -- Setup musics
 engine.interface.GameMusic:soundSystemStatus(config.settings.sound.enabled, true)

game/modules/tome/data/maps/tutorial/tutorial1.lua

@@ -38,7 +38,6 @@ defineTile("6", "GRASS", nil, nil, "TUTORIAL_TACTICS1")
 defineTile("7", "GRASS", nil, nil, "TUTORIAL_TACTICS2")
 defineTile("8", "GRASS", nil, nil, "TUTORIAL_RANGED")
 defineTile("9", "GRASS", nil, nil, "TUTORIAL_QUESTS")
-defineTile("?", nil, nil, nil, nil)
 defineTile("j", "GRASS", nil, {random_filter={type="immovable", subtype="jelly", max_ood=2}}, nil)
 defineTile(" ", "DEEP_WATER", nil, {random_filter={type="immovable", subtype="jelly", max_ood=2}}, nil)
 defineTile("!", "GRASS", {random_filter={name="potion of lesser healing"}}, nil, nil)

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

@@ -36,7 +36,7 @@ newEntity{ base = "BASE_NPC_SKELETON", define_as = "TUTORIAL_NPC_MAGE",
 	ai = "dumb_talented_simple", ai_state = { talent_in=1, },
 }
 
-newEntity{ base = "BASE_NPC_TROLL", defined_as = "TUTORIAL_NPC_TROLL",
+newEntity{ base = "BASE_NPC_TROLL", define_as = "TUTORIAL_NPC_TROLL",
 	name = "half-dead forest troll", color=colors.YELLOW_GREEN, image="npc/troll_f.png",
 	desc = [[Green-skinned and ugly, this massive humanoid glares at you, clenching wart-covered green fists.
 He looks hurt.]],
@@ -45,7 +45,7 @@ He looks hurt.]],
 	combat_armor = 3, combat_def = 0,
 }
 
-newEntity{ base = "BASE_NPC_CANINE", defined_as = "TUTORIAL_NPC_LONE_WOLF",
+newEntity{ base = "BASE_NPC_CANINE", define_as = "TUTORIAL_NPC_LONE_WOLF",
 	name = "Lone Wolf", color=colors.VIOLET, unique=true, image="npc/canine_rungof.png",
 	desc = [[It is a large wolf with eyes full of cunning, only 3 times bigger than a normal wolf. It looks hungry. You look tasty!]],
 	level_range = {3, nil}, exp_worth = 2,
@@ -68,7 +68,7 @@ newEntity{ base = "BASE_NPC_CANINE", defined_as = "TUTORIAL_NPC_LONE_WOLF",
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("tutorial", engine.Quest.COMPLETED)
-		local d = require("engine.dialogs.ShowText").new("Tutorial: "..self.name, "tutorial/"..self.text)
+		local d = require("engine.dialogs.ShowText").new("Tutorial: Finish", "tutorial/done")
 		game:registerDialog(d)
 	end,
 }