cypress

game/modules/tome/class/Grid.lua

@@ -232,6 +232,7 @@ function _M:makeNewTrees(g, kindsdefs, max_trees)
 		end
 		add[#add+1] = engine.Entity.new{
 			z = z,
+			_st = y,
 			display_x = x,
 			display_y = y + scale * parts.tall,
 			display_w = scale,
@@ -253,7 +254,7 @@ function _M:makeNewTrees(g, kindsdefs, max_trees)
 	else
 		tbl = { makeTree(1, 16), }
 	end
-	table.sort(tbl, function(a,b) return a.display_w < b.display_w end)
+	table.sort(tbl, function(a,b) return a._st < b._st end)
 	for i = 1, #tbl do tbl[i].z = 16 + i - 1 end
 	return g
 end

game/modules/tome/class/Player.lua

@@ -567,8 +567,10 @@ function _M:playerFOV()
 		self:computeFOV(self.sight or 10, "block_sight", function(x, y, dx, dy, sqdist)
 			game.level.map:apply(x, y, fovdist[sqdist])
 		end, true, false, true)
+		local lradius = self.lite
+		if self.radiance_aura and lradius < self.radiance_aura then lradius = self.radiance_aura end
 		if self.lite <= 0 then game.level.map:applyLite(self.x, self.y)
-		else self:computeFOV(self.lite + bonus, "block_sight", function(x, y, dx, dy, sqdist) game.level.map:applyLite(x, y) end, true, true, true) end
+		else self:computeFOV(lradius + bonus, "block_sight", function(x, y, dx, dy, sqdist) game.level.map:applyLite(x, y) end, true, true, true) end
 
 		-- For each entity, generate lite
 		local uid, e = next(game.level.entities)

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

@@ -42,10 +42,6 @@ newEntity{
 }
 
 local treesdef = {
-	{"small_elm", {"shadow", "trunk", "foliage_summer"}},
-	{"small_elm", {"shadow", "trunk", "foliage_summer"}},
-	{"elm", {tall=-1, "shadow", "trunk", "foliage_summer"}},
-	{"elm", {tall=-1, "shadow", "trunk", "foliage_summer"}},
 	{"small_elm", {"shadow", "trunk", "foliage_summer"}},
 	{"small_elm", {"shadow", "trunk", "foliage_summer"}},
 	{"elm", {tall=-1, "shadow", "trunk", "foliage_summer"}},
@@ -53,6 +49,9 @@ local treesdef = {
 	{"light_pine", {tall=-1, "shadow", "trunk", {"foliage_%02d",1,4}}},
 	{"light_small_wider_pine", {"shadow", "trunk", {"foliage_%02d",1,4}}},
 	{"light_small_narrow_pine", {"shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"cypress", {tall=-1, "shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"small_cypress", {tall=-1, "shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"tiny_cypress", {"shadow", "trunk", {"foliage_%02d",1,4}}},
 }
 
 newEntity{

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

@@ -62,6 +62,9 @@ for i = 1, 30 do
 		{"pine", {tall=-1, "shadow", "trunk", {"foliage_winter_%02d", 1, 2}, shader_args={attenuation=14}}},
 		{"small_narrow_pine", {"shadow", "trunk", {"foliage_winter_%02d", 1, 2}, shader_args={attenuation=14}}},
 		{"small_wider_pine", {"shadow", "trunk", {"foliage_winter_%02d", 1, 2}, shader_args={attenuation=14}}},
+		{"cypress", {tall=-1, "shadow", "trunk", {"foliage_winter_%02d",1,2}}},
+		{"small_cypress", {tall=-1, "shadow", "trunk", {"foliage_winter_%02d",1,2}}},
+		{"tiny_cypress", {"shadow", "trunk", {"foliage_winter_%02d",1,2}}},
 	}))
 end