campaigns

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

game/engines/default/engine/Birther.lua

@@ -24,6 +24,7 @@ module(..., package.seeall, class.inherit(engine.Dialog))
 
 _M.birth_descriptor_def = {}
 _M.birth_auto = {}
+_M.step_names = {}
 
 --- Defines birth descriptors
 -- Static!
@@ -34,6 +35,7 @@ function _M:loadDefinition(file)
 		ActorTalents = require("engine.interface.ActorTalents"),
 		newBirthDescriptor = function(t) self:newBirthDescriptor(t) end,
 		setAuto = function(type, v) self.birth_auto[type] = v end,
+		setStepNames = function(names) self.step_names = names end,
 		load = function(f) self:loadDefinition(f) end
 	}, {__index=_G}))
 	f()
@@ -46,6 +48,7 @@ function _M:newBirthDescriptor(t)
 	assert(t.type, "no birth type")
 	t.short_name = t.short_name or t.name
 	t.short_name = t.short_name:upper():gsub("[ ]", "_")
+	t.display_name = t.display_name or t.name
 	assert(t.desc, "no birth description")
 	if type(t.desc) == "table" then t.desc = table.concat(t.desc, "\n") end
 	t.desc = t.desc:gsub("\n\t+", "\n")
@@ -264,9 +267,9 @@ Mouse: #00FF00#Left click#FFFFFF# to accept; #00FF00#right click#FFFFFF# to go b
 	end
 
 	-- Stats
-	s:drawColorStringBlended(self.font, "Selecting: "..self.current_type:capitalize(), 2, 2)
+	s:drawColorStringBlended(self.font, "Selecting: "..(self.step_names[self.current_type] or self.current_type:capitalize()), 2, 2)
 	self:drawWBorder(s, 2, 20, 200)
 
-	self:drawSelectionList(s, 2, 25, self.font_h, self.list, self.sel, "name")
+	self:drawSelectionList(s, 2, 25, self.font_h, self.list, self.sel, "display_name")
 	self.changed = false
 end

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

@@ -20,6 +20,14 @@
 setAuto("subclass", false)
 setAuto("subrace", false)
 
