Переезд impstats и additem..

Переезд lookstats отовсюду в 1 класс.
Переезд функции repexp; Переезд классов User в неймспейс.
2023-04-16 02:54:34 +03:00 · 2023-04-16 01:54:07 +03:00 · 2023-04-15 22:52:33 +03:00
198 changed files with 2008 additions and 1942 deletions
--- a/AI.php
+++ b/AI.php
@ -7,6 +7,8 @@

 */

+use User\UserIp;
+
 if (isset($_GET['m1'])) {
    define('GAME', true);

@ -35,7 +37,7 @@ if (isset($_GET['m1'])) {
        $po = mysql_fetch_array(
            mysql_query('SELECT * FROM `items_main_data` WHERE `items_id` = "' . $pl['id'] . '" LIMIT 1')
        );
-        $po = $u->lookStats($po['data']);
+        $po = ConversionHelper::dataStringToArray($po['data']);

        if (!isset($po['add_minAtack']) && isset($po['sv_minAtack'])) {
            $po['add_minAtack'] = $po['sv_minAtack'];
--- a/_incl_data/class/Battle.php
+++ b/_incl_data/class/Battle.php
@ -1,7 +1,9 @@
 <?php

 use Core\Config;
+use Core\ConversionHelper;
 use Core\Db;
+use User\StatsModel;

 class Battle
 {
@ -862,7 +864,7 @@ class Battle
                        $tr = '';
                        $ti = $u->items['add'];
                        $x = 0;
-                        $ed = $u->lookStats($eff[$i]['data']);
+                        $ed = ConversionHelper::dataStringToArray($eff[$i]['data']);
                        while ($x < count($ti)) {
                            $n = $ti[$x];
                            if (isset($ed['add_' . $n], $u->is[$n]) && $n != 'pog') {
@ -1017,7 +1019,7 @@ class Battle
                }
                //генерируем предметы
                $ttl = '<strong>' . $itm[$i]['name'] . '</strong>';
-                $td = $u->lookStats($itm[$i]['data']);
+                $td = ConversionHelper::dataStringToArray($itm[$i]['data']);
                $lvar = '';
                if ($td['add_hpAll'] > 0) {
                    $td['add_hpAll'] = '+' . $td['add_hpAll'];
@ -1661,7 +1663,7 @@ class Battle

                    $i01 = 1;
                    while ($i01 <= (($this->info['izlomObr'] - $this->info['izlomObrNow'])) * 7) {
-                        $u->addItem(1226, $u->info['id'], '|sudba=' . $u->info['login']);
+                        \User\ItemsModel::addItem(1226, $u->info['id'], '|sudba=' . $u->info['login']);
                        $i01++;
                    }
                    mysql_query(
@ -2180,18 +2182,18 @@ class Battle

                            if (isset($pld['id'])) {
                                if ($this->users[$i]['battle_yron'] >= 500) {
-                                    $u->addItem(4754, $pld['id'], '');
-                                    $u->addItem(4754, $pld['id'], '');
-                                    $u->addItem(4754, $pld['id'], '');
-                                    $u->addItem(4754, $pld['id'], '');
-                                    $u->addItem(4754, $pld['id'], '');
+                                    \User\ItemsModel::addItem(4754, $pld['id'], '');
+                                    \User\ItemsModel::addItem(4754, $pld['id'], '');
+                                    \User\ItemsModel::addItem(4754, $pld['id'], '');
+                                    \User\ItemsModel::addItem(4754, $pld['id'], '');
+                                    \User\ItemsModel::addItem(4754, $pld['id'], '');
                                    $pld['battle_text'] .= ' За Героическое Сражение вы получаете <strong>Реликвия Ангела (x5)</strong>. ';
                                    mysql_query(
                                        'UPDATE `users_achiv` SET `pg`= `pg`+1 WHERE `id` = "' . $pld['id'] . '" LIMIT 1'
                                    );

                                    if ($this->users[$i]['team'] == $this->info['team_win'] && rand(1, 100) <= 5) {
-                                        $u->addItem(10020, $pld['id'], '');
+                                        \User\ItemsModel::addItem(10020, $pld['id'], '');
                                        $pld['battle_text'] .= ' и <strong>Жетон Успеха</strong>. ';
                                    }
                                } else {
@ -3151,7 +3153,7 @@ class Battle
                        }
                        $tmoni = 1;
                        while ($tmoni <= floor($tmon / 2)) {
-                            $u->addItem(4754, $this->users[$i]['id'], ''); //
+                            \User\ItemsModel::addItem(4754, $this->users[$i]['id'], ''); //
                            $tmoni++;
                        }
                        $this->users[$i]['battle_text'] .= ' За призовой хаот вы получаете <strong>Призовой Жетон (x' . floor(
@ -3163,7 +3165,7 @@ class Battle
                //Снижение времени Право на подвиг Титул за победу в хаоте
                if ($this->info['dungeon'] == 0 && $this->info['razdel'] == 5 && $this->users[$i]['team'] == $this->info['team_win']) {
                    //ТУТ2
-                    $u->repexp_add($this->users[$i]['id'], 2); //Репутация за поб в хаоте +2
+                    StatsModel::addRepexpById($this->users[$i]['id'], 2); //Репутация за поб в хаоте +2
                    $check = mysql_fetch_array(
                        mysql_query(
                            'SELECT * FROM `eff_users` WHERE `id_eff` = 478 AND `uid` = "' . $this->users[$i]['id'] . '" AND `delete` = 0 ORDER BY `overType` DESC LIMIT 1;'
@ -3199,13 +3201,13 @@ class Battle
                        'UPDATE `users_achiv` SET `kw`= `kw`+1 WHERE `id` = "' . $this->users[$i]['id'] . '" LIMIT 1'
                    );
                    if (date('w') == 0 || date('w') == 6 || date('w') == 4) {
-                        $u->repexp_add($this->users[$i]['id'], 25); //Клановые войны(победа) 25
+                        StatsModel::addRepexpById($this->users[$i]['id'], 25); //Клановые войны(победа) 25
                    }
                }
                //Награда за клан вар
                if ($this->info['dungeon'] == 0 && $this->info['type'] == 99 && $this->users[$i]['team'] == $this->info['team_win']) {
                    if (date('w') == 0 || date('w') == 6 || date('w') == 5) {
-                        $u->repexp_add($this->users[$i]['id'], 10); //Кровавые войны(победа) 10
+                        StatsModel::addRepexpById($this->users[$i]['id'], 10); //Кровавые войны(победа) 10
                    }
                }

@ -3311,7 +3313,7 @@ class Battle
                    }
                    while ($tmoni >= 1) {
                        if ($u->info['ang_g'] < $limitg) {
-                            $u->addItem(4754, $this->users[$i]['id'], '');
+                            \User\ItemsModel::addItem(4754, $this->users[$i]['id'], '');
                            mysql_query(
                                'UPDATE `users` SET `ang_g`=`ang_g`+1 WHERE `id` =' . $this->users[$i]['id'] . ''
                            );
@ -3332,7 +3334,7 @@ class Battle
                    if (date('d.m') == '31.10' || (date('m') == 11 && date('d') < 7)) {
                        //Хэллоуин 4504
                        $this->users[$i]['battle_text'] .= ' Вы получаете <strong>Тыква (x1)</strong>.';
-                        $u->addItem(4504, $this->users[$i]['id'], '|sudba=1');
+                        \User\ItemsModel::addItem(4504, $this->users[$i]['id'], '|sudba=1');
                    }
                }

@ -4142,7 +4144,7 @@ class Battle
                if ($itm_e[0] > 0) {
                    $j = 0;
                    while ($j < $itm_e[1]) {
-                        $u->addItem($itm_e[0], $uid, '|' . $itm_e[2]);
+                        \User\ItemsModel::addItem($itm_e[0], $uid, '|' . $itm_e[2]);
                        $j++;
                    }
                    if (!isset($this->ainm[$itm_e[0]])) {
@ -4245,7 +4247,7 @@ class Battle
        while ($i < count($this->stats[$this->uids[$uid1]]['items'])) {
            $itm = $this->stats[$this->uids[$uid1]]['items'][$i];
            if (isset($itm['id'])) {
-                $e = $u->lookStats($itm['data']);
+                $e = ConversionHelper::dataStringToArray($itm['data']);
                if (isset($e['bm_a1'])) {
                    if ($end > 0) {
                        if (file_exists('../../_incl_data/class/priems/' . $e['bm_a1'] . '.end.php')) {
@ -4278,7 +4280,7 @@ class Battle
                    'add_pog2=' . $j['y'],
                    'add_pog2=$', $this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']
                );
-                $dt3 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
+                $dt3 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
                if (isset($dt3['add_pog2mp'])) {
                    $priem->minMana($uid, round(round($yr2 / 100 * (100 - $dt3['add_pog2p'])) * $dt3['add_pog2mp']));
                }
@ -4288,7 +4290,7 @@ class Battle
                }
                unset($dt3);
                if ($j['y'] < 0 || ($this->stats[$this->uids[$uid]]['mpNow'] <= 0 && $dt3['add_pog2mp'] > 0)) {
-                    $dt2 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
+                    $dt2 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
                    if (isset($dt2['endPog']) && $dt2['endPog'] == 1) {
                        //удаляем прием
                        $this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['priem'] = mysql_fetch_array(
@ -4348,7 +4350,7 @@ class Battle
                        'add_pog2=' . $j['y'],
                        'add_pog2=$', $this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']
                    );
-                    $dt3 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
+                    $dt3 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
                    $dt30 = 0;
                    $dt30 = floor($j['y'] / $yr2 * 100);
                    if ($dt30 < $dt3['add_pog2p']) {
@ -4386,7 +4388,7 @@ class Battle
                        $yr2 = round($yr2 / 100 * (100 - $dt3['add_pog2p']));
                    }
                    if ($j['y'] < 0 || ($this->stats[$this->uids[$uid]]['mpNow'] <= 0 && $dt3['add_pog2mp'] > 0)) {
-                        $dt2 = $u->lookStats($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
+                        $dt2 = ConversionHelper::dataStringToArray($this->stats[$this->uids[$uid]]['effects'][$j['id'] - 1]['data']);
                        if (isset($dt2['endPog']) && $dt2['endPog'] == 1) {
                            //удаляем прием
                            //Добавляем в лог
@ -4675,7 +4677,7 @@ class Battle
                    $witm01 = 0;
                    $witm_type01 = 0;
                    $witm01 = $this->stats[$this->uids[$u1]]['items'][$this->stats[$this->uids[$u1]]['wp' . $wp01 . 'id']];
-                    $witm_data01 = $u->lookStats($witm01['data']);
+                    $witm_data01 = ConversionHelper::dataStringToArray($witm01['data']);
                    if ($at[$a]['atack'][$j][2] == $v) {
                        $tyv = $this->mfs(
                            2, [
@ -4781,7 +4783,7 @@ class Battle
                    $witm01 = 0;
                    $witm_type01 = 0;
                    $witm01 = $this->stats[$this->uids[$u1]]['items'][$this->stats[$this->uids[$u1]]['wp' . $wp01 . 'id']];
-                    $witm_data01 = $u->lookStats($witm01['data']);
+                    $witm_data01 = ConversionHelper::dataStringToArray($witm01['data']);
                    if ($this->mfs(
                            1, [
                            'u1' => $u1,
@ -5720,7 +5722,7 @@ class Battle
            $ii = 0;
            while ($ii < count($s['items'])) {
                if (isset($s['items'][$ii]) && $s['items'][$ii]['inOdet'] == $zi[$i]) {
-                    $po = $u->lookStats($s['items'][$ii]['data']);
+                    $po = ConversionHelper::dataStringToArray($s['items'][$ii]['data']);
                    $x = 0;
                    while ($x < count($t)) {
                        $n = $t[$x];
@ -5777,7 +5779,7 @@ class Battle

        if ($wp > 0) {
            $witm = $this->stats[$this->uids[$uid1]]['items'][$this->stats[$this->uids[$uid1]]['wp' . $wp . 'id']];
-            $witm_data = $u->lookStats($witm['data']);
+            $witm_data = ConversionHelper::dataStringToArray($witm['data']);
            $witm_type = $this->weaponTx($witm);
        }
        if ($witm_type == 0 || $witm_type == 12) {
@ -8132,7 +8134,7 @@ class Battle
                $i++;
            }
        }
-        $itm = $u->lookStats($item['data']);
+        $itm = ConversionHelper::dataStringToArray($item['data']);
        $t[0]['z'] = 0;
        $t[0]['t'] = 0;
        //колящий урон
@ -8212,7 +8214,7 @@ class Battle
        $tp = 0;
        $tp20 = 0;
        if (isset($item['id'])) {
-            $itm = $this->lookStats($item['data']);
+            $itm = \Core\ConversionHelper::dataStringToArray($item['data']);
            //начинаем расчет урона
            $min = $itm['sv_yron_min'] + $itm['yron_min'] + $st['minAtack'];
            $max = $itm['sv_yron_max'] + $itm['yron_max'] + $st['maxAtack'];
@ -8273,7 +8275,7 @@ class Battle
        $min = 0;
        $max = 0;
        if (isset($item['id'])) {
-            $itm = $this->lookStats($item['data']);
+            $itm = \Core\ConversionHelper::dataStringToArray($item['data']);
            //начинаем расчет урона
            $min = $itm['sv_yron_min'] + $itm['yron_min'] + $st['minAtack'];
            $max = $itm['sv_yron_max'] + $itm['yron_max'] + $st['maxAtack'];
@ -8367,7 +8369,7 @@ class Battle
 				*/
        ];

-        $witmdata = $this->lookStats($witm['data']);
+        $witmdata = \Core\ConversionHelper::dataStringToArray($witm['data']);

        //Расчет типа урона

@ -8605,21 +8607,6 @@ class Battle
        $this->stats[$this->uids[$pl['uid']]] = $u->getStats($pl['uid'], 0, 0, false, false, true);
    }

-    //Разбираем массив со статами
-    public function lookStats($m): array
-    {
-        $ist = [];
-        $di = explode('|', $m);
-        $i = 0;
-        $de = false;
-        while ($i < count($di)) {
-            $de = explode('=', $di[$i]);
-            $ist[$de[0]] = $de[1];
-            $i++;
-        }
-        return $ist;
-    }
-
    //Расчет мф. (новая)
    public function form_mf($u, $au): float
    {
@ -9348,7 +9335,7 @@ class Battle
                                    }
                                }
                                //
-                                $anl = $u->lookStats($anl);
+                                $anl = ConversionHelper::dataStringToArray($anl);

                                $vLog = 'time1=' . time(
                                    ) . '||s1=' . $this->users[$i]['sex'] . '||t1=' . $this->users[$i]['team'] . '||login1=' . $this->users[$i]['login'] . '';
--- a/_incl_data/class/BotLogic.php
+++ b/_incl_data/class/BotLogic.php
@ -123,7 +123,7 @@ class BotLogic
                        $cr = mysql_fetch_array(mysql_query('SELECT `id` FROM `items_users` WHERE `item_id` = "1204" AND `uid` = "' . self::$bot['id'] . '" AND `delete` = "0" LIMIT 1'));
                        if (!isset($cr['id'])) {
                            //Покупаем кристалл
-                            $u->addItem(1204, self::$bot['id']);
+                            \User\ItemsModel::addItem(1204, self::$bot['id']);
                        }
                    }
                    //Переходим в комнату для сражений
@ -194,7 +194,7 @@ class BotLogic
                        while ($i <= 20) {
                            if ($com['e' . $i] > 0) {
                                //Выдаем и надеваем предмет
-                                //$it = $u->addItem($com['e'.$i],self::$bot['id']);
+                                //$it = \User\ItemsModel::addItem($com['e'.$i],self::$bot['id']);
                                $eff = mysql_fetch_array(mysql_query('SELECT * FROM `eff_main` WHERE `id2` = "' . $com['e' . $i] . '" LIMIT 1'));
                                mysql_query('INSERT INTO `eff_users` (`overType`,`id_eff`,`uid`,`name`,`timeUse`,`data`,`no_Ace`) VALUES ("' . $eff['oneType'] . '","' . $eff['id2'] . '","' . self::$bot['id'] . '","' . $eff['mname'] . '","' . (time() + 9640000) . '","' . $eff['mdata'] . '","' . $eff['noAce'] . '")');
                            }
@ -205,7 +205,7 @@ class BotLogic
                        while ($i <= 20) {
                            if ($com['w' . $i] > 0) {
                                //Выдаем и надеваем предмет
-                                $it = $u->addItem($com['w' . $i], self::$bot['id']);
+                                $it = \User\ItemsModel::addItem($com['w' . $i], self::$bot['id']);
                                $eff1 = mysql_fetch_array(mysql_query('SELECT * FROM `items_shop` WHERE `item_id` = "' . $com['w' . $i] . '" LIMIT 1'));
                                if ($it > 0) {
                                    mysql_query('UPDATE `items_users` SET `inOdet` = "' . $i . '",`delete` = "0", `1price` = "' . $eff1['price_1'] . '" WHERE `uid` = "' . self::$bot['id'] . '" AND `id` = "' . $it . '" LIMIT 1');
@ -314,7 +314,7 @@ class BotLogic
                                    while ($i <= 20) {
                                        if ($com['e' . $i] > 0) {
                                            //Выдаем и надеваем предмет
-                                            //$it = $u->addItem($com['e'.$i],self::$bot['id']);
+                                            //$it = \User\ItemsModel::addItem($com['e'.$i],self::$bot['id']);
                                            $eff = mysql_fetch_array(mysql_query('SELECT * FROM `eff_main` WHERE `id2` = "' . $com['e' . $i] . '" LIMIT 1'));
                                            mysql_query('INSERT INTO `eff_users` (`overType`,`id_eff`,`uid`,`name`,`timeUse`,`data`,`no_Ace`) VALUES ("' . $eff['oneType'] . '","' . $eff['id2'] . '","' . self::$bot['id'] . '","' . $eff['mname'] . '","' . (time() + 86400 * 7) . '","' . $eff['mdata'] . '","' . $eff['noAce'] . '")');
                                        }
@ -1007,7 +1007,7 @@ class BotLogic
            if (self::$bot['level'] <= 5 && self::$bot['exp'] >= 12499) {
                $cr = mysql_fetch_array(mysql_query('SELECT `id` FROM `items_users` WHERE `item_id` = "1204" AND `uid` = "' . self::$bot['id'] . '" AND `delete` = "0" LIMIT 1'));
                if (!isset($cr['id'])) {
-                    $u->addItem(1204, self::$bot['id']);
+                    \User\ItemsModel::addItem(1204, self::$bot['id']);
                    self::$bot['exp'] = 12500;
                }
            }
--- a/_incl_data/class/BotPriemLogic.php
+++ b/_incl_data/class/BotPriemLogic.php
@ -1,5 +1,7 @@
 <?php

+use Core\ConversionHelper;
+
 class BotPriemLogic
 {

@ -334,8 +336,8 @@ class BotPriemLogic
        global $u;
        $notr = 0;

-        $tr = $u->lookStats($pl['tr']);
-        $d2 = $u->lookStats($pl['date2']);
+        $tr = ConversionHelper::dataStringToArray($pl['tr']);
+        $d2 = ConversionHelper::dataStringToArray($pl['date2']);

        $x = 1;
        while ($x <= 7) {
--- a/_incl_data/class/ComissionShop.php
+++ b/_incl_data/class/ComissionShop.php
@ -158,9 +158,9 @@ ORDER BY `1price`ASC , inGroupCount DESC'
                    )
                );
                if ($steck[0] > 1 && $preview == "preview") {
-                    $po = $this->lookStats($d['data']);
+                    $po = \Core\ConversionHelper::dataStringToArray($d['data']);
                } else {
-                    $po = $this->lookStats($pl['data']);
+                    $po = \Core\ConversionHelper::dataStringToArray($pl['data']);
                }
                if (($pl['type'] >= 18 && $pl['type'] <= 24) || $pl['type'] == 26 || $pl['type'] == 27) {
                    //Зоны блока +
@ -452,7 +452,7 @@ ORDER BY `1price`ASC , inGroupCount DESC'
                            //действие комплекта
                            $i1c = 0;
                            $i2c = 0;
-                            $i1e = $this->lookStats($plc['data']);
+                            $i1e = \Core\ConversionHelper::dataStringToArray($plc['data']);
                            while ($i1c < count($this->items['add'])) {
                                if (isset($i1e[$this->items['add'][$i1c]])) {
                                    $i3c = $i1e[$this->items['add'][$i1c]];
@ -488,7 +488,7 @@ ORDER BY `1price`ASC , inGroupCount DESC'
                            //действие комплекта
                            $i1c = 0;
                            $i2c = 0;
-                            $i1e = $this->lookStats($plc['data']);
+                            $i1e = \Core\ConversionHelper::dataStringToArray($plc['data']);
                            while ($i1c < count($this->items['add'])) {
                                if (isset($i1e[$this->items['add'][$i1c]])) {
                                    $i3c = $i1e[$this->items['add'][$i1c]];
--- a/_incl_data/class/Core/ConversionHelper.php
+++ b/_incl_data/class/Core/ConversionHelper.php
@ -0,0 +1,26 @@
+<?php
+
+namespace Core;
+
+class ConversionHelper
+{
+    /** Ïðåâðàùàåò ñòðîêó data ('a=1|b=2|c=3') èç ÁÄ â ìàññèâ [a=>1, b=>2, c=>3].
+     * @param string $dataString
+     * @return array
+     */
+    public static function dataStringToArray(string $dataString): array
+    {
+        $arr = json_decode(str_replace(['=', '|'], ['":', ',"'], '{"' . $dataString . '}'), true);
+        return $arr ?: [];
+    }
+
+    /** Ïðåâðàùàåò ìàññèâ [a=>1, b=>2, c=>3] â ñòðîêó data ('a=1|b=2|c=3') äëÿ ÁÄ.
+     * @param array $dataArray
+     * @return string
+     */
+    public static function arrayToDataString(array $dataArray): string
+    {
+        $str = json_encode($dataArray);
+        return $str ? str_replace(['":', ',"', '{"', '}'], ['=', '|'], $str) : '';
+    }
+}
--- a/_incl_data/class/Dialog.php
+++ b/_incl_data/class/Dialog.php
@ -208,7 +208,7 @@ class Dialog
                                //Выдаем предмет для квеста
                                $itmb = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "' . $act1[8] . '" LIMIT 1'));
                                if (isset($itmb['id'])) {
-                                    $u->addItem($act1[8], $u->info['id'], '|nodelete=1');
+                                    \User\ItemsModel::addItem($act1[8], $u->info['id'], '|nodelete=1');
                                    $txt .= '<br><b><font color=red>Вы получили предмет &quot;' . $itmb['name'] . '&quot;</font></b>';
                                }
                            }
@ -234,7 +234,7 @@ class Dialog
                                    }
                                    $txt .= '</font></b>';

-                                    $u->addItem($itmb['id'], $u->info['id'], $act1dt);
+                                    \User\ItemsModel::addItem($itmb['id'], $u->info['id'], $act1dt);
                                    $pg = $act1[4];
                                }
                            } else {
@ -263,7 +263,7 @@ class Dialog
                                            }
                                            $ic2 = 1;
                                            while ($ic2 <= $act3[2]) {
-                                                $u->addItem($itmqs['id'], $u->info['id'], '|quest_item=1', ['del' => $act3[3]]);
+                                                \User\ItemsModel::addItem($itmqs['id'], $u->info['id'], '|quest_item=1', ['del' => $act3[3]]);
                                                $ic2++;
                                            }
                                        }
@ -393,7 +393,7 @@ class Dialog
                                    if ($upd) {
                                        if ($itik > 0) {
                                            //Выдаем предметы
-                                            $u->addItem($itik, $u->info['id'], '|nosale=1|srok=' . (7 * 86400) . '', null, 1);
+                                            \User\ItemsModel::addItem($itik, $u->info['id'], '|nosale=1|srok=' . (7 * 86400) . '', null, 1);
                                            $itm_nm = mysql_fetch_array(mysql_query('SELECT `name` FROM `items_main` WHERE `id` = "' . $itik . '" LIMIT 1'));
                                            $txt = 'Вы получили предмет &quot;' . $itm_nm['name'] . '&quot;';
                                        } else {
@ -413,7 +413,7 @@ class Dialog
                                                }
                                                $arts_1 = $arts_1[rand(0, count($arts_1) - 1)];
                                                if ($arts_1 > 0) {
-                                                    $u->addItem($arts_1, $u->info['id'], '|sroknext=1|nosale=1|sleep_moroz=1|srok=' . (86400 / 2) . '', null, 100);
+                                                    \User\ItemsModel::addItem($arts_1, $u->info['id'], '|sroknext=1|nosale=1|sleep_moroz=1|srok=' . (86400 / 2) . '', null, 100);
                                                }
                                                $itm_nm = mysql_fetch_array(mysql_query('SELECT `name` FROM `items_main` WHERE `id` = "' . $arts_1 . '" LIMIT 1'));

@ -433,7 +433,7 @@ class Dialog
                                                }
                                                $arts_1 = $arts_1[rand(0, count($arts_1) - 1)];
                                                if ($arts_1 > 0) {
-                                                    $u->addItem($arts_1, $u->info['id'], '|sroknext=1|nosale=1|sleep_moroz=1|srok=' . (86400 / 2) . '', null, 100);
+                                                    \User\ItemsModel::addItem($arts_1, $u->info['id'], '|sroknext=1|nosale=1|sleep_moroz=1|srok=' . (86400 / 2) . '', null, 100);
                                                }
                                                $itm_nm = mysql_fetch_array(mysql_query('SELECT `name` FROM `items_main` WHERE `id` = "' . $arts_1 . '" LIMIT 1'));

@ -523,7 +523,7 @@ class Dialog
                                            $data = '|frompisher=' . $d->info['id2'];
                                            $e = 1;
                                            while ($e <= $t[0]) {
-                                                $u->addItem($cn[$i]['add'][0], $u->info['id'], $data);
+                                                \User\ItemsModel::addItem($cn[$i]['add'][0], $u->info['id'], $data);
                                                $e++;
                                            }
                                            $txt .= $cn[$i][$j]['n'] . ' x' . ($t[0] * $this->objLevel($cn[$i][$j], $u->info['level'])) . ' = ' . $cn[$i]['add'][1] . ' x' . $t[0] . '<br>';
@ -569,7 +569,7 @@ class Dialog
                                            $data = '|frompisher=' . $d->info['id2'];
                                            $e = 1;
                                            while ($e <= $t[0]) {
-                                                $u->addItem($cn[$i]['add'][0], $u->info['id'], $data);
+                                                \User\ItemsModel::addItem($cn[$i]['add'][0], $u->info['id'], $data);
                                                $e++;
                                            }
                                            $txt .= $cn[$i][$j]['n'] . ' x' . ($t[0] * $this->objLevel($cn[$i][$j], $u->info['level'])) . ' = ' . $cn[$i]['add'][1] . ' x' . $t[0] . '<br>';
@ -615,7 +615,7 @@ class Dialog
                                            $data = '|frompisher=' . $d->info['id2'];
                                            $e = 1;
                                            while ($e <= $t[0]) {
-                                                $u->addItem($cn[$i]['add'][0], $u->info['id'], $data);
+                                                \User\ItemsModel::addItem($cn[$i]['add'][0], $u->info['id'], $data);
                                                $e++;
                                            }
                                            $txt .= $cn[$i][$j]['n'] . ' x' . ($t[0] * $this->objLevel($cn[$i][$j], $u->info['level'])) . ' = ' . $cn[$i]['add'][1] . ' x' . $t[0] . '<br>';
@ -647,7 +647,7 @@ class Dialog
                            if (isset($keypr1['id'], $keypr2['id'])) {
                                mysql_query('DELETE FROM `items_users` WHERE `id` = "' . $keypr1['id'] . '" OR `id` = "' . $keypr2['id'] . '" LIMIT 2');
                                $data = '|frompisher=' . $d->info['id2'];
-                                $u->addItem(2555, $u->info['id'], $data);
+                                \User\ItemsModel::addItem(2555, $u->info['id'], $data);
                                $txt = 'Вы успешно получили &quot;Пирамидальный ключ&quot;';
                            }

@ -690,7 +690,7 @@ class Dialog
                                            $data = '|frompisher=' . $d->info['id2'];
                                            $e = 1;
                                            while ($e <= $t[0]) {
-                                                $u->addItem($cn[$i][$j]['add'][0], $u->info['id'], $data);
+                                                \User\ItemsModel::addItem($cn[$i][$j]['add'][0], $u->info['id'], $data);
                                                $e++;
                                            }
                                            mysql_query('DELETE FROM `items_users` WHERE `id` = "' . $keypr['id'] . '" LIMIT 1');
@ -746,7 +746,7 @@ class Dialog
                                            $data = '|frompisher=' . $d->info['id2'];
                                            $e = 1;
                                            while ($e <= $t[0]) {
-                                                $u->addItem($cn[$i][$j]['add'][0], $u->info['id'], $data);
+                                                \User\ItemsModel::addItem($cn[$i][$j]['add'][0], $u->info['id'], $data);
                                                $e++;
                                            }
                                            mysql_query('DELETE FROM `items_users` WHERE `id` = "' . $keypr['id'] . '" LIMIT 1');
@ -802,7 +802,7 @@ class Dialog
                                            $data = '|frompisher=' . $d->info['id2'];
                                            $e = 1;
                                            while ($e <= $t[0]) {
-                                                $u->addItem($cn[$i][$j]['add'][0], $u->info['id'], $data);
+                                                \User\ItemsModel::addItem($cn[$i][$j]['add'][0], $u->info['id'], $data);
                                                $e++;
                                            }
                                            $txt .= $cn[$i][$j]['n'] . ' x' . ($t[0] * $this->objLevel($cn[$i][$j], $u->info['level'])) . ' = ' . $cn[$i][$j]['add'][1] . ' x' . $t[0] . '<br>';
@ -957,7 +957,7 @@ class Dialog
                                    $qsw = 0;
                                    while ($qsw < $item['colvo']) {
                                        $txt .= '<br/>Вы получили предмет';
-                                        $u->addItem($item['item_id'], $u->info['id']);
+                                        \User\ItemsModel::addItem($item['item_id'], $u->info['id']);
                                        $qsw++;
                                    }
                                }
@ -1215,7 +1215,7 @@ class Dialog
                            $val = 4799;
                        }
                    }
-                    $u->addItem($val, $u->info['id'], $data_itm);
+                    \User\ItemsModel::addItem($val, $u->info['id'], $data_itm);
                    $i1++;
                }
            } elseif ($var == 'up') {
--- a/_incl_data/class/Dungeon.php
+++ b/_incl_data/class/Dungeon.php
@ -1309,7 +1309,7 @@ class Dungeon
                                }
                                $data = str_replace('|sudba=-1', '|sudba=' . $u->info['login'] . '', $data);

-                                $idl = $u->addItem($obj['item_id'], $u->info['id'], $data, $obj);
+                                $idl = \User\ItemsModel::addItem($obj['item_id'], $u->info['id'], $data, $obj);
                                if ($obj['del'] > 0) {
                                    mysql_query(
                                        'UPDATE `items_users` SET `dn_delete` = 1 WHERE `id` = "' . $idl . '" LIMIT 1'
--- a/_incl_data/class/DungeonEditor.php
+++ b/_incl_data/class/DungeonEditor.php
@ -20,7 +20,7 @@ class DungeonEditor
            $this->bs = mysql_fetch_array(mysql_query('SELECT * FROM `bs_turnirs` WHERE `city` = "' . $u->info['city'] . '" AND `id` = "' . $this->info['bsid'] . '" AND `time_start` = "' . $this->info['time_start'] . '" LIMIT 1'));
            //Если БС закончена
            if (isset($this->bs['id']) && $this->bs['users'] - $this->bs['users_finish'] < 2) {
-                $u->bsfinish($this->bs, false, null);
+                \Location\DeathTower::finish($this->bs, false, null);
            }
        }

--- a/_incl_data/class/FightRequest.php
+++ b/_incl_data/class/FightRequest.php
@ -7,6 +7,7 @@ use Core\Db;
 use FightRequest\FRHelper;
 use Tournament\Tournament;
 use Tournament\TournamentModel;
+use User\Effects;

 class FightRequest
 {
@ -340,10 +341,10 @@ class FightRequest
                    Db::sql('delete from stats where id = ?', [$user['id']]);
                    Db::sql('delete from items_users where uid = ?', [$user['id']]);
                    Db::sql('delete from eff_users where uid = ?', [$user['id']]);
-                    $this->u->addItem(4754, $user['id']);
+                    \Core\ConversionHelper::dataStringToArray(4754, $user['id']);
                }
            } else {
-                $this->u->addItem(4754, $user['id']);
+                \Core\ConversionHelper::dataStringToArray(4754, $user['id']);
            }
        }
        return [
@ -1599,12 +1600,12 @@ class FightRequest
        ];

        foreach ($classEffects[$sellclass] as $classEffect) {
-            UserEffects::addById($uidb, $classEffect);
+            Effects::addById($uidb, $classEffect);
        }
        $items = $classItems[$sellclass];

        foreach ($items as $slot => $itemId) {
-            $re = $this->u->addItem($itemId, $uidb);
+            $re = \Core\ConversionHelper::dataStringToArray($itemId, $uidb);
            $stmt1->execute([$slot, $re]);
            $stmt2->execute([$itemId, $re]);
        }
--- a/_incl_data/class/Location/DeathTower.php
+++ b/_incl_data/class/Location/DeathTower.php
@ -0,0 +1,170 @@
+<?php
+
+namespace Location;
+
+use Chat;
+use ChatMessage;
+use User;
+
+class DeathTower
+{
+    public static function finish($id, $bu, $di)
+    {
+        $user = User::start();
+        if ($bu) {
+            /* â ýòîì áîþ ïðîâåðÿåì þçåðîâ */
+            $i = 0;
+            while ($i < count($bu[$i])) {
+                if ($bu[$i]['lose'] > 0 || $bu[$i]['nich']) {
+                    mysql_query(
+                        'UPDATE `users` SET `lose` = "' . $bu[$i]['lose'] . '", `nick` = "' . $bu[$i]['nich'] . '" WHERE `id` = "' . $bu[$i]['id'] . '" LIMIT 1'
+                    );
+                    mysql_query(
+                        'UPDATE `bs_turnirs` SET `users_finish` = `users_finish` + 1 WHERE `id` = "' . $id['id'] . '" LIMIT 1'
+                    );
+                    /* óäàëÿåì þçåðà */
+                    if ($bu['inBot'] == 0) {
+                        $pls1 = mysql_fetch_array(
+                            mysql_query(
+                                'SELECT `id`, `bsid`, `money`, `finish`, `time`, `inBot`, `uid` FROM `bs_zv` WHERE `bsid` = "' . $id['id'] . '" AND `finish` = 0 AND `time` = "' . $id['time_start'] . '" AND `inBot` = "' . $bu[$i]['id'] . '" LIMIT 1'
+                            )
+                        );
+                        if (isset($pls1['id'])) {
+                            mysql_query('DELETE FROM `users` WHERE `id` = "' . $bu[$i]['id'] . '" LIMIT 1');
+                            mysql_query('DELETE FROM `stats` WHERE `id` = "' . $bu[$i]['id'] . '" LIMIT 1');
+
+                            //âûêèäûâàåì ïðåäìåòû íà çåìëþ
+                            $spi = mysql_query(
+                                'SELECT `id`,`item_id` FROM `items_users` WHERE `uid` = "' . $bu[$i]['id'] . '" LIMIT 500'
+                            );
+                            $ins = '';
+                            while ($pli = mysql_fetch_array($spi)) {
+                                $ins .= '("' . $di['dn_id'] . '","' . $pli['item_id'] . '","' . time(
+                                    ) . '","' . $di['x'] . '","' . $di['y'] . '"),';
+                            }
+
+                            $ins = rtrim($ins, ',');
+                            mysql_query(
+                                'INSERT INTO `dungeon_items` (`dn`,`item_id`,`time`,`x`,`y`) VALUES ' . $ins . ''
+                            );
+                            mysql_query('DELETE FROM `items_users` WHERE `uid` = "' . $pls1['inBot'] . '" LIMIT 1');
+                            mysql_query('DELETE FROM `eff_users` WHERE `uid` = "' . $pls1['inBot'] . '" LIMIT 1');
+                            mysql_query(
+                                'UPDATE `bs_zv` SET `finish` = "' . time(
+                                ) . '" WHERE `id` = "' . $pls1['id'] . '" LIMIT 1'
+                            );
+                            mysql_query('UPDATE `users` SET `inUser` = 0 WHERE `id` = "' . $pls1['uid'] . '" LIMIT 1');
+                        }
+                    }
+                    $id['users_finish']++;
+                }
+                $i++;
+            }
+        }
+        if ($id['users'] - $id['users_finish'] >= 2) {
+            return;
+        }
+        $win = [];
+        $sp = mysql_query(
+            'SELECT `id`,`bsid`,`money`,`finish`,`time`,`inBot`,`uid` FROM `bs_zv` WHERE `bsid` = "' . $id['id'] . '" AND `finish` = "0" AND `time` = "' . $id['time_start'] . '" ORDER BY `money` DESC LIMIT 100'
+        );
+        while ($pl = mysql_fetch_array($sp)) {
+            $ur = mysql_fetch_array(
+                mysql_query(
+                    'SELECT `id`,`login`,`room`,`name`,`sex`,`inUser`,`twink`,`lose`,`nich`,`win` FROM `users` WHERE `id` = "' . $pl['uid'] . '" LIMIT 1'
+                )
+            );
+            $ub = mysql_fetch_array(
+                mysql_query(
+                    'SELECT `id`,`login`,`room`,`name`,`sex`,`inUser`,`twink`,`lose`,`nich`,`win` FROM `users` WHERE `id` = "' . $ur['inUser'] . '" LIMIT 1'
+                )
+            );
+            if (isset($ur['id']) && isset($ub['id']) && $ub['lose'] <= 0 && $ub['nich'] <= 0) {
+                $win = $ub;
+                $winr = $ur;
+            }
+        }
+
+        $chat = new Chat();
+        $cmsg = new ChatMessage();
+
+        /* çàâåðøàåì ÁÑ */
+        if (isset($win['id']) && $win['lose'] == 0 && $win['nich'] == 0 && $win['id'] > 0) {
+            //åñòü ïîáåäèòåëü
+            $bsep = 0;
+            if ($winr['level'] < 6) {
+                $bsep = 2500;
+            } elseif ($winr['level'] < 7) {
+                $bsep = 5000;
+            } elseif ($winr['level'] < 8) {
+                $bsep = 15000;
+            } elseif ($winr['level'] < 9) {
+                $bsep = 25000;
+            } else {
+                $bsep = 50000;
+            }
+            /* Âûäàåì ïðèç */
+            $mn = (round($id['money'] / 100 * 85));
+            mysql_query(
+                'UPDATE `users` SET `money` = `money` + "' . $mn . '" WHERE `id` = "' . $winr['id'] . '" LIMIT 1'
+            );
+            mysql_query(
+                'UPDATE `stats` SET `exp` = `exp` + "' . $bsep . '" WHERE `id` = "' . $winr['id'] . '" LIMIT 1'
+            );
+            /* ÷àò */
+            $cmsg->setTo($winr['login']);
+            $cmsg->setText(
+                "Ïîçäðàâëÿåì! Âû ïîáåäèëè â òóðíèðå &quot;Áàøíÿ Ñìåðòè&quot;! Ïîëó÷åíî îïûòà: $bsep, äåíüãè: $mn êð."
+            );
+            $cmsg->setType(6);
+            $chat->sendMsg($cmsg);
+
+            $cmsg->setTo('');
+            $cmsg->setIsAlert(true);
+            $cmsg->setText(
+                "Çàâåðøèëñÿ òóðíèð &quot;Áàøíÿ Ñìåðòè&quot;, ïîáåäèòåëü òóðíèðà: <strong>{$winr['login']}</strong>! Ïîçäðàâëÿåì!"
+            );
+            $cmsg->setType(5);
+            $chat->sendMsg($cmsg);
+
+            $user->addDelo(
+                1, $uid,
+                '&quot;<span style="color: #C65F00; ">WinTournament.' . $user->info['city'] . '</span>&quot; (Áàøíÿ Ñìåðòè): Ïîëó÷åíî &quot;<strong>' . $mn . '</strong> êð.&quot;',
+                time(), $user->info['city'], 'WinTournament.' . $user->info['city'], 0, 0
+            );
+        } else {
+            /* ÷àò */
+            $cmsg->setIsAlert(true);
+            $cmsg->setType(5);
+            $cmsg->setText('Çàâåðøèëñÿ òóðíèð «Áàøíÿ Ñìåðòè», ïîáåäèòåëü òóðíèðà: îòñóòñòâóåò.');
+        }
+
+        $sp = mysql_query(
+            'SELECT `id`,`bsid`,`money`,`finish`,`time`,`inBot`,`uid` FROM `bs_zv` WHERE `bsid` = "' . $id['id'] . '" AND `time` = "' . $id['time_start'] . '" ORDER BY `money` DESC LIMIT 100'
+        );
+        while ($pl = mysql_fetch_array($sp)) {
+            $ur = mysql_fetch_array(
+                mysql_query(
+                    'SELECT `id`,`login`,`room`,`name`,`sex`,`inUser`,`lose`,`nich`,`win` FROM `users` WHERE `id` = "' . $pl['uid'] . '" LIMIT 1'
+                )
+            );
+            $ub = mysql_fetch_array(
+                mysql_query(
+                    'SELECT `id`,`login`,`room`,`name`,`sex`,`inUser`,`lose`,`nich`,`win` FROM `users` WHERE `id` = "' . $ur['inUser'] . '" LIMIT 1'
+                )
+            );
+            if (isset($ub['id'])) {
+                //del
+                mysql_query('DELETE FROM `users` WHERE `id` = "' . $ub['id'] . '" LIMIT 1');
+                mysql_query('DELETE FROM `stats` WHERE `id` = "' . $ub['id'] . '" LIMIT 1');
+                mysql_query('DELETE FROM `items_users` WHERE `uid` = "' . $ub['id'] . '" LIMIT 500');
+                mysql_query('DELETE FROM `eff_users` WHERE `uid` = "' . $ub['id'] . '" LIMIT 500');
+                //upd
+                mysql_query(
+                    'UPDATE `bs_zv` SET `finish` = "' . time() . '" WHERE `id` = "' . $pl['id'] . '" LIMIT 1'
+                );
+                mysql_query('UPDATE `users` SET `inUser` = 0 WHERE `id` = "' . $pl['uid'] . '" LIMIT 1');
+            }
+        }
+    }
+}
--- a/_incl_data/class/Magic.php
+++ b/_incl_data/class/Magic.php
@ -1,5 +1,6 @@
 <?php

+use Core\ConversionHelper;
 use Core\Db;
 use Insallah\Math;

@ -40,7 +41,7 @@ class Magic
                $u->unstack($itm['id'], 1);
            }

-            $st = $u->lookStats($itm['data']);
+            $st = ConversionHelper::dataStringToArray($itm['data']);

            if (isset($st['tr_lvl']) && $st['tr_lvl'] > $u->info['level']) {
                $u->error = 'Вы слишком малы чтобы использовать данный предмет ';
@ -95,7 +96,7 @@ class Magic
            } elseif (isset($st['usefromfile'])) {

                //используем заклятие
-                $st = $u->lookStats($itm['data']);
+                $st = ConversionHelper::dataStringToArray($itm['data']);
                if (isset($st['zazuby']) && $_GET['login'] != $u->info['login']) {
                    //unset($st['useOnLogin']);
                    $_GET['login'] = $u->info['login'];
@ -318,7 +319,7 @@ class Magic
                //---------------
            } elseif ($itm['type'] == 29) {
                //используем заклятие
-                $st = $u->lookStats($itm['data']);
+                $st = ConversionHelper::dataStringToArray($itm['data']);
                if (isset($st['zazuby']) && $_GET['login'] != $u->info['login']) {
                    //unset($st['useOnLogin']);
                    $_GET['login'] = $u->info['login'];
@ -664,7 +665,7 @@ class Magic
                            }
                        } elseif ($itm['magic_inci'] == 'cureHP') {
                            //Реген НР,MP
-                            $po = $u->lookStats($itm['data']);
+                            $po = ConversionHelper::dataStringToArray($itm['data']);
                            if ($u->info['battle'] > 0) {
                                //используем свиток в поединке
                                $bu = mysql_fetch_array(
@ -835,7 +836,7 @@ class Magic
                            }
                        } elseif ($itm['magic_inci'] == 'cureMP') {
                            //Реген НР,MP
-                            $po = $u->lookStats($itm['data']);
+                            $po = ConversionHelper::dataStringToArray($itm['data']);
                            if ($u->info['battle'] > 0) {
                                //используем свиток в поединке
                                $bu = mysql_fetch_array(
@ -1827,7 +1828,7 @@ class Magic
                                    $trnt .= $pl['login'] . ' Комната : ' . $rrm['name'] . ', ';
                                }
                                $trnt = rtrim($trnt, ', ');
-                                $it_ = $u->addItem(
+                                $it_ = \User\ItemsModel::addItem(
                                    2435, $u->info['id'], 'noodet=1|noremont=1|sudba=' . $u->info['login'] . ''
                                );
                                mysql_query(
--- a/_incl_data/class/Priems.php
+++ b/_incl_data/class/Priems.php
@ -1,5 +1,6 @@
 <?php

+use Core\ConversionHelper;
 use Core\Db;
 use DarksLight2\Training\TrainingManager;
 use Insallah\Math;
@ -113,7 +114,7 @@ class Priems
        }
        $x++;
        $data['add_mg2static_points'] = $x;
-        $data = $this->impStats($data);
+        $data = ConversionHelper::arrayToDataString($data);
        Db::sql(
            'update eff_users set x = ?, data = ? where uid = ? and `delete` = 0 and v2 = 260 and user_use = ?',
            [$x, $data, $uid, $this->u->info['id']]
@ -415,40 +416,6 @@ class Priems
        return $r;
    }

-    /** Превращает строку data ('a=1|b=2|c=3') из БД в массив [a=>1, b=>2, c=>3].
-     * @param $m
-     * @return array
-     */
-    public function lookStatsArray($m)
-    {
-        $arr = json_decode(str_replace(['=', '|'], ['":', ',"'], '{"' . $m . '}'), true);
-        return $arr ?: [];
-    }
-
-    /** Превращает массив [a=>1, b=>2, c=>3] в строку data ('a=1|b=2|c=3') для БД.
-     * @param array $m
-     * @return string
-     */
-    private function impStats(array $m)
-    {
-        $str = json_encode($m);
-        return $str ? str_replace(['":', ',"', '{"', '}'], ['=', '|'], $str) : '';
-    }
-
-    /**
-     * @param       $data
-     * @param array $values
-     * @return string
-     */
-    private function changeStatsData($data, array $values)
-    {
-        $arr = $this->lookStatsArray($data);
-        foreach ($values as $key => $value) {
-            $arr[$key] = $value;
-        }
-        return $this->impStats($arr);
-    }
-
    public function magicRegen($ue, $hpmin, $tmp, $pl, $eff, $rp = 0, $dp = 0, $krituet = true, $dopyrn = 0)
    {
        global $btl;
@ -533,7 +500,7 @@ class Priems
                mysql_query('SELECT * FROM `priems` WHERE `id` = "' . $pl2['v2'] . '" LIMIT 1')
            );
            if (isset($pl2['priem']['id'])) {
-                $dt1 = $this->lookStatsArray($pl2['priem']['date2']);
+                $dt1 = ConversionHelper::dataStringToArray($pl2['priem']['date2']);
                if (isset($dt1['yron_u2'])) {

                    $minu = $this->getdr(
@ -1041,7 +1008,7 @@ class Priems
                mysql_query('SELECT * FROM `priems` WHERE `id` = "' . $pl2['v2'] . '" LIMIT 1')
            );
            if (isset($pl2['priem']['id'])) {
-                $dt1 = $this->lookStatsArray($pl2['priem']['date2']);
+                $dt1 = ConversionHelper::dataStringToArray($pl2['priem']['date2']);
                if (isset($dt1['yron_u2'])) {
                    $minu = $this->getdr(
                        $dt1['yron_u2'], [0 => 'lvl1', 1 => 'yr1', 2 => 'ts5', 3 => 'ts6'],
@ -1661,8 +1628,8 @@ class Priems
    public function plusData($d1, $d2)
    {
        global $u;
-        $j1 = $this->lookStatsArray($d1);
-        $j2 = $this->lookStatsArray($this->redate($d2, $this->u->info['id']));
+        $j1 = ConversionHelper::dataStringToArray($d1);
+        $j2 = ConversionHelper::dataStringToArray($this->redate($d2, $this->u->info['id']));
        $v = $this->u->lookKeys($this->redate($d2, $this->u->info['id']), 0); // ключи 2
        //добавляем данные друг к другу
        $i = 0;
@ -1680,7 +1647,7 @@ class Priems
            $i++;
        }
        $inf = rtrim($inf, ', ');
-        $j1 = $this->u->impStats($j1);
+        $j1 = ConversionHelper::arrayToDataString($j1);
        return $j1;
    }

@ -1688,7 +1655,7 @@ class Priems
    {
        global $u, $btl;
        $rcu = false;
-        $j = $this->lookStatsArray($pl['date2']);
+        $j = ConversionHelper::dataStringToArray($pl['date2']);
        $mpr = false;
        $addch = 0;
        $uid = $this->u->info['id'];
@ -1790,8 +1757,8 @@ class Priems
            }
        } elseif ($j['onlyOne'] > 1) {
            if ($mpr['x'] < $j['onlyOne'] && isset($j['date3Plus'])) {
-                $j1 = $this->lookStatsArray($mpr['data']);
-                $j2 = $this->lookStatsArray($this->redate($pl['date3'], $this->u->info['id']));
+                $j1 = ConversionHelper::dataStringToArray($mpr['data']);
+                $j2 = ConversionHelper::dataStringToArray($this->redate($pl['date3'], $this->u->info['id']));
                $v = $this->u->lookKeys($this->redate($pl['date3'], $this->u->info['id']), 0); // ключи 2
                //добавляем данные друг к другу
                $i = 0;
@ -1809,7 +1776,7 @@ class Priems
                    $i++;
                }
                $inf = rtrim($inf, ', ');
-                $j1 = $this->u->impStats($j1);
+                $j1 = ConversionHelper::arrayToDataString($j1);
                $pld[0] = ' x' . ($mpr['x'] + 1);
                if ($j['refHod'] == 1) {
                    $mpr['hod'] = $pl['limit'];
@ -1982,7 +1949,7 @@ class Priems
        $this->u->info['priems_z'] = $pz;
        $btl->users[$btl->uids[$this->u->info['id']]]['priems_z'] = $pz;
        $btl->stats[$btl->uids[$this->u->info['id']]]['priems_z'] = $pz;
-        $tr = $this->lookStatsArray($pl['tr']);
+        $tr = ConversionHelper::dataStringToArray($pl['tr']);
        if (isset($tr['tr_mpNow'])) {
            $tr['tr_mpNow'] = round($tr['tr_mpNow'] / 100 * (100 - $this->u->stats['min_use_mp']));
            $btl->users[$btl->uids[$this->u->info['id']]]['mpNow'] -= $tr['tr_mpNow'];
@ -2167,8 +2134,8 @@ class Priems
    public function testpriem($pl, $t = 1, $o = 0)
    {
        global $c, $u, $code, $btl;
-        $tr = $this->lookStatsArray($pl['tr']);
-        $d2 = $this->lookStatsArray($pl['date2']);
+        $tr = ConversionHelper::dataStringToArray($pl['tr']);
+        $d2 = ConversionHelper::dataStringToArray($pl['date2']);
        $x = 1;
        $notr = 0;

@ -2342,7 +2309,7 @@ class Priems
    {
        global $u, $c, $code, $btl;
        $pz = explode('|', $this->u->info['priems_z']);
-        $tr = $this->lookStatsArray($pl['tr']);
+        $tr = ConversionHelper::dataStringToArray($pl['tr']);
        $trs = '';
        $x = 0;
        $notr = 0;
@ -2586,7 +2553,7 @@ class Priems
        );
        $leveledDamage = $baseDamage[$level] + 40 / 100 * (5 * $magicTargetTier);

-        list($damage, $isCrit, $isMiss) = $this->magicAttack(
+        [$damage, $isCrit, $isMiss] = $this->magicAttack(
            $btl, $this->u->info['id'], $this->ue['id'], $leveledDamage, self::FIRE, 1
        );
        //Используем проверку на урон приемов
@ -2668,7 +2635,7 @@ class Priems
        ) : $pl['date3'];

        // Костыль. Будет работать, пока приём изменяет ОДИН параметр.
-        $effect = "Защита от магии {$data[$element][1]}: " . current($this->lookStatsArray($dataStr));
+        $effect = "Защита от магии {$data[$element][1]}: " . current(ConversionHelper::dataStringToArray($dataStr));
        $color = $this->logColor[$element];

        $name = "Цель {$data[$element][1]}";
@ -2715,7 +2682,7 @@ class Priems
        }//Проверяем эффект
        $prv['j_priem'] = $btl->stats[$btl->uids[$u1]]['u_priem'][$j_id][0];

-        $pvr['data'] = $this->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+        $pvr['data'] = ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
        $pName = $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['name'];

        $pvr['hp'] = $pvr['data']['atgm'];
@ -2763,7 +2730,7 @@ class Priems
    private function devouringFlameInit($id, array $pl, Battle $btl)
    {
        $baseDamage = [6 => 53, 7 => 63, 8 => 77, 9 => 91, 10 => 110, 11 => 133,];
-        list($damage, , $isMiss) = $this->magicAttack(
+        [$damage, , $isMiss] = $this->magicAttack(
            $btl, $this->u->info['id'], $this->ue['id'], $baseDamage[$pl['level']], self::FIRE
        );
        if ($isMiss || $damage <= 0) {
@ -2777,7 +2744,7 @@ class Priems
            $logText, $btl->hodID + 1
        );

-        $data = $this->impStats(['atgm' => max(floor($damage / 5), 1)]);
+        $data = ConversionHelper::arrayToDataString(['atgm' => max(floor($damage / 5), 1)]);

        $this->addPriem(
            $this->ue['id'], $pl['id'], $data, 0, 77, 5, $this->u->info['id'], 1, 'пожирающеепламя', 0, 0, 1
@ -2801,7 +2768,7 @@ class Priems
        $datas = Db::getColumn($q, array_fill(0, 3, $this->ue['id']));
        $stats = array_fill_keys(['s1', 's2', 's3', 's5', 's6'], 0);
        foreach ($datas as $data) {
-            $data = $this->lookStatsArray($data);
+            $data = ConversionHelper::dataStringToArray($data);
            print_r($data);
            foreach (array_keys($stats) as $stat) {
                if (isset($data[$stat])) {
--- a/_incl_data/class/Quests.php
+++ b/_incl_data/class/Quests.php
@ -1,5 +1,7 @@
 <?php

+use User\ItemsModel;
+
 class Quests
 {
    private $free_x = 28;
@ -787,7 +789,7 @@ class Quests
                    }
                }
                $d['add_rep'] = (int)$d['add_rep'] * (int)$ex2[1];
-                $u->deleteItemID($ex2[0], $u->info['id'], $ex2[1]);
+                ItemsModel::deleteItemsById($ex2[0], $ex2[1]);
                $i++;
            }
        }
@ -909,7 +911,7 @@ class Quests
                    $ex2 = explode('=', $ex[$i]);
                    $ex2 = explode('=', $ex[$i]);
                    $x2 = $u->testAction('`uid` = "' . $u->info['id'] . '" AND `time` > ' . $pl2['time'] . ' AND `vars` = "win_bot_' . $ex2[0] . '" LIMIT ' . $ex2[1], 2);
-                    $u->deleteItemID($ex2[0], $u->info['id'], $ex2[1]);
+                    ItemsModel::deleteItemsById($ex2[0], $ex2[1]);
                    $i++;
                }
            }
@ -921,7 +923,7 @@ class Quests
                    $ex2 = explode('=', $ex[$i]);
                    $ex2 = explode('=', $ex[$i]);
                    $x2 = $u->testAction('`uid` = "' . $u->info['id'] . '" AND `time` > ' . $pl2['time'] . ' AND `vars` = "win_bot_' . $ex2[0] . '" LIMIT ' . $ex2[1], 2);
-                    $u->deleteItemID($ex2[0], $u->info['id'], $ex2[1]);
+                    ItemsModel::deleteItemsById($ex2[0], $ex2[1]);
                    $i++;
                }
            }
--- a/_incl_data/class/User.php
+++ b/_incl_data/class/User.php
--- a/_incl_data/class/User/Effects.php
+++ b/_incl_data/class/User/Effects.php
@ -1,13 +1,15 @@
 <?php

+namespace User;
+
 use Core\Db;

-class UserEffects
+class Effects
 {

-    /** Äàòü èãðîêó ýôôåêò.
-     * @param int $uid id èãðîêà
-     * @param int $id  id ýôôåêòà
+    /** Дать игроку эффект.
+     * @param int $uid id игрока
+     * @param int $id  id эффекта
     * @return void
     */
    public static function addById(int $uid, int $id)
--- a/_incl_data/class/User/ItemsModel.php
+++ b/_incl_data/class/User/ItemsModel.php
@ -0,0 +1,149 @@
+<?php
+
+namespace User;
+
+use Core\ConversionHelper;
+use Core\Db;
+use User;
+
+class ItemsModel
+{
+    /** Проверяет предметы на отсутствие в инвентаре.
+     * @param array $itemIds id предметов.
+     * @return array id отсутствующих предметов.
+     */
+    public static function hasNoItemsInInventory(array $itemIds): array
+    {
+        /* Очень прóклятая конструкция для очень сломанной проверки.
+        Скотина, если заработает с первого раза без проверки я буду горд собой. */
+
+        $uid = User::start()->info['id'];
+        $cols = count($itemIds);
+        $check = Db::getValue(
+            'select count(*) from items_users
+                where item_id in (?) and uid = ? and (`delete` = 0 or `delete` = 1000)',
+            [implode(',', $itemIds), $uid]
+        );
+
+        if ($cols === $check) {
+            return [];
+        }
+
+        $arr = $itemIds;
+        $query = 'select item_id from (select ' . $arr[0] . ' item_id';
+        $arr[0] = '';
+        $query .= implode(' union select ', $arr);
+        $query .= ') params left join items_users using (item_id) where items_users.item_id is null ';
+        $query .= 'and uid = ? and (`delete` = 0 or `delete` = 1000)';
+
+        //select item_id from (select 1 item_id union select 2 union select 3) params left join items_users using (item_id) where items_users.item_id is null
+
+        return Db::getColumn($query, [$uid]);
+    }
+
+    public static function getNamesByIds(array $ids, string $separator = ', '): string
+    {
+        $namesArray = Db::getColumn('select name from items_main where id in (?)', [$ids]);
+        return implode($separator, $namesArray);
+    }
+
+    //Удаление определенного типа предметов
+
+    /** Удаление предметов из инвентаря активного игрока.
+     * @param int $id id предмета.
+     * @param int $coldel количество предметов.
+     * @return void
+     */
+    public static function deleteItemsById(int $id, int $coldel = 1)
+    {
+        Db::sql(
+            'update items_users set `delete` = unix_timestamp() where id in (select id from items_users where item_id = ? and uid = ? and (`delete` = 0 or `delete` = 1000) order by inGroup desc limit ?)',
+            [$id, User::start()->info['id'], $coldel]
+        );
+    }
+
+    //вес предметов у юзера
+    public static function inventoryWeightAndItemQuantity(): array
+    {
+        $uid = User::start()->info['id'];
+        $stats = User::start()->stats;
+
+        return [
+            'now' => Db::getValue('select sum(massa) from items_users left join items_main on item_id = items_main.id where uid = ? and (`delete` = 0 or (`delete` = 1000 and inGroup > 0)) and inShop = 0 and inOdet = 0', [$uid]),
+            'max' => 40 + ($stats['os7'] * 10) + $stats['s4'] + $stats['maxves'] + $stats['s1'] * 4,
+            'items' => Db::getValue('select count(*) from items_users where uid = ? and `delete` = 0 and inShop = 0 and inOdet = 0', [$uid]),
+        ];
+    }
+
+    public static function addItem($id, $uid, $md = null, $dn = null, $mxiznos = null, $nosudba = null, $plavka = null)
+    {
+        $user = User::start();
+        $rt = -1;
+        $i = Db::getRow('select * from items_main where id = ?', [$id]);
+        if (isset($i['id'])) {
+            $d = Db::getRow('select id, items_id, data from items_main_data where items_id = ?', [$i['id']]);
+            //новая дата
+            $data = $d['data'];
+            if ($i['ts'] > 0 && $nosudba == null) {
+                $ui = Db::getValue('select login from users where id = ?', [$uid]);
+                $data .= '|sudba=' . $ui;
+            }
+            if ($md != null) {
+                $data .= $md;
+                $data = ConversionHelper::dataStringToArray($data); // Если в функции имеются две одинаковых константы SROK?
+                $data = ConversionHelper::arrayToDataString($data);
+            }
+
+            //предмет с настройками из подземелья
+            if ($dn != null && $dn['dn_delete'] > 0) {
+                $i['dn_delete'] = 1;
+            }
+            if ($mxiznos > 0) {
+                $i['iznosMAXi'] = $mxiznos;
+            }
+            if ($user->info['dnow'] > 0) {
+                $room = $user->room['city'];
+            } else {
+                $room = $user->info['city'];
+            }
+            $args = [
+                $i['overTypei'],
+                $i['id'],
+                $uid,
+                $data,
+                $i['iznosMAXi'],
+                $i['geni'],
+                $i['magic_inci'],
+                $room,
+                $i['dn_delete'] ?? 0,
+            ];
+            Db::sql(
+                'insert into items_users (overType, item_id, uid, data, iznosMAX, geniration, magic_inc, maidin, lastUPD, time_create, dn_delete) values (?,?,?,?,?,?,?,?,unix_timestamp(),unix_timestamp(),?)',
+                $args
+            );
+            $rt = Db::lastInsertId() ?? 0;
+            if ($rt !== 0) {
+                Db::sql('update items_users set dn_delete = 1 where id = ? and data like ?', [$rt, '%dn_delete=%']);
+                if ($uid == $user->info['id']) {
+                    $user->stack($rt);
+                }
+                $ads = '';
+                if ($plavka != null) {
+                    $ads = 'Расплавлен предмет : [' . $plavka . ']';
+                }
+                //Записываем в личное дело что предмет получен
+                $user->addDelo(
+                    1,
+                    $uid,
+                    '&quot;AddItems.' . $user->info['city'] . '&quot;: Получен предмет &quot;<strong>' . $i['name'] . '</strong>&quot; (x1) [#' . $i['iid'] . ']. ' . $ads,
+                    time(),
+                    $user->info['city'],
+                    'AddItems.' . $user->info['city'],
+                    0,
+                    0
+                );
+            }
+        }
+        return $rt;
+    }
+}
--- a/_incl_data/class/User/Register.php
+++ b/_incl_data/class/User/Register.php
@ -1,9 +1,12 @@
 <?php

+namespace User;
+
 use Core\Config;
 use Core\Db;
+use User;

-class UserRegister
+class Register
 {
    private string $error = '';
    private int $class = 0;
@ -164,7 +167,7 @@ class UserRegister
            ]
        );
        $uid = Db::lastInsertId();
-        trigger_error('Db::lastInsertId= ' .$uid);
+        trigger_error('Db::lastInsertId= ' . $uid);
        $_SESSION['uid'] = $uid;
        $this->setCookies($login);
        $this->setStatsItemsEffects($uid);
@ -197,7 +200,7 @@ class UserRegister
        );

        foreach ($this->classBonuses[$this->class]['items'] as $item) {
-            $itemId = $u->addItem($item, $uid);
+            $itemId = \User\ItemsModel::addItem($item, $uid);
            Db::sql(
                'update items_users
            set `1price` = (select price_1 from items_shop where items_shop.item_id = ? and sid = 1)
@ -206,7 +209,7 @@ class UserRegister
            );
        }

-        $this->addEffects($uid, implode(',',$this->classBonuses[$this->class]['effects']));
+        $this->addEffects($uid, implode(',', $this->classBonuses[$this->class]['effects']));
    }


--- a/_incl_data/class/User/Stats.php
+++ b/_incl_data/class/User/Stats.php
@ -1,12 +1,15 @@
 <?php

-use Core\Db;
+namespace User;

-class UserStats
+use Core\Db;
+use User;
+
+class Stats
 {
    /**
     * Собирает суммы всех бонусов с одетых предметов и активных эфектов.
-     * @param int $userId
+     * @param int  $userId
     * @param bool $showAll
     * @return array
     */
@ -58,4 +61,6 @@ union all select data from eff_users where uid = ? and `delete` = 0';
            'hasmana' => $mpAll > 0,
        ];
    }
+
+
 }
--- a/_incl_data/class/User/StatsModel.php
+++ b/_incl_data/class/User/StatsModel.php
@ -0,0 +1,13 @@
+<?php
+
+namespace User;
+
+use Core\Db;
+
+class StatsModel
+{
+    public static function addRepexpById(int $id, int $val)
+    {
+        Db::sql('update stats set repexp = repexp + ? where id = ?', [$val, $id]);
+    }
+}
--- a/_incl_data/class/User/UserIp.php
+++ b/_incl_data/class/User/UserIp.php
@ -1,5 +1,7 @@
 <?php

+
+namespace User;
 class UserIp
 {
    public static function get()
--- a/_incl_data/class/dnaction/101/laba1.php
+++ b/_incl_data/class/dnaction/101/laba1.php
@ -1,161 +1,183 @@
 <?php
-if( isset($s[1]) && $s[1] == '101/laba1' ) {
-	/*
-		Сундук: Лаболатория
-		* Можно собрать случайную тактику, но не более 3 на человека за поход и не более 10 на команду
-		* 897 - Слиток пустынной руды
-		* 903 - Тысячелетний камень
-		* 888 - Шепот гор
-		* 892 - Эссенция чистоты
-		* 950 - Кожа Общего Врага
-		* 904 - Кристалл времен
-		* 878 - Лучистый топаз
-		* 880 - Эссенция глубины
-		* 879 - Ралиэль
-		* 899 - Корень змеиного дерева
-		* 882 - Глубинный камень
-		* 908 - Камень затаенного солнца
-		* 909 - Эссенция праведного гнева
-		* 902 - Плод змеиного дерева
-		* 881 - Лучистый Рубин
-		* 893 - Эссенция лунного света
-		* 898 - Троекорень
-		* 890 - Сгусток астрала
-		* 907 - Кристалл стабильности
-		* 905 - Стихиалия
-		-- Боя
-		4243 - 897 х3
-		4244 - 903 х2
-		4245 - 888 х2
-		4246 - 892 х1
-		4247 - 879 х1 , 892 х1
-		-- Защиты
-		4248 - 950 х3
-		4249 - 904 х2
-		4250 - 878 х2
-		4251 - 880 х1
-		4252 - 880 х1 , 892 х1
-		-- Крови
-		4253 - 899 х3
-		4254 - 882 х2
-		4255 - 908 х2
-		4256 - 909 х1
-		4257 - 909 х1 , 892 х1
-		-- Ответа
-		4258 - 899 х3
-		4259 - 902 х2
-		4260 - 881 х2
-		4261 - 893 х1
-		4262 - 893 х1 , 892 х1
-		-- Отражения
-		4263 - 898 х3
-		4264 - 890 х2
-		4265 - 907 х2
-		4266 - 905 х1
-		4267 - 905 х1 , 892 х1
-	*/
-	//Все переменные сохранять в массиве $vad !
-	$vad = array(
-		'go' => true
-	);
-	
-	$vad['recept'] = array(
-		//Б
-		array( 897, 3 ),
-		array( 903, 2 ),
-		array( 888, 2 ),
-		array( 892, 1 ),
-		array( 892, 1, 892, 1 ),
-		//З
-		array( 950, 3 ),
-		array( 904, 2 ),
-		array( 878, 2 ),
-		array( 880, 1 ),
-		array( 880, 1, 892, 1 ),
-		//К
-		array( 899, 3 ),
-		array( 882, 2 ),
-		array( 908, 2 ),
-		array( 909, 1 ),
-		array( 909, 1, 892, 1 ),
-		//Ответа
-		array( 899, 3 ),
-		array( 902, 2 ),
-		array( 881, 2 ),
-		array( 893, 1 ),
-		array( 893, 1, 892, 1 ),
-		//Отражения
-		array( 898, 3 ),
-		array( 890, 2 ),
-		array( 907, 2 ),
-		array( 905, 1 ),
-		array( 905, 1, 892, 1 )
-	);
-	
-	$vad['test1'] = mysql_fetch_array(mysql_query('SELECT COUNT(*) FROM `dungeon_actions` WHERE `dn` = "'.$u->info['dnow'].'" AND `vars` = "obj_act'.$obj['id'].'_lab" AND `uid` = "'.$u->info['id'].'" LIMIT 1'));
-	$vad['test2'] = mysql_fetch_array(mysql_query('SELECT COUNT(*) FROM `dungeon_actions` WHERE `dn` = "'.$u->info['dnow'].'" AND `vars` = "obj_act'.$obj['id'].'_lab" LIMIT 1'));
-	
-	$vad['i'] = 0;
-	while( $vad['i'] < count($vad['recept']) ) {
-		//4243 + $vad['i']
-		$vad['tr_itm'] = $vad['recept'][$vad['i']][0]; 
-		if( $vad['tr_itm'] > 0 ) {
-			$vad['tr_itm'] = mysql_fetch_array(mysql_query('SELECT COUNT(*) FROM `items_users` WHERE `item_id` = "'.$vad['recept'][$vad['i']][0].'" AND (`delete` = "0" OR `delete` = "1000") AND `inShop` = "0" AND `inTransfer` = "0" AND `uid` = "'.$u->info['id'].'" LIMIT 1'));
-			if( $vad['tr_itm'][0] >= $vad['recept'][$vad['i']][1] ) {
-				$vad['tr_itm'] = true;
-			}else{
-				$vad['tr_itm'] = false;
-			}
-		}
-		if( $vad['recept'][$vad['i']][2] > 0 && $vad['tr_itm'] == true ) {
-			$vad['tr_itm'] = mysql_fetch_array(mysql_query('SELECT COUNT(*) FROM `items_users` WHERE `item_id` = "'.$vad['recept'][$vad['i']][2].'" AND (`delete` = "0" OR `delete` = "1000") AND `inShop` = "0" AND `inTransfer` = "0" AND `uid` = "'.$u->info['id'].'" LIMIT 1'));
-			if( $vad['tr_itm'][2] >= $vad['recept'][$vad['i']][3] ) {
-				//все ок
-			}else{
-				$vad['tr_itm'] = false;
-			}
-		}
-		if( $vad['tr_itm'] == true ) {
-			$vad['itm'][] = mysql_fetch_array(mysql_query('SELECT `id`,`name` FROM `items_main` WHERE `id` = "'.(4243 + $vad['i']).'" LIMIT 1'));
-			$vad['tr'][(4243 + $vad['i'])] = array( $vad['recept'][$vad['i']][0] , $vad['recept'][$vad['i']][1] , $vad['recept'][$vad['i']][2] , $vad['recept'][$vad['i']][3] );
-		}
-		$vad['i']++;
-	}
-	
-	$vad['itm'] = $vad['itm'][rand(0,count($vad['itm'])-1)];
-	
-	if( $vad['test2'][0] >= 10 ) {
-		$r = 'Не удалось воспользоваться лабораторией, не более 10 раз на команду за один поход';
-		$vad['go'] = false;
-	}elseif( $vad['test1'][0] >= 3 ) {
-		$r = 'Не удалось воспользоваться лабораторией, не более 3 раз на персонажа за один поход';
-		$vad['go'] = false;
-	}elseif(!isset($vad['itm']['id'])) {
-		$r = 'Недостаточно ингридиентов...';
-		$vad['go'] = false;
-	}
-	
-	
-	
-	if( $vad['go'] == true ) {
-		//Выдаем предмет
-		if( $vad['tr'][$vad['itm']['id']][1] > 0 ) {
-			$u->deleteItemID($vad['tr'][$vad['itm']['id']][0],$u->info['id'],$vad['tr'][$vad['itm']['id']][1]);
-		}
-		if( $vad['tr'][$vad['itm']['id']][3] > 0 ) {
-			$u->deleteItemID($vad['tr'][$vad['itm']['id']][2],$u->info['id'],$vad['tr'][$vad['itm']['id']][3]);
-		}
-		mysql_query('INSERT INTO `dungeon_actions` (`dn`,`uid`,`time`,`vars`,`x`,`y`) VALUES (
-			"'.$u->info['dnow'].'","'.$u->info['id'].'","'.time().'","obj_act'.$obj['id'].'_lab","'.$obj['x'].'","'.$obj['y'].'"
-		)');
-		$u->addItem($vad['itm']['id'],$u->info['id'],'|frompisher=101');
-		$r = 'Вы создали предмет &quot;'.$vad['itm']['name'].'&quot;! Расплавив ресурсы ...';
-		if($u->info['sex'] == 0) {
-			$vad['text'] = '<b>'.$u->info['login'].'</b> создал предмет &quot;'.$vad['itm']['name'].'&quot; при помощи &quot;'.$obj['name'].'&quot;.';
-		}else{
-			$vad['text'] = '<b>'.$u->info['login'].'</b> создала предмет &quot;'.$vad['itm']['name'].'&quot; при помощи &quot;'.$obj['name'].'&quot;.';
-		}
-		$this->sys_chat($vad['text']);
-	}	
+
+use User\ItemsModel;
+
+if (isset($s[1]) && $s[1] == '101/laba1') {
+    /*
+        Сундук: Лаболатория
+        * Можно собрать случайную тактику, но не более 3 на человека за поход и не более 10 на команду
+        * 897 - Слиток пустынной руды
+        * 903 - Тысячелетний камень
+        * 888 - Шепот гор
+        * 892 - Эссенция чистоты
+        * 950 - Кожа Общего Врага
+        * 904 - Кристалл времен
+        * 878 - Лучистый топаз
+        * 880 - Эссенция глубины
+        * 879 - Ралиэль
+        * 899 - Корень змеиного дерева
+        * 882 - Глубинный камень
+        * 908 - Камень затаенного солнца
+        * 909 - Эссенция праведного гнева
+        * 902 - Плод змеиного дерева
+        * 881 - Лучистый Рубин
+        * 893 - Эссенция лунного света
+        * 898 - Троекорень
+        * 890 - Сгусток астрала
+        * 907 - Кристалл стабильности
+        * 905 - Стихиалия
+        -- Боя
+        4243 - 897 х3
+        4244 - 903 х2
+        4245 - 888 х2
+        4246 - 892 х1
+        4247 - 879 х1 , 892 х1
+        -- Защиты
+        4248 - 950 х3
+        4249 - 904 х2
+        4250 - 878 х2
+        4251 - 880 х1
+        4252 - 880 х1 , 892 х1
+        -- Крови
+        4253 - 899 х3
+        4254 - 882 х2
+        4255 - 908 х2
+        4256 - 909 х1
+        4257 - 909 х1 , 892 х1
+        -- Ответа
+        4258 - 899 х3
+        4259 - 902 х2
+        4260 - 881 х2
+        4261 - 893 х1
+        4262 - 893 х1 , 892 х1
+        -- Отражения
+        4263 - 898 х3
+        4264 - 890 х2
+        4265 - 907 х2
+        4266 - 905 х1
+        4267 - 905 х1 , 892 х1
+    */
+    //Все переменные сохранять в массиве $vad !
+    $vad = [
+        'go' => true,
+    ];
+
+    $vad['recept'] = [
+        //Б
+        [897, 3],
+        [903, 2],
+        [888, 2],
+        [892, 1],
+        [892, 1, 892, 1],
+        //З
+        [950, 3],
+        [904, 2],
+        [878, 2],
+        [880, 1],
+        [880, 1, 892, 1],
+        //К
+        [899, 3],
+        [882, 2],
+        [908, 2],
+        [909, 1],
+        [909, 1, 892, 1],
+        //Ответа
+        [899, 3],
+        [902, 2],
+        [881, 2],
+        [893, 1],
+        [893, 1, 892, 1],
+        //Отражения
+        [898, 3],
+        [890, 2],
+        [907, 2],
+        [905, 1],
+        [905, 1, 892, 1],
+    ];
+
+    $vad['test1'] = mysql_fetch_array(
+        mysql_query(
+            'SELECT COUNT(*) FROM `dungeon_actions` WHERE `dn` = "' . $u->info['dnow'] . '" AND `vars` = "obj_act' . $obj['id'] . '_lab" AND `uid` = "' . $u->info['id'] . '" LIMIT 1'
+        )
+    );
+    $vad['test2'] = mysql_fetch_array(
+        mysql_query(
+            'SELECT COUNT(*) FROM `dungeon_actions` WHERE `dn` = "' . $u->info['dnow'] . '" AND `vars` = "obj_act' . $obj['id'] . '_lab" LIMIT 1'
+        )
+    );
+
+    $vad['i'] = 0;
+    while ($vad['i'] < count($vad['recept'])) {
+        //4243 + $vad['i']
+        $vad['tr_itm'] = $vad['recept'][$vad['i']][0];
+        if ($vad['tr_itm'] > 0) {
+            $vad['tr_itm'] = mysql_fetch_array(
+                mysql_query(
+                    'SELECT COUNT(*) FROM `items_users` WHERE `item_id` = "' . $vad['recept'][$vad['i']][0] . '" AND (`delete` = "0" OR `delete` = "1000") AND `inShop` = "0" AND `inTransfer` = "0" AND `uid` = "' . $u->info['id'] . '" LIMIT 1'
+                )
+            );
+            if ($vad['tr_itm'][0] >= $vad['recept'][$vad['i']][1]) {
+                $vad['tr_itm'] = true;
+            } else {
+                $vad['tr_itm'] = false;
+            }
+        }
+        if ($vad['recept'][$vad['i']][2] > 0 && $vad['tr_itm'] == true) {
+            $vad['tr_itm'] = mysql_fetch_array(
+                mysql_query(
+                    'SELECT COUNT(*) FROM `items_users` WHERE `item_id` = "' . $vad['recept'][$vad['i']][2] . '" AND (`delete` = "0" OR `delete` = "1000") AND `inShop` = "0" AND `inTransfer` = "0" AND `uid` = "' . $u->info['id'] . '" LIMIT 1'
+                )
+            );
+            if ($vad['tr_itm'][2] >= $vad['recept'][$vad['i']][3]) {
+                //все ок
+            } else {
+                $vad['tr_itm'] = false;
+            }
+        }
+        if ($vad['tr_itm'] == true) {
+            $vad['itm'][] = mysql_fetch_array(
+                mysql_query('SELECT `id`,`name` FROM `items_main` WHERE `id` = "' . (4243 + $vad['i']) . '" LIMIT 1')
+            );
+            $vad['tr'][(4243 + $vad['i'])] = [$vad['recept'][$vad['i']][0], $vad['recept'][$vad['i']][1], $vad['recept'][$vad['i']][2], $vad['recept'][$vad['i']][3]];
+        }
+        $vad['i']++;
+    }
+
+    $vad['itm'] = $vad['itm'][rand(0, count($vad['itm']) - 1)];
+
+    if ($vad['test2'][0] >= 10) {
+        $r = 'Не удалось воспользоваться лабораторией, не более 10 раз на команду за один поход';
+        $vad['go'] = false;
+    } elseif ($vad['test1'][0] >= 3) {
+        $r = 'Не удалось воспользоваться лабораторией, не более 3 раз на персонажа за один поход';
+        $vad['go'] = false;
+    } elseif (!isset($vad['itm']['id'])) {
+        $r = 'Недостаточно ингридиентов...';
+        $vad['go'] = false;
+    }
+
+
+    if ($vad['go'] == true) {
+        //Выдаем предмет
+        if ($vad['tr'][$vad['itm']['id']][1] > 0) {
+            ItemsModel::deleteItemsById($vad['tr'][$vad['itm']['id']][0], $vad['tr'][$vad['itm']['id']][1]);
+        }
+        if ($vad['tr'][$vad['itm']['id']][3] > 0) {
+            ItemsModel::deleteItemsById($vad['tr'][$vad['itm']['id']][2], $vad['tr'][$vad['itm']['id']][3]);
+        }
+        mysql_query(
+            'INSERT INTO `dungeon_actions` (`dn`,`uid`,`time`,`vars`,`x`,`y`) VALUES (
+			"' . $u->info['dnow'] . '","' . $u->info['id'] . '","' . time(
+            ) . '","obj_act' . $obj['id'] . '_lab","' . $obj['x'] . '","' . $obj['y'] . '"
+		)'
+        );
+        \User\ItemsModel::addItem($vad['itm']['id'], $u->info['id'], '|frompisher=101');
+        $r = 'Вы создали предмет &quot;' . $vad['itm']['name'] . '&quot;! Расплавив ресурсы ...';
+        if ($u->info['sex'] == 0) {
+            $vad['text'] = '<b>' . $u->info['login'] . '</b> создал предмет &quot;' . $vad['itm']['name'] . '&quot; при помощи &quot;' . $obj['name'] . '&quot;.';
+        } else {
+            $vad['text'] = '<b>' . $u->info['login'] . '</b> создала предмет &quot;' . $vad['itm']['name'] . '&quot; при помощи &quot;' . $obj['name'] . '&quot;.';
+        }
+        $this->sys_chat($vad['text']);
+    }
 }
-?>
--- a/_incl_data/class/dnaction/108/fontan2.php
+++ b/_incl_data/class/dnaction/108/fontan2.php
@ -34,7 +34,7 @@ if(isset($s[1]) && $s[1] == '108/fontan2') {
 			"'.$u->info['dnow'].'","'.time().'","'.$obj['x'].'","'.$obj['y'].'","'.$u->info['id'].'","obj_act'.$obj['id'].'","'.$vad['bad'].'")');
 		$r = 'Опустив пустую бутылку в фонтан вы наполнили её.';
 		$u->deleteItem(intval($vad['bt']['id']),$u->info['id'],1);
-		$u->addItem(round(2417),$u->info['id'],'|musor=2|noremont=1|nosale=1',108, 3);
+		\User\ItemsModel::addItem(round(2417),$u->info['id'],'|musor=2|noremont=1|nosale=1',108, 3);
 	}
 	unset($vad);
  
--- a/_incl_data/class/dnaction/108/fontan3.php
+++ b/_incl_data/class/dnaction/108/fontan3.php
@ -23,7 +23,7 @@ if(isset($s[1]) && $s[1] == '108/fontan3') {
 	mysql_query('INSERT INTO `dungeon_actions` (`dn`, `time`, `x`, `y`, `uid`, `vars`, `vals`) VALUES (
 			"'.$u->info['dnow'].'","'.time().'","'.$obj['x'].'","'.$obj['y'].'","'.$u->info['id'].'","obj_act'.$obj['id'].'","'.$vad['bad'].'")');
 			//4041
-	$u->addItem(round(4041),$u->info['id'],'|musor=2|noremont=1|nosale=1',108, 1);
+	\User\ItemsModel::addItem(round(4041),$u->info['id'],'|musor=2|noremont=1|nosale=1',108, 1);
 	$r = 'Вы получили Снадобье Забытых Мастеров';
  }
  unset($vad);
--- a/_incl_data/class/dnaction/12/fontan1.php
+++ b/_incl_data/class/dnaction/12/fontan1.php
@ -22,7 +22,7 @@ if(isset($s[1]) && $s[1] == '12/fontan1') {
    $r = 'Вы воспользовались &quot;Ключ №1&quot;. Опустив пустую бутылку в фонтан вы наполнили её.';
 	$u->deleteItem(intval($vad['key']['id']), $u->info['id'], 1);
 	$u->deleteItem(intval($vad['bottle']['id']), $u->info['id'], 1); 
-	$u->addItem(round(4403), $u->info['id'], '|musor=2|noremont=1|nosale=1',12);
+	\User\ItemsModel::addItem(round(4403), $u->info['id'], '|musor=2|noremont=1|nosale=1',12);
  } 
  unset($vad);
 }
--- a/_incl_data/class/dnaction/12/fontan2.php
+++ b/_incl_data/class/dnaction/12/fontan2.php
@ -37,7 +37,7 @@ if( isset($s[1]) && $s[1] == '12/fontan2' ) {
 				mysql_query('INSERT INTO `dungeon_actions` (`uid`,`dn`,`x`,`y`,`time`,`vars`,`vals`) VALUES ( "'.$u->info['id'].'","'.$u->info['dnow'].'","'.$u->info['x'].'","'.$u->info['y'].'","'.time().'", "use_fontan","2" )'); // Выпили раз, вот и хватит с вас!
 				$r = 'Опустив пустую бутылку в фонтан вы наполнили её.';
 				$u->deleteItem(intval($vad['bt']['id']),$u->info['id'],1); // Удаляем Пустая Бутылка = 2.
-				$u->addItem(round(1186),$u->info['id'],'|musor=2|noremont=1|nosale=1',12, 3); // Великое зелье Стойкости 1186
+				\User\ItemsModel::addItem(round(1186),$u->info['id'],'|musor=2|noremont=1|nosale=1',12, 3); // Великое зелье Стойкости 1186
 		}
 		unset($vad);
 }
--- a/_incl_data/class/dnaction/12/fontan3.php
+++ b/_incl_data/class/dnaction/12/fontan3.php
@ -51,7 +51,7 @@ if( isset($s[1]) && $s[1] == '12/fontan3' ) {
 		mysql_query('DELETE FROM `items_users` WHERE `id` = "'.mysql_real_escape_string(intval($vad['gems']['query'])).'" LIMIT 1');
 		mysql_query('DELETE FROM `items_users` WHERE `id` = "'.mysql_real_escape_string(intval($vad['bt']['id'])).'" LIMIT 1');
 		
-		$u->addItem(round(1188),$u->info['id'],'|musor=2|noremont=1|nosale=1',12, 3); // Великое зелье Отрицания 1188
+		\User\ItemsModel::addItem(round(1188),$u->info['id'],'|musor=2|noremont=1|nosale=1',12, 3); // Великое зелье Отрицания 1188
 	}
 	unset($vad);
 }
--- a/_incl_data/class/dnaction/12/fontan4.php
+++ b/_incl_data/class/dnaction/12/fontan4.php
@ -38,7 +38,7 @@ if(isset($s[1]) && $s[1] == '12/fontan4') {
 	$r = 'Опустив пустую бутылку в фонтан вы наполнили её.';
 	$vad['drug'] = array(0 => 2588, 1 => 2590, 2 => 2589, 3 => 2145);
    mysql_query('DELETE FROM `items_users` WHERE `id` = "'.mysql_real_escape_string(intval($vad['bottle']['id'])).'" LIMIT 1');
-	$u->addItem(round($vad['drug'][rand(0,3)]), $u->info['id'], '|musor=2|nosale=1|noremont=1', 12, 3);
+	\User\ItemsModel::addItem(round($vad['drug'][rand(0,3)]), $u->info['id'], '|musor=2|nosale=1|noremont=1', 12, 3);
  }
  unset($vad);
 }
--- a/_incl_data/class/dnaction/15/shaiba.php
+++ b/_incl_data/class/dnaction/15/shaiba.php
@ -15,7 +15,7 @@ if( isset($s[1]) && $s[1] == '15/shaiba' ) {
 	mysql_query('DELETE FROM `dungeon_obj` WHERE `id` = "'.$obj['id'].'" LIMIT 1');
 	
 	//Добавляем шайбу в инвентарь игрока
-	$vad['itm'] = $u->addItem(4910,$u->info['id']);
+	$vad['itm'] = \User\ItemsModel::addItem(4910,$u->info['id']);
 	if($vad['itm'] > 0) {
 		mysql_query('UPDATE `items_users` SET `gift` = "Шайба" WHERE `id` = "'.$vad['itm'].'" LIMIT 1');
 	}
--- a/_incl_data/class/dnaction/_dungeon_replace.php
+++ b/_incl_data/class/dnaction/_dungeon_replace.php
@ -1,481 +1,389 @@
 <?php

-				echo "
-				<script language='JavaScript'>
-				var elem = document.getElementById('se-pre-con');
-				elem.parentNode.removeChild(elem);
-				</script>
-				";
+use Core\Db;
+use User\ItemsModel;

-if(!defined('GAME')) { die(); }
+echo "<script>
+let elem = document.getElementById('se-pre-con');
+elem.parentNode.removeChild(elem);
+</script>";

-if($_GET['go_away']) { header('location: main.php'); die(); }
-if($u->info['battle'] != 0) { header('location: main.php'); die(); }
+if (!defined('GAME')) {
+    die();
+}

-if(isset($_POST['clip76_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4677" LIMIT 1'));
-  if($u->count_items(950, $u->info['id'], 1) > 0) {
-    if($u->count_items(907, $u->info['id'], 1) > 0) {
-      if($u->count_items(902, $u->info['id'], 1) > 0) {
-        if($u->count_items(878, $u->info['id'], 1) > 0) {
-          if($u->count_items(905, $u->info['id'], 1) > 0) {
-            if($u->count_items(903, $u->info['id'], 1) > 0) {
-                $data = '|frompisher=12';
-                $u->addItem(4677, $u->info['id'], $data, $obj);
-                $u->deleteItemID(950, $u->info['id'], 1);
-                $u->deleteItemID(907, $u->info['id'], 1);
-                $u->deleteItemID(902, $u->info['id'], 1);
-                $u->deleteItemID(878, $u->info['id'], 1);
-                $u->deleteItemID(905, $u->info['id'], 1);
-                $u->deleteItemID(903, $u->info['id'], 1);
-                $u->deleteItemID(905, $u->info['id'], 1);
-                $err = 'Вы получили Черная метка';
-            } else {
-              $err = "Не хватает ресурсов &quot;Эссенция праведного гнева&quot;"; 
-            }
-          } else {
-            $err = "Не хватает ресурсов &quot;Шепот гор&quot;"; 
-          }
-        } else {
-          $err = "Не хватает ресурсов &quot;Камень затаенного солнца&quot;"; 
+if ($_GET['go_away']) {
+    header('location: main.php');
+    die();
+}
+if ($u->info['battle'] != 0) {
+    header('location: main.php');
+    die();
+}
+
+function combineItems(array $parts, int $result, string $data = '|frompisher=12'): string
+{
+    global $u;
+    $obj = Db::getRow('select * from items_main where id = ?', [$result]);
+    $checkItems = ItemsModel::hasNoItemsInInventory($parts);
+    if (empty($checkItems)) {
+        \User\ItemsModel::addItem($result, $u->info['id'], $data, $obj);
+        foreach ($parts as $part) {
+            ItemsModel::deleteItemsById($part);
        }
-      } else {
-        $err = "Не хватает ресурсов &quot;Кристалл голоса предков&quot;"; 
-      }
+        return 'Вы получили ' . ItemsModel::getNamesByIds([$result]);
    } else {
-      $err = "Не хватает ресурсов &quot;Сгусток эфира&quot;"; 
+        return 'Не хватает ресурсов: ' . ItemsModel::getNamesByIds($checkItems);
    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Лучистое Серебро&quot;";
-  }
-} elseif(isset($_POST['clip80_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4758" LIMIT 1'));
-  if($u->count_items(950, $u->info['id'], 1) > 0) {
-    if($u->count_items(907, $u->info['id'], 1) > 0) {
-      if($u->count_items(902, $u->info['id'], 1) > 0) {
-        if($u->count_items(878, $u->info['id'], 1) > 0) {
-          if($u->count_items(905, $u->info['id'], 1) > 0) {
-            if($u->count_items(903, $u->info['id'], 1) > 0) {
-				if($u->count_items(1035, $u->info['id'], 1) > 0) {
-                 $data = '|frompisher=12|onlyOne=1|oneType=84';
-                 $u->addItem(4758, $u->info['id'], $data, $obj);
-                 $u->deleteItemID(950, $u->info['id'], 1);
-                 $u->deleteItemID(907, $u->info['id'], 1);
-                 $u->deleteItemID(902, $u->info['id'], 1);
-                 $u->deleteItemID(878, $u->info['id'], 1);
-                 $u->deleteItemID(905, $u->info['id'], 1);
-                 $u->deleteItemID(903, $u->info['id'], 1);
-                 $u->deleteItemID(905, $u->info['id'], 1);
-				 $u->deleteItemID(1035, $u->info['id'], 1);
-                 $err = 'Вы получили Клаустрофобия';
-				} else {
-              $err = "Не хватает ресурсов &quot;Сущность ресурса&quot;"; 
-             }
-            } else {
-              $err = "Не хватает ресурсов &quot;Эссенция праведного гнева&quot;"; 
-            }
-          } else {
-            $err = "Не хватает ресурсов &quot;Шепот гор&quot;"; 
-          }
-        } else {
-          $err = "Не хватает ресурсов &quot;Камень затаенного солнца&quot;"; 
-        }
-      } else {
-        $err = "Не хватает ресурсов &quot;Кристалл голоса предков&quot;"; 
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Сгусток эфира&quot;"; 
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Лучистое Серебро&quot;";
-  }
-} elseif(isset($_POST['clip81_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4679" LIMIT 1'));
-  if($u->count_items(906, $u->info['id'], 1) > 0) {
-    if($u->count_items(907, $u->info['id'], 1) > 0) {
-      $data = '|frompisher=12';
-      $u->addItem(4679, $u->info['id'], $data, $obj);
-      $u->deleteItemID(906, $u->info['id'], 1);
-      $u->deleteItemID(907, $u->info['id'], 1);
-      $err = 'Вы получили Проклятье Умирающей Земли';
-    } else {
-      $err = "Не хватает ресурсов &quot;Кристалл стабильности&quot;";
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Кристалл голоса предков&quot;";
-  }
-} elseif(isset($_POST['clip82_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4680" LIMIT 1'));
-  if($u->count_items(877, $u->info['id'], 1) > 0) {
-    if($u->count_items(890, $u->info['id'], 1) > 0) {
-      if($u->count_items(902, $u->info['id'], 1) > 0) {
-        if($u->count_items(903, $u->info['id'], 1) > 0) {
-          if($u->count_items(888, $u->info['id'], 1) > 0) {
-            $data = '|frompisher=12';
-            $u->addItem(4680, $u->info['id'], $data, $obj);
-            $u->deleteItemID(877, $u->info['id'], 1);
-            $u->deleteItemID(890, $u->info['id'], 1);
-            $u->deleteItemID(902, $u->info['id'], 1);
-            $u->deleteItemID(903, $u->info['id'], 1);
-            $u->deleteItemID(888, $u->info['id'], 1);
-            $err = 'Вы получили Проклятье Стихающего Ветра';
-          } else {
-            $err = "Не хватает ресурсов &quot;Шепот гор&quot;"; 
-          }
-        } else {
-          $err = "Не хватает ресурсов &quot;Тысячелетний камень&quot;"; 
-        }
-      } else {
-        $err = "Не хватает ресурсов &quot;Плод змеиного дерева&quot;"; 
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Сгусток астрала&quot;"; 
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Сталь&quot;";
-  }
-} elseif(isset($_POST['clip89_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4681" LIMIT 1'));
-  if($u->count_items(900, $u->info['id'], 1) > 0) {
-    if($u->count_items(882, $u->info['id'], 1) > 0) {
-      if($u->count_items(903, $u->info['id'], 1) > 0) {
-        if($u->count_items(904, $u->info['id'], 1) > 0) {
-          if($u->count_items(908, $u->info['id'], 1) > 0) {
-            $data = '|frompisher=12';
-            $u->addItem(4681, $u->info['id'], $data, $obj);
-            $u->deleteItemID(900, $u->info['id'], 1);
-            $u->deleteItemID(882, $u->info['id'], 1);
-            $u->deleteItemID(903, $u->info['id'], 1);
-            $u->deleteItemID(904, $u->info['id'], 1);
-            $u->deleteItemID(908, $u->info['id'], 1);
-            $err = 'Вы получили Проклятье Замерзающей Воды';
-          } else {
-            $err = "Не хватает ресурсов &quot;Камень затаенного солнца&quot;"; 
-          }
-        } else {
-          $err = "Не хватает ресурсов &quot;Кристалл времен&quot;"; 
-        }
-      } else {
-        $err = "Не хватает ресурсов &quot;Тысячелетний камень&quot;"; 
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Глубинный камень&quot;"; 
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Кожа змеиного дерева&quot;";
-  }
-} elseif(isset($_POST['clip90_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4682" LIMIT 1'));
-  if($u->count_items(950, $u->info['id'], 1) > 0) {
-    if($u->count_items(889, $u->info['id'], 1) > 0) {
-      if($u->count_items(902, $u->info['id'], 1) > 0) {
-        if($u->count_items(903, $u->info['id'], 1) > 0) {
-          if($u->count_items(878, $u->info['id'], 1) > 0) {
-            $data = '|frompisher=12';
-            $u->addItem(4682, $u->info['id'], $data, $obj);
-            $u->deleteItemID(950, $u->info['id'], 1);
-            $u->deleteItemID(889, $u->info['id'], 1);
-            $u->deleteItemID(902, $u->info['id'], 1);
-            $u->deleteItemID(906, $u->info['id'], 1);
-            $u->deleteItemID(878, $u->info['id'], 1);
-            $err = 'Вы получили Проклятье Угасающего Огня';
-          } else {
-            $err = "Не хватает ресурсов &quot;Лучистый топаз&quot;"; 
-          }
-        } else {
-          $err = "Не хватает ресурсов &quot;Тысячелетний камень&quot;"; 
-        }
-      } else {
-        $err = "Не хватает ресурсов &quot;Плод змеиного дерева&quot;"; 
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Сгусток эфира&quot;"; 
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Кожа Общего Врага&quot;";
-  }
-} elseif(isset($_POST['clip91_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4683" LIMIT 1'));
-  if($u->count_items(907, $u->info['id'], 1) > 0) {
-    if($u->count_items(881, $u->info['id'], 1) > 0) {
-      if($u->count_items(905, $u->info['id'], 1) > 0) {
-        $data = '|frompisher=12';
-        $u->addItem(4683, $u->info['id'], $data, $obj);
-        $u->deleteItemID(907, $u->info['id'], 1);
-        $u->deleteItemID(881, $u->info['id'], 1);
-        $u->deleteItemID(905, $u->info['id'], 1);
-        $err = 'Вы получили Проклятье Легкого Отупления';
-      } else {
-        $err = "Не хватает ресурсов &quot;Стихиалия&quot;";
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Лучистый рубин&quot;";
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Кристалл стабильности&quot;";
-  }
-} elseif(isset($_POST['clip92_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4684" LIMIT 1'));
-  if($u->count_items(907, $u->info['id'], 1) > 0) {
-    if($u->count_items(881, $u->info['id'], 1) > 0) {
-      if($u->count_items(905, $u->info['id'], 1) > 0) {
-        $data = '|frompisher=12';
-        $u->addItem(4684, $u->info['id'], $data, $obj);
-        $u->deleteItemID(907, $u->info['id'], 1);
-        $u->deleteItemID(881, $u->info['id'], 1);
-        $u->deleteItemID(905, $u->info['id'], 1);
-        $err = 'Вы получили Проклятье Уязвимости';
-      } else {
-        $err = "Не хватает ресурсов &quot;Стихиалия&quot;";
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Лучистый рубин&quot;";
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Кристалл стабильности&quot;";
-  }
-} elseif(isset($_POST['clip93_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4685" LIMIT 1'));
-  if($u->count_items(901, $u->info['id'], 1) > 0) {
-    if($u->count_items(889, $u->info['id'], 1) > 0) {
-      if($u->count_items(890, $u->info['id'], 1) > 0) {
-        $data = '|frompisher=12';
-        $u->addItem(4685, $u->info['id'], $data, $obj);
-        $u->deleteItemID(901, $u->info['id'], 1);
-        $u->deleteItemID(889, $u->info['id'], 1);
-        $u->deleteItemID(890, $u->info['id'], 1);
-        $err = 'Вы получили Зачаровать кольцо: Вытягивание души [1]';
-      } else {
-        $err = "Не хватает ресурсов &quot;Сгусток астрала&quot;";
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Сгусток эфира&quot;";
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Кристалл тысячи ответов&quot;";
-  }
-} elseif(isset($_POST['clip94_'])) {
-  $obj = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "4686" LIMIT 1'));
-  if($u->count_items(4685, $u->info['id'], 1) > 0) {
-    if($u->count_items(4688, $u->info['id'], 1) > 0) {
-      if($u->count_items(4689, $u->info['id'], 1) > 0) {
-        if($u->count_items(4690, $u->info['id'], 1) > 0) {
-          $data = '|frompisher=12';
-          $u->addItem(4686, $u->info['id'], $data, $obj);
-          $u->deleteItemID(4685, $u->info['id'], 1);
-          $u->deleteItemID(4688, $u->info['id'], 1);
-          $u->deleteItemID(4689, $u->info['id'], 1);
-          $u->deleteItemID(4690, $u->info['id'], 1);
-          $err = 'Вы получили Зачаровать кольцо: Вытягивание души [2]';
-        } else {
-          $err = "Не хватает ресурсов &quot;Ускоритель для Големов&quot;";
-        }
-      } else {
-        $err = "Не хватает ресурсов &quot;Смазка для Големов&quot;";
-      }
-    } else {
-      $err = "Не хватает ресурсов &quot;Топливо для Големов&quot;";
-    }
-  } else {
-    $err = "Не хватает ресурсов &quot;Зачаровать кольцо: Вытягивание души [1]&quot;";
-  }
+}
+
+if (isset($_POST['clip76_'])) {
+    combineItems([878, 902, 903, 905, 907, 950], 4677);
+} elseif (isset($_POST['clip80_'])) {
+    combineItems([878, 902, 903, 905, 907, 950, 1035], 4758, '|frompisher=12|onlyOne=1|oneType=84');
+} elseif (isset($_POST['clip81_'])) {
+    combineItems([906, 907], 4679);
+} elseif (isset($_POST['clip82_'])) {
+    combineItems([877, 888, 890, 902, 903], 4680);
+} elseif (isset($_POST['clip89_'])) {
+    combineItems([882,900,903,904,908], 4681);
+} elseif (isset($_POST['clip90_'])) {
+    combineItems([878, 889, 902, 906, 950], 4682);
+} elseif (isset($_POST['clip91_'])) {
+    combineItems([881, 905, 907], 4683);
+} elseif (isset($_POST['clip92_'])) {
+    combineItems([881, 905, 907], 4684);
+} elseif (isset($_POST['clip93_'])) {
+    combineItems([889, 890, 901], 4685);
+} elseif (isset($_POST['clip94_'])) {
+    combineItems([4685, 4688, 4689, 4690], 4686);
 }


-function getColor($id, $num) {
-  global $u;
-  $color = 'green';
-  $ch = mysql_query("SELECT `id` FROM `items_users` WHERE `uid` = ".$u->info['id']." AND `delete` = 0 AND `item_id` = ".(int)$id." AND inShop = 0 AND inOdet = 0");
-  if(mysql_num_rows($ch) < $num) { $color = 'red'; }
-  return $color;
+function getColor($id, $num)
+{
+    global $u;
+    $color = 'green';
+    $ch = mysql_query(
+        "SELECT `id` FROM `items_users` WHERE `uid` = " . $u->info['id'] . " AND `delete` = 0 AND `item_id` = " . (int)$id . " AND inShop = 0 AND inOdet = 0"
+    );
+    if (mysql_num_rows($ch) < $num) {
+        $color = 'red';
+    }
+    return $color;
 }

-function getImg($id, $num) {
-  global $u;
-  $img = 'good.png';
-  $ch = mysql_query("SELECT `id` FROM `items_users` WHERE `uid` = ".$u->info['id']." AND `delete` = 0 AND `item_id` = ".(int)$id." AND inShop = 0 AND inOdet = 0");
-  if(mysql_num_rows($ch) < $num) { $img = 'i/clear.gif'; }
-  return $img;
+function getImg($id, $num)
+{
+    global $u;
+    $img = 'good.png';
+    $ch = mysql_query(
+        "SELECT `id` FROM `items_users` WHERE `uid` = " . $u->info['id'] . " AND `delete` = 0 AND `item_id` = " . (int)$id . " AND inShop = 0 AND inOdet = 0"
+    );
+    if (mysql_num_rows($ch) < $num) {
+        $img = 'i/clear.gif';
+    }
+    return $img;
 }

 ?>
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="//img.new-combats.tech/css/main.css" />
-<meta http-equiv="Cache-Control" content="no-cache, max-age=0, must-revalidate, no-store" />
-<meta http-equiv="PRAGMA" content="NO-CACHE" />
-<meta http-equiv="Expires" content="0" />
-<style>
-.row { cursor:pointer; }      
-#answer1 {color: #003388; font-weight: bold; text-decoration: none; }
-</style>
-<script type="text/javascript">
-function show(ele) {
-  var srcElement = document.getElementById(ele);
-  if(srcElement != null) {
-    if(srcElement.style.display == "block") {
-      srcElement.style.display= 'none';
-    } else {
-      srcElement.style.display='block';
-    }
-  }
-}
+    <link rel="stylesheet" type="text/css" href="//img.new-combats.tech/css/main.css"/>
+    <meta http-equiv="Cache-Control" content="no-cache, max-age=0, must-revalidate, no-store"/>
+    <meta http-equiv="PRAGMA" content="NO-CACHE"/>
+    <meta http-equiv="Expires" content="0"/>
+    <style>
+        .row {
+            cursor: pointer;
+        }

-function OpenDiv(vr) {
-  var dg01 = document.getElementById(vr);
-  if(dg01.style.display == '') {
-    dg01.style.display = 'none'
-  } else {
-    dg01.style.display = ''
-  }
-}
-</script>
-<script type="text/javascript" src="//img.new-combats.tech/js/inf.0.104.js?<?=mt_rand(1436,1293286936)/10000000000?>" charset="utf-8"></script>
+        #answer1 {
+            color: #003388;
+            font-weight: bold;
+            text-decoration: none;
+        }
+    </style>
+    <script type="text/javascript">
+        function show(ele) {
+            var srcElement = document.getElementById(ele);
+            if (srcElement != null) {
+                if (srcElement.style.display == "block") {
+                    srcElement.style.display = 'none';
+                } else {
+                    srcElement.style.display = 'block';
+                }
+            }
+        }
+
+        function OpenDiv(vr) {
+            var dg01 = document.getElementById(vr);
+            if (dg01.style.display == '') {
+                dg01.style.display = 'none'
+            } else {
+                dg01.style.display = ''
+            }
+        }
+    </script>
+    <script type="text/javascript"
+            src="//img.new-combats.tech/js/inf.0.104.js?<?= mt_rand(1436, 1293286936) / 10000000000 ?>"
+            charset="utf-8"></script>
 </head>
-<body leftmargin=5 topmargin=5 marginwidth=5 marginheight=5  bgcolor="#d7d7d7" onLoad="">
+<body leftmargin=5 topmargin=5 marginwidth=5 marginheight=5 bgcolor="#d7d7d7" onLoad="">
 <div id=hint4 class=ahint></div>
 <TABLE cellspacing=0 cellpadding=2 width=100%>
-<TD style="width: 40%; vertical-align: top; ">
-<TABLE cellspacing=0 cellpadding=2 style="width: 100%; ">
-<tr><TD align=center><h4>Мастерская Забытых Мастеров</h4></TD></tr>
-<TR>
-</TABLE>
-</TD>
-<TD style="width: 5%; vertical-align: top; ">&nbsp;</TD>
-</TR>
+    <TD style="width: 40%; vertical-align: top; ">
+        <TABLE cellspacing=0 cellpadding=2 style="width: 100%; ">
+            <tr>
+                <TD align=center><h4>Мастерская Забытых Мастеров</h4></TD>
+            </tr>
+            <TR>
+        </TABLE>
+    </TD>
+    <TD style="width: 5%; vertical-align: top; ">&nbsp;</TD>
+    </TR>
 </TABLE>
 </html>
-<?php if($err != '') { echo "<center><b style='color: Red;'>".$err."</b></center>"; } ?>
+<?php if ($err != '') {
+    echo "<center><b style='color: Red;'>" . $err . "</b></center>";
+} ?>
 <table width="100%">
-<tr>
-<td width="255" valign="top"><div align="left"><?php $st = array(); $st2 = array(); $st = $u->getStats($u->info['id'],1); $st2 = $st[1]; $st = $st[0]; $rgd = $u->regen($u->info['id'],$st,1); $us = $u->getInfoPers($u->info['id'],1,$st); if($us!=false){ echo $us[0]; }else{ echo 'information is lost.'; } ?></div>
-<div align="left"></div><div align="left"></div>
-<div style="float: left">
-<td valign="top"><br />
-<div id="step1" style="margin-left: 20px;"></div>
-<br /><br />
-<table>
-<tr>
-<td>
-<div id="answer1">
-• <a href="#" onclick="OpenDiv('clip76')">Черная метка <img src="//img.new-combats.tech/i/items/spell_curse.gif"></a><br />
-<div id="clip76" style="display: none; color: black;">
- <p style="color:<?=getColor(950, 1)?>"> Лучистое Серебро <img src="//img.new-combats.tech/<?=getImg(950, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(907, 1)?>"> Сгусток эфира <img src="//img.new-combats.tech/<?=getImg(907, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(902, 1)?>"> Кристалл голоса предков <img src="//img.new-combats.tech/<?=getImg(902, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(878, 1)?>"> Камень затаенного солнца <img src="//img.new-combats.tech/<?=getImg(878, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(905, 1)?>"> Шепот гор <img src="//img.new-combats.tech/<?=getImg(905, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(903, 1)?>"> Эссенция праведного гнева <img src="//img.new-combats.tech/<?=getImg(903, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip76_" value="Собрать" />
-</form>
-</div>
-    
-• <a href="#" onclick="OpenDiv('clip80')">Клаустрофобия <img src="//img.new-combats.tech/i/items/d_blat24.gif"></a><br />
-<div id="clip80" style="display: none; color: black;">
- <p style="color:<?=getColor(950, 1)?>"> Кожа общего врага <img src="//img.new-combats.tech/<?=getImg(950, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(907, 1)?>"> Кристалл стабильности <img src="//img.new-combats.tech/<?=getImg(907, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(902, 1)?>"> Плод змеиного дерева <img src="//img.new-combats.tech/<?=getImg(902, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(878, 1)?>"> Лучистый топаз <img src="//img.new-combats.tech/<?=getImg(878, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(905, 1)?>"> Стихиалия <img src="//img.new-combats.tech/<?=getImg(905, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(903, 1)?>"> Тысячелетний камень <img src="//img.new-combats.tech/<?=getImg(903, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip80_" value="Собрать" />
-</form>
-</div>
+    <tr>
+        <td width="255" valign="top">
+            <div align="left"><?php $st = [];
+                $st2 = [];
+                $st = $u->getStats($u->info['id'], 1);
+                $st2 = $st[1];
+                $st = $st[0];
+                $rgd = $u->regen($u->info['id'], $st, 1);
+                $us = $u->getInfoPers($u->info['id'], 1, $st);
+                if ($us != false) {
+                    echo $us[0];
+                } else {
+                    echo 'information is lost.';
+                } ?></div>
+            <div align="left"></div>
+            <div align="left"></div>
+            <div style="float: left">
+                <td valign="top"><br/>
+                    <div id="step1" style="margin-left: 20px;"></div>
+                    <br/><br/>
+                    <table>
+                        <tr>
+                            <td>
+                                <div id="answer1">
+                                    • <a href="#" onclick="OpenDiv('clip76')">Черная метка <img
+                                            src="//img.new-combats.tech/i/items/spell_curse.gif"></a><br/>
+                                    <div id="clip76" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(950, 1) ?>"> Лучистое Серебро <img
+                                                src="//img.new-combats.tech/<?= getImg(950, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(907, 1) ?>"> Сгусток эфира <img
+                                                src="//img.new-combats.tech/<?= getImg(907, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(902, 1) ?>"> Кристалл голоса предков <img
+                                                src="//img.new-combats.tech/<?= getImg(902, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(878, 1) ?>"> Камень затаенного солнца <img
+                                                src="//img.new-combats.tech/<?= getImg(878, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(905, 1) ?>"> Шепот гор <img
+                                                src="//img.new-combats.tech/<?= getImg(905, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(903, 1) ?>"> Эссенция праведного гнева <img
+                                                src="//img.new-combats.tech/<?= getImg(903, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip76_" value="Собрать"/>
+                                        </form>
+                                    </div>

-• <a href="#" onclick="OpenDiv('clip81')">Проклятье Умирающей Земли <img src="//img.new-combats.tech/i/items/m_ptp_1.gif"></a><br />
-<div id="clip81"  style="display: none; color: black;">
- <p style="color:<?=getColor(906, 1)?>"> Кристалл голоса предков <img src="//img.new-combats.tech/<?=getImg(906, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(907, 1)?>"> Кристалл стабильности <img src="//img.new-combats.tech/<?=getImg(907, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip81_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip80')">Клаустрофобия <img
+                                            src="//img.new-combats.tech/i/items/d_blat24.gif"></a><br/>
+                                    <div id="clip80" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(950, 1) ?>"> Кожа общего врага <img
+                                                src="//img.new-combats.tech/<?= getImg(950, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(907, 1) ?>"> Кристалл стабильности <img
+                                                src="//img.new-combats.tech/<?= getImg(907, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(902, 1) ?>"> Плод змеиного дерева <img
+                                                src="//img.new-combats.tech/<?= getImg(902, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(878, 1) ?>"> Лучистый топаз <img
+                                                src="//img.new-combats.tech/<?= getImg(878, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(905, 1) ?>"> Стихиалия <img
+                                                src="//img.new-combats.tech/<?= getImg(905, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(903, 1) ?>"> Тысячелетний камень <img
+                                                src="//img.new-combats.tech/<?= getImg(903, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip80_" value="Собрать"/>
+                                        </form>
+                                    </div>

-• <a href="#" onclick="OpenDiv('clip82')">Проклятье Стихающего Ветра <img src="//img.new-combats.tech/i/items/m_ptp_2.gif"></a><br />
-<div id="clip82" style="display: none; color: black;">
- <p style="color:<?=getColor(877, 1)?>"> Сталь <img src="//img.new-combats.tech/<?=getImg(877, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(890, 1)?>"> Сгусток астрала <img src="//img.new-combats.tech/<?=getImg(890, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(902, 1)?>"> Плод змеиного дерева <img src="//img.new-combats.tech/<?=getImg(902, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(903, 1)?>"> Тысячелетний камень <img src="//img.new-combats.tech/<?=getImg(903, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(888, 1)?>"> Шепот гор <img src="//img.new-combats.tech/<?=getImg(888, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip82_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip81')">Проклятье Умирающей Земли <img
+                                            src="//img.new-combats.tech/i/items/m_ptp_1.gif"></a><br/>
+                                    <div id="clip81" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(906, 1) ?>"> Кристалл голоса предков <img
+                                                src="//img.new-combats.tech/<?= getImg(906, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(907, 1) ?>"> Кристалл стабильности <img
+                                                src="//img.new-combats.tech/<?= getImg(907, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip81_" value="Собрать"/>
+                                        </form>
+                                    </div>

-• <a href="#" onclick="OpenDiv('clip89')">Проклятье Замерзающей Воды <img src="//img.new-combats.tech/i/items/m_ptp_3.gif"></a><br />
-<div id="clip89" style="display: none; color: black;">
- <p style="color:<?=getColor(900, 1)?>"> Кора змеиного дерева <img src="//img.new-combats.tech/<?=getImg(900, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(882, 1)?>"> Глубинный камень <img src="//img.new-combats.tech/<?=getImg(882, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(903, 1)?>"> Тысячелетний камень <img src="//img.new-combats.tech/<?=getImg(903, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(904, 1)?>"> Кристалл времен <img src="//img.new-combats.tech/<?=getImg(904, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(908, 1)?>"> Камень затаенного солнца <img src="//img.new-combats.tech/<?=getImg(908, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
- <input type="submit" name="clip89_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip82')">Проклятье Стихающего Ветра <img
+                                            src="//img.new-combats.tech/i/items/m_ptp_2.gif"></a><br/>
+                                    <div id="clip82" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(877, 1) ?>"> Сталь <img
+                                                src="//img.new-combats.tech/<?= getImg(877, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(890, 1) ?>"> Сгусток астрала <img
+                                                src="//img.new-combats.tech/<?= getImg(890, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(902, 1) ?>"> Плод змеиного дерева <img
+                                                src="//img.new-combats.tech/<?= getImg(902, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(903, 1) ?>"> Тысячелетний камень <img
+                                                src="//img.new-combats.tech/<?= getImg(903, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(888, 1) ?>"> Шепот гор <img
+                                                src="//img.new-combats.tech/<?= getImg(888, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip82_" value="Собрать"/>
+                                        </form>
+                                    </div>

-• <a href="#" onclick="OpenDiv('clip90')">Проклятье Угасающего Огня <img src="//img.new-combats.tech/i/items/m_ptp_4.gif"></a><br />
-<div id="clip90" style="display: none; color: black;">
- <p style="color:<?=getColor(950, 1)?>"> Кожа Общего Врага <img src="//img.new-combats.tech/<?=getImg(950, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(889, 1)?>"> Сгусток эфира <img src="//img.new-combats.tech/<?=getImg(889, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(902, 1)?>"> Плод змеиного дерева <img src="//img.new-combats.tech/<?=getImg(902, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(903, 1)?>"> Тысячелетний камень <img src="//img.new-combats.tech/<?=getImg(903, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(878, 1)?>"> Лучистый топаз <img src="//img.new-combats.tech/<?=getImg(878, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip90_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip89')">Проклятье Замерзающей Воды <img
+                                            src="//img.new-combats.tech/i/items/m_ptp_3.gif"></a><br/>
+                                    <div id="clip89" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(900, 1) ?>"> Кора змеиного дерева <img
+                                                src="//img.new-combats.tech/<?= getImg(900, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(882, 1) ?>"> Глубинный камень <img
+                                                src="//img.new-combats.tech/<?= getImg(882, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(903, 1) ?>"> Тысячелетний камень <img
+                                                src="//img.new-combats.tech/<?= getImg(903, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(904, 1) ?>"> Кристалл времен <img
+                                                src="//img.new-combats.tech/<?= getImg(904, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(908, 1) ?>"> Камень затаенного солнца <img
+                                                src="//img.new-combats.tech/<?= getImg(908, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip89_" value="Собрать"/>
+                                        </form>
+                                    </div>

-• <a href="#" onclick="OpenDiv('clip91')">Проклятье Легкого Отупления <img src="//img.new-combats.tech/i/items/m_ptp_5.gif"></a><br />
-<div id="clip91" style="display: none; color: black;">
- <p style="color:<?=getColor(907, 1)?>"> Кристалл стабильности <img src="//img.new-combats.tech/<?=getImg(907, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(881, 1)?>"> Лучистый рубин <img src="//img.new-combats.tech/<?=getImg(881, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(905, 1)?>"> Стихиалия <img src="//img.new-combats.tech/<?=getImg(905, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip91_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip90')">Проклятье Угасающего Огня <img
+                                            src="//img.new-combats.tech/i/items/m_ptp_4.gif"></a><br/>
+                                    <div id="clip90" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(950, 1) ?>"> Кожа Общего Врага <img
+                                                src="//img.new-combats.tech/<?= getImg(950, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(889, 1) ?>"> Сгусток эфира <img
+                                                src="//img.new-combats.tech/<?= getImg(889, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(902, 1) ?>"> Плод змеиного дерева <img
+                                                src="//img.new-combats.tech/<?= getImg(902, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(903, 1) ?>"> Тысячелетний камень <img
+                                                src="//img.new-combats.tech/<?= getImg(903, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(878, 1) ?>"> Лучистый топаз <img
+                                                src="//img.new-combats.tech/<?= getImg(878, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip90_" value="Собрать"/>
+                                        </form>
+                                    </div>
+
+                                    • <a href="#" onclick="OpenDiv('clip91')">Проклятье Легкого Отупления <img
+                                            src="//img.new-combats.tech/i/items/m_ptp_5.gif"></a><br/>
+                                    <div id="clip91" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(907, 1) ?>"> Кристалл стабильности <img
+                                                src="//img.new-combats.tech/<?= getImg(907, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(881, 1) ?>"> Лучистый рубин <img
+                                                src="//img.new-combats.tech/<?= getImg(881, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(905, 1) ?>"> Стихиалия <img
+                                                src="//img.new-combats.tech/<?= getImg(905, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip91_" value="Собрать"/>
+                                        </form>
+                                    </div>


-• <a href="#" onclick="OpenDiv('clip92')">Проклятье Уязвимости <img src="//img.new-combats.tech/i/items/m_ptp_6.gif"></a><br />
-<div id="clip92" style="display: none; color: black;">
- <p style="color:<?=getColor(907, 1)?>"> Кристалл стабильности <img src="//img.new-combats.tech/<?=getImg(907, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(881, 1)?>"> Лучистый рубин <img src="//img.new-combats.tech/<?=getImg(881, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(905, 1)?>"> Стихиалия <img src="//img.new-combats.tech/<?=getImg(905, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip92_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip92')">Проклятье Уязвимости <img
+                                            src="//img.new-combats.tech/i/items/m_ptp_6.gif"></a><br/>
+                                    <div id="clip92" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(907, 1) ?>"> Кристалл стабильности <img
+                                                src="//img.new-combats.tech/<?= getImg(907, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(881, 1) ?>"> Лучистый рубин <img
+                                                src="//img.new-combats.tech/<?= getImg(881, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(905, 1) ?>"> Стихиалия <img
+                                                src="//img.new-combats.tech/<?= getImg(905, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip92_" value="Собрать"/>
+                                        </form>
+                                    </div>


-• <a href="#" onclick="OpenDiv('clip93')">Зачаровать кольцо: Вытягивание души [1] <img src="//img.new-combats.tech/i/items/enhp_6_revamp10.gif"></a><br />
-<div id="clip93" style="display: none; color: black;">
- <p style="color:<?=getColor(901, 1)?>"> Кристалл тысячи ответов <img src="//img.new-combats.tech/<?=getImg(901, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(889, 1)?>"> Сгусток эфира <img src="//img.new-combats.tech/<?=getImg(889, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(890, 1)?>"> Сгусток астрала <img src="//img.new-combats.tech/<?=getImg(890, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip93_" value="Собрать" />
-</form>
-</div>
+                                    • <a href="#" onclick="OpenDiv('clip93')">Зачаровать кольцо: Вытягивание души [1]
+                                        <img src="//img.new-combats.tech/i/items/enhp_6_revamp10.gif"></a><br/>
+                                    <div id="clip93" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(901, 1) ?>"> Кристалл тысячи ответов <img
+                                                src="//img.new-combats.tech/<?= getImg(901, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(889, 1) ?>"> Сгусток эфира <img
+                                                src="//img.new-combats.tech/<?= getImg(889, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(890, 1) ?>"> Сгусток астрала <img
+                                                src="//img.new-combats.tech/<?= getImg(890, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip93_" value="Собрать"/>
+                                        </form>
+                                    </div>


-• <a href="#" onclick="OpenDiv('clip94')">Зачаровать кольцо: Вытягивание души [2] <img src="//img.new-combats.tech/i/items/enhp_6_revamp10_2.gif"></a><br />
-<div id="clip94" style="display: none; color: black;">
- <p style="color:<?=getColor(4685, 1)?>"> Зачаровать кольцо: Вытягивание души [1] <img src="//img.new-combats.tech/<?=getImg(4685, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(4688, 1)?>"> Топливо для Големов <img src="//img.new-combats.tech/<?=getImg(4688, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(4689, 1)?>"> Смазка для Големов <img src="//img.new-combats.tech/<?=getImg(4689, 1)?>" width="13" height="13" /></p>
- <p style="color:<?=getColor(4690, 1)?>"> Ускоритель для Големов <img src="//img.new-combats.tech/<?=getImg(4690, 1)?>" width="13" height="13" /></p>
-<form action="" method="POST">
-<input type="submit" name="clip94_" value="Собрать" />
-</form>
-</div>
-  <br> 
-• <a href="?go_away=1">Уйти. (Выход)</a>
+                                    • <a href="#" onclick="OpenDiv('clip94')">Зачаровать кольцо: Вытягивание души [2]
+                                        <img src="//img.new-combats.tech/i/items/enhp_6_revamp10_2.gif"></a><br/>
+                                    <div id="clip94" style="display: none; color: black;">
+                                        <p style="color:<?= getColor(4685, 1) ?>"> Зачаровать кольцо: Вытягивание души
+                                            [1] <img src="//img.new-combats.tech/<?= getImg(4685, 1) ?>" width="13"
+                                                     height="13"/></p>
+                                        <p style="color:<?= getColor(4688, 1) ?>"> Топливо для Големов <img
+                                                src="//img.new-combats.tech/<?= getImg(4688, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(4689, 1) ?>"> Смазка для Големов <img
+                                                src="//img.new-combats.tech/<?= getImg(4689, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <p style="color:<?= getColor(4690, 1) ?>"> Ускоритель для Големов <img
+                                                src="//img.new-combats.tech/<?= getImg(4690, 1) ?>" width="13"
+                                                height="13"/></p>
+                                        <form action="" method="POST">
+                                            <input type="submit" name="clip94_" value="Собрать"/>
+                                        </form>
+                                    </div>
+                                    <br>
+                                    • <a href="?go_away=1">Уйти. (Выход)</a>

-</div>
+                                </div>
                            </td>
                        </tr>
                    </table>
@ -483,35 +391,47 @@ function OpenDiv(vr) {
            </div>
            <div style="float:left">

-                <td  width="120">
+                <td width="120">
                    <table width="100" border="0" cellspacing="0" cellpadding="0">
                        <tr>
                            <td>
-                                <TABLE  border=0 cellSpacing=1 cellPadding=0 width="100%">
+                                <TABLE border=0 cellSpacing=1 cellPadding=0 width="100%">
                                    <TBODY>
                                    <TR vAlign=top>
                                        <TD>
                                            <TABLE border=0 cellSpacing=0 cellPadding=0 width="100%">
                                                <TBODY>
-                                                </TBODY></TABLE></TD>
-                                        <TD><TABLE border=0 cellSpacing=0 cellPadding=0 width="100%"><TBODY>
+                                                </TBODY>
+                                            </TABLE>
+                                        </TD>
+                                        <TD>
+                                            <TABLE border=0 cellSpacing=0 cellPadding=0 width="100%">
+                                                <TBODY>

-                                        </TBODY></TABLE></TD></TR></TBODY></TABLE></TD>
-                            </td>
-                        </tr>
-                    </table>
+                                                </TBODY>
+                                            </TABLE>
+                                        </TD>
+                                    </TR>
+                                    </TBODY>
+                                </TABLE>
+                            </TD>
                </td>
+    </tr>
+</table>
+</td>

 </tr>
 </table>
 </div>
 <TABLE width=100% align="right">
-    <tr><td>
-        <br />
-        <br />
-        <br />
+    <tr>
+        <td>
+            <br/>
+            <br/>
+            <br/>

-    </TD></tr>
+        </TD>
+    </tr>
 </TABLE>
 </body>
-</html>
+</html>
--- a/_incl_data/class/magic/__magic.php
+++ b/_incl_data/class/magic/__magic.php
@ -1,4 +1,7 @@
 <?php
+
+use Core\ConversionHelper;
+
 if (!defined('GAME')) {
    die();
 }
@ -34,7 +37,7 @@ class Magic
            )
        );
        if (isset($itm['id'])) {
-            $st = $u->lookStats($itm['data']);
+            $st = ConversionHelper::dataStringToArray($itm['data']);
            if (isset($st['usefromfile']) && $st['usefromfile'] == 1) {
                if (file_exists('_incl_data/class/magic/' . $itm['magic_inci'] . '.php')) {
                    require('_incl_data/class/magic/' . $itm['magic_inci'] . '.php');
@ -178,7 +181,7 @@ class Magic
                $cmsg->setType(11);
                $cmsg->setTypeTime(1);
                //используем заклятие
-                $st = $u->lookStats($itm['data']);
+                $st = ConversionHelper::dataStringToArray($itm['data']);
                $jl = $_GET['login'];
                $_GET['login'] = urlencode($_GET['login']);
                //используем на персонажа (все кроме себя)
--- a/_incl_data/class/magic/feerverks.php
+++ b/_incl_data/class/magic/feerverks.php
@ -1,5 +1,7 @@
 <?php
 //Феерверк
+use Core\ConversionHelper;
+
 if (!defined('GAME')) {
    die();
 }
@ -18,7 +20,7 @@ if ($u->room['id'] != '9') {
    $cmsg->setType(6);
    $cmsg->setTypeTime(2);

-    $po = $u->lookStats($itm['data']);
+    $po = ConversionHelper::dataStringToArray($itm['data']);
    $fid = 'fw04';
    if (isset($po['feerverk_eff'])) {
        $fid = $po['feerverk_eff'];
--- a/_incl_data/class/magic/hny2012.php
+++ b/_incl_data/class/magic/hny2012.php
@ -15,40 +15,40 @@ if(date('Y')==2013 || $u->info['id'] == 1) {
 7. Новогодний Эликсир
 	*/	
 	//Снежок 0/13 (x1)
-	$idit = $u->addItem(1000,$u->info['id']);
+	$idit = \User\ItemsModel::addItem(1000,$u->info['id']);
 	if($idit > 0) {
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "13" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//Новогодний эликсир (x1)
-		$idit = $u->addItem(997,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(997,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "7" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//Новогодний эликсир (x1)
-		$idit = $u->addItem(2870,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(2870,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "7" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//Звездное сияние (x1)
-		$idit = $u->addItem(1462,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(1462,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "7" WHERE `id` = "'.$idit.'" LIMIT 1');
 				
 		//Открытка (x1)
-		$idit = $u->addItem(996,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(996,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Новый Год" , `gtxt1` = "Администрация проекта поздравляет Вас с Новым, 2013, Годом!" WHERE `id` = "'.$idit.'" LIMIT 1');	
 		
 		//Нападалка 0/13 (x1)
-		$idit = $u->addItem(874,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(874,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "13" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//Кольцо жизни (x1)
-		$idit = $u->addItem(2101,$u->info['id'],'|noremont=1|srok=1209600|sudba='.$u->info['login']);
+		$idit = \User\ItemsModel::addItem(2101,$u->info['id'],'|noremont=1|srok=1209600|sudba='.$u->info['login']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "13" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//Восстановление Энергии 900НР (x3)
-		$idit = $u->addItem(2710,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(2710,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год" WHERE `id` = "'.$idit.'" LIMIT 1');
-		$idit = $u->addItem(2710,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(2710,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год" WHERE `id` = "'.$idit.'" LIMIT 1');
-		$idit = $u->addItem(2710,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(2710,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		$u->error = 'Вы успешно использовали &quot;'.$itm['name'].'&quot;. В инвентарь добавлены подарки. С Новым, 2013, Годом!';
--- a/_incl_data/class/magic/hny2014.php
+++ b/_incl_data/class/magic/hny2014.php
@ -15,38 +15,38 @@ if(date('Y')==2023) {
 7. Новогодний Эликсир
 	*/	
 	//рыба (x1)
-	$idit = $u->addItem(5009,$u->info['id']);
+	$idit = \User\ItemsModel::addItem(5009,$u->info['id']);
 	if($idit > 0) {
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "3" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//мастера
-		$idit = $u->addItem(4041,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(4041,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "3" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//искуства
-		$idit = $u->addItem(4948,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(4948,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "3" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//жж6
-		$idit = $u->addItem(3101,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(3101,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "5" WHERE `id` = "'.$idit.'" LIMIT 1');
 				
 		//Открытка (x1)
-		$idit = $u->addItem(996,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(996,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Новый Год" , `gtxt1` = "Администрация проекта поздравляет Вас с Новым, 2023, Годом!" WHERE `id` = "'.$idit.'" LIMIT 1');	
 		
 		
 		//точилка
-		$idit = $u->addItem(6457,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(6457,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "100" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		//чек на 100 екров
-		$idit = $u->addItem(5023,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(5023,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "1" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		
 		//цепь защитника
-		$idit = $u->addItem(6459,$u->info['id']);
+		$idit = \User\ItemsModel::addItem(6459,$u->info['id']);
 		mysql_query('UPDATE `items_users` SET `gift` = "Старый Год",`iznosMAX` = "100" WHERE `id` = "'.$idit.'" LIMIT 1');
 		
 		
--- a/_incl_data/class/magic/ironbad.php
+++ b/_incl_data/class/magic/ironbad.php
@ -80,7 +80,7 @@ if(!defined('GAME'))
 		70 => '10036'
 		);
 		$idve=$idv[rand(0,count($idv)-1)];
-		$u->addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
+		\User\ItemsModel::addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
 		$inf = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.$idve.'" LIMIT 1'));
 		$u->error = 'Вы получили:'.$inf['name'].'';
 		
--- a/_incl_data/class/magic/irongod.php
+++ b/_incl_data/class/magic/irongod.php
@ -87,7 +87,7 @@ if(!defined('GAME'))
 		78 => '10035'
 		);
 		$idve=$idv[rand(0,count($idv)-1)];
-		$u->addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
+		\User\ItemsModel::addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
 		$inf = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.$idve.'" LIMIT 1'));
 		$u->error = 'Вы получили:'.$inf['name'].'';
 		
--- a/_incl_data/class/magic/ironnorm.php
+++ b/_incl_data/class/magic/ironnorm.php
@ -93,7 +93,7 @@ if(!defined('GAME'))
 		84 => '10037'
 		);
 		$idve=$idv[rand(0,count($idv)-1)];
-		$u->addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
+		\User\ItemsModel::addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
 		$inf = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.$idve.'" LIMIT 1'));
 		$u->error = 'Вы получили:'.$inf['name'].'';
 		
--- a/_incl_data/class/magic/pandorax.php
+++ b/_incl_data/class/magic/pandorax.php
@ -17,13 +17,13 @@ $rnd0['itm3'] = $rnd0[rand(0,count($rnd0))];
 $rnd0['itm1'] = mysql_fetch_array(mysql_query('SELECT `id`,`name` FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($rnd0['itm1']).'" LIMIT 1'));
 $rnd0['itm2'] = mysql_fetch_array(mysql_query('SELECT `id`,`name` FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($rnd0['itm2']).'" LIMIT 1'));

-$u->addItem($rnd0['itm1']['id'],$u->info['id'],'|srok=1209600|sudba='.$u->info['login']);
-$u->addItem($rnd0['itm2']['id'],$u->info['id'],'|srok=1209600|sudba='.$u->info['login']);
+\User\ItemsModel::addItem($rnd0['itm1']['id'],$u->info['id'],'|srok=1209600|sudba='.$u->info['login']);
+\User\ItemsModel::addItem($rnd0['itm2']['id'],$u->info['id'],'|srok=1209600|sudba='.$u->info['login']);

 if(rand(0,7) == 2) {
 	$rnd0['itm3'] = mysql_fetch_array(mysql_query('SELECT `id`,`name` FROM `items_main` WHERE `id` = "'.mysql_real_escape_string($rnd0['itm3']).'" LIMIT 1'));
 }else{
-	$u->addItem($rnd0['itm3']['id'],$u->info['id'],'|srok=1209600|sudba='.$u->info['login']);
+	\User\ItemsModel::addItem($rnd0['itm3']['id'],$u->info['id'],'|srok=1209600|sudba='.$u->info['login']);
 }

 $u->deleteItem($itm['id'],$u->info['id']);
--- a/_incl_data/class/magic/ruletka.php
+++ b/_incl_data/class/magic/ruletka.php
@ -98,7 +98,7 @@ $tomorrow  = mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"));
 		78 => '10035'
 		);
 		$idve=$idv[rand(0,count($idv)-1)];
-		$u->addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
+		\User\ItemsModel::addItem($idve,$u->info['id'],'|frompisher=1|sudba='.$u->info['login']);
 		$inf = mysql_fetch_array(mysql_query('SELECT * FROM `items_main` WHERE `id` = "'.$idve.'" LIMIT 1'));
 		$u->error = 'Вы получили:'.$inf['name'].'';
 		
--- a/_incl_data/class/magic/sunduk_ov.php
+++ b/_incl_data/class/magic/sunduk_ov.php
@ -5,15 +5,15 @@ if(!defined('GAME'))
 }

 	//лечение легких травм
-	$ov_item = $u->addItem(4412,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
+	$ov_item = \User\ItemsModel::addItem(4412,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
 	if($ov_item > 0) {
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		
 		//пропуск забытых
-		$ov_item = $u->addItem(2412,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(2412,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//жж6
-		$ov_item = $u->addItem(3101,$u->info['id'],'|srok=3600|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(3101,$u->info['id'],'|srok=3600|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		mysql_query('UPDATE `items_users` SET `iznosNOW` = `iznosNOW` + 1 WHERE `id` = '.$itm['id'].' LIMIT 1');
 		
--- a/_incl_data/class/magic/sunduk_ov2.php
+++ b/_incl_data/class/magic/sunduk_ov2.php
@ -5,24 +5,24 @@ if(!defined('GAME'))
 }

 	//лечение легких травм
-	$ov_item = $u->addItem(4412,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
+	$ov_item = \User\ItemsModel::addItem(4412,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
 	if($ov_item > 0) {
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		
 		//пропуск забытых
-		$ov_item = $u->addItem(2412,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(2412,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//жж6
-		$ov_item = $u->addItem(3101,$u->info['id'],'|srok=3600|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(3101,$u->info['id'],'|srok=3600|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//лечение средних травм
-		$ov_item = $u->addItem(4413,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(4413,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (бездна)
-		$ov_item = $u->addItem(5035,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5035,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (грибница)
-		$ov_item = $u->addItem(5039,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5039,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//
 		mysql_query('UPDATE `items_users` SET `iznosNOW` = `iznosNOW` + 1 WHERE `id` = '.$itm['id'].' LIMIT 1');
--- a/_incl_data/class/magic/sunduk_ov3.php
+++ b/_incl_data/class/magic/sunduk_ov3.php
@ -5,36 +5,36 @@ if(!defined('GAME'))
 }

 	//лечение легких травм
-	$ov_item = $u->addItem(4412,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
+	$ov_item = \User\ItemsModel::addItem(4412,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
 	if($ov_item > 0) {
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		
 		//пропуск забытых
-		$ov_item = $u->addItem(2412,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(2412,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//жж6
-		$ov_item = $u->addItem(3101,$u->info['id'],'|srok=3600|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(3101,$u->info['id'],'|srok=3600|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//лечение средних травм
-		$ov_item = $u->addItem(4413,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(4413,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (бездна)
-		$ov_item = $u->addItem(5035,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5035,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (грибница)
-		$ov_item = $u->addItem(5039,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5039,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//Лечение тяжелых травм
-		$ov_item = $u->addItem(4414,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(4414,$u->info['id'],'|srok=43200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (ПТП)
-		$ov_item = $u->addItem(5036,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5036,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (Катакомбы)
-		$ov_item = $u->addItem(5037,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5037,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//право на подвиг (Гора легиона)
-		$ov_item = $u->addItem(5038,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
+		$ov_item = \User\ItemsModel::addItem(5038,$u->info['id'],'|srok=43200|battleUseZd=7200|sudba='.$u->info['login'].'');
 		mysql_query('UPDATE `items_users` SET `iznosMAX` = "1" WHERE `id` = "'.$ov_item.'" LIMIT 1');
 		//
 		mysql_query('UPDATE `items_users` SET `iznosNOW` = `iznosNOW` + 1 WHERE `id` = '.$itm['id'].' LIMIT 1');
--- a/_incl_data/class/magic/toms.php
+++ b/_incl_data/class/magic/toms.php
@ -49,7 +49,7 @@ if($goodkast == 1) {
 		);");
 	}
 	//
-	$u->addItem( 4752 , $u->info['id'] , '|sudba=1' );
+	\User\ItemsModel::addItem( 4752 , $u->info['id'] , '|sudba=1' );
 	mysql_query('UPDATE `items_users` SET `iznosNOW` = `iznosNOW` + 1 WHERE `id` = "'.$itm['id'].'" LIMIT 1');
 	//
 }
--- a/_incl_data/class/magic/upexp.php
+++ b/_incl_data/class/magic/upexp.php
@ -16,7 +16,7 @@ if( $u->info['twink'] != 0 ) {
 		//Выдаем еще и кристалл
 		$test_itm = mysql_fetch_array(mysql_query('SELECT `id` FROM `items_users` WHERE `item_id` = 1204 AND `uid` = "'.$u->info['id'].'" LIMIT 1'));
 		if( !isset($test_itm['id']) ) {
-			$u->addItem(1204,$u->info['id']);
+			\User\ItemsModel::addItem(1204,$u->info['id']);
 		}
 		}
 		*/
--- a/_incl_data/class/priem/121.php
+++ b/_incl_data/class/priem/121.php
@ -40,7 +40,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/122.php
+++ b/_incl_data/class/priem/122.php
@ -40,7 +40,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/123.php
+++ b/_incl_data/class/priem/123.php
@ -40,7 +40,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/124.php
+++ b/_incl_data/class/priem/124.php
@ -40,7 +40,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/125.php
+++ b/_incl_data/class/priem/125.php
@ -40,7 +40,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/13.php
+++ b/_incl_data/class/priem/13.php
@ -21,8 +21,8 @@ $this->addEffPr($pl,$id);
 	$prv['eda'] = $pl['date3'];
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/139.php
+++ b/_incl_data/class/priem/139.php
@ -20,8 +20,8 @@ $this->addEffPr($pl,$id);
 	$prv['eda'] = $pl['date3'];
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/14.php
+++ b/_incl_data/class/priem/14.php
@ -20,8 +20,8 @@ $pvr = array();
 	$prv['eda'] = $pl['date3'];
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/180.php
+++ b/_incl_data/class/priem/180.php
@ -29,8 +29,8 @@ if( $pvr['x5']['x'] < 5 ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/187.php
+++ b/_incl_data/class/priem/187.php
@ -26,8 +26,8 @@ if( !isset($pvr['x5']['id']) ) {
 		$u->is['mab2'] = 'Броня корпуса';
 		$u->is['mab3'] = 'Броня пояса';
 		$u->is['mab4'] = 'Броня ног';
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$this->ue['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$this->ue['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$this->ue['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/188.php
+++ b/_incl_data/class/priem/188.php
@ -20,8 +20,8 @@ $this->addEffPr($pl,$id);
 	$prv['eda'] = $pl['date3'];
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/192.php
+++ b/_incl_data/class/priem/192.php
@ -52,10 +52,10 @@ if( isset($pvr['pl']['priem']) && isset($pvr['pl']['id']) ) {
 		($btl->hodID)
 	);
 	
-	$pvr['edt'] = $u->lookStats($pvr['pl']['data']);	
+	$pvr['edt'] = \Core\ConversionHelper::dataStringToArray($pvr['pl']['data']);	
 	$pvr['edt']['add_zm2proc'] = 0;
 	$pvr['edt']['add_mg2static_points'] = 0;
-	$pvr['edt'] = $u->impStats($pvr['edt']);
+	$pvr['edt'] = \Core\ConversionHelper::arrayToDataString($pvr['edt']);
 	
 	if( $pvr['pl']['priem']['id'] == 260 ) {
 		$prv['color2'] = '000000';
--- a/_incl_data/class/priem/205.php
+++ b/_incl_data/class/priem/205.php
@ -79,10 +79,10 @@ if( true == true ) {
 			($btl->hodID + 0)
 		);
 		
-		$pvr['edt'] = $u->lookStats($pvr['pl']['data']);	
+		$pvr['edt'] = \Core\ConversionHelper::dataStringToArray($pvr['pl']['data']);	
 		$pvr['edt']['add_zm2proc'] = 0;
 		$pvr['edt']['add_mg2static_points'] = 0;
-		$pvr['edt'] = $u->impStats($pvr['edt']);
+		$pvr['edt'] = \Core\ConversionHelper::arrayToDataString($pvr['edt']);
 		
 		if( $pvr['pl']['priem']['id'] == 260 ) {
 			$prv['color2'] = '000000';
--- a/_incl_data/class/priem/21.php
+++ b/_incl_data/class/priem/21.php
@ -39,7 +39,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/22.php
+++ b/_incl_data/class/priem/22.php
@ -37,7 +37,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/223.php
+++ b/_incl_data/class/priem/223.php
@ -17,8 +17,8 @@ $pvr = array();
 	$prv['eda'] = $pl['date3'];
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/23.php
+++ b/_incl_data/class/priem/23.php
@ -37,7 +37,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/233.php
+++ b/_incl_data/class/priem/233.php
@ -18,8 +18,8 @@ if( $u->stats['items'][$u->stats['wp14id']]['type'] == 13 ) {
 	$prv['eda'] = $pl['date3'];
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/239.php
+++ b/_incl_data/class/priem/239.php
@ -34,7 +34,7 @@ if( isset($pr_tested_this) ) {
 				$prv['j_priem'] = $btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][0];
 				$prv['priem_th'] = $btl->stats[$btl->uids[$uid]]['effects'][$prv['j_priem']]['id'];
 				$btl->stats[$btl->uids[$uid]]['effects'][$prv['j_priem']]['hod'] = 3;
-				$prv['data_re'] = $u->lookStats($btl->stats[$btl->uids[$uid]]['effects'][$prv['j_priem']]['data']);
+				$prv['data_re'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$uid]]['effects'][$prv['j_priem']]['data']);
 				
 				if($prv['data_re']['step'] < 5) {
 					$prv['data_re']['add_maxAtack'] += $btl->users[$btl->uids[$uid]]['level'];
--- a/_incl_data/class/priem/240.php
+++ b/_incl_data/class/priem/240.php
@ -59,7 +59,7 @@ if( isset($pr_tested_this) ) {
 		if( $a > 0 ) {
 			$prv['j_priem'] = $btl->stats[$btl->uids[$u1]]['u_priem'][$j_id][0];
 			$prv['priem_th'] = $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'];
-			$prv['data_re'] = $u->lookStats($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$prv['data_re'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$j = 0; $k = 0; $wp = 3;
 			while($j < count($at['p'][$a]['atack'])) {
 				if( isset($at['p'][$a]['atack'][$j]['yron']) && (
@ -118,7 +118,7 @@ if( isset($pr_tested_this) ) {
 						//
 						$btl->users[$btl->uids[$u1]]['last_hp'] = $pvr['hp'];
 						//
-						$prv['data_re'] = $u->lookStats($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+						$prv['data_re'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 						if($prv['data_re']['step'] < 1) {
 							if( $btl->users[$btl->uids[$u1]]['level'] == 7 ) {
 								$prv['data_re']['add_s1'] += 10;
--- a/_incl_data/class/priem/241.php
+++ b/_incl_data/class/priem/241.php
@ -18,7 +18,7 @@ else
 if( isset($pvr['mg']['id']) ) {	
 	//Действие при клике
 	$pvr['hp'] = 0;
-	$pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
+	$pvr['data'] = \Core\ConversionHelper::dataStringToArray($pvr['mg']['data']);
 	$pvr['di'] = 0;
 	$pvr['dc'] = count($pvr['data']['atgm']);
 	$pvr['rd'] = 0;
--- a/_incl_data/class/priem/244.php
+++ b/_incl_data/class/priem/244.php
@ -18,7 +18,7 @@ if (
    $cup = true;
 } else {
    //Действие при клике
-    $pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
+    $pvr['data'] = \Core\ConversionHelper::dataStringToArray($pvr['mg']['data']);
    $pvr['name'] = $pvr['mg']['name'];

    // Урон = 150% оставшегося урона (урон за ход * количество ходов * 150/100).
--- a/_incl_data/class/priem/247.php
+++ b/_incl_data/class/priem/247.php
@ -103,10 +103,10 @@ if( isset($pr_momental_this)) {
 				$pvr['pl'] = mysql_fetch_array($pvr['sp']);
 				$pvr['pl']['priem'] = mysql_fetch_array(mysql_query('SELECT * FROM `priems` WHERE `id` = "'.$pvr['pl']['v2'].'" LIMIT 1'));
 				if( isset($pvr['pl']['priem']) ) {
-					$pvr['edt'] = $u->lookStats($pvr['pl']['data']);	
+					$pvr['edt'] = \Core\ConversionHelper::dataStringToArray($pvr['pl']['data']);	
 					$pvr['edt']['add_zm2proc'] = 0;
 					$pvr['edt']['add_mg2static_points'] = 0;
-					$pvr['edt'] = $u->impStats($pvr['edt']);
+					$pvr['edt'] = \Core\ConversionHelper::arrayToDataString($pvr['edt']);
 					
 					if( $pvr['pl']['priem']['id'] == 260 ) {
 						$prv['color2'] = '000000';
--- a/_incl_data/class/priem/250.php
+++ b/_incl_data/class/priem/250.php
@ -29,8 +29,8 @@ if( $pvr['x5']['x'] < 5 ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/251.php
+++ b/_incl_data/class/priem/251.php
@ -42,7 +42,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/252.php
+++ b/_incl_data/class/priem/252.php
@ -37,7 +37,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['mp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/257.php
+++ b/_incl_data/class/priem/257.php
@ -34,8 +34,8 @@ if( !isset($pvr['x5']['id']) ) {
 		$u->is['mab2'] = 'Броня корпуса';
 		$u->is['mab3'] = 'Броня пояса';
 		$u->is['mab4'] = 'Броня ног';
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$this->ue['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$this->ue['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$this->ue['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/258.php
+++ b/_incl_data/class/priem/258.php
@ -26,8 +26,8 @@ if( !isset($pvr['x5']['id']) ) {
 		$u->is['mab2'] = 'Броня корпуса';
 		$u->is['mab3'] = 'Броня пояса';
 		$u->is['mab4'] = 'Броня ног';
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$this->ue['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$this->ue['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$this->ue['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/262.php
+++ b/_incl_data/class/priem/262.php
@ -13,7 +13,7 @@ if( isset($pvr['mg']['id']) ) {
 	//$pvr['hp'] = floor(144/3*$pvr['mg']['x']);
 	/*$pvr['hp'] = 1;*/
 			//
-	$pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
+	$pvr['data'] = \Core\ConversionHelper::dataStringToArray($pvr['mg']['data']);
 			//
 	/**/	
 	if( $pvr['data']['add_mg2static_points'][0] < 1 ) {
@ -70,10 +70,10 @@ if( isset($pvr['mg']['id']) ) {
 		$pvr['mg']['priem']['id'] = $pvr['mg']['id'];
 		//$btl->delPriem($pvr['mg'],$btl->users[$btl->uids[$this->ue['id']]],2);
 		
-		$pvr['edt'] = $u->lookStats($pvr['mg']['data']);	
+		$pvr['edt'] = \Core\ConversionHelper::dataStringToArray($pvr['mg']['data']);	
 		$pvr['edt']['add_zm2proc'] = 0;
 		$pvr['edt']['add_mg2static_points'] = 0;
-		$pvr['edt'] = $u->impStats($pvr['edt']);
+		$pvr['edt'] = \Core\ConversionHelper::arrayToDataString($pvr['edt']);
 		mysql_query('UPDATE `eff_users` SET `x` = 1, `data` = "'.$pvr['edt'].'" WHERE `id` = "'.$pvr['mg']['id'].'" LIMIT 1');
 		
 		//Отнимаем тактики
--- a/_incl_data/class/priem/263.php
+++ b/_incl_data/class/priem/263.php
@ -11,7 +11,7 @@ if (!isset($pvr['mg']['id'])) {
    echo '<b style="color: red">На персонаже нет Статики</b>';
    $cup = true;
 } else {
-    $pvr['data'] = $this->lookStatsArray($pvr['mg']['data']);
+    $pvr['data'] = \Core\ConversionHelper::dataStringToArray($pvr['mg']['data']);
    //
    /**/
    if ($pvr['data']['add_mg2static_points'] < 1) {
--- a/_incl_data/class/priem/280.php
+++ b/_incl_data/class/priem/280.php
@ -35,7 +35,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			$prv['priem_th'] = $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'];
 			
 			//действия
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/282.php
+++ b/_incl_data/class/priem/282.php
@ -74,7 +74,7 @@ if( isset($pr_momental_this)) {
 			$prv['priem_th'] = $btl->stats[$btl->uids[$u2]]['effects'][$prv['j_priem']]['id'];
 			//
 			$pvr['hp'] = 1;
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u2]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u2]]['effects'][$prv['j_priem']]['data']);
 			$pvr['hp'] = floor($pvr['data']['add_atgm'][0]);
 			//
 			//$pvr['hp'] = floor($btl->stats[$btl->uids[$u2]]['hpAll']/50);
--- a/_incl_data/class/priem/283.php
+++ b/_incl_data/class/priem/283.php
@ -29,8 +29,8 @@ if( $pvr['x5']['x'] < 5 ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/285.php
+++ b/_incl_data/class/priem/285.php
@ -29,8 +29,8 @@ if( $pvr['x5']['x'] < 5 ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/29.php
+++ b/_incl_data/class/priem/29.php
@ -29,8 +29,8 @@ if( !isset($pvr['x5']['id']) ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/292.php
+++ b/_incl_data/class/priem/292.php
@ -28,8 +28,8 @@ if( $pvr['x5']['x'] < 1 ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/294.php
+++ b/_incl_data/class/priem/294.php
@ -41,7 +41,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			}
 			//
 			/*
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/295.php
+++ b/_incl_data/class/priem/295.php
@ -41,7 +41,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			}
 			//
 			/*
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/296.php
+++ b/_incl_data/class/priem/296.php
@ -41,7 +41,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			}
 			//
 			/*
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/299.php
+++ b/_incl_data/class/priem/299.php
@ -42,7 +42,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			$pvr['krit'] = $pvr['hp'][1];
 			$pvr['hp']   = $pvr['hp'][0];
 			/*//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/30.php
+++ b/_incl_data/class/priem/30.php
@ -29,8 +29,8 @@ if( !isset($pvr['x5']['id']) ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/300.php
+++ b/_incl_data/class/priem/300.php
@ -41,7 +41,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = rand(15,25);
 				/*//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/301.php
+++ b/_incl_data/class/priem/301.php
@ -42,7 +42,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			$pvr['krit'] = $pvr['hp'][1];
 			$pvr['hp']   = $pvr['hp'][0];
 			/*//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/31.php
+++ b/_incl_data/class/priem/31.php
@ -34,8 +34,8 @@ if( !isset($pvr['x5']['id']) ) {
 		$u->is['mab2'] = 'Броня корпуса';
 		$u->is['mab3'] = 'Броня пояса';
 		$u->is['mab4'] = 'Броня ног';
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$this->ue['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$this->ue['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$this->ue['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/32.php
+++ b/_incl_data/class/priem/32.php
@ -29,8 +29,8 @@ if( !isset($pvr['x5']['id']) ) {
 	}
 	//
 	if( isset($prv['eda']) ) {
-		$prv['d'] = $u->lookStats($prv['eda']);
-		$prv['j'] = $u->lookStats($this->redate($prv['eda'],$u->info['id']));
+		$prv['d'] = \Core\ConversionHelper::dataStringToArray($prv['eda']);
+		$prv['j'] = \Core\ConversionHelper::dataStringToArray($this->redate($prv['eda'],$u->info['id']));
 		$prv['v'] = $u->lookKeys($this->redate($prv['eda'],$u->info['id']),0); // ключи 2
 		$prv['i'] = 0; $prv['inf'] = '';
 		while($prv['i']<count($prv['v'])) {
--- a/_incl_data/class/priem/337.php
+++ b/_incl_data/class/priem/337.php
@ -59,7 +59,7 @@ if( isset($pr_tested_this) ) {
 		if( $a > 0 ) {
 			$prv['j_priem'] = $btl->stats[$btl->uids[$u1]]['u_priem'][$j_id][0];
 			$prv['priem_th'] = $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'];
-			$prv['data_re'] = $u->lookStats($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$prv['data_re'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$j = 0; $k = 0; $wp = 3;
 			while($j < count($at['p'][$a]['atack'])) {
 				if( isset($at['p'][$a]['atack'][$j]['yron']) && (
@ -115,7 +115,7 @@ if( isset($pr_tested_this) ) {
 						//
 						$btl->users[$btl->uids[$u1]]['last_hp'] = $pvr['hp'];
 						//
-						/*$prv['data_re'] = $u->lookStats($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+						/*$prv['data_re'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 						if($prv['data_re']['step'] < 1) {
 							if( $btl->users[$btl->uids[$u1]]['level'] == 7 ) {
 								$prv['data_re']['add_s1'] += 10;
--- a/_incl_data/class/priem/36.php
+++ b/_incl_data/class/priem/36.php
@ -37,7 +37,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['hp'] = floor($pvr['data']['add_atgm'][0]);
 				$pvr['hp'] = $btl->hphe( $uid , $pvr['hp'] );
 				//				
--- a/_incl_data/class/priem/42.php
+++ b/_incl_data/class/priem/42.php
@ -40,7 +40,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 				//действия
 				$pvr['hp'] = 1;
 				//
-				$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+				$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 				$pvr['di'] = 0;
 				$pvr['dc'] = count($pvr['data']['atgm']);
 				$pvr['rd'] = 0;
--- a/_incl_data/class/priem/70.php
+++ b/_incl_data/class/priem/70.php
@ -37,7 +37,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/71.php
+++ b/_incl_data/class/priem/71.php
@ -37,7 +37,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/72.php
+++ b/_incl_data/class/priem/72.php
@ -39,7 +39,7 @@ if( isset($pr_used_this) && isset($pr_moment) ) {
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/73.php
+++ b/_incl_data/class/priem/73.php
@ -39,7 +39,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/74.php
+++ b/_incl_data/class/priem/74.php
@ -39,7 +39,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/75.php
+++ b/_incl_data/class/priem/75.php
@ -39,7 +39,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/76.php
+++ b/_incl_data/class/priem/76.php
@ -39,7 +39,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/_incl_data/class/priem/77.php
+++ b/_incl_data/class/priem/77.php
@ -41,7 +41,7 @@ if( isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is
 			//действия
 			$pvr['hp'] = 1;
 			//
-			$pvr['data'] = $priem->lookStatsArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
+			$pvr['data'] = \Core\ConversionHelper::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']);
 			$pvr['di'] = 0;
 			$pvr['dc'] = count($pvr['data']['atgm']);
 			$pvr['rd'] = 0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ivor Barhansky	2bc67ce543	Переезд impstats и additem..	2023-04-16 02:54:34 +03:00
Ivor Barhansky	3dc4cf7284	Переезд lookstats отовсюду в 1 класс.	2023-04-16 01:54:07 +03:00
Ivor Barhansky	2d63efd915	Переезд функции repexp; Переезд классов User в неймспейс.	2023-04-15 22:52:33 +03:00