diff --git a/_incl_data/class/Chat.php b/_incl_data/class/Chat.php index 7ec2abfd..4e203a50 100644 --- a/_incl_data/class/Chat.php +++ b/_incl_data/class/Chat.php @@ -106,7 +106,7 @@ class Chat public static function setCurrentTimeById(int $messageId): void { - Db::sql('update chat set time = unix_timestamp() where id = ?)', [$messageId]); + Db::sql('update chat set time = unix_timestamp() where id = ?', [$messageId]); } public static function setCurrentTimeAndIdById(int $messageId, int $newMessageId): void diff --git a/_incl_data/class/Dungeon.php b/_incl_data/class/Dungeon.php index 5d8c12db..7fb2b9d5 100644 --- a/_incl_data/class/Dungeon.php +++ b/_incl_data/class/Dungeon.php @@ -68,6 +68,7 @@ class Dungeon isset($_GET['take_obj']) => $this->takeit((int)$_GET['take_obj']), isset($_GET['look']) => $this->look((int)$_GET['look'], $user), isset($_GET['go']) => $this->testGo((int)$_GET['go']), // перемещение + default => null, }; /* генерируем вид персонажа (только карта) */ @@ -1274,7 +1275,7 @@ class Dungeon //Розыгрыш предмета - private function testGo($id) + private function testGo($id): void { match ($id) { 1 => $go = $this->sg[$this->gs][1], // up diff --git a/_incl_data/class/Helper/Conversion.php b/_incl_data/class/Helper/Conversion.php index 709e91e5..bfa52516 100644 --- a/_incl_data/class/Helper/Conversion.php +++ b/_incl_data/class/Helper/Conversion.php @@ -7,11 +7,14 @@ use DateTime; class Conversion { /** Превращает строку data ('a=1|b=2|c=3') из БД в массив [a=>1, b=>2, c=>3]. - * @param string $dataString + * @param string|null $dataString * @return array */ - public static function dataStringToArray(string $dataString): array + public static function dataStringToArray(?string $dataString): array { + if (empty($dataString)) { + return []; + } $dataString = str_replace('||', '|', $dataString); // любители забивать руками параметры и задваивать разделители. if (mb_substr($dataString, -1) === '|') { diff --git a/_incl_data/class/LocationResponse.php b/_incl_data/class/LocationResponse.php new file mode 100644 index 00000000..8c308694 --- /dev/null +++ b/_incl_data/class/LocationResponse.php @@ -0,0 +1,191 @@ + 'Ваше местоположение', + 'move-bk' => 'Проход через Бойцовский клуб', + 'move-zalu4' => 'Проход через Зал паладинов', + 'move-map_halls' => 'Проход через Залы', + 'move-to-sek4' => 'Проход через Рыцарский или Торговый зал', + 'move-sek5' => 'Проход через Торговый зал', + 'move-sek6' => 'Проход через Рыцарский зал', + ]; + + private static function thisInfRm($id): array + { + $rm = Db::getRow('select id, name from room where code = ?', [$id]); + + if (isset($rm['id'])) { + $rown = Db::getValue('select count(*) from users where online > unix_timestamp() - 120 and room = ?', [$rm['id']]); + return [$id, $rm['name'], $rown]; + } + return ['false', 'Здание было разрушено', 0]; + } + + public static function init( + int $tmGo, + int $tmGol, + $roomFile, + $roomName, + ): string { + $r = match ($roomFile) { + 'bk' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig', + 'left' => '241', + 'top' => '128', + ], + 'goto' => [ + ['id' => 'map_bk', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_klub1', 'params' => self::thisInfRm('1.180.0.15')], + ['id' => 'map_klub2', 'params' => self::thisInfRm('1.180.0.225')], + ['id' => 'map_klub3', 'params' => self::thisInfRm('1.180.0.2')], + ['id' => 'map_klub4', 'params' => self::thisInfRm('1.180.0.4')], + ['id' => 'map_klub5', 'params' => self::thisInfRm('1.180.0.5')], + ['id' => 'map_klub6', 'params' => self::thisInfRm('1.180.0.16')], + ['id' => 'map_klub7', 'params' => self::thisInfRm('1.180.0.9')], + ], + 'buttons' => [ + ['Возврат', 'main.php?homeworld=true'], + ['Карта клуба', 'main.php?clubmap=true'], + ['Форум', "window.open('" . Config::get('forum') . "', 'forum', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')"], + ['Подсказка', "window.open('/encicl/help/top1.html', 'help', 'height=300,width=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes')"], + ], + ], + 'zv1' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig', + 'left' => '154', + 'top' => '148', + ], + 'goto' => [ + ['id' => 'map_bk', 'params' => self::thisInfRm('1.180.0.3')], + ['id' => 'map_klub1', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub2', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub3', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub4', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_klub5', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub6', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub7', 'params' => [false, self::MSG['move-bk']]], + ], + ], + 'zv2' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig', + 'left' => '395', + 'top' => '142', + ], + 'goto' => [ + ['id' => 'map_bk', 'params' => self::thisInfRm('1.180.0.3')], + ['id' => 'map_klub1', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub2', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub3', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_klub4', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub5', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub6', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub7', 'params' => [false, self::MSG['move-bk']]], + ], + ], + 'zv3' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig', + 'left' => '337', + 'top' => '79', + ], + 'goto' => [ + ['id' => 'map_bk', 'params' => self::thisInfRm('1.180.0.3')], + ['id' => 'map_klub1', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub2', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub3', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub4', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub5', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_klub6', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub7', 'params' => [false, self::MSG['move-bk']]], + ], + ], + 'zv4' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig', + 'left' => '139', + 'top' => '79', + ], + 'goto' => [ + ['id' => 'map_bk', 'params' => self::thisInfRm('1.180.0.3')], + ['id' => 'map_klub1', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub2', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub3', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub4', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub5', 'params' => [false, self::MSG['move-bk']]], + ['id' => 'map_klub6', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_klub7', 'params' => [false, self::MSG['move-bk']]], + ], + ], + 'zalu' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig1', + 'left' => '337', + 'top' => '117', + ], + 'goto' => [ + ['id' => 'map_halls', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_zalu3', 'params' => [false, self::MSG['move-zalu4']]], + ['id' => 'map_zalu4', 'params' => self::thisInfRm('1.180.0.16')], + ['id' => 'map_zalu6', 'params' => [false, self::MSG['move-zalu4']]], + ['id' => 'map_zalu7', 'params' => self::thisInfRm('1.180.0.3')], + + ], + ], + 'zalu_pal' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig1', + 'left' => '163', + 'top' => '28', + ], + 'goto' => [ + ['id' => 'map_halls', 'params' => self::thisInfRm('1.180.0.15')], + ['id' => 'map_zalu3', 'params' => self::thisInfRm('1.180.0.xx')], + ['id' => 'map_zalu4', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_zalu6', 'params' => self::thisInfRm('1.180.0.0')], + ['id' => 'map_zalu7', 'params' => [false, self::MSG['move-map_halls']]], + ], + ], + 'bk2' => [ + 'status' => 'success', + 'location' => [ + 'bg' => 'navig3', + 'left' => '162', + 'top' => '125', + ], + 'goto' => [ + ['id' => 'map_2stair', 'params' => [false, self::MSG['your-position']]], + ['id' => 'map_sec1', 'params' => self::thisInfRm('1.180.0.3')], + ['id' => 'map_sec2', 'params' => self::thisInfRm('1.180.0.xx')], + ['id' => 'map_sec3', 'params' => [false, self::MSG['move-sek5']]], + ['id' => 'map_sec4', 'params' => [false, self::MSG['move-to-sek4']]], + ['id' => 'map_sec5', 'params' => self::thisInfRm('1.180.0.221')], + ['id' => 'map_sec6', 'params' => self::thisInfRm('1.180.0.224')], + ['id' => 'map_sec7', 'params' => [false, self::MSG['move-sek6']]], + ], + ], + default => [], + }; + if (!empty($r)) { + $r['location']['name'] = $roomName; + $r['location']['tgo'] = $tmGo * 10; + $r['location']['tgo1'] = $tmGol * 10; + } + $r = json_encode($r); + return $r ?: ''; + } +} \ No newline at end of file diff --git a/_incl_data/class/Model/ActionModel.php b/_incl_data/class/Model/ActionModel.php index 461b9630..970079bb 100644 --- a/_incl_data/class/Model/ActionModel.php +++ b/_incl_data/class/Model/ActionModel.php @@ -65,6 +65,10 @@ class ActionModel Db::sql('delete from actions where uid = ? and vals = ?', [$this->uid, $vals]); } + public static function deleteById(int $id): void + { + Db::sql('delete from actions where id = ?', [$id]); + } /*protected function testAction($filter, $tp): array { diff --git a/_incl_data/class/User.php b/_incl_data/class/User.php index 77424a97..860ceca7 100644 --- a/_incl_data/class/User.php +++ b/_incl_data/class/User.php @@ -5132,7 +5132,7 @@ class User $snIt = 0; //Проверяем одетые вещи и вещи с сроком годности - $cl = Db::getRow("select + $itm = Db::getRow("select items_main.id, items_users.id as iduid, data, @@ -5164,86 +5164,104 @@ class User ) and uid = ?", [$u['id']]); - foreach ($cl as $itm) { - $po = Conversion::dataStringToArray($itm['data']); - $po['lvl'] = $u['level']; - //проверяем требования + $t = $this->items['tr']; $x = 0; $notr = 0; - $j = 1; - while ($j <= 4) { - if (!isset($po['tr_s' . $j]) && $itm['type'] != 26) { - $po['tr_s' . $j] = 0; - } - $j++; - } - while ($x < count($t)) { - $n = $t[$x]; - if (isset($po['tr_' . $n]) && $n == 'sex') { - if ($po['tr_' . $n] != $this->info['sex']) { - $notr++; - } - } elseif (isset($po['tr_' . $n])) { - if ($po['tr_' . $n] > $this->stats[$n] && $n != 'align' && $n != 'align_bs') { - $notr++; - } - } - $x++; - } - if ($this->info['twink'] > 0) { - //Не дороже 100 екр. - if ($itm['price2'] > 1 || $itm['2price'] > 1) { - $notr++; - } - //Нельзя руны + чарки - if (isset($po['rune']) && $po['rune'] > 0) { - $notr++; - } - if (isset($po['spell_id']) && $po['spell_id'] > 0) { - $notr++; - } - } - if (isset($po['sudba']) && $po['sudba'] == 1) { - $po['sudba'] = $u['login']; - Db::sql('update items_users set data = ? where id = ? and uid = ?', [Conversion::arrayToDataString($po), $itm['iduid'], $u['id']]); - } - if (isset($po['srok']) && $po['srok'] > 0) { - $itm['srok'] = $po['srok']; - } - if (isset($po['vip_sale']) && $sn['silver'] < 2 && ($itm['time_create'] - time()) < 0) { - if ($itm['item_id'] == 4704) { - $po['musor2'] = 4708; + if (empty($itm['data'])) { + if ($this->info['twink'] > 0) { + //Не дороже 100 екр. + if ($itm['price2'] > 1 || $itm['2price'] > 1) { + $notr++; + } } - ItemsModel::itemDecay($itm['id'], $itm['overType'], $u['id'], (int)$po['musor2'], $itm['type'], $itm['name']); - $notr++; - } - if ($itm['iznosNOW'] >= ceil($itm['iznosMAX']) && $itm['iznosMAXi'] != 999999999) { - $notr++; - } - if ($notr > 0 && $itm['inOdet'] != 0) { - //снимаем предмет - $this->snatItem($itm['id'], $u['id']); - $snIt++; - } - //проверяем срок годности - if ($itm['iznosNOW'] >= ceil($itm['iznosMAX']) && $itm['iznosMAXi'] != 999999999 && isset($po['musor']) && $po['musor'] > 0) { - //предмет сломался - $this->itemDestroy($itm['id'], $u['id'], (int)$po['musor']); - } - if ($itm['time_create'] + $itm['srok'] <= time() && $itm['srok'] > 0 && $itm['time_sleep'] == 0) { - if ($itm['inOdet'] != 0) { + if ($itm['iznosNOW'] >= ceil($itm['iznosMAX']) && $itm['iznosMAXi'] != 999999999) { + $notr++; + } + if ($notr > 0 && $itm['inOdet'] != 0) { + //снимаем предмет $this->snatItem($itm['id'], $u['id']); $snIt++; } - //удаляем предмет - if ($itm['item_id'] == 4704) { - $po['musor2'] = 4708; + } else { + + $po = Conversion::dataStringToArray($itm['data']); + $po['lvl'] = $u['level']; + //проверяем требования + $j = 1; + while ($j <= 4) { + if (!isset($po['tr_s' . $j]) && $itm['type'] != 26) { + $po['tr_s' . $j] = 0; + } + $j++; + } + while ($x < count($t)) { + $n = $t[$x]; + if (isset($po['tr_' . $n]) && $n == 'sex') { + if ($po['tr_' . $n] != $this->info['sex']) { + $notr++; + } + } elseif (isset($po['tr_' . $n])) { + if ($po['tr_' . $n] > $this->stats[$n] && $n != 'align' && $n != 'align_bs') { + $notr++; + } + } + $x++; + } + if ($this->info['twink'] > 0) { + //Не дороже 100 екр. + if ($itm['price2'] > 1 || $itm['2price'] > 1) { + $notr++; + } + //Нельзя руны + чарки + if (isset($po['rune']) && $po['rune'] > 0) { + $notr++; + } + if (isset($po['spell_id']) && $po['spell_id'] > 0) { + $notr++; + } + } + if (isset($po['sudba']) && $po['sudba'] == 1) { + $po['sudba'] = $u['login']; + Db::sql('update items_users set data = ? where id = ? and uid = ?', [Conversion::arrayToDataString($po), $itm['iduid'], $u['id']]); + } + + if (isset($po['srok']) && $po['srok'] > 0) { + $itm['srok'] = $po['srok']; + } + if (isset($po['vip_sale']) && $sn['silver'] < 2 && ($itm['time_create'] - time()) < 0) { + if ($itm['item_id'] == 4704) { + $po['musor2'] = 4708; + } + ItemsModel::itemDecay($itm['id'], $itm['overType'], $u['id'], (int)$po['musor2'], $itm['type'], $itm['name']); + $notr++; + } + if ($itm['iznosNOW'] >= ceil($itm['iznosMAX']) && $itm['iznosMAXi'] != 999999999) { + $notr++; + } + if ($notr > 0 && $itm['inOdet'] != 0) { + //снимаем предмет + $this->snatItem($itm['id'], $u['id']); + $snIt++; + } + //проверяем срок годности + if ($itm['iznosNOW'] >= ceil($itm['iznosMAX']) && $itm['iznosMAXi'] != 999999999 && isset($po['musor']) && $po['musor'] > 0) { + //предмет сломался + $this->itemDestroy($itm['id'], $u['id'], (int)$po['musor']); + } + if ($itm['time_create'] + $itm['srok'] <= time() && $itm['srok'] > 0 && $itm['time_sleep'] == 0) { + if ($itm['inOdet'] != 0) { + $this->snatItem($itm['id'], $u['id']); + $snIt++; + } + //удаляем предмет + if ($itm['item_id'] == 4704) { + $po['musor2'] = 4708; + } + ItemsModel::itemDecay($itm['id'], $itm['overType'], $u['id'], (int)$po['musor2'], $itm['type'], $itm['name']); } - ItemsModel::itemDecay($itm['id'], $itm['overType'], $u['id'], (int)$po['musor2'], $itm['type'], $itm['name']); } - } if ($snIt > 0) { $this->testItems($uid, $sn, 1); } elseif ($dt == 0) { diff --git a/_incl_data/class/User/Effects.php b/_incl_data/class/User/Effects.php index 022cb8d7..7f07947f 100644 --- a/_incl_data/class/User/Effects.php +++ b/_incl_data/class/User/Effects.php @@ -118,9 +118,9 @@ insert into eff_users return true; } - public static function removeByEffectId(int $userId, int $overType): void + public static function removeByEffectId(int $userId, int $effectId): void { - Db::sql('delete from eff_users where id_eff = ? and uid = ?', [$overType, $userId]); + Db::sql('delete from eff_users where id_eff = ? and uid = ?', [$effectId, $userId]); } public static function removeByOverType(int $userId, int $overType): void diff --git a/_incl_data/class/User/InfoBox.php b/_incl_data/class/User/InfoBox.php index d48bb5fd..777c7198 100644 --- a/_incl_data/class/User/InfoBox.php +++ b/_incl_data/class/User/InfoBox.php @@ -28,9 +28,7 @@ class InfoBox { global $code; - $st = false; $rt = []; - $type_info = 1; if ($uid != $this->info['id']) { $u = User::getInfo($uid); @@ -65,10 +63,6 @@ class InfoBox if (isset($u['id'], $u['stats'])) { $rt = [0 => '', 1 => []]; - $st = []; - $st['id'] = $u['id']; - $st['login'] = $u['login']; - $st['lvl'] = $u['level']; //Характеристики от предметов и их изображение $witm = []; @@ -332,7 +326,6 @@ class InfoBox $oi = ''; if ($i1 != 1) { - $jf = 'main'; $oi = 'onMouseOver="top.hi(this,\'' . $u['login'] . ' (Перейти в "Инвентарь")\',event,3,1,1,1,\'\');" onMouseOut="top.hic();" onMouseDown="top.hic();"'; $msl = ' diff --git a/_incl_data/class/priem/1.php b/_incl_data/class/priem/1.php index d27eea5a..f8229829 100644 --- a/_incl_data/class/priem/1.php +++ b/_incl_data/class/priem/1.php @@ -35,13 +35,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -66,13 +66,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/10.php b/_incl_data/class/priem/10.php index edc8a374..62912862 100644 --- a/_incl_data/class/priem/10.php +++ b/_incl_data/class/priem/10.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/11.php b/_incl_data/class/priem/11.php index 29bd8baa..0f558d6e 100644 --- a/_incl_data/class/priem/11.php +++ b/_incl_data/class/priem/11.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/121.php b/_incl_data/class/priem/121.php index 650f1b47..c544ca19 100644 --- a/_incl_data/class/priem/121.php +++ b/_incl_data/class/priem/121.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/122.php b/_incl_data/class/priem/122.php index cb29fba0..696c68f5 100644 --- a/_incl_data/class/priem/122.php +++ b/_incl_data/class/priem/122.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/123.php b/_incl_data/class/priem/123.php index ebf80ae9..b6e619a9 100644 --- a/_incl_data/class/priem/123.php +++ b/_incl_data/class/priem/123.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/124.php b/_incl_data/class/priem/124.php index cea48064..cc6d03ed 100644 --- a/_incl_data/class/priem/124.php +++ b/_incl_data/class/priem/124.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/125.php b/_incl_data/class/priem/125.php index 02347cc4..e844d3f5 100644 --- a/_incl_data/class/priem/125.php +++ b/_incl_data/class/priem/125.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/138.php b/_incl_data/class/priem/138.php index 46f6fcfb..cfe7f4a4 100644 --- a/_incl_data/class/priem/138.php +++ b/_incl_data/class/priem/138.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/140.php b/_incl_data/class/priem/140.php index 9bc01b4c..8f38804e 100644 --- a/_incl_data/class/priem/140.php +++ b/_incl_data/class/priem/140.php @@ -35,13 +35,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -66,13 +66,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/142.php b/_incl_data/class/priem/142.php index db03ecfc..3273df62 100644 --- a/_incl_data/class/priem/142.php +++ b/_incl_data/class/priem/142.php @@ -38,13 +38,13 @@ if (isset($pr_momental_this)) { if ($uid == $uid2) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid1) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if (isset($at['p'][$a]['priems']['kill'][$uid][$j_id])) { mysql_query('UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `id` = "' . $btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3] . '" AND `uid` = "' . $uid . '" LIMIT 1'); @@ -68,13 +68,13 @@ if (isset($pr_momental_this)) { // if ($uid == $uid2) { // $a = 1; // $b = 2; -// $u1 = ${'uid1'}; -// $u2 = ${'uid2'}; +// $u1 = $uid1; +// $u2 = $uid2; // } elseif ($uid == $uid1) { // $a = 2; // $b = 1; -// $u1 = ${'uid2'}; -// $u2 = ${'uid1'}; +// $u1 = $uid2; +// $u2 = $uid1; // } // if ($a > 0) { // $j = 0; diff --git a/_incl_data/class/priem/144.php b/_incl_data/class/priem/144.php index 8891e2b7..40f0fc83 100644 --- a/_incl_data/class/priem/144.php +++ b/_incl_data/class/priem/144.php @@ -38,13 +38,13 @@ if (isset($pr_momental_this)) { if ($uid == $uid2) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid1) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if (isset($at['p'][$a]['priems']['kill'][$uid][$j_id])) { mysql_query('UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `id` = "' . $btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3] . '" AND `uid` = "' . $uid . '" LIMIT 1'); @@ -68,13 +68,13 @@ if (isset($pr_momental_this)) { // if ($uid == $uid2) { // $a = 1; // $b = 2; -// $u1 = ${'uid1'}; -// $u2 = ${'uid2'}; +// $u1 = $uid1; +// $u2 = $uid2; // } elseif ($uid == $uid1) { // $a = 2; // $b = 1; -// $u1 = ${'uid2'}; -// $u2 = ${'uid1'}; +// $u1 = $uid2; +// $u2 = $uid1; // } // if ($a > 0) { // $j = 0; diff --git a/_incl_data/class/priem/145.php b/_incl_data/class/priem/145.php index 697851f9..1085b7b8 100644 --- a/_incl_data/class/priem/145.php +++ b/_incl_data/class/priem/145.php @@ -38,13 +38,13 @@ if (isset($pr_momental_this)) { if ($uid == $uid2) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid1) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if (isset($at['p'][$a]['priems']['kill'][$uid][$j_id])) { mysql_query('UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `id` = "' . $btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3] . '" AND `uid` = "' . $uid . '" LIMIT 1'); @@ -68,13 +68,13 @@ if (isset($pr_momental_this)) { // if ($uid == $uid2) { // $a = 1; // $b = 2; -// $u1 = ${'uid1'}; -// $u2 = ${'uid2'}; +// $u1 = $uid1; +// $u2 = $uid2; // } elseif ($uid == $uid1) { // $a = 2; // $b = 1; -// $u1 = ${'uid2'}; -// $u2 = ${'uid1'}; +// $u1 = $uid2; +// $u2 = $uid1; // } // if ($a > 0) { // $j = 0; diff --git a/_incl_data/class/priem/146.php b/_incl_data/class/priem/146.php index 40c7e846..33c1a414 100644 --- a/_incl_data/class/priem/146.php +++ b/_incl_data/class/priem/146.php @@ -38,13 +38,13 @@ if (isset($pr_momental_this)) { if ($uid == $uid2) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid1) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if (isset($at['p'][$a]['priems']['kill'][$uid][$j_id])) { mysql_query('UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `id` = "' . $btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3] . '" AND `uid` = "' . $uid . '" LIMIT 1'); @@ -68,13 +68,13 @@ if (isset($pr_momental_this)) { // if ($uid == $uid2) { // $a = 1; // $b = 2; -// $u1 = ${'uid1'}; -// $u2 = ${'uid2'}; +// $u1 = $uid1; +// $u2 = $uid2; // } elseif ($uid == $uid1) { // $a = 2; // $b = 1; -// $u1 = ${'uid2'}; -// $u2 = ${'uid1'}; +// $u1 = $uid2; +// $u2 = $uid1; // } // if ($a > 0) { // $j = 0; diff --git a/_incl_data/class/priem/147.php b/_incl_data/class/priem/147.php index 1c3e270e..ba84a861 100644 --- a/_incl_data/class/priem/147.php +++ b/_incl_data/class/priem/147.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -67,13 +67,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/148.php b/_incl_data/class/priem/148.php index 0856bd59..6999cde3 100644 --- a/_incl_data/class/priem/148.php +++ b/_incl_data/class/priem/148.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -67,13 +67,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/149.php b/_incl_data/class/priem/149.php index 9f1c9f7e..ff4b0d0a 100644 --- a/_incl_data/class/priem/149.php +++ b/_incl_data/class/priem/149.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -67,13 +67,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/150.php b/_incl_data/class/priem/150.php index e8ad457c..a14aa67d 100644 --- a/_incl_data/class/priem/150.php +++ b/_incl_data/class/priem/150.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -67,13 +67,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/175.php b/_incl_data/class/priem/175.php index f1bc1ea4..0219765d 100644 --- a/_incl_data/class/priem/175.php +++ b/_incl_data/class/priem/175.php @@ -40,13 +40,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/176.php b/_incl_data/class/priem/176.php index fba84eb5..319e8122 100644 --- a/_incl_data/class/priem/176.php +++ b/_incl_data/class/priem/176.php @@ -40,13 +40,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/177.php b/_incl_data/class/priem/177.php index f5743a84..a7877a28 100644 --- a/_incl_data/class/priem/177.php +++ b/_incl_data/class/priem/177.php @@ -40,13 +40,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/178.php b/_incl_data/class/priem/178.php index 242d449d..2823047d 100644 --- a/_incl_data/class/priem/178.php +++ b/_incl_data/class/priem/178.php @@ -40,13 +40,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/179.php b/_incl_data/class/priem/179.php index 962e69a6..4e8fbc4e 100644 --- a/_incl_data/class/priem/179.php +++ b/_incl_data/class/priem/179.php @@ -41,13 +41,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -71,13 +71,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/193.php b/_incl_data/class/priem/193.php index d9662e5b..f988de82 100644 --- a/_incl_data/class/priem/193.php +++ b/_incl_data/class/priem/193.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -51,13 +51,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/2.php b/_incl_data/class/priem/2.php index 49e87138..b7fa2b50 100644 --- a/_incl_data/class/priem/2.php +++ b/_incl_data/class/priem/2.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/204.php b/_incl_data/class/priem/204.php index 380e6b42..e98113ad 100644 --- a/_incl_data/class/priem/204.php +++ b/_incl_data/class/priem/204.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/206.php b/_incl_data/class/priem/206.php index a617562a..2bbfb653 100644 --- a/_incl_data/class/priem/206.php +++ b/_incl_data/class/priem/206.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/207.php b/_incl_data/class/priem/207.php index 052b8dd5..f38dec71 100644 --- a/_incl_data/class/priem/207.php +++ b/_incl_data/class/priem/207.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/208.php b/_incl_data/class/priem/208.php index 94c3b44e..a77c56f2 100644 --- a/_incl_data/class/priem/208.php +++ b/_incl_data/class/priem/208.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/209.php b/_incl_data/class/priem/209.php index 92b918d7..2641b112 100644 --- a/_incl_data/class/priem/209.php +++ b/_incl_data/class/priem/209.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/21.php b/_incl_data/class/priem/21.php index a205dc2d..33ad32a3 100644 --- a/_incl_data/class/priem/21.php +++ b/_incl_data/class/priem/21.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/210.php b/_incl_data/class/priem/210.php index dc3765d6..2555a039 100644 --- a/_incl_data/class/priem/210.php +++ b/_incl_data/class/priem/210.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/211.php b/_incl_data/class/priem/211.php index 22889756..98aef726 100644 --- a/_incl_data/class/priem/211.php +++ b/_incl_data/class/priem/211.php @@ -61,13 +61,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -91,13 +91,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/213.php b/_incl_data/class/priem/213.php index 752446dc..9f48bd94 100644 --- a/_incl_data/class/priem/213.php +++ b/_incl_data/class/priem/213.php @@ -31,13 +31,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -62,13 +62,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/215.php b/_incl_data/class/priem/215.php index 0570302a..ef5c8cba 100644 --- a/_incl_data/class/priem/215.php +++ b/_incl_data/class/priem/215.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/216.php b/_incl_data/class/priem/216.php index 85bc8755..ab7d160a 100644 --- a/_incl_data/class/priem/216.php +++ b/_incl_data/class/priem/216.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/217.php b/_incl_data/class/priem/217.php index fc1e165b..e3230c31 100644 --- a/_incl_data/class/priem/217.php +++ b/_incl_data/class/priem/217.php @@ -21,13 +21,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -51,13 +51,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/219.php b/_incl_data/class/priem/219.php index ac492644..52b55c14 100644 --- a/_incl_data/class/priem/219.php +++ b/_incl_data/class/priem/219.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/22.php b/_incl_data/class/priem/22.php index bd8e8b5f..02500d69 100644 --- a/_incl_data/class/priem/22.php +++ b/_incl_data/class/priem/22.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/220.php b/_incl_data/class/priem/220.php index 3c306788..7dcd4177 100644 --- a/_incl_data/class/priem/220.php +++ b/_incl_data/class/priem/220.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/222.php b/_incl_data/class/priem/222.php index e1c645c8..26d9f9d6 100644 --- a/_incl_data/class/priem/222.php +++ b/_incl_data/class/priem/222.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/225.php b/_incl_data/class/priem/225.php index 6b19efb5..0ce44696 100644 --- a/_incl_data/class/priem/225.php +++ b/_incl_data/class/priem/225.php @@ -39,13 +39,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); diff --git a/_incl_data/class/priem/226.php b/_incl_data/class/priem/226.php index 97ada6e6..7270451c 100644 --- a/_incl_data/class/priem/226.php +++ b/_incl_data/class/priem/226.php @@ -59,13 +59,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -89,13 +89,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/23.php b/_incl_data/class/priem/23.php index 019e401f..c0ec3cff 100644 --- a/_incl_data/class/priem/23.php +++ b/_incl_data/class/priem/23.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/231.php b/_incl_data/class/priem/231.php index c1d42d99..b9d5db2a 100644 --- a/_incl_data/class/priem/231.php +++ b/_incl_data/class/priem/231.php @@ -21,13 +21,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/234.php b/_incl_data/class/priem/234.php index 8cb54806..5b28f863 100644 --- a/_incl_data/class/priem/234.php +++ b/_incl_data/class/priem/234.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -67,13 +67,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/235.php b/_incl_data/class/priem/235.php index b2ebb7c9..c712d064 100644 --- a/_incl_data/class/priem/235.php +++ b/_incl_data/class/priem/235.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } $pvr['x5'] = mysql_fetch_array(mysql_query('SELECT `id`,`x`,`hod` FROM `eff_users` WHERE `uid` = "'.$u2.'" AND `v2` = 191 AND `delete` = 0 LIMIT 1')); diff --git a/_incl_data/class/priem/237.php b/_incl_data/class/priem/237.php index 286eb122..fb4bbd97 100644 --- a/_incl_data/class/priem/237.php +++ b/_incl_data/class/priem/237.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -51,15 +51,15 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; $uid1 = $btl->atacks[$id]['uid1']; $uid2 = $btl->atacks[$id]['uid2']; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; $uid1 = $btl->atacks[$id]['uid2']; $uid2 = $btl->atacks[$id]['uid1']; } diff --git a/_incl_data/class/priem/239.php b/_incl_data/class/priem/239.php index 12363c2f..95caaef2 100644 --- a/_incl_data/class/priem/239.php +++ b/_incl_data/class/priem/239.php @@ -20,13 +20,13 @@ if (isset($pr_tested_this)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if (isset($at['p'][$a]['priems']['used_good'][$uid][$j_id])) { $prv['j'] = $at['p'][$a]['priems']['used_good'][$uid][$j_id]; @@ -70,13 +70,13 @@ if (isset($pr_tested_this)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { $j = 0; diff --git a/_incl_data/class/priem/240.php b/_incl_data/class/priem/240.php index f146219e..61eb5ac9 100644 --- a/_incl_data/class/priem/240.php +++ b/_incl_data/class/priem/240.php @@ -20,13 +20,13 @@ if (isset($pr_tested_this)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } // // -- конец приема @@ -48,13 +48,13 @@ if (isset($pr_tested_this)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { $prv['j_priem'] = $btl->stats[$btl->uids[$u1]]['u_priem'][$j_id][0]; diff --git a/_incl_data/class/priem/245.php b/_incl_data/class/priem/245.php index 3b59db38..1de93617 100644 --- a/_incl_data/class/priem/245.php +++ b/_incl_data/class/priem/245.php @@ -35,13 +35,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -65,13 +65,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/248.php b/_incl_data/class/priem/248.php index c6e0225e..fd0295b8 100644 --- a/_incl_data/class/priem/248.php +++ b/_incl_data/class/priem/248.php @@ -36,13 +36,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -66,13 +66,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/249.php b/_incl_data/class/priem/249.php index 5fe60330..a936c696 100644 --- a/_incl_data/class/priem/249.php +++ b/_incl_data/class/priem/249.php @@ -35,13 +35,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -65,13 +65,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/251.php b/_incl_data/class/priem/251.php index 7d75b2c4..2811719c 100644 --- a/_incl_data/class/priem/251.php +++ b/_incl_data/class/priem/251.php @@ -22,15 +22,15 @@ if (isset($pr_used_this) && isset($pr_moment)) { $pvrl = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "' . $btl->atacks[$id]['uid1'] . '" AND `v2` = "251" AND `delete` = "0" ORDER BY `id` DESC LIMIT 1')); $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; $u3 = $pvrl['user_use']; } elseif ($uid == $uid2) { $pvrl = mysql_fetch_array(mysql_query('SELECT * FROM `eff_users` WHERE `uid` = "' . $btl->atacks[$id]['uid2'] . '" AND `v2` = "251" AND `delete` = "0" ORDER BY `id` DESC LIMIT 1')); $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; $u3 = $pvrl['user_use']; } if ($a > 0) { diff --git a/_incl_data/class/priem/252.php b/_incl_data/class/priem/252.php index d1974548..2ba90147 100644 --- a/_incl_data/class/priem/252.php +++ b/_incl_data/class/priem/252.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/255.php b/_incl_data/class/priem/255.php index bb5a011e..1118b79e 100644 --- a/_incl_data/class/priem/255.php +++ b/_incl_data/class/priem/255.php @@ -40,13 +40,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/269.php b/_incl_data/class/priem/269.php index 05b294c4..f7164663 100644 --- a/_incl_data/class/priem/269.php +++ b/_incl_data/class/priem/269.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -68,13 +68,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/270.php b/_incl_data/class/priem/270.php index 7f33f5fe..e302e773 100644 --- a/_incl_data/class/priem/270.php +++ b/_incl_data/class/priem/270.php @@ -74,13 +74,13 @@ if( isset($pr_momental_this_seven)) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -104,13 +104,13 @@ if( isset($pr_momental_this_seven)) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/273.php b/_incl_data/class/priem/273.php index 4875419e..48633ea8 100644 --- a/_incl_data/class/priem/273.php +++ b/_incl_data/class/priem/273.php @@ -30,13 +30,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -61,13 +61,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/276.php b/_incl_data/class/priem/276.php index 8b311e21..493ba7c1 100644 --- a/_incl_data/class/priem/276.php +++ b/_incl_data/class/priem/276.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/277.php b/_incl_data/class/priem/277.php index cb119544..e5b1311c 100644 --- a/_incl_data/class/priem/277.php +++ b/_incl_data/class/priem/277.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/280.php b/_incl_data/class/priem/280.php index 17001c05..0503f017 100644 --- a/_incl_data/class/priem/280.php +++ b/_incl_data/class/priem/280.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/281.php b/_incl_data/class/priem/281.php index d9a8a1c4..ae0aa7ce 100644 --- a/_incl_data/class/priem/281.php +++ b/_incl_data/class/priem/281.php @@ -23,13 +23,13 @@ if(isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -62,13 +62,13 @@ if(isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $pvr['hp'] = floor($btl->stats[$btl->uids[$u2]]['hpAll']/50); diff --git a/_incl_data/class/priem/282.php b/_incl_data/class/priem/282.php index 24a21b7d..778035ee 100644 --- a/_incl_data/class/priem/282.php +++ b/_incl_data/class/priem/282.php @@ -30,13 +30,13 @@ if (isset($pr_momental_this)) { if ($uid == $uid2) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid1) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if (isset($at['p'][$a]['priems']['kill'][$uid][$j_id])) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -61,13 +61,13 @@ if (isset($pr_momental_this)) { if ($uid == $uid2) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid1) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { $prv['j_priem'] = $btl->stats[$btl->uids[$u2]]['u_priem'][$j_id][0]; diff --git a/_incl_data/class/priem/284.php b/_incl_data/class/priem/284.php index 023f752a..06bf69b6 100644 --- a/_incl_data/class/priem/284.php +++ b/_incl_data/class/priem/284.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/286.php b/_incl_data/class/priem/286.php index 1c6d477a..58597315 100644 --- a/_incl_data/class/priem/286.php +++ b/_incl_data/class/priem/286.php @@ -30,13 +30,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -61,13 +61,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/287.php b/_incl_data/class/priem/287.php index f8a4a30c..be205fcb 100644 --- a/_incl_data/class/priem/287.php +++ b/_incl_data/class/priem/287.php @@ -30,13 +30,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -61,13 +61,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/288.php b/_incl_data/class/priem/288.php index 91b1a8ca..a93d377d 100644 --- a/_incl_data/class/priem/288.php +++ b/_incl_data/class/priem/288.php @@ -30,13 +30,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -61,13 +61,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/291.php b/_incl_data/class/priem/291.php index b5c396f1..52b36357 100644 --- a/_incl_data/class/priem/291.php +++ b/_incl_data/class/priem/291.php @@ -35,13 +35,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { //mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -65,13 +65,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/294.php b/_incl_data/class/priem/294.php index 26acb382..50f0f011 100644 --- a/_incl_data/class/priem/294.php +++ b/_incl_data/class/priem/294.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/295.php b/_incl_data/class/priem/295.php index cec9d758..a7296ca6 100644 --- a/_incl_data/class/priem/295.php +++ b/_incl_data/class/priem/295.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/296.php b/_incl_data/class/priem/296.php index b40ba934..99eb337c 100644 --- a/_incl_data/class/priem/296.php +++ b/_incl_data/class/priem/296.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/297.php b/_incl_data/class/priem/297.php index 92777358..ffb514e9 100644 --- a/_incl_data/class/priem/297.php +++ b/_incl_data/class/priem/297.php @@ -21,13 +21,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { if( $pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { diff --git a/_incl_data/class/priem/298.php b/_incl_data/class/priem/298.php index 6d192152..4efdcac6 100644 --- a/_incl_data/class/priem/298.php +++ b/_incl_data/class/priem/298.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/299.php b/_incl_data/class/priem/299.php index 595a317f..bac0f749 100644 --- a/_incl_data/class/priem/299.php +++ b/_incl_data/class/priem/299.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/300.php b/_incl_data/class/priem/300.php index 0aa66407..6fa2ddd9 100644 --- a/_incl_data/class/priem/300.php +++ b/_incl_data/class/priem/300.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/301.php b/_incl_data/class/priem/301.php index ea9918e7..960acadb 100644 --- a/_incl_data/class/priem/301.php +++ b/_incl_data/class/priem/301.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/302.php b/_incl_data/class/priem/302.php index adae05c9..d346614e 100644 --- a/_incl_data/class/priem/302.php +++ b/_incl_data/class/priem/302.php @@ -20,13 +20,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { diff --git a/_incl_data/class/priem/303.php b/_incl_data/class/priem/303.php index 30940b14..9c6ab2e7 100644 --- a/_incl_data/class/priem/303.php +++ b/_incl_data/class/priem/303.php @@ -37,13 +37,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -67,13 +67,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/327.php b/_incl_data/class/priem/327.php index d09568b7..9e445a8a 100644 --- a/_incl_data/class/priem/327.php +++ b/_incl_data/class/priem/327.php @@ -21,13 +21,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } // if( $a > 0 ) { diff --git a/_incl_data/class/priem/333.php b/_incl_data/class/priem/333.php index c6cf7a62..04ff3853 100644 --- a/_incl_data/class/priem/333.php +++ b/_incl_data/class/priem/333.php @@ -21,13 +21,13 @@ if( isset($pr_used_this) && isset($pr_moment) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } // if( $a > 0 ) { diff --git a/_incl_data/class/priem/337.php b/_incl_data/class/priem/337.php index c13ebc3c..80dc57a5 100644 --- a/_incl_data/class/priem/337.php +++ b/_incl_data/class/priem/337.php @@ -20,13 +20,13 @@ if (isset($pr_tested_this)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } // // -- конец приема @@ -48,13 +48,13 @@ if (isset($pr_tested_this)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { $prv['j_priem'] = $btl->stats[$btl->uids[$u1]]['u_priem'][$j_id][0]; diff --git a/_incl_data/class/priem/36.php b/_incl_data/class/priem/36.php index 309c101a..d5c838be 100644 --- a/_incl_data/class/priem/36.php +++ b/_incl_data/class/priem/36.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/_incl_data/class/priem/4.php b/_incl_data/class/priem/4.php index 4079ac88..9a73d363 100644 --- a/_incl_data/class/priem/4.php +++ b/_incl_data/class/priem/4.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/42.php b/_incl_data/class/priem/42.php index b71b7baa..edea709f 100644 --- a/_incl_data/class/priem/42.php +++ b/_incl_data/class/priem/42.php @@ -1,169 +1,157 @@ atacks[$id]['uid1']; - $uid2 = $btl->atacks[$id]['uid2']; - if( $uid == $uid1 ) { - $a = 1; - $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; - }elseif( $uid == $uid2 ) { - $a = 2; - $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; - } - 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']; - - if( $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['hod'] == 1 ) { - - $pvr['user_use'] = $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['user_use']; - //действия - $pvr['hp'] = 1; - // - $pvr['data'] = Helper\Conversion::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']); - $pvr['di'] = 0; - $pvr['dc'] = count($pvr['data']['atgm']); - $pvr['rd'] = 0; - $pvr['redata'] = ''; - while( $pvr['di'] < 4 ) { - if( isset($pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]) ) { - if( $pvr['rd'] < 3 ) { - $pvr['hp'] += $pvr['data']['atgm'][($pvr['dc']-$pvr['di'])]; - $pvr['redata'] = 'atgm='.$pvr['data']['atgm'][($pvr['dc']-$pvr['di'])].'|'.$pvr['redata']; - $pvr['rd']++; - } - } - $pvr['di']++; - } - // - $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data'] = $pvr['redata']; - mysql_query('UPDATE `eff_users` SET `data` = "'.$pvr['redata'].'" WHERE `id` = "'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'].'" LIMIT 1'); - // - $pvr['hp'] = floor($pvr['hp']); - /*$pvr['hp'] = $priem->magatack( $u2, $u1, $pvr['hp'], 'вода', 0 ); - $pvr['promah_type'] = $pvr['hp'][3]; - $pvr['promah'] = $pvr['hp'][2]; - $pvr['krit'] = $pvr['hp'][1]; - $pvr['hp'] = $pvr['hp'][0];*/ - $pvr['hpSee'] = '--'; - $pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']); - $pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll']; - - //Используем проверку на урон приемов - $pvr['hp'] = $btl->testYronPriem( $pvr['user_use'], $u1, 11, $pvr['hp'], 8, true, false, 1 ); - - $pvr['hpSee'] = '-'.$pvr['hp']; - $pvr['hpNow'] -= $pvr['hp']; - $btl->priemYronSave($pvr['user_use'],$u1,$pvr['hp'],0); - - if( $pvr['hpNow'] > $pvr['hpAll'] ) { - $pvr['hpNow'] = $pvr['hpAll']; - }elseif( $pvr['hpNow'] < 0 ) { - $pvr['hpNow'] = 0; - } - - $btl->stats[$btl->uids[$u1]]['hpNow'] = $pvr['hpNow']; - - mysql_query('UPDATE `stats` SET `hpNow` = "'.$btl->stats[$btl->uids[$u1]]['hpNow'].'" WHERE `id` = "'.$u1.'" LIMIT 1'); - //$prv['text'] = $btl->addlt(1 , 19 , $btl->users[$btl->uids[$u2]]['sex'] , NULL); - $prv['text'] = '{u2} утратил здоровье от "{pr}"'; - - //Цвет приема - if( $pvr['promah'] == false ) { - if( $pvr['krit'] == false ) { - $prv['color2'] = '000000'; - $prv['color'] = '008000'; - }else{ - $prv['color2'] = 'FF0000'; - $prv['color'] = 'FF0000'; - } - }else{ - $prv['color2'] = '909090'; - $prv['color'] = '909090'; - } - - $prv['text2'] = '{tm1} '.$prv['text'].'. '.$pvr['hpSee'].' ['.$pvr['hpNow'].'/'.$pvr['hpAll'].']'; - if( $pvr['promah_type'] == 2 ) { - //$prv['text'] = $btl->addlt(1 , 20 , $btl->users[$btl->uids[$u2]]['sex'] , NULL); - $prv['text2'] = '{tm1} '.$prv['text'].'. maginfoattack($pvr['user_use'],$u1,4).'>-- ['.$pvr['hpNow'].'/'.$pvr['hpAll'].']'; - } - $prv['xx'] = ''; - if( $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['x'] > 1 ) { - //$prv['xx'] = ' x'.$btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['x'].''; - } - $btl->priemAddLog( $id, 1, 2, $pvr['user_use'], $u1, - 'Метеорит [6]'.$prv['xx'].'', - $prv['text2'], - ($btl->hodID) - ); - // спасение - $btl->spaCheck($u1); - // спасение - } - } - // -- конец приема - return $at; - }; - unset( $pr_used_this ); -}else{ - $pvr['hp'] = floor(rand(46,49)); - $pvr['hp'] = $this->magatack( $u->info['id'], $this->ue['id'], $pvr['hp'], 'земля', 0 ); - $pvr['promah_type'] = $pvr['hp'][3]; - $pvr['promah'] = $pvr['hp'][2]; - $pvr['krit'] = $pvr['hp'][1]; - $pvr['hp'] = $pvr['hp'][0]; - // - $prv['color2'] = '000000'; - //Цвет приема - if( $pvr['promah'] == false ) { - if( $pvr['krit'] == false ) { - $prv['color2'] = '000000'; - //$prv['color'] = '008000'; - }else{ - $prv['color2'] = 'FF0000'; - //$prv['color'] = 'FF0000'; - } - }else{ - $prv['color2'] = '909090'; - //$prv['color'] = '909090'; - } - $prv['text'] = $btl->addlt(1 , 19 , $btl->users[$btl->uids[$u->info['id']]]['sex'] , NULL); - $prv['text2'] = '{tm1} '.$prv['text'].'.'; - $btl->priemAddLog( $id, 1, 2, $u->info['id'], $this->ue['id'], - 'Метеорит [6]', - $prv['text2'], - ($btl->hodID + 1) - ); - - //Добавляем прием - //$this->addEffPr($pl,$id); - if ($pvr['hp']>0) - { - $this->addPriem($this->ue['id'],$pl['id'],'atgm='.floor($pvr['hp']).'',0,77,4,$u->info['id'],1,'метеорит',0,0,1); - Ъ - //Отнимаем тактики - //$this->mintr($pl); -} +$pvr = []; +if (isset($pr_used_this) && isset($pr_moment)) { + //Каждый ход + $fx_priem = function ($id, $at, $uid, $j_id) { + // -- начало приема + global $u, $btl, $priem; + // + //Параметры приема + $pvr['used'] = 0; + // + $uid1 = $btl->atacks[$id]['uid1']; + $uid2 = $btl->atacks[$id]['uid2']; + if ($uid == $uid1) { + $a = 1; + $b = 2; + $u1 = $uid1; + $u2 = $uid2; + } elseif ($uid == $uid2) { + $a = 2; + $b = 1; + $u1 = $uid2; + $u2 = $uid1; + } + if ($a > 0) { -unset($pvr); -?> \ No newline at end of file + //Проверяем эффект + $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']; + + if ($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['hod'] == 1) { + + $pvr['user_use'] = $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['user_use']; + //действия + $pvr['hp'] = 1; + // + $pvr['data'] = Helper\Conversion::dataStringToArray($btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data']); + $pvr['di'] = 0; + $pvr['dc'] = count($pvr['data']['atgm']); + $pvr['rd'] = 0; + $pvr['redata'] = ''; + while ($pvr['di'] < 4) { + if (isset($pvr['data']['atgm'][($pvr['dc'] - $pvr['di'])])) { + if ($pvr['rd'] < 3) { + $pvr['hp'] += $pvr['data']['atgm'][($pvr['dc'] - $pvr['di'])]; + $pvr['redata'] = 'atgm=' . $pvr['data']['atgm'][($pvr['dc'] - $pvr['di'])] . '|' . $pvr['redata']; + $pvr['rd']++; + } + } + $pvr['di']++; + } + // + $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['data'] = $pvr['redata']; + mysql_query('UPDATE `eff_users` SET `data` = "' . $pvr['redata'] . '" WHERE `id` = "' . $btl->stats[$btl->uids[$u1]]['effects'][$prv['j_priem']]['id'] . '" LIMIT 1'); + // + $pvr['hp'] = floor($pvr['hp']); + $pvr['hpSee'] = '--'; + $pvr['hpNow'] = floor($btl->stats[$btl->uids[$u1]]['hpNow']); + $pvr['hpAll'] = $btl->stats[$btl->uids[$u1]]['hpAll']; + + //Используем проверку на урон приемов + $pvr['hp'] = $btl->testYronPriem($pvr['user_use'], $u1, 11, $pvr['hp'], 8, true, false, 1); + + $pvr['hpSee'] = '-' . $pvr['hp']; + $pvr['hpNow'] -= $pvr['hp']; + $btl->priemYronSave($pvr['user_use'], $u1, $pvr['hp'], 0); + + if ($pvr['hpNow'] > $pvr['hpAll']) { + $pvr['hpNow'] = $pvr['hpAll']; + } elseif ($pvr['hpNow'] < 0) { + $pvr['hpNow'] = 0; + } + + $btl->stats[$btl->uids[$u1]]['hpNow'] = $pvr['hpNow']; + + mysql_query('UPDATE `stats` SET `hpNow` = "' . $btl->stats[$btl->uids[$u1]]['hpNow'] . '" WHERE `id` = "' . $u1 . '" LIMIT 1'); + //$prv['text'] = $btl->addlt(1 , 19 , $btl->users[$btl->uids[$u2]]['sex'] , NULL); + $prv['text'] = '{u2} утратил здоровье от "{pr}"'; + + //Цвет приема + if ($pvr['promah'] == false) { + if ($pvr['krit'] == false) { + $prv['color2'] = '000000'; + $prv['color'] = '008000'; + } else { + $prv['color2'] = 'FF0000'; + $prv['color'] = 'FF0000'; + } + } else { + $prv['color2'] = '909090'; + $prv['color'] = '909090'; + } + + $prv['text2'] = '{tm1} ' . $prv['text'] . '. ' . $pvr['hpSee'] . ' [' . $pvr['hpNow'] . '/' . $pvr['hpAll'] . ']'; + if ($pvr['promah_type'] == 2) { + //$prv['text'] = $btl->addlt(1 , 20 , $btl->users[$btl->uids[$u2]]['sex'] , NULL); + $prv['text2'] = '{tm1} ' . $prv['text'] . '. maginfoattack( + $pvr['user_use'], $u1, 4 + ) . '>-- [' . $pvr['hpNow'] . '/' . $pvr['hpAll'] . ']'; + } + $prv['xx'] = ''; + + $btl->priemAddLog( + $id, 1, 2, $pvr['user_use'], $u1, + 'Метеорит [6]' . $prv['xx'] . '', + $prv['text2'], + ($btl->hodID) + ); + $btl->spaCheck($u1); + } + } + // -- конец приема + return $at; + }; + unset($pr_used_this); +} else { + $pvr['hp'] = floor(rand(46, 49)); + $pvr['hp'] = $this->magatack($u->info['id'], $this->ue['id'], $pvr['hp'], 'земля', 0); + $pvr['promah_type'] = $pvr['hp'][3]; + $pvr['promah'] = $pvr['hp'][2]; + $pvr['krit'] = $pvr['hp'][1]; + $pvr['hp'] = $pvr['hp'][0]; + // + $prv['color2'] = '000000'; + //Цвет приема + if (!$pvr['promah']) { + if (!$pvr['krit']) { + $prv['color2'] = '000000'; + } else { + $prv['color2'] = 'FF0000'; + } + } else { + $prv['color2'] = '909090'; + } + $prv['text'] = $btl->addlt(1, 19, $btl->users[$btl->uids[$u->info['id']]]['sex'], null); + $prv['text2'] = '{tm1} ' . $prv['text'] . '.'; + $btl->priemAddLog( + $id, 1, 2, $u->info['id'], $this->ue['id'], + 'Метеорит [6]', + $prv['text2'], + ($btl->hodID + 1) + ); + + //Добавляем прием + + if ($pvr['hp'] > 0) { + $this->addPriem($this->ue['id'], $pl['id'], 'atgm=' . floor($pvr['hp']) . '', 0, 77, 4, $u->info['id'], 1, 'метеорит', 0, 0, 1); + } + + unset($pvr); +} diff --git a/_incl_data/class/priem/45.php b/_incl_data/class/priem/45.php index c7aa0b49..c65214b9 100644 --- a/_incl_data/class/priem/45.php +++ b/_incl_data/class/priem/45.php @@ -39,13 +39,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -70,13 +70,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/47.php b/_incl_data/class/priem/47.php index eb757e45..0cef0ccb 100644 --- a/_incl_data/class/priem/47.php +++ b/_incl_data/class/priem/47.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/48.php b/_incl_data/class/priem/48.php index b00175d1..9e690ba1 100644 --- a/_incl_data/class/priem/48.php +++ b/_incl_data/class/priem/48.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/49.php b/_incl_data/class/priem/49.php index 412726ba..814683db 100644 --- a/_incl_data/class/priem/49.php +++ b/_incl_data/class/priem/49.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/7.php b/_incl_data/class/priem/7.php index 54b64ad0..6463c6e9 100644 --- a/_incl_data/class/priem/7.php +++ b/_incl_data/class/priem/7.php @@ -43,13 +43,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -73,13 +73,13 @@ if( isset($pr_momental_this)) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/70.php b/_incl_data/class/priem/70.php index 2ee2b159..9d122153 100644 --- a/_incl_data/class/priem/70.php +++ b/_incl_data/class/priem/70.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/71.php b/_incl_data/class/priem/71.php index 43beb655..e1b042cc 100644 --- a/_incl_data/class/priem/71.php +++ b/_incl_data/class/priem/71.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/72.php b/_incl_data/class/priem/72.php index d63f3f2d..2be33f88 100644 --- a/_incl_data/class/priem/72.php +++ b/_incl_data/class/priem/72.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/73.php b/_incl_data/class/priem/73.php index f51281bd..4262f9ac 100644 --- a/_incl_data/class/priem/73.php +++ b/_incl_data/class/priem/73.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/74.php b/_incl_data/class/priem/74.php index d14ebd6e..2445648e 100644 --- a/_incl_data/class/priem/74.php +++ b/_incl_data/class/priem/74.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/75.php b/_incl_data/class/priem/75.php index 4668e11a..c1b79ed7 100644 --- a/_incl_data/class/priem/75.php +++ b/_incl_data/class/priem/75.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/76.php b/_incl_data/class/priem/76.php index 9cf51011..55538898 100644 --- a/_incl_data/class/priem/76.php +++ b/_incl_data/class/priem/76.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/77.php b/_incl_data/class/priem/77.php index 76c7d5f1..cb2eca9d 100644 --- a/_incl_data/class/priem/77.php +++ b/_incl_data/class/priem/77.php @@ -24,13 +24,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/78.php b/_incl_data/class/priem/78.php index a4c149e9..376052a4 100644 --- a/_incl_data/class/priem/78.php +++ b/_incl_data/class/priem/78.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { //Проверяем эффект diff --git a/_incl_data/class/priem/79.php b/_incl_data/class/priem/79.php index bbe24925..dfa86cd5 100644 --- a/_incl_data/class/priem/79.php +++ b/_incl_data/class/priem/79.php @@ -22,13 +22,13 @@ if (isset($pr_used_this) && isset($pr_moment) && !isset($btl->info['id']) && !is if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/8.php b/_incl_data/class/priem/8.php index 7f2aba66..b75c8b58 100644 --- a/_incl_data/class/priem/8.php +++ b/_incl_data/class/priem/8.php @@ -21,13 +21,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -51,13 +51,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid2 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid1 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/80.php b/_incl_data/class/priem/80.php index 80ec114b..cf27380b 100644 --- a/_incl_data/class/priem/80.php +++ b/_incl_data/class/priem/80.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/81.php b/_incl_data/class/priem/81.php index 836122c9..ab43ca51 100644 --- a/_incl_data/class/priem/81.php +++ b/_incl_data/class/priem/81.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/82.php b/_incl_data/class/priem/82.php index 7ac0b9e3..d73ec53b 100644 --- a/_incl_data/class/priem/82.php +++ b/_incl_data/class/priem/82.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/83.php b/_incl_data/class/priem/83.php index 8f4f1b02..1ea54e12 100644 --- a/_incl_data/class/priem/83.php +++ b/_incl_data/class/priem/83.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/84.php b/_incl_data/class/priem/84.php index 04a67c73..4090b817 100644 --- a/_incl_data/class/priem/84.php +++ b/_incl_data/class/priem/84.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { diff --git a/_incl_data/class/priem/85.php b/_incl_data/class/priem/85.php index 5f7b1213..58a79c21 100644 --- a/_incl_data/class/priem/85.php +++ b/_incl_data/class/priem/85.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/_incl_data/class/priem/86.php b/_incl_data/class/priem/86.php index cac2f0cf..b8a1f0ea 100644 --- a/_incl_data/class/priem/86.php +++ b/_incl_data/class/priem/86.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/_incl_data/class/priem/87.php b/_incl_data/class/priem/87.php index a41e480f..e24b3475 100644 --- a/_incl_data/class/priem/87.php +++ b/_incl_data/class/priem/87.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/_incl_data/class/priem/88.php b/_incl_data/class/priem/88.php index 43265a28..ebe335d9 100644 --- a/_incl_data/class/priem/88.php +++ b/_incl_data/class/priem/88.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/_incl_data/class/priem/89.php b/_incl_data/class/priem/89.php index dedd78ee..8313077f 100644 --- a/_incl_data/class/priem/89.php +++ b/_incl_data/class/priem/89.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/_incl_data/class/priem/9.php b/_incl_data/class/priem/9.php index 49fa50d5..1791cd77 100644 --- a/_incl_data/class/priem/9.php +++ b/_incl_data/class/priem/9.php @@ -20,13 +20,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) ) { mysql_query('UPDATE `eff_users` SET `delete` = "'.time().'" WHERE `id` = "'.$btl->stats[$btl->uids[$uid]]['u_priem'][$j_id][3].'" AND `uid` = "'.$uid.'" LIMIT 1'); @@ -50,13 +50,13 @@ if( isset($pr_tested_this) ) { if( $uid == $uid1 ) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; }elseif( $uid == $uid2 ) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if( $a > 0 ) { $j = 0; $k = 0; $wp = 3; diff --git a/_incl_data/class/priem/90.php b/_incl_data/class/priem/90.php index 2b0577b3..b5460fa7 100644 --- a/_incl_data/class/priem/90.php +++ b/_incl_data/class/priem/90.php @@ -20,13 +20,13 @@ if (isset($pr_used_this) && isset($pr_moment)) { if ($uid == $uid1) { $a = 1; $b = 2; - $u1 = ${'uid1'}; - $u2 = ${'uid2'}; + $u1 = $uid1; + $u2 = $uid2; } elseif ($uid == $uid2) { $a = 2; $b = 1; - $u1 = ${'uid2'}; - $u2 = ${'uid1'}; + $u1 = $uid2; + $u2 = $uid1; } if ($a > 0) { if ($pvr['used'] == 0 && !isset($at['p'][$a]['priems']['kill'][$uid][$j_id]) && floor($btl->stats[$btl->uids[$uid]]['hpNow']) >= 1) { diff --git a/modules_data/_locations.php b/modules_data/_locations.php index a7338d95..99b5b623 100644 --- a/modules_data/_locations.php +++ b/modules_data/_locations.php @@ -1,11 +1,16 @@ room['noatack'] == 0) { - - $ua = mysql_fetch_array( - mysql_query( - 'SELECT `s`.*,`u`.* FROM `stats` AS `s` LEFT JOIN `users` AS `u` ON `s`.`id` = `u`.`id` WHERE `u`.`login` = "' . mysql_real_escape_string( - $_GET['login'] - ) . '" LIMIT 1' - ) - ); - - $battle = mysql_fetch_array( - mysql_query( - 'SELECT `id` FROM `battle_last` WHERE `uid` = "' . $u->info['id'] . '" AND `battle_id` = "' . $ua['battle'] . '" LIMIT 1' - ) - ); + $ua = User::getInfo($_GET['login']); + $wasInThisBattle = !empty(Db::getValue('select id from battle_last where uid = ? and battle_id = ? limit 1', [$u->info['id'], $ua['battle']])); if (isset($ua['id']) && $ua['online'] > time() - 520) { $usta = $u->getStats($ua['id'], 0); $minHp = $usta['hpAll'] / 100 * 33; - if ($ua['battle'] > 0) { - $uabt = mysql_fetch_array( - mysql_query( - 'SELECT `id` FROM `battle` WHERE `id` = "' . $ua['battle'] . '" AND `team_win` = "-1" LIMIT 1' - ) - ); - if (!isset($uabt['id'])) { - $ua['battle'] = 0; - } + if ($ua['battle'] > 0 && empty(Db::getValue('select count(id) from battle where id = ? and team_win = -1', [$ua['battle']]))) { + $ua['battle'] = 0; } - if ($ua['level'] < 8) { $re = 'Новички находятся под защитой Мироздателя...'; } elseif ($ua['id'] == $u->info['id']) { $re = 'На себя нападать нельзя...'; } elseif ($u->info['level'] > $ua['level'] + 1) { $re = 'Вы слишком сильны'; - } elseif ($ua['no_ip'] == 'trupojor') { + } elseif ($ua['align'] === 9) { $re = 'Нельзя нападать на городского монста с помощью кнопки напасть!'; - } elseif (isset($battle['id'])) { + } elseif ($wasInThisBattle) { $re = 'Нельзя вмешаться, вы уже были в этом поединке.'; } elseif ($ua['admin'] == 1 && $u->info['admin'] == 0) { $re = 'На кого прыгаешь, щенок?'; @@ -112,84 +97,55 @@ function thisInfRm($id, $tp = null, $json = false) { $rm = Db::getRow('select * from room where code = ? and city = ?', [$id, 'capitalcity']); $inf = 'Здание было разрушено'; + $rown = 0; if (isset($rm['id'])) { $rown = Db::getValue('select count(*) from users where online > unix_timestamp() - 120 and city = ? and room = ?', ['capitalcity', $rm['id']]); if ($tp == null) { - $inf = '' . $rm['name'] . '
Сейчас в комнате ' . ($rown) . ' чел.'; + $inf = '' . $rm['name'] . '
Сейчас в комнате ' . $rown . ' чел.'; } else { - $inf = $rm['name'] . "\nСейчас в комнате " . ($rown) . ' чел.'; + $inf = $rm['name'] . "\nСейчас в комнате " . $rown . ' чел.'; } if ($json) { - return [$rm['code'], $rm['name'], ($rown)]; + return [$rm['code'], $rm['name'], $rown]; } } if ($json) { - return ['false', $inf, ($rown)]; + return ['false', $inf, $rown]; } if ($tp == null) { echo 'onMouseOver="top.hi(this,\'
' . $inf . '
\',event,0,1,1,1,\'max-height:240px\');" onMouseOut="top.hic();" onMouseDown="top.hic();" onClick="goLocal(\'main.php?loc=' . $rm['code'] . '\',\'' . $rm['name'] . '\');"'; } else { echo $inf; } + return []; } if (isset($_GET['loc'])) { -// $training_manager = \DarksLight2\Training\TrainingManager::getInstance(); + // $training_manager = \DarksLight2\Training\TrainingManager::getInstance(); $go = Db::getRow('select * from room where code = ?', [$_GET['loc']]); -// if (in_array( -// $go['file'], $training_manager->getRegistered()[$training_manager->getCurrentStepName()]->allowedToMove() -// ) || $u->info['admin'] > 0) { - - $tr_pl = mysql_fetch_array( - mysql_query( - 'SELECT `id`,`v1` FROM `eff_users` WHERE `id_eff` = 4 AND `uid` = "' . $u->info['id'] . '" AND `delete` = "0" ORDER BY `v1` DESC LIMIT 1' - ) - ); + // if (in_array( + // $go['file'], $training_manager->getRegistered()[$training_manager->getCurrentStepName()]->allowedToMove() + // ) || $u->info['admin'] > 0) { + $tr_pl = Db::getValue('select v1 from eff_users where id_eff = 4 and uid = ? order by v1 desc limit 1', [$u->info['id']]); //Проверяем костыли - $kos1 = mysql_fetch_array( - mysql_query( - 'SELECT `id`,`item_id` FROM `items_users` WHERE `inOdet` = 3 AND `uid` = "' . $u->info['id'] . '" AND `delete` = 0 LIMIT 1' - ) - ); - $kos2 = mysql_fetch_array( - mysql_query( - 'SELECT `id`,`item_id` FROM `items_users` WHERE `inOdet` = 14 AND `uid` = "' . $u->info['id'] . '" AND `delete` = 0 LIMIT 1' - ) - ); - - if ($kos1['item_id'] == 630 || $kos1['item_id'] == 631) { - $kos1['good'] = 1; - } else { - $kos1['good'] = 0; - } - if ($kos2['item_id'] == 630 || $kos2['item_id'] == 631) { - $kos2['good'] = 1; - } else { - $kos2['good'] = 0; - } - - if (isset($tr_pl['id'])) { - $zadej = 0; - - if ($tr_pl['v1'] == 2) { - if ($kos1['good'] == 0 && $kos2['good'] == 0) { - $re = 'Вы травмированы. Не возможно с такими увечиями передвигаться без костылей.'; - $zadej = -1; - } else { + $hasKostyl = Db::getValue('select count(id) from items_users where inOdet in (3,14) and item_id in (630, 631) and uid = ?') > 0; + $zadej = 0; + if (isset($tr_pl)) { + if ($hasKostyl) { + if ($tr_pl == 2) { $zadej = 20; - } - } elseif ($tr_pl['v1'] == 3 || $tr_pl['v1'] == 4) { - if ($kos1['good'] == 0 || $kos2['good'] == 0) { - $re = 'Вы травмированы. Не возможно с такими увечиями передвигаться без костылей.'; - $zadej = -1; - } else { + } elseif ($tr_pl == 3 || $tr_pl == 4) { $zadej = 30; } + } else { + $zadej = -1; + $re = 'Вы травмированы. Не возможно с такими увечиями передвигаться без костылей.'; } } + if ($u->room['extdlg'] > 0) { header('location: main.php?talk=' . $u->room['extdlg'] . ''); } elseif (isset($zadej) && $zadej == -1) { @@ -202,8 +158,9 @@ if (isset($_GET['loc'])) { } elseif ($u->info['inTurnir'] > 0) { $re = 'Вы не можете перемещаться, Вы приняли заявку на турнир ...'; } elseif ( - ($kos1['good'] == 0 && $kos2['good'] == 0) && ( - (!isset($zadej) || $zadej == 0) && + !$hasKostyl && + ( + empty($zadej) && $u->aves['now'] >= $u->aves['max'] && $u->room['name'] != 'Общежитие' && $u->room['name'] != 'Общ. Этаж 1' && @@ -239,18 +196,12 @@ if (isset($_GET['loc'])) { } elseif (($alg[0] > $u->info['align'] || $alg[1] < $u->info['align']) && $go['align'] != 0) { $re = 'Ты не ту склонность выбрал.. Дружок :)'; } elseif ($u->info['zv'] > 0) { - $test_zv = mysql_fetch_array( - mysql_query( - 'SELECT * FROM `zayvki` WHERE `id` = "' . $u->info['zv'] . '" AND `cancel` = 0 AND `start` = 0 AND `time` > "' . (time() - 60 * 60 * 2) . '" LIMIT 1' - ) - ); - if (isset($test_zv['id'])) { + $testZv = Db::getValue('select count(id) from zayvki where id = ? and cancel = 0 and start = 0 and time > unix_timestamp() - 60*60*2') > 0; + if ($testZv) { $re = 'Подали заявку и убегаем?.. Не хорошо!'; } else { $re = 'Ваша заявка была удалена... Теперь вы можете перейти в другую локацию!'; - mysql_query( - 'UPDATE `stats` SET `zv` = 0 WHERE `id` = "' . $u->info['id'] . '" LIMIT 1' - ); + Db::sql('update stats set zv = 0 where id = ?', [$u->info['id']]); } } elseif (($go['clan'] > 0 && $u->info['clan'] != $go['clan']) || ($go['clan'] == -1 && $u->info['clan'] == 0)) { $re = 'Вы не можете попасть в эту комнату'; @@ -261,20 +212,15 @@ if (isset($_GET['loc'])) { } elseif ($mlvl[1] < $u->info['level']) { $re = 'Вы не можете попасть в эту комнату, уровень высоковат ;)'; } elseif ($go['close'] == 0) { - $travms = mysql_fetch_array( - mysql_query( - 'SELECT * FROM `eff_users` WHERE `uid` = "' . $u->info['id'] . '" and (`v1`="2" or `v1`="3") and `delete`=0 ORDER by v1 DESC' - ) - ); //замедление перемешения при травмах - $plus_timeGo = 0 + $zadej; // добавочное время при травме + $plus_timeGo = $zadej; // добавочное время при травме if ($plus_timeGo < 0) { $plus_timeGo = 0; } if ( - (!isset($zadej) || $zadej == 0) && + empty($zadej) && $u->aves['now'] >= $u->aves['max'] && $u->room['name'] != 'Общежитие' && $u->room['name'] != 'Общ. Этаж 1' && @@ -282,7 +228,7 @@ if (isset($_GET['loc'])) { $u->room['name'] != 'Общ. Этаж 3' ) { $plus_timeGo += 2 * 60; - if ($kos1['good'] == 0) { + if (!$hasKostyl) { $plus_timeGo += 1.5 * 60; } } @@ -295,54 +241,35 @@ if (isset($_GET['loc'])) { } $u->info['timeGo'] = time() + $go['timeGO'] + $plus_timeGo; $u->info['timeGoL'] = time(); - $upd = mysql_query( - 'UPDATE `stats` SET `timeGo` = "' . $u->info['timeGo'] . '",`timeGoL` = "' . $u->info['timeGoL'] . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1' - ); - if ($upd) { - $upd2 = mysql_query( - 'UPDATE `users` SET `room` = "' . $go['id'] . '",`online` = "' . time() . '" WHERE `id` = "' . $u->info['id'] . '" LIMIT 1' + Db::sql('update stats set timeGo = ?, timeGoL = ? where id = ?', [$u->info['timeGo'], $u->info['timeGoL'], $u->info['id']]); + Db::sql('update users set room = ?, online = unix_timestamp() where id = ?', [$go['id'], $u->info['id']]); + + if ($u->room['file'] == 'bsenter' && $go['file'] != 'bsenter') { + //Удаляем все ставки в БС + Db::sql( + 'update bs_turnirs + set users = users - (select count(bsid) from bs_zv where inBot = 0 and finish = 0 and uid = ?) + where id = (select bsid from bs_zv where inBot = 0 and finish = 0 and uid = ? limit 1)', [$u->info['id'], $u->info['id']] ); - if ($upd2) { - if ($u->room['file'] == 'bsenter' && $go['file'] != 'bsenter') { - //Удаляем все ставки в БС - $sp_bs = mysql_query( - 'SELECT `id`,`bsid`,`money` FROM `bs_zv` WHERE `uid` = "' . $u->info['id'] . '" AND `inBot` = "0" AND `finish` = "0"' - ); - while ($pl_bs = mysql_fetch_array($sp_bs)) { - mysql_query( - 'UPDATE `bs_turnirs` SET `users` = `users` - 1 WHERE `id` = "' . $pl_bs['bsid'] . '" LIMIT 1' - ); - } - unset($sp_bs, $pl_bs); - mysql_query( - 'UPDATE `bs_zv` SET `finish` = "' . time() . '" WHERE `uid` = "' . $u->info['id'] . '" AND `inBot` = "0" AND `finish` = "0"' - ); - } - - $smt = $u->testAction( - '`uid` = "' . $u->info['id'] . '" AND `time`>=' . (time() - 600) . ' AND `vars` = "create_snowball_cp" LIMIT 1', - 1 - ); - if (isset($smt['id'])) { - mysql_query( - 'DELETE FROM `actions` WHERE `id` = "' . $smt['id'] . '" LIMIT 1' - ); - } - mysql_query( - 'UPDATE `eff_users` SET `delete` = "' . time() . '" WHERE `id_eff` = "24" AND `uid` = "' . $u->info['id'] . '" AND `delete` = "0" LIMIT 24' - ); - - $u->info['room'] = $go['id']; - $u->room = $go; - if (!isset($_GET['mAjax'])) { - echo ''; - } - } else { - $re = 'Вы не смогли перейти в локацию, возможно она была разрушена'; - } - } else { - $re = 'Вы не смогли перейти в локацию'; + Db::sql('update bs_zv set finish = unix_timestamp() where uid = ? and inBot = 0 and finish = 0', [$u->info['id']]); } + + $smt = $u->testAction( + '`uid` = "' . $u->info['id'] . '" AND `time`>=' . (time() - 600) . ' AND `vars` = "create_snowball_cp" LIMIT 1', + 1 + ); + if (isset($smt['id'])) { + ActionModel::deleteById($smt['id']); + } + Effects::removeByEffectId($u->info['id'], 24); + + $u->info['room'] = $go['id']; + $u->room = $go; + if (!isset($_GET['mAjax'])) { + echo ''; + } + + } elseif ($go['destroy'] == 1) { $re = 'Здание было разрушено, в данный момент оно реставрируется'; } else { @@ -354,9 +281,9 @@ if (isset($_GET['loc'])) { } else { $re = 'Проход не существует'; } -// } else { -// $re = 'Вам запрещено передвигаться до окончания обучения!!!'; -// } + // } else { + // $re = 'Вам запрещено передвигаться до окончания обучения!!!'; + // } } if ($u->info['room'] == 209) { @@ -376,36 +303,36 @@ if (isset($_GET['mAjax'])) { if ($tmGol < 1) { $tmGol = 1; } - $rowonmax = ''; - $rowonmax2 = 0; - $rowonmax2 = mysql_fetch_array( - mysql_query( - 'SELECT COUNT(`id`) FROM `users` WHERE `online` > ' . (time() - 520) . ' AND `inUser` = "0" AND `city` = "' . $u->info['city'] . '" AND `no_ip` != "trupojor" AND `pass` != "saintlucia" AND `login` NOT LIKE "%(%" AND `banned` = 0 AND `bot_id` = 0 LIMIT 1' - ) + + $playersOnline = Db::getValue( + "select count(id) from users where + online > unix_timestamp() - 520 and + inUser = 0 and + no_ip != 'trupojor' and + pass != 'saintlucia' and + login not like '%(%' and + banned = 0 and + bot_id = 0" ); - $rowonmax = 'Сейчас в клубе: ' . $rowonmax2[0] . ' чел.'; - $rowonmax = '' . $rowonmax . ''; - $rowonmax2c = mysql_fetch_array( - mysql_query( - 'SELECT COUNT(`id`) FROM `users` WHERE `online` > ' . (time() - 520) . ' AND `inUser` = "0" AND `no_ip` != "trupojor" AND `pass` != "saintlucia" AND `login` NOT LIKE "%(%" AND `banned` = 0 AND `bot_id` = 0 LIMIT 1' - ) + $allPlayers = Db::getValue( + "select count(id) from users where + inUser = 0 and + no_ip != 'trupojor' and + pass != 'saintlucia' and + login not like '%(%' and + banned = 0 and + bot_id = 0" ); - $rowonmax3c = mysql_fetch_array( - mysql_query( - 'SELECT COUNT(`id`) FROM `users` WHERE `online` > ' . (time() - 520) . ' AND `inUser` = "0" AND `no_ip` != "trupojor" AND `pass` != "saintlucia" AND `login` NOT LIKE "%(%" AND `banned` = 0 AND `bot_id` = 0 LIMIT 1' - ) - ); - $rowonmaxc = 'Всего в Игре: ' . $rowonmax2c[0] . ' чел.'; - unset($sil, $pil, $rowonmax2); + $rowonmax = "Сейчас в клубе: $playersOnline чел."; + $rowonmaxc = "Всего в Игре: $allPlayers чел."; if ($u->room['file'] != '') { - include_once('modules_data/location/fight-club.database.php'); + exit(LocationResponse::init($tmGo, $tmGol, $u->room['file'], $u->room['name'])); } - exit(json_encode($Response)); } if (isset($_GET['ajaxHostel'])) { // Для общежития, проверка на лимит положенных предметов в сундук. - include_once('modules_data/location/room_hostel.php'); + include_once 'modules_data/location/room_hostel.php'; } @@ -424,19 +351,16 @@ if (isset($_GET['ajaxHostel'])) { // Для общежития, проверка - + 1, - 267 => 1, - 9 => 1, - 286 => 1, - 11 => 1, - 236 => 1, - 213 => 1, - 252 => 1, - 323 => 1, - ]; - if ($rsnow[$u->room['id']] == 1) { + $rsnow = [9, 11, 213, 234, 236, 252, 267, 286, 323,]; + + if (in_array($u->room['id'], $rsnow)) { ?> '; - $goline = '
- ' . $goLis . ' -
'; - $rowonmax = ''; - $rowonmax2 = 0; + $goline = '
' . $goLis . '
'; + $playersOnline = Db::getValue( + "select count(id) from users where + online > unix_timestamp() - 520 and + inUser = 0 and + no_ip != 'trupojor' and + pass != 'saintlucia' and + login not like '%(%' and + banned = 0 and + bot_id = 0" + ); + $allPlayers = Db::getValue( + "select count(id) from users where + inUser = 0 and + no_ip != 'trupojor' and + pass != 'saintlucia' and + login not like '%(%' and + banned = 0 and + bot_id = 0" + ); - $rowonmax2 = mysql_fetch_array( - mysql_query( - 'SELECT COUNT(`id`) FROM `users` WHERE `online` > ' . (time() - 777) . ' AND `inUser` = "0" AND `city` = "' . $u->info['city'] . '" AND `no_ip` != "trupojor" AND `pass` != "saintlucia" AND `login` NOT LIKE "%(%" AND `banned` = 0 AND `bot_id` = 0 LIMIT 1' - ) - ); - $rowonmax = '
Сейчас в клубе ' . ($rowonmax2[0]) . ' реальных чел.'; - $rowonmax2c = mysql_fetch_array( - mysql_query( - 'SELECT COUNT(`id`) FROM `users` WHERE `online` > ' . (time() - 770) . ' AND `inUser` = "0" AND `no_ip` != "trupojor" AND `login` NOT LIKE "%(%" AND `banned` = 0 AND `bot_id` = 0 LIMIT 1' - ) - ); - $rowonmax3c = mysql_fetch_array( - mysql_query( - 'SELECT COUNT(`id`) FROM `users` WHERE `online` > ' . (time() - 770) . ' AND `inUser` = "0" AND `no_ip` != "trupojor" AND `login` NOT LIKE "%(%" AND `banned` = 0 AND `bot_id` = 0 LIMIT 1' - ) - ); - if ($rowonmax2c[0] - $rowonmax2[0] > 0) { - $rowonmaxc = '(Общий онлайн с учетом ботов: ' . ($rowonmax2c[0] + 5) . ' чел.)'; + $rowonmax = '
Сейчас в клубе ' . $playersOnline . ' реальных чел.'; + + if ($allPlayers > $playersOnline) { + $rowonmax .= '
(Общий онлайн: ' . $allPlayers . ' чел.)'; } - $rowonmax = $rowonmax . '
' . $rowonmaxc; - unset($sil, $pil, $rowonmax2); + if ($u->room['file'] != '') { include_once('modules_data/location/' . $u->room['file'] . '.php'); - if ((date('m') == 11 || date('m') == 12 || date('m') == 1 || date('m') == 2) && $rsnow[$u->room['id']] == 1) { + if ((date('m') == 11 || date('m') == 12 || date('m') == 1 || date('m') == 2) && in_array($u->room['id'], $rsnow)) { echo ''; } } diff --git a/modules_data/location/bk.php b/modules_data/location/bk.php index f1106584..c8e2baf5 100644 --- a/modules_data/location/bk.php +++ b/modules_data/location/bk.php @@ -40,12 +40,10 @@ if ($u->room['file'] != 'bk') {
info['login'] == 'mZer0ne') { ?> - 'Ваше местоположение', - 'move-bk'=>'Проход через "Бойцовский клуб"', - 'move-zalu4'=>'Проход через "Зал паладинов"', - 'move-map_halls'=>'Проход через "Залы"', - 'move-to-sek4'=>'Проход через "Рыцарский" или "Торговый" зал', - 'move-sek5'=>'Проход через "Торговый зал"', - 'move-sek6'=>'Проход через "Рыцарский зал"', -); -$Response = array('status'=>'update'); -switch($u->room['file']){ - case'bk':// Бойцовский клуб - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig', - 'left'=>'241', - 'top'=>'128', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_bk','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_klub1','params'=>thisInfRm('1.180.0.15', NULL, true)), - array('id'=>'map_klub2','params'=>thisInfRm('1.180.0.225', NULL, true)), - array('id'=>'map_klub3','params'=>thisInfRm('1.180.0.2', NULL, true)), - array('id'=>'map_klub4','params'=>thisInfRm('1.180.0.4', NULL, true)), - array('id'=>'map_klub5','params'=>thisInfRm('1.180.0.5', NULL, true)), - array('id'=>'map_klub6','params'=>thisInfRm('1.180.0.16', NULL, true)), - array('id'=>'map_klub7','params'=>thisInfRm('1.180.0.9', NULL, true)) - ), - 'buttons'=>array( - array('Возврат','main.php?homeworld=true'), - array('Карта клуба','main.php?clubmap=true'), - array('Форум',"window.open('" . $c['forum'] . "', 'forum', 'location=yes,menubar=yes,status=yes,resizable=yes,toolbar=yes,scrollbars=yes,scrollbars=yes')"), - array('Подсказка',"window.open('/encicl/help/top1.html', 'help', 'height=300,width=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes')") - ) - ); - break; - case'zv1':// Зал Воинов 1 - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig', - 'left'=>'154', - 'top'=>'148', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_bk','params'=>thisInfRm('1.180.0.3', NULL, true)), - array('id'=>'map_klub1','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub2','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub3','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub4','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_klub5','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub6','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub7','params'=>array(false, $StaticMSG['move-bk'])) - ) - ); - break; - case'zv2':// Зал Воинов 2 - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig', - 'left'=>'395', - 'top'=>'142', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_bk','params'=>thisInfRm('1.180.0.3', NULL, true)), - array('id'=>'map_klub1','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub2','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub3','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_klub4','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub5','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub6','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub7','params'=>array(false, $StaticMSG['move-bk'])) - ) - ); - break; - case'zv3':// Зал Воинов 3 - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig', - 'left'=>'337', - 'top'=>'79', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_bk','params'=>thisInfRm('1.180.0.3', NULL, true)), - array('id'=>'map_klub1','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub2','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub3','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub4','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub5','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_klub6','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub7','params'=>array(false, $StaticMSG['move-bk'])) - ) - ); - break; - case'zv4':// Будуар - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig', - 'left'=>'139', - 'top'=>'79', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_bk','params'=>thisInfRm('1.180.0.3', NULL, true)), - array('id'=>'map_klub1','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub2','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub3','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub4','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub5','params'=>array(false, $StaticMSG['move-bk'])), - array('id'=>'map_klub6','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_klub7','params'=>array(false, $StaticMSG['move-bk'])) - ) - ); - break; - case'zalu':// Залы - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig1', - 'left'=>'337', - 'top'=>'117', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_halls','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_zalu3','params'=>array(false, $StaticMSG['move-zalu4'])), - array('id'=>'map_zalu4','params'=>thisInfRm('1.180.0.16', NULL, true)), - array('id'=>'map_zalu6','params'=>array(false, $StaticMSG['move-zalu4'])), - array('id'=>'map_zalu7','params'=>thisInfRm('1.180.0.3', NULL, true)) - - ) - ); - break; - case'zalu_pal':// Залы - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig1', - 'left'=>'163', - 'top'=>'28', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_halls','params'=>thisInfRm('1.180.0.15', NULL, true)), - array('id'=>'map_zalu3','params'=>thisInfRm('1.180.0.xx', NULL, true)), - array('id'=>'map_zalu4','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_zalu6','params'=>thisInfRm('1.180.0.0', NULL, true)), - array('id'=>'map_zalu7','params'=>array(false, $StaticMSG['move-map_halls'])) - ) - ); - break; - case'bk2':// Залы - $Response = array( - 'status'=>'success', - 'location'=>array( - 'bg'=>'navig3', - 'left'=>'162', - 'top'=>'125', - 'name'=>$u->room['name'], - 'tgo'=>($tmGo*10), - 'tgo1'=>($tmGol*10) - ), - 'goto'=>array( - array('id'=>'map_2stair','params'=>array(false, $StaticMSG['your-position'])), - array('id'=>'map_sec1','params'=>thisInfRm('1.180.0.3', NULL, true)), - array('id'=>'map_sec2','params'=>thisInfRm('1.180.0.xx', NULL, true)), - array('id'=>'map_sec3','params'=>array(false, $StaticMSG['move-sek5'])), - array('id'=>'map_sec4','params'=>array(false, $StaticMSG['move-to-sek4'])), - array('id'=>'map_sec5','params'=>thisInfRm('1.180.0.221', NULL, true)), - array('id'=>'map_sec6','params'=>thisInfRm('1.180.0.224', NULL, true)), - array('id'=>'map_sec7','params'=>array(false, $StaticMSG['move-sek6'])) - ) - ); - break; - -} -$Response; \ No newline at end of file diff --git a/modules_data/location/fight-club.php b/modules_data/location/fight-club.php index 9d005c44..bd8f602e 100644 --- a/modules_data/location/fight-club.php +++ b/modules_data/location/fight-club.php @@ -1,60 +1,70 @@ +?> + - - - - + + + - +
+ +
getInfoPers($u->info['id'],0); - if($usee!=false){ - echo $usee[0]; - }else{ - echo 'information is lost.'; - } - ?>
error!=''){ - echo ''.$u->error.''; - } - ?> - - - -
'.$re.''; - } - ?> - - - -
- - ?>
- -
testHome(); if(!isset($hgo['id'])){ - echo''; - } - unset($hgo); - ?> - - - - -

- Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
+
getInfoPers($u->info['id'], 0); + if ($usee) { + echo $usee[0]; + } else { + echo 'information is lost.'; + } + ?> +
error != '') { + echo '' . $u->error . ''; + } + ?> + + + + +
' . $re . ''; + } + ?> + + + + +
+ +
+ + ?> + +
+ +
+
testHome(); + if (!isset($hgo['id'])) { + echo ''; + } + unset($hgo); + ?> + + + + +

+ Внимание!Смените пароль на уникальный,который не использовался ранее в подобных проектах,это обезопасит вашего персонажа от взлома.
Администрация.
-
-
\ No newline at end of file