Created the generator hierarchy

server/enemies/enemy_factory_interface.hpp

@@ -23,7 +23,7 @@
 #define ENEMYFACTORYINTERFACE_HPP_
 
 #include "enemy_data.hpp"
-#include "room_data.hpp"
+#include "map_type.hpp"
 
 #include <list>
 
@@ -36,13 +36,14 @@ public:
 	virtual void Generate(std::list<EnemyData>* container) = 0;
 
 	//control the difficulty of the room
-	RoomData::RoomType SetType(RoomData::RoomType t) { return type = t; }
+	MapType SetType(MapType t) { return type = t; }
+	MapType GetType() { return type; }
+
 	int SetDifficulty(int d) { return difficulty = d; }
-	RoomData::RoomType GetType() { return type; }
 	int GetDifficulty() { return difficulty; }
 protected:
-	RoomData::RoomType type;
-	int difficulty;
+	MapType type;
+	int difficulty = 0;
 };
 
 #endif

server/enemies/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../rooms ../../common/gameplay ../../common/map ../../common/utilities
+INCLUDES+=. ../mapgen ../../common/gameplay ../../common/map ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/linit.cpp

@@ -38,6 +38,8 @@
 
 #include "region_api.hpp"
 #include "pager_api.hpp"
+#include "room_api.hpp"
+#include "generator_api.hpp"
 
 //these libs are loaded by lua.c and are readily available to any Lua program
 static const luaL_Reg loadedlibs[] = {
@@ -56,6 +58,8 @@ static const luaL_Reg loadedlibs[] = {
 	//custom libs
 	{LUA_REGIONLIBNAME, luaopen_regionapi},
 	{LUA_PAGERLIBNAME, luaopen_pagerapi},
+	{LUA_ROOMLIBNAME, luaopen_roomapi},
+	{LUA_GENERATORLIBNAME, luaopen_generatorapi},
 
 	{NULL, NULL}
 };

server/mapgen/base_generator.cpp

@@ -0,0 +1,35 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "base_generator.hpp"
+
+BaseGenerator::BaseGenerator() {
+	for (int i = 0; i < MAP_WIDTH; i++) {
+		for (int j = 0; j < MAP_HEIGHT; j++) {
+			chunks[i][j].type = TerrainType::NONE;
+			chunks[i][j].mod = ChunkData::Moddable::CLEAR;
+		}
+	}
+}
+
+BaseGenerator::~BaseGenerator() {
+	//
+}

server/mapgen/base_generator.hpp

@@ -0,0 +1,48 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef BASEGENERATOR_HPP_
+#define BASEGENERATOR_HPP_
+
+#include "chunk_data.hpp"
+
+#include "lua/lua.hpp"
+
+constexpr int MAP_WIDTH = 256;
+constexpr int MAP_HEIGHT = 256;
+
+class BaseGenerator {
+public:
+	BaseGenerator();
+	virtual ~BaseGenerator();
+
+	//accessors and mutators
+	virtual ChunkData* GetChunk(int x, int y) { return &chunks[x][y]; }
+
+	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
+	lua_State* GetLuaState() { return luaState; }
+
+protected:
+	ChunkData chunks[MAP_WIDTH][MAP_HEIGHT];
+	lua_State* luaState = nullptr;
+};
+
+#endif

server/mapgen/caves_generator.cpp

@@ -0,0 +1,30 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "caves_generator.hpp"
+
+CavesGenerator::CavesGenerator() {
+	//
+}
+
+CavesGenerator::~CavesGenerator() {
+	//
+}

server/mapgen/caves_generator.hpp

@@ -0,0 +1,38 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef CAVESGENERATOR_HPP_
+#define CAVESGENERATOR_HPP_
+
+#include "base_generator.hpp"
+
+#define CAVES_GENERATOR_PSEUDOINDEX "CavesGenerator"
+
+class CavesGenerator : public BaseGenerator {
+public:
+	CavesGenerator();
+	~CavesGenerator();
+
+private:
+	//
+};
+
+#endif

server/mapgen/forests_generator.cpp

@@ -0,0 +1,30 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "forests_generator.hpp"
+
+ForestsGenerator::ForestsGenerator() {
+	//
+}
+
+ForestsGenerator::~ForestsGenerator() {
+	//
+}

server/mapgen/forests_generator.hpp

@@ -0,0 +1,38 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef FORESTSGENERATOR_HPP_
+#define FORESTSGENERATOR_HPP_
+
+#include "base_generator.hpp"
+
+#define FORESTS_GENERATOR_PSEUDOINDEX "ForestsGenerator"
+
+class ForestsGenerator : public BaseGenerator {
+public:
+	ForestsGenerator();
+	~ForestsGenerator();
+
+private:
+	//
+};
+
+#endif

server/mapgen/generator_api.cpp

@@ -0,0 +1,37 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "generator_api.hpp"
+
+static int getGenerator(lua_State* L) {
+	//TODO: return a generator based on the given parameter
+	return 0;
+}
+
+static const luaL_Reg generatorlib[] = {
+	{"getgenerator", getGenerator},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int luaopen_generatorapi(lua_State* L) {
+	luaL_newlib(L, generatorlib);
+	return 1;
+}

server/mapgen/generator_api.hpp

@@ -0,0 +1,31 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef GENERATORAPI_HPP_
+#define GENERATORAPI_HPP_
+
+#include "lua/lua.hpp"
+
+#define LUA_GENERATORLIBNAME "generator"
+LUAMOD_API int luaopen_generatorapi(lua_State* L);
+
+
+#endif

server/mapgen/map_type.hpp

@@ -0,0 +1,33 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef MAPTYPE_HPP_
+#define MAPTYPE_HPP_
+
+enum class MapType {
+	OVERWORLD = 0,
+	RUINS = 1,
+	TOWERS = 2,
+	FORESTS = 3,
+	CAVES = 4,
+};
+
+#endif

server/mapgen/overworld_generator.cpp

@@ -22,12 +22,7 @@
 #include "overworld_generator.hpp"
 
 OverworldGenerator::OverworldGenerator() {
-	for (int i = 0; i < OVERWORLD_WIDTH; i++) {
-		for (int j = 0; j < OVERWORLD_HEIGHT; j++) {
-			chunks[i][j].type = TerrainType::NONE;
-			chunks[i][j].mod = ChunkData::Moddable::CLEAR;
-		}
-	}
+	//
 }
 
 OverworldGenerator::~OverworldGenerator() {

server/mapgen/overworld_generator.hpp

@@ -22,31 +22,17 @@
 #ifndef OVERWORLDGENERATOR_HPP_
 #define OVERWORLDGENERATOR_HPP_
 
-#include "chunk_data.hpp"
-
-#include "lua/lua.hpp"
+#include "base_generator.hpp"
 
 #define OVERWORLD_GENERATOR_PSEUDOINDEX "OverworldGenerator"
 
-constexpr int OVERWORLD_WIDTH = 256;
-constexpr int OVERWORLD_HEIGHT = 256;
-
-//TODO: SuperGenerator API
-//TODO: SuperGenerator DOCS
-class OverworldGenerator {
+class OverworldGenerator : public BaseGenerator {
 public:
 	OverworldGenerator();
 	~OverworldGenerator();
 
-	//accessors and mutators
-	ChunkData* GetChunk(int x, int y) { return &chunks[x][y]; }
-
-	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
-	lua_State* GetLuaState() { return luaState; }
-
 private:
-	ChunkData chunks[OVERWORLD_WIDTH][OVERWORLD_HEIGHT];
-	lua_State* luaState = nullptr;
+	//
 };
 
 #endif

server/mapgen/ruins_generator.cpp

@@ -0,0 +1,30 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "ruins_generator.hpp"
+
+RuinsGenerator::RuinsGenerator() {
+	//
+}
+
+RuinsGenerator::~RuinsGenerator() {
+	//
+}

server/mapgen/ruins_generator.hpp

@@ -0,0 +1,38 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef RUINSGENERATOR_HPP_
+#define RUINSGENERATOR_HPP_
+
+#include "base_generator.hpp"
+
+#define RUINS_GENERATOR_PSEUDOINDEX "RuinsGenerator"
+
+class RuinsGenerator : public BaseGenerator {
+public:
+	RuinsGenerator();
+	~RuinsGenerator();
+
+private:
+	//
+};
+
+#endif

server/mapgen/towers_generator.cpp

@@ -0,0 +1,30 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "towers_generator.hpp"
+
+TowersGenerator::TowersGenerator() {
+	//
+}
+
+TowersGenerator::~TowersGenerator() {
+	//
+}

server/mapgen/towers_generator.hpp

@@ -0,0 +1,38 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef TOWERSGENERATOR_HPP_
+#define TOWERSGENERATOR_HPP_
+
+#include "base_generator.hpp"
+
+#define TOWERS_GENERATOR_PSEUDOINDEX "TowersGenerator"
+
+class TowersGenerator : public BaseGenerator {
+public:
+	TowersGenerator();
+	~TowersGenerator();
+
+private:
+	//
+};
+
+#endif

server/rooms/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../../common/map
+INCLUDES+=. ../mapgen ../../common/map
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 

server/rooms/room_data.hpp

@@ -22,21 +22,15 @@
 #ifndef ROOMDATA_HPP_
 #define ROOMDATA_HPP_
 
+#include "map_type.hpp"
+
 //map system
 #include "region_pager_lua.hpp"
 
 struct RoomData {
-	enum class RoomType {
-		OVERWORLD = 0,
-		RUINS = 1,
-		TOWERS = 2,
-		FORESTS = 3,
-		CAVE = 4,
-	};
-
 	//members
 	RegionPagerLua pager;
-	RoomType type;
+	MapType type;
 
 	//TODO: collision map
 	//TODO: NPCs?