From 03df3577033fd6090ffa3a6e2fa7e9a53b3427e2 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date: Sat, 26 Oct 2024 18:02:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D1=80=D1=83=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D0=B4=D0=BE=D0=BA=D1=80=D1=83=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20(#749)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru-RU/blocking/blocking-examine.ftl       | 22 ++++++++++--
 .../Entities/Objects/Shields/shields.yml      | 35 +++++++++----------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/Resources/Locale/ru-RU/blocking/blocking-examine.ftl b/Resources/Locale/ru-RU/blocking/blocking-examine.ftl
index 303b10655b..aca9ca8301 100644
--- a/Resources/Locale/ru-RU/blocking/blocking-examine.ftl
+++ b/Resources/Locale/ru-RU/blocking/blocking-examine.ftl
@@ -2,5 +2,23 @@
 blocking-examinable-verb-text = Защита
 blocking-examinable-verb-message = Изучите значения защиты.
 blocking-fraction = Он блокирует [color=lightblue]{ $value }%[/color] входящего урона и:
-blocking-coefficient-value = - Отнимает [color=lightblue]{ $value }%[/color] [color=yellow]{ $type }[/color] урона.
-blocking-reduction-value = - Отнимает на [color=lightblue]{ $value }[/color] меньше [color=yellow]{ $type }[/color] урона.
+blocking-coefficient-value = - Получает [color=lightblue]{ $value }%[/color] [color=yellow]{ $type ->
+       *[other] Другого
+        [Blunt] Тупого
+        [Slash] Рубящего
+        [Piercing] Проникающего
+        [Heat] Теплового
+        [Radiation] Радиационного
+        [Caustic] Кислотного
+        [Cold] Морозного
+        }[/color] урона.
+blocking-reduction-value = - Получает на [color=lightblue]{ $value }[/color] [color=yellow]{ $type ->
+       *[other] Другого
+        [Blunt] Тупого
+        [Slash] Рубящего
+        [Piercing] Проникающего
+        [Heat] Теплового
+        [Radiation] Радиационного
+        [Caustic] Кислотного
+        [Cold] Морозного
+        }[/color] урона меньше.
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index c3a0f7203e..7bcd45592c 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -77,17 +77,17 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Blunt: 0.7
-          Slash: 0.7
-          Piercing: 0.5
+          Blunt: 0.6
+          Slash: 0.8
+          Piercing: 0.9
       activeBlockModifier:
         coefficients:
-          Blunt: 0.6
-          Slash: 0.6
-          Piercing: 0.4
+          Blunt: 0.5
+          Slash: 0.7
+          Piercing: 0.8
         flatReductions:
-          Blunt: 1.5
-          Piercing: 1.5
+          Blunt: 2
+          Slash: 1
     - type: Destructible
       thresholds:
       - trigger:
@@ -122,7 +122,7 @@
       thresholds:
       - trigger:
           !type:DamageTrigger
-          damage: 120
+          damage: 140
         behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -144,22 +144,21 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Blunt: 0.8
-          Slash: 0.8
-          Piercing: 0.8
+          Blunt: 0.9
+          Slash: 0.9
+          Piercing: 0.6
       activeBlockModifier:
         coefficients:
-          Blunt: 0.7
-          Slash: 0.7
-          Piercing: 0.7
+          Blunt: 0.85
+          Slash: 0.85
+          Piercing: 0.5
         flatReductions:
-          Blunt: 1.5
-          Piercing: 1.5
+          Piercing: 2
     - type: Destructible
       thresholds:
       - trigger:
           !type:DamageTrigger
-          damage: 220
+          damage: 200
         behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ] # WD end