the 4 races of the Free People.

now finalized at all


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

game/engine/Birther.lua

@@ -26,6 +26,8 @@ function _M:newBirthDescriptor(t)
 	t.short_name = t.short_name or t.name
 	t.short_name = t.short_name:upper():gsub("[ ]", "_")
 	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")
 	t.descriptor_choices = t.descriptor_choices or {}
 
 	table.insert(self.birth_descriptor_def, t)
@@ -166,7 +168,7 @@ Mouse: #00FF00#Left click#FFFFFF# to increase a stat; #00FF00#right click#FFFFFF
 		s:drawColorString(self.font, birthhelp[i], self.iw / 2 + 5, 2 + (i-1) * self.font:lineSkip())
 	end
 
-	local lines = table.concat(self.list[self.sel].desc,"\n"):splitLines(self.iw / 2 - 10, self.font)
+	local lines = self.list[self.sel].desc:splitLines(self.iw / 2 - 10, self.font)
 	for i = 1, #lines do
 		s:drawColorString(self.font, lines[i], self.iw / 2 + 5, 2 + (i + #birthhelp + 1) * self.font:lineSkip())
 	end

game/modules/tome/class/PlayerDisplay.lua

@@ -28,7 +28,7 @@ function _M:display()
 
 	local h = 0
 	self.surface:drawString(self.font, game.player.name, 0, h, 0, 200, 255) h = h + self.font_h
-	self.surface:drawString(self.font, game.player.descriptor.race or "", 0, h, 0, 200, 255) h = h + self.font_h
+	self.surface:drawString(self.font, game.player.descriptor.subrace or "", 0, h, 0, 200, 255) h = h + self.font_h
 	h = h + self.font_h
 	self.surface:drawColorString(self.font, "Level: #00ff00#"..game.player.level, 0, h, 255, 255, 255) h = h + self.font_h
 	self.surface:drawColorString(self.font, ("Exp: #00ff00#%2d%%"):format(100 * cur_exp / max_exp), 0, h, 255, 255, 255) h = h + self.font_h

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

@@ -14,7 +14,9 @@ newBirthDescriptor{
 	},
 }
 
-load("/data/birth/races.lua")
-load("/data/birth/subraces.lua")
+load("/data/birth/races/human.lua")
+load("/data/birth/races/elf.lua")
+load("/data/birth/races/hobbit.lua")
+load("/data/birth/races/dwarf.lua")
 load("/data/birth/sexes.lua")
 load("/data/birth/classes.lua")

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

+---------------------------------------------------------
+--                       Dwarves                       --
+---------------------------------------------------------
+newBirthDescriptor{
+	type = "race",
+	name = "Dwarf",
+	desc = {
+		"The children of Aule, a strong but small race.",
+		"Miners and fighters of legend.",
+		"Female dwarves remain a mystery and as such may not be played."
+	},
+	descriptor_choices =
+	{
+		subrace =
+		{
+			__ALL__ = "never",
+			Dwarf = "allow",
+		},
+		sex =
+		{
+			__ALL__ = "never",
+			Male = "allow",
+		},
+	},
+	stats = { str=4, con=3, wil=3, mag=-2, dex=-2 },
+	talents = {
+--		[ActorTalents.T_],
+	},
+	copy = {
+		default_wilderness = {"wilderness/main", 41, 18},
+	},
+	life_rating=12,
+	experience = 1.1,
+}
+
+---------------------------------------------------------
+--                       Dwarves                       --
+---------------------------------------------------------
+newBirthDescriptor
+{
+	type = "subrace",
+	name = "Dwarf",
+	desc = {
+		"The children of Aule, a strong but small race.",
+		"Miners and fighters of legend.",
+	},
+}

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

+---------------------------------------------------------
+--                       Elves                         --
+---------------------------------------------------------
+newBirthDescriptor{
+	type = "race",
+	name = "Elf",
+	desc = {
+		"Quendi are Elves, the first children of Eru.",
+		"The first Elves awoke by Cuiviénen, the Water of Awakening in the far east of Middle-earth, long Ages before the Rising of the Sun or Moon.",
+		"Unlike Men, the Elves are not subject to death by old age.",
+	},
+	descriptor_choices =
+	{
+		subrace =
+		{
+			Nandor = "allow",
+			Avari = "allow",
+			__ALL__ = "never",
+		},
+	},
+	talents = {
+--		[ActorTalents.T_IMPROVED_MANA_I]=1,
+	},
+	copy = {
+		default_wilderness = {"wilderness/main", 41, 18},
+	},
+	experience = 1.05,
+}
+
+---------------------------------------------------------
+--                       Elves                         --
+---------------------------------------------------------
+newBirthDescriptor
+{
+	type = "subrace",
+	name = "Nandor",
+	desc = {
+		"Elves who turned aside from the Great Journey in the early days and settled in th east of the Misty Mountains.",
+		"Both the Wood-Elves of Mirkwood and the Elves of Lórien are Nandor.",
+	},
+	stats = { str=-2, mag=2, wil=3, cun=1, dex=1, con=0 },
+	experience = 1.3,
+	talents = {},
+}
+
+newBirthDescriptor
+{
+	type = "subrace",
+	name = "Avari",
+	desc = {
+		"The Avari are those elves who refused the summons of Orome to come to Valinor, and stayed behind in Middle-earth instead.",
+	},
+	stats = { str=-1, mag=1, wil=1, cun=3, dex=2, con=0 },
+	talents = { ActorTalents.DECREASED_HEALTH_I },
+	experience = 1.1,
+}

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

-newBirthDescriptor{
-	type = "race",
-	name = "Human",
-	desc = {
-		"Humans are one of the youngest of the races of Arda.",
-	},
-	descriptor_choices =
-	{
-		subrace =
-		{
-			Human = "allow",
-			Dunadan = "allow",
-			Rohirrim = "allow",
-			Beorning = "allow",
-			__ALL__ = "never",
-		},
-	},
-	stats = { cun=1 },
-	talents = {},
-	experience = 1.0,
-}
-
-newBirthDescriptor{
-	type = "race",
-	name = "Elf",
-	desc = {
-		"Elves are the first children of Eru.",
-		"The first Elves awoke by Cuiviénen, the Water of Awakening in the far east of Middle-earth, long Ages before the Rising of the Sun or Moon. Unlike Men, the Elves were not subject to illness or death.",
-	},
-	descriptor_choices =
-	{
-		subrace =
-		{
-			Noldor = "allow",
-			Avari = "allow",
-			__ALL__ = "never",
-		},
-	},
-	stats = { wil=1, mag=1, },
-	talents = {
-		ActorTalents.T_IMPROVED_MANA_I,
-	},
-	experience = 1.05,
-}
-
---[[
-newBirthDescriptor{
-	type = "race",
-	name = "Dwarf",
-	desc = {
-		"The children of Aule, a strong but small race.",
-		"Miners and fighters of legend.",
-		"Female dwarves remain a mystery and as such may not be played."
-	},
-	descriptor_choices =
-	{
-		subrace =
-		{
-			__ALL__ = "never",
-			Dwarf = "allow",
-		},
-		sex =
-		{
-			__ALL__ = "never",
-			Male = "allow",
-		},
-	},
-	stats = { str=1, con=1 },
-	talents = {
-		ActorTalents.T_IMPROVED_HEALTH_I,
-	},
-	experience = 1.05,
-}
-
+---------------------------------------------------------
+--                       Hobbits                       --
+---------------------------------------------------------
 newBirthDescriptor{
 	type = "race",
 	name = "Hobbit",
@@ -107,5 +36,38 @@ newBirthDescriptor{
 		ActorTalents.T_IMPROVED_HEALTH_I,
 		ActorTalents.T_IMPROVED_HEALTH_II,
 	},
+	copy = {
+		default_wilderness = {"wilderness/main", 41, 18},
+	},
+}
+
+---------------------------------------------------------
+--                       Hobbits                       --
+---------------------------------------------------------
+newBirthDescriptor
+{
+	type = "subrace",
+	name = "Harfoot",
+	desc = {
+		"An old but quiet race related to humans.",
+		"They are small and quite weak but good at many things.",
+	},
+}
+newBirthDescriptor
+{
+	type = "subrace",
+	name = "Fallohide",
+	desc = {
+		"An old but quiet race related to humans.",
+		"They are small and quite weak but good at many things.",
+	},
+}
+newBirthDescriptor
+{
+	type = "subrace",
+	name = "Stoor",
+	desc = {
+		"An old but quiet race related to humans.",
+		"They are small and quite weak but good at many things.",
+	},
 }
-]]
\ No newline at end of file

game/modules/tome/data/birth/subraces.lua → game/modules/tome/data/birth/races/human.lua

 ---------------------------------------------------------
 --                       Humans                        --
 ---------------------------------------------------------
---[[
+newBirthDescriptor{
+	type = "race",
+	name = "Human",
+	desc = {
+		"The Edain are the humans are one of the youngest of the races of Arda.",
+	},
+	descriptor_choices =
+	{
+		subrace =
+		{
+			["Bree-man"] = "allow",
+			Dunadan = "allow",
+			Rohirrim = "allow",
+			Beorning = "allow",
+			__ALL__ = "never",
+		},
+	},
+	talents = {},
+	experience = 1.0,
+}
+
+---------------------------------------------------------
+--                       Humans                        --
+---------------------------------------------------------
 newBirthDescriptor
 {
 	type = "subrace",
-	name = "Human",
+	name = "Bree-man",
 	desc = {
-		"Humans are one of the youngest of the races of Arda.",
+		"Humans hailing from the northen town of Bree. A common kind of man.",
+	},
+	copy = {
+		default_wilderness = {"wilderness/main", 41, 18},
 	},
 }
-]]
+
 newBirthDescriptor
 {
 	type = "subrace",
@@ -20,7 +46,7 @@ newBirthDescriptor
 		"stronger, smarter and wiser.",
 	},
 	stats = { str=1, cun=1, dex=1, wil=1 },
-	experience = 1.1,
+	experience = 1.25,
 	talents = { [ActorTalents.T_IMPROVED_HEALTH_I]=1, [ActorTalents.T_DUNADAN_HEAL]=1, },
 	copy = {
 		default_wilderness = {"wilderness/main", 41, 18},
@@ -60,106 +86,3 @@ newBirthDescriptor
 }
 ]]
 
