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 = 'Уровень:
Сила:
Ловкость:
Интуиция:
Выносливость:
Интеллект:
Мудрость:
Местонахождение:'; $variables = $this->level . '
' . - parent::getStat('strength') . '
' . - parent::getStat('dexterity') . '
' . - parent::getStat('intuition') . '
' . - parent::getStat('endurance') . '
' . - parent::getStat('intelligence') . '
' . - parent::getStat('wisdom') . '
' . + parent::getFullStats()->allStrength . '
' . + parent::getFullStats()->allDexterity . '
' . + parent::getFullStats()->allIntuition . '
' . + parent::getFullStats()->allEndurance . '
' . + parent::getFullStats()->allIntelligence . '
' . + parent::getFullStats()->allWisdom . '
' . 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('Игра');
- Сила: getFreeStatPoints() ? $userStats->getStat('strength', 1) . '(' . strval($userStats->getStrength() + $getItemsBonuses->getStrengthBonus()) . ')' : $userStats->getStrength() + $getItemsBonuses->getStrengthBonus()) ?> + Сила: getFreeStatPoints() ? $userStats->getStat('strength', 1) . '(' . strval($userStats->getFullStats()->allStrength) . ')' : $userStats->getFullStats()->allStrength) ?>
- Ловкость: getFreeStatPoints() ? $userStats->getStat('dexterity', 1) . '(' . strval($userStats->getDexterity() + $getItemsBonuses->getDexterityBonus()) . ')' : $userStats->getDexterity() + $getItemsBonuses->getDexterityBonus()) ?> + Ловкость: getFreeStatPoints() ? $userStats->getStat('dexterity', 1) . '(' . strval($userStats->getFullStats()->allDexterity) . ')' : $userStats->getFullStats()->allDexterity) ?>
- Интуиция: getFreeStatPoints() ? $userStats->getStat('intuition', 1) . '(' . strval($userStats->getIntuition() + $getItemsBonuses->getIntuitionBonus()) . ')' : $userStats->getIntuition() + $getItemsBonuses->getIntuitionBonus()) ?> + Интуиция: getFreeStatPoints() ? $userStats->getStat('intuition', 1) . '(' . strval($userStats->getFullStats()->allIntuition) . ')' : $userStats->getFullStats()->allIntuition) ?>
- Выносливость: getFreeStatPoints() ? $userStats->getStat('endurance', 1) . '(' . strval($userStats->getEndurance() + $getItemsBonuses->getEnduranceBonus()) . ')' : $userStats->getEndurance() + $getItemsBonuses->getEnduranceBonus()) ?> + Выносливость: getFreeStatPoints() ? $userStats->getStat('endurance', 1) . '(' . strval($userStats->getFullStats()->allEndurance) . ')' : $userStats->getFullStats()->allEndurance) ?>
- Интеллект: getFreeStatPoints() ? $userStats->getStat('intelligence', 1) . '(' . strval($userStats->getIntelligence() + $getItemsBonuses->getIntelliganceBonus()) . ')' : $userStats->getIntelligence() + $getItemsBonuses->getIntelliganceBonus()) ?> + Интеллект: getFreeStatPoints() ? $userStats->getStat('intelligence', 1) . '(' . strval($userStats->getFullStats()->allIntelligence) . ')' : $userStats->getFullStats()->allIntelligence) ?>
- Мудрость: getFreeStatPoints() ? $userStats->getStat('wisdom', 1) . '(' . strval($userStats->getWisdom() + $getItemsBonuses->getWisdomBonus()) . ')' : $userStats->getWisdom() + $getItemsBonuses->getWisdomBonus()) ?> + Мудрость: getFreeStatPoints() ? $userStats->getStat('wisdom', 1) . '(' . strval($userStats->getFullStats()->allWisdom) . ')' : $userStats->getFullStats()->allWisdom) ?>
getFreeStatPoints()): ?> Возможных @@ -438,7 +438,7 @@ Template::header('Игра');
Рюкзак - (масса: getStrength() * 4 ?>) + (масса: getStrength() * 4 ?>)