Pressing ? will bring up the game menu

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

game/engines/default/engine/generator/map/Static.lua

@@ -160,7 +160,7 @@ function _M:generate(lev, old_lev)
 		if g then
 			if g.force_clone then g = g:clone() end
 			g:resolve()
-			g:resolve(nil, true) print(i-1, j-1, g.name)
+			g:resolve(nil, true)
 			self.map(i-1, j-1, Map.TERRAIN, g)
 		end
 

game/modules/tome/class/Game.lua

@@ -148,14 +148,17 @@ function _M:newGame()
 
 		self.paused = true
 		print("[PLAYER BIRTH] resolved!")
-		self.player:playerLevelup(function()
+		local birthend = function()
 			self:registerDialog(require("mod.dialogs.IntroDialog").new(self.player, function()
 				self.player:resetToFull()
 				self.player:registerCharacterPlayed()
 				self.player:grantQuest(self.player.starting_quest)
 				self.player:onBirth(birth)
 			end))
-		end)
+		end
+
+		if self.player.no_birth_levelup then birthend()
+		else self.player:playerLevelup(birthend) end
 	end, quickbirth, 720, 500)
 	self:registerDialog(birth)
 end
@@ -559,7 +562,7 @@ function _M:setupCommands()
 				self:changeLevel(1, "grushnak-pride")
 --				self.player:grantQuest("master-jeweler")
 			end
-		end
+		end,
 	}
 	self.key:addBinds
 	{
@@ -733,6 +736,7 @@ function _M:setupCommands()
 			self.player.changed = true
 		end,
 
+		HELP = "EXIT",
 		EXIT = function()
 			local menu menu = require("engine.dialogs.GameMenu").new{
 				"resume",

game/modules/tome/data/birth/classes/tutorial.lua

@@ -51,24 +51,15 @@ newBirthDescriptor{
 	},
 	stats = { str=10, con=5, dex=5, mag=10, wil=5, cun=5 },
 	talents_types = {
-		["technique/shield-offense"]={true, 0.3},
-		["technique/shield-defense"]={true, 0.3},
 		["technique/combat-training"]={true, 0.3},
-		["cunning/survival"]={true, 0.3},
-		["spell/fire"]={true, 0.3},
-		["spell/air"]={true, 0.3},
-		["spell/arcane"]={true, 0.3},
 	},
 	talents = {
-		[ActorTalents.T_SHIELD_PUMMEL] = 2,
-		[ActorTalents.T_REPULSION] = 2,
 		[ActorTalents.T_WEAPON_COMBAT] = 2,
 		[ActorTalents.T_HEAVY_ARMOUR_TRAINING] = 2,
-		[ActorTalents.T_FLAME] = 2,
-		[ActorTalents.T_LIGHTNING] = 2,
-		[ActorTalents.T_ARCANE_POWER] = 2,
+		[ActorTalents.T_SWORD_MASTERY] = 2,
 	},
 	copy = {
+		unused_stats = 0, unused_talents = 0, unused_generics = 0, unused_talents_types = 0,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="longsword", name="iron longsword", autoreq=true},
 			{type="armor", subtype="shield", name="iron shield", autoreq=true},

game/modules/tome/data/birth/races/hobbit.lua

@@ -68,10 +68,10 @@ newBirthDescriptor
 		"#LIGHT_BLUE# * +0 Magic, +0 Willpower, +3 Cunning",
 		"#LIGHT_BLUE# * +5 Luck",
 		"#GOLD#Life per levels:#LIGHT_BLUE# 12",
-		"#GOLD#Experience penality:#LIGHT_BLUE# 15%",
+		"#GOLD#Experience penality:#LIGHT_BLUE# 20%",
 	},
 	stats = { str=-3, dex=3, con=1, cun=3, lck=5, },
-	experience = 1.15,
+	experience = 1.20,
 	talents = {
 		[ActorTalents.T_HOBBIT_LUCK]=1,
 	},

game/modules/tome/data/birth/worlds.lua

@@ -93,6 +93,9 @@ newBirthDescriptor{
 			["Tutorial Adventurer"] = "allow",
 		},
 	},
+	copy = {
+		no_birth_levelup = true,
+	},
 }
 
 newBirthDescriptor{

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

@@ -20,7 +20,7 @@
 startx = 49
 starty = 24
 
-defineTile(""", "DEEP_WATER", 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("#", "DEEP_WATER", nil, {random_filter={type="immovable", subtype="jelly", max_ood=2}}, nil)
 defineTile("$", "DEEP_WATER", {random_filter={name="potion of lesser healing"}}, nil, nil)
 defineTile("&", {"TREE","TREE2","TREE3","TREE4","TREE5","TREE6","TREE7","TREE8","TREE9","TREE10","TREE11","TREE12","TREE13","TREE14","TREE15","TREE16","TREE17","TREE18","TREE19","TREE20"}, nil, nil, nil)
@@ -28,7 +28,7 @@ defineTile("j", "GRASS", nil, {random_filter={type="immovable", subtype="jelly",
 defineTile("~", "DEEP_WATER", nil, nil, nil)
 defineTile(",", "GRASS", nil, nil, nil)
 defineTile("?", nil, nil, nil, nil)
-defineTile("S", "GRASS", nil, {random_filter={type="animal", subtype=snake", max_ood=2}}, nil)
+defineTile("S", "GRASS", nil, {random_filter={type="animal", subtype="snake", 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)
 
@@ -82,5 +82,4 @@ return [[
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&~&&&&&&
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&~&&&&&&
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&$&&&&&&
-&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-]]
+&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&]]