plop

game/engines/default/engine/Calendar.lua

@@ -44,7 +44,7 @@ DAY_START = HOUR * 6
 -- @param start_day defaults to 1
 -- @param start_hour defaults to 8
 function _M:init(definition, datestring, start_year, start_day, start_hour)
-	local data = dofile(definition)
+	local data, c_dts = dofile(definition)
 	self.calendar = {}
 	local days = 0
 	for _, e in ipairs(data) do
@@ -54,7 +54,7 @@ function _M:init(definition, datestring, start_year, start_day, start_hour)
 	end
 	assert(days == 365, "Calendar incomplete, days ends at "..days.." instead of 365")
 
-	self.datestring = datestring
+	self.datestring = c_dts or datestring
 	self.start_year = start_year
 	self.start_day = start_day or 1
 	self.start_hour = start_hour or 8

game/engines/default/engine/tilemaps/Tilemap.lua

@@ -30,6 +30,8 @@ function _M:init(size, fill_with)
 		if size.getClass and size:getClass() == _M then
 			self:setSize(size.data_w, size.data_h)
 			self.data = table.clone(size.data, true)
+		elseif size.x and size.y then
+			self:setSize(size.x, size.y, fill_with)
 		else
 			self:setSize(size[1], size[2], fill_with)
 		end
@@ -149,9 +151,25 @@ point_meta = {
 		if type(b) == "number" then return _M:point(a.x / b, a.y / b)
 		else return _M:point(a.x / b.x, a.y / b.y) end
 	end,
+	__unm = function(a)
+		return _M:point(-a.x, -a.y)
+	end,
+	__len = function(a)
+		return a:area()
+	end,
 	__eq = function(a, b)
 		return a.x == b.x and a.y == b.y
 	end,
+	__lt = function(a, b)
+		if type(a) == "number" then return a < b.x and a < b.y end
+		if type(b) == "number" then return a.x < b and a.y < b end
+		return a.x < b.x and a.y < b.y
+	end,
+	__le = function(a, b)
+		if type(a) == "number" then return a <= b.x and a <= b.y end
+		if type(b) == "number" then return a.x <= b and a.y <= b end
+		return a.x <= b.x and a.y <= b.y
+	end,
 	__tostring = function(p)
 		return ("Point(%d x %d)"):format(p.x, p.y)
 	end,
@@ -532,6 +550,7 @@ end
 
 --- Returns the bounding rectangle of a list of points
 function _M:pointsBoundingRectangle(list)
+	if #list == 0 then return self:point(1, 1), self:point(1, 1) end
 	local to = self:point(1, 1)
 	local from = self:point(999999, 999999)
 	for _, p in ipairs(list) do
@@ -545,7 +564,7 @@ end
 
 local group_meta
 
---- Make a point data, can be added
+--- Make a group data
 function _M:group(list)
 	local g = {list=list, is_tm_group=true}
 	setmetatable(g, group_meta)
@@ -553,6 +572,18 @@ function _M:group(list)
 	return g
 end
 
+--- Return a group that is the merge of all groups
+function _M:mergeGroups(...)
+	local g = self:group{}
+	local groups = {...}
+	-- Assume if the first arg is not a group that it is a list of groups
+	if not groups[1].is_tm_group then groups = groups[1] end
+	for _, ag in ipairs(groups) do
+		for _, p in ipairs(ag.list) do g:add(p:clone()) end
+	end
+	return g
+end
+
 group_meta = {
 	__add = function(a, b)
 		local g = _M:group{}
@@ -669,6 +700,14 @@ group_meta = {
 			if type(x) == "table" then x, y = x.x, x.y end
 			return g.reverse[x] and g.reverse[x][y]
 		end,
+		allMatch = function(g, map, list)
+			if type(list) ~= "table" then list = {list} end
+			list = table.reverse(list)
+			for p in g:iterate() do
+				if not list[map:get(p)] then return false end
+			end
+			return true
+		end,
 		pickSpot = function(group, mode, what, mapcheck)
 			local function check(x, y)
 				if mapcheck then
@@ -1054,6 +1093,16 @@ function _M:groupOuterRectangle(group)
 	return self:point(x1, y1), self:point(x2, y2), x2 - x1 + 1, y2 - y1 + 1
 end
 
+--- Trim the map (returns a new one) on each sides until we hit a non-wall
+function _M:trim(walls)
+	if type(walls) ~= "table" then walls = {walls} end
+	local group = self:mergeGroups(self:findGroupsNotOf(walls))
+	local from, to = group:bounds()
+	local tm = _M.new(to - from + 1)
+	tm:merge(-from + 1 + 1, self)
+	return tm
+end
+
 --- Carve out a simple linear path from coords until a tile is reached
 function _M:carveLinearPath(char, from, dir, stop_at, dig_only_into, ignore_first)
 	local x, y = math.floor(from.x), math.floor(from.y)
@@ -1138,7 +1187,7 @@ function _M:printResult()
 		print("------------- Tilemap result")		
 		return
 	end
-	print("------------- Tilemap result --[[")
+	print("------------- Tilemap ("..self.data_w.."x"..self.data_h..") result --[[")
 	local p = core.game.stdout_write
 	for y = 1, self.data_h do
 		for x = 1, self.data_w do