elven trees

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

@@ -22,7 +22,7 @@ local autumn_grass_editer = { method="borders_def", def="autumn_grass"}
 newEntity{
 	define_as = "AUTUMN_GRASS",
 	type = "floor", subtype = "autumn_grass",
-	name = "autumn_grass", image = "terrain/grass/autumn_grass_main_01.png",
+	name = "autumn grass", image = "terrain/grass/autumn_grass_main_01.png",
 	display = '.', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	grow = "AUTUMN_TREE",
 	nice_tiler = { method="replace", base={"AUTUMN_GRASS_PATCH", 100, 1, 14}},
@@ -38,11 +38,11 @@ local autumn_treesdef = {
 newEntity{
 	define_as = "AUTUMN_TREE",
 	type = "wall", subtype = "autumn_grass",
-	name = "autumn_tree",
+	name = "autumn tree",
 	image = "terrain/autumn_tree.png",
 	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
-	can_pass = {pass_autumn_tree=1},
+	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
 	dig = "AUTUMN_GRASS",
@@ -56,7 +56,7 @@ end
 newEntity{
 	define_as = "HARDAUTUMN_TREE",
 	type = "wall", subtype = "autumn_grass",
-	name = "tall thick autumn_tree",
+	name = "tall thick tree",
 	image = "terrain/autumn_tree.png",
 	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
@@ -68,7 +68,7 @@ newEntity{
 	nice_editer = autumn_grass_editer,
 }
 for i = 1, 30 do
-	newEntity(class:makeNewTrees({base="AUTUMN_TREE", define_as = "AUTUMN_TREE"..i, image = "terrain/grass/autumn_grass_main_01.png"}, autumn_treesdef))
+	newEntity(class:makeNewTrees({base="HARDAUTUMN_TREE", define_as = "HARDAUTUMN_TREE"..i, image = "terrain/grass/autumn_grass_main_01.png"}, autumn_treesdef))
 end
 
 -----------------------------------------

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

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+local grass_editer = { method="borders_def", def="grass"}
+local autumn_grass_editer = { method="borders_def", def="autumn_grass"}
+
+local treesdef = {
+	{"elventree", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	{"fat_elventree", {tall=-1, "shadow", "trunk", {"foliage_summer_%02d",1,2}}},
+}
+
+newEntity{
+	define_as = "ELVEN_TREE",
+	type = "wall", subtype = "grass",
+	name = "tree",
+	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={"ELVEN_TREE", 100, 1, 30}},
+	nice_editer = grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="ELVEN_TREE", define_as = "ELVEN_TREE"..i, image = "terrain/grass/grass_main_01.png"}, treesdef))
+end
+
+newEntity{
+	define_as = "HARDELVEN_TREE",
+	type = "wall", subtype = "grass",
+	name = "tall thick tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	does_block_move = true,
+	block_sight = true,
+	block_sense = true,
+	block_esp = true,
+	nice_tiler = { method="replace", base={"HARDELVEN_TREE", 100, 1, 30}},
+	nice_editer = grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="HARDELVEN_TREE", define_as = "HARDELVEN_TREE"..i, image = "terrain/grass/grass_main_01.png"}, treesdef))
+end
+
+
+local snow_treesdef = {
+	{"elventree", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+	{"fat_elventree", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+}
+
+newEntity{
+	define_as = "SNOW_ELVEN_TREE",
+	type = "wall", subtype = "grass",
+	name = "tree",
+	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={"SNOW_ELVEN_TREE", 100, 1, 30}},
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="SNOW_ELVEN_TREE", define_as = "SNOW_ELVEN_TREE"..i, image = "terrain/snowy_grass.png"}, snow_treesdef))
+end
+
+local autumn_treesdef = {
+	{"elventree", {tall=-1, "shadow", "trunk", "foliage_autumn"}},
+	{"fat_elventree", {tall=-1, "shadow", "trunk", {"foliage_autumn_%02d",1,2}}},
+}
+
+newEntity{
+	define_as = "AUTUMN_ELVEN_TREE",
+	type = "wall", subtype = "autumn_grass",
+	name = "tree",
+	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 = "AUTUMN_GRASS",
+	nice_tiler = { method="replace", base={"AUTUMN_ELVEN_TREE", 100, 1, 30}},
+	nice_editer = autumn_grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="AUTUMN_ELVEN_TREE", define_as = "AUTUMN_ELVEN_TREE"..i, image = "terrain/grass/grass_main_01.png"}, autumn_treesdef))
+end

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

@@ -52,6 +52,8 @@ local treesdef = {
 	{"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}}},
+	-- {"elventree", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	-- {"fat_elventree", {tall=-1, "shadow", "trunk", {"foliage_summer_%02d",1,2}}},
 }
 
 newEntity{

game/modules/tome/data/maps/towns/shatur.lua

@@ -18,8 +18,8 @@
 -- darkgod@te4.org
 
 defineTile('<', "GRASS_UP_WILDERNESS")
-defineTile('t', "TREE")
-defineTile('s', {"ROCKY_SNOWY_TREE","ROCKY_SNOWY_TREE2","ROCKY_SNOWY_TREE3","ROCKY_SNOWY_TREE4","ROCKY_SNOWY_TREE5","ROCKY_SNOWY_TREE6","ROCKY_SNOWY_TREE7","ROCKY_SNOWY_TREE8","ROCKY_SNOWY_TREE9","ROCKY_SNOWY_TREE10","ROCKY_SNOWY_TREE11","ROCKY_SNOWY_TREE12","ROCKY_SNOWY_TREE13","ROCKY_SNOWY_TREE14","ROCKY_SNOWY_TREE15","ROCKY_SNOWY_TREE16","ROCKY_SNOWY_TREE17","ROCKY_SNOWY_TREE18","ROCKY_SNOWY_TREE19","ROCKY_SNOWY_TREE20"})
+defineTile('t', "ELVEN_TREE")
+defineTile('s', "SNOW_ELVEN_TREE")
 defineTile('-', "ROCKY_GROUND")
 defineTile('~', "DEEP_WATER")
 defineTile('.', "GRASS")