From f03e780e96a913ebd4fbd2519286fb5dee031dbc Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Sun, 19 Jun 2016 01:23:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B5=D0=B1=D0=B0=D1=82=D1=8C=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B8=D1=82,=20=D0=B1=D0=BB=D1=8F=D0=B4=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.txt                              | 110 +++++++++++-------
 Applications/RayWalk/RayWalk.lua              |  18 ++-
 .../Weapons/CrosshairTextures/Angled.pic      | Bin 0 -> 93 bytes
 .../Weapons/CrosshairTextures/Default.pic     | Bin 0 -> 78 bytes
 .../Weapons/CrosshairTextures/Half.pic        | Bin 0 -> 67 bytes
 .../Weapons/FireTextures/PowderFire.pic       | Bin 0 -> 4287 bytes
 .../RayWalk/Weapons/WeaponTextures/Pistol.pic | Bin 0 -> 3870 bytes
 .../RayWalk/Weapons/WeaponTextures/Rifle.pic  | Bin 0 -> 5065 bytes
 .../RayWalk/Weapons/WeaponTextures/Sniper.pic | Bin 0 -> 7190 bytes
 Applications/RayWalk/Weapons/Weapons.cfg      |  35 ++++++
 .../RayWalk/Worlds/ExampleWorld/Player.cfg    |   4 +
 .../RayWalk/Worlds/ExampleWorld/World.cfg     |   2 +-
 .../RayWalk/Worlds/ForeverDay/Map.cfg         |  28 -----
 .../RayWalk/Worlds/ForeverDay/Player.cfg      |  13 ---
 .../RayWalk/Worlds/ForeverDay/World.cfg       |  59 ----------
 .../RayWalk/Worlds/SundownBeams/Player.cfg    |   4 +
 lib/rayEngine.lua                             |  55 ++++++++-
 17 files changed, 183 insertions(+), 145 deletions(-)
 create mode 100644 Applications/RayWalk/Weapons/CrosshairTextures/Angled.pic
 create mode 100644 Applications/RayWalk/Weapons/CrosshairTextures/Default.pic
 create mode 100644 Applications/RayWalk/Weapons/CrosshairTextures/Half.pic
 create mode 100644 Applications/RayWalk/Weapons/FireTextures/PowderFire.pic
 create mode 100644 Applications/RayWalk/Weapons/WeaponTextures/Pistol.pic
 create mode 100644 Applications/RayWalk/Weapons/WeaponTextures/Rifle.pic
 create mode 100644 Applications/RayWalk/Weapons/WeaponTextures/Sniper.pic
 create mode 100644 Applications/RayWalk/Weapons/Weapons.cfg
 delete mode 100644 Applications/RayWalk/Worlds/ForeverDay/Map.cfg
 delete mode 100644 Applications/RayWalk/Worlds/ForeverDay/Player.cfg
 delete mode 100644 Applications/RayWalk/Worlds/ForeverDay/World.cfg

diff --git a/Applications.txt b/Applications.txt
index 98a58a23..f311781d 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -546,45 +546,77 @@
       },
     },
   },
