moddable tiles for elfs, humans

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

game/modules/tome/class/Actor.lua

@@ -823,7 +823,9 @@ function _M:tooltip(x, y, seen_by)
 		print("============================================== SEEING from", self.name)
 		for i, a in ipairs(self.fov.actors_dist) do
 			local d = self.fov.actors[a]
-			print(("%3d : %-40s at %3dx%3d (see at %3dx%3d), diff %3dx%3d"):format(d.sqdist, a.name, a.x, a.y, d.x, d.y,d.dx,d.dy))
+			if d then
+				print(("%3d : %-40s at %3dx%3d (see at %3dx%3d), diff %3dx%3d"):format(d.sqdist, a.name, a.x, a.y, d.x, d.y,d.dx,d.dy))
+			end
 		end
 		print("==============================================")
 	end
@@ -842,7 +844,7 @@ function _M:tooltip(x, y, seen_by)
 	end
 
 	local ts = tstring{}
-	ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"}, true)
+	ts:add({"uid",self.uid}) ts:merge(rank_color:toTString()) ts:add(self.name, {"color", "WHITE"}, {"font","italic"}, "(", self.female and "female" or "male", ")", {"font","normal"}, true)
 	ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true)
 	ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true)
 	ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true)
@@ -1752,10 +1754,12 @@ function _M:updateModdableTile()
 	local i
 
 	i = self.inven[self.INVEN_CLOAK]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile):format("behind")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1} end
-	add[#add+1] = {image = base.."base_01.png"}
+	add[#add+1] = {image = base..(self.moddable_tile_base or "base_01.png")}
 	i = self.inven[self.INVEN_CLOAK]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile):format("shoulder")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1} end
-	i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1} end
-	i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile2 then add[#add+1] = {image = base..(i[1].moddable_tile2)..".png"} end
+	i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile2 then add[#add+1] = {image = base..(i[1].moddable_tile2)..".png"}
+	else add[#add+1] = {image = base.."lower_body_01.png"} end
+	i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1}
+	else add[#add+1] = {image = base.."upper_body_01.png"} end
 	i = self.inven[self.INVEN_MAINHAND]; if i and i[1] and i[1].moddable_tile then
 		add[#add+1] = {image = base..(i[1].moddable_tile):format("right")..".png", display_y=i[1].moddable_tile_big and -1 or 0, display_h=i[1].moddable_tile_big and 2 or 1}
 		if i[1].moddable_tile_particle then
@@ -2729,6 +2733,7 @@ end
 -- Used to make escorts and such
 function _M:addedToLevel(level, x, y)
 	if not self._rst_full then self:resetToFull() self._rst_full = true end -- Only do it once, the first time we come into being
+	self:updateModdableTile()
 	if self.make_escort then
 		for _, filter in ipairs(self.make_escort) do
 			for i = 1, filter.number do

game/modules/tome/class/GameState.lua

@@ -443,7 +443,8 @@ function _M:spawnWorldAmbush(enc, dx, dy)
 		min_material_level = util.bound(math.ceil(game.player.level / 10), 1, 5) - 1,
 		generator =  {
 			map = gen,
-			actor = { class = "engine.generator.actor.Random", nb_npc = enc.nb or {1,1}, filters=enc.filters },
+--			actor = { class = "engine.generator.actor.Random", nb_npc = enc.nb or {1,1}, filters=enc.filters },
+			actor = { class = "engine.generator.actor.Random", nb_npc = {15,15}, filters=enc.filters },
 		},
 
 		npc_list = mod.class.NPC:loadList("/data/general/npcs/all.lua", nil, nil, function(e) e.make_escort=nil end),

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

@@ -73,6 +73,9 @@ newBirthDescriptor
 	talents_types = { ["race/shalore"]={true, 0} },
 	talents = { [ActorTalents.T_SHALOREN_SPEED]=1 },
 	copy = {
+		moddable_tile = "elf_#sex#",
+		moddable_tile_base = "base_shalore_01.png",
+		moddable_tile_ornament = {female="braid_02"},
 		default_wilderness = {"playerpop", "shaloren"},
 		starting_zone = "scintillating-caves",
 		starting_quest = "start-shaloren",
@@ -106,6 +109,9 @@ newBirthDescriptor
 	talents_types = { ["race/thalore"]={true, 0} },
 	talents = { [ActorTalents.T_THALOREN_WRATH]=1 },
 	copy = {
+		moddable_tile = "elf_#sex#",
+		moddable_tile_base = "base_thalore_01.png",
+		moddable_tile_ornament = {female="braid_01"},
 		default_wilderness = {"playerpop", "thaloren"},
 		starting_zone = "norgos-lair",
 		starting_quest = "start-thaloren",

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

@@ -45,6 +45,8 @@ newBirthDescriptor{
 	},
 	talents = {},
 	copy = {
+		moddable_tile = "human_#sex#",
+		moddable_tile_base = "base_cornac_01.png",
 		faction = "allied-kingdoms",
 		type = "humanoid", subtype="human",
 		resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
@@ -79,6 +81,8 @@ newBirthDescriptor
 		[ActorTalents.T_HIGHER_HEAL]=1,
 	},
 	copy = {
+		moddable_tile = "human_#sex#",
+		moddable_tile_base = "base_higher_01.png",
 		life_rating = 11,
 		default_wilderness = {"playerpop", "allied"},
 		starting_zone = "trollmire",

game/modules/tome/data/general/npcs/humanoid_random_boss.lua

@@ -44,7 +44,8 @@ newEntity{ base = "BASE_NPC_HUMANOID_RANDOM_BOSS",
 		else
 			image = "player/cornac_male.png"
 		end
-		e.moddable_tile = "cornac_#sex#"
+		e.moddable_tile = "human_#sex#"
+		e.moddable_tile_base = "base_cornac_01.png"
 	end),
 	humanoid_random_boss = 1,
 	resolvers.racial(),
@@ -59,7 +60,9 @@ newEntity{ base = "BASE_NPC_HUMANOID_RANDOM_BOSS",
 		else
 			image = "player/thalore_male.png"
 		end
-		e.moddable_tile = "thalore_#sex#"
+		e.moddable_tile = "elf_#sex#"
+		e.moddable_tile_base = "base_thalore_01.png"
+		e.moddable_tile_ornament = {female="braid_01"}
 	end),
 	humanoid_random_boss = 1,
 	resolvers.racial(),
@@ -74,7 +77,9 @@ newEntity{ base = "BASE_NPC_HUMANOID_RANDOM_BOSS",
 		else
 			image = "player/shalore_male.png"
 		end
-		e.moddable_tile = "shalore_#sex#"
+		e.moddable_tile = "elf_#sex#"
+		e.moddable_tile_base = "base_shalore_01.png"
+		e.moddable_tile_ornament = {female="braid_02"}
 	end),
 	humanoid_random_boss = 1,
 	resolvers.racial(),