----------------------------------------------------------
---                       Elves                         --
----------------------------------------------------------
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Noldor",
-	desc = {
-		"The Noldor are the second clan of Elves who came to Valinor, and ",
-		"are accounted as the greatest of all peoples in Middle-earth. ",
-		"They are masters of all skills, and are strong and intelligent. ",
-		"They can play all classes except rogues, and very well at that. ",
-		"High-elves begin their lives able to see the unseen, and resist ",
-		"light effects just like regular elves.  However, there are few ",
-		"things that they have not seen already, and experience is very ",
-		"hard for them to gain."
-	},
-	stats = { str=1, mag=2, wil=3, cun=1, dex=1, },
-	experience = 1.3,
-	talents = {},
-	copy = {
-		default_wilderness = {"wilderness/main", 41, 18},
-	},
-}
-
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Avari",
-	desc = {
-		"The Avari are those elves who refused the summons of Orome to come",
-		"to Valinor, and stayed behind in Middle-earth instead.  While ",
-		"somewhat less hardy than the Noldor, they are better at magic, ",
-		"gain experience faster, and have an intrinsic magic missile ",
-		"attack.  Unlike the Noldor, they are resistant to darkness attacks ",
-		"rather than light attacks, and gain the ability to see invisible ",
-		"things at a higher level, rather than starting out with it."
-	},
-	stats = { str=-1, dex=2, cun=2, mag=1, },
-	talents = { ActorTalents.DECREASED_HEALTH_I },
-	experience = 1.1,
-	copy = {
-		default_wilderness = {"wilderness/main", 41, 18},
-	},
-}
-
----------------------------------------------------------
---                       Hobbits                       --
----------------------------------------------------------
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Harfoot",
-	desc = {
-		"An old but quiet race related to humans.",
-		"They are small and quite weak but good at many things.",
-	},
-}
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Fallohide",
-	desc = {
-		"An old but quiet race related to humans.",
-		"They are small and quite weak but good at many things.",
-	},
-}
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Stoor",
-	desc = {
-		"An old but quiet race related to humans.",
-		"They are small and quite weak but good at many things.",
-	},
-}
-
----------------------------------------------------------
---                       Dwarves                       --
----------------------------------------------------------
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Dwarf",
-	desc = {
-		"The children of Aule, a strong but small race.",
-		"Miners and fighters of legend.",
-	},
-}
-
----------------------------------------------------------
---                        Ents                         --
----------------------------------------------------------
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Ent",
-	desc = {
-		"Guardian of the forests of Middle-earth, summoned by Yavanna before",
-		"even the elves awoke. It is said 'Trolls are strong, Ents are STRONGER'.",
-		"Ent-wives went away a long time ago and as such may not be played."
-	},
-}