dev-fixes (#14)

Closes #9
2022-07-01 12:45:43 +00:00
parent a591872949
commit 9306b5f5d8
108 changed files with 12865 additions and 46114 deletions
@@ -0,0 +1,264 @@
+<?php
+
+namespace Insallah;
+
+class Achievements
+{
+    private $user;
+    private $info;
+    private $data = [
+        'zb' => [
+            'questname' => 'Åæåäí.Çàäàíèÿ',
+            'quest' => 'Âûïîëíèòü çàäàíèÿ áàáêè.',
+            'check' => ['Çàäàíèé', 5, 25, 50, 100, 250],
+            'prize' => ['Æåòîí <br>óñïåõà <br>', 5, 20, 40, 60, 100],
+            'startlink' => 11
+        ],
+        'vx' => [
+            'questname' => 'Õàîòè÷åñêèå áîè',
+            'quest' => 'Ïîáåäèòü â õàîòè÷åñêèõ áîÿõ.',
+            'check' => ['Ïîáåä', 50, 300, 400, 500, 1000],
+            'prize' => ['åêð.', 25, 50, 75, 100, 200],
+            'startlink' => 21
+        ],
+        'snt' => [
+            'questname' => 'Ñóíäóê òðóïîæîðà',
+            'quest' => 'Îòêðûòü ñóíäóê òðóïîæîðà.',
+            'check' => ['Îòêðûòèé', 5, 25, 50, 100, 250],
+            'prize' => ['åêð.', 10, 25, 50, 75, 200],
+            'startlink' => 31
+        ],
+        'rp' => [
+            'questname' => 'Ðóíû 8 ëâë.',
+            'quest' => 'Ïîëó÷èòü ðóíó ïðè ïëàâêå ïëîõèõ çàãîòîâîê. [S]',
+            'check' => ['Ðóí', 5, 10, 25, 50, 100],
+            'prize' => ['Ïëîõèå <br> çàãîòîâêè <br>', 5, 7, 10, 12, 15],
+            'startlink' => 41
+        ],
+        'rn' => [
+            'questname' => 'Ðóíû 9 ëâë.',
+            'quest' => 'Ïîëó÷èòü ðóíó ïðè ïëàâêå íîðìàëüíûõ çàãîòîâîê. [M]',
+            'check' => ['Ðóí', 5, 10, 15, 25, 50],
+            'prize' => ['Íîðìàëüíûå <br> çàãîòîâêè <br>', 5, 7, 9, 12, 15],
+            'startlink' => 51
+        ],
+        'rb' => [
+            'questname' => 'Ðóíû 10 ëâë.',
+            'quest' => 'Ïîëó÷èòü ðóíó ïðè ïëàâêå èäåàëüíûõ çàãîòîâîê. [L]',
+            'check' => ['Ðóí', 2, 5, 8, 11, 15],
+            'prize' => ['Èäåàëüíûå <br> çàãîòîâêè <br>', 2, 4, 6, 10, 15],
+            'startlink' => 61
+        ],
+        'pg' => [
+            'questname' => 'Ãåðîè÷. Ñðàæåíèÿ',
+            'quest' => 'Ïîó÷àñòâîâàòü â ãåðîè÷åñêîì ñðàæåíèè.',
+            'check' => ['Ó÷àñòèé', 100, 200, 400, 600, 1000],
+            'prize' => ['Æåòîí <br>óñïåõà <br>', 10, 20, 40, 60, 80],
+            'startlink' => 71
+        ],
+        'bv' => [
+            'questname' => 'Ïðîäàæè Áàáóøêå',
+            'quest' => 'Ïðîäàòü áàáóøêå íàéäåííûå âåùè â ïåùåðå.',
+            'check' => ['Ïðîäàæ', 5, 25, 50, 100, 250],
+            'prize' => ['êð.', 500, 1000, 2000, 4000, 5000],
+            'startlink' => 81
+        ],
+        'kw' => [
+            'questname' => 'Êëàí Ïîåäèíêè',
+            'quest' => 'Ïîáåäèòü â êëàíîâîé âîéíå.',
+            'check' => ['Ïîáåä', 5, 10, 15, 20, 25],
+            'prize' => ['Ñâèòîê <br> êëàíîâîãî<br> îïûòà ', 1, 2, 5, 10, 15],
+            'startlink' => 91
+        ],
+        'pa' => [ # not implemented!
+            'questname' => 'Ïîêðîâèòåëüñòâî',
+            'quest' => 'Ïîëó÷èòü ïîêðîâèòåëüñòâî Àíãåëà.',
+            'check' => ['Ïîëó÷åíî', 5, 25, 50, 100, 250],
+            'prize' => null,
+            'startlink' => null
+        ],
+        'bs' => [
+            'questname' => 'Áàøíÿ ñìåðòè',
+            'quest' => 'Ïîáåäû â áàøíå ñìåðòè.',
+            'check' => ['Ïîáåä', 1, 5, 10, 50, 500],
+            'prize' => ['åêð.', 1, 5, 10, 50, 200],
+            'startlink' => 101
+        ],
+        'trn' => [ # not implemented!
+            'questname' => 'Òóðíèðû',
+            'quest' => 'Ïîó÷àâñòâîâàòü â òóðíèðàõ.',
+            'check' => ['Ïîáåä', 25, 50, 100, 200, 500],
+            'prize' => ['åêð.', 25, 25, 25, 25, 50],
+            'startlink' => 111
+        ],
+    ];
+
+    public function __construct(\user $user)
+    {
+        $this->user = $user;
+        $this->info = Db::getRow('select * from users_achiv where id = ?', [$user->info['id']]);
+    }
+
+    private function prizeName($int, $string)
+    {
+        return in_array($string, ['åêð.', 'êð.']) ? $int . ' ' . $string : $string . ' ' . $int;
+    }
+
+    private function drawSunduk($nagr, $whatInside, $tier)
+    {
+        return vsprintf('<img onclick="%s" onmouseover="%s" onmouseout="%s" onmousedown="%s" class="cp" src="%s" alt="Ñóíäóê">',
+            [
+                "location.href='\main.php?titul&nagr=$nagr'",
+                "top.hi(this, '<b>Ñóíäóê $tier ðàíãà<hr>Ñîäåðæèò:<hr> $whatInside</b>', event, 2, 0, 1, 1, 'max-width:307px')",
+                "top.hic();",
+                "top.hic();",
+                "https://img.new-combats.com/i/titul/nagr$tier.gif"
+            ]);
+    }
+
+    public function getList()
+    {
+        $string = '';
+        $this->calculateCurrent(1);
+
+        foreach ($this->data as $key => $value) {
+            //Áëÿ, êàêóþ õåðíþ ïðèõîäèòñÿ ãîðîäèòü!
+            //Ïåðâîå ÷èñëî = òðåáîâàíèå ñëåäóþùåãî òèðà ìèíóñ òðåáîâàíèå òåêóùåãî òèðà (íàäî íàáðàòü)
+            //Âòîðîå ÷èñëî = êîëè÷åñòâî äîñòèæåíèé ìèíóñ òðåáîâàíèå òåêóùåãî òèðà (íàáðàë)
+            //Òðåáîâàíèÿ òåêóùåãî òèðà îòíèìàþòñÿ ÷òîáû êàæäûé òèð íà÷èíàë ñ÷èòàòü ïðîöåíò ñ 0.
+            //Ïèçäû äàòü òîìó, êòî òàê óåáàíñêè íàçûâàåò ïåðåìåííûå, ÷òî íóæíî ïîëäíÿ âúåçæàòü ÷òî ïðîèñõîäèò.
+            //È õåð ïîìåíÿåøü - âñ¸ ñëîìàåòñÿ. FFUUUUUUUUUUUUUU!!! Ins.
+            $percentToSuccess = Math::get100Percentage(
+                $value['check'][$this->info['klas' . $key] + 1] - $value['check'][$this->info['klas' . $key]],
+                $this->info[$key] - $value['check'][$this->info['klas' . $key]]
+            );
+            $questname = empty($value['questname']) ? $value['quest'] : $value['questname'];
+            $string .= '<h4>' . $questname . '</h4>';
+            $string .= '<strong>' . $value['quest'] . '</strong><br>';
+            $string .= 'Òåêóùèé Ðàíã: <strong>' . $this->info['klas' . $key] . '</strong> ';
+            $string .= 'Êîëè÷åñòâî ' . mb_strtolower($value['check'][0]) . ': <strong>' . $this->info[$key] . ' =' . $percentToSuccess . '%</strong>';
+
+            $string .= Table::get([
+                ['Ðàíãè', 1, 2, 3, 4, 5],
+                $value['check'],
+                [
+                    'Íàãðàäà',
+                    $this->prizeName($value['prize'][1], $value['prize'][0]),
+                    $this->prizeName($value['prize'][2], $value['prize'][0]),
+                    $this->prizeName($value['prize'][3], $value['prize'][0]),
+                    $this->prizeName($value['prize'][4], $value['prize'][0]),
+                    $this->prizeName($value['prize'][5], $value['prize'][0])
+                ]
+            ], 'prizelist', true);
+            # If has new tier, AND only first 5 tiers AND prize is set.
+            if (
+                $this->info['klas' . $key] > $this->info[$key . '_n'] &&
+                in_array($this->info[$key . '_n'], [0, 1, 2, 3, 4]) &&
+                !empty($value['prize']) &&
+                !empty($value['startlink'])
+            ) {
+                $string .= '<br>Íàãðàäà:<br>';
+                $string .= $this->drawSunduk(
+                    $this->info[$key . '_n'] + $value['startlink'],
+                    $this->prizeName($value['prize'][$this->info[$key . '_n'] + 1], $value['prize'][0]),
+                    $this->info[$key . '_n'] + 1
+                );
+            }
+            $string .= '<hr>';
+        }
+        return $string;
+    }
+
+    private function calculateCurrent($check = null)
+    {
+        $this->info['bs'] = $this->user->info['win_bs'];
+        foreach ($this->info as $k => $v) {
+            if (
+                empty($this->info[$k]) &&
+                is_null($check) ||
+                $k === 'id' ||
+                !in_array($k, array_keys($this->data))
+            ) {
+                continue;
+            }
+
+            $this->info["klas$k"] = 0;
+            $this->info["name$k"] = $this->data[$k]['questname'];
+            $this->info["klasP$k"] = Math::get100Percentage($this->data[$k]['check'][1], $this->info[$k]);
+
+            for ($i = 1; $i <= 5; $i++) {
+                if ($this->info[$k] >= $this->data[$k]['check'][$i]) {
+                    $this->info["klas$k"] = $i;
+                    if ($i === 5) {
+                        # Íà 5 ðàíãå äîëæíî îòäàâàòü ìàêñèìóì.
+                        $this->info["klasP$k"] = 100;
+                    } else {
+                        $this->info["klasP$k"] = Math::get100Percentage(
+                            $this->data[$k]['check'][$i + 1] - $this->data[$k]['check'][$i],
+                            $this->info[$k] - $this->data[$k]['check'][$i]
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    public function getInfo($user_id = null)
+    {
+        if (!is_null($user_id)) {
+            $this->info = Db::getRow('select * from users_achiv where id = ?', [$user_id]);
+        }
+        $this->calculateCurrent();
+        return $this->info;
+    }
+
+    public function getCheckedInfo()
+    {
+        $this->calculateCurrent(1);
+        return $this->info;
+    }
+
+    private function addOne($name)
+    {
+        Db::sql("update users_achiv set $name = $name + 1 where id = ?", [$this->user->info['id']]);
+    }
+
+    public function updateTier($name)
+    {
+        if (in_array($name, array_keys($this->data))) {
+            $this->addOne($name . '_n');
+        }
+    }
+
+    public function updateCounter($name)
+    {
+        if (in_array($name, array_keys($this->data))) {
+            $this->addOne($name);
+        }
+    }
+
+    /**
+     * @return array[]
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    public function hasNoTier4Access($nagr)
+    {
+        return $this->user->info['level'] < 9 && in_array($nagr, [14, 15, 24, 25, 34, 35, 44, 45, 54, 55, 64, 65, 74, 75, 84, 85, 94, 95, 104, 105]);
+    }
+
+    public function givePrizeItems($itemId, $aType)
+    {
+        for ($i = 1; $i <= $this->data[$aType]['prize'][$this->info[$aType . '_n'] + 1]; $i++) {
+            $this->user->addItem($itemId, $this->user->info['id']);
+        }
+    }
+
+    public function getTypes()
+    {
+        return array_keys($this->data);
+    }
+}
@@ -0,0 +1,27 @@
+<?php
+
+namespace Insallah;
+
+/** All raw mathematics in one place. */
+class Math
+{
+    public static function getPercentage($total, $number)
+    {
+        return $total > 0 ? round(($number * 100) / $total, 2) : 0;
+    }
+
+
+    public static function get100Percentage($total, $number)
+    {
+        return min(self::getPercentage($total, $number), 100);
+    }
+
+    /** Number-20% and Number+20% */
+    public static function get20PercentRange($number)
+    {
+        return [
+            'min' => $number * ((100 - 20) / 100),
+            'max' => $number * ((100 + 20) / 100)
+        ];
+    }
+}
@@ -0,0 +1,22 @@
+<?php
+
+namespace Insallah;
+
+class Table
+{
+    public static function get($rows, $class = '', $fill = false)
+    {
+        $c = '';
+        $max_rows = sizeof(max($rows));
+
+
+        foreach ($rows as $row) {
+            if ($fill && sizeof($row) < $max_rows) {
+                $row = array_merge($row, array_fill(0, $max_rows - sizeof($row), ''));
+            }
+            $c .= '<tr><td>' . implode('</td><td>', $row) . '</td></tr>';
+        }
+
+        return (!empty($class) ? "<table class='$class'>" : '<table>') . $c . '</table>' . PHP_EOL;
+    }
+}
@@ -1,14 +1,35 @@
 <?php
-/** todo
- * В каком-то месте проверять по крону не протух ли турнир!
- */

 namespace Insallah;

 class Tournament
 {
+    const IS_ENABLED = true;
+    const SEND_CHAT_MESSAGE = 3;
+    const START_TOURNAMENT = 5;
+    const PRIZE1 = 25;
+    const PRIZE2 = 10;
+    const PRIZE3 = 5;
+    const MIN_EXP = 175000;
+    const CHAT_MESSAGE = 'Âíèìàíèå! Òóðíèð äëÿ %d óðîâíÿ îòêðûò! Ïîñïåøèòå ïðèíÿòü ó÷àñòèå â Çàëå Âîèíîâ!';
+    const VICTORY_MESSAGE = 'Òóðíèð äëÿ %d óðîâíåé çàâåðø¸í! Ïåðâîå ìåñòî: %s. Âòîðîå ìåñòî: %s. Òðåòüå ìåñòî: %s.';
+    const DELAY1 = '+12hour';
+    const DELAY2 = '+6hour';
+    const DELAY3 = '+3hour';
+
+    /** Ôîðìóëà ðàññ÷¸òà ðàçðåø¸ííîé ñòîèìîñòè îäåòûõ ïðåäìåòîâ.
+     *
+     * @param int $int
+     *
+     * @return float|int
+     */
+    public static function ekrOverpriceFormula($int)
+    {
+        return ($int - 7) * 151;
+    }
+
    /**
-     * Проверяем может ли игрок учавствовать в турнире и либо присоединяем его, либо обламываем.
+     * Ïðîâåðÿåì ìîæåò ëè èãðîê ó÷àâñòâîâàòü â òóðíèðå è ëèáî ïðèñîåäèíÿåì åãî, ëèáî îáëàìûâàåì.
     *
     * @param int $user_id
     *
@@ -16,9 +37,15 @@ class Tournament
     */
    public function join($user_id)
    {
-        /** Возвращает level, или 0 если провалены проверки. */
+        /** Âîçâðàùàåò level, èëè 0 åñëè ïðîâàëåíû ïðîâåðêè. */
        $userLevel = TournamentModel::getUserLevel($user_id);
-        if ($userLevel === 0) {
+        if (
+            $userLevel === 0 ||
+            TournamentModel::isEkrOverpriced($user_id, $userLevel) ||
+            !TournamentModel::isEnoughExperience($user_id) ||
+            TournamentModel::IsRestrictedToJoin($user_id) ||
+            TournamentModel::isStarted($user_id)
+        ) {
            return;
        }

@@ -28,41 +55,41 @@ class Tournament
        }

        TournamentModel::joinTournament($user_id, $userLevel);
+        $mq++;

-        /** На третьем участнике пишем уведомление в чат. */
-        if ($mq === 2) {
-            TournamentModel::sysMessage("Внимание! Идёт набор бойцов на турнир " . $userLevel . " уровня! Поспешите!");
+        if ($mq == self::SEND_CHAT_MESSAGE) {
+            TournamentModel::sysMessage(sprintf(self::CHAT_MESSAGE, $userLevel));
        }

-        /** На двенадцатом участнике начинаем турнир. */
-        if ($mq === 11) {
+        if ($mq == self::START_TOURNAMENT) {
            TournamentModel::startTournament($userLevel);
-            $this->check_members($userLevel);
        }
    }

    /**
-     * Проверяем есть ли ещё участники турнира. Если есть, отправляем драться. Если остался последний - значит он
-     * победитель.
-     * todo Обработать ничью!
-     *
-     * @param int $tournament_id
-     *
+     * Ïðîâåðêà äëÿ êðîíà\êîíôèãà. Âûáèâàåò ïðîèãðàâøèõ è ïåðåçàïóñêàåò ïîåäèíêè âî âñåõ òóðíèðàõ.
     * @return void
     */
-    private function check_members($tournament_id)
+    public function startAllBattles()
    {
-        $active_fighters = TournamentModel::getFreeFighters($tournament_id);
-        if (count($active_fighters) > 1) {
-            $this->start_battle($active_fighters);
-        } else {
-            TournamentModel::removeFighter($active_fighters[0]); // выбиваем победителя
-            $this->victory($tournament_id);
+        $db = new Db();
+        $db::sql('delete from tournaments where start_time + date_add(start_time,interval 30 minute) < unix_timestamp()');
+        TournamentModel::removeFighter(TournamentModel::getLooser());
+        $tournament_levels = $db::getColumn('select tid from tournaments where start_time = -1');
+        foreach ($tournament_levels as $level) {
+            $alive_fighters = TournamentModel::getFreeFighters($level);
+            if (count($alive_fighters) > 1) {
+                shuffle($alive_fighters);
+                $this->start_battle($alive_fighters);
+            } elseif (count($alive_fighters) === 1) {
+                TournamentModel::removeFighter($alive_fighters[0], true);
+                $this->victory($level);
+            }
        }
    }

    /**
-     * Получаем пары бойцов и начинаем их поединки.
+     * Ïîëó÷àåì ïàðû áîéöîâ è íà÷èíàåì èõ ïîåäèíêè.
     *
     * @param array $fighters_list
     *
@@ -79,23 +106,7 @@ class Tournament
    }

    /**
-     * Вызывается при проигрыше боя или при уходе в оффлайн.
-     *
-     * @param int $user_id
-     *
-     * @return void
-     */
-    public function kick_user($user_id)
-    {
-        if (empty($user_id)) {
-            return;
-        }
-        TournamentModel::removeFighter($user_id);
-        $this->check_members(TournamentModel::getTournamentIdByUserId($user_id)); //перезапуск выбора противника для поединка
-    }
-
-    /**
-     * Награждаем победителей турнира, чистим базу.
+     * Íàãðàæäàåì ïîáåäèòåëåé òóðíèðà, ÷èñòèì áàçó.
     *
     * @param int $tournament_id
     *
@@ -104,9 +115,21 @@ class Tournament
    private function victory($tournament_id)
    {
        $winners = TournamentModel::getWinners($tournament_id);
+        sleep(1);
+        TournamentModel::givePrizeItems($winners[1], self::PRIZE1);
+        TournamentModel::givePrizeItems($winners[2], self::PRIZE2);
+        TournamentModel::givePrizeItems($winners[3], self::PRIZE3);
+        sleep(1);
+        TournamentModel::giveDelay($winners[1], strtotime(self::DELAY1));
+        TournamentModel::giveDelay($winners[2], strtotime(self::DELAY2));
+        TournamentModel::giveDelay($winners[3], strtotime(self::DELAY3));
+        sleep(1);
+        TournamentModel::sysMessage(sprintf(self::VICTORY_MESSAGE,
+            $tournament_id,
+            TournamentModel::uidToLogin($winners[1]),
+            TournamentModel::uidToLogin($winners[2]),
+            TournamentModel::uidToLogin($winners[3])));
+        sleep(3);
        TournamentModel::destroyTournament($tournament_id);
-        TournamentModel::givePrizeItems($winners[1], 25);
-        TournamentModel::givePrizeItems($winners[2], 10);
-        TournamentModel::givePrizeItems($winners[3], 5);
    }
 }
@@ -1,12 +1,13 @@
 <?php

 namespace Insallah;
+
 class TournamentModel
 {

    /**
-     * проверка уровня, стоимости эквипа, прочие проверки, что персонаж свободен
-     * таймер ожидания 30 минут
+     * ïðîâåðêà óðîâíÿ, ñòîèìîñòè ýêâèïà, ïðî÷èå ïðîâåðêè, ÷òî ïåðñîíàæ ñâîáîäåí
+     * òàéìåð îæèäàíèÿ 30 ìèíóò
     *
     * @param int $uid
     *
@@ -14,22 +15,64 @@ class TournamentModel
     */
    public static function getUserLevel($uid)
    {
-        $db = new Db;
+        $db = new Db();
        $level = $db::getValue('select level from users where id = ? and level between 8 and 12 and battle = 0', [$uid]);
-        if (!$level) {
-            return 0;
-        }
-        $ekr_total = $db::getValue('select sum(2price) from items_users where inOdet > 0 and uid = ?', [$uid]);
-        $exp = $db::getValue('select exp from stats where id = ?', [$uid]);
-        // Вот правда не знаю проканает или нет.
-        if ($ekr_total > ($level - 7) * 150 || $exp < 250000) {
-            return 0;
-        }
-        return $level;
+        return $level ?: 0;
    }

    /**
-     * Считаем сколько игроков ждут в заявке на турнир.
+     * @param int $uid
+     * @param int $level
+     *
+     * @return bool
+     */
+    public static function isEkrOverpriced($uid, $level = null)
+    {
+        $db = new Db();
+        if (is_null($level)) {
+            $level = $db::getValue('select level from users where id = ?', [$uid]);
+        }
+        $wearedItemsEkrPrice = $db::getValue('select sum(2price) from items_users where inOdet > 0 and uid = ?', [$uid]);
+        return $wearedItemsEkrPrice > Tournament::ekrOverpriceFormula($level);
+    }
+
+    /**
+     * @param int $uid
+     *
+     * @return bool
+     */
+    public static function isEnoughExperience($uid)
+    {
+        $db = new Db();
+        return $db::getValue('select exp from stats where id = ?', [$uid]) >= Tournament::MIN_EXP;
+        }
+
+    /**
+     * @param int $uid
+     *
+     * @return bool
+     */
+    public static function IsRestrictedToJoin($uid)
+    {
+        $db = new Db();
+        $delayEffect = $db::getValue('select count(*) from eff_users where uid = ? and id_eff = 486 and `delete` = 0', [$uid]);
+        return (bool)$delayEffect;
+    }
+
+    /**
+     * @param $tid
+     *
+     * @return bool
+     */
+    public static function isStarted($tid)
+    {
+        $db = new Db();
+        $status = $db::getValue('select count(*) from tournaments where start_time = -1 and tid = ?', [$tid]);
+        return (bool)$status;
+    }
+
+    /**
+     * Ñ÷èòàåì ñêîëüêî èãðîêîâ æäóò â çàÿâêå íà òóðíèð.
     *
     * @param int $tid
     *
@@ -42,7 +85,7 @@ class TournamentModel
    }

    /**
-     * Создание нового турнира.
+     * Ñîçäàíèå íîâîãî òóðíèðà.
     *
     * @param int $tid
     *
@@ -55,7 +98,7 @@ class TournamentModel
    }

    /**
-     * Игрок присоединяется к турниру и телепортируется в турнирную комнату.
+     * Èãðîê ïðèñîåäèíÿåòñÿ ê òóðíèðó è òåëåïîðòèðóåòñÿ â òóðíèðíóþ êîìíàòó.
     *
     * @param int $uid
     * @param int $tid
@@ -64,7 +107,7 @@ class TournamentModel
     */
    public static function joinTournament($uid, $tid)
    {
-        /** Кастомные комнаты 25008 - 25012. */
+        /** Êàñòîìíûå êîìíàòû 25008 - 25012. */
        $room_id = 25000 + $tid;
        $db = new Db();
        $db::sql('insert into tournaments_users (tid, uid) values (?, ?)', [$tid, $uid]);
@@ -72,7 +115,7 @@ class TournamentModel
    }

    /**
-     * Старт турнира.
+     * Ñòàðò òóðíèðà.
     *
     * @param int $tid
     *
@@ -85,7 +128,7 @@ class TournamentModel
    }

    /**
-     * Чистим базы от прошедшего турнира.
+     * ×èñòèì áàçû îò ïðîøåäøåãî òóðíèðà.
     *
     * @param int $tid
     *
@@ -94,12 +137,12 @@ class TournamentModel
    public static function destroyTournament($tid)
    {
        $db = new Db();
-        //Убедиться что в базе настроен foreign_keys и последует автоочистка tournaments_users !!!
+        //Óáåäèòüñÿ ÷òî â áàçå íàñòðîåí foreign_keys è ïîñëåäóåò àâòîî÷èñòêà tournaments_users !!!
        $db::sql('delete from tournaments where tid = ?', [$tid]);
    }

    /**
-     * Получаем список бойцов и бьём их на пары. Возвращаем списки пар + 1 последний без пары если есть.
+     * Ïîëó÷àåì ñïèñîê áîéöîâ è áü¸ì èõ íà ïàðû. Âîçâðàùàåì ñïèñêè ïàð + 1 ïîñëåäíèé áåç ïàðû åñëè åñòü.
     *
     * @param array $fighters_list
     *
@@ -108,11 +151,12 @@ class TournamentModel
    public static function getFightersTeams(array $fighters_list)
    {
        $db = new Db();
-        return array_chunk($db::getRows('select id from users where battle = 0 and id in (?)', [implode(', ', $fighters_list)]), 2);
+        $query = sprintf("select id from users where battle = 0 and id in (%s)", implode(', ', $fighters_list));
+        return array_chunk($db::getColumn($query), 2);
    }

    /**
-     * Выбираем живых бойцов не сражающихся в данный момент.
+     * Âûáèðàåì æèâûõ áîéöîâ íå ñðàæàþùèõñÿ â äàííûé ìîìåíò.
     *
     * @param int $tid
     *
@@ -121,11 +165,11 @@ class TournamentModel
    public static function getFreeFighters($tid)
    {
        $db = new Db();
-        return $db::getRows('select uid from tournaments_users where tid = ? and death_time = 0 order by rand()', [$tid]);
+        return $db::getColumn('select uid from tournaments_users where tid = ? and death_time = 0 order by uid', [$tid]);
    }

    /**
-     * Выбираем победителей. Смещаем массив, чтобы возврат шёл с единицы.
+     * Âûáèðàåì ïîáåäèòåëåé. Ñìåùàåì ìàññèâ, ÷òîáû âîçâðàò ø¸ë ñ åäèíèöû.
     *
     * @param int $tid
     *
@@ -134,18 +178,16 @@ class TournamentModel
    public static function getWinners($tid)
    {
        $db = new Db();
-        $arr = [];
-        array_unshift($arr, '');
-        unset($arr[0]);
-        $winners = $db::getRows('select uid from tournaments_users where tid = ? order by death_time desc limit 3', [$tid]);
-        foreach ($winners as $winner) {
-            $arr[] = $winner['uid'];
-        }
-        return $arr;
+        $winners = $db::getColumn('select uid from tournaments_users where tid = ? order by death_time desc limit 3', [$tid]);
+        return [
+            1 => $winners[0],
+            2 => $winners[1],
+            3 => $winners[2]
+        ];
    }

    /**
-     * Пробуем выкусить проигравшего в последней турнирной битве и удалить эту самую битву во избежание.
+     * Ïðîáóåì âûêóñèòü ïðîèãðàâøåãî â ïîñëåäíåé òóðíèðíîé áèòâå è óäàëèòü ýòó ñàìóþ áèòâó âî èçáåæàíèå.
     * @return mixed
     */
    public static function getLooser()
@@ -163,30 +205,34 @@ class TournamentModel
                 limit 1) as last_battle 
            where 
                battle_users.battle = last_battle.id and 
-                battle_users.team != last_battle.team_win';
+                battle_users.team != last_battle.team_win and
+                battle_users.uid in (select uid from tournaments_users where death_time = 0)';
        $db = new Db;
        $row = $db::getRow($query);
-        $db::sql('delete from battle where id = ?', [$row['battle']]);
        return $row['uid'];
    }

    /**
-     * Выбывший из турнира покидает комнату и получает время смерти.
+     * Âûáûâøèé èç òóðíèðà ïîêèäàåò êîìíàòó è ïîëó÷àåò âðåìÿ ñìåðòè.
     *
     * @param int $uid
     *
     * @return void
     */
-    public static function removeFighter($uid)
+    public static function removeFighter($uid, $winner = false)
    {
+        if (!$uid) return;
+        $winner_timer_add = $winner? 500 : 0; # Ïîñëåäíûé ÄÎËÆÅÍ áûòü ïîñëåäíèì.
        $db = new Db();
-        $db::sql('update tournaments_users set death_time = unix_timestamp() where uid = ?', [$uid]);
+        $db::sql('update tournaments_users set death_time = unix_timestamp() + ? where death_time = 0 and uid = ?', [$winner_timer_add, $uid]);
        self::teleport($uid, 9);
+        //fixme: Êëàññû íå ïîäêëþ÷àþòñÿ äðóã ê äðóãó. Íóæíî ìåíÿòü àðõèòåêòóðó èãðû. :(
+        Db::sql("update users_achiv set trn = trn + 1 where id = ?", [$uid]);
+        //(new Achievements(\user::start()))->updateCounter('trn');
    }

    /**
-     * Узнаём id турнира по id игрока.
-     * todo Проверить, возможно можно обращаться к уровню игрока.
+     * Óçíà¸ì id òóðíèðà ïî id èãðîêà.
     *
     * @param int $uid
     *
@@ -199,10 +245,10 @@ class TournamentModel
    }

    /**
-     * Попробуем стартонуть поединок.
-     * 25000 - Уникальный id поединка под турниры.
-     * noinc - запрет на вмешательство
-     * invis - невидимый бой
+     * Ïîïðîáóåì ñòàðòîíóòü ïîåäèíîê.
+     * 25000 - Óíèêàëüíûé id ïîåäèíêà ïîä òóðíèðû.
+     * noinc - çàïðåò íà âìåøàòåëüñòâî
+     * invis - íåâèäèìûé áîé
     *
     * @param int $uid1
     * @param int $uid2
@@ -212,15 +258,21 @@ class TournamentModel
    public static function startBattle($uid1, $uid2)
    {
        $db = new Db();
+        $check = Db::getValue('select count(*) from users where id in (?, ?) and battle = 0', [$uid1, $uid2]);
+        if ((int)$check !== 2) {
+            return;
+        }
+
        $db::exec('insert into battle (city, time_start, timeout, type, invis, noinc, travmChance, typeBattle) 
        values (\'capitalcity\', unix_timestamp(), 60, 0, 1, 1, 0, 25000)');
+        $bid = $db::lastInsertId(); // ÂÀÆÍÎ!
        $db::sql('update stats set team = 1, hpNow = hpAll, mpNow = mpAll where id = ?', [$uid1]);
        $db::sql('update stats set team = 2, hpNow = hpAll, mpNow = mpAll where id = ?', [$uid2]);
-        $db::sql('update users set battle = ? where id in (?, ?)', [$db::lastInsertId(), $uid1, $uid2]);
+        $db::sql('update users set battle = ? where id in (?, ?)', [$bid, $uid1, $uid2]);
    }

    /**
-     * Узнаём логин персонажа по его id.
+     * Óçíà¸ì ëîãèí ïåðñîíàæà ïî åãî id.
     *
     * @param int $uid
     *
@@ -233,7 +285,7 @@ class TournamentModel
    }

    /**
-     * Телепорт по комнатам.
+     * Òåëåïîðò ïî êîìíàòàì.
     *
     * @param int $uid
     * @param int $room_id
@@ -247,21 +299,23 @@ class TournamentModel
    }

    /**
-     * Нет проверок $message потому что оно всегда задаётся в коде и игрок на него не влияет.
+     * Íåò ïðîâåðîê $message ïîòîìó ÷òî îíî âñåãäà çàäà¸òñÿ â êîäå è èãðîê íà íåãî íå âëèÿåò.
     *
-     * @param string $city
     * @param string $message
     *
     * @return void
     */
-    public static function sysMessage($message, $city = 'capitalcity')
+    public static function sysMessage($message)
    {
+        if (!empty($message)) {
        $db = new Db();
-        $db::sql('insert into chat (city, room, time, type, text, new, da) values (?, 0, unix_timestamp(), 6, ?, 1, 1)', [$city, $message]);
+            $message = "<span style='font-weight: bold; color: forestgreen;'>$message</span>";
+            $db::sql('insert into chat (time, type, text, new, da) values (unix_timestamp(), 6, ?, 1, 1)', [$message]);
+        }
    }

    /**
-     * Генерирует множественный запрос сразу на $quantity однотипных предметов в инвентарь пользователя $uid.
+     * Ãåíåðèðóåò ìíîæåñòâåííûé çàïðîñ ñðàçó íà $quantity îäíîòèïíûõ ïðåäìåòîâ â èíâåíòàðü ïîëüçîâàòåëÿ $uid.
     *
     * @param int $uid
     * @param int $quantity
@@ -282,4 +336,18 @@ class TournamentModel
            $stmt->execute($args);
        }
    }
+
+    /** Ýôôåêò-îãðàíè÷èòåëü íà ó÷àñòèå â òóðíèðå.
+     * @param $uid
+     * @param $unix_time
+     *
+     * @return void
+     */
+    public static function giveDelay($uid, $unix_time)
+    {
+        $db = new Db();
+        $query = 'insert into eff_users (id_eff, uid, name, timeUse) VALUES (?,?,?,?)';
+        $args = [486, $uid, 'Ïðèç¸ð ãîðîäñêîãî òóðíèðà!', $unix_time];
+        $db::sql($query, $args);
+    }
 }