diff --git a/classes/ShopItem.php b/classes/ShopItem.php index 633c87a..28d2104 100644 --- a/classes/ShopItem.php +++ b/classes/ShopItem.php @@ -37,21 +37,21 @@ class ShopItem extends Item { switch ($shopType) { default: - $btnPrice = "Купить за " . intval($this->cost) . " кр."; + $btnValue = "Купить за " . intval($this->cost) . " кр."; $btnLink = "/shop.php?buy={$this->id}&rnd=" . mt_rand(); break; case 'ashop': - $btnPrice = "Купить за " . intval($this->ecost) . " eкр."; + $btnValue = "Купить за " . intval($this->ecost) . " eкр."; $btnLink = "/ashop.php?buy={$this->id}&rnd=" . mt_rand(); break; case 'sell': - $btnPrice = "Продать"; + $btnValue = "Продать"; $btnLink = "/shop.php?sell={$this->id}&rnd=".mt_rand(); break; } echo << BTN; if ($this->count > 0) echo "
В наличии: {$this->count} штук"; diff --git a/functions.php b/functions.php index c1c6f86..580f03a 100644 --- a/functions.php +++ b/functions.php @@ -1456,17 +1456,6 @@ function showpersout($pas = 0) //FIXME Сделать по человеческ - - - - - - - - -
- 10500, '2' => 23500, '3' => 38500, '4' => 57000, '5' => 77000, '6' => 103000, '7' => 136500, '8' => 171500, '9' => 212500, '10' => 257500]; $returnHTML = ''; $incmagic = []; $up = ''; @@ -1706,9 +1694,6 @@ function showitem($row, $type = null, $returned = false, $infOnly = false) $returnHTML .= " Этот предмет вам подарил {$row["; // Конец первой строчки - if ($row['type'] == 24 && $type != 11) - $returnHTML .= "
Уровень руны: " . $row['rune_level'] . " (" . $row['rune_exp'] . "/" . $runes_exp[$row['rune_level'] + 1] . ")"; - if (!empty($row['ecost'])) { $returnHTML .= "
Предмет куплен за еврокредиты."; } elseif (!empty($row['point'])) { @@ -1876,34 +1861,6 @@ function showitem($row, $type = null, $returned = false, $infOnly = false) echo $returnHTML; } -function show_rune($slot, $uid, $type = 0) -{ - global $user; - $runes_exp = ['1' => 10500, '2' => 23500, '3' => 38500, '4' => 57000, '5' => 77000, '6' => 103000, '7' => 136500, '8' => 171500, '9' => 212500, '10' => 257500]; - $us = db::c()->query('SELECT `id`, `rune_1`, `rune_2`, `rune_3` FROM `users` WHERE `id` = ?i', $uid)->fetch_assoc(); - if (isset($us['id'])) { - if ($us['rune_' . $slot] > 0) { - $ruid = $us['rune_' . $slot]; - $rtype = (23 + $slot); - $dress = db::c()->query('SELECT `id`, `img`, `name`, `duration`, `maxdur`, `rune_level`, `rune_exp` FROM `inventory` WHERE `id` = ?i AND `owner` = ?i', $ruid, $us['id'])->fetch_assoc(); - if (isset($dress['id'])) { - if ($us['id'] == $user['id'] && $type == 1) { - $r = ''; - } else { - $r = ''; - } - } else { - $r = ''; - } - } else { - $r = ''; - } - } else { - $r = ''; - } - return $r; -} - function undressall($id) { for ($i = 1; $i <= 26; $i++) { diff --git a/main.php b/main.php index 825c0c7..6e8af9d 100644 --- a/main.php +++ b/main.php @@ -604,17 +604,6 @@ function showpersinv($id)
- - - - - - - - - -
- + кр.
- + .
- +