From d84a36fa3107dfac6f60a473ba90f1a28a21b5e1 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Wed, 12 Dec 2018 00:26:21 +0200
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BD=D1=83=D1=81=D1=8B=20=D0=B7?=
 =?UTF-8?q?=D0=B0=20=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.php | 113 +++++++++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 58 deletions(-)

diff --git a/main.php b/main.php
index 101cb75..21b9a71 100644
--- a/main.php
+++ b/main.php
@@ -1812,55 +1812,54 @@ if (input::get('edit')) {
                 <br>Побед: <b><?= $user['win'] ?></b>
                 <br>Поражений: <b><?= $user['lose'] ?></b>
                 <br>Ничьих: <b><?= $user['nich'] ?></b>
-                <br>
                 <br>Деньги: <b><?= $user['money'] ?></b> кр.
                 <br>Репутация: <b><?= $user['doblest'] ?></b> реп.
                 <HR>
             </div>
             <!--Параметры-->
             <div>
-                <!--href='?up=11&edit=1&s4i=".($user['sid'])."'-->
-                Сила: <?= $user['sila'] ?>
-                <?php if (!empty($user['stats'])): ?>
-                    <img src=i/up.gif onclick="location.href='?edit=1&ups=sila'">
-                <?php endif; ?>
-                <br>
-                Ловкость: <?= $user['lovk'] ?>
-                <?php if (!empty($user['stats'])): ?>
-                    <img src=i/up.gif onclick="location.href='?edit=1&ups=lovk'">
-                <?php endif; ?>
-                <br>
-                Интуиция: <?= $user['inta'] ?>
-                <?php if (!empty($user['stats'])): ?>
-                    <img src=i/up.gif onclick="location.href='?edit=1&ups=inta'">
-                <?php endif; ?>
-                <br>
-                Выносливость: <?= $user['vinos'] ?>
-                <?php if (!empty($user['stats'])): ?>
-                    <img src=i/up.gif onclick="location.href='?edit=1&ups=vinos'">
-                <?php endif; ?>
-                <br>
-                Интеллект: <?= $user['intel'] ?>
-                <?php if (!empty($user['stats'])): ?>
-                    <img src=i/up.gif onclick="location.href='?edit=1&ups=intel'">
-                <?php endif; ?>
-                <br>
-                Мудрость: <?= $user['mudra'] ?>
-                <?php if (!empty($user['stats'])): ?>
-                    <img src=i/up.gif onclick="location.href='?edit=1&ups=mudra'">
-                <?php endif; ?>
-                <br>
-                <small style="color: darkgreen;">Возможных увеличений: <?= $user['stats'] ?></small>
-                <br>
-
+                <div class="container">
+                    Сила: <?= $user['sila'] ?>
+                    <?php if (!empty($user['stats'])): ?>
+                        <img src=i/up.gif onclick="location.href='?edit=1&ups=sila'">
+                    <?php endif; ?>
+                    <br>
+                    Ловкость: <?= $user['lovk'] ?>
+                    <?php if (!empty($user['stats'])): ?>
+                        <img src=i/up.gif onclick="location.href='?edit=1&ups=lovk'">
+                    <?php endif; ?>
+                    <br>
+                    Интуиция: <?= $user['inta'] ?>
+                    <?php if (!empty($user['stats'])): ?>
+                        <img src=i/up.gif onclick="location.href='?edit=1&ups=inta'">
+                    <?php endif; ?>
+                    <br>
+                    Выносливость: <?= $user['vinos'] ?>
+                    <?php if (!empty($user['stats'])): ?>
+                        <img src=i/up.gif onclick="location.href='?edit=1&ups=vinos'">
+                    <?php endif; ?>
+                    <br>
+                    Интеллект: <?= $user['intel'] ?>
+                    <?php if (!empty($user['stats'])): ?>
+                        <img src=i/up.gif onclick="location.href='?edit=1&ups=intel'">
+                    <?php endif; ?>
+                    <br>
+                    Мудрость: <?= $user['mudra'] ?>
+                    <?php if (!empty($user['stats'])): ?>
+                        <img src=i/up.gif onclick="location.href='?edit=1&ups=mudra'">
+                    <?php endif; ?>
+                    <br>
+                    <small style="color: darkgreen;">Возможных увеличений: <?= $user['stats'] ?></small>
+                    <br><br>
+                </div>
                 <?
                 $mf = countmf();
                 $min_dmg = 0;
                 $max_dmg = 0;
 
-                $item_mf = db::c()->query('SELECT `id` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 1 AND `add_proc_mf` > 0',$_SESSION['uid'])->fetch_assoc();
-                $item_damage = db::c()->query('SELECT `id` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 1 AND `add_proc_uron` > 0',$_SESSION['uid'])->fetch_assoc();
-                $item_bron = db::c()->query('SELECT `id` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 1 AND `add_proc_bron` > 0',$_SESSION['uid'])->fetch_assoc();
+                $item_mf = db::c()->query('SELECT `id` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 1 AND `add_proc_mf` > 0', $_SESSION['uid'])->fetch_assoc();
+                $item_damage = db::c()->query('SELECT `id` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 1 AND `add_proc_uron` > 0', $_SESSION['uid'])->fetch_assoc();
+                $item_bron = db::c()->query('SELECT `id` FROM `inventory` WHERE `owner` = ?i AND `dressed` = 1 AND `add_proc_bron` > 0', $_SESSION['uid'])->fetch_assoc();
 
                 if (isset($item_mf['id'])) {
                     $max_mf = max_mf();
@@ -1910,7 +1909,7 @@ if (input::get('edit')) {
                         echo '<span style=\'color: Green;\'>(' . $add_mf . '%)</span>';
                     } ?></span><br>
 
-                <div class="container" bit=1>
+                <div class="container">
                     <b>Владение оружием:</b>
                     <br>Кинжалами: <?= $user['noj'] ?>
                     <?php if (!empty($user['stats'])): ?>
@@ -1928,8 +1927,7 @@ if (input::get('edit')) {
                     <?php if (!empty($user['stats'])): ?>
                         <img src=i/up.gif onclick="location.href='?edit=1&upm=topor'">
                     <?php endif; ?>
-                    <br>
-
+                    <br><br>
                     <b>Владение магией:</b>
                     <br>Магия огня: <?= $user['mfire'] ?>
                     <?php if (!empty($user['stats'])): ?>
@@ -1961,26 +1959,25 @@ if (input::get('edit')) {
                     <?php endif; ?>
                     <br>
                     <small style="color: darkgreen;">Возможных увеличений: <?= $user['master'] ?></small>
-                    <br>
+                    <br><br>
+                </div>
+                <div class="container">
+                    Броня головы: <?= $mf['bron1'] + $var_brons['a1'] ?><? if (isset($item_bron['id'])) {
+                        echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
+                    } ?><BR>
+                    Броня корпуса: <?= $mf['bron2'] + $var_brons['a2'] ?><? if (isset($item_bron['id'])) {
+                        echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
+                    } ?><BR>
+                    Броня пояса: <?= $mf['bron3'] + $var_brons['a3'] ?><? if (isset($item_bron['id'])) {
+                        echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
+                    } ?><BR>
+                    Броня ног: <?= $mf['bron4'] + $var_brons['a4'] ?><? if (isset($item_bron['id'])) {
+                        echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
+                    } ?><BR>
                 </div>
 
-                Броня головы: <?= $mf['bron1'] + $var_brons['a1'] ?><? if (isset($item_bron['id'])) {
-                    echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
-                } ?><BR>
-                Броня корпуса: <?= $mf['bron2'] + $var_brons['a2'] ?><? if (isset($item_bron['id'])) {
-                    echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
-                } ?><BR>
-                Броня пояса: <?= $mf['bron3'] + $var_brons['a3'] ?><? if (isset($item_bron['id'])) {
-                    echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
-                } ?><BR>
-                Броня ног: <?= $mf['bron4'] + $var_brons['a4'] ?><? if (isset($item_bron['id'])) {
-                    echo '<span style=\'color: Green;\'>(' . $add_bron . '%)</span>';
-                } ?><BR>
-
-
                 <?
-                if (($user['sila'] >= 25 || $user['lovk'] >= 25 || $user['inta'] >= 25 || $user['vinos'] >= 25 || $user['intel'] >= 25) && $user['level'] == 25) {
-
+                if (($user['sila'] >= 25 || $user['lovk'] >= 25 || $user['inta'] >= 25 || $user['vinos'] >= 25 || $user['intel'] >= 25)) {
 
                     if ($user['sila'] >= 25) {
                         $sila['fauvorot'] = 10;