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..0794276 100644
--- a/classes/Battles/UserInfo.php
+++ b/classes/Battles/UserInfo.php
@@ -53,12 +53,12 @@ class UserInfo extends UserStats
$captions = 'Уровень:
Сила:
Ловкость:
Интуиция:
Выносливость:
Интеллект:
Мудрость:
Местонахождение:';
$variables =
$this->level . '
' .
- parent::getStat('strength') . '
' .
- parent::getStat('dexterity') . '
' .
- parent::getStat('intuition') . '
' .
- parent::getStat('endurance') . '
' .
- parent::getStat('intelligence') . '
' .
- parent::getStat('wisdom') . '
' .
+ parent::getFullStats()->strength . '
' .
+ parent::getFullStats()->dexterity . '
' .
+ parent::getFullStats()->intuition . '
' .
+ parent::getFullStats()->endurance . '
' .
+ parent::getFullStats()->intelligence . '
' .
+ parent::getFullStats()->wisdom . '
' .
Rooms::$roomNames[$this->room];
if ($isMainWindow) {
$this->Bank = new Bank($this->id);
diff --git a/classes/Battles/UserStats.php b/classes/Battles/UserStats.php
index 74a5055..09ce3d9 100644
--- a/classes/Battles/UserStats.php
+++ b/classes/Battles/UserStats.php
@@ -221,12 +221,12 @@ class UserStats extends User
{
$query = "
select
- sum(greatest(strength + (ifnull((select sum(add_strength) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as allStrength,
- sum(greatest(dexterity + (ifnull((select sum(add_dexterity) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as allDexterity,
- sum(greatest(intuition + (ifnull((select sum(add_intuition) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as allIntuition,
- sum(greatest(endurance + (ifnull((select sum(add_endurance) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as allEndurance,
- sum(greatest(intelligence + (ifnull((select sum(add_intelligence) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as allIntelligence,
- sum(greatest(wisdom + (ifnull((select sum(add_wisdom) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as allWisdom
+ sum(greatest(strength + (ifnull((select sum(add_strength) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as strength,
+ sum(greatest(dexterity + (ifnull((select sum(add_dexterity) from inventory where dressed_slot != 0 and owner_id = $this->id), 0)), 0)) as dexterity,
+ 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
from users where id = $this->id";
return self::$db->ofetch($query);
}
diff --git a/main.php b/main.php
index 4d115b5..04e240b 100644
--- a/main.php
+++ b/main.php
@@ -164,12 +164,12 @@ function dressitem($id)
$error = DRESSITEM_ERROR['ITEM_NOT_FOUND'];
} else {
$selectedItem = $selectedItemRow->fetch_object();
- if ($selectedItem->need_strength > $userStats->getFullStats()->allStrength
- || $selectedItem->need_dexterity > $userStats->getFullStats()->allDexterity
- || $selectedItem->need_intuition > $userStats->getFullStats()->allIntuition
- || $selectedItem->need_endurance > $userStats->getFullStats()->allEndurance
- || $selectedItem->need_intelligence > $userStats->getFullStats()->allIntelligence
- || $selectedItem->need_wisdom > $userStats->getFullStats()->allWisdom) {
+ if ($selectedItem->need_strength > $userStats->getFullStats()->strength
+ || $selectedItem->need_dexterity > $userStats->getFullStats()->dexterity
+ || $selectedItem->need_intuition > $userStats->getFullStats()->intuition
+ || $selectedItem->need_endurance > $userStats->getFullStats()->endurance
+ || $selectedItem->need_intelligence > $userStats->getFullStats()->intelligence
+ || $selectedItem->need_wisdom > $userStats->getFullStats()->wisdom) {
$error = DRESSITEM_ERROR['REQUIREMENTS_NOT_MET'];
} else {
$itemInSlotRow = db::c()->query('SELECT dressed_slot FROM inventory WHERE owner_id = ?i AND dressed_slot > 0 AND item_type = ?i', $_SESSION['uid'], $selectedItem->item_type);
@@ -381,17 +381,17 @@ Template::header('Игра');