astar

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

game/engines/default/engine/Astar.lua

@@ -71,7 +71,7 @@ end
 -- @param ty the end coord
 -- @param use_has_seen if true the astar wont consider non-has_seen grids
 -- @return either nil if no path or a list of nodes in the form { {x=...,y=...}, {x=...,y=...}, ..., {x=tx,y=ty}}
-function _M:calc(sx, sy, tx, ty, use_has_seen, heuristic, add_check)
+function _M:calc(sx, sy, tx, ty, use_has_seen, heuristic, add_check, forbid_diagonals)
 	local heur = heuristic or self.heuristicCloserPath
 	local w, h = self.map.w, self.map.h
 	local start = self:toSingle(sx, sy)
@@ -151,9 +151,11 @@ function _M:calc(sx, sy, tx, ty, use_has_seen, heuristic, add_check)
 		checkPos(node, x - 1, y)
 		checkPos(node, x, y + 1)
 		checkPos(node, x, y - 1)
-		checkPos(node, x + 1, y + 1)
-		checkPos(node, x + 1, y - 1)
-		checkPos(node, x - 1, y + 1)
-		checkPos(node, x - 1, y - 1)
+		if not forbid_diagonals then
+			checkPos(node, x + 1, y + 1)
+			checkPos(node, x + 1, y - 1)
+			checkPos(node, x - 1, y + 1)
+			checkPos(node, x - 1, y - 1)
+		end
 	end
 end

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

@@ -31,6 +31,7 @@ function _M:init(zone, map, level, data)
 	self.zoom = data.zoom or 5
 	self.max_percent = data.max_percent or 80
 	self.sqrt_percent = data.sqrt_percent or 30
+	self.sqrt_percent2 = data.sqrt_percent2
 	self.hurst = data.hurst or nil
 	self.lacunarity = data.lacunarity or nil
 	self.octave = data.octave or 4
@@ -138,7 +139,16 @@ function _M:generate(lev, old_lev)
 			if (v >= self.sqrt_percent and rng.percent(v)) or (v < self.sqrt_percent and rng.percent(math.sqrt(v))) then
 				self.map(i-1, j-1, Map.TERRAIN, self:resolve("wall"))
 			else
-				self.map(i-1, j-1, Map.TERRAIN, self:resolve("floor"))
+				if not self.sqrt_percent2 then
+					self.map(i-1, j-1, Map.TERRAIN, self:resolve("floor"))
+				else
+					if (v >= self.sqrt_percent2) then
+						self.map(i-1, j-1, Map.TERRAIN, self:resolve("floor2"))
+					else
+						self.map(i-1, j-1, Map.TERRAIN, self:resolve("floor"))
+					end
+				end
+
 				if v >= self.sqrt_percent then possible_spots[#possible_spots+1] = {x=i-1, y=j-1, type="clearing", subtype="clearing"} end
 			end
 		end