Added game:shakeScreen()

@@ -36,7 +36,7 @@ end
 
 function _M:easing(time, easing, txt, ...)
 	self:easingSimple(time, easing, txt, ...)
-	game.logPlayer(game.player, "%s", txt:toString())
+	game.logPlayer(game.player, txt, ...)
 end
 
 function _M:saySimple(time, txt, ...)

@@ -161,6 +161,11 @@ function _M:runReal()
 
 	self.zone_font = FontPackage:get("zone")
 
+	self.shake_time = nil
+	self.shake_force = 0
+	self.shake_x = 0
+	self.shake_y = 0
+
 	self.inited = true
 
 	if self.level and self.level.map then
@@ -1721,6 +1726,11 @@ function _M:updateFOV()
 	self.player:playerFOV()
 end
 
+function _M:shakeScreen(time, force)
+	self.shake_time = time
+	self.shake_force = force
+end
+
 function _M:displaySeensMap(map, x, y, nb_keyframe)
 	map._map:drawSeensTexture(x, y)
 end
@@ -1730,6 +1740,18 @@ function _M:displayMap(nb_keyframes, prev_fbo)
 	if self.level and self.level.map and self.level.map.finished then
 		local map = self.level.map
 
+		if self.shake_time then
+			if self.shake_time <= 0 then
+				self.shake_time = nil
+				self.shake_x = 0
+				self.shake_y = 0
+			else
+				self.shake_time = self.shake_time - nb_keyframes
+				self.shake_x = self.shake_x + rng.range(-self.shake_force, self.shake_force)
+				self.shake_y = self.shake_y + rng.range(-self.shake_force, self.shake_force)
+			end
+		end
+
 		-- Display the map and compute FOV for the player if needed
 		local changed = map.changed
 		if changed then self:updateFOV() end
@@ -1764,7 +1786,7 @@ function _M:displayMap(nb_keyframes, prev_fbo)
 			self.fbo2:use(false, prev_fbo)
 
 			_2DNoise:bind(1, false)
-			self.fbo2:postEffects(self.fbo, prev_fbo, map.display_x, map.display_y, map.viewport.width, map.viewport.height, unpack(self.posteffects_use))
+			self.fbo2:postEffects(self.fbo, prev_fbo, map.display_x + self.shake_x, map.display_y + self.shake_y, map.viewport.width, map.viewport.height, unpack(self.posteffects_use))
 			if self.target then self.target:display(nil, nil, prev_fbo, nb_keyframes) end
 
 		-- Basic display; no FBOs

@@ -261,16 +261,17 @@ function _M:makeNewTrees(g, kindsdefs, max_trees, basedir)
 		local treeid = treedef[1]
 		local parts = treedef[2]
 		if not parts.tall then parts.tall = 0 end
+		if not parts.alltall then parts.alltall = 0 else parts.tall = parts.alltall end
 
 		local scale = rng.float(0.5 + inb / 6, 1)
 		local x = rng.float(-1 / 3 * nb / 3, 1 / 3 * nb / 3)
 		local y = rng.float(-1 / 5 * nb / 3, 1 / 4 * nb / 3)
 
 		for i = 1, #parts - 1 do
-			mos[#mos+1] = {image=basedir..treeid.."_"..getname(parts[i])..".png", display_x=x, display_y=y, display_w=scale, display_h=scale}
+			mos[#mos+1] = {image=basedir..treeid.."_"..getname(parts[i])..".png", display_x=x, display_y=y + scale * parts.alltall, display_w=scale, display_h=scale * (1 - parts.alltall)}
 		end
 		if parts.base then
-			basemos[#basemos+1] = {image=basedir..treeid.."_"..getname(parts.base)..".png", display_x=x, display_y=y, display_w=scale, display_h=scale}
+			basemos[#basemos+1] = {image=basedir..treeid.."_"..getname(parts.base)..".png", display_x=x, display_y=y + scale * parts.alltall, display_w=scale, display_h=scale * (1 - parts.tall)}
 		end
 		if parts.adds then
 			local name = parts.adds[1]

@@ -33,5 +33,5 @@ return {
 	resetargs = {
 		tick_start = function() return core.game.getFrameTime() end,
 	},
-	clone = false,
+	clone = true,
 }