From 81404a51da0c9b4547faed5b807e1f30d2686bd3 Mon Sep 17 00:00:00 2001
From: Doom-JSlayer <dol_pashenka@mail.ru>
Date: Tue, 6 May 2025 17:13:14 +0300
Subject: [PATCH 1/3] update: movement

---
 __pycache__/fill_level.cpython-313.pyc | Bin 2934 -> 2962 bytes
 main.py                                |  32 +++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/__pycache__/fill_level.cpython-313.pyc b/__pycache__/fill_level.cpython-313.pyc
index 44a1f1b44772ad082869a9c6f413a7ba8a0cbaf4..60ba9c77b4b531d4305a1c5057d5a6f4babc7424 100644
GIT binary patch
delta 64
zcmew+Hc6cOGcPX}0}yyHNNwcKU{rHVwu%WYPAw`1lQAy&$)&lec_qa$E~R<tsrh;F
Pu8Ae7MVo6Ge{uo<YLgX-

delta 36
qcmbOv{!NVgGcPX}0}#x-C%KV3gON)$#VW?d)iK01X!A_QpPT@^*$TP<

diff --git a/main.py b/main.py
index d9e7cfb..5018279 100644
--- a/main.py
+++ b/main.py
@@ -35,25 +35,43 @@ class SNAKE():
     def add_dody(self):
         self.body[len(self.body)-1].type = "body"
         last_body = self.body[len(self.body)-1]
+
         new_body = body(0,0, last_body.rotate, "tail")
         v_x = int(-math.sin(-last_body.rotate * math.pi / 180))
         new_body.x = -v_x + last_body.x
         v_y = int(math.cos(-last_body.rotate * math.pi / 180))
         new_body.y = -v_y + last_body.y
+
         self.body.append(new_body)
 
     def move(self, vector):
         self.body[0].rotate = vector * 90
+        
+
         i = len(self.body)-1
+        self.body[len(self.body)-1].type = "tail"
+        self.body[i].x = self.body[i-1].x
+        self.body[i].y = self.body[i-1].y
+        self.body[i].rotate = self.body[i-1].rotate
+
+        i-=1
         while i > 0:
-            if self.body[i].type == "body" or self.body[i].type == "tail":
-                self.body[i].x = self.body[i-1].x
-                self.body[i].y = self.body[i-1].y
-                self.body[i].rotate = self.body[i-1].rotate 
-            i = i - 1
+            self.body[i].x = self.body[i-1].x
+            self.body[i].y = self.body[i-1].y
             
-        self.body[0].x = int(-math.sin(-self.body[0].rotate * math.pi / 180)) + self.body[0].x
-        self.body[0].y = int(math.cos(-self.body[0].rotate * math.pi / 180)) + self.body[0].y
+
+            if abs(math.cos(self.body[i+1].rotate)) == abs(math.cos(self.body[i-1].rotate)) or abs(math.sin(self.body[i+1].rotate)) == abs(math.sin(self.body[i-1].rotate)):
+                self.body[i].type = "body"
+                self.body[i].rotate = self.body[i-1].rotate
+            else:
+                self.body[i].type = "body-rotate"
+                self.body[i].rotate = (self.body[i+1].rotate - 90) % 360
+                
+            
+
+            i = i - 1
+        self.body[0].x = int(-math.sin(-(vector * 90) * math.pi / 180)) + self.body[0].x
+        self.body[0].y = int(math.cos(-(vector * 90) * math.pi / 180)) + self.body[0].y
 
         # print(f"Move {vector}")
 

From c7c5b6429bf5d9c2220dd003f16166d9146f0e65 Mon Sep 17 00:00:00 2001
From: PABLO <stud178861@vyatsu.ru>
Date: Wed, 7 May 2025 01:15:15 +0300
Subject: [PATCH 2/3] update: movement

---
 DATA/Sprites/Snake/body.aseprite       | Bin 468 -> 465 bytes
 DATA/Sprites/Snake/body.png            | Bin 371 -> 342 bytes
 DATA/Sprites/Snake/head.aseprite       | Bin 486 -> 443 bytes
 DATA/Sprites/Snake/head.png            | Bin 329 -> 305 bytes
 DATA/Sprites/Snake/tail.png            | Bin 315 -> 222 bytes
 __pycache__/fill_level.cpython-313.pyc | Bin 2962 -> 2934 bytes
 main.py                                | 107 ++++++++++++++++---------
 7 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/DATA/Sprites/Snake/body.aseprite b/DATA/Sprites/Snake/body.aseprite
index b2d7e37a33bc8a997f2d2ad341ea793764f737d0..fce8482037791e3c4aaa0c20008b78e7fad14b48 100644
GIT binary patch
delta 175
zcmcb@e36;);zY)J#=wb<8|&vYFfgzx00{;zhW|_;8Uz#=co-_?Bqto;JtV&3pZoEO
zDZ#7?w?)m|d08(Xl6~>dd7FOre8vbKm%~3^<TZX=nJB+&?v9L<?F)8u&Y%0D?BExH
zWOc*5Lt_3Xz9n6D=iS}ODIfD{Wg?rZ$-WILX1PI5kG+I{ToT$Ot>D2cUsE}2N=>h}
bd{QyD=^JI17qNMQkNJ|`urMelXg>!4h6zIU

delta 178
zcmcb}e1)0u%0$L`#*m4P8|xP_FfgzxFfecd>HkbX0t|Q<6c{SzBqua9d|+Mm|M0UF
zf6w1a{~&*)?V^IAz}W`22~Q_{6$tXz{_Myw`{$Md;azeyc~0frx_4Yw{xq;p4DQ$V
zaWvUg74(=VJR&K$-&fbjcg=23-trl8L5E~xZTFQlpUz3T%%CHu>``d0nJE#!<HDwx
d1F3d;wm&WznBHyC_4)Wx^379q2E_#J=K$$^Mo0hv

diff --git a/DATA/Sprites/Snake/body.png b/DATA/Sprites/Snake/body.png
index 0a661648014a573013e73fd8d13d10599366c86f..9d8d66773aabbaa69869d56a6bc37b28aee2a3a3 100644
GIT binary patch
delta 302
zcmV+}0nz^R0@ebMF@F$AL_t(oh3%BF4uUWchW{ES813vpBD2rnL+HxD<O4Y|u*yUD
z49=1;ILjy#Ngc3wEl{g6X}{%?E8PG0a#z6Na5(-QW;)zvOQGiuabf)DYXekNH0m+)
zo_@YCBB(CYZ%IXY=%c#aFkb|?mNj_j<672=8ToyloNWyW0DstK%eKxYjT8e^bSzRc
zx~ZYg$V-ZbAy3X-ev?LR2TWqNQJSFL(Ywk+AN%!5IrF9vuP!(6Fz6MxVP?9~P&AqN
z1hzY_#8^AWS_#<A%1}JSg;LXN#TaOm!eav^8ul2#pch}6pmak>leYUUw?|(`x*bCU
zDz~6pLmM$0-Y0m#6x~UmRow^?om|J^a5#R4J6h=oY-O6;ZU6uP07*qoM6N<$f}}l+
A`2YX_

delta 331
zcmV-R0kr<s0`mfpF@G&dL_t(oh3%IyZo)tiMc+hQnG)9&mdKGpOOa!xpoJrWMBy5j
zrm{3C&`QW&7c*WKDa!QTef~55k1ZH$ci5^9Lfuq!ZO?kMqHB9}5F{wa{Y5P2eOLiv
zJzu`wth~qg0iG}K+P*x%+Z2dB9xG5c6*>sJ!&YAk03boRU4QRc+Td;hFo7rraNJ)+
zf=;aHX+u^8JZ)G6Fjm0RhO7$QuJ>{PsW`5i3JE3`V#@7UaUV#~i2~Mr;8H+`$N5X;
zcL99;d@4)_Fv?$K8>Xhem;!S#97E{k0FYM!6LOsXF+{xl^nEr<kVOH&?0+*rTrhL-
zYn^^G06hGkibP-U+nWI(?f)fZ2FNx2Zh(~kmz2wfDGPdH7@RhI>kPpBC%LE0PyPQJ
d#`-h=hQE9AB~Kwdp#%T`002ovPDHLkV1f#UmRA4(

diff --git a/DATA/Sprites/Snake/head.aseprite b/DATA/Sprites/Snake/head.aseprite
index 039b8f74758b768d4fd8e39c8d37a290721b490e..482db0b221c20f119f34788b78af9594a3a8933e 100644
GIT binary patch
delta 147
zcmaFHyqlSE_e92eM(c@<+v}Sd7#LU;fCK|4!+$0a4Fa+Zd<+$Hk`ol<Tl53|_V;NT
z^rh_1NHn+mTwia*oSgJl?bz897TNO|!+tloH5wZJb2Dofk&=D<S$o&sDL0&X%5o>O
xB+syX@?&yPkDU9LO~o25x~7*dI6Rr!s3E)}*M93;rDJ(XUl<u!4hW_80{{iyH*Ej_

delta 190
zcmV;v073t|1Lgw(=8*w^0cMebw|}kx000Fb000R90|5U500000000004gehhc${Nk
zzz)I}sQw3G9MU-TWbHEmV`B9p>mgPz%x$i1l5jmBHX%2YqYoyB%bmFNlA{k<oRB_b
zz2xXa<NyEt$qYjuNDL&0t{;S9a`^OtXl(kh=|R?uO&?4zK7H8q;0hCB!!L#yeZ<5$
sF>w!*$EF8Yz97~<Lg^D58(*G4cPl<OVsk4tHa>l$_6;rj05GCuk8v+dJpcdz

diff --git a/DATA/Sprites/Snake/head.png b/DATA/Sprites/Snake/head.png
index 370d62f41b6655d419ef71acc923759dfe5e0f4e..30ba40a1548445f46a055b7e6031693abf31b988 100644
GIT binary patch
delta 266
zcmV+l0rmdL0<i*+Fn<8+Nkl<ZScPL?7zLwX6pVra28@(w4qu@9A6;x^!flewB+CKV
zEGE|>L^}YVrAvYY85kHC7-H7FC)pv4#P|jo2+MIZynXZ)!*W)>Q!s~O)rZR=OfW-<
zrQbgK${;Mq4afOselg^q`Ni=2lNrPBPi8nBj?1HrS^EtB!+#7VM3Vz<pLof@z`($u
zY9Y?>_R&|2kYEg7p!%N}%PDaLGC+3(6U8P{2$*Q?``ag8!lMCO6tEC$IU&bPG+|?4
zV8G0ZLQ*_9EoWdD1le%l3nF42K&)ekwU{CY;ByG6mC+~|1*2dT3^)J)AmpZE=AoRt
Q00000NkvXXt^-0~f_30=+yDRo

delta 290
zcmV+-0p0$w0?7i9Fn<99Nkl<ZScUCYAr6B;5S%u3D1yiF1s;OIRPY17gur0>jtYKo
z4p%{%kYGSib#x0fWtVFR$&I<oW%p)w7B&Z192s#I3~?3=Tkbe*A@_U-08m#gibRR-
z5+zY`4XKE;gd70W{V|^Dy`&v%0j9ySj8?eR0u4?pc6VU40Dn$@IkCrZfL2r_3VGzt
zV)DpEk*LL-%>pQii5Rf}0O*?#Y1z%r)3QU~gxu?R0<O2Gkr=UnUj$t8)dD0ler?V%
zena40k>@)fV^^cD+HpMpbre$~if_V<3(z9;O7{}5KQ8?kp-$+%<WX|r3YZcCa{B>c
o3#bEAH@L74SQ`hd1G_u$0?LN8|06E8{{R3007*qoM6N<$f`7+-CIA2c

diff --git a/DATA/Sprites/Snake/tail.png b/DATA/Sprites/Snake/tail.png
index ec9f76bb793f5fbd7573ca813f8447f6e11e9d7f..8c21d5d68d1695953dd4bea83fcb0706159b6f1c 100644
GIT binary patch
delta 181
zcmV;m080P60^R|TF@KmzL_t(og=1hC1*2dTjDk@xz<`kw&0%xY{v-2OrQ9OfJd!ma
zTPmW&#qj3dH#kkKW5VXB{bywPPn-kLeTi-<E*jk-=;puxURUC>6c-@m7!f5dhPRKt
zG6>6Y!)d&(!v(MfFDW5~><EGe;j<JQz!!2jLx9=<n<t140WNwu2nOil0AvupK$WEQ
jHVQ_;C>RB!VE6+7qpNgM6c|#C00000NkvXXu0mjfr~gZN

delta 275
zcmV+u0qp+X0lNZ_F@N<*L_t(oh1Hdz4udcdhW{>8AVDKY#v?I1!DAt2$0M->fd<JG
zNhg*g%`$V>OE3FPUH`A&rL6-q*Zal$-Jz^Atn-GV%CXKH{O;h+9*^78arQfL0VrX4
zQRUKY_yB(Y955_j=Pez;(2Wi-G(ah;9Lw}NRsihzM*%F;3x8#u9ji1V02)IGkraRu
zmJ?JGfVOYEhJG;sprc;|(Dsc7pi(XZ_*E{QzZf8#eM~tUKwCc>;JZBb^dbO_s}}{J
zsh<rnbfYsj0Km=wg$&TGND81mhN!>56hLbX|7k$u1&jjFj2J-6g1LdHm^?(<F$XZu
Z8*&<kIVBg!p9}y1002ovPDHLkV1jQfb&&u7

diff --git a/__pycache__/fill_level.cpython-313.pyc b/__pycache__/fill_level.cpython-313.pyc
index 60ba9c77b4b531d4305a1c5057d5a6f4babc7424..44a1f1b44772ad082869a9c6f413a7ba8a0cbaf4 100644
GIT binary patch
delta 36
qcmbOv{!NVgGcPX}0}#x-C%KV3gON)$#VW?d)iK01X!A_QpPT@^*$TP<

delta 64
zcmew+Hc6cOGcPX}0}yyHNNwcKU{rHVwu%WYPAw`1lQAy&$)&lec_qa$E~R<tsrh;F
Pu8Ae7MVo6Ge{uo<YLgX-

diff --git a/main.py b/main.py
index 5018279..326728a 100644
--- a/main.py
+++ b/main.py
@@ -21,7 +21,7 @@ class body():
         self.type = type
     
 class SNAKE():
-    def __init__(self, star_point_x, star_point_y, start_rotate = 90):
+    def __init__(self, star_point_x, star_point_y, start_rotate = 0):
         self.body = [
             body(star_point_x, star_point_y, start_rotate, "head"),
             body(star_point_x - 1, star_point_y, start_rotate, "tail")
@@ -37,43 +37,78 @@ class SNAKE():
         last_body = self.body[len(self.body)-1]
 
         new_body = body(0,0, last_body.rotate, "tail")
-        v_x = int(-math.sin(-last_body.rotate * math.pi / 180))
+        v_x = int(math.cos(math.radians(last_body.rotate)))
+        v_y = int(math.sin(math.radians(last_body.rotate)))
+
         new_body.x = -v_x + last_body.x
-        v_y = int(math.cos(-last_body.rotate * math.pi / 180))
         new_body.y = -v_y + last_body.y
 
         self.body.append(new_body)
+    def calculate_rot(self, degr1, degr2):
+        # deg1 - угол ближайшей к голове части
+        # deg2 - угол дальней от голове части 
+        degr1 = degr1 % 360
+        degr2 = degr2 % 360
+        if (degr1 == 180 and degr2 == 270) or (degr1 == 90 and degr2 == 0):
+            return 180
+        if (degr1 == 0 and degr2 == 90) or (degr1 == 270 and degr2 == 180):
+            return 0
+        if ((degr1 == 90) and degr2 == 180) or (degr1 == 0 and degr2 == 270):
+            return 90
+        if (degr1 == 270 and degr2 == 0) or (degr1 == 180 and degr2 == 90):
+            return 270
+        return 90
+    
+    def calculate_coeff(self, degr):
+        return math.cos(math.radians(degr - 90)) + math.sin(math.radians(degr + 90))
+    
+    def convert_rot_to_tail(self, deg0, deg2 ):
+        # deg1 - угол ближайшей к голове части
+        # deg0 - угол переходной части (он особый)
+        deg0 = deg0 % 360
+        deg2 = deg2 % 360
+        if (deg0 == 180 and deg2 == 270) or (deg0 == 270 and deg2 == 90):
+            return 180
+        if (deg0 == 90 and deg2 == 270) or (deg0 == 0 and deg2 == 90):
+            return 0
+        if ((deg0 == 90) and deg2 == 180) or (deg0 == 180 and deg2 == 0):
+            return 90
+        if (deg0 == 0 and deg2 == 180) or (deg0 == 270 and deg2 == 0):
+            return 270
+        return 0
 
     def move(self, vector):
-        self.body[0].rotate = vector * 90
+        l = len(self.body)-1
+        i = l
         
-
-        i = len(self.body)-1
-        self.body[len(self.body)-1].type = "tail"
-        self.body[i].x = self.body[i-1].x
-        self.body[i].y = self.body[i-1].y
-        self.body[i].rotate = self.body[i-1].rotate
-
-        i-=1
         while i > 0:
             self.body[i].x = self.body[i-1].x
             self.body[i].y = self.body[i-1].y
-            
+            self.body[i].rotate = self.body[i-1].rotate if self.body[i-1] != "body-rotate" else self.convert_rot_to_tail(self.body[i-1].rotate, self.body[i].rotate)
 
-            if abs(math.cos(self.body[i+1].rotate)) == abs(math.cos(self.body[i-1].rotate)) or abs(math.sin(self.body[i+1].rotate)) == abs(math.sin(self.body[i-1].rotate)):
-                self.body[i].type = "body"
-                self.body[i].rotate = self.body[i-1].rotate
-            else:
-                self.body[i].type = "body-rotate"
-                self.body[i].rotate = (self.body[i+1].rotate - 90) % 360
+            self.body[i].type = self.body[i-1].type 
+            
+            # elif (self.body[i].type == "tail") and self.body[i-1].type == "body-rotate":
+            #     self.body[l].rotate = self.convert_rot_to_tail(self.body[l-1].rotate, self.body[l].rotate)
                 
-            
-
             i = i - 1
-        self.body[0].x = int(-math.sin(-(vector * 90) * math.pi / 180)) + self.body[0].x
-        self.body[0].y = int(math.cos(-(vector * 90) * math.pi / 180)) + self.body[0].y
 
+                 
+        self.body[0].rotate = vector * 90
+        self.body[0].x = int(math.cos(math.radians(self.body[0].rotate))) + self.body[0].x
+        self.body[0].y = int(math.sin(math.radians(self.body[0].rotate))) + self.body[0].y
+
+        if self.body[0].rotate != self.body[1].rotate:
+            self.body[1].type = "body-rotate" 
+            self.body[1].rotate = self.calculate_rot(self.body[0].rotate, self.body[1].rotate)
+        else:
+            self.body[1].type = "body" 
+            
+        
+        self.body[l].type = "tail"
+        # self.body[l].rotate = lf.body[l-1].type == "body-rotate" else self.body[l-1].rotate
         # print(f"Move {vector}")
+        
 
 class Level_data():
     def __init__(self, level_data_json = []):
@@ -120,8 +155,8 @@ class MYGAME(arcade.Window):
 
         # food
         self.food_list = arcade.SpriteList()
-        self.food_sleep = 300
-        self.delay = 400
+        self.food_sleep = 200
+        self.delay = 200
         self.food = []
         # Счет
         self.score = 0
@@ -133,7 +168,7 @@ class MYGAME(arcade.Window):
         # Загрузка змеи
         for body in self.snake.body:
             snake_sprite = arcade.Sprite(f"./DATA/Sprites/Snake/{body.type}.png", self.scale_)
-            snake_sprite.angle = 90
+            snake_sprite.angle = 0
             snake_sprite.center_x = self.level_start[0] - 16 + ( body.x + 1 ) * 32 * self.scale_
             snake_sprite.center_y = self.level_start[1] - 16 + ( body.y + 1 ) * 32 * self.scale_
             self.player_list.append(snake_sprite)
@@ -171,7 +206,7 @@ class MYGAME(arcade.Window):
             i = 0
             while i < len(self.snake.body):
                 self.player_list[i] = arcade.Sprite(f"./DATA/Sprites/Snake/{self.snake.body[i].type}.png", self.scale_)
-                self.player_list[i].angle = self.snake.body[i].rotate
+                self.player_list[i].angle = 360 - self.snake.body[i].rotate
                 self.player_list[i].center_x = self.level_start[0] - 16 + ( self.snake.body[i].x + 1 ) * 32 * self.scale_
                 self.player_list[i].center_y = self.level_start[1] - 16 + ( self.snake.body[i].y + 1 ) * 32 * self.scale_
                 i = i + 1
@@ -230,20 +265,20 @@ class MYGAME(arcade.Window):
         if len(self.player_list) > 0:
             
             if key in (arcade.key.UP, arcade.key.W):
-                if self.floor_grid[self.snake.body[0].y + 1][self.snake.body[0].x] == 1 and self.snake.body[0].rotate != 180 and not(self.snake.check_contact(self.snake.body[0].x ,self.snake.body[0].y+1)):   
-                    self.snake.move(0)
+                if self.floor_grid[self.snake.body[0].y + 1][self.snake.body[0].x] == 1 and self.snake.body[0].rotate != 270 and not(self.snake.check_contact(self.snake.body[0].x ,self.snake.body[0].y+1)):   
+                    self.snake.move(1)
                 
             elif key in (arcade.key.DOWN, arcade.key.S):
-                if self.floor_grid[self.snake.body[0].y - 1][self.snake.body[0].x] == 1 and self.snake.body[0].rotate != 0 and not(self.snake.check_contact(self.snake.body[0].x ,self.snake.body[0].y-1)):   
-                    self.snake.move(2)
-
-            elif key in (arcade.key.LEFT, arcade.key.A):
-                if self.floor_grid[self.snake.body[0].y][self.snake.body[0].x - 1] == 1 and self.snake.body[0].rotate != 90 and not(self.snake.check_contact(self.snake.body[0].x - 1,self.snake.body[0].y)):   
+                if self.floor_grid[self.snake.body[0].y - 1][self.snake.body[0].x] == 1 and self.snake.body[0].rotate != 90 and not(self.snake.check_contact(self.snake.body[0].x ,self.snake.body[0].y-1)):   
                     self.snake.move(3)
 
+            elif key in (arcade.key.LEFT, arcade.key.A):
+                if self.floor_grid[self.snake.body[0].y][self.snake.body[0].x - 1] == 1 and self.snake.body[0].rotate != 0 and not(self.snake.check_contact(self.snake.body[0].x - 1,self.snake.body[0].y)):   
+                    self.snake.move(2)
+
             elif key in (arcade.key.RIGHT, arcade.key.D):
-                if self.floor_grid[self.snake.body[0].y][self.snake.body[0].x + 1] == 1 and self.snake.body[0].rotate != 270 and not(self.snake.check_contact(self.snake.body[0].x + 1,self.snake.body[0].y)):   
-                    self.snake.move(1)
+                if self.floor_grid[self.snake.body[0].y][self.snake.body[0].x + 1] == 1 and self.snake.body[0].rotate != 180 and not(self.snake.check_contact(self.snake.body[0].x + 1,self.snake.body[0].y)):   
+                    self.snake.move(0)
 
     def on_key_release(self, key, modifiers):
         """Вызывается, когда пользователь отпускает клавишу"""

From f99fe6e27c07cb90803c267170de5b5e13b9534c Mon Sep 17 00:00:00 2001
From: PABLO <stud178861@vyatsu.ru>
Date: Thu, 8 May 2025 01:29:18 +0300
Subject: [PATCH 3/3] fix: movement

---
 DATA/Sprites/Snake/body.png | Bin 342 -> 308 bytes
 main.py                     |  92 ++++++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/DATA/Sprites/Snake/body.png b/DATA/Sprites/Snake/body.png
index 9d8d66773aabbaa69869d56a6bc37b28aee2a3a3..f3a53f97bed8bf468b6cdd9e9110b926e8682325 100644
GIT binary patch
delta 269
zcmV+o0rLLV0<;2<Fn<8<Nkl<ZScUCWF%H5o40Nha>DbI2BEigSU}a$9O$@B?2p$4b
zhtBQTPL;xx;F=@~kPY8r$w_tR>%{;J27~eM5V6DEd1YwtvVTOs`B?xaHS_XVlrKHG
zga|q%CRJL((2Y<x74+={N=xY5X(7hmzaH*Mf+(NZp4N*7CVvf8EQX5mIb%twqt1aC
zS!%T+ushUM-*80^@}V0+X$hh<ptJ-t3#gmQ)tIwIY$9Jx72~VE`{H=pn2?<zD^s(Q
zQr|*|i9><H|C9#uldQN9;zsKGw!-Oi^ofZDG}~7Dc7bJGt5iscl)+#y7#L4qo+9kP
TZF)Wc0000<MFvhpu0mjff;N9-

delta 303
zcmV+~0nq-m0@ebMFn<9MNkl<ZScUDBu?~VT5QhI6CK&DPKq9lx;6v!jz~lotF|f)*
z_zcdHFgVL76G<Jgcr8$?GHJi%k}KT*_i|Uj;cz(q9cDV*W=o;x4sl`p=W7F0R5a=_
z^PYabFe0cf({D*ddFZ3M+%R7RxRy0|=;K<}iW&KRo}6tB34Z|CX3MtDCXEyWRCFv-
zGrFmv&d5uOh9OVRU4D~BZ3j$Zwo#g(-O;<sLm&I~NjdYT5U(yb@G$5Vw_#?w(NHv*
z_yo2)uEbb7$65*4&B{<b#D!ARYsDC7l)_^JB^ve^z@QgjnV@t-NRzhvEw@KsN4gzD
z11h(mTSFT$8z|m*z!cp{pH<xm5uIGe;cz&9hdWy72yA7V+im~=002ovPDHLkV1it!
BjJp5;

diff --git a/main.py b/main.py
index 326728a..ad4515b 100644
--- a/main.py
+++ b/main.py
@@ -22,6 +22,7 @@ class body():
     
 class SNAKE():
     def __init__(self, star_point_x, star_point_y, start_rotate = 0):
+        self.tail_rot = 0
         self.body = [
             body(star_point_x, star_point_y, start_rotate, "head"),
             body(star_point_x - 1, star_point_y, start_rotate, "tail")
@@ -32,18 +33,27 @@ class SNAKE():
             if body.x == x and body.y == y:
                 cont = 1
         return cont
-    def add_dody(self):
-        self.body[len(self.body)-1].type = "body"
+    def add_body(self):
+        
         last_body = self.body[len(self.body)-1]
 
-        new_body = body(0,0, last_body.rotate, "tail")
-        v_x = int(math.cos(math.radians(last_body.rotate)))
-        v_y = int(math.sin(math.radians(last_body.rotate)))
+        new_body = body(last_body.x,last_body.y, self.tail_rot, "tail")
+        v_x = int(math.cos(math.radians(self.tail_rot)))
+        v_y = int(math.sin(math.radians(self.tail_rot)))
 
-        new_body.x = -v_x + last_body.x
-        new_body.y = -v_y + last_body.y
+        new_body.x = last_body.x -v_x
+        new_body.y = last_body.y -v_y
+
+        l = len(self.body)-1
+
+        if self.body[l].rotate != self.tail_rot:
+            self.body[l].type = "body-rotate" 
+            self.body[l].rotate = self.calculate_rot(self.body[l].rotate, self.tail_rot)
+        else:
+            self.body[l].type = "body"
 
         self.body.append(new_body)
+        
     def calculate_rot(self, degr1, degr2):
         # deg1 - угол ближайшей к голове части
         # deg2 - угол дальней от голове части 
@@ -60,40 +70,50 @@ class SNAKE():
         return 90
     
     def calculate_coeff(self, degr):
-        return math.cos(math.radians(degr - 90)) + math.sin(math.radians(degr + 90))
+        return math.cos(math.radians(degr)) + math.sin(math.radians(degr))
     
-    def convert_rot_to_tail(self, deg0, deg2 ):
+    def convert_rot_to_body(self, deg0, deg1 ):
         # deg1 - угол ближайшей к голове части
         # deg0 - угол переходной части (он особый)
         deg0 = deg0 % 360
-        deg2 = deg2 % 360
-        if (deg0 == 180 and deg2 == 270) or (deg0 == 270 and deg2 == 90):
+        deg1 = deg1 % 360
+        if (deg0 == 180 and deg1 == 270) or (deg0 == 270 and deg1 == 90):
             return 180
-        if (deg0 == 90 and deg2 == 270) or (deg0 == 0 and deg2 == 90):
+        if (deg0 == 90 and deg1 == 270) or (deg0 == 0 and deg1 == 90):
             return 0
-        if ((deg0 == 90) and deg2 == 180) or (deg0 == 180 and deg2 == 0):
+        if ((deg0 == 90) and deg1 == 180) or (deg0 == 180 and deg1 == 0):
             return 90
-        if (deg0 == 0 and deg2 == 180) or (deg0 == 270 and deg2 == 0):
+        if (deg0 == 0 and deg1 == 180) or (deg0 == 270 and deg1 == 0):
             return 270
         return 0
-
-    def move(self, vector):
-        l = len(self.body)-1
-        i = l
+    # def convert_rot_to_tail(self, deg0, deg2):
         
+    
+    def calc_tail_rotate(self):
+        tail = self.body[len(self.body)-1]
+        pre_last = self.body[len(self.body)-2]
+
+        grad = 0
+        pos_x = tail.x
+        pos_y = tail.y
+
+        while not((pre_last.x == pos_x) and (pre_last.y == pos_y)):
+            pos_x = tail.x + int(math.cos(math.radians(grad)))
+            pos_y = tail.y + int(math.sin(math.radians(grad)))
+            grad += 90
+        return grad - 90
+    
+    def move(self, vector):
+        i = len(self.body)-1 
+        self.tail_rot = self.body[len(self.body)-1 ].rotate
+
         while i > 0:
             self.body[i].x = self.body[i-1].x
             self.body[i].y = self.body[i-1].y
-            self.body[i].rotate = self.body[i-1].rotate if self.body[i-1] != "body-rotate" else self.convert_rot_to_tail(self.body[i-1].rotate, self.body[i].rotate)
+            self.body[i].rotate = self.body[i-1].rotate
+            self.body[i].type = self.body[i-1].type
+            i -= 1
 
-            self.body[i].type = self.body[i-1].type 
-            
-            # elif (self.body[i].type == "tail") and self.body[i-1].type == "body-rotate":
-            #     self.body[l].rotate = self.convert_rot_to_tail(self.body[l-1].rotate, self.body[l].rotate)
-                
-            i = i - 1
-
-                 
         self.body[0].rotate = vector * 90
         self.body[0].x = int(math.cos(math.radians(self.body[0].rotate))) + self.body[0].x
         self.body[0].y = int(math.sin(math.radians(self.body[0].rotate))) + self.body[0].y
@@ -102,14 +122,14 @@ class SNAKE():
             self.body[1].type = "body-rotate" 
             self.body[1].rotate = self.calculate_rot(self.body[0].rotate, self.body[1].rotate)
         else:
-            self.body[1].type = "body" 
-            
-        
-        self.body[l].type = "tail"
-        # self.body[l].rotate = lf.body[l-1].type == "body-rotate" else self.body[l-1].rotate
-        # print(f"Move {vector}")
+            self.body[1].type = "body"
+
+        self.body[len(self.body)-1 ].type = "tail"
+        self.body[len(self.body)-1 ].rotate = self.calc_tail_rotate()
+
         
 
+
 class Level_data():
     def __init__(self, level_data_json = []):
         if level_data_json:
@@ -176,8 +196,8 @@ class MYGAME(arcade.Window):
         # Загрузка пола
         for floor in self.Lvl_data.floor:
             floor_sprite = arcade.Sprite(floor["sprite"], self.scale_)
-            floor_sprite.center_x = self.level_start[0] - 16 + ( floor["x"] + 1 ) * 32 * self.scale_
-            floor_sprite.center_y = self.level_start[1] - 16 + ( floor["y"] + 1 ) * 32 * self.scale_
+            floor_sprite.center_x = self.level_start[0] - 16  + ( floor["x"] + 1 ) * 32 * self.scale_
+            floor_sprite.center_y = self.level_start[1] - 16  + ( floor["y"] + 1 ) * 32 * self.scale_
             self.floor_list.append(floor_sprite)
         
         # Загрузка врагов
@@ -221,7 +241,7 @@ class MYGAME(arcade.Window):
                 self.food_list[i].kill()
                 self.food.pop(i)
                 self.score += 1
-                self.snake.add_dody()
+                self.snake.add_body()
                 self.player_list.append(arcade.Sprite())
             i += 1
         # Enemy_spawn