update

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

game/modules/tome/class/Grid.lua

@@ -106,17 +106,20 @@ function _M:tooltip(x, y)
 end
 
 --- Generate sub entities to make nice trees
-function _M:makeTrees(base, max)
+function _M:makeTrees(base, max, bigheight_limit)
 	local function makeTree(nb, z)
 		local inb = 4 - nb
+		local treeid = rng.range(1, max or 5)
 		return engine.Entity.new{
 			z = z,
-			display_scale = rng.float(0.5 + inb / 6, 1.3),
+			display_scale = 1,
+			display_scale = rng.float(0.5 + inb / 6, 1),
 			display_x = rng.float(-1 / 3 * nb / 3, 1 / 3 * nb / 3),
-			display_y = rng.float(-1 / 3 * nb / 3, 1 / 3 * nb / 3),
+			display_y = rng.float(-1 / 3 * nb / 3, 1 / 3 * nb / 3) - (treeid < (bigheight_limit or 9) and 0 or 1),
 			display_on_seen = true,
 			display_on_remember = true,
-			image = (base or "terrain/tree_alpha")..rng.range(1,max or 5)..".png",
+			display_h = treeid < (bigheight_limit or 9) and 1 or 2,
+			image = (base or "terrain/tree_alpha")..treeid..".png",
 		}
 	end
 

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

@@ -81,7 +81,7 @@ newBirthDescriptor{
 			{type="lite", subtype="lite", name="brass lantern", ego_chance=-1000},
 		},
 		make_tile = function(e)
-			e.image = "player/"..e.descriptor.subrace:lower().."_"..e.descriptor.sex:lower()..".png"
+			if not e.image then e.image = "player/"..e.descriptor.subrace:lower():gsub("[^a-z0-9_]", "_").."_"..e.descriptor.sex:lower():gsub("[^a-z0-9_]", "_")..".png" end
 		end,
 	},
 }
