diff --git a/Applications.txt b/Applications.txt
index 337d9bf9..e86742eb 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -249,7 +249,7 @@
     name="lib/GUI.lua",
     url="IgorTimofeev/OpenComputers/master/lib/GUI.lua",
     type="Library",
-    version=1.1,
+    version=1.11,
   },
   {
     name="lib/serialization.lua",
@@ -273,7 +273,7 @@
     name="lib/rayEngine.lua",
     url="IgorTimofeev/OpenComputers/master/lib/rayEngine.lua",
     type="Library",
-    version=1.23,
+    version=1.24,
   },
   {
     name="lib/doubleHeight.lua",
@@ -546,53 +546,45 @@
       },
     },
   },
-  -- {
-  --   name="MineOS/Applications/RayWalk",
-  --   url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayWalk.lua",
-  --   about="IgorTimofeev/OpenComputers/master/Applications/RayWalk/About/",
-  --   type="Application",
-  --   icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic",
-  --   createShortcut="desktop",
-  --   version=1.43,
-  --   resources={
-  --     {
-  --       name="Worlds/ExampleWorld/Map.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg",
-  --     },
-  --     {
-  --       name="Worlds/ExampleWorld/Player.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg",
-  --     },
-  --     {
-  --       name="Worlds/ExampleWorld/World.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/World.cfg",
-  --     },
-  --     {
-  --       name="Worlds/ForeverDay/Map.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ForeverDay/Map.cfg",
-  --     },
-  --     {
-  --       name="Worlds/ForeverDay/Player.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ForeverDay/Player.cfg",
-  --     },
-  --     {
-  --       name="Worlds/ForeverDay/World.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ForeverDay/World.cfg",
-  --     },
-  --     {
-  --       name="Worlds/SundownBeams/Map.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Map.cfg",
-  --     },
-  --     {
-  --       name="Worlds/SundownBeams/Player.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Player.cfg",
-  --     },
-  --     {
-  --       name="Worlds/SundownBeams/World.cfg",
-  --       url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/World.cfg",
-  --     },
-  --   },
-  -- },
+  {
+    name="MineOS/Applications/RayWalk",
+    url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayWalk.lua",
+    about="IgorTimofeev/OpenComputers/master/Applications/RayWalk/About/",
+    type="Application",
+    icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic",
+    createShortcut="desktop",
+    version=1.44,
+    resources={
+      {
+        name="RayEngine.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayEngine.cfg",
+      },
+      {
+        name="Worlds/ExampleWorld/Map.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg",
+      },
+      {
+        name="Worlds/ExampleWorld/Player.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg",
+      },
+      {
+        name="Worlds/ExampleWorld/World.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/ExampleWorld/World.cfg",
+      },
+      {
+        name="Worlds/SundownBeams/Map.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Map.cfg",
+      },
+      {
+        name="Worlds/SundownBeams/Player.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/Player.cfg",
+      },
+      {
+        name="Worlds/SundownBeams/World.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Worlds/SundownBeams/World.cfg",
+      },
+    },
+  },
   {
     name="MineOS/Applications/GuessWord",
     url="IgorTimofeev/OpenComputers/master/Applications/GuessWord/GuessWord.lua",
diff --git a/Applications/RayWalk/RayEngine.cfg b/Applications/RayWalk/RayEngine.cfg
new file mode 100644
index 00000000..cf197541
--- /dev/null
+++ b/Applications/RayWalk/RayEngine.cfg
@@ -0,0 +1,5 @@
+{
+	tileWidth = 32,
+	drawDistance = 1000,
+	raycastQuality = 0.2,
+}
\ No newline at end of file
diff --git a/Applications/RayWalk/RayWalk.lua b/Applications/RayWalk/RayWalk.lua
index daa00fde..f26e4ea0 100644
--- a/Applications/RayWalk/RayWalk.lua
+++ b/Applications/RayWalk/RayWalk.lua
@@ -5,42 +5,53 @@ local libraries = {
 	buffer = "doubleBuffering",
 	rayEngine = "rayEngine",
 	GUI = "GUI",
+	ecs = "ECSAPI",
 	unicode = "unicode",
 	event = "event",
 }
 
 for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil
-local worldsPath = "MineOS/Applications/RayWalk.app/Resources/Worlds/"
+local applicationPath = "MineOS/Applications/RayWalk.app/Resources/"
+local worldsPath = applicationPath .. "Worlds/"
+local rayWalkVersion = "RayWalk v3.2 closed beta"
 
 ----------------------------------------------------------------------------------------------------------------------------------
 
 local function menu()
-	local buttonWidth = 50
-	local buttons = {}
-	for file in fs.list(worldsPath) do table.insert(buttons, unicode.sub(file, 1, -2)) end
-	local x, y = math.floor(buffer.screen.width / 2 - buttonWidth / 2), math.floor(buffer.screen.height / 2 - ((#buttons + 1) * 4) / 2)
-	local buttonData = {}; for i = 1, #buttons do table.insert(buttonData, {GUI.buttonTypes.default, buttonWidth, 3, 0xDDDDDD, 0x555555, 0xBBBBBB, 0x262626, buttons[i]}) end
-	table.insert(buttonData, {GUI.buttonTypes.default, buttonWidth, 3, 0xBBBBBB, 0x262626, 0x999999, 0x262626, "Выход"})
+	local buttonWidth, buttonHeight = 50, 3
+	local selectWorldButtons, buttons = {}, {}
+	for file in fs.list(worldsPath) do table.insert(selectWorldButtons, unicode.sub(file, 1, -2)) end
+	local x, y = math.floor(buffer.screen.width / 2 - buttonWidth / 2), math.floor(buffer.screen.height / 2 - ((#selectWorldButtons + 3) * (buttonHeight + 1)) / 2)
+	local buttonData = {}; for i = 1, #selectWorldButtons do table.insert(buttonData, {GUI.buttonTypes.default, buttonWidth, buttonHeight, 0xEEEEEE, 0x262626, 0xBBBBBB, 0x262626, selectWorldButtons[i]}) end
 
 	rayEngine.drawWorld()
 	buffer.clear(0x000000, 50)
-	buttons = GUI.buttons(x, y, GUI.directions.vertical, 1, table.unpack(buttonData))
+
+	GUI.centeredText(GUI.alignment.verticalCenter, y, 0xFFFFFF, rayWalkVersion); y = y + 2
+	buttons.resume = GUI.button(x, y, buttonWidth, buttonHeight, 0xEEEEEE, 0x262626, 0xBBBBBB, 0x262626, "Продолжить"); y = y + buttonHeight + 1
+	buttons.quit = GUI.button(x, y, buttonWidth, buttonHeight, 0xEEEEEE, 0x262626, 0x999999, 0x262626, "Выход"); y = y + buttonHeight + 1
+	GUI.centeredText(GUI.alignment.verticalCenter, y, 0xFFFFFF, "Загрузить мир"); y = y + 2
+	selectWorldButtons = GUI.buttons(x, y, GUI.directions.vertical, 1, table.unpack(buttonData))
+
 	buffer.draw()
 
 	while true do
 		local e = {event.pull("touch")}
-		for _, button in pairs(buttons) do
+		for _, button in pairs(selectWorldButtons) do
 			if button:isClicked(e[3], e[4]) then
 				button:press()
-				if button.text == "Выход" then
-					os.exit()
-				else
-					rayEngine.loadWorld(worldsPath .. button.text)
-					return
-				end
-				break
+				rayEngine.loadWorld(worldsPath .. button.text)
+				return
 			end
 		end
+
+		if buttons.resume:isClicked(e[3], e[4]) then
+			buttons.resume:press()
+			return
+		elseif buttons.quit:isClicked(e[3], e[4]) then
+			buttons.quit:press()
+			os.exit()
+		end
 	end
 end
 
@@ -71,6 +82,7 @@ local controls = {
 
 buffer.start()
 -- rayEngine.intro()
+rayEngine.init(applicationPath .. "RayEngine.cfg")
 rayEngine.loadWorld(worldsPath .. "ExampleWorld")
 menu()
 rayEngine.update()
diff --git a/lib/GUI.lua b/lib/GUI.lua
index ea7fe139..22691c03 100644
--- a/lib/GUI.lua
+++ b/lib/GUI.lua
@@ -1,7 +1,6 @@
 
 local libraries = {
 	buffer = "doubleBuffering",
-	ecs = "ECSAPI",
 	unicode = "unicode",
 	event = "event",
 }
@@ -11,6 +10,12 @@ local GUI = {}
 
 ---------------------------------------------------- Универсальные методы --------------------------------------------------------
 
+GUI.alignment = {
+	verticalCenter = 0,
+	horizontalCenter = 1,
+	horizontalAndVerticalCenter = 3,
+}
+
 GUI.directions = {
 	horizontal = 0,
 	vertical = 1,
@@ -253,10 +258,10 @@ function GUI.error(text, errorWindowParameters)
 	--Ебемся с текстом, делаем его пиздатым во всех смыслах
 	if type(text) ~= "table" then
 		text = tostring(text)
-		text = (errorWindowParameters and errorWindowParameters.truncate) and ecs.stringLimit("end", text, errorWindowParameters.truncate) or text
+		text = (errorWindowParameters and errorWindowParameters.truncate) and unicode.sub(text, 1, errorWindowParameters.truncate) or text
 		text = { text }
 	end
-	text = ecs.stringWrap(text, widthOfText)
+	text = GUI.stringWrap(text, widthOfText)
 
 
 	--Ебашим высоту правильнуюe
@@ -475,6 +480,67 @@ end
 
 --------------------------------------------------------------------------------------------------------------------------------
 
+--Функция по переносу слов на новую строку в зависимости от ограничения по ширине
+function GUI.stringWrap(strings, limit)
+	local currentString = 1
+	while currentString <= #strings do
+		local words = {}; for word in string.gmatch(tostring(strings[currentString]), "[^%s]+") do table.insert(words, word) end
+
+		local newStringThatFormedFromWords, oldStringThatFormedFromWords = "", ""
+		local word = 1
+		local overflow = false
+		while word <= #words do
+			oldStringThatFormedFromWords = oldStringThatFormedFromWords .. (word > 1 and " " or "") .. words[word]
+			if unicode.len(oldStringThatFormedFromWords) > limit then
+				--ЕБЛО
+				if unicode.len(words[word]) > limit then
+					local left = unicode.sub(oldStringThatFormedFromWords, 1, limit)
+					local right = unicode.sub(strings[currentString], unicode.len(left) + 1, -1)
+					overflow = true
+					strings[currentString] = left
+					if strings[currentString + 1] then
+						strings[currentString + 1] = right .. " " .. strings[currentString + 1]
+					else
+						strings[currentString + 1] = right
+					end 
+				end
+				break
+			else
+				newStringThatFormedFromWords = oldStringThatFormedFromWords
+			end
+			word = word + 1
+		end
+
+		if word <= #words and not overflow then
+			local fuckToAdd = table.concat(words, " ", word, #words)
+			if strings[currentString + 1] then
+				strings[currentString + 1] = fuckToAdd .. " " .. strings[currentString + 1]
+			else
+				strings[currentString + 1] = fuckToAdd
+			end
+			strings[currentString] = newStringThatFormedFromWords
+		end
+
+		currentString = currentString + 1
+	end
+
+	return strings
+end
+
+--------------------------------------------------------------------------------------------------------------------------------
+
+function GUI.centeredText(centrationENUM, coordinate, color, text)
+	local textLength, x, y = unicode.len(text)
+	if centrationENUM == GUI.alignment.verticalCenter then
+		x, y = math.floor(buffer.screen.width / 2 - textLength / 2), coordinate
+	elseif centrationENUM == GUI.alignment.horizontalCenter then
+		x, y = coordinate, math.floor(buffer.screen.height / 2)
+	else
+		x, y = math.floor(buffer.screen.width / 2 - textLength / 2), math.floor(buffer.screen.height / 2)
+	end
+
+	buffer.text(x, y, color, text)
+end
 
 --------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/lib/rayEngine.lua b/lib/rayEngine.lua
index 4d895c45..cbd39bb8 100644
--- a/lib/rayEngine.lua
+++ b/lib/rayEngine.lua
@@ -14,7 +14,6 @@ local rayEngine = {}
 
 ---------------------------------------------------- Константы ------------------------------------------------------------------
 
-rayEngine.tileWidth = 32
 rayEngine.wallsPosition = 0
 rayEngine.horizonPosition = math.floor(buffer.screen.height / 2)
 rayEngine.minimapEnabled = true
@@ -36,14 +35,6 @@ local function round(num)
 	end
 end
 
-local function convertRadiansToDegrees(rad)
-	return rad * (180 / 3.14)
-end
-
-local function convertDegreesToRadians(ang)
-	return ang * (3.14 / 180)
-end
-
 local function constrainAngle(value)
 	if ( value < 0 ) then
 		value = value + 360
@@ -90,18 +81,24 @@ local function correctDouble(number)
 end
 
 local function convertWorldCoordsToMapCoords(x, y)
-	return round(x / rayEngine.tileWidth), round(y / rayEngine.tileWidth)
+	return round(x / rayEngine.properties.tileWidth), round(y / rayEngine.properties.tileWidth)
 end
 
 local function getBlockCoordsByLook(distance)
-	local radRotation = math.rad(rayEngine.player.rotation + 90)
-	return convertWorldCoordsToMapCoords(rayEngine.player.position.x + distance * math.sin(radRotation) * rayEngine.tileWidth, rayEngine.player.position.y + distance * math.cos(radRotation) * rayEngine.tileWidth)
+	local radRotation = math.rad(rayEngine.player.rotation)
+	return convertWorldCoordsToMapCoords(rayEngine.player.position.x + distance * math.sin(radRotation) * rayEngine.properties.tileWidth, rayEngine.player.position.y + distance * math.cos(radRotation) * rayEngine.properties.tileWidth)
 end
 
 ---------------------------------------------------- Работа с файлами ------------------------------------------------------------------
 
+--Грузим базовый конфиг движка
+function rayEngine.init(pathToRayEnginePropertiesFile)
+	rayEngine.properties = files.loadTableFromFile(pathToRayEnginePropertiesFile)
+	rayEngine.properties.raycastQuality = rayEngine.properties.raycastQuality * rayEngine.properties.tileWidth
+end
+
+--Загружаем все конфиг-файлы мира
 function rayEngine.loadWorld(pathToWorldFolder)
-	--Загружаем все конфиг-файлы мира
 	rayEngine.world = files.loadTableFromFile(pathToWorldFolder .. "/World.cfg")
 	rayEngine.map = files.loadTableFromFile(pathToWorldFolder .. "/Map.cfg")
 	rayEngine.player = files.loadTableFromFile(pathToWorldFolder .. "/Player.cfg")
@@ -109,22 +106,24 @@ function rayEngine.loadWorld(pathToWorldFolder)
 	rayEngine.map.width = #rayEngine.map[1]
 	rayEngine.map.height = #rayEngine.map
 	--Ебашим правильную позицию игрока, основанную на этой ХУЙНЕ, которую ГЛЕБ так ЛЮБИТ
-	rayEngine.player.position.x = rayEngine.tileWidth * rayEngine.player.position.x - rayEngine.tileWidth / 2
-	rayEngine.player.position.y = rayEngine.tileWidth * rayEngine.player.position.y - rayEngine.tileWidth / 2
+	rayEngine.player.position.x = rayEngine.properties.tileWidth * rayEngine.player.position.x - rayEngine.properties.tileWidth / 2
+	rayEngine.player.position.y = rayEngine.properties.tileWidth * rayEngine.player.position.y - rayEngine.properties.tileWidth / 2
 	--Рассчитываем стартовые цвета, зависимые от времени - небо, землю, стены
 	getTimeDependentColors()
 	--Обнуляем текущее время, если превышен лимит
 	rayEngine.world.dayNightCycle.currentTime = rayEngine.world.dayNightCycle.currentTime > rayEngine.world.dayNightCycle.length and 0 or rayEngine.world.dayNightCycle.currentTime
 	--Осуществляем базовое получение аптайма пекарни
 	rayEngine.world.dayNightCycle.lastComputerUptime = computer.uptime()
-	rayEngine.distanceToProjectionPlane = (buffer.screen.width / 2) / math.tan(convertDegreesToRadians(rayEngine.player.fieldOfView / 2))
+	rayEngine.distanceToProjectionPlane = (buffer.screen.width / 2) / math.tan(math.rad((rayEngine.player.fieldOfView / 2)))
+	--Шаг, с которым будет изменяться угол рейкаста
+	rayEngine.properties.raycastStep = rayEngine.player.fieldOfView / buffer.screen.width
 end
 
 ---------------------------------------------------- Функции, связанные с игроком ------------------------------------------------------------------
 
 function rayEngine.move(distanceForward, distanceRight)
-	local forwardRotation = math.rad(rayEngine.player.rotation + 90)
-	local rightRotation = math.rad(rayEngine.player.rotation + 180)
+	local forwardRotation = math.rad(rayEngine.player.rotation)
+	local rightRotation = math.rad(rayEngine.player.rotation + 90)
 	local xNew = rayEngine.player.position.x + distanceForward * math.sin(forwardRotation) + distanceRight * math.sin(rightRotation)
 	local yNew = rayEngine.player.position.y + distanceForward * math.cos(forwardRotation) + distanceRight * math.cos(rightRotation)
 
@@ -374,86 +373,43 @@ end
 
 ---------------------------------------------------- Функции отрисовки мира ------------------------------------------------------------------
 
-local function hRaycast(player, angle)
-	local rayInTop = math.sin( angle ) > 0
+local function raycast(angle)
+	angle = math.rad(angle)
+	local angleSinDistance, angleCosDistance, currentDistance, xWorld, yWorld, xMap, yMap, tile = math.sin(angle) * rayEngine.properties.raycastQuality, math.cos(angle) * rayEngine.properties.raycastQuality, 0, rayEngine.player.position.x, rayEngine.player.position.y
 
-	local tanAng = math.tan( angle )
+	while true do
+		if currentDistance <= rayEngine.properties.drawDistance then
+			xMap, yMap = math.floor(xWorld / rayEngine.properties.tileWidth), math.floor(yWorld / rayEngine.properties.tileWidth)
+			if rayEngine.map[yMap] and rayEngine.map[yMap][xMap] then
+				return currentDistance, rayEngine.map[yMap][xMap]
+			end
 
-	local Ay = math.floor(rayEngine.player.position.y / rayEngine.tileWidth) * rayEngine.tileWidth; Ay = Ay + ( (rayInTop) and -1 or rayEngine.tileWidth )
-	local Ax = rayEngine.player.position.x + (rayEngine.player.position.y - Ay) / tanAng
-
-	local Ya = (rayInTop) and -rayEngine.tileWidth or rayEngine.tileWidth
-	local Xa = rayEngine.tileWidth / tanAng; Xa = Xa * ( (rayInTop) and 1 or -1 )
-
-	local x, y = math.floor(Ax / rayEngine.tileWidth), math.floor(Ay / rayEngine.tileWidth)
-
-	while (rayEngine.map[y + 1] and not rayEngine.map[y + 1][x + 1]) do
-		Ax = Ax + Xa; Ay = Ay + Ya
-
-		if (Ax < 0 or Ax > rayEngine.tileWidth * rayEngine.map.width or Ay < 0 or Ay > rayEngine.tileWidth * rayEngine.map.height) then
-			break
+			xWorld, yWorld = xWorld + angleSinDistance, yWorld + angleCosDistance
+			currentDistance = currentDistance + rayEngine.properties.raycastQuality
+		else
+			return nil
 		end
-
-		x, y = math.floor(Ax / rayEngine.tileWidth), math.floor(Ay / rayEngine.tileWidth)
 	end
-
-	return math.abs(rayEngine.player.position.x - Ax) / math.abs(math.cos( angle ))
-end
-
-local function vRaycast(player, angle)
-	local rayInRight = math.cos( angle ) > 0
-
-	local tanAng = math.tan( angle )
-
-	local Bx = math.floor(rayEngine.player.position.x / rayEngine.tileWidth) * rayEngine.tileWidth; Bx = Bx + ( (rayInRight) and rayEngine.tileWidth or -1 )
-	local By = rayEngine.player.position.y + (rayEngine.player.position.x - Bx) * tanAng
-
-	local Xa = (rayInRight) and rayEngine.tileWidth or -rayEngine.tileWidth
-	local Ya = rayEngine.tileWidth * tanAng; Ya = Ya * ( (rayInRight) and -1 or 1 )
-
-	local x, y = math.floor(Bx / rayEngine.tileWidth), math.floor(By / rayEngine.tileWidth)
-
-	while (rayEngine.map[y + 1] and not rayEngine.map[y + 1][x + 1]) do
-		Bx = Bx + Xa; By = By + Ya
-
-		if (Bx < 0 or Bx > rayEngine.tileWidth * rayEngine.map.width or By < 0 or By > rayEngine.tileWidth * rayEngine.map.height) then
-			break
-		end
-
-		x, y = math.floor(Bx / rayEngine.tileWidth), math.floor(By / rayEngine.tileWidth)
-	end
-
-	return math.abs(rayEngine.player.position.y - By) / math.abs(math.sin( angle ))
 end
 
 function rayEngine.drawWorld()
+	--Земля
 	buffer.clear(rayEngine.world.colors.groundByTime)
+	--Небо
 	buffer.square(1, 1, buffer.screen.width, rayEngine.horizonPosition, rayEngine.world.colors.sky.current)
+	--Сцена
+	local startAngle, endAngle, startX, distanceLimit, distanceToTile, tile, height, startY, tileColor = rayEngine.player.rotation - rayEngine.player.fieldOfView / 2, rayEngine.player.rotation + rayEngine.player.fieldOfView / 2, 1, buffer.screen.height * 0.85	
+	for angle = startAngle, endAngle, rayEngine.properties.raycastStep do
+		distanceToTile, tile = raycast(angle)
+		if distanceToTile then
+			height = rayEngine.properties.tileWidth / distanceToTile * rayEngine.distanceToProjectionPlane
+			startY = buffer.screen.height / 2 - height / 2 + rayEngine.wallsPosition + 1
 
-	local startColumn = rayEngine.player.rotation - (rayEngine.player.fieldOfView / 2)
-	local endColumn = rayEngine.player.rotation + (rayEngine.player.fieldOfView / 2)
-	local step = rayEngine.player.fieldOfView / buffer.screen.width
-
-	local startX = 1
-	local distanceLimit = buffer.screen.height * 0.85
-	local hDist, vDist, dist, height, startY, tileColor
-	for angle = startColumn, endColumn, step do
-		hDist = hRaycast(player, convertDegreesToRadians(angle) )
-		vDist = vRaycast(player, convertDegreesToRadians(angle) )
-
-		-- local dist = math.min( hDist, vDist ) * math.cos( convertDegreesToRadians(angle) )
-		dist = math.min( hDist, vDist )
-		height = rayEngine.tileWidth / dist * rayEngine.distanceToProjectionPlane
-		startY = buffer.screen.height / 2 - height / 2 + 1 + rayEngine.wallsPosition
-
-		--Рисуем сценку
-		tileColor = height > distanceLimit and rayEngine.world.colors.tile.byTime[#rayEngine.world.colors.tile.byTime] or rayEngine.world.colors.tile.byTime[math.floor(#rayEngine.world.colors.tile.byTime * height / distanceLimit)]
-		buffer.square(math.floor(startX), math.floor(startY), 1, height, tileColor, 0x000000, " ")
-		-- buffer.square(math.floor(startX), math.floor(startY), 1, height, 0x000000, 0x000000, " ")
+			tileColor = height > distanceLimit and rayEngine.world.colors.tile.byTime[#rayEngine.world.colors.tile.byTime] or rayEngine.world.colors.tile.byTime[math.floor(#rayEngine.world.colors.tile.byTime * height / distanceLimit)]
+			buffer.square(math.floor(startX), math.floor(startY), 1, math.floor(height), tileColor, 0x000000, " ")
+		end
 		startX = startX + 1
 	end
-
-	doDayNightCycle()
 end
 
 function rayEngine.update()
@@ -464,6 +420,7 @@ function rayEngine.update()
 	if rayEngine.watchEnabled then rayEngine.watch(xTools, yTools) end
 	--rayEngine.drawWeapon()
 	if rayEngine.chatEnabled then rayEngine.chat() end
+	doDayNightCycle()
 	buffer.draw()
 end
 
diff --git a/lib/rayEngineBackup.lua b/lib/rayEngineBackup.lua
new file mode 100644
index 00000000..4d895c45
--- /dev/null
+++ b/lib/rayEngineBackup.lua
@@ -0,0 +1,472 @@
+local libraries = {
+	colorlib = "colorlib",
+	image = "image",
+	buffer = "doubleBuffering",
+	doubleHeight = "doubleHeight",
+	GUI = "GUI",
+	files = "files",
+	computer = "computer",
+	event = "event",
+}
+
+for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil
+local rayEngine = {}
+
+---------------------------------------------------- Константы ------------------------------------------------------------------
+
+rayEngine.tileWidth = 32
+rayEngine.wallsPosition = 0
+rayEngine.horizonPosition = math.floor(buffer.screen.height / 2)
+rayEngine.minimapEnabled = true
+rayEngine.compassEnabled = false
+rayEngine.watchEnabled = false
+rayEngine.drawFieldOfViewOnMinimap = false
+rayEngine.chatShowTime = 4
+rayEngine.chatHistory = {}
+rayEngine.chatPanelWidth, rayEngine.chatPanelHeight = math.floor(buffer.screen.width * 0.4), math.floor(buffer.screen.height * 0.4)
+rayEngine.chatHistoryLimit = rayEngine.chatPanelHeight
+
+---------------------------------------------- Вспомогательные функции ------------------------------------------------------------------
+
+local function round(num) 
+	if num >= 0 then 
+		return math.floor(num + 0.5) 
+	else
+		return math.ceil(num - 0.5)
+	end
+end
+
+local function convertRadiansToDegrees(rad)
+	return rad * (180 / 3.14)
+end
+
+local function convertDegreesToRadians(ang)
+	return ang * (3.14 / 180)
+end
+
+local function constrainAngle(value)
+	if ( value < 0 ) then
+		value = value + 360
+	elseif ( value > 360 )  then
+		value = value - 360
+	end
+	return value
+end
+
+local function getSkyColorByTime()
+	return rayEngine.world.colors.sky[rayEngine.world.dayNightCycle.currentTime > 0 and math.ceil(rayEngine.world.dayNightCycle.currentTime / rayEngine.world.dayNightCycle.length * #rayEngine.world.colors.sky) or 1]
+end
+
+local function getBrightnessByTime()
+	return rayEngine.world.colors.brightnessMultiplyer[rayEngine.world.dayNightCycle.currentTime > 0 and math.ceil(rayEngine.world.dayNightCycle.currentTime / rayEngine.world.dayNightCycle.length * #rayEngine.world.colors.brightnessMultiplyer) or 1]
+end
+
+local function getTimeDependentColors()
+	rayEngine.world.colors.sky.current = getSkyColorByTime()
+	rayEngine.world.colors.brightnessMultiplyer.current = math.floor(getBrightnessByTime() * 2.55)
+	rayEngine.world.colors.groundByTime = colorlib.alphaBlend(rayEngine.world.colors.ground, 0x000000, rayEngine.world.colors.brightnessMultiplyer.current)
+
+	rayEngine.world.colors.tile.byTime = {}
+	for i = 1, #rayEngine.world.colors.tile do
+		rayEngine.world.colors.tile.byTime[i] = colorlib.alphaBlend(rayEngine.world.colors.tile[i], 0x000000, rayEngine.world.colors.brightnessMultiplyer.current)
+	end
+end
+
+local function doDayNightCycle()
+	if rayEngine.world.dayNightCycle.enabled then
+		local computerUptime = computer.uptime()
+		if (computerUptime - rayEngine.world.dayNightCycle.lastComputerUptime) >= rayEngine.world.dayNightCycle.speed then
+			rayEngine.world.dayNightCycle.currentTime = rayEngine.world.dayNightCycle.currentTime + rayEngine.world.dayNightCycle.speed
+			if rayEngine.world.dayNightCycle.currentTime > rayEngine.world.dayNightCycle.length then rayEngine.world.dayNightCycle.currentTime = 0 end	
+			rayEngine.world.dayNightCycle.lastComputerUptime = computerUptime
+
+			getTimeDependentColors()
+		end
+	end
+end
+
+local function correctDouble(number)
+	return string.format("%.1f", number)
+end
+
+local function convertWorldCoordsToMapCoords(x, y)
+	return round(x / rayEngine.tileWidth), round(y / rayEngine.tileWidth)
+end
+
+local function getBlockCoordsByLook(distance)
+	local radRotation = math.rad(rayEngine.player.rotation + 90)
+	return convertWorldCoordsToMapCoords(rayEngine.player.position.x + distance * math.sin(radRotation) * rayEngine.tileWidth, rayEngine.player.position.y + distance * math.cos(radRotation) * rayEngine.tileWidth)
+end
+
+---------------------------------------------------- Работа с файлами ------------------------------------------------------------------
+
+function rayEngine.loadWorld(pathToWorldFolder)
+	--Загружаем все конфиг-файлы мира
+	rayEngine.world = files.loadTableFromFile(pathToWorldFolder .. "/World.cfg")
+	rayEngine.map = files.loadTableFromFile(pathToWorldFolder .. "/Map.cfg")
+	rayEngine.player = files.loadTableFromFile(pathToWorldFolder .. "/Player.cfg")
+	--Дополняем карту ее размерами
+	rayEngine.map.width = #rayEngine.map[1]
+	rayEngine.map.height = #rayEngine.map
+	--Ебашим правильную позицию игрока, основанную на этой ХУЙНЕ, которую ГЛЕБ так ЛЮБИТ
+	rayEngine.player.position.x = rayEngine.tileWidth * rayEngine.player.position.x - rayEngine.tileWidth / 2
+	rayEngine.player.position.y = rayEngine.tileWidth * rayEngine.player.position.y - rayEngine.tileWidth / 2
+	--Рассчитываем стартовые цвета, зависимые от времени - небо, землю, стены
+	getTimeDependentColors()
+	--Обнуляем текущее время, если превышен лимит
+	rayEngine.world.dayNightCycle.currentTime = rayEngine.world.dayNightCycle.currentTime > rayEngine.world.dayNightCycle.length and 0 or rayEngine.world.dayNightCycle.currentTime
+	--Осуществляем базовое получение аптайма пекарни
+	rayEngine.world.dayNightCycle.lastComputerUptime = computer.uptime()
+	rayEngine.distanceToProjectionPlane = (buffer.screen.width / 2) / math.tan(convertDegreesToRadians(rayEngine.player.fieldOfView / 2))
+end
+
+---------------------------------------------------- Функции, связанные с игроком ------------------------------------------------------------------
+
+function rayEngine.move(distanceForward, distanceRight)
+	local forwardRotation = math.rad(rayEngine.player.rotation + 90)
+	local rightRotation = math.rad(rayEngine.player.rotation + 180)
+	local xNew = rayEngine.player.position.x + distanceForward * math.sin(forwardRotation) + distanceRight * math.sin(rightRotation)
+	local yNew = rayEngine.player.position.y + distanceForward * math.cos(forwardRotation) + distanceRight * math.cos(rightRotation)
+
+	local xWorld, yWorld = convertWorldCoordsToMapCoords(xNew, yNew)
+	if rayEngine.map[yWorld][xWorld] == nil then
+		rayEngine.player.position.x, rayEngine.player.position.y = xNew, yNew
+	end
+end
+
+function rayEngine.rotate(angle)
+	rayEngine.player.rotation = constrainAngle(rayEngine.player.rotation + angle)
+end
+
+function rayEngine.turnRight()
+	rayEngine.rotate(rayEngine.player.rotationSpeed)
+end
+
+function rayEngine.turnLeft()
+	rayEngine.rotate(-rayEngine.player.rotationSpeed)
+end
+
+function rayEngine.moveForward()
+	rayEngine.move(rayEngine.player.moveSpeed, 0)
+end
+
+function rayEngine.moveBackward()
+	rayEngine.move(-rayEngine.player.moveSpeed, 0)
+end
+
+function rayEngine.moveLeft()
+	rayEngine.move(0, -rayEngine.player.moveSpeed)
+end
+
+function rayEngine.moveRight()
+	rayEngine.move(0, rayEngine.player.moveSpeed)
+end
+
+function rayEngine.jump()
+	if not rayEngine.player.jumpTimer then
+		local function onJumpFinished()
+			rayEngine.horizonPosition = rayEngine.horizonPosition - rayEngine.player.jumpHeight;
+			rayEngine.wallsPosition = rayEngine.wallsPosition - rayEngine.player.jumpHeight;
+			rayEngine.player.jumpTimer = nil
+		end
+
+		rayEngine.player.jumpTimer = event.timer(1, onJumpFinished)
+		rayEngine.wallsPosition = rayEngine.wallsPosition + rayEngine.player.jumpHeight
+		rayEngine.horizonPosition = rayEngine.horizonPosition + rayEngine.player.jumpHeight
+	end
+end
+
+function rayEngine.crouch()
+	rayEngine.player.isCrouched = not rayEngine.player.isCrouched
+	local heightAdder = rayEngine.player.isCrouched and -rayEngine.player.crouchHeight or rayEngine.player.crouchHeight
+	rayEngine.wallsPosition = rayEngine.wallsPosition + heightAdder
+	rayEngine.horizonPosition = rayEngine.horizonPosition + heightAdder
+end
+
+function rayEngine.destroy(distance)
+	local xBlock, yBlock = getBlockCoordsByLook(distance)
+	rayEngine.map[yBlock][xBlock] = nil
+end
+
+function rayEngine.place(distance, blockColor)
+	local xBlock, yBlock = getBlockCoordsByLook(distance)
+	rayEngine.map[yBlock][xBlock] = blockColor or 0x0
+end
+
+---------------------------------------------------- Функции интерфейса ------------------------------------------------------------------
+
+local function drawFieldOfViewAngle(x, y, distance, color)
+	local fieldOfViewHalf = rayEngine.player.fieldOfView / 2
+	local firstAngle, secondAngle = math.rad(-(rayEngine.player.rotation - fieldOfViewHalf + 90)), math.rad(-(rayEngine.player.rotation + fieldOfViewHalf + 90))
+	local xFirst, yFirst = math.floor(x + math.sin(firstAngle) * distance), math.floor(y + math.cos(firstAngle) * distance)
+	local xSecond, ySecond = math.floor(x + math.sin(secondAngle) * distance), math.floor(y + math.cos(secondAngle) * distance)
+	doubleHeight.line(x, y, xFirst, yFirst, color)
+	doubleHeight.line(x, y, xSecond, ySecond, color)
+end
+
+function rayEngine.drawMap(x, y, width, height, transparency)
+	buffer.square(x, y, width, height, 0x000000, 0x000000, " ", transparency)
+	local xHalf, yHalf = math.floor(width / 2), math.floor(height / 2)
+	local xMap, yMap = convertWorldCoordsToMapCoords(rayEngine.player.position.x, rayEngine.player.position.y)
+
+	local xPos, yPos = x, y
+	for i = yMap - yHalf + 1, yMap + yHalf + 1 do
+		for j = xMap + xHalf + 1, xMap - xHalf + 1, -1 do
+			if rayEngine.map[i] and rayEngine.map[i][j] then
+				buffer.square(xPos, yPos, 1, 1, 0xEEEEEE)
+			end
+			xPos = xPos + 1
+		end
+		xPos = x; yPos = yPos + 1
+	end
+
+	local xPlayer, yPlayer = x + xHalf, (y + yHalf) * 2
+	--Поле зрения
+	if rayEngine.drawFieldOfViewOnMinimap then drawFieldOfViewAngle(xPlayer, yPlayer, 5, 0xCCFFBF) end
+	--Игрок
+	doubleHeight.set(xPlayer, yPlayer, 0x66FF40)
+	--Инфа
+	y = y + height
+	buffer.square(x, y, width, 1, 0x000000, 0x000000, " ", transparency + 10)
+	x = x + 1
+	buffer.text(x, y, 0xFFFFFF, "POS: " .. correctDouble(rayEngine.player.position.x) .. " x " .. correctDouble(rayEngine.player.position.y))
+end
+
+function rayEngine.intro()
+	local logo = image.fromString("17060000FF 0000FF 0000FF 0000FF 007EFF▄007EFF▄007EFF▄007EFF▀007EFF▀007EFF▀007EFF▀007EFF▀007EFF▀007EFF▀007EFF▄007EFF▄007EFF▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 007EFF▄007EFF▀007EFF▀0000FF 0000FF 0000FF 0000FF 0053FF▄0053FF▀0053FF▀0053FF▀0053FF▄0000FF 0000FF 0000FF 0000FF 007EFF▀007EFF▀007EFF▄0000FF 0000FF 0000FF 007EFF▀007EFF▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 530000 0000FF 0078FF▀0000FF 537800▀0078FF▀0078FF▀0078FF▀0078FF▀0078FF▀0078FF▀7E7800▀0078FF▀0000FF 0078FF▀0000FF 0000FF 007EFF▀007EFF▀007EFF▄007EFF▄007EFF▄0000FF 0000FF 0053FF▀0053FF▀0053FF▀0000FF 0000FF 007EFF▄007EFF▄007EFF▄007EFF▀007EFF▀0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 007EFF▀007EFF▀007EFF▀007EFF▀007EFF▀007EFF▀007EFF▀0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 007EFFP007EFFo007EFFw007EFFe007EFFr007EFFe007EFFd0000FF 007EFFb007EFFy0000FF 007EFFR007EFFa007EFFy007EFFE007EFFn007EFFg007EFFi007EFFn007EFFe007EFF™0000FF 0000FF ")
+	local x, y = math.floor(buffer.screen.width / 2 - logo.width / 2), math.floor(buffer.screen.height / 2 - logo.height / 2)
+	local function draw(transparency)
+		buffer.clear(0xF0F0F0);
+		buffer.image(x, y, logo)
+		buffer.square(1, 1, buffer.screen.width, buffer.screen.height, 0x000000, 0x000000, " ", transparency)
+		buffer.draw()
+		os.sleep(0)
+	end
+	for i = 20, 100, 20 do draw(i) end
+	os.sleep(1.5)
+	for i = 100, 20, -20 do draw(i) end
+end
+
+function rayEngine.compass(x, y)
+	if not rayEngine.compassImage then rayEngine.compassImage = image.fromString("1C190000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 553600▄373100▄543600▄373600▄543600▄373100▄540000 375400▄673700▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0055FF▄675400▄553700▄375500▄550000 375500▄540000 375400▄540000 373600▄310000 675500▄677E00▄375300▄365400▄373600▄540000 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 555400▄553700▄540000 543700▄540000 375300▄533100▄310B00▄310000 310000 360000 543100▄375300▄553100▄533600▄543200▄313600▄372A00▄373100▄0054FF▄0054FF▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 540000 543200▄540000 545300▄540600▄063100▄310000 315400▄365400▄373100▄313600▄530000 0000FF 0000FF 535400▄535400▄540000 365300▄533100▄065300▄310000 530600▄0054FF▄0000FF 0000FF 0000FF 0000FF 0000FF 530000 365300▄543600▄310600▄312A00▄2A5300▄365300▄543600▄540000 365300▄315300▄530000 0000FF 0000FF 535400▄540000 540000 313600▄363100▄540000 313600▄315300▄062A00▄543100▄0000FF 0000FF 0000FF 0000FF 315300▄533600▄312A00▄2A3100▄315300▄533600▄315400▄540000 535400▄540000 530000 533100▄0000FF 0000FF 540000 540000 315400▄540000 543100▄530000 543100▄313600▄2A0000 2A2900▄540000 0000FF 0000FF 0000FF 533100▄315400▄530000 062A00▄533100▄315300▄535400▄533100▄540000 315400▄543100▄530000 0000FF 0000FF 540000 535400▄315300▄535400▄363100▄535400▄530000 530000 312A00▄2A5300▄0054FF▀0000FF 0000FF 0000FF 312A00▄530000 553600▄2A5500▄2A0000 312A00▄533600▄545300▄315400▄535400▄540000 540000 0053FF▄0053FF▄540000 530000 535400▄535400▄545300▄530000 363100▄312A00▄313600▄545300▄0000FF 0000FF 0000FF 0000FF 530000 535400▄540000 545300▄555400▄315500▄315400▄533100▄543100▄530000 533100▄530000 535400▄535500▄533100▄535400▄315300▄533100▄533600▄315300▄530000 542A00▄312800▄0029FF▀0000FF 0000FF 0000FF 0000FF 530000 545500▄540000 555300▄535400▄530000 542A00▄545300▄365400▄530000 543600▄2A5400▄547E00▄550000 545300▄533600▄540000 530000 530000 542A00▄2A0000▄0029FF▀0000FF 0000FF 0000FF 0000FF 0000FF 530000 535400▄540000 540000 540000 545300▄530000 540000 2A5500▄545300▄292A00▄290000 292A00▄290000 295400▄292A00▄292A00▄290000 542A00▄543600▄285400▄0054FF▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 530000 533100▄540000 530000 535400▄0053FF▀0053FF▀542800▄542800▄532800▄2A2900▄542900▄532900▄542900▄542900▄532900▄542800▄2A2900▄2A2800▄532900▄552800▄542800▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 2A5300▄530000 535400▄540000 530000 532A00▀2A5300▄2A5500▄0029FF▀0028FF▀0028FF▀0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0028FF▀0028FF▀0028FF▀295300▄535500▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 535400▄545300▄530000 545300▄530000 2A0000 2A5300▄545300▄532A00▄542900▄532900▄2A2900▄2A2900▄2A2800▄2A2800▄2A2800▄2A2900▄2A2900▄532900▄532900▄2A2900▄542A00▄545300▄0054FF▄0054FF▄0000FF 0000FF 0000FF 545300▄530000 530000 545300▄2A5300▄532A00▄542900▄290000 295400▄297F00▄548100▄548100▄558100▄558100▄558100▄558100▄538100▄2A8100▄007E00▄295400▄2A2900▄295400▄2A2900▄290000 542A00▄557E00▄0000FF 0000FF 530000 2A0000 545300▄530000 532900▄285400▄2A8000▄7F8100▄810000 810000 810000 810000 810000 810000 812A00N810000 810000 810000 810000 810000 808100▄548100▄545500▄295300▄282900▄542900▄0000FF 0000FF 2A0000 2A0000 545300▄2A2900▄298000▄810000 810000 815500381550018155005810000 810000 810000 810000 810000 810000 810000 810000 81550048155005810000 810000 810000 558100▄2A5300▄282900▄0029FF▄0000FF 532A00▄2A0000 545300▄547E00▄810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 7F8000▄290000 292800▄0000FF 2A0000 2A0000 2A5300▄7E5300▄810000 812A00W810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 812A00E810000 807E00▄2A2900▄292800▄0000FF 2A0000 2A2900▄2A0000 2A0000 552A00▄810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 810000 815500▄542900▄280000 0028FF▀530000 2A0000 2A0000 290000 2A2900▄545300▄552A00▄815500▄810000 815500281550028155005810000 810000 810000 810000 810000 810000 810000 815500181550038155005817F00▄552900▄292800▄280000 282A00▄0000FF 530000 2A0000 540000 2A5300▄282A00▄290000 532900▄542A00▄542800▄552900▄7F5300▄815500▄817F00▄817F00▄810000 812A00S810000 817F00▄815500▄815500▄555400▄532900▄292800▄280000 282A00▄282A00▄530000 0000FF 532A00▄2A0000 530000 530000 2A5300▄290000 282900▄002900▄280000 280000 280000 290000 292A00▄2A2900▄542900▄532900▄2A0000 295300▄282900▄280000 280000 280000 282900▄295300▄295300▄2A5300▄552A00▄0000FF 530000 295300▄535400▄540000 535400▄540000 535400▄2A5500▄282900▄280000▄280000 280000▄290000▄2A2800▄2A2900▄552A00▄7E0000▄2A0000▄280000▄280000 280000▄280000▄002AFF▀002AFF▀002AFF▀002AFF▀0000FF 0000FF 532900▄532800▄0029FF▀0029FF▀0029FF▀0029FF▀0029FF▀0029FF▀0000FF 2A9800▄285500▄547E00▄7E5400▄7F5300▄7E2900▄7E2900▄552A00▄542A00▄2A5300▄282A00▄2A7E00▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF ") end	
+	buffer.image(x, y, rayEngine.compassImage)
+
+	x, y = x + 15, y + 17
+	local distance = 3.4
+	local northAngle = -rayEngine.player.rotation
+	local xScaleFactor = 2.2
+	local southPoint, northPoint = {}, {}
+	local northAngleRad = math.rad(northAngle)
+	northPoint.x, northPoint.y = round(x + math.sin(northAngleRad) * distance * xScaleFactor), round(y - math.cos(northAngleRad) * distance)
+	northAngleRad = math.rad(northAngle + 180)
+	southPoint.x, southPoint.y = round(x + math.sin(northAngleRad) * distance * xScaleFactor), round(y - math.cos(northAngleRad) * distance)
+	
+	y = y * 2
+	doubleHeight.line(x, y, northPoint.x, northPoint.y * 2, 0xFF5555)
+	doubleHeight.line(x, y, southPoint.x, southPoint.y * 2, 0xFFFFFF)
+	doubleHeight.set(x, y, 0x000000)
+end
+
+function rayEngine.watch(x, y)
+	if not rayEngine.watchImage then rayEngine.watchImage = image.fromString("20190000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0053FF▄552900▄673100▄7E2A00▄7E3100▄7E2A00▄7E3100▄672A00▄7E2A00▄672900▄7F3100▄7E2A00▄0053FF▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 313600▄290000 290600▄062900▄290000 062900▄290000 062900▄290000 290600▄062900▄2A2900▄2A0600▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 313600▄012900▄2A2900▄290000 012900▄290000 290000 012A00▄290000 290000 312900▄293100▄310600▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 310000 292800▄062A00▄290000 290100▄062900▄290000 290000 2C2900▄290600▄293100▄2A2900▄292800▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0054FF▄557F00▄012800▄290000 290000 292800▄290000 012900▄292800▄290600▄290000 292800▄290000 012800▄807E00▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF AB8100▄7F8000▄283100▄280000 015400▄318100▄005300▄065500▄315500▄282A00▄296700▄015500▄290000 002900▄677E00▄81AA00▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 807F00▄7F8000▄677E00▄812900▄672800▄542800▄2A0000▄2A0000▄815400▄ACAA00▄555400▄283100▄2A0000 312900▄672800▄7F5300▄7F0000 7F0000 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 007EFF▄817E00▄7E2900▄2A0000▄805300▄54AA00▄003100▄2A0000 310600▄532900▄312800▄532900▄360100▄552900▄672800▄7E2A00▄315500▄678000▄555300▄540000▄805400▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0081FF▄802900▄280100▄280000 285400▄310600▄532900▄290000 290000 290000 290000 29D700129D7002290000 290000 290000 282900▄062900▄2A2900▄550600▄556700▄285500▄542800▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0080FF▄557E00▄28AA00▄005500▄552900▄290000 290000 290000 29D700129D7001290000 290000 290000 290000 290000 290000 290000 29D7001290000 290000 290000 290000 672900▄318000▄297F00▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 543100▄002800▄553100▄7E2800▄290000 29D700129D7000290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 29D7002290000 290000 7E2900▄7E6700▄282900▄808100▄0000FF 0000FF 0000FF 0000FF 805500▄280000▄290000 310600▄290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 555400▄535400▄533100▄D58000▄0080FF▄0000FF 552900▀550000 54AB00▄558100▄290000 290000 29D7009290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 29D7003290000 315400▄548100▄067E00▄557F00▄806700▄ACAB00▄0055FF▀545500▄AB3100▄815400▄290100▄290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 545300▄AB5500▄815300▄558000▄558000▄0000FF 0000FF 538100▄002800▄290600▄290000 290000 290000 29D7008290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 29D7004290000 290000 530000 000000 286700▄0080FF▀0000FF 0000FF 0000FF 0000FF 292A00▄000100▄530000 285400▄290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 290000 296700▄063100▄280000 818000▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 550000 810000▄532800▄015300▄280000 292800▄290000 29D7007290000 290000 290000 290000 290000 290000 290000 290000 290000 29D7005290000 290100▄292A00▄065300▄7F0000▄802900▄81C900▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 549900▄002900▄292800▄312800▄290600▄283100▄290600▄292800▄290000 290000 290000 29D7006290000 290000 292800▄292800▄290000 285300▄2A0600▄362800▄280000 285500▄0081FF▀0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 7EAA00▄317E00▄005300▄547E00▄7F2900▄290000▄292A00▄063100▄283100▄295500▄286200▄285500▄012A00▄292A00▄310600▄540000▄807E00▄005500▄015500▄530000 0081FF▀0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 7E8100▄7E8000▄557F00▄317E00▄2A3600▄283100▄005400▄2A5300▄817E00▄AA7E00▄545300▄005300▄005400▄283100▄537E00▄548100▄7F0000 7E8000▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 819800▄807F00▄280000 002900▄312900▄7E2800▄292800▄532800▄552900▄280000 550100▄542800▄282900▄000100▄7E0000 AA9800▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 555300▄012800▄290000 062900▄290000 062900▄290000 062900▄290000 290000 290000 290600▄280000 007EFF▀0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 313600▄062900▄312900▄290000 012900▄293100▄290000 062900▄312900▄290600▄312900▄2A0000 2A2900▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 315400▄290600▄310000 062900▄290000 293100▄062900▄290000 293100▄290000 293100▄062900▄312A00▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0054FF▀285500▄285500▄015500▄285500▄285500▄015500▄295500▄015500▄285500▄015500▄285500▄065500▄0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF 0000FF ") end
+	
+	buffer.image(x, y, rayEngine.watchImage)
+	x, y = x + 15, y + 12
+
+	local realTimeInSeconds = rayEngine.world.dayNightCycle.currentTime * 86400 / rayEngine.world.dayNightCycle.length
+	local hours = realTimeInSeconds / 3600
+	local _, minutes = math.modf(hours)
+	local hourAngle = math.rad(hours * 360 / 12)
+	local minuteAngle = math.rad(minutes * 360)
+	local hourArrowLength, minuteArrowLength = 2.8, 4.5
+	local xMinute, yMinute = round(x + math.sin(minuteAngle) * minuteArrowLength * 2), round(y - math.cos(minuteAngle) * minuteArrowLength)
+	local xHour, yHour = round(x + math.sin(hourAngle) * hourArrowLength * 2), round(y - math.cos(hourAngle) * hourArrowLength)
+
+	y = y * 2
+	doubleHeight.line(x, y, xMinute, yMinute * 2, 0xEEEEEE)
+	doubleHeight.line(x, y, xHour, yHour * 2, 0xEEEEEE)
+end	
+
+local function addItemToChatHistory(text, color)
+	text = GUI.stringWrap({text}, rayEngine.chatPanelWidth - 2)
+	table.insert(rayEngine.chatHistory, {color = color, text = text})
+	if #rayEngine.chatHistory > rayEngine.chatHistoryLimit then table.remove(rayEngine.chatHistory, 1) end
+end
+
+function rayEngine.chat(transparency)
+	local x, y = 1, buffer.screen.height - rayEngine.chatPanelHeight - 3
+	buffer.square(x, y, rayEngine.chatPanelWidth, rayEngine.chatPanelHeight, 0x000000, 0xFFFFFF, " ", transparency or 50)
+	buffer.setDrawLimit(x, y, rayEngine.chatPanelWidth, rayEngine.chatPanelHeight)
+	local yMessage = y + rayEngine.chatPanelHeight - 1
+	x = x + 1
+
+	for message = #rayEngine.chatHistory, 1, -1 do
+		for line = #rayEngine.chatHistory[message].text, 1, -1 do
+			buffer.text(x, yMessage, rayEngine.chatHistory[message].color or 0xFFFFFF, rayEngine.chatHistory[message].text[line])
+			yMessage = yMessage - 1
+			if yMessage < y then buffer.resetDrawLimit(); return end
+		end
+	end
+
+	buffer.resetDrawLimit()
+end
+
+function rayEngine.commandLine(transparency)
+	transparency = transparency or 50
+	local inputPanelHeight = 3
+	local x, y = 1, buffer.screen.height - inputPanelHeight + 1
+	--Врубаем чат и рисуем все, включая его
+	rayEngine.chatEnabled = true
+	rayEngine.update()
+	--Рисуем панель ввода
+	buffer.square(x, y, buffer.screen.width, inputPanelHeight, 0x000000, 0xFFFFFF, " ", transparency)
+
+	--Ввод данных
+	local text = GUI.input(x + 2, y + 1, buffer.screen.width - 4, 0xFFFFFF, "")
+	local words = {}; for word in string.gmatch(text, "[^%s]+") do table.insert(words, word) end
+	if #words > 0 then
+		if unicode.sub(words[1], 1, 1) == "/" then
+			words[1] = unicode.sub(words[1], 2, -1)
+			if words[1] == "time" then
+				if words[2] == "set" and words[3] and tonumber(words[3]) then
+					local newTime = tonumber(words[3])
+					if newTime < 0 or newTime > rayEngine.world.dayNightCycle.length then
+						addItemToChatHistory("Время не может быть отрицательным и превышать длину суток (" .. rayEngine.world.dayNightCycle.length .. " секю)", 0xFF8888)
+					else
+						rayEngine.world.dayNightCycle.currentTime = math.floor(newTime)
+						addItemToChatHistory("Время успешно изменено на: " .. newTime, 0xFFDB40)
+					end
+				elseif words[2] == "get" then
+					addItemToChatHistory("Текущее время: " .. rayEngine.world.dayNightCycle.currentTime, 0xFFDB40)
+					addItemToChatHistory("Длина суток: " .. rayEngine.world.dayNightCycle.length, 0xFFDB40)
+				end
+			elseif words[1] == "help" then
+				addItemToChatHistory("Доступные команды:", 0xFFDB40)
+				addItemToChatHistory("/time get", 0xFFFFBF)
+				addItemToChatHistory("/time set <value>", 0xFFFFBF)
+			else
+				addItemToChatHistory("Неизвестная команда. Введите /help для получения списка команд", 0xFF8888)
+			end
+		else
+			addItemToChatHistory("Вы написали: " .. text, 0xFFFFFF)
+		end
+	end
+
+	--Активируем таймер
+	if rayEngine.chatTimer then event.cancel(rayEngine.chatTimer) end
+	rayEngine.chatEnabled = true
+	rayEngine.chatTimer = event.timer(rayEngine.chatShowTime, function() rayEngine.chatEnabled = false; rayEngine.chatTimer = nil; update() end)
+end
+
+function rayEngine.toggleMinimap()
+	rayEngine.minimapEnabled = not rayEngine.minimapEnabled
+end
+
+function rayEngine.toggleCompass()
+	rayEngine.compassEnabled = not rayEngine.compassEnabled
+	if not rayEngine.compassEnabled then rayEngine.compassImage = nil end
+end
+
+function rayEngine.toggleWatch()
+	rayEngine.watchEnabled = not rayEngine.watchEnabled
+	if not rayEngine.watchEnabled then rayEngine.watchImage = nil end
+end
+
+---------------------------------------------------- Функции отрисовки мира ------------------------------------------------------------------
+
+local function hRaycast(player, angle)
+	local rayInTop = math.sin( angle ) > 0
+
+	local tanAng = math.tan( angle )
+
+	local Ay = math.floor(rayEngine.player.position.y / rayEngine.tileWidth) * rayEngine.tileWidth; Ay = Ay + ( (rayInTop) and -1 or rayEngine.tileWidth )
+	local Ax = rayEngine.player.position.x + (rayEngine.player.position.y - Ay) / tanAng
+
+	local Ya = (rayInTop) and -rayEngine.tileWidth or rayEngine.tileWidth
+	local Xa = rayEngine.tileWidth / tanAng; Xa = Xa * ( (rayInTop) and 1 or -1 )
+
+	local x, y = math.floor(Ax / rayEngine.tileWidth), math.floor(Ay / rayEngine.tileWidth)
+
+	while (rayEngine.map[y + 1] and not rayEngine.map[y + 1][x + 1]) do
+		Ax = Ax + Xa; Ay = Ay + Ya
+
+		if (Ax < 0 or Ax > rayEngine.tileWidth * rayEngine.map.width or Ay < 0 or Ay > rayEngine.tileWidth * rayEngine.map.height) then
+			break
+		end
+
+		x, y = math.floor(Ax / rayEngine.tileWidth), math.floor(Ay / rayEngine.tileWidth)
+	end
+
+	return math.abs(rayEngine.player.position.x - Ax) / math.abs(math.cos( angle ))
+end
+
+local function vRaycast(player, angle)
+	local rayInRight = math.cos( angle ) > 0
+
+	local tanAng = math.tan( angle )
+
+	local Bx = math.floor(rayEngine.player.position.x / rayEngine.tileWidth) * rayEngine.tileWidth; Bx = Bx + ( (rayInRight) and rayEngine.tileWidth or -1 )
+	local By = rayEngine.player.position.y + (rayEngine.player.position.x - Bx) * tanAng
+
+	local Xa = (rayInRight) and rayEngine.tileWidth or -rayEngine.tileWidth
+	local Ya = rayEngine.tileWidth * tanAng; Ya = Ya * ( (rayInRight) and -1 or 1 )
+
+	local x, y = math.floor(Bx / rayEngine.tileWidth), math.floor(By / rayEngine.tileWidth)
+
+	while (rayEngine.map[y + 1] and not rayEngine.map[y + 1][x + 1]) do
+		Bx = Bx + Xa; By = By + Ya
+
+		if (Bx < 0 or Bx > rayEngine.tileWidth * rayEngine.map.width or By < 0 or By > rayEngine.tileWidth * rayEngine.map.height) then
+			break
+		end
+
+		x, y = math.floor(Bx / rayEngine.tileWidth), math.floor(By / rayEngine.tileWidth)
+	end
+
+	return math.abs(rayEngine.player.position.y - By) / math.abs(math.sin( angle ))
+end
+
+function rayEngine.drawWorld()
+	buffer.clear(rayEngine.world.colors.groundByTime)
+	buffer.square(1, 1, buffer.screen.width, rayEngine.horizonPosition, rayEngine.world.colors.sky.current)
+
+	local startColumn = rayEngine.player.rotation - (rayEngine.player.fieldOfView / 2)
+	local endColumn = rayEngine.player.rotation + (rayEngine.player.fieldOfView / 2)
+	local step = rayEngine.player.fieldOfView / buffer.screen.width
+
+	local startX = 1
+	local distanceLimit = buffer.screen.height * 0.85
+	local hDist, vDist, dist, height, startY, tileColor
+	for angle = startColumn, endColumn, step do
+		hDist = hRaycast(player, convertDegreesToRadians(angle) )
+		vDist = vRaycast(player, convertDegreesToRadians(angle) )
+
+		-- local dist = math.min( hDist, vDist ) * math.cos( convertDegreesToRadians(angle) )
+		dist = math.min( hDist, vDist )
+		height = rayEngine.tileWidth / dist * rayEngine.distanceToProjectionPlane
+		startY = buffer.screen.height / 2 - height / 2 + 1 + rayEngine.wallsPosition
+
+		--Рисуем сценку
+		tileColor = height > distanceLimit and rayEngine.world.colors.tile.byTime[#rayEngine.world.colors.tile.byTime] or rayEngine.world.colors.tile.byTime[math.floor(#rayEngine.world.colors.tile.byTime * height / distanceLimit)]
+		buffer.square(math.floor(startX), math.floor(startY), 1, height, tileColor, 0x000000, " ")
+		-- buffer.square(math.floor(startX), math.floor(startY), 1, height, 0x000000, 0x000000, " ")
+		startX = startX + 1
+	end
+
+	doDayNightCycle()
+end
+
+function rayEngine.update()
+	rayEngine.drawWorld()
+	if rayEngine.minimapEnabled then rayEngine.drawMap(3, 2, 25, 13, 50) end
+	local xTools, yTools = 3, buffer.screen.height - 25
+	if rayEngine.compassEnabled then rayEngine.compass(xTools, yTools); xTools = xTools + 30 end
+	if rayEngine.watchEnabled then rayEngine.watch(xTools, yTools) end
+	--rayEngine.drawWeapon()
+	if rayEngine.chatEnabled then rayEngine.chat() end
+	buffer.draw()
+end
+
+----------------------------------------------------------------------------------------------------------------------------------
+
+return rayEngine