lopar/battles
lopar/battles
0
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

Compare commits

base: lopar:26ed4cd286e7e7c16d8a5015f806e4a22945a1c8
Branches Tags
lopar:master
lopar:dev
lopar:dev-arena
...
compare: lopar:1d2128830fa5d7f9c16f917f225c1d6a20364d8b
Branches Tags
lopar:dev
lopar:master
lopar:dev-arena

2 Commits
26ed4cd286 ... 1d2128830f

Author SHA1 Message Date
lopar
1d2128830f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	classes/Battles/UserInfo.php
#	main.php
 2021-03-11 20:21:00 +02:00
lopar
484695af10 Отображение стат+бонус вместо чистого стата там, где это необходимо. Унификация запроса переменной. #18 2021-03-11 20:19:31 +02:00
3 changed files with 24 additions and 24 deletions
Show Stats Expand all files Collapse all files

12
classes/Battles/UserInfo.php
View File

@ -53,12 +53,12 @@ class UserInfo extends UserStats
$captions = 'Уровень:<br>Сила:<br>Ловкость:<br>Интуиция:<br>Выносливость:<br>Интеллект:<br>Мудрость:<br>Местонахождение:'; $captions = 'Уровень:<br>Сила:<br>Ловкость:<br>Интуиция:<br>Выносливость:<br>Интеллект:<br>Мудрость:<br>Местонахождение:';
$variables = $variables =
$this->level . '<br>' . $this->level . '<br>' .
parent::getFullStats()->allStrength . '<br>' . parent::getFullStats()->strength . '<br>' .
parent::getFullStats()->allDexterity . '<br>' . parent::getFullStats()->dexterity . '<br>' .
parent::getFullStats()->allIntuition . '<br>' . parent::getFullStats()->intuition . '<br>' .
parent::getFullStats()->allEndurance . '<br>' . parent::getFullStats()->endurance . '<br>' .
parent::getFullStats()->allIntelligence . '<br>' . parent::getFullStats()->intelligence . '<br>' .
parent::getFullStats()->allWisdom . '<br>' . parent::getFullStats()->wisdom . '<br>' .
Rooms::$roomNames[$this->room]; Rooms::$roomNames[$this->room];
if ($isMainWindow) { if ($isMainWindow) {
$this->Bank = new Bank($this->id); $this->Bank = new Bank($this->id);

12
classes/Battles/UserStats.php
View File

@ -221,12 +221,12 @@ class UserStats extends User
{ {
$query = " $query = "
select 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(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 allDexterity, 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 allIntuition, 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 allEndurance, 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 allIntelligence, 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 allWisdom 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"; from users where id = $this->id";
return self::$db->ofetch($query); return self::$db->ofetch($query);
} }

24
main.php
View File

@ -164,12 +164,12 @@ function dressitem($id)
$error = DRESSITEM_ERROR['ITEM_NOT_FOUND']; $error = DRESSITEM_ERROR['ITEM_NOT_FOUND'];
} else { } else {
$selectedItem = $selectedItemRow->fetch_object(); $selectedItem = $selectedItemRow->fetch_object();
if ($selectedItem->need_strength > $userStats->getFullStats()->allStrength if ($selectedItem->need_strength > $userStats->getFullStats()->strength
|| $selectedItem->need_dexterity > $userStats->getFullStats()->allDexterity || $selectedItem->need_dexterity > $userStats->getFullStats()->dexterity
|| $selectedItem->need_intuition > $userStats->getFullStats()->allIntuition || $selectedItem->need_intuition > $userStats->getFullStats()->intuition
|| $selectedItem->need_endurance > $userStats->getFullStats()->allEndurance || $selectedItem->need_endurance > $userStats->getFullStats()->endurance
|| $selectedItem->need_intelligence > $userStats->getFullStats()->allIntelligence || $selectedItem->need_intelligence > $userStats->getFullStats()->intelligence
|| $selectedItem->need_wisdom > $userStats->getFullStats()->allWisdom) { || $selectedItem->need_wisdom > $userStats->getFullStats()->wisdom) {
$error = DRESSITEM_ERROR['REQUIREMENTS_NOT_MET']; $error = DRESSITEM_ERROR['REQUIREMENTS_NOT_MET'];
} else { } 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); $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('Игра');
<!--Параметры--> <!--Параметры-->
<div> <div>
<div class="container"> <div class="container">
Сила: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('strength', 1) . '(' . strval($userStats->getFullStats()->allStrength) . ')' : $userStats->getFullStats()->allStrength) ?> Сила: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('strength', 1) . '(' . strval($userStats->getFullStats()->strength) . ')' : $userStats->getFullStats()->strength) ?>
<br> <br>
Ловкость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('dexterity', 1) . '(' . strval($userStats->getFullStats()->allDexterity) . ')' : $userStats->getFullStats()->allDexterity) ?> Ловкость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('dexterity', 1) . '(' . strval($userStats->getFullStats()->dexterity) . ')' : $userStats->getFullStats()->dexterity) ?>
<br> <br>
Интуиция: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intuition', 1) . '(' . strval($userStats->getFullStats()->allIntuition) . ')' : $userStats->getFullStats()->allIntuition) ?> Интуиция: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intuition', 1) . '(' . strval($userStats->getFullStats()->intuition) . ')' : $userStats->getFullStats()->intuition) ?>
<br> <br>
Выносливость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('endurance', 1) . '(' . strval($userStats->getFullStats()->allEndurance) . ')' : $userStats->getFullStats()->allEndurance) ?> Выносливость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('endurance', 1) . '(' . strval($userStats->getFullStats()->endurance) . ')' : $userStats->getFullStats()->endurance) ?>
<br> <br>
Интеллект: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intelligence', 1) . '(' . strval($userStats->getFullStats()->allIntelligence) . ')' : $userStats->getFullStats()->allIntelligence) ?> Интеллект: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('intelligence', 1) . '(' . strval($userStats->getFullStats()->intelligence) . ')' : $userStats->getFullStats()->intelligence) ?>
<br> <br>
Мудрость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('wisdom', 1) . '(' . strval($userStats->getFullStats()->allWisdom) . ')' : $userStats->getFullStats()->allWisdom) ?> Мудрость: <?= ($userStats->getFreeStatPoints() ? $userStats->getStat('wisdom', 1) . '(' . strval($userStats->getFullStats()->wisdom) . ')' : $userStats->getFullStats()->wisdom) ?>
<br> <br>
<?php if ($userStats->getFreeStatPoints()): ?> <?php if ($userStats->getFreeStatPoints()): ?>
<small style="color: darkgreen;">Возможных <small style="color: darkgreen;">Возможных