-  -- {
-  --   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/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.45,
+    resources={
+      {
+        name="RayEngine.cfg",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayEngine.cfg",
+      },
+------------
+      {
+        name="Weapons/CrosshairTextures/Angled.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/CrosshairTextures/Angled.pic",
+      },
+      {
+        name="Weapons/CrosshairTextures/Default.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/CrosshairTextures/Default.pic",
+      },
+      {
+        name="Weapons/CrosshairTextures/Half.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/CrosshairTextures/Half.pic",
+      },
+------------
+      {
+        name="Weapons/FireTextures/PowderFire.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/FireTextures/PowderFire.pic",
+      },
+------------
+      {
+        name="Weapons/WeaponTextures/Pistol.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/WeaponTextures/Pistol.pic",
+      },
+      {
+        name="Weapons/WeaponTextures/Sniper.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/WeaponTextures/Sniper.pic",
+      },
+      {
+        name="Weapons/WeaponTextures/Rifle.pic",
+        url="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Weapons/WeaponTextures/Rifle.pic",
+      },
+------------
+      {
+        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/RayWalk.lua b/Applications/RayWalk/RayWalk.lua
index f26e4ea0..31a355f7 100644
--- a/Applications/RayWalk/RayWalk.lua
+++ b/Applications/RayWalk/RayWalk.lua
@@ -11,6 +11,9 @@ local libraries = {
 }
 
 for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil
+
+----------------------------------------------------------------------------------------------------------------------------------
+
 local applicationPath = "MineOS/Applications/RayWalk.app/Resources/"
 local worldsPath = applicationPath .. "Worlds/"
 local rayWalkVersion = "RayWalk v3.2 closed beta"
@@ -82,7 +85,8 @@ local controls = {
 
 buffer.start()
 -- rayEngine.intro()
-rayEngine.init(applicationPath .. "RayEngine.cfg")
+rayEngine.loadEngine(applicationPath .. "RayEngine.cfg")
+rayEngine.loadWeapons(applicationPath .. "Weapons/")
 rayEngine.loadWorld(worldsPath .. "ExampleWorld")
 menu()
 rayEngine.update()
@@ -92,9 +96,17 @@ while (true) do
 
 	if ( e[1] ) then
 		if e[1] == "touch" then
-			if e[5] == 1 then rayEngine.place(3) else rayEngine.destroy(3) end
+			if e[5] == 1 then 
+				if not rayEngine.currentWeapon then rayEngine.place(3) end
+			else
+				if rayEngine.currentWeapon then rayEngine.fire() else rayEngine.destroy(3) end
+			end
 		else
-			if controls[e[1]] and controls[e[1]][e[4]] then controls[e[1]][e[4]]() end
+			if e[4] > 1 and e[4] < 10 then
+				rayEngine.changeWeapon(e[4] - 2)
+			else
+				if controls[e[1]] and controls[e[1]][e[4]] then controls[e[1]][e[4]]() end
+			end
 		end
 	end
 
diff --git a/Applications/RayWalk/Weapons/CrosshairTextures/Angled.pic b/Applications/RayWalk/Weapons/CrosshairTextures/Angled.pic
new file mode 100644
index 0000000000000000000000000000000000000000..301892fdd6947caf10eee6486f090a3628bb9041
GIT binary patch
literal 93
zcmXwvyA6Oa3<drC9M8cj1St{~MJjKTAz%;~iABOkN_D!^ZOdBBIm3FzR3KR>;egVT
dhv~;Kg60+XaTfF}kO0%`dmFBbf4D{f^#S4h5yt=k

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/CrosshairTextures/Default.pic b/Applications/RayWalk/Weapons/CrosshairTextures/Default.pic
new file mode 100644
index 0000000000000000000000000000000000000000..e997c9a31f90854ce5a98bc97902e7ef90922c8f
GIT binary patch
literal 78
zcmW-Y!3}^g48-DGx(BOJq)NPa^p$ZCD=;C86w1%C>|@(o6s>4<mWEZ6Wq?OXTp60!
UdG4z*s<|a7k)}I;$9MS5UIE?>djJ3c

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/CrosshairTextures/Half.pic b/Applications/RayWalk/Weapons/CrosshairTextures/Half.pic
new file mode 100644
index 0000000000000000000000000000000000000000..465c6f47234a6471b31c4958b632f6456df4135d
GIT binary patch
literal 67
zcmeZw_H<)mWpZR>{vXV!;Ks<{#K6Q5$;ikY$->0Q#KIcP_-IPA8{>Z`21cMT6Ele4
L2;;Lbf|LLNr#K9(

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/FireTextures/PowderFire.pic b/Applications/RayWalk/Weapons/FireTextures/PowderFire.pic
new file mode 100644
index 0000000000000000000000000000000000000000..f91c3c47e377329c865420779734f7069e8eb676
GIT binary patch
literal 4287
zcmb`KUvAq*5XRFJ^a#~a2oxyLryilYiTTho6n)bz)I1bbiXsSW5C~v6GAy=XRd{8{
z2;)aRPQUrTOcf+4Vi4wVx!j%k&9}3w@4o)_n=iil@`?P>;&a_EhhGnmug{K0!+5qG
zQ)hes^RvF&<nz_l)!}f+XLNpebt%t%-_P1-<9x1oFwWukZZ=Pu5JwqCT=Vup{ibOp
z?ZnRrx=h+$_!<Aox}|@9`~jc$>y=v3hM{egv(dbK-pQ;tf4#h$&Qm`7-KWwx-uyw+
z-|+s=y^kl^L+BC(oQx>KTDNF>g2<>_mi3Y?+)CGo)%n{#`k^}>v|mg1Mc4M7x0Oyt
zp=nb(W9GBLE%C%7!$U>W7z(Rl7>>u|EK?rS`|k9PvfzMxFXJJd?#+6IIn95Iouf<t
zor1?+)(t5S+{{9dGzcRgKnLUIZ<(M_sQL|!eIb1HEmKXal~E!~aMMV0$g0CpqDM#)
z6&~ci+wHLARKM>~kpB0V&+Z<_q{+GA@i2oCK=_uystuC2Tn-*BLM^*S{7eEInM8pb
zO=dM_K}s~q7YN_2sUgySX~kP+rgJcFrCf0g-l9nz1v<6-v7%IUnejoX-QV8}jqB^{
zhlhuxfktWfyJ*GNxV!-*=Tup~O5mlf7mm<Wfn{h>R}n6~jg~|$Q^d_lRBabTBfmYJ
zo}Nx8?YBCeZq&lJqF*9VRI*cy#}tJLb9aR{<O=mTgq?VRz)WRa^}M#JzPNmFz1(iM
zUeE7#m5$K8?{qDNYAaT#D7J2bOJN$~^Qrt~5uFO6d^)F5Xo)M@#8ZF@R&DU3AVm1%
zFVJ8X(WYjl<4vt=6jtcAs0D}3XDm#wZb4{9EfhEQ>kaP+%n!RDELRd>seY!B_eZ<|
zE?lsXh*dFmF+NuYuf~m46-dVONEhxot45h1^HZwf;(f$KNunR2Ga9GhJ_e^4nKRJH
zcsz&BmU(1Lc}8^<@8t^wK~YalUBG3rWnIJ0q<r3v<*n+9SYKY>svQgUNvrle2VOnB
zE>|ls^IWa5RVXNxQAO-jLE6=q7W!$#Nk0?`vDUfKe#o5H0K644@Gta*3`;+*y|JSP
zBW@F&bgUDxs@>Aor|YZ3?#B9RQP!<u%__Ui14`;ycv0~}o7D^C+j5HvV}3&oVFd@!
z+^CYOI%TyBokCqpuTz<ctct1csqr~dXR#tgT^a{!u&N7)j9k_(UwgbU+F4JkJw3iY
zY@h$P>hl<`RjfW)OGrZ9)^d#4fh;#jpw-igUgVl9T#|BY73!ei<CUwfS5TV}rD;LK
z!d9Q>C8>m!dO{rGpL>r|<2A-~k@d$p0g@=@`051^B_BY$zt%ImDhm6loT1k^&571>
zES~!VwM;XI>Z+O-zojiBV9R&U?*YJ+6*M=&5OuH-HsIhV)p}$bg=@LY(N`)08_%)x
z8k`qakDQB$Pt3gLqLLGiPxT2Z==HtQJ05WelV1wQ?Tf5n-Ve*uRw(PuR(7aNa_3&f
zIV|#--iHSH%wg4ISXh+chfB0NG`+2KRA=p{^U7P^ms_<kht4Y}D6SxNR{5knt15hM
zTp_witBgnYv3DF&h1Qw=<xQo%^ug81XEHefL(z~j@1)5wPJeZbP^82tr!!MQ5RKC=
zBwz%99hVZ==x*IY2Yf9mfA{-+KGPdrJJoxb`Tqa51BQ=t_V;q~NnHsc**iD;Uw%W5
ma^H~3ppkiu61PTMarB+$_V!lh=XFq@_h?eT0KxtHr2D_88b(n7

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/WeaponTextures/Pistol.pic b/Applications/RayWalk/Weapons/WeaponTextures/Pistol.pic
new file mode 100644
index 0000000000000000000000000000000000000000..806f1d6da13a1b06a063b30162503b35df75d26f
GIT binary patch
literal 3870
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

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/WeaponTextures/Rifle.pic b/Applications/RayWalk/Weapons/WeaponTextures/Rifle.pic
new file mode 100644
index 0000000000000000000000000000000000000000..508586282cea28aa30bb2c000361a35e1a06acab
GIT binary patch
literal 5065
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
HTy*{o`%T{7

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/WeaponTextures/Sniper.pic b/Applications/RayWalk/Weapons/WeaponTextures/Sniper.pic
new file mode 100644
index 0000000000000000000000000000000000000000..926953e20287dbea395a1ee716e20161b311e7a5
GIT binary patch
literal 7190
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

literal 0
HcmV?d00001

diff --git a/Applications/RayWalk/Weapons/Weapons.cfg b/Applications/RayWalk/Weapons/Weapons.cfg
new file mode 100644
index 00000000..517be9f3
--- /dev/null
+++ b/Applications/RayWalk/Weapons/Weapons.cfg
@@ -0,0 +1,35 @@
+{
+	{
+		name = "USP-5",
+		damage = 25,
+		weaponTexture = "WeaponTextures/Pistol.pic",
+		fireTexture = "FireTextures/PowderFire.pic",
+		firePosition = {
+			x = -1,
+			y = -4,
+		},
+		crosshairTexture = "CrosshairTextures/Default.pic",
+	},
+	{
+		name = "MAG20-USP",
+		damage = 48,
+		weaponTexture = "WeaponTextures/Rifle.pic",
+		fireTexture = "FireTextures/PowderFire.pic",
+		firePosition = {
+			x = 1,
+			y = -1,
+		},
+		crosshairTexture = "CrosshairTextures/Half.pic",
+	},
+	{
+		name = "UberSniper228",
+		damage = 100,
+		weaponTexture = "WeaponTextures/Sniper.pic",
+		fireTexture = "FireTextures/PowderFire.pic",
+		firePosition = {
+			x = -5,
+			y = 1,
+		},
+		crosshairTexture = "CrosshairTextures/Angled.pic",
+	},
+}
\ No newline at end of file
diff --git a/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg b/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg
index a43d74fe..777a7e19 100644
--- a/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg
+++ b/Applications/RayWalk/Worlds/ExampleWorld/Player.cfg
@@ -3,6 +3,10 @@
 		x = 5,
 		y = 5,
 	},
+	health = {
+		maximum = 100,
+		current = 100,
+	},
 	isCrouched = false,
 	jumpHeight = 10,
 	moveSpeed = 16,
diff --git a/Applications/RayWalk/Worlds/ExampleWorld/World.cfg b/Applications/RayWalk/Worlds/ExampleWorld/World.cfg
index a52f11c8..81b76a9c 100644
--- a/Applications/RayWalk/Worlds/ExampleWorld/World.cfg
+++ b/Applications/RayWalk/Worlds/ExampleWorld/World.cfg
@@ -1,7 +1,7 @@
 {
 	dayNightCycle = {
 		enabled = true,
-		currentTime = 90,
+		currentTime = 100,
 		speed = 1,
 		length = 300,
 	},
diff --git a/Applications/RayWalk/Worlds/ForeverDay/Map.cfg b/Applications/RayWalk/Worlds/ForeverDay/Map.cfg
deleted file mode 100644
index 74dde403..00000000
--- a/Applications/RayWalk/Worlds/ForeverDay/Map.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 0x0 },
-	{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 },
-}
\ No newline at end of file
diff --git a/Applications/RayWalk/Worlds/ForeverDay/Player.cfg b/Applications/RayWalk/Worlds/ForeverDay/Player.cfg
deleted file mode 100644
index a43d74fe..00000000
--- a/Applications/RayWalk/Worlds/ForeverDay/Player.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	position = {
-		x = 5,
-		y = 5,
-	},
-	isCrouched = false,
-	jumpHeight = 10,
-	moveSpeed = 16,
-	rotationSpeed = 5,
-	crouchHeight = 10,
-	fieldOfView = 60,
-	rotation = 0,
-}
\ No newline at end of file
diff --git a/Applications/RayWalk/Worlds/ForeverDay/World.cfg b/Applications/RayWalk/Worlds/ForeverDay/World.cfg
deleted file mode 100644
index 99f62b94..00000000
--- a/Applications/RayWalk/Worlds/ForeverDay/World.cfg
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	dayNightCycle = {
-		enabled = false,
-		currentTime = 90,
-		speed = 1,
-		length = 200,
-	},
-	colors = {
-		ground = 0xEEEEEE,
-		clouds = 0xFFFFFF,
-		sky = {
-			0x002440,
-			0x002480,
-			0x3349BF,
-			0x6692FF,
-			0x99DBFF,
-			0x99DBFF,
-			0x99DBFF,
-			0x66B6FF,
-			0x66B6FF,
-			0xFFDB80,
-			0xFFB640,
-			0xCCBD00,
-			0x000080,
-			0x002440,
-		},
-		brightnessMultiplyer = {
-			20,
-			40,
-			60,
-			80,
-			100,
-			100,
-			100,
-			80,
-			80,
-			70,
-			60,
-			50,
-			40,
-			30,
-		},
-		tile = {
-			0x000000,
-			0x111111,
-			0x222222,
-			0x333333,
-			0x444444,
-			0x555555,
-			0x666666,
-			0x777777,
-			0x888888,
-			0x999999,
-			0xAAAAAA,
-			0xBBBBBB,
-			0xCCCCCC,
-		},
-	},
-}
\ No newline at end of file
diff --git a/Applications/RayWalk/Worlds/SundownBeams/Player.cfg b/Applications/RayWalk/Worlds/SundownBeams/Player.cfg
index a43d74fe..777a7e19 100644
--- a/Applications/RayWalk/Worlds/SundownBeams/Player.cfg
+++ b/Applications/RayWalk/Worlds/SundownBeams/Player.cfg
@@ -3,6 +3,10 @@
 		x = 5,
 		y = 5,
 	},
+	health = {
+		maximum = 100,
+		current = 100,
+	},
 	isCrouched = false,
 	jumpHeight = 10,
 	moveSpeed = 16,
diff --git a/lib/rayEngine.lua b/lib/rayEngine.lua
index 84339ee6..713f8f33 100644
--- a/lib/rayEngine.lua
+++ b/lib/rayEngine.lua
@@ -88,14 +88,39 @@ local function getBlockCoordsByLook(distance)
 	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.changeWeapon(weaponID)
+	if rayEngine.weapons[weaponID] then 
+		rayEngine.currentWeapon = {
+			damage = rayEngine.weapons[weaponID].damage,
+			weaponTexture = image.load(rayEngine.weaponsFolder .. rayEngine.weapons[weaponID].weaponTexture),
+			fireTexture = image.load(rayEngine.weaponsFolder .. rayEngine.weapons[weaponID].fireTexture),
+			crosshairTexture = image.load(rayEngine.weaponsFolder .. rayEngine.weapons[weaponID].crosshairTexture)
+		}
+		rayEngine.currentWeapon.xWeapon = buffer.screen.width - rayEngine.currentWeapon.weaponTexture.width + 1
+		rayEngine.currentWeapon.yWeapon = buffer.screen.height - rayEngine.currentWeapon.weaponTexture.height + 1
+		rayEngine.currentWeapon.xFire = rayEngine.currentWeapon.xWeapon + rayEngine.weapons[weaponID].firePosition.x
+		rayEngine.currentWeapon.yFire = rayEngine.currentWeapon.yWeapon + rayEngine.weapons[weaponID].firePosition.y
+		rayEngine.currentWeapon.xCrosshair = math.floor(buffer.screen.width / 2 - rayEngine.currentWeapon.crosshairTexture.width / 2)
+		rayEngine.currentWeapon.yCrosshair = math.floor(buffer.screen.height / 2 - rayEngine.currentWeapon.crosshairTexture.height / 2)
+	else
+		rayEngine.currentWeapon = nil
+	end
+end
+
 ---------------------------------------------------- Работа с файлами ------------------------------------------------------------------
 
 --Грузим базовый конфиг движка
-function rayEngine.init(pathToRayEnginePropertiesFile)
+function rayEngine.loadEngine(pathToRayEnginePropertiesFile)
 	rayEngine.properties = files.loadTableFromFile(pathToRayEnginePropertiesFile)
 	rayEngine.properties.raycastQuality = rayEngine.properties.raycastQuality * rayEngine.properties.tileWidth
 end
 
+function rayEngine.loadWeapons(pathToWeaponsFolder)
+	rayEngine.weaponsFolder = pathToWeaponsFolder
+	rayEngine.weapons = files.loadTableFromFile(rayEngine.weaponsFolder .. "Weapons.cfg")
+	rayEngine.changeWeapon(1)
+end
+
 --Загружаем все конфиг-файлы мира
 function rayEngine.loadWorld(pathToWorldFolder)
 	rayEngine.world = files.loadTableFromFile(pathToWorldFolder .. "/World.cfg")
@@ -381,6 +406,21 @@ function rayEngine.toggleWatch()
 	if not rayEngine.watchEnabled then rayEngine.watchImage = nil end
 end
 
+function rayEngine.drawWeapon()
+	if rayEngine.currentWeapon.needToFire then buffer.image(rayEngine.currentWeapon.xFire, rayEngine.currentWeapon.yFire, rayEngine.currentWeapon.fireTexture); rayEngine.currentWeapon.needToFire = false end
+	buffer.image(rayEngine.currentWeapon.xWeapon, rayEngine.currentWeapon.yWeapon, rayEngine.currentWeapon.weaponTexture)
+	buffer.image(rayEngine.currentWeapon.xCrosshair, rayEngine.currentWeapon.yCrosshair, rayEngine.currentWeapon.crosshairTexture)
+end
+
+function rayEngine.drawStats()
+	local width = math.floor(buffer.screen.width * 0.3)
+	local height = 5
+	local x, y = buffer.screen.width - width - 1, 2
+	buffer.square(x, y, width, height, 0x000000, 0xFFFFFF, " ", 50)
+
+	GUI.progressBar(x + 1, y + 4, width - 2, 1, 0x000000, 0xFF5555, rayEngine.player.health.current, rayEngine.player.health.maximum, true)
+end
+
 ---------------------------------------------------- Функции отрисовки мира ------------------------------------------------------------------
 
 local function raycast(angle)
@@ -425,6 +465,7 @@ function rayEngine.drawWorld()
 
 			--Кусочек стенки
 			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)]
+			-- tileColor = 0x000000
 			buffer.square(math.floor(startX), math.floor(startY), 1, math.floor(height), tileColor, 0x000000, " ")
 		end
 		startX = startX + 1
@@ -433,11 +474,12 @@ end
 
 function rayEngine.update()
 	rayEngine.drawWorld()
+	if rayEngine.currentWeapon then rayEngine.drawWeapon() end
 	if rayEngine.minimapEnabled then rayEngine.drawMap(3, 2, 25, 13, 50) end
+	-- rayEngine.drawStats()
 	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
 	doDayNightCycle()
 	buffer.draw()
@@ -445,4 +487,13 @@ end
 
 ----------------------------------------------------------------------------------------------------------------------------------
 
+function rayEngine.fire()
+	rayEngine.currentWeapon.needToFire = true
+	rayEngine.update()
+	os.sleep(0.1)
+	rayEngine.update()
+end
+
+----------------------------------------------------------------------------------------------------------------------------------
+
 return rayEngine