Implemented the new system in the startup script, needs testing

This commit is contained in:
Kayne Ruse
2014-08-15 09:12:22 +10:00
parent 52ab9f0087
commit 59c9ba698f
2 changed files with 10 additions and 29 deletions
-24
View File
@@ -78,26 +78,6 @@ static int getDepth(lua_State* L) {
return 1; return 1;
} }
static int load(lua_State* L) {
//EMPTY
return 0;
}
static int save(lua_State* L) {
//EMPTY
return 0;
}
static int create(lua_State* L) {
//EMPTY
return 0;
}
static int unload(lua_State* L) {
//EMPTY
return 0;
}
static const luaL_Reg regionLib[] = { static const luaL_Reg regionLib[] = {
{"SetTile",setTile}, {"SetTile",setTile},
{"GetTile",getTile}, {"GetTile",getTile},
@@ -108,10 +88,6 @@ static const luaL_Reg regionLib[] = {
{"GetWidth",getWidth}, {"GetWidth",getWidth},
{"GetHeight",getHeight}, {"GetHeight",getHeight},
{"GetDepth",getDepth}, {"GetDepth",getDepth},
{"Load",load},
{"Save",save},
{"Create",create},
{"Unload",unload},
{nullptr, nullptr} {nullptr, nullptr}
}; };
+10 -5
View File
@@ -15,10 +15,10 @@ tiles = {
water = base + shift * 4 water = base + shift * 4
} }
--could set custom generation systems here, that differ from the global generators, etc. --custom generation systems here
function Region.Create(region) function islandGenerator(region)
for i = 1, Region.GetWidth() do for i = 1, Region.GetWidth(region) do
for j = 1, Region.GetHeight() do for j = 1, Region.GetHeight(region) do
local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1) local dist = math.dist(0, 0, i + Region.GetX(region) -1, j + Region.GetY(region) -1)
if dist < 10 then if dist < 10 then
Region.SetTile(region, i, j, 1, tiles.plains) Region.SetTile(region, i, j, 1, tiles.plains)
@@ -33,14 +33,19 @@ function Region.Create(region)
end end
--Get some regions --Get some regions
--BUG: The server fails without this --BUG: The server fails without at least one room
--TODO: Create rooms with names?
newRoom = RoomManager.CreateRoom() newRoom = RoomManager.CreateRoom()
pager = Room.GetPager(newRoom) pager = Room.GetPager(newRoom)
RegionPager.SetOnCreate(pager, islandGenerator)
--[[
regionTable = { regionTable = {
RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0), RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() * 0),
RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() * 0), RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() * 0),
RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() *-1), RegionPager.GetRegion(pager, Region.GetWidth() * 0, Region.GetHeight() *-1),
RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() *-1) RegionPager.GetRegion(pager, Region.GetWidth() *-1, Region.GetHeight() *-1)
} }
]]
print("Finished the lua script") print("Finished the lua script")