From 1e75359ad1b284b30b1d00a9d9ec9708b0c7c5c4 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Sun, 19 Jun 2016 14:20:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A5=D1=83=D1=83=D1=83=D1=83=D1=83=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.txt                              |  4 +-
 .../RayWalk/Worlds/ExampleWorld/Blocks.cfg    |  4 ++
 .../RayWalk/Worlds/ExampleWorld/Map.cfg       | 59 +++++++++++--------
 .../RayWalk/Worlds/SundownBeams/Blocks.cfg    | 14 ++++-
 lib/rayEngine.lua                             |  4 +-
 5 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/Applications.txt b/Applications.txt
index c3763a61..6ce10545 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -273,7 +273,7 @@
     name="lib/rayEngine.lua",
     url="IgorTimofeev/OpenComputers/master/lib/rayEngine.lua",
     type="Library",
-    version=1.30,
+    version=1.31,
   },
   {
     name="lib/doubleHeight.lua",
@@ -553,7 +553,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic",
     createShortcut="desktop",
-    version=1.48,
+    version=1.49,
     resources={
       {
         name="RayEngine.cfg",
diff --git a/Applications/RayWalk/Worlds/ExampleWorld/Blocks.cfg b/Applications/RayWalk/Worlds/ExampleWorld/Blocks.cfg
index b58a9534..edc7dd40 100644
--- a/Applications/RayWalk/Worlds/ExampleWorld/Blocks.cfg
+++ b/Applications/RayWalk/Worlds/ExampleWorld/Blocks.cfg
@@ -1,4 +1,8 @@
 {
+	{
+		color = 0xFFFFFF,
+		canBeDestroyed = false,
+	},
 	{
 		color = 0xFFFFFF,
 		canBeDestroyed = true,
diff --git a/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg b/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg
index 0eab38d5..6c03aaea 100644
--- a/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg
+++ b/Applications/RayWalk/Worlds/ExampleWorld/Map.cfg
@@ -1,28 +1,35 @@
 {
-	{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, 0x1, 0x1, 0x1, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x4, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x3, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, 0x1, 0x1, 0x1, 0x1, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
-	{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 },
+	{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x3, 0x2, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, 0x2, 0x2, 0x2, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x5, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x4, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x3, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, 0x2, 0x2, 0x2, 0x2, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x3, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x3, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x4, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, 0x2, 0x4, 0x4, 0x2, nil, 0x2, 0x2, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x1 },
+	{ 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 },
 }
\ No newline at end of file
diff --git a/Applications/RayWalk/Worlds/SundownBeams/Blocks.cfg b/Applications/RayWalk/Worlds/SundownBeams/Blocks.cfg
index 7c6e6f07..edc7dd40 100644
--- a/Applications/RayWalk/Worlds/SundownBeams/Blocks.cfg
+++ b/Applications/RayWalk/Worlds/SundownBeams/Blocks.cfg
@@ -1,4 +1,8 @@
 {
+	{
+		color = 0xFFFFFF,
+		canBeDestroyed = false,
+	},
 	{
 		color = 0xFFFFFF,
 		canBeDestroyed = true,
@@ -8,7 +12,15 @@
 		canBeDestroyed = true,
 	},
 	{
-		color = 0x55FF55,
+		color = 0x88FF88,
+		canBeDestroyed = true,
+	},
+	{
+		color = 0xFF88FF,
+		canBeDestroyed = true,
+	},
+	{
+		color = 0xFFEE60,
 		canBeDestroyed = true,
 	},
 }
\ No newline at end of file
diff --git a/lib/rayEngine.lua b/lib/rayEngine.lua
index b086cfe3..a2f517d8 100644
--- a/lib/rayEngine.lua
+++ b/lib/rayEngine.lua
@@ -215,12 +215,12 @@ end
 
 function rayEngine.destroy(distance)
 	local xBlock, yBlock = getBlockCoordsByLook(distance)
-	rayEngine.map[yBlock][xBlock] = nil
+	if rayEngine.map[yBlock] and rayEngine.map[yBlock][xBlock] and rayEngine.blocks[rayEngine.map[yBlock][xBlock]] and rayEngine.blocks[rayEngine.map[yBlock][xBlock]].canBeDestroyed then rayEngine.map[yBlock][xBlock] = nil end
 end
 
 function rayEngine.place(distance, blockColor)
 	local xBlock, yBlock = getBlockCoordsByLook(distance)
-	rayEngine.map[yBlock][xBlock] = blockColor or 0x0
+	if rayEngine.map[yBlock] and rayEngine.map[yBlock][xBlock] == nil then rayEngine.map[yBlock][xBlock] = blockColor end
 end
 
 ---------------------------------------------------- Функции интерфейса ------------------------------------------------------------------