From c689b6631c30037581e3c7a1fed6b503c1a20bc9 Mon Sep 17 00:00:00 2001
From: "Igor Barkov (iwork)" <lopar@lopar.us>
Date: Mon, 20 Jul 2020 16:44:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BA=D1=83=D1=81=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20=D1=83=D1=80=D0=BE=D0=BD=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B7=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/DressedItems.php | 4 ++--
 classes/User.php         | 8 ++++----
 main.php                 | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/DressedItems.php b/classes/DressedItems.php
index 15d4350..39e1b62 100644
--- a/classes/DressedItems.php
+++ b/classes/DressedItems.php
@@ -44,8 +44,8 @@ SELECT SUM(add_strength) as sum_strength,
        SUM(add_accuracy) as sum_accuracy,
        SUM(add_evasion) as sum_evasion,
        SUM(add_criticals) as sum_criticals,
-       SUM(min_physical_damage) as sum_min_phys_damage,
-       SUM(max_physical_damage) as sum_max_phys_damage
+       SUM(add_min_physical_damage) as sum_min_phys_damage,
+       SUM(add_max_physical_damage) as sum_max_phys_damage
 FROM inventory WHERE owner_id = ?i AND dressed_slot > 0'
 SQL;
             $this->DBSUM = db::c()->query($query, $this->USERID)->fetch_assoc();
diff --git a/classes/User.php b/classes/User.php
index 22745ca..78477db 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -28,15 +28,15 @@ class User
     // Удар кулаком всегда 1-2.
     public $minDamage = 1;
     public $maxDamage = 2;
-
+    //Броня без предметов не существует.
+    public $headArmor = 0;
+    public $chestArmor = 0;
+    public $legArmor = 0;
     public const STAT_MAXIMUM_AMOUNT = 40;
     // Пока несуществующие, для совместимости.
     public $married = 'Someone или нет.';
     public $experience = 200;
     public $stat_points = 1;
-    public $headArmor;
-    public $chestArmor;
-    public $legArmor;
     // Динамически рассчитываемые
     public $health;
     //Статусы того, кто смотрит на информацию.
diff --git a/main.php b/main.php
index 8e58fa1..654fe92 100644
--- a/main.php
+++ b/main.php
@@ -880,7 +880,7 @@ if (input::get('edit')) {
                     Шанс крита: ?? + <?= $getItemsBonuses->getCriticalsBonus() ?><br>
                     Урон: <?= $showUser->minDamage ?> - <?= $showUser->maxDamage ?> <br>
                     <br>
-                    <div style="color: gold;">
+                    <div style="color: gray;">
                         Защита от огня: ?? <br>
                         Защита от воды: ?? <br>
                         Защита от вохдуха: ?? <br>