@@ -127,6 +127,7 @@ newBirthDescriptor{
 		no_birth_levelup = true,
 		easy_mode_lifes = 99999,
 		__game_difficulty = 1,
+		__allow_rod_recall = false,
 	},
 }
 newBirthDescriptor{

game/modules/tome/data/general/encounters/maj-eyal.lua

@@ -247,7 +247,7 @@ newEntity{
 
 		local g = mod.class.WorldNPC.new{
 			name="Agrimley the Hermit",
-			type="humanoid", subtype="elf", faction="angolwen",
+			type="humanoid", subtype="human", faction="neutral",
 			display='@', color=colors.BLUE,
 			can_talk = "alchemist-hermit",
 			unit_power = 300,

game/modules/tome/data/general/grids/forest.lua

@@ -23,31 +23,30 @@ newEntity{
 	name = "grass", image = "terrain/grass.png",
 	display = '.', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	grow = "TREE",
+	nice_tiler = { method="replace", base={"GRASS_PATCH", 70, 1, 15}},
 }
+for i = 1, 12 do newEntity{ base = "GRASS", define_as = "GRASS_PATCH"..i, image = "terrain/grass"..(i<7 and "" or "2")..".png" } end
 
-for i = 1, 20 do
 newEntity{
-	define_as = "TREE"..(i > 1 and i or ""),
+	define_as = "TREE",
 	type = "wall", subtype = "grass",
 	name = "tree",
-	image = "terrain/grass.png",
-	add_displays = class:makeTrees("terrain/tree_alpha"),
+	image = "terrain/tree.png",
 	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
 	dig = "GRASS",
+	nice_tiler = { method="replace", base={"TREE", 100, 1, 30}},
 }
-end
+for i = 1, 30 do newEntity{ base="TREE", define_as = "TREE"..i, image = "terrain/grass.png", add_displays = class:makeTrees("terrain/tree_alpha", 13, 9)} end
 
-for i = 1, 20 do
 newEntity{
-	define_as = "HARDTREE"..(i > 1 and i or ""),
+	define_as = "HARDTREE,
 	type = "wall", subtype = "grass",
 	name = "tall thick tree",
-	image = "terrain/grass.png",
-	add_displays = class:makeTrees("terrain/tree_alpha"),
+	image = "terrain/tree.png",
 	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	does_block_move = true,
@@ -55,7 +54,7 @@ newEntity{
 	block_sense = true,
 	block_esp = true,
 }
-end
+for i = 1, 30 do newEntity{ define_as = "HARDTREE"..i, image = "terrain/grass.png", add_displays = class:makeTrees("terrain/tree_alpha", 13, 9) } end
 
 newEntity{
 	define_as = "GRASS_DARK1",
@@ -100,18 +99,17 @@ end
 newEntity{
 	define_as = "FLOWER",
 	type = "floor", subtype = "grass",
-	name = "flower", image = "terrain/grass_flower3.png",
+	name = "flower", image = "terrain/flower.png",
 	display = ';', color=colors.YELLOW, back_color={r=44,g=95,b=43},
 	grow = "TREE",
-	nice_tiler = { method="replace", base={"FLOWER", 100, 3, 8}},
+	nice_tiler = { method="replace", base={"FLOWER", 100, 1, 1}},
 }
-for i = 3, 8 do newEntity{ base = "FLOWER", define_as = "FLOWER"..i, image = "terrain/grass_flower"..i..".png"} end
-
+for i = 1, 1 do newEntity{ base = "FLOWER", define_as = "FLOWER"..i, image = "terrain/grass.png", add_mos = {{image = "terrain/flower0"..i..".png"}}} end
 
 newEntity{
 	define_as = "ROCK_VAULT",
 	type = "wall", subtype = "grass",
-	name = "huge loose rock", image = "terrain/grass.png", add_displays = {class.new{image="terrain/rock_grass.png"}},
+	name = "huge loose rock", image = "terrain/grass.png", add_mos = {{image="terrain/huge_rock.png"}},
 	display = '+', color=colors.GREY, back_color={r=44,g=95,b=43},
 	notice = true,
 	always_remember = true,
@@ -126,7 +124,7 @@ newEntity{
 newEntity{
 	define_as = "ROCK_VAULT_DARK",
 	type = "wall", subtype = "grass",
-	name = "huge loose rock", image = "terrain/rock_grass_dark.png",
+	name = "huge loose rock", image = "terrain/grass.png", add_mos = {{image="terrain/huge_rock.png"}},
 	display = '+', color=colors.GREY, back_color={r=44,g=95,b=43},
 	notice = true,
 	always_remember = true,
@@ -144,7 +142,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_UP_WILDERNESS",
 	type = "floor", subtype = "grass",
-	name = "exit to the worldmap", image = "terrain/grass.png", add_displays = {class.new{image="terrain/worldmap.png"}},
+	name = "exit to the worldmap", image = "terrain/grass.png", add_mos = {{image="terrain/worldmap.png"}},
 	display = '<', color_r=255, color_g=0, color_b=255,
 	always_remember = true,
 	notice = true,
@@ -155,7 +153,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_UP8",
 	type = "floor", subtype = "grass",
-	name = "way to the previous level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_8.png"}},
+	name = "way to the previous level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_8.png"}},
 	display = '<', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -164,7 +162,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_UP2",
 	type = "floor", subtype = "grass",
-	name = "way to the previous level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_2.png"}},
+	name = "way to the previous level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_2.png"}},
 	display = '<', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -173,7 +171,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_UP4",
 	type = "floor", subtype = "grass",
-	name = "way to the previous level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_4.png"}},
+	name = "way to the previous level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_4.png"}},
 	display = '<', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -182,7 +180,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_UP6",
 	type = "floor", subtype = "grass",
-	name = "way to the previous level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_6.png"}},
+	name = "way to the previous level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_6.png"}},
 	display = '<', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -192,7 +190,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_DOWN8",
 	type = "floor", subtype = "grass",
-	name = "way to the next level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_8.png"}},
+	name = "way to the next level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_8.png"}},
 	display = '>', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -201,7 +199,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_DOWN2",
 	type = "floor", subtype = "grass",
-	name = "way to the next level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_2.png"}},
+	name = "way to the next level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_2.png"}},
 	display = '>', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -210,7 +208,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_DOWN4",
 	type = "floor", subtype = "grass",
-	name = "way to the next level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_4.png"}},
+	name = "way to the next level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_4.png"}},
 	display = '>', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,
@@ -219,7 +217,7 @@ newEntity{
 newEntity{
 	define_as = "GRASS_DOWN6",
 	type = "floor", subtype = "grass",
-	name = "way to the next level", image = "terrain/grass.png", add_displays = {class.new{image="terrain/way_next_6.png"}},
+	name = "way to the next level", image = "terrain/grass.png", add_mos = {{image="terrain/way_next_6.png"}},
 	display = '>', color_r=255, color_g=255, color_b=0,
 	notice = true,
 	always_remember = true,