diff --git a/AI.php b/AI.php index 72bc19a7..7ed3bbc6 100644 --- a/AI.php +++ b/AI.php @@ -37,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']; diff --git a/_incl_data/class/Battle.php b/_incl_data/class/Battle.php index 503bda16..34d9452b 100644 --- a/_incl_data/class/Battle.php +++ b/_incl_data/class/Battle.php @@ -1,6 +1,7 @@ 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') { @@ -1018,7 +1019,7 @@ class Battle } //генерируем предметы $ttl = '' . $itm[$i]['name'] . ''; - $td = $u->lookStats($itm[$i]['data']); + $td = ConversionHelper::dataStringToArray($itm[$i]['data']); $lvar = ''; if ($td['add_hpAll'] > 0) { $td['add_hpAll'] = '+' . $td['add_hpAll']; @@ -4246,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')) { @@ -4279,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'])); } @@ -4289,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( @@ -4349,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']) { @@ -4387,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) { //удаляем прием //Добавляем в лог @@ -4676,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, [ @@ -4782,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, @@ -5721,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]; @@ -5778,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) { @@ -8133,7 +8134,7 @@ class Battle $i++; } } - $itm = $u->lookStats($item['data']); + $itm = ConversionHelper::dataStringToArray($item['data']); $t[0]['z'] = 0; $t[0]['t'] = 0; //колящий урон @@ -8213,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']; @@ -8274,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']; @@ -8368,7 +8369,7 @@ class Battle */ ]; - $witmdata = $this->lookStats($witm['data']); + $witmdata = \Core\ConversionHelper::dataStringToArray($witm['data']); //Расчет типа урона @@ -8606,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 { @@ -9349,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'] . ''; diff --git a/_incl_data/class/BotPriemLogic.php b/_incl_data/class/BotPriemLogic.php index cd10d177..fdbc105f 100644 --- a/_incl_data/class/BotPriemLogic.php +++ b/_incl_data/class/BotPriemLogic.php @@ -1,5 +1,7 @@ lookStats($pl['tr']); - $d2 = $u->lookStats($pl['date2']); + $tr = ConversionHelper::dataStringToArray($pl['tr']); + $d2 = ConversionHelper::dataStringToArray($pl['date2']); $x = 1; while ($x <= 7) { diff --git a/_incl_data/class/ComissionShop.php b/_incl_data/class/ComissionShop.php index f7694896..87f973c6 100644 --- 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]]; diff --git a/_incl_data/class/Core/ConversionHelper.php b/_incl_data/class/Core/ConversionHelper.php new file mode 100644 index 00000000..b8756f72 --- /dev/null +++ b/_incl_data/class/Core/ConversionHelper.php @@ -0,0 +1,26 @@ +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) : ''; + } +} \ No newline at end of file diff --git a/_incl_data/class/Magic.php b/_incl_data/class/Magic.php index 763f0a51..592d2cb7 100644 --- a/_incl_data/class/Magic.php +++ b/_incl_data/class/Magic.php @@ -1,5 +1,6 @@ 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( diff --git a/_incl_data/class/Quests.php b/_incl_data/class/Quests.php index 1c4cd2b2..76e3258b 100644 --- a/_incl_data/class/Quests.php +++ b/_incl_data/class/Quests.php @@ -1,5 +1,7 @@ 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++; } } diff --git a/_incl_data/class/User.php b/_incl_data/class/User.php index e66a8239..97a2f8b8 100644 --- a/_incl_data/class/User.php +++ b/_incl_data/class/User.php @@ -1,6 +1,7 @@ lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); $proc = $procs[$po['tr_lvl']]; // if ($itm['type'] >= 28) { @@ -885,37 +886,6 @@ class User } //Удаление определенного типа предметов - public function deleteItemID(int $id, int $uid, int $coldel) - { - $sp = mysql_query( - 'SELECT * FROM `items_users` WHERE `item_id` = "' . mysql_real_escape_string( - $id - ) . '" AND `uid` = "' . mysql_real_escape_string( - $uid - ) . '" AND (`delete` = 0 OR `delete` = 1000) ORDER BY `inGroup` DESC LIMIT ' . $coldel - ); - $delitm = []; - while ($pl = mysql_fetch_array($sp)) { - if (count($delitm) < $coldel) { - $delitm[] = $pl['id']; - } - } - $i = 0; - while ($i < count($delitm)) { - mysql_query( - 'UPDATE `items_users` SET `delete` = "' . time() . '" WHERE `id` = "' . $delitm[$i] . '" LIMIT 1' - ); - $i++; - } - } - - public function count_items(int $id, int $uid, int $coldel): int - { - return Db::getValue( - 'select count(*) from items_users where item_id = ? and uid = ? and (`delete` = 0 or `delete` = 1000) limit ?', - [$id, $uid, $coldel] - ); - } public function repobmen($id, $type) { @@ -925,7 +895,7 @@ class User 'SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="' . $this->info['id'] . '" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "' . ((int)$id) . '" LIMIT 1;' ) ); - $po = $this->lookStats($pl['data']); + $po = ConversionHelper::dataStringToArray($pl['data']); if ((!isset($po['frompisher']) || $po['tr_lvl'] < 4) && $pl['type'] != 31) { $e = 'Не удалось обменять предмет на репутацию.'; } else { @@ -1161,7 +1131,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` 'SELECT `id`,`items_id`,`data` FROM `items_main_data` WHERE `items_id` = "' . $pl['item_id'] . '" LIMIT 1' ) ); - $po = $this->lookStats($d['data']); + $po = ConversionHelper::dataStringToArray($d['data']); if ($pl['level'] == 0) { $pl['level'] = 0 + $po['tr_lvl']; } @@ -1230,7 +1200,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` { $tp = 0; if (isset($item['id'])) { - $itm = $this->lookStats($item['data']); + $itm = ConversionHelper::dataStringToArray($item['data']); //начинаем расчет урона if (!isset($st['minAtack'])) { $st['minAtack'] = 0; @@ -1371,7 +1341,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tp = 0; $t = 0; $i = 1; - $d = $this->lookStats($w1['data']); + $d = ConversionHelper::dataStringToArray($w1['data']); while ($i <= 4) { if (isset($d['tya' . $i]) && $t < $d['tya' . $i]) { $t = $d['tya' . $i]; @@ -1410,7 +1380,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tp = 0; $t = 0; $i = 1; - $d = $this->lookStats($w2['data']); + $d = ConversionHelper::dataStringToArray($w2['data']); while ($i <= 4) { if ($t < $d['tya' . $i]) { $t = $d['tya' . $i]; @@ -1446,7 +1416,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tp = 0; $t = 0; $i = 1; - $d = $this->lookStats($w1['data']); + $d = ConversionHelper::dataStringToArray($w1['data']); while ($i <= 4) { if (isset($d['tya' . $i]) && $t < $d['tya' . $i]) { $t = $d['tya' . $i]; @@ -1479,7 +1449,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tp = 0; $t = 0; $i = 1; - $d = $this->lookStats($w2['data']); + $d = ConversionHelper::dataStringToArray($w2['data']); while ($i <= 4) { if ($t < $d['tya' . $i]) { $t = $d['tya' . $i]; @@ -1512,7 +1482,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tp = 0; $t = 0; $i = 1; - $d = $this->lookStats($w1['data']); + $d = ConversionHelper::dataStringToArray($w1['data']); $y = 0; if (isset($d['sv_' . $v])) { $y += $d['sv_' . $v]; @@ -1532,7 +1502,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $tp = 0; $t = 0; $i = 1; - $d = $this->lookStats($w2['data']); + $d = ConversionHelper::dataStringToArray($w2['data']); $y = @$this->stats[$v] + @$d['sv_' . $v]; if ($y != $ry) { $r .= ' / ' . $y . ''; @@ -1670,7 +1640,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } if ($md != null) { $data .= $md; - $data = $this->lookStats($data); // Если в функции имеются две одинаковых константы SROK? + $data = ConversionHelper::dataStringToArray($data); // Если в функции имеются две одинаковых константы SROK? $data = $this->impStats($data); } @@ -2305,7 +2275,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //снимаем все вещи mysql_query('UPDATE `items_users` SET `inOdet` = "0" WHERE `uid` = "' . $this->info['id'] . '"'); //одеваем вещи, если они не удалены - $cm = $this->lookStats($cmp['val']); + $cm = ConversionHelper::dataStringToArray($cmp['val']); $i = 1; while ($i <= 250) { if (isset($cm[$i])) { @@ -2372,7 +2342,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ); $t = $this->items['tr']; $x = 0; - $po = $this->lookStats($o['tr']); + $po = ConversionHelper::dataStringToArray($o['tr']); if ($o['itm'] > 0) { $o['itm'] = explode(',', $o['itm']); $j = 0; @@ -2433,7 +2403,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ); $t = $this->items['tr']; $x = 0; - $po = $this->lookStats($o['tr']); + $po = ConversionHelper::dataStringToArray($o['tr']); if ($o['itm'] > 0) { $o['itm'] = explode(',', $o['itm']); $j = 0; @@ -2696,7 +2666,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if ($ins1) { if ($round > 0) { //Улучшаем мф. и статы и НР 1 раунд = +10% - $statss = $this->lookStats($clon['stats']); + $statss = ConversionHelper::dataStringToArray($clon['stats']); // $statss['s1'] = ceil($statss['s1'] * (1 + 0.1 * ($round))); $statss['s2'] = ceil($statss['s2'] * (1 + 0.1 * ($round))); @@ -2718,7 +2688,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } if ($luser && $clon['level'] < 8) { //Хуже уворот, крит и защита - $statss = $this->lookStats($clon['stats']); + $statss = ConversionHelper::dataStringToArray($clon['stats']); $statss['m1'] = ceil($statss['m1'] * 0.75); $statss['m2'] = ceil($statss['m2'] * 0.75); $statss['m3'] = ceil($statss['m3'] * 0.75); @@ -2820,7 +2790,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $uid = mysql_insert_id(); if ($round > 0) { //Улучшаем мф. и статы и НР 1 раунд = +20% - $statss = $this->lookStats($bot['stats']); + $statss = ConversionHelper::dataStringToArray($bot['stats']); // $statss['s1'] = ceil($statss['s1'] * (1 + 0.20 * ($round))); $statss['s2'] = ceil($statss['s2'] * (1 + 0.20 * ($round))); @@ -2973,7 +2943,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if (isset($i['tr_reputation']) && $i['tr_reputation'] != '') { // Требуемая репутация для покупки $need_rep = 0; - $tr_rep = $this->lookStats($i['tr_reputation']); + $tr_rep = ConversionHelper::dataStringToArray($i['tr_reputation']); foreach ($tr_rep as $row) { if ($this->rep[$row[0]] >= $row[1]) { $need_rep++; @@ -3162,7 +3132,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $need_rep = 0; if (isset($i['tr_reputation']) && $i['tr_reputation'] != '') { // Требуемая репутация для покупки - $tr_rep = $this->lookStats($i['tr_reputation']); + $tr_rep = ConversionHelper::dataStringToArray($i['tr_reputation']); foreach ($tr_rep as $row) { if ($this->rep[$row[0]] >= $row[1]) { $need_rep++; @@ -3499,7 +3469,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if (isset($i['tr_reputation']) && $i['tr_reputation'] != '') { // Требуемая репутация для покупки $need_rep = 0; - $tr_rep = $this->lookStats($i['tr_reputation']); + $tr_rep = ConversionHelper::dataStringToArray($i['tr_reputation']); foreach ($tr_rep as $row) { if ($this->rep[$row[0]] >= $row[1]) { $need_rep++; @@ -3569,7 +3539,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ); if (isset($itm['data']) && $itm['data'] != '' && $c_itm == 0) { - $po = $this->lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); if (isset($po['sudba'])) { if (isset($po['sudba'])) { @@ -3658,7 +3628,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $j++; } if ($c_itm > 0) { - $data = $this->lookStats($data); + $data = ConversionHelper::dataStringToArray($data); // Чарка if (isset($c_itm_data_a['spell_st_name']) && isset($c_itm_data_a['spell_st_val']) && $c_itm_data_a['spell_st_name'] != '' && $c_itm_data_a['spell_st_val'] != '') { $data['add_' . $c_itm_data_a['spell_st_name']] = (int)(isset($data['add_' . $c_itm_data_a['spell_st_name']]) ? (int)$data['add_' . $c_itm_data_a['spell_st_name']] : 0) + (int)$c_itm_data_a['spell_st_val']; @@ -3671,7 +3641,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); $j = 0; - $data_r = $this->lookStats($ritm['data']); + $data_r = ConversionHelper::dataStringToArray($ritm['data']); while ($j < count($this->items['add'])) { if (isset($data_r['add_' . $this->items['add'][$j]])) { $data['add_' . $this->items['add'][$j]] += $data_r['add_' . $this->items['add'][$j]]; @@ -3850,7 +3820,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if (isset($i['tr_reputation']) && $i['tr_reputation'] != '') { // Требуемая репутация для покупки $need_rep = 0; - $tr_rep = $this->lookStats($i['tr_reputation']); + $tr_rep = ConversionHelper::dataStringToArray($i['tr_reputation']); foreach ($tr_rep as $key => $val) { if ((int)$this->rep[$key] > (int)$val) { $need_rep++; @@ -3884,7 +3854,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` 'SELECT `id`,`items_id`,`data` FROM `items_main_data` WHERE `items_id` = "' . $i['id'] . '" LIMIT 1' ) ); - $po = $this->lookStats($d['data']); + $po = ConversionHelper::dataStringToArray($d['data']); if ($zuby == 1 && $po['tr_lvl'] > 7) { $r = 'Данный предмет нельзя приобрести за зубы.'; @@ -4253,7 +4223,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` 'SELECT `id`, `item_id`, `data`, `inGroup`, `uid` FROM `items_users` WHERE `id` = ' . $iid . ' LIMIT 1' ) ); - $ChSudba = $this->lookStats($ChImtem['data']); + $ChSudba = ConversionHelper::dataStringToArray($ChImtem['data']); if (!isset($ChSudba['sudba']) && $ChSudba['sudba'] == 0 && $ChSudba['sudba'] != 1 && !isset($ChSudba['toclan'])) { if (isset($ChImtem['inGroup']) and $ChImtem['inGroup'] > 0) { $col = $this->itemsX($ChImtem['id']); @@ -4395,7 +4365,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` 'SELECT `id`,`items_id`,`data` FROM `items_main_data` WHERE `items_id` = "' . $pl['id'] . '" LIMIT 1' ) ); - $po = $this->lookStats($d['data']); + $po = ConversionHelper::dataStringToArray($d['data']); if ($sid == 609) { $po['icos'] = 'WL'; @@ -4837,7 +4807,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //действие комплекта $i1c = 0; $i2c = 0; - $i1e = $this->lookStats($plc['data']); + $i1e = ConversionHelper::dataStringToArray($plc['data']); while ($i1c < count($this->items['add'])) { if (isset($i1e[$this->items['add'][$i1c]])) { $i3c = $i1e[$this->items['add'][$i1c]]; @@ -4959,7 +4929,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if ($this->info['wipe'] > 0 && $this->info['battle'] == 0) { //wipe = 1 , значит обнуляем статы и умения if ($this->info['wipe'] < 4) { - $st = $this->lookStats($this->info['stats']); + $st = ConversionHelper::dataStringToArray($this->info['stats']); $n1 = $this->info['ability']; //способности $n2 = $this->info['skills']; //владение магией и оружием $n3 = $this->info['sskills']; //особенности @@ -5066,7 +5036,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); if (isset($itm['id'])) { - $po = $this->lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); //статы if ($_GET['mf'] == 's1' || $_GET['mf'] == 's2' || $_GET['mf'] == 's3' || $_GET['mf'] == 's5') { @@ -5125,7 +5095,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); if (isset($itm['id']) && ($s == 1 || $s == 2 || $s == 3 || $s == 5)) { - $po = $this->lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); if (isset($po['free_stats']) && $po['free_stats'] > 0) { $s = (int)$s; if ($s >= 1 || $s <= 3 || $s == 5) { @@ -5151,7 +5121,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); if (isset($itm['id'])) { - $po = $this->lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); if ($itm['so'] > 0) { $s = (int)$s; if ($tp == 1) { @@ -5303,14 +5273,14 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` return; } $s = (int)$s; - $po = $this->lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); if (isset($po['sudba']) && $po['sudba'] == '0') { return; } if (isset($po['sm_skill']) && $s > 100) { $mx2 = 1; $mx1 = 0; - $mx3 = $this->lookStats($this->info['stats']); + $mx3 = ConversionHelper::dataStringToArray($this->info['stats']); while ($mx2 <= 7) { $mx1 += ($mx3['a' . $mx2] + $mx3['mg' . $mx2]) - ($po['add_a' . $mx2] + $po['add_mg' . $mx2]); $mx2++; @@ -5330,7 +5300,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } elseif (isset($po['sm_abil']) && $s < 11 && $s > 0) { $mx2 = 1; $mx1 = 0; - $mx3 = $this->lookStats($this->info['stats']); + $mx3 = ConversionHelper::dataStringToArray($this->info['stats']); while ($mx2 <= 7) { $mx1 += $mx3['s' . $mx2] - $po['add_s' . $mx2]; $mx2++; @@ -5407,7 +5377,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` while ($pl = mysql_fetch_array($sp)) { $vibor .= '
'; if (!isset($id['id'])) { - $dt = $this->lookStats($pl['data']); + $dt = ConversionHelper::dataStringToArray($pl['data']); $id = []; $id = $pl; $id_type = $pl['type']; @@ -5458,7 +5428,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` if ($idt['type'] == 4) { $idt['type'] = 6; } - $data = $this->lookStats($id['data']); + $data = ConversionHelper::dataStringToArray($id['data']); $type_rune = [ 'хи' => 9, //Серьги 'хэ' => 10, //Ожерелье @@ -5501,7 +5471,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); $j = 0; - $data_r = $this->lookStats($ritm['data']); + $data_r = ConversionHelper::dataStringToArray($ritm['data']); while ($j < count($this->items['add'])) { if (isset($data_r['add_' . $this->items['add'][$j]])) { $data['add_' . $this->items['add'][$j]] -= $data_r['add_' . $this->items['add'][$j]]; @@ -5514,7 +5484,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $data['rune_name'] = $rune['name']; $data['rune_lvl'] = $rune['level']; //Добавляем характеристики руны - $add = $this->lookStats($rune['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); $i = 0; while ($i < count($this->items['add'])) { if (isset($add['add_' . $this->items['add'][$i]])) { @@ -5555,8 +5525,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); - $data = $this->lookStats($id['data']); - $add = $this->lookStats($rune['data']); + $data = ConversionHelper::dataStringToArray($id['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); if (isset($data['nomodif'])) { $this->error = 'Улучшить данный предмет невозможно'; } elseif (isset($data['art']) && $data['tr_lvl'] < 0) { @@ -5658,8 +5628,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } //$id['type'] = $idt['type']; //Встраиваем руну - $data = $this->lookStats($id['data']); - $add = $this->lookStats($rune['data']); + $data = ConversionHelper::dataStringToArray($id['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); if (isset($data['nomodif'])) { $this->error = 'Улучшить данный предмет невозможно'; } elseif (isset($data['art']) && $data['tr_lvl'] < 0) { @@ -5720,7 +5690,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); - $data_l = $this->lookStats($litm['data']); + $data_l = ConversionHelper::dataStringToArray($litm['data']); $pvr = [ 'i' => 0, 'spell' => [], @@ -5745,7 +5715,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ) ); $j = 0; - $data_r = $this->lookStats($ritm['data']); + $data_r = ConversionHelper::dataStringToArray($ritm['data']); while ($j < count($this->items['add'])) { if (isset($data_r['add_' . $this->items['add'][$j]])) { $pvr['rune'][$this->items['add'][$j]] = $data_r['add_' . $this->items['add'][$j]]; @@ -5923,8 +5893,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } } } elseif ($rune['type'] == 47) { - $add = $this->lookStats($id['data']); - $data = $this->lookStats($rune['data']); + $add = ConversionHelper::dataStringToArray($id['data']); + $data = ConversionHelper::dataStringToArray($rune['data']); if ($add['art'] == 1) { if ($id['iznosNOW'] > 0) { $id['iznosNOW'] -= $data['repairLevel']; @@ -5956,9 +5926,9 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } $id['type'] = $idt['type']; if ($id_type < 18 || $id_type > 24) { - $add = $this->lookStats($rune['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); if (isset($add['uptimeitem'])) { - $data = $this->lookStats($id['data']); + $data = ConversionHelper::dataStringToArray($id['data']); if ($data['srok'] > 0 || $id['srok'] > 0) { if (!isset($data['srok'])) { $data['srok'] = $id['srok']; @@ -5996,8 +5966,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } } else { //Заточка - $data = $this->lookStats($id['data']); - $add = $this->lookStats($rune['data']); + $data = ConversionHelper::dataStringToArray($id['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); if (isset($data['upatack_id'])) { $this->error = 'Предмет уже заточен, вытащите заточку в Ремонтной мастерской.'; } elseif (isset($data['nomodif'])) { @@ -6011,7 +5981,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` 'SELECT * FROM `items_main_data` WHERE `items_id` = "' . $data['upatack_id'] . '" LIMIT 1' ) ); - $data_r = $this->lookStats($ritm['data']); + $data_r = ConversionHelper::dataStringToArray($ritm['data']); if ($id_type == 22) { $data['add_m11'] -= $data_r['upatack']; //*2 } @@ -6056,8 +6026,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } } elseif ($rune['type'] == 48) { //Профиль - $data = $this->lookStats($id['data']); - $add = $this->lookStats($rune['data']); + $data = ConversionHelper::dataStringToArray($id['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); if ($data['tya1'] >= 90 || $data['tya2'] >= 90 || $data['tya3'] >= 90 || $data['tya4'] >= 90) { $this->error = 'Предмет уже имеет 90 своего профиля'; @@ -6139,8 +6109,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $id['type'] = $idt['type']; //Встраиваем руну - $data = $this->lookStats($id['data']); - $add = $this->lookStats($rune['data']); + $data = ConversionHelper::dataStringToArray($id['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); if (isset($data['nomodif'])) { $this->error = 'Улучшить данный предмет невозможно'; } elseif (!isset($data['close']) && $data['close'] != 0) { @@ -6171,8 +6141,8 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` ); if ($idt['type'] != 37) { // - $data = $this->lookStats($id['data']); - $add = $this->lookStats($rune['data']); + $data = ConversionHelper::dataStringToArray($id['data']); + $add = ConversionHelper::dataStringToArray($rune['data']); // if ($id['gift'] == '' || $id['gift'] == '0') { if (isset($data['notransfer'])) { @@ -6315,7 +6285,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` } while ($pl = mysql_fetch_array($cl)) { if ($type == 30) { - $ChSudba = $this->lookStats($pl['data']); + $ChSudba = ConversionHelper::dataStringToArray($pl['data']); if (isset($ChSudba['sudba']) || $ChSudba['sudba'] != 0 || $ChSudba['nosale'] == 1) { continue; } @@ -6330,7 +6300,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $d[0] = 0; $d[1] = 1; $d[2] = 0; - $po = $this->lookStats($pl['data']); + $po = ConversionHelper::dataStringToArray($pl['data']); $see1 = 1; if ($type == 15) { //кормушка зверя @@ -6842,7 +6812,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //Возможно сохранять и распределять скилы $mx2 = 1; $mx1 = 0; - $mx3 = $this->lookStats($this->info['stats']); + $mx3 = ConversionHelper::dataStringToArray($this->info['stats']); while ($mx2 <= 7) { $mx1 += $mx3['s' . $mx2] - $po['add_s' . $mx2]; $mx2++; @@ -6872,7 +6842,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //Возможно сохранять и распределять скилы $mx2 = 1; $mx1 = 0; - $mx3 = $this->lookStats($this->info['stats']); + $mx3 = ConversionHelper::dataStringToArray($this->info['stats']); while ($mx2 <= 7) { $mx1 += ($mx3['a' . $mx2] + $mx3['mg' . $mx2]) - ($po['add_a' . $mx2] + $po['add_mg' . $mx2]); $mx2++; @@ -6919,7 +6889,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //действие комплекта $i1c = 0; $i2c = 0; - $i1e = $this->lookStats($plc['data']); + $i1e = ConversionHelper::dataStringToArray($plc['data']); while ($i1c < count($this->items['add'])) { if (isset($i1e[$this->items['add'][$i1c]])) { $i3c = $i1e[$this->items['add'][$i1c]]; @@ -6955,7 +6925,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` //действие комплекта $i1c = 0; $i2c = 0; - $i1e = $this->lookStats($plc['data']); + $i1e = ConversionHelper::dataStringToArray($plc['data']); while ($i1c < count($this->items['add'])) { if (isset($i1e[$this->items['add'][$i1c]])) { $i3c = $i1e[$this->items['add'][$i1c]]; @@ -7156,7 +7126,7 @@ FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.` $itemrun = mysql_fetch_array( mysql_query('SELECT * FROM `items_users` WHERE `id` ="' . $pl['id'] . '" LIMIT 1') ); - $it = $this->lookStats($itemrun['data']); + $it = ConversionHelper::dataStringToArray($itemrun['data']); if (!isset($it['rune_name']) || $_GET['otdel'] == 2) //отдел 2(заточки) { $is1 .= 'lookStats($this->stats['items'][$i]['data']); + $po = ConversionHelper::dataStringToArray($this->stats['items'][$i]['data']); if ($po['useOnLogin'] == 1) { $useUrl = 'top.useMagicBattle(\'' . $this->stats['items'][$i]['name'] . '\',' . $this->stats['items'][$i]['id'] . ',\'' . $this->stats['items'][$i]['img'] . '\',1,1,\'\',\'' . $this->stats['items'][$i]['useInBattle'] . '\');'; } else { @@ -8180,7 +8131,7 @@ LIMIT 1' public function getInfoItemInfo($pl): string { $lvar = ''; - $td = $this->lookStats($pl['data']); + $td = ConversionHelper::dataStringToArray($pl['data']); if (isset($td['sv_yron_max']) && $td['sv_yron_max'] > 0) { $lvar .= '
Урон: ' . $td['sv_yron_min'] . '-' . $td['sv_yron_max'] . ''; @@ -8377,7 +8328,7 @@ LIMIT 1' $b1 = '
'; while ($pl = mysql_fetch_array($cl)) { - $td = $this->lookStats($pl['data']); + $td = ConversionHelper::dataStringToArray($pl['data']); if (isset($td['modif'])) { $pl['name'] = $pl['name'] . ' (мф)'; @@ -8451,13 +8402,13 @@ LIMIT 1' $wj1i .= $br; } $td = []; - $td = $this->lookStats($wj[1]['data']); + $td = ConversionHelper::dataStringToArray($wj[1]['data']); $wj[1]['name'] = $this->nameItemMf($wj[1], $td); $wj1i .= '' . $wj[1]['name'] . ''; $wj1i .= $this->getInfoItemInfo($wj[1]); } if (isset($wj[52]) && $wj[52]) { - $td = $this->lookStats($wj[52]['data']); + $td = ConversionHelper::dataStringToArray($wj[52]['data']); $wj[52]['name'] = $this->nameItemMf($wj[52], $td); @@ -8472,7 +8423,7 @@ LIMIT 1' $wj4i = ''; if ($wj[6]) { $td = []; - $td = $this->lookStats($wj[6]['data']); + $td = ConversionHelper::dataStringToArray($wj[6]['data']); $wj[6]['name'] = $this->nameItemMf($wj[6], $td); $wj4i .= '' . $wj[6]['name'] . ''; @@ -8483,7 +8434,7 @@ LIMIT 1' } if ($wj[5]) { $td = []; - $td = $this->lookStats($wj[5]['data']); + $td = ConversionHelper::dataStringToArray($wj[5]['data']); $wj[5]['name'] = $this->nameItemMf($wj[5], $td); $wj4i .= '' . $wj[5]['name'] . ''; @@ -8494,7 +8445,7 @@ LIMIT 1' } if ($wj[4]) { $td = []; - $td = $this->lookStats($wj[4]['data']); + $td = ConversionHelper::dataStringToArray($wj[4]['data']); $wj[4]['name'] = $this->nameItemMf($wj[4], $td); $wj4i .= '' . $wj[4]['name'] . ''; @@ -8736,7 +8687,7 @@ LIMIT 1' $tr = ''; $t = $this->items['add']; $x = 0; - $ed = $this->lookStats($e['data']); + $ed = ConversionHelper::dataStringToArray($e['data']); while ($x < count($t)) { $n = $t[$x]; if (isset($ed['add_' . $n], $this->is[$n])) { @@ -8763,7 +8714,7 @@ LIMIT 1' $eff .= ''; } elseif ($e['timeUse'] + $e['timeAce'] + $e['actionTime'] < time() && $e['timeUse'] != 77) { //удаляем эффект - $ed = $this->lookStats($e['data']); + $ed = ConversionHelper::dataStringToArray($e['data']); if (!isset($ed['finish_file']) || $this->info['id'] == $e['uid']) { $this->endEffect($e['id'], $u); } @@ -9093,7 +9044,7 @@ LIMIT 1' 'UPDATE `eff_users` SET `delete`="' . time() . '" WHERE `id` = "' . $e['id'] . '" LIMIT 1' ); if ($upd) { - $po = $this->lookStats($e['data']); + $po = ConversionHelper::dataStringToArray($e['data']); if (isset($po['finish_file'])) { if (file_exists('_incl_data/class/magic/' . $po['finish_file'] . '.php')) { require('_incl_data/class/magic/' . $po['finish_file'] . '.php'); @@ -9209,7 +9160,7 @@ LIMIT 1' } - $tr = $this->lookStats($itm['data']); + $tr = ConversionHelper::dataStringToArray($itm['data']); $notr = $this->trItem($tr); $msb = ''; if (isset($tr['maks_itm_one']) && $tr['maks_itm_one'] > 0) { @@ -9655,7 +9606,7 @@ LIMIT 1' } if ($upd) { if (isset($_GET['deleteall7'])) { - $st = $this->lookStats($itm['data']); + $st = ConversionHelper::dataStringToArray($itm['data']); $whr = ''; if (isset($st['frompisher'])) { $whr .= 'AND `data` LIKE "%frompisher=' . $st['frompisher'] . '%"'; @@ -10153,7 +10104,7 @@ LIMIT 1' ) . '" AND (`endTime` > "' . time() . '" OR `endTime` = 0)' ); while ($e = mysql_fetch_array($efs)) { - $sts = $this->lookStats($e['bonus']); + $sts = ConversionHelper::dataStringToArray($e['bonus']); $i = 0; while ($i < count($ia)) { if (isset($ia[$i])) { @@ -10234,7 +10185,7 @@ LIMIT 1' } $st['effects'][$h] = $e; $h++; - $sts = $this->lookStats($e['data']); + $sts = ConversionHelper::dataStringToArray($e['data']); if (isset($sts['itempl']) && $sts['itempl'] > 0) { $nbs[$sts['itempl']] += 1; } @@ -10408,7 +10359,7 @@ LIMIT 1' } $st['effects'][$h] = $e; $h++; - $sts = $this->lookStats($e['data']); + $sts = ConversionHelper::dataStringToArray($e['data']); if ($e['v2'] == 217) { $st['raztac'] = 1; } @@ -10583,7 +10534,7 @@ LIMIT 1' if (isset($com['id'])) { //добавляем действия комплекта $ij = 0; - $sti = $this->lookStats($com['data']); + $sti = ConversionHelper::dataStringToArray($com['data']); while ($ij < count($ia)) { if (isset($ia[$ij]) && isset($sti[$ia[$ij]])) { $st[$ia[$ij]] += $sti[$ia[$ij]]; @@ -11514,7 +11465,7 @@ LIMIT 1' } } - $tst = $this->lookStats($this->info['stats']); + $tst = ConversionHelper::dataStringToArray($this->info['stats']); $tst['s4'] += $lvl['vinos']; $tst['s7'] += $lvl['duh']; $this->info['stats'] = $this->impStats($tst); @@ -11742,7 +11693,7 @@ LIMIT 1' ); $res = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id` = "' . $cl . '" LIMIT 1')); if (isset($item_['id'])) { - $po = $this->lookStats($item_['data']); + $po = ConversionHelper::dataStringToArray($item_['data']); if (isset($po['toclan'])) { $po['toclan1'] = explode('#', $po['toclan']); $po['toclan1'] = $po['toclan1'][0]; @@ -11848,7 +11799,7 @@ LIMIT 1' ); $res = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id` = "' . $cl . '" LIMIT 1')); if (isset($itm_['id'])) { - $po = $this->lookStats($itm_['data']); + $po = ConversionHelper::dataStringToArray($itm_['data']); if (isset($po['toclan'])) { $cls = explode('#', $po['toclan']); $cls = $cls[1]; @@ -11879,7 +11830,7 @@ LIMIT 1' 'SELECT * FROM `items_users` WHERE (`uid` = "-21' . $user['clan'] . '" OR `data` LIKE "%toclan=' . $user['clan'] . '#%")' ); while ($pl = mysql_fetch_array($itms)) { - $po = $this->lookStats($pl['data']); + $po = ConversionHelper::dataStringToArray($pl['data']); if (isset($po['toclan'])) { $cls = explode('#', $po['toclan']); $cls = $cls[1]; diff --git a/_incl_data/class/User/Effects.php b/_incl_data/class/User/Effects.php index ee74c708..cf5f51ba 100644 --- a/_incl_data/class/User/Effects.php +++ b/_incl_data/class/User/Effects.php @@ -7,9 +7,9 @@ use Core\Db; 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) diff --git a/_incl_data/class/User/ItemsModel.php b/_incl_data/class/User/ItemsModel.php new file mode 100644 index 00000000..301282c6 --- /dev/null +++ b/_incl_data/class/User/ItemsModel.php @@ -0,0 +1,63 @@ +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] + ); + } +} \ No newline at end of file diff --git a/_incl_data/class/dnaction/101/laba1.php b/_incl_data/class/dnaction/101/laba1.php index 305757b1..ef8148a2 100644 --- a/_incl_data/class/dnaction/101/laba1.php +++ b/_incl_data/class/dnaction/101/laba1.php @@ -1,161 +1,183 @@ 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 = 'Вы создали предмет "'.$vad['itm']['name'].'"! Расплавив ресурсы ...'; - if($u->info['sex'] == 0) { - $vad['text'] = ''.$u->info['login'].' создал предмет "'.$vad['itm']['name'].'" при помощи "'.$obj['name'].'".'; - }else{ - $vad['text'] = ''.$u->info['login'].' создала предмет "'.$vad['itm']['name'].'" при помощи "'.$obj['name'].'".'; - } - $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'] . '" + )' + ); + $u->addItem($vad['itm']['id'], $u->info['id'], '|frompisher=101'); + $r = 'Вы создали предмет "' . $vad['itm']['name'] . '"! Расплавив ресурсы ...'; + if ($u->info['sex'] == 0) { + $vad['text'] = '' . $u->info['login'] . ' создал предмет "' . $vad['itm']['name'] . '" при помощи "' . $obj['name'] . '".'; + } else { + $vad['text'] = '' . $u->info['login'] . ' создала предмет "' . $vad['itm']['name'] . '" при помощи "' . $obj['name'] . '".'; + } + $this->sys_chat($vad['text']); + } } -?> \ No newline at end of file diff --git a/_incl_data/class/dnaction/_dungeon_replace.php b/_incl_data/class/dnaction/_dungeon_replace.php index f4162ca3..9a0f9e84 100644 --- a/_incl_data/class/dnaction/_dungeon_replace.php +++ b/_incl_data/class/dnaction/_dungeon_replace.php @@ -1,481 +1,389 @@ - var elem = document.getElementById('se-pre-con'); - elem.parentNode.removeChild(elem); - - "; +use Core\Db; +use User\ItemsModel; -if(!defined('GAME')) { die(); } +echo ""; -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 = "Не хватает ресурсов "Эссенция праведного гнева""; - } - } else { - $err = "Не хватает ресурсов "Шепот гор""; - } - } else { - $err = "Не хватает ресурсов "Камень затаенного солнца""; +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)) { + $u->addItem($result, $u->info['id'], $data, $obj); + foreach ($parts as $part) { + ItemsModel::deleteItemsById($part); } - } else { - $err = "Не хватает ресурсов "Кристалл голоса предков""; - } + return 'Вы получили ' . ItemsModel::getNamesByIds([$result]); } else { - $err = "Не хватает ресурсов "Сгусток эфира""; + return 'Не хватает ресурсов: ' . ItemsModel::getNamesByIds($checkItems); } - } else { - $err = "Не хватает ресурсов "Лучистое Серебро""; - } -} 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 = "Не хватает ресурсов "Сущность ресурса""; - } - } else { - $err = "Не хватает ресурсов "Эссенция праведного гнева""; - } - } else { - $err = "Не хватает ресурсов "Шепот гор""; - } - } else { - $err = "Не хватает ресурсов "Камень затаенного солнца""; - } - } else { - $err = "Не хватает ресурсов "Кристалл голоса предков""; - } - } else { - $err = "Не хватает ресурсов "Сгусток эфира""; - } - } else { - $err = "Не хватает ресурсов "Лучистое Серебро""; - } -} 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 = "Не хватает ресурсов "Кристалл стабильности""; - } - } else { - $err = "Не хватает ресурсов "Кристалл голоса предков""; - } -} 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 = "Не хватает ресурсов "Шепот гор""; - } - } else { - $err = "Не хватает ресурсов "Тысячелетний камень""; - } - } else { - $err = "Не хватает ресурсов "Плод змеиного дерева""; - } - } else { - $err = "Не хватает ресурсов "Сгусток астрала""; - } - } else { - $err = "Не хватает ресурсов "Сталь""; - } -} 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 = "Не хватает ресурсов "Камень затаенного солнца""; - } - } else { - $err = "Не хватает ресурсов "Кристалл времен""; - } - } else { - $err = "Не хватает ресурсов "Тысячелетний камень""; - } - } else { - $err = "Не хватает ресурсов "Глубинный камень""; - } - } else { - $err = "Не хватает ресурсов "Кожа змеиного дерева""; - } -} 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 = "Не хватает ресурсов "Лучистый топаз""; - } - } else { - $err = "Не хватает ресурсов "Тысячелетний камень""; - } - } else { - $err = "Не хватает ресурсов "Плод змеиного дерева""; - } - } else { - $err = "Не хватает ресурсов "Сгусток эфира""; - } - } else { - $err = "Не хватает ресурсов "Кожа Общего Врага""; - } -} 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 = "Не хватает ресурсов "Стихиалия""; - } - } else { - $err = "Не хватает ресурсов "Лучистый рубин""; - } - } else { - $err = "Не хватает ресурсов "Кристалл стабильности""; - } -} 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 = "Не хватает ресурсов "Стихиалия""; - } - } else { - $err = "Не хватает ресурсов "Лучистый рубин""; - } - } else { - $err = "Не хватает ресурсов "Кристалл стабильности""; - } -} 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 = "Не хватает ресурсов "Сгусток астрала""; - } - } else { - $err = "Не хватает ресурсов "Сгусток эфира""; - } - } else { - $err = "Не хватает ресурсов "Кристалл тысячи ответов""; - } -} 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 = "Не хватает ресурсов "Ускоритель для Големов""; - } - } else { - $err = "Не хватает ресурсов "Смазка для Големов""; - } - } else { - $err = "Не хватает ресурсов "Топливо для Големов""; - } - } else { - $err = "Не хватает ресурсов "Зачаровать кольцо: Вытягивание души [1]""; - } +} + +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; } ?> - - - - - - - + #answer1 { + color: #003388; + font-weight: bold; + text-decoration: none; + } + + + - +
- - - + + +
- - - -

Мастерская Забытых Мастеров

-
 
+ + + + + +

Мастерская Забытых Мастеров

+
 
-".$err.""; } ?> +" . $err . ""; +} ?> - - + + +
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.'; } ?>
-
-
-

-
-

- - - + +
-
-• Черная метка
- - -• Клаустрофобия
- +
+
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.'; + } ?>
+
+
+
+

+
+

+ + +
+
+ • Черная метка
+ -• Проклятье Умирающей Земли
- + • Клаустрофобия
+ -• Проклятье Стихающего Ветра
- + • Проклятье Умирающей Земли
+ -• Проклятье Замерзающей Воды
- + • Проклятье Стихающего Ветра
+ -• Проклятье Угасающего Огня
- + • Проклятье Замерзающей Воды
+ -• Проклятье Легкого Отупления
- + • Проклятье Угасающего Огня
+ + + • Проклятье Легкого Отупления
+ -• Проклятье Уязвимости
- + • Проклятье Уязвимости
+ -• Зачаровать кольцо: Вытягивание души [1]
- + • Зачаровать кольцо: Вытягивание души [1] +
+ -• Зачаровать кольцо: Вытягивание души [2]
- -
-• Уйти. (Выход) + • Зачаровать кольцо: Вытягивание души [2] +
+ +
+ • Уйти. (Выход) -
+
@@ -483,35 +391,47 @@ function OpenDiv(vr) {
-
+ - - -
- +
- +
-
+ +
+
+ + -
+
+
+ + + + - + + +
-
-
-
+
+
+
+
-
- \ No newline at end of file + diff --git a/_incl_data/class/magic/__magic.php b/_incl_data/class/magic/__magic.php index 36642211..09e603da 100644 --- a/_incl_data/class/magic/__magic.php +++ b/_incl_data/class/magic/__magic.php @@ -1,4 +1,7 @@ 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']); //используем на персонажа (все кроме себя) diff --git a/_incl_data/class/magic/feerverks.php b/_incl_data/class/magic/feerverks.php index 349dcf8c..49c34a9d 100644 --- a/_incl_data/class/magic/feerverks.php +++ b/_incl_data/class/magic/feerverks.php @@ -1,5 +1,7 @@ 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']; diff --git a/_incl_data/class/priem/13.php b/_incl_data/class/priem/13.php index c39f327c..c2d376ca 100644 --- 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']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']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']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']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']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']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']); diff --git a/_incl_data/class/priem/205.php b/_incl_data/class/priem/205.php index 3ebb28d0..5f4ae87a 100644 --- a/_incl_data/class/priem/205.php +++ b/_incl_data/class/priem/205.php @@ -79,7 +79,7 @@ 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']); diff --git a/_incl_data/class/priem/223.php b/_incl_data/class/priem/223.php index 36deb49b..54ef7754 100644 --- 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']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']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']; diff --git a/_incl_data/class/priem/240.php b/_incl_data/class/priem/240.php index 29e46735..c3ad9522 100644 --- 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; diff --git a/_incl_data/class/priem/247.php b/_incl_data/class/priem/247.php index 61514964..28ae00a4 100644 --- a/_incl_data/class/priem/247.php +++ b/_incl_data/class/priem/247.php @@ -103,7 +103,7 @@ 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']); diff --git a/_incl_data/class/priem/250.php b/_incl_data/class/priem/250.php index 4baf45e5..5e4192c4 100644 --- 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']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']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']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']); diff --git a/_incl_data/class/priem/283.php b/_incl_data/class/priem/283.php index f5866c47..23f56d4f 100644 --- 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']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']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']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']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']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']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'] 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; diff --git a/_incl_data/class/priems/air.php b/_incl_data/class/priems/air.php index 99c6dcf6..0e4a3974 100644 --- a/_incl_data/class/priems/air.php +++ b/_incl_data/class/priems/air.php @@ -9,7 +9,7 @@ function mg2static_points($uid,$st) { if(isset($st['mg2static_points'])) { $mg = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "'.$uid.'" AND `data` LIKE "%add_mg2static_points%" ORDER BY `id` DESC LIMIT 1')); if(isset($mg['id'])) { - $mg['data'] = $u->lookStats($mg['data']); + $mg['data'] = \Core\ConversionHelper::dataStringToArray($mg['data']); $mg['data']['add_mg2static_points']++; $mg['data']['add_zm2proc']--; $mg['data'] = $u->impStats($mg['data']); @@ -60,7 +60,7 @@ if(isset($hod)) if(isset($btl->stats[$btl->uids[$uen]]['mg2static_points']) && $btl->stats[$btl->uids[$uen]]['mg2static_points'] > 0) { $mg = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "'.$btl->users[$btl->uids[$uen]]['id'].'" AND `data` LIKE "%add_mg2static_points%" ORDER BY `id` DESC LIMIT 1')); if(isset($mg['id'])) { - $mg['data'] = $u->lookStats($mg['data']); + $mg['data'] = \Core\ConversionHelper::dataStringToArray($mg['data']); if($pl['id'] == 261) { $hpmin = round($btl->stats[$btl->uids[$uen]]['hpAll']/100*rand(1,3)); diff --git a/_incl_data/class/priems/bot_priems1.end.php b/_incl_data/class/priems/bot_priems1.end.php index 93129e9a..5f1ed0a9 100644 --- a/_incl_data/class/priems/bot_priems1.end.php +++ b/_incl_data/class/priems/bot_priems1.end.php @@ -1363,7 +1363,7 @@ elseif($this->users[$this->uids[$uid1]]['bot_id'] == 254) { if(isset($pl['id'])) { $rcu = false; - $j = $u->lookStats($pl['date2']); + $j = \Core\ConversionHelper::dataStringToArray($pl['date2']); $mpr = false; $addch = 0; $uid = $this->users[$this->uids[$uid1]]['id']; if(isset($pr_vars['priem_use'][$i]['on']['id'])) { @@ -1403,8 +1403,8 @@ elseif($this->users[$this->uids[$uid1]]['bot_id'] == 254) { } elseif($j['onlyOne'] > 1) { if($mpr['x'] < $j['onlyOne']) { if(isset($j['date3Plus'])) { - $j1 = $u->lookStats($mpr['data']); - $j2 = $u->lookStats($priem->redate($pl['date3'], $this->users[$this->uids[$uid1]]['id'])); + $j1 = \Core\ConversionHelper::dataStringToArray($mpr['data']); + $j2 = \Core\ConversionHelper::dataStringToArray($priem->redate($pl['date3'], $this->users[$this->uids[$uid1]]['id'])); $v = $u->lookKeys($priem->redate($pl['date3'], $this->users[$this->uids[$uid1]]['id']), 0); $i56 = 0; $inf = ''; while($i56 < count($v)) { diff --git a/_incl_data/class/priems/moment.php b/_incl_data/class/priems/moment.php index 774a2c43..644facb8 100644 --- a/_incl_data/class/priems/moment.php +++ b/_incl_data/class/priems/moment.php @@ -416,7 +416,7 @@ if(isset($hpmin) && $hpmin>0 && $u->info['enemy']>0) $pl2['priem'] = mysql_fetch_array(mysql_query('SELECT * FROM `priems` WHERE `id` = "'.$pl2['v2'].'" LIMIT 1')); if(isset($pl2['priem']['id'])) { - $dt1 = $u->lookStats($pl2['priem']['date2']); + $dt1 = \Core\ConversionHelper::dataStringToArray($pl2['priem']['date2']); if(isset($dt1['yron_u2'])) { $minu = getdr($dt1['yron_u2'],array(0=>'lvl1',1=>'yr1'),array(0=>$u->info['level'],1=>$hpmin)); diff --git a/_incl_data/class/priems/test.php b/_incl_data/class/priems/test.php index 795f3d78..23942fdd 100644 --- a/_incl_data/class/priems/test.php +++ b/_incl_data/class/priems/test.php @@ -165,7 +165,7 @@ if(isset($hod)) { }elseif($pl['priem']['id']==239) { //Поступь смерти - $pl['data_re'] = $u->lookStats($pl['data']); + $pl['data_re'] = \Core\ConversionHelper::dataStringToArray($pl['data']); if($pl['data_re']['step'] < 10) { $pl['data_re']['add_maxAtack'] += $this->users[$this->uids[$pl['uid']]]['level']; $pl['data_re']['step']++; @@ -180,7 +180,7 @@ if(isset($hod)) { }elseif($pl['priem']['id']==240) { //Хлебнуть Крови - $pl['data_re'] = $u->lookStats($pl['data']); + $pl['data_re'] = \Core\ConversionHelper::dataStringToArray($pl['data']); if(isset($pl['data_re']['step']) || $pl['data_re']['step'] == 0) { //Добавляем силу if($this->users[$this->uids[$u2['id']]]['level'] == 7) { diff --git a/adminion/recovery.php b/adminion/recovery.php index 211b3f52..698ff1ec 100644 --- a/adminion/recovery.php +++ b/adminion/recovery.php @@ -49,7 +49,7 @@ while ($pl = mysql_fetch_array($sp)) { $r[5] -= $pl['money']; } // -$sts = $u->lookStats($st['stats']); +$sts = \Core\ConversionHelper::dataStringToArray($st['stats']); $nst = [ 's1' => 3, 's2' => 3, diff --git a/adminion/testing.php b/adminion/testing.php index 12b2e905..e917cddd 100644 --- a/adminion/testing.php +++ b/adminion/testing.php @@ -287,7 +287,7 @@ while ($i < 100) { $tr = ''; $t = $u->items['add']; $x = 0; - $ed = $u->lookStats($pl['mdata']); + $ed = \Core\ConversionHelper::dataStringToArray($pl['mdata']); while ($x < count($t)) { $n = $t[$x]; if (isset($ed['add_' . $n], $u->is[$n])) { diff --git a/inf.php b/inf.php index cac482db..ffe0ab8a 100644 --- a/inf.php +++ b/inf.php @@ -1,6 +1,7 @@ lookStats($pl['data']); + $po = ConversionHelper::dataStringToArray($pl['data']); $pl_gift = $po['gift_id']; if ($pl_gift > 0) { $pl_gift = mysql_fetch_array( diff --git a/items_info.php b/items_info.php index 2c61d9ec..ea708d07 100644 --- a/items_info.php +++ b/items_info.php @@ -148,34 +148,12 @@ function timeOut($ttm) return $out; } -function lookStats($m) -{ - if (empty($m)) { - return []; - } - $ist = []; - $di = explode('|', $m); - $i = 0; - $de = false; - while ($i < count($di)) { - $de = explode('=', $di[$i]); - if (isset($de[0], $de[1])) { - if (!isset($ist[$de[0]])) { - $ist[$de[0]] = 0; - } - $ist[$de[0]] = $de[1]; - } - $i++; - } - return $ist; -} - if (empty($itm['id']) && !empty($_GET['id'])) { $data = Db::getValue('select data from items_main_data where items_id = ?', [$_GET['id']]); } else { $data = Db::getValue('select data from items_main_data where items_id = ?', [$itm['id']]); } -$itd = !empty($data) ? lookStats($data) : []; +$itd = !empty($data) ? \Core\ConversionHelper::dataStringToArray($data) : []; $items = [ 'tr' => ['lvl', 's1', 's2', 's3', 's4', 's5', 's6', 's7', 's8', 's9', 's10', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'mg1', 'mg2', 'mg3', 'mg4', 'mg5', 'mg6', 'mg7', 'mall', 'm2all', 'aall'], @@ -597,7 +575,7 @@ $rz[$rt[$itm['type']]][1] ??= 'Прочие предметы'; //действие комплекта $i1c = 0; $i2c = 0; - $i1e = lookStats($itmc['data']); + $i1e = \Core\ConversionHelper::dataStringToArray($itmc['data']); while ($i1c < count($items['add'])) { if (isset($i1e[$items['add'][$i1c]])) { $i3c = $i1e[$items['add'][$i1c]]; @@ -815,7 +793,7 @@ $rz[$rt[$itm['type']]][1] ??= 'Прочие предметы'; $itd = mysql_fetch_array( mysql_query('SELECT * FROM `items_main_data` WHERE `items_id` = ' . $itm['id']) ); - $itd = lookStats($itd['data']); + $itd = \Core\ConversionHelper::dataStringToArray($itd['data']); ?>
@@ -1076,7 +1054,7 @@ $rz[$rt[$itm['type']]][1] ??= 'Прочие предметы'; //действие комплекта $i1c = 0; $i2c = 0; - $i1e = lookStats($itmc['data']); + $i1e = \Core\ConversionHelper::dataStringToArray($itmc['data']); while ($i1c < count($items['add'])) { if (isset($i1e[$items['add'][$i1c]])) { $i3c = $i1e[$items['add'][$i1c]]; diff --git a/modules_data/_animal.php b/modules_data/_animal.php index 44c5e8fd..cc133ec1 100644 --- a/modules_data/_animal.php +++ b/modules_data/_animal.php @@ -55,11 +55,11 @@ if(isset($_GET['delete']) && $_GET['delete'] == $an['id']) { $anl = mysql_fetch_array(mysql_query('SELECT `bonus` FROM `levels_animal` WHERE `type` = "'.$an['type'].'" AND `level` = "'.$an['level'].'" LIMIT 1')); $anl = $anl['bonus']; -$anl = $u->lookStats($anl); +$anl = \Core\ConversionHelper::dataStringToArray($anl); $nam = array(1=>'Кот',2=>'Сова',3=>'Светляк',4=>'Чертяка',5=>'Собака',6=>'Свинья',7=>'Дракон'); $sab = mysql_fetch_array(mysql_query('SELECT * FROM `test_bot` WHERE `login` = "'.$nam[$an['type']].' ['.$an['level'].']" LIMIT 1')); -$sa = $u->lookStats($an['stats']); +$sa = \Core\ConversionHelper::dataStringToArray($an['stats']); $sa['hpAll'] += 30+$sa['s4']*6+$sa['hpAll']; $ne = ''; @@ -124,7 +124,7 @@ if(isset($_GET['obj_corm'])) { if($an['yad'] > time()) { $err = '"'.$an['name'].'" отвернулся от еды...'; }elseif($an['eda'] < 50) { - $po = $u->lookStats($corm['data']); + $po = \Core\ConversionHelper::dataStringToArray($corm['data']); $corm['level'] = $po['tr_lvl']; if($an['level'] >= $corm['level']) { $rzc = $an['level']-$corm['level']; diff --git a/modules_data/_clan.php b/modules_data/_clan.php index 664d9270..33825978 100644 --- a/modules_data/_clan.php +++ b/modules_data/_clan.php @@ -2254,7 +2254,7 @@ if ($u->info['clan_prava'] != 'glava') { AND `iu`.`id` = "' . mysql_real_escape_string($_GET['ungive_itm']) . '" LIMIT 1' ) ); - $ps = $u->lookStats($itms['data']); + $ps = \Core\ConversionHelper::dataStringToArray($itms['data']); $ps['cl'] = explode('#', $ps['toclan']); $use_s = $ps['cl'][1]; if (isset($_GET['ungive_itm']) && $ps['cl'][0] == $res['id'] && ($tt[14][0] == 1 || ($u->info['id'] == $use_s))) { diff --git a/modules_data/_clan_oldversion.php b/modules_data/_clan_oldversion.php index 849ed191..263a4c04 100644 --- a/modules_data/_clan_oldversion.php +++ b/modules_data/_clan_oldversion.php @@ -2085,7 +2085,7 @@ if ($u->info['clan_prava'] != 'glava') { AND `iu`.`id` = "' . mysql_real_escape_string($_GET['ungive_itm']) . '" LIMIT 1' ) ); - $ps = $u->lookStats($itms['data']); + $ps = \Core\ConversionHelper::dataStringToArray($itms['data']); $ps['cl'] = explode('#', $ps['toclan']); $use_s = $ps['cl'][1]; if (isset($_GET['ungive_itm']) && $ps['cl'][0] == $res['id'] && ($tt[14][0] == 1 || ($u->info['id'] == $use_s))) { diff --git a/modules_data/_friends.php b/modules_data/_friends.php index f63645a8..3830aef2 100644 --- a/modules_data/_friends.php +++ b/modules_data/_friends.php @@ -65,7 +65,7 @@ $friend = mysql_fetch_array( mysql_query("SELECT * FROM `friends` WHERE `user` = '" . $u->info['id'] . "' LIMIT 1;") ); -$st = $u->lookStats($u->info['stats']); +$st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $addfr = mysql_fetch_array( mysql_query("SELECT count(`id`) FROM `friends` WHERE `user` = '" . $u->info['id'] . "';") ); diff --git a/modules_data/_obraz.php b/modules_data/_obraz.php index ef7ddc9f..bf38923b 100644 --- a/modules_data/_obraz.php +++ b/modules_data/_obraz.php @@ -48,7 +48,7 @@ $sp = mysql_query('SELECT * FROM `obraz` WHERE `sex` = "'.$u->info['sex'].'" AND while($pl = mysql_fetch_array($sp)) { $tr = true; $trd = ''; - $po = $u->lookStats($pl['tr']); + $po = \Core\ConversionHelper::dataStringToArray($pl['tr']); $t = $u->items['tr']; $x = 0; if( $pl['level'] > 0 ) { diff --git a/modules_data/_umenie.php b/modules_data/_umenie.php index bdb15d15..4991be34 100644 --- a/modules_data/_umenie.php +++ b/modules_data/_umenie.php @@ -204,7 +204,7 @@ $tma = ''; '; - }else{ - $itmAllSee = $itmAll[2]; - } - //Удачно растворен предмет "Укрепленный Костыль". Получена руна "Моно Бауни". - ?> - -
microLogin($u->info['id']); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); if ( $_GET['dec_transfer'] || $_GET['dec_travma'] || @@ -1429,7 +1429,7 @@ $tma = ''; $clr = $clr == 'C7' ? 'D5' : 'C7'; $v1 = ''; $v2 = ''; - $v3 = $u->lookStats($u->stats['effects'][$i]['data']); + $v3 = \Core\ConversionHelper::dataStringToArray($u->stats['effects'][$i]['data']); $j = 0; while ($j < count($u->items['add'])) { if (isset($v3['add_' . $u->items['add'][$j]])) { @@ -1488,7 +1488,7 @@ $tma = ''; $clr = $clr == 'C7' ? 'D5' : 'C7'; $v1 = ''; $v2 = ''; - $v3 = $u->lookStats($e['bonus']); + $v3 = \Core\ConversionHelper::dataStringToArray($e['bonus']); $j = 0; while ($j < count($u->items['add'])) { @@ -1905,7 +1905,7 @@ $tma = ''; //добавляем действия комплекта $cmss .= ''; $ij = 0; - $sti = $u->lookStats($plc['data']); + $sti = \Core\ConversionHelper::dataStringToArray($plc['data']); while ($ij < count($ia)) { if (isset($ia[$ij]) && isset($sti[$ia[$ij]])) { $mad = $sti[$ia[$ij]]; @@ -2334,7 +2334,7 @@ $tma = ''; 1 ); if (isset($sf['id'])) { - $sfe = $u->lookStats($sf['vals']); + $sfe = \Core\ConversionHelper::dataStringToArray($sf['vals']); $sf[0] = $u->info['exp'] - (int)$sfe['e']; $sf[1] = $u->info['win'] - (int)$sfe['w']; $sf[2] = $u->info['lose'] - (int)$sfe['l']; diff --git a/modules_data/location/_shop_referal_.php b/modules_data/location/_shop_referal_.php index b244848f..d93914d5 100644 --- a/modules_data/location/_shop_referal_.php +++ b/modules_data/location/_shop_referal_.php @@ -141,7 +141,7 @@ if(isset($_GET['buy'])){ LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } @@ -213,7 +213,7 @@ if(isset($_GET['buy'])){ } elseif(isset($_GET['sale']) && isset($_GET['item_rep']) && $u->newAct($_GET['sd4']) ) { $id = (int)$_GET['item_rep']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `im`.`pricerep` > 0 AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/a_hram.php b/modules_data/location/a_hram.php index 365ad901..7d890d9c 100644 --- a/modules_data/location/a_hram.php +++ b/modules_data/location/a_hram.php @@ -53,7 +53,7 @@ if($u->room['file']=='a_hram') { $id = (int)$_GET['sale1kr']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.*,`iu`.`id` AS `id_user` FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); $po['toclan1'] = explode('#',$po['toclan']); $po['toclan1'] = $po['toclan1'][0]; $see1 = 1; diff --git a/modules_data/location/altar_cat.php b/modules_data/location/altar_cat.php index 444b5e7f..12193483 100644 --- a/modules_data/location/altar_cat.php +++ b/modules_data/location/altar_cat.php @@ -88,7 +88,7 @@ if(isset($file) && $file[0]=='altar_cat.php') $itm_data = mysql_fetch_array(mysql_query('SELECT `data` FROM `items_main_data` WHERE `items_id` = "'.mysql_real_escape_string($itm['id']).'"')); if(isset($itm['id'])) { if($vaza==true && isset($itm_data['data'])){ - $itm_data = $u->lookStats($itm_data['data']); + $itm_data = \Core\ConversionHelper::dataStringToArray($itm_data['data']); $itm_data = array('srok'=>$itm_data['srok']); // Извлекаем только срок! $itm_data['srok'] = (int)$itm_data['srok']; // Только Цифры! if(isset($itm_data['srok']) and $itm_data['srok']>0){ diff --git a/modules_data/location/an/flower.php b/modules_data/location/an/flower.php index 06ecf97d..f97431c9 100644 --- a/modules_data/location/an/flower.php +++ b/modules_data/location/an/flower.php @@ -96,7 +96,7 @@ if($u->room['file']=='an/flower') $itm_data = mysql_fetch_array(mysql_query('SELECT data FROM `items_main_data` WHERE `items_id` = "'.mysql_real_escape_string($itm['id']).'"')); if(isset($itm['id'])) { if($vaza==true && isset($itm_data['data'])){ - $itm_data = $u->lookStats($itm_data['data']); + $itm_data = \Core\ConversionHelper::dataStringToArray($itm_data['data']); $itm_data = array('srok'=>$itm_data['srok']); // Извлекаем только срок! $itm_data['srok'] = (int)$itm_data['srok']; // Только Цифры! if(isset($itm_data['srok']) and $itm_data['srok']>0){ diff --git a/modules_data/location/an/post.php b/modules_data/location/an/post.php index fe988414..d7d2b01b 100644 --- a/modules_data/location/an/post.php +++ b/modules_data/location/an/post.php @@ -59,7 +59,7 @@ if($r == 1) { }elseif(isset($itm['id'])) { $itm['id'] = mysql_real_escape_string(round((int)$_POST['itm_post'])); $see1 = 1; - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); $po['toclan1'] = explode('#',$po['toclan']); $po['toclan1'] = $po['toclan1'][0]; diff --git a/modules_data/location/an/remont.php b/modules_data/location/an/remont.php index bb6ee724..78c90803 100644 --- a/modules_data/location/an/remont.php +++ b/modules_data/location/an/remont.php @@ -43,7 +43,7 @@ if($u->room['file']=='an/remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%modif%" AND `iu`.`data` NOT LIKE "%upgrade=5%" AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['upgrade']).'" LIMIT 1')); if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if($ir['price1']>$ir['1price']) { $ir['1price'] = $ir['price1']; } @@ -135,7 +135,7 @@ if($u->room['file']=='an/remont') AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['modif']).'" LIMIT 1')); if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if($ir['price1']>$ir['1price']) { $ir['1price'] = $ir['price1']; } @@ -269,7 +269,7 @@ if($u->room['file']=='an/remont') // Предмет существует. if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); // Тут мы храним характеристики предмета. + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); // Тут мы храним характеристики предмета. if($po['tr_lvl'] > $ir['level']) { $pl['level'] = $po['tr_lvl']; // Если уровень предмета, меньше чем уровень требований с характеристик, то идет обновление уровня предмета. } @@ -309,8 +309,8 @@ if($u->room['file']=='an/remont') // Обнуляем инфу к стандартным данным - $ir['item_id'] $item_default = mysql_fetch_array(mysql_query('SELECT `data` FROM `items_main_data` WHERE `items_id` = "'.mysql_real_escape_string((int)$ir['item_id']).'" LIMIT 1')); - $item_default = $u->lookStats($item_default['data']); - $upattack = $u->lookStats($upattack['data']); + $item_default = \Core\ConversionHelper::dataStringToArray($item_default['data']); + $upattack = \Core\ConversionHelper::dataStringToArray($upattack['data']); if( $upattack['uptype'] == 22 ) { $po['add_m11'] -= $upattack['upatack']*2; $po['tr_lvl'] = $item_default['tr_lvl']; @@ -400,7 +400,7 @@ if($u->room['file']=='an/remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%rune_id%" AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['unrune']).'" LIMIT 1')); if(isset($ir['id']) ) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(isset($po['noremont']) or isset($st['frompisher'])){ $re2 = 'Предмет не подлежит извлечению рун.'; } else { @@ -411,7 +411,7 @@ if($u->room['file']=='an/remont') $pcena = 10*$ir['level']+40; if($pcena <= $u->info['money']) { $iro = mysql_fetch_array(mysql_query('SELECT * FROM `items_main_data` WHERE `items_id` = "'.$po['rune_id'].'" LIMIT 1')); - $ro = $u->lookStats($iro['data']); + $ro = \Core\ConversionHelper::dataStringToArray($iro['data']); $restat = array(); $i = 0; @@ -452,7 +452,7 @@ if($u->room['file']=='an/remont') } if($pcena <= $u->info['money']) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); $po['gravi'] = substr($_GET['grav_text'],0, 20); $po['gravic'] = $u->info['city']; $po['gravi'] = str_replace('=','',$po['gravi']); @@ -485,7 +485,7 @@ if($u->room['file']=='an/remont') } if($pcena <= $u->info['money']) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); $po['gravi'] = substr($_GET['grav_text'],0, 20); $po['gravic'] = $u->info['city']; $po['gravi'] = str_replace('=','',$po['gravi']); @@ -511,7 +511,7 @@ if($u->room['file']=='an/remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `im`.`inslot` = 5 AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['podgon']).'" LIMIT 1')); if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(!isset($po['podgon'])) { if($po['tr_lvl']>$ir['level']) { $ir['level'] = $po['tr_lvl']; @@ -560,7 +560,7 @@ if($u->room['file']=='an/remont') if(isset($ir['id'])) { - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(isset($po['noremont'])) { $re2 = 'Предмет не подлежит ремонту в этой мастерской.'; @@ -649,7 +649,7 @@ if($u->room['file']=='an/remont') if(isset($ir['id'])) { - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(isset($po['noremont'])) { $re2 = 'Предмет не подлежит ремонту в этой мастерской.'; diff --git a/modules_data/location/an/shop_.php b/modules_data/location/an/shop_.php index 618d516f..7ae586cd 100644 --- a/modules_data/location/an/shop_.php +++ b/modules_data/location/an/shop_.php @@ -134,7 +134,7 @@ if($u->room['file']=='an/shop_') LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } @@ -206,7 +206,7 @@ if($u->room['file']=='an/shop_') } elseif(isset($_GET['sale']) && isset($_GET['item_rep']) && $u->newAct($_GET['sd4']) ) { $id = (int)$_GET['item_rep']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `im`.`pricerep` > 0 AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/an/znahar.php b/modules_data/location/an/znahar.php index 47e69724..67f2b5d4 100644 --- a/modules_data/location/an/znahar.php +++ b/modules_data/location/an/znahar.php @@ -190,7 +190,7 @@ function zact($i,$x = 1) { } #------------------Запросы и прочее -$st = $u->lookStats($u->info['stats']); +$st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $vinos = array( /* level,summvinos*/ "0" => 3, @@ -233,7 +233,7 @@ if(isset($tst_trvm['id'])) { if($z_na[0] == 1) { //сброс пристрастия mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.mysql_real_escape_string($epr['id']).'" LIMIT 1'); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(2,'Сброс пристрастий'); $err = 'Вы заплатили '.$kr.' кр. Все прошло успешно, но вам необходим отдых...'; }else{ @@ -247,7 +247,7 @@ if(isset($tst_trvm['id'])) { $z_na = zact(3); if($z_na[0] == 1) { //сброс статов - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $st['s1'] = 3; $st['s2'] = 3; $st['s3'] = 3; @@ -271,7 +271,7 @@ if(isset($tst_trvm['id'])) { mysql_query('UPDATE `stats` SET `wipe`="0",`stats`="'.$st.'",`ability`="'.$n1.'",`skills`="'.$n2.'",`sskills`="'.$n3.'",`nskills`="'.$n4.'" WHERE `id` = "'.$u->info['id'].'" LIMIT 1'); //$u->info['wipe'] = 2; //$u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(1,'Сброс характеристик'); $err = 'Вы заплатили '.$kr.' кр. Все прошло успешно, но вам необходим отдых...'; }else{ @@ -282,7 +282,7 @@ if(isset($tst_trvm['id'])) { $z_na = zact(1); if($z_na[0] == 1) { //сброс статов - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $st['a1'] = 0; $st['a2'] = 0; $st['a3'] = 0; @@ -304,7 +304,7 @@ if(isset($tst_trvm['id'])) { mysql_query('UPDATE `stats` SET `wipe`="0",`stats`="'.$st.'",`ability`="'.$n1.'",`skills`="'.$n2.'",`sskills`="'.$n3.'",`nskills`="'.$n4.'" WHERE `id` = "'.$u->info['id'].'" LIMIT 1'); //$u->info['wipe'] = 2; //$u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(1,'Сброс умений'); $err = 'Вы заплатили '.$kr.' кр. Все прошло успешно, но вам необходим отдых...'; }else{ @@ -318,7 +318,7 @@ if(isset($tst_trvm['id'])) { //сброс характеристик $u->info['wipe'] = 3; $u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $err = 'Умения покину вас... вам плохо...'; }else{ $err = ''.$z_na[1].''; @@ -330,7 +330,7 @@ if(isset($tst_trvm['id'])) { //сброс особенностей $u->info['wipe'] = 3.5; $u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(1,'Сброс навыков'); $err = 'Особенности покинули вас... вам плохо...'; }else{ @@ -375,7 +375,7 @@ if(isset($tst_trvm['id'])) { //Надо добавить UPDATE в базе свободных статов $u->stats = $u->getStats($u->info['id'],0,1); $u->testItems($u->info['id'],$u->stats,0); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); } } }else{ diff --git a/modules_data/location/berezka.php b/modules_data/location/berezka.php index 0940b550..769815bd 100644 --- a/modules_data/location/berezka.php +++ b/modules_data/location/berezka.php @@ -61,7 +61,7 @@ if($u->room['file']=='berezka') LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`data` NOT LIKE "%|zazuby=%" AND `im`.`price2` > 0 AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/fe/shop_.php b/modules_data/location/fe/shop_.php index 3d5aa219..e1249b13 100644 --- a/modules_data/location/fe/shop_.php +++ b/modules_data/location/fe/shop_.php @@ -105,7 +105,7 @@ if($u->room['file']=='fe/shop_') { $id = (int)$_GET['item']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if(isset($po['nosale'])) { $error = 'Не удалось продать предмет ...'; diff --git a/modules_data/location/flower.php b/modules_data/location/flower.php index be73fbee..6cef7d2a 100644 --- a/modules_data/location/flower.php +++ b/modules_data/location/flower.php @@ -96,7 +96,7 @@ if($u->room['file']=='flower') $itm_data = mysql_fetch_array(mysql_query('SELECT data FROM `items_main_data` WHERE `items_id` = "'.mysql_real_escape_string($itm['id']).'"')); if(isset($itm['id'])) { if($vaza==true && isset($itm_data['data'])){ - $itm_data = $u->lookStats($itm_data['data']); + $itm_data = \Core\ConversionHelper::dataStringToArray($itm_data['data']); $itm_data = array('srok'=>$itm_data['srok']); // Извлекаем только срок! $itm_data['srok'] = (int)$itm_data['srok']; // Только Цифры! if(isset($itm_data['srok']) and $itm_data['srok']>0){ diff --git a/modules_data/location/griboed.php b/modules_data/location/griboed.php index 30efee9d..2447200c 100644 --- a/modules_data/location/griboed.php +++ b/modules_data/location/griboed.php @@ -24,7 +24,7 @@ if(isset($file) && $file[0]=='griboed.php') LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } @@ -96,7 +96,7 @@ if(isset($file) && $file[0]=='griboed.php') } elseif(isset($_GET['sale']) && isset($_GET['item_rep']) && $u->newAct($_GET['sd4']) ) { $id = (int)$_GET['item_rep']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `im`.`pricerep` > 0 AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/hramrep.php b/modules_data/location/hramrep.php index 8e5ff482..f1341960 100644 --- a/modules_data/location/hramrep.php +++ b/modules_data/location/hramrep.php @@ -1,160 +1,188 @@ room['file']=='hramrep') -{ - if(isset($_GET['itm'])) - { - //echo 'dsfgdsgf'; - //$_GET['itm'] = (int)$_GET['r']; - if($_GET['itm']>0) - { - if($_GET['r']!=1) - { - //echo 'dsfgdsgf'; - //Обмен на репутацию - $resz = $u->repobmen($_GET['itm'],1); - echo ''.$resz.''; - unset($resz); - }else{ - //Переплавка рун - - } - } - } - $reps = mysql_fetch_array(mysql_query('SELECT * FROM `rep` WHERE `id` = "'.$u->info['id'].'"')); +if ($u->room['file'] == 'hramrep') { + if (isset($_GET['itm']) && $_GET['itm'] > 0 && $_GET['r'] != 1) { + //Обмен на репутацию + $resz = $u->repobmen($_GET['itm'], 1); + echo '' . $resz . ''; + unset($resz); + } + $reps = mysql_fetch_array(mysql_query('SELECT * FROM `rep` WHERE `id` = "' . $u->info['id'] . '"')); -?> - -
'.$re.''; } ?>
- - - -
Храм Репутации
-
- - - - -
  - - - -
- - - - - - - - -
- - - - -
Большая торговая улица
 
-

-
- - genInv(12,'`iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" and (`im`.`inslot`="3" or `im`.`inslot`="14" or `im`.`type`="31") ORDER BY `lastUPD` DESC'); - if($itmAll[0]==0) - { - $itmAllSee = '
ПУСТО (нет подходящих предметов)
- - '; + } else { + $itmAllSee = $itmAll[2]; + } + //Удачно растворен предмет "Укрепленный Костыль". Получена руна "Моно Бауни". + ?> + +
- info); - ?> - Репутация Capitalcity: -

Предмет не выбран

-
-
-
- Внимание!
- Предметы при обмене необратимо теряются.
- К обмену принимается оружие и щиты, 4ур и выше найденные в подземелиях.
+ ?> + +
' . $re . ''; + } ?>
+ + + + - -
+
Храм Репутации
+
+ + + + + +
  + + + + +
+ + + + + + + + + +
+ + + + + +
Большая + торговая улица
+
 
+
+
+

- - - info['invBlock']==0){ echo $itmAllSee; }else{ echo '
Рюкзак закрыт.
Введите пароль:
'; } ?> -
- -
- -   По всей видимости Алтарь рун был разрушен... Лорд разрушитель не дремлет... - \ No newline at end of file + + genInv( + 12, + '`iu`.`uid`="' . $u->info['id'] . '" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" and (`im`.`inslot`="3" or `im`.`inslot`="14" or `im`.`type`="31") ORDER BY `lastUPD` DESC' + ); + if ($itmAll[0] == 0) { + $itmAllSee = '
ПУСТО (нет подходящих предметов)
+ + + + +
+ info); + ?> + Репутация Capitalcity: +

+
Предмет не выбран

+ +
+
+
+ Внимание!
+ Предметы при обмене необратимо теряются.
+ К обмену принимается оружие и щиты, 4ур и выше найденные в подземелиях.
+
+ + + info['invBlock'] == 0) { + echo $itmAllSee; + } else { + echo '
Рюкзак закрыт.
Введите пароль:
'; + } ?> +
+ +
+ +   По всей видимости Алтарь рун был разрушен... Лорд разрушитель не дремлет... + \ No newline at end of file diff --git a/modules_data/location/nc/shop_.php b/modules_data/location/nc/shop_.php index d9abfa98..d1e9590d 100644 --- a/modules_data/location/nc/shop_.php +++ b/modules_data/location/nc/shop_.php @@ -105,7 +105,7 @@ if($u->room['file']=='nc/shop_') { $id = (int)$_GET['item']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if(isset($po['nosale'])) { $error = 'Не удалось продать предмет ...'; diff --git a/modules_data/location/post.php b/modules_data/location/post.php index d5793890..98c7b6fc 100644 --- a/modules_data/location/post.php +++ b/modules_data/location/post.php @@ -87,7 +87,7 @@ if ($r == 1) { } elseif (isset($itm['id'])) { $itm['id'] = mysql_real_escape_string(round((int)$_POST['itm_post'])); $see1 = 1; - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); $po['toclan1'] = explode('#', $po['toclan']); $po['toclan1'] = $po['toclan1'][0]; diff --git a/modules_data/location/remont.php b/modules_data/location/remont.php index 4344fc29..5e1aab74 100644 --- a/modules_data/location/remont.php +++ b/modules_data/location/remont.php @@ -43,7 +43,7 @@ if($u->room['file']=='remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%modif%" AND `iu`.`data` NOT LIKE "%upgrade=5%" AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['upgrade']).'" LIMIT 1')); if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if($ir['price1']>$ir['1price']) { $ir['1price'] = $ir['price1']; } @@ -135,7 +135,7 @@ if($u->room['file']=='remont') AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['modif']).'" LIMIT 1')); if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if($ir['price1']>$ir['1price']) { $ir['1price'] = $ir['price1']; } @@ -269,7 +269,7 @@ if($u->room['file']=='remont') // Предмет существует. if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); // Тут мы храним характеристики предмета. + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); // Тут мы храним характеристики предмета. if($po['tr_lvl'] > $ir['level']) { $pl['level'] = $po['tr_lvl']; // Если уровень предмета, меньше чем уровень требований с характеристик, то идет обновление уровня предмета. } @@ -307,8 +307,8 @@ if($u->room['file']=='remont') // Обнуляем инфу к стандартным данным - $ir['item_id'] $item_default = mysql_fetch_array(mysql_query('SELECT `data` FROM `items_main_data` WHERE `items_id` = "'.mysql_real_escape_string((int)$ir['item_id']).'" LIMIT 1')); - $item_default = $u->lookStats($item_default['data']); - $upattack = $u->lookStats($upattack['data']); + $item_default = \Core\ConversionHelper::dataStringToArray($item_default['data']); + $upattack = \Core\ConversionHelper::dataStringToArray($upattack['data']); if( $upattack['uptype'] == 22 ) { $po['add_m11'] -= $upattack['upatack']*2; $po['tr_lvl'] = $item_default['tr_lvl']; @@ -393,7 +393,7 @@ if($u->room['file']=='remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%rune_id%" AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['unrune']).'" LIMIT 1')); if(isset($ir['id']) ) { $po = []; - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if($po['tr_lvl'] > $ir['level']) { $ir['level'] = $po['tr_lvl']; } @@ -431,7 +431,7 @@ if($u->room['file']=='remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`data` LIKE "%upatack_id%" AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['ubeff']).'" LIMIT 1')); if(isset($ir['id']) ) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if($po['tr_lvl'] > $ir['level']) { $ir['level'] = $po['tr_lvl']; } @@ -442,7 +442,7 @@ if($u->room['file']=='remont') $pcena = 0; } $iro = mysql_fetch_array(mysql_query('SELECT * FROM `items_main_data` WHERE `items_id` = "'.$po['upatack_id'].'" LIMIT 1')); - $ro = $u->lookStats($iro['data']); + $ro = \Core\ConversionHelper::dataStringToArray($iro['data']); $restat = array(); $i = 0; @@ -489,7 +489,7 @@ if($u->room['file']=='remont') } if($pcena <= $u->info['money']) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); $po['gravi'] = substr($_GET['grav_text'],0, 20); $po['gravic'] = $u->info['city']; $po['gravi'] = str_replace('=','',$po['gravi']); @@ -522,7 +522,7 @@ if($u->room['file']=='remont') } if($pcena <= $u->info['money']) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); $po['gravi'] = substr($_GET['grav_text'],0, 20); $po['gravic'] = $u->info['city']; $po['gravi'] = str_replace('=','',$po['gravi']); @@ -548,7 +548,7 @@ if($u->room['file']=='remont') $ir = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `im`.`inslot` = 5 AND `iu`.`id` = "'.mysql_real_escape_string((int)$_GET['podgon']).'" LIMIT 1')); if(isset($ir['id'])) { $po = array(); - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(!isset($po['podgon'])) { if($po['tr_lvl']>$ir['level']) { $ir['level'] = $po['tr_lvl']; @@ -597,7 +597,7 @@ if($u->room['file']=='remont') if(isset($ir['id'])) { - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(isset($po['noremont'])) { $re2 = 'Предмет не подлежит ремонту в этой мастерской.'; @@ -681,7 +681,7 @@ if($u->room['file']=='remont') if(isset($ir['id'])) { - $po = $u->lookStats($ir['data']); + $po = \Core\ConversionHelper::dataStringToArray($ir['data']); if(isset($po['noremont'])) { $re2 = 'Предмет не подлежит ремонту в этой мастерской.'; diff --git a/modules_data/location/shop2_.php b/modules_data/location/shop2_.php index 41136f6d..c13cba18 100644 --- a/modules_data/location/shop2_.php +++ b/modules_data/location/shop2_.php @@ -31,7 +31,7 @@ if($u->room['file']=='shop2_') { $id = (int)$_GET['item']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/shop_.php b/modules_data/location/shop_.php index 854c9bfe..38ce3898 100644 --- a/modules_data/location/shop_.php +++ b/modules_data/location/shop_.php @@ -97,7 +97,7 @@ if(isset($_POST['itemgift'])) } }else{ $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE (`im`.`type` = "28" OR `im`.`type` = "38" OR `im`.`type` = "63" OR `im`.`type` = "64" OR `im`.`type` = "37") AND `iu`.`id` = "'.mysql_real_escape_string($_POST['itemgift']).'" AND `iu`.`uid` = "'.$u->info['id'].'" AND (`iu`.`gift` = "" OR (`iu`.`data` LIKE "%|zazuby=%" AND `iu`.`gift` = 1)) AND `iu`.`delete` = "0" AND `iu`.`inOdet` = "0" AND `iu`.`inShop` = "0" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if(isset($itm['id']) && $itm['type'] != 37) { $re = '
Дарить подарки возможно только в упаковке!
'; }elseif(!isset($po['item_inbox'])) { @@ -136,7 +136,7 @@ if(isset($_POST['itemgift'])) $giftlogin = 'клана '.$cln['name'].''; } } - $items = $u->lookStats($itm['data']); + $items = \Core\ConversionHelper::dataStringToArray($itm['data']); $iteminc = mysql_fetch_array(mysql_query('SELECT * FROM `items_users` WHERE `id` = "'.intval($items['item_inbox']).'" LIMIT 1')); @@ -202,7 +202,7 @@ if(isset($_GET['buy'])){ LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } @@ -274,7 +274,7 @@ if(isset($_GET['buy'])){ } elseif(isset($_GET['sale']) && isset($_GET['item_rep']) && $u->newAct($_GET['sd4']) ) { $id = (int)$_GET['item_rep']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `im`.`pricerep` > 0 AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/shop_kat.php b/modules_data/location/shop_kat.php index 7931b5f5..7734f524 100644 --- a/modules_data/location/shop_kat.php +++ b/modules_data/location/shop_kat.php @@ -24,7 +24,7 @@ if(isset($file) && $file[0]=='shop_kat.php') LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } @@ -96,7 +96,7 @@ if(isset($file) && $file[0]=='shop_kat.php') } elseif(isset($_GET['sale']) && isset($_GET['item_rep']) && $u->newAct($_GET['sd4']) ) { $id = (int)$_GET['item_rep']; $itm = mysql_fetch_array(mysql_query('SELECT `im`.*,`iu`.* FROM `items_users` AS `iu` LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) WHERE `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `im`.`pricerep` > 0 AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/shop_priz.php b/modules_data/location/shop_priz.php index 1b5e28e9..4bdb1b0c 100644 --- a/modules_data/location/shop_priz.php +++ b/modules_data/location/shop_priz.php @@ -26,7 +26,7 @@ if($u->room['file']=='shop_priz') LEFT JOIN `items_main` AS `im` ON (`im`.`id` = `iu`.`item_id`) LEFT JOIN `items_users` as `iuu` ON (`iuu`.inGroup = `iu`.inGroup AND `iuu`.item_id = `im`.id ) WHERE `iuu`.`uid`="'.$u->info['id'].'" AND `iu`.`uid`="'.$u->info['id'].'" AND `iu`.`delete`="0" AND `iu`.`inOdet`="0" AND `iu`.`inShop`="0" AND `iu`.`id` = "'.mysql_real_escape_string($id).'" LIMIT 1')); - $po = $u->lookStats($itm['data']); + $po = \Core\ConversionHelper::dataStringToArray($itm['data']); if($u->info['allLock'] > time()) { $po['nosale'] = 1; } diff --git a/modules_data/location/znahar.php b/modules_data/location/znahar.php index b390d05d..f5a45516 100644 --- a/modules_data/location/znahar.php +++ b/modules_data/location/znahar.php @@ -207,7 +207,7 @@ function zact($i,$x = 1) { } #------------------Запросы и прочее -$st = $u->lookStats($u->info['stats']); +$st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $vinos = array( /* level,summvinos*/ "0" => 3, @@ -250,7 +250,7 @@ if(isset($tst_trvm['id'])) { if($z_na[0] == 1) { //сброс пристрастия mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.mysql_real_escape_string($epr['id']).'" LIMIT 1'); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(2,'Сброс пристрастий'); $err = 'Вы заплатили '.$kr.' кр. Все прошло успешно, но вам необходим отдых...'; }else{ @@ -264,7 +264,7 @@ if(isset($tst_trvm['id'])) { $z_na = zact(3); if($z_na[0] == 1) { //сброс статов - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $st['s1'] = 3; $st['s2'] = 3; $st['s3'] = 3; @@ -288,7 +288,7 @@ if(isset($tst_trvm['id'])) { mysql_query('UPDATE `stats` SET `wipe`="0",`stats`="'.$st.'",`ability`="'.$n1.'",`skills`="'.$n2.'",`sskills`="'.$n3.'",`nskills`="'.$n4.'" WHERE `id` = "'.$u->info['id'].'" LIMIT 1'); //$u->info['wipe'] = 2; //$u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(1,'Сброс характеристик'); $err = 'Вы заплатили '.$kr.' кр. Все прошло успешно, но вам необходим отдых...'; }else{ @@ -299,7 +299,7 @@ if(isset($tst_trvm['id'])) { $z_na = zact(1); if($z_na[0] == 1) { //сброс статов - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $st['a1'] = 0; $st['a2'] = 0; $st['a3'] = 0; @@ -321,7 +321,7 @@ if(isset($tst_trvm['id'])) { mysql_query('UPDATE `stats` SET `wipe`="0",`stats`="'.$st.'",`ability`="'.$n1.'",`skills`="'.$n2.'",`sskills`="'.$n3.'",`nskills`="'.$n4.'" WHERE `id` = "'.$u->info['id'].'" LIMIT 1'); //$u->info['wipe'] = 2; //$u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(1,'Сброс умений'); $err = 'Вы заплатили '.$kr.' кр. Все прошло успешно, но вам необходим отдых...'; }else{ @@ -335,7 +335,7 @@ if(isset($tst_trvm['id'])) { //сброс характеристик $u->info['wipe'] = 3; $u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $err = 'Умения покину вас... вам плохо...'; }else{ $err = ''.$z_na[1].''; @@ -347,7 +347,7 @@ if(isset($tst_trvm['id'])) { //сброс особенностей $u->info['wipe'] = 3.5; $u->wipe(); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); add_narkoz(1,'Сброс навыков'); $err = 'Особенности покинули вас... вам плохо...'; }else{ @@ -393,7 +393,7 @@ if(isset($tst_trvm['id'])) { //Надо добавить UPDATE в базе свободных статов $u->stats = $u->getStats($u->info['id'],0,1); $u->testItems($u->info['id'],$u->stats,0); - $st = $u->lookStats($u->info['stats']); + $st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); } } }else{ diff --git a/modules_data/location/znahar1.php b/modules_data/location/znahar1.php index 675419fa..adb18139 100644 --- a/modules_data/location/znahar1.php +++ b/modules_data/location/znahar1.php @@ -29,7 +29,7 @@ function ghideshow() { top.fullhideshow(mmoves3); } lookStats($u->info['stats']); +$st = \Core\ConversionHelper::dataStringToArray($u->info['stats']); $vinos = array( /* level,summvinos*/ "0" => 3, diff --git a/transfer.php b/transfer.php index a37ae58c..282ef319 100644 --- a/transfer.php +++ b/transfer.php @@ -1,4 +1,7 @@ lookStats($pl['data']); + $po = ConversionHelper::dataStringToArray($pl['data']); $i_s = ''; if (isset($po['frompisher']) && $po['frompisher'] > 0) { $i_s = '[Предмет из подземелья]'; @@ -228,7 +231,7 @@ if ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') { ) ); if (isset($itm['id'])) { - $po = $u->lookStats($itm['data']); + $po = ConversionHelper::dataStringToArray($itm['data']); if (isset($po['sudba']) && $po['sudba'] != '0') { $g = 0; }