+setStepNames{
+	world = "Campaign",
+	race = "Race Category",
+	subrace = "Race",
+	class = "Class Category",
+	subclass = "Class",
+}
+
 newBirthDescriptor{
 	type = "base",
 	name = "base",
@@ -31,7 +39,13 @@ newBirthDescriptor{
 		{
 			Tutorial = "disallow",
 			Arda = "allow",
-			["Spydrë"] = function() return profile.mod.allow_build.world_spydre and "allow" or "disallow" end,
+			Ents = "disallow",
+			Spydre = "disallow",
+			Orcs = "disallow",
+			Trolls = "disallow",
+			Nagas = "disallow",
+			Undeads = "disallow",
+			Faeros = "disallow",
 		},
 		subclass =
 		{

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

@@ -17,17 +17,61 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
--- Player worlds
+newBirthDescriptor{
+	type = "world",
+	name = "Tutorial",
+	desc =
+	{
+		"The tutorial will explain the basics of the game to get you started.",
+	},
+--	on_select = function(what)
+--		setAuto("subclass", false)
+--		setAuto("subrace", false)
+--	end,
+	descriptor_choices =
+	{
+		race =
+		{
+			__ALL__ = "forbid",
+			["Tutorial Human"] = "allow",
+		},
+		subrace =
+		{
+			__ALL__ = "forbid",
+			["Tutorial Human"] = "allow",
+		},
+		class =
+		{
+			__ALL__ = "forbid",
+			["Tutorial Adventurer"] = "allow",
+		},
+		subclass =
+		{
+			__ALL__ = "forbid",
+			["Tutorial Adventurer"] = "allow",
+		},
+	},
+}
+
+
+-- Player worlds/campaigns
 newBirthDescriptor{
 	type = "world",
 	name = "Arda",
+	display_name = "Free People: The Fourth Age",
 	desc =
 	{
+--[[
 		"Arda, the World.",
 		"It was shaped into being ages ago by the Music of the Ainur.",
 		"It is home of elves, men, dwarves and hobbits, but also evil orcs, trolls and dragons.",
 		"Since the downfall of Sauron, the lands have known relative peace.",
 		"Until recently it was the only world known to exist.",
+]]
+		"The Free People of Middle-earth: Humans, Hobbits, Elves and Dwarves.",
+		"The West has been at relative peace for over one hundred year and people are prospering again.",
+		"You are an adventurer, setting out to find lost treasure and glory.",
+		"But what lurks in the shadow of the world?",
 	},
 	descriptor_choices =
 	{
@@ -61,48 +105,127 @@ newBirthDescriptor{
 
 newBirthDescriptor{
 	type = "world",
-	name = "Tutorial",
+	name = "Orcs",
+	display_name = "Orcs: The Rise to Power",
 	desc =
 	{
-		"The tutorial will explain the basics of the game to get you started.",
+		"Baston!",
 	},
---	on_select = function(what)
---		setAuto("subclass", false)
---		setAuto("subrace", false)
---	end,
 	descriptor_choices =
 	{
 		race =
 		{
-			__ALL__ = "forbid",
-			["Tutorial Human"] = "allow",
+			__ALL__ = "disallow",
+			Orc = "allow",
+--			Spider = function() return profile.mod.allow_build.spider and "allow" or "disallow" end,
 		},
-		subrace =
+	},
+}
+
+newBirthDescriptor{
+	type = "world",
+	name = "Spydre",
+	display_name = "Spydrë: Legacy of Ungoliant",
+	desc =
+	{
+		"Spydrë is home to the essence of spiders. The mighty Ungoliant of Arda actually originating from this world.",
+		"It is home to uncounted numbers of spider races, all fighting for supremacy of all the lands.",
+		"Some humanoids also live there, but they are usually the prey, not the hunter.",
+	},
+	descriptor_choices =
+	{
+		race =
 		{
-			__ALL__ = "forbid",
-			["Tutorial Human"] = "allow",
+			__ALL__ = "disallow",
+			Human = "allow",
+--			Spider = function() return profile.mod.allow_build.spider and "allow" or "disallow" end,
 		},
-		class =
+	},
+}
+
+newBirthDescriptor{
+	type = "world",
+	name = "Ents",
+	display_name = "Ents: The March of the Entwifes",
+	desc =
+	{
+		"",
+	},
+	descriptor_choices =
+	{
+		race =
 		{
-			__ALL__ = "forbid",
-			["Tutorial Adventurer"] = "allow",
+			__ALL__ = "disallow",
+			Human = "allow",
+--			Spider = function() return profile.mod.allow_build.spider and "allow" or "disallow" end,
 		},
-		subclass =
+	},
+}
+
+newBirthDescriptor{
+	type = "world",
+	name = "Trolls",
+	display_name = "Trolls: Terror of the Woods",
+	desc =
+	{
+		"",
+	},
+	descriptor_choices =
+	{
+		race =
 		{
-			__ALL__ = "forbid",
-			["Tutorial Adventurer"] = "allow",
+			__ALL__ = "disallow",
+			Human = "allow",
+--			Spider = function() return profile.mod.allow_build.spider and "allow" or "disallow" end,
 		},
 	},
 }
 
 newBirthDescriptor{
 	type = "world",
-	name = "Spydrë",
+	name = "Nagas",
+	display_name = "Nagas: Guardians of the Tide",
 	desc =
 	{
-		"Spydrë is home to the essence of spiders. The mighty Ungoliant of Arda actually originating from this world.",
-		"It is home to uncounted numbers of spider races, all fighting for supremacy of all the lands.",
-		"Some humanoids also live there, but they are usually the prey, not the hunter.",
+		"",
+	},
+	descriptor_choices =
+	{
+		race =
+		{
+			__ALL__ = "disallow",
+			Human = "allow",
+--			Spider = function() return profile.mod.allow_build.spider and "allow" or "disallow" end,
+		},
+	},
+}
+
+newBirthDescriptor{
+	type = "world",
+	name = "Faeros",
+	display_name = "Urthalath: Treason or the High Guards",
+	desc =
+	{
+		"",
+	},
+	descriptor_choices =
+	{
+		race =
+		{
+			__ALL__ = "disallow",
+			Human = "allow",
+--			Spider = function() return profile.mod.allow_build.spider and "allow" or "disallow" end,
+		},
+	},
+}
+
+newBirthDescriptor{
+	type = "world",
+	name = "Undeads",
+	display_name = "Broken Oath: The Curse of Undeath",
+	desc =
+	{
+		"",
 	},
 	descriptor_choices =
 	{