Added many new room shapes

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

game/engines/default/engine/generator/map/RoomsLoader.lua

@@ -37,7 +37,11 @@ function _M:init(data)
 	end
 end
 
+local rooms_cache = {}
+
 function _M:loadRoom(file)
+	if rooms_cache[file] then return rooms_cache[file] end
+
 	local f, err = loadfile("/data/rooms/"..file..".lua")
 	if not f and err then error(err) end
 	setfenv(f, setmetatable({
@@ -49,6 +53,7 @@ function _M:loadRoom(file)
 	-- We got a room generator function, save it for later
 	if type(ret) == "function" then
 		print("loaded room generator",file,ret)
+		rooms_cache[file] = ret
 		return ret
 	end
 
@@ -66,6 +71,7 @@ function _M:loadRoom(file)
 	end
 	print("loaded room",file,t.w,t.h)
 
+	rooms_cache[file] = t
 	return t
 end
 

game/modules/tome/data/maps/zones/blighted-ruins-last.lua

@@ -29,7 +29,7 @@ subGenerator{
 	generator = "engine.generator.map.Roomer",
 	data = {
 		nb_rooms = 10,
-		rooms = {"simple", "pilar"},
+		rooms = {"random_room"},
 		['.'] = "FLOOR",
 		['#'] = "WALL",
 		up = "UP",

game/modules/tome/data/maps/zones/high-peak-last.lua

@@ -41,7 +41,7 @@ subGenerator{
 	generator = "engine.generator.map.Roomer",
 	data = {
 		nb_rooms = 7,
-		rooms = {"simple", "pilar"},
+		rooms = {"random_room"},
 		['.'] = "FLOOR",
 		['#'] = "WALL",
 		up = "FLOOR",

game/modules/tome/data/maps/zones/ruins-kor-pul-last.lua

@@ -27,7 +27,7 @@ subGenerator{
 	generator = "engine.generator.map.Roomer",
 	data = {
 		nb_rooms = 10,
-		rooms = {"simple", "pilar"},
+		rooms = {"random_room"},
 		['.'] = "FLOOR",
 		['#'] = "WALL",
 		up = "UP",

game/modules/tome/data/maps/zones/unremarkable-cave.lua

@@ -29,7 +29,7 @@ subGenerator{
 	data = {
 		edge_entrances = {4,6},
 		nb_rooms = 13,
-		rooms = {"simple", "pilar"},
+		rooms = {"random_room"},
 		['.'] = "FLOOR",
 		['#'] = "WALL",
 		up = "UP_WILDERNESS_FAR_EAST",

game/modules/tome/data/rooms/big_cells.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!#]],
+[[!......!]],
+[[###..###]],
+[[!.#..#.!]],
+[[!......!]],
+[[!.#..#.!]],
+[[###..###]],
+[[!......!]],
+[[#!!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!!!!!!#]],
+[[!...........!]],
+[[!...........!]],
+[[!.#########.!]],
+[[!.#...#...#.!]],
+[[!.##.###.##.!]],
+[[!...........!]],
+[[!.##.###.##.!]],
+[[!.#...#...#.!]],
+[[!.#########.!]],
+[[!...........!]],
+[[!...........!]],
+[[#!!!!!!!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells2.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!!!!!#]],
+[[!..........!]],
+[[!.#.#..#.#.!]],
+[[!.#.#..#.#.!]],
+[[!.###..###.!]],
+[[!..........!]],
+[[!.###..###.!]],
+[[!.#.#..#.#.!]],
+[[!.#.#..#.#.!]],
+[[!..........!]],
+[[#!!!!!!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells3.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!#!!!!#!#]],
+[[!.#....#.!]],
+[[!........!]],
+[[####..####]],
+[[####..####]],
+[[!........!]],
+[[!.#....#.!]],
+[[#!#!!!!#!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells4.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!#!#!#!#]],
+[[!.#.#.#.!]],
+[[!.#.#.#.!]],
+[[!.......!]],
+[[###...###]],
+[[###...###]],
+[[!.......!]],
+[[!.#.#.#.!]],
+[[!.#.#.#.!]],
+[[#!#!#!#!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells5.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!#]],
+[[##..##]],
+[[!....!]],
+[[##..##]],
+[[!....!]],
+[[##..##]],
+[[!....!]],
+[[##..##]],
+[[!....!]],
+[[##..##]],
+[[!....!]],
+[[##..##]],
+[[#!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells6.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!#]],
+[[!.....!]],
+[[##.#.##]],
+[[!.#.#.!]],
+[[!.....!]],
+[[!.....!]],
+[[!.#.#.!]],
+[[##.#.##]],
+[[!.....!]],
+[[#!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells7.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!#]],
+[[!.....!]],
+[[!.###.!]],
+[[!.#.#.!]],
+[[!.....!]],
+[[!.#.#.!]],
+[[!.###.!]],
+[[!.....!]],
+[[#!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cells8.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!#!!#]],
+[[!..#..!]],
+[[##...##]],
+[[!.....!]],
+[[##...##]],
+[[!..#..!]],
+[[#!!#!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/center_arrows.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!!!!#]],
+[[!.........!]],
+[[!.........!]],
+[[!..##.##..!]],
+[[!...###...!]],
+[[!.#.....#.!]],
+[[!.##...##.!]],
+[[!..#...#..!]],
+[[!.##...##.!]],
+[[!.#.....#.!]],
+[[!...###...!]],
+[[!..##.##..!]],
+[[!.........!]],
+[[!.........!]],
+[[#!!!!!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/cross.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[###!!!!###]],
+[[###....###]],
+[[###....###]],
+[[###....###]],
+[[###....###]],
+[[!........!]],
+[[!........!]],
+[[!........!]],
+[[!........!]],
+[[###....###]],
+[[###....###]],
+[[###....###]],
+[[###....###]],
+[[###!!!!###]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/double_y.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!#####!!#]],
+[[!..#####..!]],
+[[!...###...!]],
+[[!.........!]],
+[[!...###...!]],
+[[!..#####..!]],
+[[#!!#####!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/equal.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!.#####.!]],
+[[!.......!]],
+[[!.#####.!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/equal2.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!!#]],
+[[!.......!]],
+[[!.......!]],
+[[###...###]],
+[[!.......!]],
+[[!.......!]],
+[[###...###]],
+[[!.......!]],
+[[!.......!]],
+[[#!!!!!!!#]],
+}
\ No newline at end of file

game/modules/tome/data/rooms/h.lua

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 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
+
+return {
+[[#!!!!!!!!!#]],
+[[!.........!]],
+[[!.#######.!]],
+[[!....#....!]],
+[[!.#######.!]],
+[[!.........!]],
+[[#!!!!!!!!!#]],
+}
\ No newline at end of file