From 26ed4cd286e7e7c16d8a5015f806e4a22945a1c8 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Thu, 11 Mar 2021 20:14:41 +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=82=D0=B0=D1=82+=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=83=D1=81=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=20=D1=87=D0=B8=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B0=20=D1=82=D0=B0=D0=BC,=20=D0=B3=D0=B4=D0=B5?=
 =?UTF-8?q?=20=D1=8D=D1=82=D0=BE=20=D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=BC=D0=BE.=20=D0=A3=D0=BD=D0=B8=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B9.=20#18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Battles/DressedItems.php | 30 ------------------------------
 classes/Battles/UserInfo.php     | 12 ++++++------
 main.php                         | 14 +++++++-------
 3 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/classes/Battles/DressedItems.php b/classes/Battles/DressedItems.php
index 5fcb770..b429f08 100644
--- a/classes/Battles/DressedItems.php
+++ b/classes/Battles/DressedItems.php
@@ -60,36 +60,6 @@ SQL;
         return self::$db->fetch($query, $this->USERID);
     }
 
-    public function getStrengthBonus(): ?int
-    {
-        return self::getBonuses()['sum_strength'];
-    }
-
-    public function getDexterityBonus(): ?int
-    {
-        return self::getBonuses()['sum_dexterity'];
-    }
-
-    public function getIntuitionBonus(): ?int
-    {
-        return self::getBonuses()['sum_intuition'];
-    }
-
-    public function getEnduranceBonus(): ?int
-    {
-        return self::getBonuses()['sum_endurance'];
-    }
-
-    public function getIntelliganceBonus(): ?int
-    {
-        return self::getBonuses()['sum_intelligence'];
-    }
-
-    public function getWisdomBonus(): ?int
-    {
-        return self::getBonuses()['sum_wisdom'];
-    }
-
     public function getAccuracyBonus(): ?int
     {
         return self::getBonuses()['sum_accuracy'] ?? 0;
diff --git a/classes/Battles/UserInfo.php b/classes/Battles/UserInfo.php
index 26a8c0f..617c066 100644
--- a/classes/Battles/UserInfo.php
+++ b/classes/Battles/UserInfo.php
@@ -53,12 +53,12 @@ class UserInfo extends UserStats
         $captions = 'Уровень:<br>Сила:<br>Ловкость:<br>Интуиция:<br>Выносливость:<br>Интеллект:<br>Мудрость:<br>Местонахождение:';
         $variables =
             $this->level . '<br>' .
-            parent::getStat('strength') . '<br>' .
-            parent::getStat('dexterity') . '<br>' .
-            parent::getStat('intuition') . '<br>' .
-            parent::getStat('endurance') . '<br>' .
-            parent::getStat('intelligence') . '<br>' .
-            parent::getStat('wisdom') . '<br>' .
+            parent::getFullStats()->allStrength . '<br>' .
+            parent::getFullStats()->allDexterity . '<br>' .
+            parent::getFullStats()->allIntuition . '<br>' .
+            parent::getFullStats()->allEndurance . '<br>' .
+            parent::getFullStats()->allIntelligence . '<br>' .
+            parent::getFullStats()->allWisdom . '<br>' .
             Rooms::$roomNames[$this->room];
         if ($isMainWindow) {
             $this->Bank = new Bank($this->id);
diff --git a/main.php b/main.php
index 4d115b5..9683a07 100644
--- a/main.php
+++ b/main.php
@@ -381,17 +381,17 @@ Template::header('Игра');
             <!--Параметры-->
             <div>
                 <div class="container">
-                    Сила: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('strength', 1) . '(' . strval($userStats->getStrength() + $getItemsBonuses->getStrengthBonus()) . ')' : $userStats->getStrength() + $getItemsBonuses->getStrengthBonus()) ?>
+                    Сила: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('strength', 1) . '(' . strval($userStats->getFullStats()->allStrength) . ')' : $userStats->getFullStats()->allStrength) ?>
                     <br>
-                    Ловкость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('dexterity', 1) . '(' . strval($userStats->getDexterity() + $getItemsBonuses->getDexterityBonus()) . ')' : $userStats->getDexterity() + $getItemsBonuses->getDexterityBonus()) ?>
+                    Ловкость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('dexterity', 1) . '(' . strval($userStats->getFullStats()->allDexterity) . ')' : $userStats->getFullStats()->allDexterity) ?>
                     <br>
-                    Интуиция: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intuition', 1) . '(' . strval($userStats->getIntuition() + $getItemsBonuses->getIntuitionBonus()) . ')' : $userStats->getIntuition() + $getItemsBonuses->getIntuitionBonus()) ?>
+                    Интуиция: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intuition', 1) . '(' . strval($userStats->getFullStats()->allIntuition) . ')' : $userStats->getFullStats()->allIntuition) ?>
                     <br>
-                    Выносливость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('endurance', 1) . '(' . strval($userStats->getEndurance() + $getItemsBonuses->getEnduranceBonus()) . ')' : $userStats->getEndurance() + $getItemsBonuses->getEnduranceBonus()) ?>
+                    Выносливость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('endurance', 1) . '(' . strval($userStats->getFullStats()->allEndurance) . ')' : $userStats->getFullStats()->allEndurance) ?>
                     <br>
-                    Интеллект: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intelligence', 1) . '(' . strval($userStats->getIntelligence() + $getItemsBonuses->getIntelliganceBonus()) . ')' : $userStats->getIntelligence() + $getItemsBonuses->getIntelliganceBonus()) ?>
+                    Интеллект: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intelligence', 1) . '(' . strval($userStats->getFullStats()->allIntelligence) . ')' : $userStats->getFullStats()->allIntelligence) ?>
                     <br>
-                    Мудрость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('wisdom', 1) . '(' . strval($userStats->getWisdom() + $getItemsBonuses->getWisdomBonus()) . ')' : $userStats->getWisdom() + $getItemsBonuses->getWisdomBonus()) ?>
+                    Мудрость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('wisdom', 1) . '(' . strval($userStats->getFullStats()->allWisdom) . ')' : $userStats->getFullStats()->allWisdom) ?>
                     <br>
                     <?php if ($userStats->getFreeStatPoints()): ?>
                         <small style="color: darkgreen;">Возможных
@@ -438,7 +438,7 @@ Template::header('Игра');
             <div> <!--рюкзак-->
                 <table style="border: 0; padding: 2px; border-spacing: 1px; width: 100%; background-color: #a5a5a5">
                     <caption>Рюкзак
-                        (масса: <?= '?? /' . $userStats->getStrength() * 4 ?>)
+                        (масса: <?= '?? /' . (int)$userStats->getStrength() * 4 ?>)
                     </caption>
                     <?php
                     foreach ($iteminfo as $ii) {