Не прогрузилась таблица inventory (SUM) для класса DressedItems.
';
+ echo 'Не прогрузилась таблица inventory (SUM) для класса DressedItems:' . $e . '
';
}
}
- public function getItemsInSlots($user_id)
+ public function getItemsInSlots()
{
if (!$this->DB) {
- $this->getDressedItems($user_id);
+ $this->getDressedItems();
}
while ($row = $this->DB->fetch_assoc()) {
$dressed_item[$row['dressed_slot']] = $row;
@@ -57,12 +70,50 @@ SQL;
}
}
- public function getBonusesAmount($user_id)
+ protected function getBonuses()
{
if (!$this->DBSUM) {
- $this->getBonusesFromDressedItems($user_id);
+ $this->getBonusesFromDressedItems();
}
return $this->DBSUM;
}
+ public function getStrengthBonus()
+ {
+ return $this->getBonuses()['sum_strength'];
+ }
+ public function getDexterityBonus()
+ {
+ return $this->getBonuses()['sum_dexterity'];
+ }
+ public function getIntuitionBonus()
+ {
+ return $this->getBonuses()['sum_intuition'];
+ }
+ public function getEnduranceBonus()
+ {
+ return $this->getBonuses()['sum_endurance'];
+ }
+ public function getIntelliganceBonus()
+ {
+ return $this->getBonuses()['sum_intelligence'];
+ }
+ public function getWisdomBonus()
+ {
+ return $this->getBonuses()['sum_wisdom'];
+ }
+ public function getAccuracyBonus()
+ {
+ return $this->getBonuses()['sum_accuracy'];
+ }
+ public function getDodgeBonus()
+ {
+ return $this->getBonuses()['sum_dodge'];
+ }
+ public function getCriticalsBonus()
+ {
+ return $this->getBonuses()['sum_criticals'];
+ }
+
+
}
\ No newline at end of file
diff --git a/classes/User.php b/classes/User.php
index 1cb1265..788b081 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -68,8 +68,8 @@ class User
private function UserInfoDoll($isBattle = 0, $isMain = 0)
{
//https://jsfiddle.net/ngx0yvhc
- $di = new DressedItems();
- $dressedItems = $di->getItemsInSlots($this->id);
+ $di = new DressedItems($this->id);
+ $dressedItems = $di->getItemsInSlots();
for ($i = 1; $i <= 12; $i++) {
echo sprintf('', $i);
diff --git a/main.php b/main.php
index d3dc861..21bdf74 100644
--- a/main.php
+++ b/main.php
@@ -329,8 +329,8 @@ function countmf()
$sokr = db::c()->query('SELECT 1 FROM `users_effects` WHERE `type` = 202 AND `owner_id` = ?i', $_SESSION['uid'])->getNumRows();
$user = new User($_SESSION['uid']);
- $userDressedItems = new DressedItems();
- $allBonuses = $userDressedItems->getBonusesAmount($_SESSION['uid']) ?? [];
+ $userDressedItemsBonuses = new DressedItems();
+
function GetWeaponType($idwep)
{
@@ -367,22 +367,17 @@ function countmf()
$mf = [];
//$user_dress = db::c()->query('SELECT SUM(`minu`), SUM(`maxu`), SUM(`mfkrit`), SUM(`mfakrit`), SUM(`mfuvorot`), SUM(`mfauvorot`), SUM(`bron1`), SUM(`bron2`), SUM(`bron3`), SUM(`bron4`) FROM `inventory` WHERE `dressed` = 1 AND `owner` = ?i', $user['id'])->fetch_row();
+ //FIXME Брони стало 3, а не 4.
+ $user_dress[6] = $bmfbron + $user->headArmor;
+ $user_dress[7] = $bmfbron + $user->chestArmor;
+ $user_dress[8] = $bmfbron + $user->legArmor;
+ $user_dress[9] = $bmfbron + $user->legArmor;
- $user_dress[6] = $bmfbron;
- $user_dress[7] = $bmfbron;
- $user_dress[8] = $bmfbron;
- $user_dress[9] = $bmfbron;
+ $mykrit = $allBonuses['sum_intuition'] * 2.95; /* + SUM(mfkrit) */
+ $myakrit = $allBonuses['sum_intuition'] * 2.75; /* + SUM(mfakrit) */
+ $myuvorot = $allBonuses['sum_dexterity'] * 5; /* + SUM(mfuvorot) */
+ $myauvorot = $allBonuses['sum_dexterity'] * 5; /* + SUM(mfauvorot) */
- $user_dress[6] += $user['ubron1'];
- $user_dress[7] += $user['ubron2'];
- $user_dress[8] += $user['ubron3'];
- $user_dress[9] += $user['ubron4'];
-
- $mykrit = $user_dress[2] + ($user['inta'] * 2.95);
- $myakrit = $user_dress[3] + ($user['inta'] * 2.75);
-
- $myuvorot = $user_dress[4] + ($user['lovk'] * 5);
- $myauvorot = $user_dress[5] + ($user['lovk'] * 4);
$mf['me'] = ['udar' => (floor($user['sila'] / 3) + 1 + $user_dress[0]), 'maxudar' => (floor($user['sila'] / 3) + 4 + $user_dress[1])];
@@ -946,6 +941,7 @@ if (input::get('edit')) {
showUserDoll(0, 1);
+ $showItemsBonuses = new DressedItems();
?>
Снять все
@@ -989,14 +985,18 @@ if (input::get('edit')) {
- Сила: = $showUser->getStrength(1) ?>
- Ловкость: = $showUser->getDexterity(1) ?>
- Интуиция: = $showUser->getIntuition(1) ?>
- Выносливость: = $showUser->getEndurance(1) ?>
- Интеллект: = $showUser->getIntelligence(1) ?>
- Мудрость: = $showUser->getWisdom(1) ?>
+ Сила: = $showUser->getStrength(1) + $showItemsBonuses->sumStrength ?>
+ Ловкость: = $showUser->getDexterity(1) + $showItemsBonuses->sumDexterity ?>
+ Интуиция: = $showUser->getIntuition(1) + $showItemsBonuses->sumIntuition ?>
+ Выносливость: = $showUser->getEndurance(1) + $showItemsBonuses->sumEndurance ?>
+ Интеллект: = $showUser->getIntelligence(1) + $showItemsBonuses->sumIntelligence ?>
+ Мудрость: = $showUser->getWisdom(1) + $showItemsBonuses->sumWisdom ?>
Возможных увеличений: = $showUser->stat_points ?>
+ Здоровье: = $showUser->getHealth() ?>
+ Уворот: ?? + $showItemsBonuses->sumDodge ?>
+ Точность: ?? + $showItemsBonuses->sumAccuracy ?>
+ Шанс крита: ?? + $showItemsBonuses->sumCriticals ?>