From 4164046edbfbdb11300938e746a2db1fa0004282 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Thu, 11 Mar 2021 21:20:36 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=83=D0=BC=D0=BC=D0=B0=D1=80?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D1=81=D1=82=D0=B0=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D1=83=D0=B5=D1=85=D0=B0=D0=BB=D0=BE=20=D0=B8=D0=B7=20DressedIt?=
 =?UTF-8?q?ems=20=D0=B2=20UserStats.=20#18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Battles/DressedItems.php | 44 --------------------------------
 classes/Battles/UserStats.php    | 23 +++++------------
 main.php                         | 11 ++++----
 3 files changed, 11 insertions(+), 67 deletions(-)

diff --git a/classes/Battles/DressedItems.php b/classes/Battles/DressedItems.php
index 692d0b1..34dd8f3 100644
--- a/classes/Battles/DressedItems.php
+++ b/classes/Battles/DressedItems.php
@@ -42,50 +42,6 @@ class DressedItems
         return $this->dressedItem;
     }
 
-    private function getBonuses(): array
-    {
-        $query = <<<SQL
-SELECT SUM(add_strength) as sum_strength, 
-       SUM(add_dexterity) as sum_dexterity, 
-       SUM(add_intuition) as sum_intuition, 
-       SUM(add_endurance) as sum_endurance, 
-       SUM(add_intelligence) as sum_intelligence, 
-       SUM(add_wisdom) as sum_wisdom,
-       SUM(add_accuracy) as sum_accuracy,
-       SUM(add_evasion) as sum_evasion,
-       SUM(add_criticals) as sum_criticals,
-       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 = ? AND dressed_slot > 0
-SQL;
-        return self::$db->fetch($query, $this->USERID);
-    }
-
-    public function getAccuracyBonus(): ?int
-    {
-        return self::getBonuses()['sum_accuracy'] ?? 0;
-    }
-
-    public function getEvasionBonus(): ?int
-    {
-        return self::getBonuses()['sum_evasion'] ?? 0;
-    }
-
-    public function getCriticalsBonus(): ?int
-    {
-        return self::getBonuses()['sum_criticals'] ?? 0;
-    }
-
-    public function getMinPhysDamage(): ?int
-    {
-        return self::getBonuses()['sum_min_phys_damage'];
-    }
-
-    public function getMaxPhysDamage(): ?int
-    {
-        return self::getBonuses()['sum_max_phys_damage'];
-    }
-
     /**
      * Снимает с предмета статус одетого на персонажа в определённом слоте персонажа.
      * @param $slot_id - номер слота.
diff --git a/classes/Battles/UserStats.php b/classes/Battles/UserStats.php
index 09ce3d9..b1105e3 100644
--- a/classes/Battles/UserStats.php
+++ b/classes/Battles/UserStats.php
@@ -177,22 +177,6 @@ class UserStats extends User
         return $this->maxMana;
     }
 
-    /**
-     * @return int
-     */
-    public function getMinDamage(): int
-    {
-        return $this->minDamage;
-    }
-
-    /**
-     * @return int
-     */
-    public function getMaxDamage(): int
-    {
-        return $this->maxDamage;
-    }
-
     /**
      * @return int
      */
@@ -226,7 +210,12 @@ class UserStats extends User
         sum(greatest(intuition + (ifnull((select sum(add_intuition) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as intuition,
         sum(greatest(endurance + (ifnull((select sum(add_endurance) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as endurance,
         sum(greatest(intelligence + (ifnull((select sum(add_intelligence) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as intelligence,
-        sum(greatest(wisdom + (ifnull((select sum(add_wisdom) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as wisdom
+        sum(greatest(wisdom + (ifnull((select sum(add_wisdom) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as wisdom,
+           ifnull((select sum(add_accuracy) from inventory where dressed_slot != 0 and owner_id = $this->id), 0) as accuracy,
+           ifnull((select sum(add_evasion) from inventory where dressed_slot != 0 and owner_id = $this->id), 0) as evasion,
+           ifnull((select sum(add_criticals) from inventory where dressed_slot != 0 and owner_id = $this->id), 0) as criticals,
+           sum(greatest($this->minDamage + (ifnull((select sum(add_min_physical_damage) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as min_physical_damage,
+           sum(greatest($this->maxDamage + (ifnull((select sum(add_max_physical_damage) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as max_physical_damage
     from users where id = $this->id";
         return self::$db->ofetch($query);
     }
diff --git a/main.php b/main.php
index 3da9ecf..157033f 100644
--- a/main.php
+++ b/main.php
@@ -82,7 +82,6 @@ if ($edit) {
 // Подготавливаем отображение инфы и предметов.
 $userInfo = new UserInfo($user->getId());
 $userStats = new UserStats($user->getId());
-$getItemsBonuses = new DressedItems($user->getId());
 $data = \Battles\Database\DBPDO::INIT()->ofetchAll('SELECT * FROM inventory WHERE owner_id = ? AND dressed_slot = 0 AND on_sale = 0', $user->getId());
 $iteminfo = [];
 foreach ($data as $row) {
@@ -400,11 +399,11 @@ Template::header('Игра');
                     <br>
                     Здоровье: <?= $userStats->getHealth() ?><br>
                     Пыль: <?= $userStats->getMana() ?><br>
-                    Уворот: <?= $getItemsBonuses->getEvasionBonus() ?><br>
-                    Точность: <?= $getItemsBonuses->getAccuracyBonus() ?><br>
-                    Шанс крита: <?= $getItemsBonuses->getCriticalsBonus() ?><br>
-                    Урон: <?= $userStats->getMinDamage() + $getItemsBonuses->getMinPhysDamage() ?>
-                    - <?= $userStats->getMaxDamage() + $getItemsBonuses->getMaxPhysDamage() ?> <br>
+                    Уворот: <?= $userStats->getFullStats()->evasion ?><br>
+                    Точность: <?= $userStats->getFullStats()->accuracy ?><br>
+                    Шанс крита: <?= $userStats->getFullStats()->criticals ?><br>
+                    Урон: <?= $userStats->getFullStats()->min_physical_damage ?>
+                    - <?= $userStats->getFullStats()->max_physical_damage ?> <br>
                     <br>
                     Защита от огня: ?? <br>
                     Защита от воды: ?? <br>