diff --git a/aren_of_angels.php b/aren_of_angels.php
index 92b92a4..041e646 100644
--- a/aren_of_angels.php
+++ b/aren_of_angels.php
@@ -27,7 +27,7 @@ function join_arena($u, $btl, $team, $at)
     } else {
         $adtxt = 'За сторону <b>Света</b>.';
     }
-    addlog($btl, '<span class=date>' . date("H:i") . '</span> ' . nick::id($u)->short() . ' вмешался в поединок! ' . $adtxt . '<br />');
+    addlog($btl, '<span class=date>' . date("H:i") . '</span> ' . Nick::id($u)->short() . ' вмешался в поединок! ' . $adtxt . '<br />');
     mysql_query('UPDATE `battle` SET `teams` = \'' . serialize($battle) . '\', `t' . $team . '` = CONCAT(`t' . $team . '`,\';' . $u . '\')  WHERE `id` = "' . $btl . '" LIMIT 1');
     mysql_query("UPDATE users SET `battle` = '" . $btl . "', `zayavka` = 0 WHERE `id` = '" . $u . "' LIMIT 1");
     header("Location: fbattle.php");
diff --git a/c_haos.php b/c_haos.php
index 1fea7fe..3778707 100644
--- a/c_haos.php
+++ b/c_haos.php
@@ -191,7 +191,7 @@ elseif ($in_haos['status']==0)
             if($cit_haos_pl['players']!='')
             {
                 foreach(explode(";",$cit_haos_pl['players']) as $ch_p)
-                    echo(nick::id($ch_p)->full(1).",");  
+                    echo(Nick::id($ch_p)->full(1).",");
                 echo('Пароль:<input type="text" size="10" NAME="gr_pass_in'.$i.'">');
             }
                 
@@ -208,7 +208,7 @@ elseif ($in_haos['status']==0)
              if(strlen($cit_haos_pl['players'])>1)
             {
                 foreach(explode(";",$cit_haos_pl['players']) as $ch_p)
-                    echo(nick::id($ch_p)->full(1).",");  
+                    echo(Nick::id($ch_p)->full(1).",");
                 echo('Пароль:<input type="text" size="10" NAME="gr_pass_in'.$i.'">');
             }
             else echo('  <em>(Создать новую группу)</em>');
@@ -239,7 +239,7 @@ elseif ($in_haos['status']==1)
    echo("<br />");
    $cit_haos_pl=mysql_fetch_array(mysql_query("SELECT * FROM `cit_haos_var` WHERE `group`='".$in_haos['group']."' LIMIT 1;"));
                 foreach(explode(";",$cit_haos_pl['players']) as $ch_p)
-                    echo(nick::id($ch_p)->full(1)."<br />"); 
+                    echo(Nick::id($ch_p)->full(1)."<br />");
    
    echo("</td></tr>");
 }
@@ -260,7 +260,7 @@ elseif ($in_haos['status']==4)
 elseif ($in_haos['status']==5)
 {
     mysql_query("UPDATE users SET `doblest`=`doblest`+'1' WHERE `id` = '".$user['id']."';");
-            addchp ('За убийство босса ЦХ вы получили 1 доблести','{[]}'.nick::id($user['id'])->short().'{[]}');
+            addchp ('За убийство босса ЦХ вы получили 1 доблести','{[]}'.Nick::id($user['id'])->short().'{[]}');
     		mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
                         VALUES ('','0','{$cur_user['id']}','\"".$user['login']."\" получил в ЦХ 1 доблести',1,'".time()."');");
     mysql_query("DELETE FROM `cit_haos_status` WHERE `id` ='{$user['id']}'; ");
diff --git a/c_haos_in.php b/c_haos_in.php
index b7a6e68..58f6b34 100644
--- a/c_haos_in.php
+++ b/c_haos_in.php
@@ -129,7 +129,7 @@
             if ($in_haos['status'] == 2) 
             {
                mysql_query("UPDATE `cit_haos_status` SET room='0',status='5',bot='0' WHERE id = '{$user['id']}'; ");
-               addchp ('Вы пробились до двери на 2 уровень подземелий Цитадели Хаоса. Только опытный воин и храбрый страж сможет пройти через нее (10 уровень, страж 2 уровня)','{[]}'.nick::id($user['id'])->short().'{[]}'); 
+               addchp ('Вы пробились до двери на 2 уровень подземелий Цитадели Хаоса. Только опытный воин и храбрый страж сможет пройти через нее (10 уровень, страж 2 уровня)','{[]}'.Nick::id($user['id'])->short().'{[]}');
             }
             mysql_query("UPDATE `cit_haos_var` SET bots='',players='' WHERE group='".$in_haos['group']."'; ");
             header('location: c_haos.php');
@@ -235,7 +235,7 @@ if($_POST['go_attack'])
         $group_raw=mysql_query("SELECT * FROM `cit_haos_status` WHERE `group` = '{$in_haos['group']}' AND status='2';");
         while ($gr = mysql_fetch_array($group_raw))
             {
-                addchp ('<font color=red>Внимание!</font> '.$bot_name.' напал на Вашу группу!','{[]}'.nick::id($gr['id'])->short().'{[]}');
+                addchp ('<font color=red>Внимание!</font> '.$bot_name.' напал на Вашу группу!','{[]}'.Nick::id($gr['id'])->short().'{[]}');
             }
        
        for($bot_c=0;$bot_c<$bot_count;$bot_c++)
@@ -389,19 +389,19 @@ $tm=time();
 				'{$dress['mfkrit']}','{$dress['mfakrit']}','{$dress['mfuvorot']}','{$dress['mfauvorot']}','{$dress['bron1']}','{$dress['bron3']}','{$dress['bron2']}','{$dress['bron4']}','{$dress['maxu']}','{$dress['minu']}','{$dress['magic']}','{$dress['nlevel']}','{$dress['nalign']}','".(($dress['goden'])?($dress['goden']*24*60*60+time()):"")."','{$dress['goden']}','{$dress['razdel']}','{$dress['gmp']}','{$dress['gmeshok']}','{$dress['encicl']}','{$dress['artefact']}','{$dur}','Мусорщик'
 				) ;");
             mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) VALUES ('','0','$all_get[$l_id]','\"".$user['login']."\" получил в ЦХ предмет: \"".$dress['name']."\" ".$dresscount."id:(".$dressid.") [0/".$dress['maxdur']."]',1,'".time()."');");
-            addchp ('За убийство босса Цитадели Хаоса вы получили '.$dress['name'],'{[]}'.nick::id($all_get[$l_id])->short().'{[]}');
+            addchp ('За убийство босса Цитадели Хаоса вы получили '.$dress['name'],'{[]}'.Nick::id($all_get[$l_id])->short().'{[]}');
         }
         if($priz_exp>0)
         {
 	 GiveExp($all_get[$l_id],$priz_exp);
-            addchp ('За убийство босса Цитадели Хаоса вы получили '.$priz_exp.' опыта','{[]}'.nick::id($all_get[$l_id])->short().'{[]}');
+            addchp ('За убийство босса Цитадели Хаоса вы получили '.$priz_exp.' опыта','{[]}'.Nick::id($all_get[$l_id])->short().'{[]}');
     		mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
                         VALUES ('','0','{$cur_user['id']}','\"".$all_get[$l_id]."\" получил в ЦХ \"".$priz_exp."\" опыта',1,'".time()."');");
         }
         if($priz_dobl>0)
         {
             mysql_query("UPDATE users SET `doblest`=`doblest`+'".$priz_dobl."' WHERE `id` = '".$all_get[$l_id]."';");
-            addchp ('За убийство босса Цитадели Хаоса вы получили '.$priz_dobl.' доблести','{[]}'.nick::id($all_get[$l_id])->short().'{[]}');
+            addchp ('За убийство босса Цитадели Хаоса вы получили '.$priz_dobl.' доблести','{[]}'.Nick::id($all_get[$l_id])->short().'{[]}');
     		mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
                         VALUES ('','0','{$cur_user['id']}','\"".$all_get[$l_id]."\" получил в ЦХ \"".$priz_dobl."\" доблести',1,'".time()."');");
         }
diff --git a/c_park.php b/c_park.php
index bc19334..b6db2f7 100644
--- a/c_park.php
+++ b/c_park.php
@@ -117,7 +117,7 @@
         foreach($bots as $b) mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$b} LIMIT 1;");
     	mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']};");
         
-        addchp ('<font color=red>Внимание!</font> Вы вступили в бой c бандитами!','{[]}'.nick::id($user['id'])->short().'{[]}');
+        addchp ('<font color=red>Внимание!</font> Вы вступили в бой c бандитами!','{[]}'.Nick::id($user['id'])->short().'{[]}');
     	
         die("<script>location.href='fbattle.php';</script>");
     }
@@ -206,11 +206,11 @@ if($in_park['room']==0 || $in_park['room']>=15)
             }
             
             mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) VALUES ('','0','{$user['id']}','\"".$user['login']."\" Подобрал в Парке гайки ( \"".$gadget_num."\" ".$dresscount."id:(".$dressid.") [0/".$dress['maxdur']."]',1,'".time()."');");
-            addchp ('В Парке Вы подобрали гайки ('.$gadget_num.' шт.)','{[]}'.nick::id($user['id'])->short().'{[]}');
+            addchp ('В Парке Вы подобрали гайки ('.$gadget_num.' шт.)','{[]}'.Nick::id($user['id'])->short().'{[]}');
             //денежный приз
             $priz=mt_rand(1,10);
             mysql_query("UPDATE users set money=money+{$priz} where id='{$user['id']}';");
-        	addchp ('После посещения Парка Вы обогатились на '.$priz.' кр. ','{[]}'.nick::id($user['id'])->short().'{[]}');
+        	addchp ('После посещения Парка Вы обогатились на '.$priz.' кр. ','{[]}'.Nick::id($user['id'])->short().'{[]}');
         	mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
             VALUES ('','0','{$user['id']}','\"".$user['login']."\" нашел в Парке ".$priz." кр. ',1,'".time()."');");
             //переход
diff --git a/canalizaciya.php b/canalizaciya.php
index 5eb58fc..5609a8b 100644
--- a/canalizaciya.php
+++ b/canalizaciya.php
@@ -525,7 +525,7 @@ die("<script>location.href='canalizaciya.php';</script>");
     <td valign="top" align="left">
 <?php
 //Вывести хп и ману
-print "<div style=\"font-size: 12px\">". nick($user)."</div>";
+sprintf('<div style="font-size: 12px">%s</div>',Nick::id($user)->battle());
 ?>    
     <br><br>
 <div style="text-align: center;"><table width="450" border="0" cellspacing="1" cellpadding="0">
diff --git a/cave.php b/cave.php
index 810ee78..b98f892 100644
--- a/cave.php
+++ b/cave.php
@@ -134,7 +134,7 @@ function battlewithbot($b, $name = '', $time = 3, $blood = 1, $group = 1, $battl
         if ($user1['invis'] == 1) {
             addlog($battleid, '<span class=date>' . date("H:i") . '</span> <b>невидимка</b> вмешался в поединок!<BR>');
         } else {
-            addlog($battleid, '<span class=date>' . date("H:i") . '</span> ' . nick::id($user['id'])->short() . ' вмешался в поединок!<BR>');
+            addlog($battleid, '<span class=date>' . date("H:i") . '</span> ' . Nick::id($user['id'])->short() . ' вмешался в поединок!<BR>');
         }
 
         mysql_query('UPDATE `battle` SET `teams` = \'' . serialize($battle) . '\', `t' . $ttt . '` = CONCAT(`t' . $ttt . '`,\';' . $user1['id'] . '\')  WHERE `id` = ' . $battleid . ' LIMIT 1');
@@ -187,9 +187,9 @@ function battlewithbot($b, $name = '', $time = 3, $blood = 1, $group = 1, $battl
         mysql_query("UPDATE `users` SET `battle` = {$battleid} WHERE `id` = {$user1['id']} LIMIT 1");
 
         if ($user1['invis'] == 1) {
-            $rr = "<b>невидимка</b> и <b>" . nick::id($botid1)->full(1) . "</b>";
+            $rr = "<b>невидимка</b> и <b>" . Nick::id($botid1)->full(1) . "</b>";
         } else {
-            $rr = "<b>" . nick::id($user1['id'])->full(1) . "</b> и <b>" . nick::id($botid1)->full(1) . "</b>";
+            $rr = "<b>" . Nick::id($user1['id'])->full(1) . "</b> и <b>" . Nick::id($botid1)->full(1) . "</b>";
         }
         addlog($battleid, "Часы показывали <span class=date>" . date("Y.m.d H.i") . "</span>, когда " . $rr . " бросили вызов друг другу. <BR>" . ($others ? "$others<BR>" : ""));
         if (!$noredir) {
@@ -1475,9 +1475,7 @@ function drawmap($map1, $players, $x, $y, $direction) {
     $ret.="</table></div>
     </td></tr></table>";
 
-    $ret.="<div align=\"center\" style=\"position:absolute; left:389px; top:10px; font-size:6px;padding:0px;border:solid black 0px; text-align:center\" id=\"prcont\">
-    <script language=\"javascript\" type=\"text/javascript\">
-    var s=\"\";for (i=1; i<=32; i++) {s+='<span id=\"progress'+i+'\">&nbsp;</span>';if (i<32) {s+='&nbsp;'};}document.getElementById('prcont').innerHTML=s;
+    $ret.= ">&nbsp;</span>';if (i<32) {s+='&nbsp;'}}document.getElementById('prcont').innerHTML=s;
     </script></div>";
 
     $ret.="<TABLE><tr>
diff --git a/ch.php b/ch.php
index cc0f507..1852a67 100644
--- a/ch.php
+++ b/ch.php
@@ -161,7 +161,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
                 style = '';
                 if (!name2) name2 = name;
                 if (klan.length > 0) {
-                    klan = '<img src="i/klan/' + klan + '.gif" title="' + klan + '">';
+                    klan = '<img src="i/clan/' + klan + '.gif" title="' + klan + '">';
                 }
                 document.write('<A HREF="javascript:top.AddToPrivate(\'' + name + '\', top.CtrlPress)" target=refreshed><img src="i/');
                 if (in_battle > 0) {
diff --git a/church.php b/church.php
index fc6a61d..20abcdb 100644
--- a/church.php
+++ b/church.php
@@ -61,7 +61,7 @@ if(isset($_GET['info'])){
 			while($row = mysql_fetch_assoc($getRating)){
 				echo'<tr>' .
 					'<td align="center" width="25" bgcolor="#' . ($row['uid'] != $user['id'] ? 'C0C0CA' : '999999') . '"><b>' . $i++ . '</b></td>' .
-					'<td align="center" bgcolor="#' . ($row['uid'] != $user['id'] ? 'C0C0CA' : '999999') . '">' . nick::id($row['id'])->full(1) . '</td>' .
+					'<td align="center" bgcolor="#' . ($row['uid'] != $user['id'] ? 'C0C0CA' : '999999') . '">' . Nick::id($row['id'])->full(1) . '</td>' .
 					'<td align="center" bgcolor="#' . ($row['uid'] != $user['id'] ? 'C0C0CA' : '999999') . '"><b>' . $row['val'] . '</b> шт.</td>' .
 				'</tr>';
 			}
@@ -69,7 +69,7 @@ if(isset($_GET['info'])){
 				'<td align="center" colspan="3">&nbsp;</td>' .
 			'</tr>' .
 			'<tr>' .
-				'<td align="center" colspan="2" bgcolor="#C0C0CA">' . nick::id($row['id'])->full(1) . '</td>' .
+				'<td align="center" colspan="2" bgcolor="#C0C0CA">' . Nick::id($row['id'])->full(1) . '</td>' .
 				'<td align="center" bgcolor="#C0C0CA"><b>' . intval(mysql_result(mysql_query("SELECT SUM(`val`) as `val` FROM `church_logs` WHERE `key`='" . $getResource['id'] . "' AND `ch`='" . $thisChurch . "' AND `uid`='" . $user['id'] . "' GROUP BY `uid` ORDER BY SUM(`val`) DESC LIMIT 1;"), 0)) . '</b> шт.</td>' .
 			'</tr>';
 		}else{
diff --git a/clan.php b/clan.php
index d1a49fd..506a358 100644
--- a/clan.php
+++ b/clan.php
@@ -94,7 +94,7 @@ $clan_memberlist = db::c()->query('SELECT `id`, `login`, `status`, `level`, `roo
     <tr>
         <td>
             <p style="width: 50%; vertical-align: top;" rowspan=2>
-            <h3><img src="./i/klan/<?= $klan['short'] ?>.gif"><?= $klan['name'] ?></h3>
+            <h3><img src="./i/clan/<?= $klan['short'] ?>.gif"><?= $klan['name'] ?></h3>
             Количество рейтинговых очков клана: <span
                     style="color: #428f21; font-size: larger;"><?= $klan['rating'] ?></span><br>
 
@@ -193,7 +193,7 @@ $clan_memberlist = db::c()->query('SELECT `id`, `login`, `status`, `level`, `roo
                     else $rrm = $rooms[$row['room']];
                     ?>
                     <tr>
-                        <td><?= nick::id($row['id'])->full() ?></td>
+                        <td><?= Nick::id($row['id'])->full() ?></td>
                         <td><?= $row['status'] ?></td>
                         <td><i style="font-size: smaller;"><?= $rrm ?></i></td>
                     </tr>
diff --git a/clan_castle.php b/clan_castle.php
index e301502..309eb33 100644
--- a/clan_castle.php
+++ b/clan_castle.php
@@ -70,7 +70,7 @@ $own=mysql_fetch_array(mysql_query("SELECT `value` FROM `variables` WHERE `var`
 if($own['value']>0) $tmp_k=mysql_fetch_array(mysql_query("SELECT `name` FROM `clans` WHERE `id` = '{$own['value']}' LIMIT 1;"));
 echo('<br />Над Замком развевается флаг ');
 if($tmp_k['name']) 
-    echo('<strong>клана <img title="'.$tmp_k['name'].'" src="i/klan/'.$tmp_k['name'].'.gif">'.$tmp_k['name'].'</strong><br />');
+    echo('<strong>клана <img title="'.$tmp_k['name'].'" src="i/clan/'.$tmp_k['name'].'.gif">'.$tmp_k['name'].'</strong><br />');
 else
     echo('<strong>сил Хаоса</strong><br />');
 
@@ -91,7 +91,7 @@ elseif($ccd<time() && ($ccd+900)>=time())
        {
             $zays[]=$a_zay['clan'];
             $tmp_k=mysql_fetch_array(mysql_query("SELECT `name` FROM `clans` WHERE `id` = '{$a_zay['clan']}' LIMIT 1;"));
-            echo '<tr><td><strong>Клан <img title="'.$tmp_k['name'].'" src="i/klan/'.$tmp_k['name'].'.gif">'.$tmp_k['name'].'</strong></td></tr>';
+            echo '<tr><td><strong>Клан <img title="'.$tmp_k['name'].'" src="i/clan/'.$tmp_k['name'].'.gif">'.$tmp_k['name'].'</strong></td></tr>';
        }
        if(empty($zays))
         echo '<tr><td><strong>Ждем смелых ...</strong></td></tr>';
@@ -127,8 +127,8 @@ elseif(($ccd+900)<time() && ($ccd+90+900)>=time())
             if($own['value']>0)
                 $tmp_o=mysql_fetch_array(mysql_query("SELECT `name` FROM `clans` WHERE `id` = '{$own['value']}' LIMIT 1;"));
        
-   if($tmp_k) echo('Внимание!<img title="'.$tmp_k['name'].'" src="i/klan/'.$tmp_k['name'].'.gif"><strong>'.$tmp_k['name'].'</strong> собираются штурмовать замок');
-   if($tmp_k && $own['value']>0) echo('<img title="'.$tmp_o['name'].'" src="i/klan/'.$tmp_o['name'].'.gif"><strong>'.$tmp_o['name'].'</strong>!');
+   if($tmp_k) echo('Внимание!<img title="'.$tmp_k['name'].'" src="i/clan/'.$tmp_k['name'].'.gif"><strong>'.$tmp_k['name'].'</strong> собираются штурмовать замок');
+   if($tmp_k && $own['value']>0) echo('<img title="'.$tmp_o['name'].'" src="i/clan/'.$tmp_o['name'].'.gif"><strong>'.$tmp_o['name'].'</strong>!');
    if($tmp_k && !$own['value']>0) echo('!');
 }
 elseif(($ccd+90+900)<=time())
@@ -175,7 +175,7 @@ elseif(($ccd+90+900)<=time())
         $cc_k=mysql_fetch_array(mysql_query("SELECT `name` FROM `clans` WHERE `id` = '{$cc_own['value']}' LIMIT 1;"));
         $cc_att=mysql_fetch_array(mysql_query("SELECT `value` FROM variables WHERE var='castle_att' LIMIT 1;"));
         $cc_a=mysql_fetch_array(mysql_query("SELECT `name` FROM `clans` WHERE `id` = '{$cc_att['value']}' LIMIT 1;"));
-        {AddChatSystem('<font color=red><strong>Клан <img title="'.$cc_a['name'].'" src="i/klan/'.$cc_a['name'].'.gif">'.$cc_a['name'].'</strong> без боя забрал у <strong>клана <img title="'.$cc_k['name'].'" src="i/klan/'.$cc_k['name'].'.gif">'.$cc_k['name'].'</strong> Замок Мэра</font>');}
+        {AddChatSystem('<font color=red><strong>Клан <img title="'.$cc_a['name'].'" src="i/clan/'.$cc_a['name'].'.gif">'.$cc_a['name'].'</strong> без боя забрал у <strong>клана <img title="'.$cc_k['name'].'" src="i/clan/'.$cc_k['name'].'.gif">'.$cc_k['name'].'</strong> Замок Мэра</font>');}
          
          $c_prev=mysql_fetch_array(mysql_query("SELECT `glava`,`align` FROM `clans` WHERE `id`='{$own['value']}' LIMIT 1;"));
             mysql_query("UPDATE `users` SET `align`='{$c_prev['align']}',`abil`='' WHERE `id`='{$c_prev['glava']}';");
@@ -237,15 +237,15 @@ elseif(($ccd+90+900)<=time())
                 
 				foreach( $at_t as $k=>$v ) {				    
 					if ($k!=0) { $rr.=", "; $rrc.=", "; }
-					$rr .= nick::id($v)->full(1);
-					$rrc .= nick::id($v)->short();    
-					addchp ('<font color=red>Внимание!</font> Ваш бой начался!<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($v)->short().'{[]}');
+					$rr .= Nick::id($v)->full(1);
+					$rrc .= Nick::id($v)->short();
+					addchp ('<font color=red>Внимание!</font> Ваш бой начался!<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($v)->short().'{[]}');
                 }
 				$rr .= "</b> и <b>"; $rrc .= "</b> и <b>";
 				foreach( $bots as $k=>$v ) {
 					if ($k!=0) { $rr.=", "; $rrc.=", ";}
-					$rr .= nick::id($v)->full(1);
-					$rrc .= nick::id($v)->short();
+					$rr .= Nick::id($v)->full(1);
+					$rrc .= Nick::id($v)->short();
                      }
 				$rr .= "</b>";
                 addch ("<a href=logs.php?log=".$id." target=_blank>Поединок</a> между <B>".$rrc."</B> начался.   ",$user['room']);
@@ -289,16 +289,16 @@ elseif(($ccd+90+900)<=time())
                 
 				foreach( $at_t as $k=>$v ) {				    
 					if ($k!=0) { $rr.=", "; $rrc.=", "; }
-					$rr .= nick::id($v)->full(1);
-					$rrc .= nick::id($v)->short();    
-					addchp ('<font color=red>Внимание!</font> Ваш бой начался!<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($v)->short().'{[]}');
+					$rr .= Nick::id($v)->full(1);
+					$rrc .= Nick::id($v)->short();
+					addchp ('<font color=red>Внимание!</font> Ваш бой начался!<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($v)->short().'{[]}');
                 }
 				$rr .= "</b> и <b>"; $rrc .= "</b> и <b>";
 				foreach( $ow_t as $k=>$v ) {
 					if ($k!=0) { $rr.=", "; $rrc.=", ";}
-					$rr .= nick::id($v)->full(1);
-					$rrc .= nick::id($v)->short();
-					addchp ('<font color=red>Внимание!</font> Ваш бой начался!<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($v)->short().'{[]}');
+					$rr .= Nick::id($v)->full(1);
+					$rrc .= Nick::id($v)->short();
+					addchp ('<font color=red>Внимание!</font> Ваш бой начался!<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($v)->short().'{[]}');
                 }
 				$rr .= "</b>";
                 addch ("<a href=logs.php?log=".$id." target=_blank>Поединок</a> между <B>".$rrc."</B> начался.   ",$user['room']);
diff --git a/clan_create.php b/clan_create.php
index 425b454..93badbb 100644
--- a/clan_create.php
+++ b/clan_create.php
@@ -74,7 +74,7 @@ if ($user['admin'] == '1') {
             <TD>", $clanreg_row['date'], "</TD>
             <TD>", $clanreg_row['name'], "</TD>
             <TD>", $clanreg_row['abbr'], "</TD>
-            <TD>", nick::id($clanreg_row['owner'])->full(), "</TD>
+            <TD>", Nick::id($clanreg_row['owner'])->full(), "</TD>
             <TD>", nl2br($clanreg_row['descr']), "</TD>
           </TR>";
     }
diff --git a/clan_log.php b/clan_log.php
index c2280d3..c5bc8cd 100644
--- a/clan_log.php
+++ b/clan_log.php
@@ -46,7 +46,7 @@ if($clan_acces[6][0] == 1) {
       $pp = "<img src=\"i/kazna_put.gif\" title=\"Положил еврокредиты\" />"; $dop = 'Екр.';
     }
     $it['date'] = date('d.m.y h:i', $it['time']);
-    $it['login'] = nick::id($it['user_id'])->full(1);
+    $it['login'] = Nick::id($it['user_id'])->full(1);
     $it['coms'] = ' <nobr>Комментарий : '.$it['comment'].'</nobr>';
     $t .= "<tr><td class='dash' align='center' width='10'>".$pp."</td><td class=dash align=left width=10>&nbsp;&nbsp;<nobr>".$it['date']."</nobr></td><td class='dash' align='left'>&nbsp;<nobr>".$it['login']."</nobr>".$it['coms']."</td><td class='dash' align='right'>".$it['suma']."&nbsp;$dop</td></tr>";
   }
diff --git a/clans.php b/clans.php
index 71a4366..81fe162 100644
--- a/clans.php
+++ b/clans.php
@@ -20,13 +20,13 @@ if ($claninf AND ($query = db::c()->query('SELECT * FROM `clans` WHERE `name` =
     echo "<h1>{$query['name']}</h1><p>{$query['descr']}</p>";
     $clanlist = db::c()->query('SELECT `login`,`status` FROM `users` WHERE `klan` = ?i',$query['id']);
     while ($member = $clanlist->fetch_assoc()) {
-        echo "<img src=i/align_",$query['align'],".gif> <img src=i/klan/",$query['short'],".gif> ",$member['login']," - ",$member['status'],"<br>";
+        echo "<img src=i/align_",$query['align'],".gif> <img src=i/clan/",$query['short'],".gif> ",$member['login']," - ",$member['status'],"<br>";
     }
 } else {
     echo "<h1>Список кланов</h1>";
     $query = db::c()->query('SELECT `align`,`name`,`short` FROM `clans` ORDER BY `name` ASC');
     while ($clanrow = $query->fetch_assoc()) {
-        $frm = "<img src='i/align_%s.gif'> <img src='i/klan/%s.gif'> <a href='?%s'>%s</a><br>";
+        $frm = "<img src='i/align_%s.gif'> <img src='i/clan/%s.gif'> <a href='?%s'>%s</a><br>";
         echo sprintf($frm,$clanrow['align'],$clanrow['short'],$clanrow['name'],$clanrow['name']);
     }
 }
diff --git a/classes/Nick.php b/classes/Nick.php
new file mode 100644
index 0000000..58c5acb
--- /dev/null
+++ b/classes/Nick.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Разные способы отображения строки с логином персонажа.
+ */
+
+class Nick extends User
+{
+    private $user_data;
+
+    private function getInvisibilityStatus()
+    {
+        return db::c()->query('SELECT 1 FROM users_effects WHERE type = 1022 AND owner_id = ?i', $this->id);
+        $User->login;
+    }
+
+    /**
+     * Отображение иконки склонности.
+     * @return string
+     */
+    private function getAlign()
+    {
+        if (isset($this->align)) {
+            return sprintf('<img src="i/align_%s.gif">', $this->align);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Отображение иконки клана.
+     * @return string
+     */
+    private function getClan()
+    {
+        if (isset($this->clan)) {
+            return sprintf('<img src="i/clan/%s.gif">', $this->clan);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Берем ID и возвращаем его. Что-то для обратной совместимости, скорее всего.
+     * TODO: Отвязаться от функции и удалить.
+     * @param $playerId
+     *
+     * @return Nick
+     */
+    public static function id($playerId)
+    {
+        return new self($playerId);
+    }
+
+    /**
+     * Возвращает строку со склонностью, кланом, логином, уровнем, ссылкой на профиль.
+     *
+     * @param int $showInvisibility - По умолчанию 0. Выбрать 1, если надо отображать невидимый статус.
+     *
+     * @return string
+     * @throws \Krugozor\Database\Mysql\Exception
+     */
+    public function full($showInvisibility = 0)
+    {
+        if ($showInvisibility && $this->getInvisibilityStatus()) {
+            return '<i>невидимка</i>';
+        }
+        return $this->getAlign().$this->getClan().sprintf('<b>%s</b> [%s] <a href="inf.php?%s" target="_blank"><img src="i/inf.gif" style="width:12px;height:11px"></a>', $this->login, $this->level, $this->login);
+    }
+
+    /**
+     * Возвращает строку с логином или невидимым статусом.
+     * @return string
+     * @throws \Krugozor\Database\Mysql\Exception
+     */
+    public function short()
+    {
+        if ($this->getInvisibilityStatus()) {
+            return '<i>невидимка</i>';
+        } else {
+            return htmlspecialchars($this->login);
+        }
+    }
+
+    /**
+     * Возвращает строку со склонностью, кланом, логином, уровнем, ссылкой на профиль, здоровьем.
+     * @return string
+     */
+    public function battle()
+    {
+        return $this->getAlign().$this->getClan().sprintf('<b>%s</b> [%s] <a href="inf.php?%s" target="_blank"><img src="i/inf.gif" style="width:12px;height:11px"></a> <img src="i/herz.gif" alt="HP"> _hp_/_maxhp_', $this->login, $this->level, $this->login);
+    }
+}
\ No newline at end of file
diff --git a/classes/User.php b/classes/User.php
index 37d0006..d4794a8 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -121,7 +121,7 @@ class User
             $nameString .= ' <b>' . $this->login . '</b> ';
         }
         if ($this->clan) {
-            $nameString .= sprintf('<img src="/i/klan/%s.png" >', ClanImage($this->clan));
+            $nameString .= sprintf('<img src="/i/clan/%s.png" >', ClanImage($this->clan));
         }
         echo '<div class="user-info">';
         echo '<div class="info">';
diff --git a/classes/battle_new.class.php b/classes/battle_new.class.php
index 94f15a9..2eb20b2 100644
--- a/classes/battle_new.class.php
+++ b/classes/battle_new.class.php
@@ -104,7 +104,7 @@ class fbattle
                                         }
                                         if ($us && (int)$us['hp'] > 0) {
                                             $tr = settravma($k, 0, 86400, 1);
-                                            $this->add_log('<span class=date>' . date("H:i") . '</span> ' . nick::id($k)->short() . ' получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                                            $this->add_log('<span class=date>' . date("H:i") . '</span> ' . Nick::id($k)->short() . ' получил повреждение: <font color=red>' . $tr . '</font><BR>');
                                         }
                                     }
                                     //$this->write_log ();
@@ -803,7 +803,7 @@ class fbattle
 
     function razmen_log($type, $kuda, $chem, $uron, $kto, $c1, $pokomy, $c2, $hp, $maxhp)
     {
-        $this->write_stat(nick::id($kto)->short() . "|++|" . nick::id($pokomy)->short() . "|++|" . $type . "|++|" . $uron . "|++|" . $kuda . "|++|" . $chem);
+        $this->write_stat(Nick::id($kto)->short() . "|++|" . Nick::id($pokomy)->short() . "|++|" . $type . "|++|" . $uron . "|++|" . $kuda . "|++|" . $chem);
 
         if ($this->enemyhar['sex'] && $kto == $this->enemyhar['id']) {
             $sex1 = false;
@@ -932,7 +932,7 @@ class fbattle
                     $textuvorot = array(" <font color=green><B>уклонился</B></font> от удара ", " <font color=green><B>увернулся</B></font> от удара ", " <font color=green><B>отскочил</B></font> от удара ");
                 }
 
-                return '<span class=date>' . date("[H:i:s]") . '</span> ' . nick::id($kto)->short() . ' ' . $textfail[rand(0, count($textfail) - 1)] . ' ' . $hark2[rand(0, count($hark2) - 1)] . ' ' . nick::id($pokomy)->short() . ' ' . $textuvorot[rand(0, count($textuvorot) - 1)] . ' ' . $textchem[rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
+                return '<span class=date>' . date("[H:i:s]") . '</span> ' . Nick::id($kto)->short() . ' ' . $textfail[rand(0, count($textfail) - 1)] . ' ' . $hark2[rand(0, count($hark2) - 1)] . ' ' . Nick::id($pokomy)->short() . ' ' . $textuvorot[rand(0, count($textuvorot) - 1)] . ' ' . $textchem[rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
                 break;
             //блок
             case "block":
@@ -941,7 +941,7 @@ class fbattle
                 } else {
                     $textblock = array(" заблокировал удар ", " остановил удар ", " отбил удар ");
                 }
-                return '<span class=date>' . date("[H:i:s]") . '</span> ' . nick::id($kto)->short() . ' ' . $textfail[rand(0, count($textfail) - 1)] . ' ' . $hark2[rand(0, count($hark2) - 1)] . ' ' . nick::id($pokomy)->short() . ' ' . $textblock[rand(0, count($textblock) - 1)] . ' ' . $textchem[rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
+                return '<span class=date>' . date("[H:i:s]") . '</span> ' . Nick::id($kto)->short() . ' ' . $textfail[rand(0, count($textfail) - 1)] . ' ' . $hark2[rand(0, count($hark2) - 1)] . ' ' . Nick::id($pokomy)->short() . ' ' . $textblock[rand(0, count($textblock) - 1)] . ' ' . $textchem[rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
                 break;
             //крит
             case "krit":
@@ -950,7 +950,7 @@ class fbattle
                 } else {
                     $textkrit = array(", напугав всех, неслышно подойдя сзади ударил", ", сказав \"БУ!\", ласково ударил", ", расслабившись, ударил", ", показав сразу два пальца, ударил", ", напугав всех, укусил", ", проклиная этот сайт, ударил");
                 }
-                return '<span class=date>' . date("[H:i:s]") . '</span> ' . nick::id($pokomy)->short() . ' ' . $textud[rand(0, count($textud) - 1)] . ' ' . $hark[rand(0, count($hark) - 1)] . ' ' . nick::id($kto)->short() . ' ' . $textkrit[rand(0, count($textkrit) - 1)] . ' ' . $kuda . '.<b><font color=red>-' . $uron . '</font></b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
+                return '<span class=date>' . date("[H:i:s]") . '</span> ' . Nick::id($pokomy)->short() . ' ' . $textud[rand(0, count($textud) - 1)] . ' ' . $hark[rand(0, count($hark) - 1)] . ' ' . Nick::id($kto)->short() . ' ' . $textkrit[rand(0, count($textkrit) - 1)] . ' ' . $kuda . '.<b><font color=red>-' . $uron . '</font></b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
                 break;
             //крит
             case "krita":
@@ -959,7 +959,7 @@ class fbattle
                 } else {
                     $textkrit = array(", напугав всех, неслышно подойдя сзади, пробив блок, ударил", ", сказав \"БУ!\", ласково, пробив блок, ударил", ", расслабившись, пробив блок, ударил", ", показав сразу два пальца, пробив блок, ударил", ", напугав всех, пробив блок, укусил", ", проклиная этот сайт, пробив блок, ударил");
                 }
-                return '<span class=date>' . date("[H:i:s]") . '</span> ' . nick::id($pokomy)->short() . ' ' . $textud[rand(0, count($textud) - 1)] . ' ' . $hark[rand(0, count($hark) - 1)] . ' ' . nick::id($kto)->short() . ' ' . $textkrit[rand(0, count($textkrit) - 1)] . ' ' . $kuda . '.<b><font color=red>-' . $uron . '</font> </b>[' . $hp . '/' . $maxhp . ']' . '<BR>';
+                return '<span class=date>' . date("[H:i:s]") . '</span> ' . Nick::id($pokomy)->short() . ' ' . $textud[rand(0, count($textud) - 1)] . ' ' . $hark[rand(0, count($hark) - 1)] . ' ' . Nick::id($kto)->short() . ' ' . $textkrit[rand(0, count($textkrit) - 1)] . ' ' . $kuda . '.<b><font color=red>-' . $uron . '</font> </b>[' . $hp . '/' . $maxhp . ']' . '<BR>';
                 break;
             // попадание
             case "udar":
@@ -968,7 +968,7 @@ class fbattle
                 } else {
                     $textudar = array(", разбежавшись, рубанул", " отчаянно проткнул ", " нехотя уколол ", " не подумав, рубанул ", ", улыбаясь, саданул укол ", " приложил удар ", " ударил ", " сдуру вмазал ");
                 }
-                return '<span class=date>' . date("[H:i:s]") . '</span> ' . nick::id($pokomy)->short() . ' ' . $textud[rand(0, count($textud) - 1)] . ' ' . $hark[rand(0, count($hark) - 1)] . ' ' . nick::id($kto)->short() . '' . $textudar[rand(0, count($textudar) - 1)] . ' ' . $textchem[rand(0, count($textchem) - 1)] . ' ' . $kuda . ' <b>-' . $uron . '</b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
+                return '<span class=date>' . date("[H:i:s]") . '</span> ' . Nick::id($pokomy)->short() . ' ' . $textud[rand(0, count($textud) - 1)] . ' ' . $hark[rand(0, count($hark) - 1)] . ' ' . Nick::id($kto)->short() . '' . $textudar[rand(0, count($textudar) - 1)] . ' ' . $textchem[rand(0, count($textchem) - 1)] . ' ' . $kuda . ' <b>-' . $uron . '</b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
                 break;
         }
     }
@@ -1065,7 +1065,7 @@ class fbattle
                     // if(in_array($k,$war)) {
                     unset($this->battle[$k]);
 
-                    $this->add_log('<span class=date>' . date("H:i") . '</span> ' . nick::id($k)->short() . ' проиграл бой!<BR>');
+                    $this->add_log('<span class=date>' . date("H:i") . '</span> ' . Nick::id($k)->short() . ' проиграл бой!<BR>');
 
                     mysql_query('UPDATE `users` SET `hp` = 0, `fullhptime` = ' . time() . ' WHERE `id` = \'' . $k . '\' LIMIT 1;');
                     foreach ($this->battle as $kak => $vav) {
@@ -1200,7 +1200,7 @@ class fbattle
                 if ($us && (int)$us['hp'] > 0) {
                     if (!$this->battle_data['blood']) {
                         $tr = settravma($k, 0, 86400, 1);
-                        $this->add_log('<span class=date>' . date("H:i") . '</span> ' . nick::id($k)->short() . ' получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                        $this->add_log('<span class=date>' . date("H:i") . '</span> ' . Nick::id($k)->short() . ' получил повреждение: <font color=red>' . $tr . '</font><BR>');
                     }
                 }
             }
@@ -1257,13 +1257,13 @@ class fbattle
                 // оцениваем игроков
                 //$cost1 =0; $cost2 =0; $kula4ka = 0; $t2c =0; $t1c =0; $lvs1=0; $lvs2=0; $bxp = 0;
                 foreach ($this->t1 as $k => $v) {
-                    $nks1[] = nick::id($v)->short();
-                    $nks1hist[] = nick::id($v)->full(1);
+                    $nks1[] = Nick::id($v)->short();
+                    $nks1hist[] = Nick::id($v)->full(1);
                 }
                 $lvs1 = $lvs1 / ($t1c + 1);
                 foreach ($this->t2 as $k => $v) {
-                    $nks2[] = nick::id($v)->short();
-                    $nks2hist[] = nick::id($v)->full(1);
+                    $nks2[] = Nick::id($v)->short();
+                    $nks2hist[] = Nick::id($v)->full(1);
                 }
 
                 // тима победителей
@@ -1271,7 +1271,7 @@ class fbattle
                     $flag = 1;
                     foreach ($this->t1 as $k => $v) {
                         mysql_query('UPDATE `battle` SET `win` = 1 WHERE `id` = ' . $this->user['battle'] . '  LIMIT 1');
-                        $this->t1[$k] = nick::id($v)->short();
+                        $this->t1[$k] = Nick::id($v)->short();
                         $this->exp[$v] = $this->exp[$v] * $opitas / 1;
                         $this->exp[$v] = round($this->exp[$v]);
 
@@ -1611,7 +1611,7 @@ class fbattle
                             echo "<script>console.log('Win Fiz');</script>";
                         }
 
-                        addchp('<font color=red>Внимание!</font> Победа! Бой окончен. Всего вами нанесено урона : ' . $this->damage[$v] . ' HP. Получено опыта : ' . $this->exp[$v] . ' (' . $dop_exp . '%)' . $ads . ' ', '{[]}' . nick::id($v)->short() . '{[]}');
+                        addchp('<font color=red>Внимание!</font> Победа! Бой окончен. Всего вами нанесено урона : ' . $this->damage[$v] . ' HP. Получено опыта : ' . $this->exp[$v] . ' (' . $dop_exp . '%)' . $ads . ' ', '{[]}' . Nick::id($v)->short() . '{[]}');
 
                         mysql_query('UPDATE `users` SET `win` = (`win` +1), `fullhptime` = ' . time() . ' WHERE `id` = "' . $v . '"');
                         GiveExp($v, $this->exp[$v]);
@@ -1630,7 +1630,7 @@ class fbattle
                     $flag = 2;
                     foreach ($this->t2 as $k => $v) {
                         mysql_query('UPDATE `battle` SET `win` = 2 WHERE `id` = "' . $this->user['battle'] . '" LIMIT 1');
-                        $this->t2[$k] = nick::id($v)->short();
+                        $this->t2[$k] = Nick::id($v)->short();
 
                         if ($this->battle_data['aren_of'] == 1 && $this->t2[$k] && $v < _BOTSEPARATOR_) {
                             mysql_query('INSERT INTO `logs_arena` (`battle`, `user`, `uid`, `damage`, `team`) VALUES ("' . $this->user['battle'] . '", "' . $this->t1[$k] . '", "' . $v . '", "' . $this->damage[$v] . '", "2")');
@@ -1695,7 +1695,7 @@ class fbattle
                             $us = mysql_query('UPDATE `inventory` SET `duration`=`duration`+1 WHERE `type` <> 12 AND `dressed` = 1 AND `owner` = \'' . $v . '\';');
                         }
                         $this->exp[$v] = 0;
-                        addchp('<font color=red>Внимание!</font> Бой окончен. Всего вами нанесено урона ' . (int)$this->damage[$v] . ' HP. Получено опыта 0.   ', '{[]}' . nick::id($v)->short() . '{[]}');
+                        addchp('<font color=red>Внимание!</font> Бой окончен. Всего вами нанесено урона ' . (int)$this->damage[$v] . ' HP. Получено опыта 0.   ', '{[]}' . Nick::id($v)->short() . '{[]}');
                         mysql_query('UPDATE `users` SET `lose`=`lose` +1 WHERE `id` = \'' . $v . '\';');
                         // если поединок был кровавым - еще и ставм травмы
                     }
@@ -1736,18 +1736,18 @@ class fbattle
                     $us = mysql_query('SELECT duration, maxdur, name FROM `inventory` WHERE `type` <> 12 AND `dressed` = 1 AND `owner` = \'' . $v . '\';');
                     while ($rrow = mysql_fetch_row($us)) {
                         if (($rrow[1] - $rrow[0]) == 1)
-                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет "' . $rrow[2] . '" в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет "' . $rrow[2] . '" в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                         elseif (($rrow[1] - $rrow[0]) == 2)
-                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                     }
                 }
                 foreach ($this->t2 as $k => $v) {
                     $us = mysql_query('SELECT duration, maxdur, name FROM `inventory` WHERE `type` <> 12 AND `dressed` = 1 AND `owner` = \'' . $v . '\';');
                     while ($rrow = mysql_fetch_row($us)) {
                         if (($rrow[1] - $rrow[0]) == 1)
-                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет ' . $rrow[2] . ' в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет ' . $rrow[2] . ' в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                         elseif (($rrow[1] - $rrow[0]) == 2)
-                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская oldbbk</b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                     }
                 }
 
@@ -1761,7 +1761,7 @@ class fbattle
                         $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> ... и победители стали калечить проигравших...<BR>');
                         foreach ($lomka as $k => $v) {
                             $tr = settravma($v, 0, 86400, 1);
-                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> ' . nick::id($v)->short() . ' получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                            $this->add_log('<span class=date>' . date("[H:i:s]") . '</span> ' . Nick::id($v)->short() . ' получил повреждение: <font color=red>' . $tr . '</font><BR>');
                         }
                     }
                 } else {
diff --git a/classes/nick.php b/classes/nick.php
deleted file mode 100644
index 6327d18..0000000
--- a/classes/nick.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright (c) 2018.
- * Author: Igor Barkov <lopar.4ever@gmail.com>
- * Project name: Battles-Game
- */
-
-class nick
-{
-    private $user_data;
-
-    /**
-     * nick constructor.
-     * @param int $playerId
-     */
-    private function __construct($playerId)
-    {
-        if (!$this->user_data) {
-            $user = db::c()->query('
-              SELECT `login`, `level`, U.`align`, `short`, (SELECT 1 FROM `effects` WHERE `owner` = U.`id` AND `type` = 1022) AS `invis`, U.`hp`, `maxhp`
-              FROM `users` U
-              LEFT JOIN `clans` C ON C.`id` = `klan`
-              WHERE U.`id` = ?i', $playerId)->fetch_assoc();
-            $this->user_data = $user;
-        }
-
-    }
-
-    /**
-     * @param $playerId
-     * @return nick
-     */
-    public static function id($playerId)
-    {
-        return new self($playerId);
-    }
-
-    /**
-     * @param int $showInvisibility
-     * @return string
-     */
-    public function full($showInvisibility = 0)
-    {
-        $n = '';
-        if ($showInvisibility && isset($this->user_data['invis'])) {
-            return '<i>невидимка</i>';
-        } else {
-            if (isset($this->user_data['align'])) {
-                $n .= sprintf('<img src="i/align_%s.gif">', intval($this->user_data['align']));
-            }
-            if (isset($this->user_data['klan'])) {
-                $n .= sprintf('<img src="i/klan/%s.gif">', htmlspecialchars($this->user_data['klan']));
-            }
-        }
-        $n .= sprintf('<b>%s</b> [%s] <a href="inf.php?%s" target="_blank"><img src="i/inf.gif" style="width:12px;height:11px"></a>', htmlspecialchars($this->user_data['login']), intval($this->user_data['level']), htmlspecialchars($this->user_data['login']));
-
-        return $n;
-    }
-
-    /**
-     * @return string
-     */
-    public function short()
-    {
-        if ($this->user_data['invis']) {
-            return '<i>невидимка</i>';
-        } else return htmlspecialchars($this->user_data['login']);
-    }
-}
\ No newline at end of file
diff --git a/classturnir.php b/classturnir.php
index da3dca7..1cb3926 100644
--- a/classturnir.php
+++ b/classturnir.php
@@ -49,7 +49,7 @@ class TTournament {
 							for($j=1;$j<=($kol-$cop);$j++){
 								$res=mysql_fetch_row($uch);
 								mysql_query("delete from turnamuser where id=".$res[0]);
-								addchp ('<font color=red>Внимание!</font> На этой неделе Вам не нашлелся противник в турнире.<BR>','{[]}'.nick::id($res[1])->short().'{[]}');
+								addchp ('<font color=red>Внимание!</font> На этой неделе Вам не нашлелся противник в турнире.<BR>','{[]}'.Nick::id($res[1])->short().'{[]}');
 							}
 							mysql_query("update turnament set kolvo=kolvo-".($kol-$cop)." where old=0 and level=".$i);
 							break;
@@ -66,15 +66,15 @@ class TTournament {
 						$user1=$CountUser[$ii];
 						$user2=$CountUser[++$ii];
 						mysql_query("insert into turnirbattle(userid,userid1,level,idtur) values(".$user1.",".$user2.",".$i.",(select id from turnament where old=0 and level=".$i."))");
-						addchp ('<font color=red>Внимание!</font> Подготовтесь к турниру.<BR>','{[]}'.nick::id($user1)->short().'{[]}');
-						addchp ('<font color=red>Внимание!</font> Подготовтесь к турниру.<BR>','{[]}'.nick::id($user2)->short().'{[]}');
+						addchp ('<font color=red>Внимание!</font> Подготовтесь к турниру.<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
+						addchp ('<font color=red>Внимание!</font> Подготовтесь к турниру.<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
 					}
 			}
 			else{
 				//Если команда не набралась удалить из таблицы и поставить турниру статус 2
 				while ($res=mysql_fetch_row($uch)){
 					mysql_query("delete from turnamuser where id=".$res['0']);
-					addchp ('<font color=red>Внимание!</font>На этой неделе команда для турнира не набралась.<BR>','{[]}'.nick::id($res[1])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>На этой неделе команда для турнира не набралась.<BR>','{[]}'.Nick::id($res[1])->short().'{[]}');
 				}
 				mysql_query("delete from turnament where old=0 and level=".$i);
 			}
@@ -88,31 +88,31 @@ class TTournament {
 			if ((time()-$res['badmaxweap1'])>120){
 				mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$user1." and idturnam=".$res['idtur']);
 				mysql_query("delete from turnirbattle where userid1=".$user1);
-				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($user1)->short().'{[]}');
-				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($user2)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
 			}
 		}elseif ($res['userid']==$user2 && $res['badmaxweap']!=0){
 			if ((time()-$res['badmaxweap'])>120){
 				mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$user2." and idturnam=".$res['idtur']);
 				mysql_query("delete from turnirbattle where userid=".$user2);
-				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($user2)->short().'{[]}');
-				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($user1)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
 			}
 		}
 		elseif ($res['userid']==$user1 && $res['badmaxweap']!=0){
 			if ((time()-$res['badmaxweap'])>120){
 				mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$user1." and idturnam=".$res['idtur']);
 				mysql_query("delete from turnirbattle where userid=".$user1);
-				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($user1)->short().'{[]}');
-				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($user2)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
 			}
 		}
 		elseif ($res['userid1']==$user2 && $res['badmaxweap1']!=0 ){
 			if ((time()-$res['badmaxweap1'])>120){
 				mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$user2." and idturnam=".$res['idtur']);
 				mysql_query("delete from turnirbattle where userid1=".$user2);
-				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($user2)->short().'{[]}');
-				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($user1)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
 			}
 		}
 		else{
@@ -129,14 +129,14 @@ class TTournament {
 					mysql_query("update turnirbattle set badmaxweap=".time()." , checkuser=0 where userid=".$user1);
 				if ($res['userid1']==$user1)
 					mysql_query("update turnirbattle set badmaxweap1=".time()." , checkuser2=0 where userid1=".$user1);
-				addchp ('<font color=red>Внимание!</font>Оставьте оружие только до 16экр или оставьте только оружие.<BR>','{[]}'.nick::id($user1)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Оставьте оружие только до 16экр или оставьте только оружие.<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
 			}
 			elseif ($PriceWeap1[0]>16 || $Shmotuser1['sergi']!=0 || $Shmotuser1['kulon']!=0 || $Shmotuser1['perchi']!=0 || $Shmotuser1['bron']!=0 || $Shmotuser1['r1']!=0 || $Shmotuser1['r2']!=0 || $Shmotuser1['r3']!=0 || $Shmotuser1['helm']!=0 || $Shmotuser1['shit']!=0 || $Shmotuser1['boots']!=0 || $Shmotuser1['stats']!=0 || $Shmotuser1['m1']!=0 || $Shmotuser1['m2']!=0 || $Shmotuser1['m3']!=0 || $Shmotuser1['m4']!=0 || $Shmotuser1['m5']!=0 || $Shmotuser1['m6']!=0 || $Shmotuser1['m7']!=0 || $Shmotuser1['m8']!=0 || $Shmotuser1['m9']!=0 || $Shmotuser1['m10']!=0){
 				if ($res['userid']==$user2)
 					mysql_query("update turnirbattle set badmaxweap=".time()." , checkuser=0 where userid=".$user2);
 				if ($res['userid1']==$user2)
 					mysql_query("update turnirbattle set badmaxweap1=".time()." , checkuser2=0 where userid1=".$user2);
-				addchp ('<font color=red>Внимание!</font>Оставьте оружие только до 16экр или оставьте только оружие.<BR>','{[]}'.nick::id($user2)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font>Оставьте оружие только до 16экр или оставьте только оружие.<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
 			}
 			else{
 				// генерим массив с командами
@@ -155,8 +155,8 @@ class TTournament {
 				// кидаем в бой
 				mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = ".$user1." OR `id` = ".$user2);
 				// создаем лог
-				$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-				addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+				$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+				addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 				addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." решили выяснить кто из них сильнее. <i>(турнир)</i><BR>");
 				return $id;
 			}
@@ -199,7 +199,7 @@ class TTournament {
 					mysql_query("delete from turnirbattle where id=".$res['id']);
 				}
 				if($win==3){
-					echo nick::id($res['userid'])->full(1)." против ".nick::id($res['useridl'])->full(1);
+					echo Nick::id($res['userid'])->full(1)." против ".Nick::id($res['useridl'])->full(1);
 				}
 			}
 		}
@@ -217,7 +217,7 @@ class TTournament {
 			@shuffle($CountUser);
 			
 			if (count($ArrayUsers)==1) $CheckFinal[]=$ArrayUsers[0];
-			if (count($ArrayUsers)==1 && $i==0) addchp ('<font color=red>Внимание!</font> Вы вышли в финал. Дождитесь второго финалиста.<BR>','{[]}'.nick::id($ArrayUsers[0])->short().'{[]}');
+			if (count($ArrayUsers)==1 && $i==0) addchp ('<font color=red>Внимание!</font> Вы вышли в финал. Дождитесь второго финалиста.<BR>','{[]}'.Nick::id($ArrayUsers[0])->short().'{[]}');
 			
 			if ($this->fract(count($ArrayUsers)/2)!=false)
 				$countUs=count($ArrayUsers)-1;
@@ -230,8 +230,8 @@ class TTournament {
 				//Востанавливаем HP
 				mysql_query("update users set hp=maxhp where id=".$user1." or id=".$user2);
 				mysql_query("insert into turnirbattle(userid,userid1,level,idtur) values(".$user1.",".$user2.",".$level.",(select id from turnament where old=0 and level=".$level."))");
-				addchp ('<font color=red>Внимание!</font> Подготовтесь к следующему туру.<BR>','{[]}'.nick::id($user1)->short().'{[]}');
-				addchp ('<font color=red>Внимание!</font> Подготовтесь к следующему туру.<BR>','{[]}'.nick::id($user2)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> Подготовтесь к следующему туру.<BR>','{[]}'.Nick::id($user1)->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> Подготовтесь к следующему туру.<BR>','{[]}'.Nick::id($user2)->short().'{[]}');
 			}
 		}
 		if (count($CheckFinal)==2) $this->TournirFinal($level,$CheckFinal);
@@ -258,7 +258,7 @@ class TTournament {
 		while ($res=mysql_fetch_array($sql)){
 			if ($i==1 || $i==2 || $i==3){
 				mysql_query("INSERT INTO `delo`(`id` , `author` ,`pers`, `text`, `type`, `date`) VALUES ('','0','".$res['iduser']."','Выиграл в турнире ".$Priz[$i][$level]." кр.','1','".time()."');");
-				addchp ('<font color=red>Внимание!</font> За '.$i.' место в турнире, Вы получили '.$Priz[$i][$level].' кр.<BR>','{[]}'.nick::id($res['iduser'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> За '.$i.' место в турнире, Вы получили '.$Priz[$i][$level].' кр.<BR>','{[]}'.Nick::id($res['iduser'])->short().'{[]}');
 			}	
 			fwrite($f, '<tr><td>'.$res['login'].'</td><td>'.$i++.'</td></tr>');
 			
@@ -290,8 +290,8 @@ class TTournament {
 	function TournirFinal($level,$masFinals){
 		mysql_query("update turnamuser set place=0 where (iduser=".$masFinals[0]." or iduser=".$masFinals[1].") and idturnam=(select id from turnament where old=0 and level=".$level.")");
 		mysql_query("insert into turnirbattle(userid,userid1,level,idtur) values(".$masFinals[0].",".$masFinals[1].",".$level.",(select id from turnament where old=0 and level=".$level."))");
-		addchp ('<font color=red>Внимание!</font> Подготовтесь к финалу.<BR>','{[]}'.nick::id($masFinals[0])->short().'{[]}');
-		addchp ('<font color=red>Внимание!</font> Подготовтесь к финалу.<BR>','{[]}'.nick::id($masFinals[1])->short().'{[]}');
+		addchp ('<font color=red>Внимание!</font> Подготовтесь к финалу.<BR>','{[]}'.Nick::id($masFinals[0])->short().'{[]}');
+		addchp ('<font color=red>Внимание!</font> Подготовтесь к финалу.<BR>','{[]}'.Nick::id($masFinals[1])->short().'{[]}');
 	}
 	
 	function expectationenemy(){
@@ -309,8 +309,8 @@ class TTournament {
 				if ((time()-$res['badmaxweap'])>120){
 					mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$res['userid']." and idturnam=".$res['idtur']);
 					mysql_query("delete from turnirbattle where userid=".$res['userid']);
-					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($res['userid'])->short().'{[]}');
-					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($res['userid1'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($res['userid'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($res['userid1'])->short().'{[]}');
 				}
 			}
 			if ($res['userid1']==$user['id'] && $res['checkuser2']==0 && $res['badmaxweap1']==0){
@@ -324,8 +324,8 @@ class TTournament {
 				if ((time()-$res['badmaxweap1'])>120){
 					mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$res['userid']." and idturnam=".$res['idtur1']);
 					mysql_query("delete from turnirbattle where userid1=".$res['userid1']);
-					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($res['userid1'])->short().'{[]}');
-					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($res['userid'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($res['userid1'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($res['userid'])->short().'{[]}');
 				}
 			}
 		}
@@ -343,7 +343,7 @@ class TTournament {
 				mysql_query("update turnirbattle set badmaxweap=".time()." , checkuser=0 where userid=".$user['id']);
 			if ($res['userid1']==$user['id'] && $res['badmaxweap1']==0)
 				mysql_query("update turnirbattle set badmaxweap1=".time()." , checkuser2=0 where userid1=".$user['id']);
-			addchp ('<font color=red>Внимание!</font>Оставьте оружие только до 16экр или оставьте только оружие.<BR>','{[]}'.nick::id($user['id'])->short().'{[]}');
+			addchp ('<font color=red>Внимание!</font>Оставьте оружие только до 16экр или оставьте только оружие.<BR>','{[]}'.Nick::id($user['id'])->short().'{[]}');
 		}
 		else{
 			if ($res['userid']==$user['id']){
@@ -361,16 +361,16 @@ class TTournament {
 				if ((time()-$res['badmaxweap1'])>120){
 					mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$res['userid1']." and idturnam=".$res['idtur']);
 					mysql_query("delete from turnirbattle where userid1=".$res['userid1']);
-					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($res['userid1'])->short().'{[]}');
-					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($res['userid'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($res['userid1'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($res['userid'])->short().'{[]}');
 				}
 			}
 			if($res['badmaxweap']!=0){
 				if ((time()-$res['badmaxweap'])>120){
 					mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$res['userid']." and idturnam=".$res['idtur']);
 					mysql_query("delete from turnirbattle where userid=".$res['userid']);
-					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($res['userid'])->short().'{[]}');
-					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($res['userid1'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($res['userid'])->short().'{[]}');
+					addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($res['userid1'])->short().'{[]}');
 				}
 			}
 		}
@@ -386,12 +386,12 @@ class TTournament {
 						if ((time()-$res['badmaxweap'])>120){
 							mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$res['userid']." and idturnam=".$res['idtur']);
 							mysql_query("delete from turnirbattle where userid=".$res['userid']);
-							addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($res['userid'])->short().'{[]}');
-							addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($res['userid1'])->short().'{[]}');
+							addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($res['userid'])->short().'{[]}');
+							addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($res['userid1'])->short().'{[]}');
 						}
-						else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'> противник ".nick::id($res['useridl'])->full(1)."(поражений-".$looseL1[0].")</form>";
+						else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'> противник ".Nick::id($res['useridl'])->full(1)."(поражений-".$looseL1[0].")</form>";
 					}
-					else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'> противник ".nick::id($res['useridl'])->full(1)."(поражений-".$looseL1[0].")</form>";
+					else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'> противник ".Nick::id($res['useridl'])->full(1)."(поражений-".$looseL1[0].")</form>";
 				}
 				else echo "Ожидаем противника";
 			}
@@ -402,12 +402,12 @@ class TTournament {
 						if ((time()-$res['badmaxweap1'])>120){
 							mysql_query("update turnamuser set loose=2, place=".time()." where iduser=".$res['userid1']." and idturnam=".$res['idtur']);
 							mysql_query("delete from turnirbattle where userid1=".$res['userid1']);
-							addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.nick::id($res['userid1'])->short().'{[]}');
-							addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.nick::id($res['userid'])->short().'{[]}');
+							addchp ('<font color=red>Внимание!</font>Вы выбыли из турнира<BR>','{[]}'.Nick::id($res['userid1'])->short().'{[]}');
+							addchp ('<font color=red>Внимание!</font>Ваш противник отказался от боя. Техническая победа.<BR>','{[]}'.Nick::id($res['userid'])->short().'{[]}');
 						}
-						else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'>противник ".nick::id($res['userid'])->full(1)."(поражений-".$looseL[0].")</form>";
+						else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'>противник ".Nick::id($res['userid'])->full(1)."(поражений-".$looseL[0].")</form>";
 					}
-					else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'>противник ".nick::id($res['userid'])->full(1)."(поражений-".$looseL[0].")</form>";
+					else echo "<form method='post'><input type='submit' name='expenemy' value='Я готов'>противник ".Nick::id($res['userid'])->full(1)."(поражений-".$looseL[0].")</form>";
 				}	
 				else echo "Ожидаем противника";
 			}
diff --git a/contacts.php b/contacts.php
index 03fbfa1..0234044 100644
--- a/contacts.php
+++ b/contacts.php
@@ -76,8 +76,8 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
                     <TR valign="top">
                         <TD>
                             <?php
-                            if ($us['online'] > 0 && !$us["invis"]) echo nick::id($us['id'])->full() . " - <i>" . $us['room'] . "</i><br>";
-                            else echo "<span style='color: grey'>" . nick::id($us['id'])->full() . "</span><br>";
+                            if ($us['online'] > 0 && !$us["invis"]) echo Nick::id($us['id'])->full() . " - <i>" . $us['room'] . "</i><br>";
+                            else echo "<span style='color: grey'>" . Nick::id($us['id'])->full() . "</span><br>";
                             ?>
                         </TD>
                         <TD style="background: darkgrey; width: 65%; padding: 0.2em 1em; border-radius: 2px;">
@@ -94,7 +94,7 @@ $contacts_list = db::c()->query('SELECT `friend`,`comment` FROM `friends` WHERE
         </TD>
         <TD style="width: 200px; vertical-align: top; background: whitesmoke;">
             <h3>Администраторы</h3>
-            <?php while ($row = $admins_list->fetch_assoc()) echo nick::id($row['id'])->full() . "<br>"; ?>
+            <?php while ($row = $admins_list->fetch_assoc()) echo Nick::id($row['id'])->full() . "<br>"; ?>
         </TD>
     </TR>
 </TABLE>
diff --git a/cronjobs/cron.php b/cronjobs/cron.php
index 6b1c085..1187c9f 100644
--- a/cronjobs/cron.php
+++ b/cronjobs/cron.php
@@ -193,7 +193,7 @@ function startbattle($id, $zay, $r)
         if ($k != 0) {
             $rr .= ", ";
         }
-        $rr .= nick::id($v)->full(1);
+        $rr .= Nick::id($v)->full(1);
         file_get_contents(GAMEDOMAIN . '/chats.php?id=7&user=' . $v);
     }
 
@@ -203,7 +203,7 @@ function startbattle($id, $zay, $r)
         if ($k != 0) {
             $rr .= ", ";
         }
-        $rr .= nick::id($v)->full(1);
+        $rr .= Nick::id($v)->full(1);
         file_get_contents(GAMEDOMAIN . '/chats.php?id=7&user=' . $v);
     }
 
@@ -329,7 +329,7 @@ if ($st_ar['value'] <= time()) {
     mysql_query("INSERT INTO `battle` (`id`, `coment`, `teams`, `time_m`, `timeout`, `type`, `status`, `t1`, `t2`, `to1`, `to2`, `blood`, `aren_of`) VALUES (NULL, '', '" . serialize($teams) . "', '" . time() . "', '3', '1', '0', '" . $dark['id_at'] . "', '" . $light['id_at'] . "', '" . time() . "', '" . time() . "', '1', '1')");
     $id = mysql_insert_id();
     mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE (`id` = {$dark['id_at']} OR `id` = {$light['id_at']}) LIMIT 2");
-    $rr = "<b>" . nick::id($dark['id_at'])->full(1) . "</b> и <b>" . nick::id($light['id_at'])->full(1) . "</b>";
+    $rr = "<b>" . Nick::id($dark['id_at'])->full(1) . "</b> и <b>" . Nick::id($light['id_at'])->full(1) . "</b>";
     addlog($id, "Часы показывали <span class=date>" . date("Y.m.d H.i") . "</span>, когда " . $rr . " бросили вызов друг другу. <br />");
     mysql_query("UPDATE `users` SET `battle` = {$id}, `zayavka` = 0 WHERE (`id` = {$dark['id']} OR `id` = {$light['id']}) LIMIT 2");
     file_get_contents(GAMEDOMAIN . '/chats.php?id=2');
diff --git a/cronjobs/cron_bots_battle.php b/cronjobs/cron_bots_battle.php
index 67cef02..d607899 100644
--- a/cronjobs/cron_bots_battle.php
+++ b/cronjobs/cron_bots_battle.php
@@ -136,7 +136,7 @@ class fbattle
                             if ($us && (int)$us['hp'] > 0 && $us['level'] > 6) {
                                 $tr = settravma($k, 0, 86400, 1);
                                 if ($k < _BOTSEPARATOR_ && $tr) {
-                                    $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . nick::id($k)->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                                    $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . Nick::id($k)->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
                                 }
                             }
                         }
@@ -293,13 +293,13 @@ class fbattle
                 mysql_query("UPDATE `battle` SET `win` = 0 WHERE `id` = '{$this->battle_data['id']}' LIMIT 1");
 
                 foreach ($this->t1 as $k => $v) {
-                    $nks1[] = nick::id($v)->short();
-                    $nks1hist[] = nick::id($v)->full(1);
+                    $nks1[] = Nick::id($v)->short();
+                    $nks1hist[] = Nick::id($v)->full(1);
                 }
 
                 foreach ($this->t2 as $k => $v) {
-                    $nks2[] = nick::id($v)->short();
-                    $nks2hist[] = nick::id($v)->full(1);
+                    $nks2[] = Nick::id($v)->short();
+                    $nks2hist[] = Nick::id($v)->full(1);
                 }
 
                 if (in_array($ss[0], $this->t1)) {
@@ -307,7 +307,7 @@ class fbattle
                     foreach ($this->t1 as $k => $v) {
                         mysql_query('UPDATE `battle` SET `win` = 1 WHERE `id` = "' . $this->battle_data['id'] . '" LIMIT 1');
 
-                        $this->t1[$k] = nick::id($v)->short();
+                        $this->t1[$k] = Nick::id($v)->short();
 
                         if ($this->battle_data['aren_of'] == 1 && $this->t1[$k] && $v < _BOTSEPARATOR_) {
                             mysql_query('INSERT INTO `logs_arena` (`battle`, `user`, `uid`, `damage`, `team`) VALUES ("' . $this->battle_data['id'] . '", "' . $this->t1[$k] . '", "' . $v . '", "' . $this->damage[$v] . '", "1")');
@@ -376,7 +376,7 @@ class fbattle
                             addActions(time(), 'win_fiz', 0, $this->user['id']);
                         }
 
-                        addchp('<font color=red>Внимание!</font> Победа! Бой окончен. Всего вами нанесено урона : ' . $this->damage[$v] . ' HP. Получено опыта : ' . $this->exp[$v] . ' (' . $dop_exp . '%)' . $ads . ' ', '{[]}' . nick::id($v)->short() . '{[]}');
+                        addchp('<font color=red>Внимание!</font> Победа! Бой окончен. Всего вами нанесено урона : ' . $this->damage[$v] . ' HP. Получено опыта : ' . $this->exp[$v] . ' (' . $dop_exp . '%)' . $ads . ' ', '{[]}' . Nick::id($v)->short() . '{[]}');
 
                         mysql_query('UPDATE `users` SET `win` = (`win` +1), `fullhptime` = ' . time() . ' WHERE `id` = "' . $v . '"');
                         GiveExp($v, $this->exp[$v]);
@@ -395,7 +395,7 @@ class fbattle
                     $flag = 2;
                     foreach ($this->t2 as $k => $v) {
                         mysql_query('UPDATE `battle` SET `win` = 2 WHERE `id` = "' . $this->user['battle'] . '" LIMIT 1');
-                        $this->t2[$k] = nick::id($v)->short();
+                        $this->t2[$k] = Nick::id($v)->short();
 
                         if ($this->battle_data['aren_of'] == 1 && $this->t2[$k] && $v < _BOTSEPARATOR_) {
                             mysql_query('INSERT INTO `logs_arena` (`battle`, `user`, `uid`, `damage`, `team`) VALUES ("' . $this->user['battle'] . '", "' . $this->t1[$k] . '", "' . $v . '", "' . $this->damage[$v] . '", "2")');
@@ -453,7 +453,7 @@ class fbattle
                             mysql_query("UPDATE `cavebots` SET `battle` = 0 WHERE `battle` = '" . $this->battle_data['id'] . "'");
                         }
 
-                        addchp('<font color=red>Внимание!</font> Победа! Бой окончен. Всего вами нанесено урона : ' . (int)$this->damage[$v] . ' HP. Получено опыта ' . $this->exp[$v] . ' (' . $dop_exp . '%).  ', '{[]}' . nick::id($v)->short() . '{[]}');
+                        addchp('<font color=red>Внимание!</font> Победа! Бой окончен. Всего вами нанесено урона : ' . (int)$this->damage[$v] . ' HP. Получено опыта ' . $this->exp[$v] . ' (' . $dop_exp . '%).  ', '{[]}' . Nick::id($v)->short() . '{[]}');
 
                         mysql_query('UPDATE `users` SET `win` = (`win`+1), `fullhptime` = ' . time() . ' WHERE `id` = "' . $v . '"');
                         GiveExp($v, $this->exp[$v]);
@@ -507,7 +507,7 @@ class fbattle
                         }
 
                         $this->exp[$v] = 0;
-                        addchp('<font color=red>Внимание!</font> Поражение! Бой окончен. Всего вами нанесено урона : ' . (int)$this->damage[$v] . ' HP. Получено опыта 0.', '{[]}' . nick::id($v)->short() . '{[]}');
+                        addchp('<font color=red>Внимание!</font> Поражение! Бой окончен. Всего вами нанесено урона : ' . (int)$this->damage[$v] . ' HP. Получено опыта 0.', '{[]}' . Nick::id($v)->short() . '{[]}');
                         mysql_query('UPDATE `users` SET `lose` = (`lose`+1) WHERE `id` = \'' . $v . '\'');
                     }
                 }
@@ -516,9 +516,9 @@ class fbattle
                     $us = mysql_query('SELECT `duration`, `maxdur`, `name` FROM `inventory` WHERE `type` != 12 AND `dressed` = 1 AND `owner` = \'' . $v . '\'');
                     while ($rrow = mysql_fetch_row($us)) {
                         if (($rrow[1] - $rrow[0]) == 1) {
-                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет "' . $rrow[2] . '" в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет "' . $rrow[2] . '" в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                         } elseif (($rrow[1] - $rrow[0]) == 2) {
-                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                         }
                     }
                 }
@@ -527,9 +527,9 @@ class fbattle
                     $us = mysql_query('SELECT `duration`, `maxdur`, `name` FROM `inventory` WHERE `type` != 12 AND `dressed` = 1 AND `owner` = \'' . $v . '\'');
                     while ($rrow = mysql_fetch_row($us)) {
                         if (($rrow[1] - $rrow[0]) == 1) {
-                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет ' . $rrow[2] . ' в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет ' . $rrow[2] . ' в критическом состоянии! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                         } elseif (($rrow[1] - $rrow[0]) == 2) {
-                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
+                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> Внимание! У "' . Nick::id($v)->short() . '" предмет "' . $rrow[2] . '" нуждается в ремонте! <BR><small>(на правах рекламы) <b>Ремонтная мастерская </b>. Мы даем вторую жизнь старым вещам!</small><BR>');
                         }
                     }
                 }
@@ -581,7 +581,7 @@ class fbattle
                             }
 
                             if ($v < _BOTSEPARATOR_) {
-                                $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . nick::id($v)->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                                $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . Nick::id($v)->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
                                 $inv_broken = mysql_query("SELECT `id`, `type`, `dressed`, `duration`, `maxdur`, `dategoden`, `owner` FROM `inventory` WHERE `type` != 12 AND `dressed` = 1 AND ((`maxdur` <= `duration`) OR (`dategoden` > 0 AND `dategoden` <= '" . time() . "')) AND `owner` = '{$v}'");
                                 while ($br = mysql_fetch_array($inv_broken)) {
                                     dropitemid($br['type'], $v);
@@ -636,7 +636,7 @@ class fbattle
                     if (!$this->battle_data['blood']) {
                         $tr = settravma($k, 0, 86400, 1);
                         if ($k < _BOTSEPARATOR_) {
-                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . nick::id($k)->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                            $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . Nick::id($k)->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
                         }
                     }
                 }
@@ -677,7 +677,7 @@ class fbattle
                 }
 
                 if ($us['hp'] <= 0) {
-                    $this->AddToLog('<span class=date>' . date("H:i") . '</span> ' . nick::id($k)->short() . ' умер!<BR>');
+                    $this->AddToLog('<span class=date>' . date("H:i") . '</span> ' . Nick::id($k)->short() . ' умер!<BR>');
 
                     if ($k < _BOTSEPARATOR_) {
                         mysql_query("UPDATE `users` SET `hp` = 0, `fullhptime` = '" . time() . "' WHERE `id` = '{$k}' LIMIT 1");
@@ -939,7 +939,7 @@ class fbattle
                             if (mt_rand(0, 100) <= 40 && $this->user['level'] > 6) {
                                 $tr = settravma($this->user['id'], 0, 86400, 0);
                                 if ($this->user['id'] < _BOTSEPARATOR_) {
-                                    $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . nick::id($this->user['id'])->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                                    $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . Nick::id($this->user['id'])->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
                                 }
                             }
                         }
@@ -1018,7 +1018,7 @@ class fbattle
                                 if (mt_rand(0, 100) <= 40 && $tmpen['level'] > 6) {
                                     $tr = settravma($tmpen['id'], $tmptravma, 86400, 0);
                                     if ($tmpen['id'] < _BOTSEPARATOR_) {
-                                        $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . nick::id($tmpen['id'])->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
+                                        $this->AddToLog('<span class=date>' . date("H:i") . '</span> <b>' . Nick::id($tmpen['id'])->short() . '</b> получил повреждение: <font color=red>' . $tr . '</font><BR>');
                                     }
                                 }
                             }
@@ -1190,7 +1190,7 @@ class fbattle
                 } else {
                     $textuvorot = array(" <font color=green><B>уклонился</B></font> от удара ", " <font color=green><B>увернулся</B></font> от удара ", " <font color=green><B>отскочил</B></font> от удара ");
                 }
-                return '<span class=date>' . date("H:i") . '</span> ' . nick::id($kto)->short() . ' ' . $textfail[mt_rand(0, count($textfail) - 1)] . ' ' . $hark2[mt_rand(0, count($hark2) - 1)] . ' ' . nick::id($pokomy)->short() . ' ' . $textuvorot[mt_rand(0, count($textuvorot) - 1)] . ' ' . $textchem[mt_rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
+                return '<span class=date>' . date("H:i") . '</span> ' . Nick::id($kto)->short() . ' ' . $textfail[mt_rand(0, count($textfail) - 1)] . ' ' . $hark2[mt_rand(0, count($hark2) - 1)] . ' ' . Nick::id($pokomy)->short() . ' ' . $textuvorot[mt_rand(0, count($textuvorot) - 1)] . ' ' . $textchem[mt_rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
                 break;
 
             case "block":
@@ -1199,7 +1199,7 @@ class fbattle
                 } else {
                     $textblock = array(" заблокировал удар ", " остановил удар ", " отбил удар ");
                 }
-                return '<span class=date>' . date("H:i") . '</span> ' . nick::id($kto)->short() . ' ' . $textfail[mt_rand(0, count($textfail) - 1)] . ' ' . $hark2[mt_rand(0, count($hark2) - 1)] . ' ' . nick::id($pokomy)->short() . ' ' . $textblock[mt_rand(0, count($textblock) - 1)] . ' ' . $textchem[mt_rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
+                return '<span class=date>' . date("H:i") . '</span> ' . Nick::id($kto)->short() . ' ' . $textfail[mt_rand(0, count($textfail) - 1)] . ' ' . $hark2[mt_rand(0, count($hark2) - 1)] . ' ' . Nick::id($pokomy)->short() . ' ' . $textblock[mt_rand(0, count($textblock) - 1)] . ' ' . $textchem[mt_rand(0, count($textchem) - 1)] . ' ' . $kuda . '.<BR>';
                 break;
 
             case "krit":
@@ -1208,7 +1208,7 @@ class fbattle
                 } else {
                     $textkrit = array(", напугав всех, неслышно подойдя сзади ударил по голове булыжником оппонента.", ", сказав \"БУ!\", ласково заломил руку за спину соперника.", ", расслабившись, расцарапал нос соперника.", ", показав сразу два пальца, наступил на ногу врага.", ", напугав всех, укусил в нос противника.", ", проклиная этот сайт, провел ужасный бросок через пупок оппонента.");
                 }
-                return '<span class=date>' . date("H:i") . '</span> ' . nick::id($pokomy)->short() . ' ' . $textud[mt_rand(0, count($textud) - 1)] . ' ' . $hark[mt_rand(0, count($hark) - 1)] . ' ' . nick::id($kto)->short() . ' ' . $textkrit[mt_rand(0, count($textkrit) - 1)] . ' <b><font color=red>-' . $uron . '</font></b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
+                return '<span class=date>' . date("H:i") . '</span> ' . Nick::id($pokomy)->short() . ' ' . $textud[mt_rand(0, count($textud) - 1)] . ' ' . $hark[mt_rand(0, count($hark) - 1)] . ' ' . Nick::id($kto)->short() . ' ' . $textkrit[mt_rand(0, count($textkrit) - 1)] . ' <b><font color=red>-' . $uron . '</font></b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
                 break;
 
             case "krita":
@@ -1217,7 +1217,7 @@ class fbattle
                 } else {
                     $textkrit = array(", напугав всех, неслышно подойдя сзади ударил, пробив блок, по голове булыжником оппонента.", ", пробив блок, ласково заломил руку за спину соперника.", ", пробив блок, расцарапал нос соперника.", ", пробив блок, наступил на ногу врага.", ", пробив блок, укусил в нос противника.", ", пробив блок, провел ужасный бросок через пупок оппонента.");
                 }
-                return '<span class=date>' . date("H:i") . '</span> ' . nick::id($pokomy)->short() . ' ' . $textud[mt_rand(0, count($textud) - 1)] . ' ' . $hark[mt_rand(0, count($hark) - 1)] . ' ' . nick::id($kto)->short() . ' ' . $textkrit[mt_rand(0, count($textkrit) - 1)] . ' <b><font color=red>-' . $uron . '</font></b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
+                return '<span class=date>' . date("H:i") . '</span> ' . Nick::id($pokomy)->short() . ' ' . $textud[mt_rand(0, count($textud) - 1)] . ' ' . $hark[mt_rand(0, count($hark) - 1)] . ' ' . Nick::id($kto)->short() . ' ' . $textkrit[mt_rand(0, count($textkrit) - 1)] . ' <b><font color=red>-' . $uron . '</font></b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
                 break;
 
             case "udar":
@@ -1226,7 +1226,7 @@ class fbattle
                 } else {
                     $textudar = array(", разбежавшись, рубанул", " отчаянно проткнул ", " нехотя уколол ", " не подумав, рубанул ", ", улыбаясь, саданул укол ", " приложил удар ", " ударил ", " сдуру вмазал ");
                 }
-                return '<span class=date>' . date("H:i") . '</span> ' . nick::id($pokomy)->short() . ' ' . $textud[mt_rand(0, count($textud) - 1)] . ' ' . $hark[mt_rand(0, count($hark) - 1)] . ' ' . nick::id($kto)->short() . '' . $textudar[mt_rand(0, count($textudar) - 1)] . ' ' . $textchem[mt_rand(0, count($textchem) - 1)] . ' ' . $kuda . ' <b>-' . $uron . '</b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
+                return '<span class=date>' . date("H:i") . '</span> ' . Nick::id($pokomy)->short() . ' ' . $textud[mt_rand(0, count($textud) - 1)] . ' ' . $hark[mt_rand(0, count($hark) - 1)] . ' ' . Nick::id($kto)->short() . '' . $textudar[mt_rand(0, count($textudar) - 1)] . ' ' . $textchem[mt_rand(0, count($textchem) - 1)] . ' ' . $kuda . ' <b>-' . $uron . '</b> [' . $hp . '/' . $maxhp . ']' . '<BR>';
                 break;
         }
     }
diff --git a/cronjobs/cron_tower.php b/cronjobs/cron_tower.php
index 067d4a3..bbf4a34 100644
--- a/cronjobs/cron_tower.php
+++ b/cronjobs/cron_tower.php
@@ -84,7 +84,7 @@ if (!$tr && $turnirstart[0] <= time() && $dd[0] >= 2) {
         if ($i > 1) {
             $lors .= ", ";
         }
-        $lors .= nick::id($row['owner'])->full(1);
+        $lors .= Nick::id($row['owner'])->full(1);
     }
 
     // Боты: Архивариус и два помощника.
@@ -104,9 +104,9 @@ if (!$tr && $turnirstart[0] <= time() && $dd[0] >= 2) {
     mysql_query("UPDATE `online` SET `room` = '" . $rums . "', `date` = '999999999999' WHERE `id` = '235' LIMIT 1");
     echo mysql_error();
     $i++;
-    $lors .= ", " . nick::id(233)->full(1);
-    $lors .= ", " . nick::id(234)->full(1);
-    $lors .= ", " . nick::id(235)->full(1);
+    $lors .= ", " . Nick::id(233)->full(1);
+    $lors .= ", " . Nick::id(234)->full(1);
+    $lors .= ", " . Nick::id(235)->full(1);
     $lors .= ltrim(",", $lors);
 
     mysql_query("TRUNCATE TABLE `deztow_items`");
diff --git a/fbattle.php b/fbattle.php
index 43f752f..bab2987 100644
--- a/fbattle.php
+++ b/fbattle.php
@@ -377,7 +377,7 @@ $fbattle = new fbattle($user['battle']);
                                         $cc = '';
                                     }
                                     $ffs .= $cc . nick4($v, "B1");
-                                    $zz .= "private [" . nick::id($v)->short() . "] ";
+                                    $zz .= "private [" . Nick::id($v)->short() . "] ";
                                 }
                             }
 
@@ -399,7 +399,7 @@ $fbattle = new fbattle($user['battle']);
                                         $cc = '';
                                     }
                                     $ffs .= $cc . nick4($v, "B2");
-                                    $zz .= "private [" . nick::id($v)->short() . "] ";
+                                    $zz .= "private [" . Nick::id($v)->short() . "] ";
                                 }
                             }
                             $i = 0;
diff --git a/forest.php b/forest.php
index 22b854c..3031dd2 100644
--- a/forest.php
+++ b/forest.php
@@ -56,10 +56,10 @@ if($rand < 15 && $user['battle'] == 0) {
   mysql_query("INSERT INTO `battle`(`teams`, `timeout`, `type`, `status`, `t1`, `t2`, `to1`, `to2`) VALUES ('".serialize($teams)."', '3', '1', '0', '".$user['id']."', '".$bot."', '".time()."', '".time()."')");
   $id = mysql_insert_id();
   mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1");
-  $rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($bot)->full(1)."</b>";
+  $rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($bot)->full(1)."</b>";
   addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <br />");
   mysql_query("UPDATE `users` SET `battle` = {$id}, `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
-  addchp ('<b style="color:#990000">Внимание!</b> На вас напал "'.$bots[$rbot].'".   ','{[]}'.nick::id($user["id"])->short().'{[]}');
+  addchp ('<b style="color:#990000">Внимание!</b> На вас напал "'.$bots[$rbot].'".   ','{[]}'.Nick::id($user["id"])->short().'{[]}');
 }
 
 
@@ -108,7 +108,7 @@ if($_GET['res']) {
       $fo = mysql_query("INSERT INTO `inventory`(`name`, `koll`, `img`, `owner`, `type`, `massa`, `isrep`, `podzem`, `maxdur`, `present`) VALUES ('".$gss['name']."', '1', '".$gss['img']."', '".$user['id']."', '200', '0.1', '0', '1', '1', 'Лес')");
     }
     mysql_query("DELETE FROM `les_res` WHERE `id` = '".$gss['id']."' LIMIT 1");
-    addchp ('<b style="color:#990000">Внимание!</b> <b>'.$user["login"].'</b>, поднял предмет "'.$gss['name'].'".', '{[]}'.nick::id($user["id"])->short().'{[]}');
+    addchp ('<b style="color:#990000">Внимание!</b> <b>'.$user["login"].'</b>, поднял предмет "'.$gss['name'].'".', '{[]}'.Nick::id($user["id"])->short().'{[]}');
     echo "<font style='color:#990000'>Вы подняли <b>'".$gss['name']."'</b>.</font>";
   } else {
     echo "&nbsp;<font style='font-size:12px; color:cc0000;'>Кто-то оказался быстрее!</font>";}
diff --git a/forum.php b/forum.php
index 7ebee04..48d3a60 100644
--- a/forum.php
+++ b/forum.php
@@ -239,7 +239,7 @@ if (isset($_POST['add']) && isset($user['id'])) {
         if ($user['invis'] == 1) {
             $userPost = '<b>Невидимка</b>';
         } else {
-            $userPost = nick::id($user['id'])->full(1);
+            $userPost = Nick::id($user['id'])->full(1);
         }
         if ($isModerator == false) $text1 = strip_tags($text1, '<b><i><u><code><a><br><img><div>');
 
@@ -273,7 +273,7 @@ if (isset($_POST['add2']) && isset($user['id'])) {
         if ($user['invis'] == 1) {
             $userPost = '<b>Невидимка</b>';
         } else {
-            $userPost = nick::id($user['id'])->full(1);
+            $userPost = Nick::id($user['id'])->full(1);
         }
 
         if ($isModerator == false) {
@@ -317,7 +317,7 @@ if (isset($_GET['com']) && isset($_GET['cpr']) && $isModerator == true) {
     if ($user['invis'] == 1) {
         $addText = "<br /><b>Невидимка</b>: " . $_GET['cpr'];
     } else {
-        $addText = nick::id($user['id'])->full(1) . ": " . $_GET['cpr'];
+        $addText = Nick::id($user['id'])->full(1) . ": " . $_GET['cpr'];
     }
     db::c()->query('UPDATE `forum` SET `text` = CONCAT(`text`,"?s") WHERE `id` = ?i', $addText, $_GET['com']);
     echo "<script>window.location='?topic=" . $_GET['topic'] . "&rnd'</script>";
@@ -332,7 +332,7 @@ if (isset($_GET['do']) && $isModerator == true) {
     }
 
     if ($_GET['do'] == "close") {
-        $closeComment = "Обсуждение закрыл " . ($isAdmin) ? "<b>Администратор</b>" : nick::id($user['id'])->full(1);
+        $closeComment = "Обсуждение закрыл " . ($isAdmin) ? "<b>Администратор</b>" : Nick::id($user['id'])->full(1);
         db::c()->query('UPDATE `forum` SET `close` = 1, `closepal` = "?s" WHERE `id` = "?s"', $closeComment, $_GET['topic']);
         echo "<script>window.location='?topic=" . $_GET['topic'] . "&rnd'</script>";
         exit();
@@ -369,7 +369,7 @@ if (isset($_GET['do']) && $isModerator == true) {
     <tr valign="top">
         <td width="200">
             <br/>
-            <?php if (isset($user['id'])) echo "Игрок : " . nick::id($user['id'])->full(1) . "<br />"; ?>
+            <?php if (isset($user['id'])) echo "Игрок : " . Nick::id($user['id'])->full(1) . "<br />"; ?>
             <h4>Конференции</h4>
             <?php
             if ((isset($_GET['conf']) && is_numeric($_GET['conf'])) || (isset($_GET['konftop']) && is_numeric($_GET['konftop'])) || $Movemess == 1) {
@@ -626,7 +626,7 @@ if (isset($_GET['do']) && $isModerator == true) {
                     $data2 = db::c()->query('SELECT `author` FROM (SELECT `author`,`id` FROM `forum` WHERE `parent` = ?i ORDER BY `id` DESC LIMIT 10) AS sTable ORDER BY id DESC', $row['id']);
                     while ($row2 = $data2->fetch_row()) {
                         $userlist = strip_tags($row2[0], "");
-                        list ($username, $level) = split(" \[", $userlist);
+                        [$username, $level] = split(" \[", $userlist);
                         $logi .= $username;
                     }
                     $datacount = db::c()->query('SELECT count(*) AS CountNumber FROM `forum` WHERE `parent` = ?i', $row['id'])->fetch_assoc();
diff --git a/functions.php b/functions.php
index 721e085..7b760b9 100644
--- a/functions.php
+++ b/functions.php
@@ -211,21 +211,6 @@ function topsethp()
     return "top.setHP($user[hp], $user[maxhp], $delay);";
 }
 
-function nick($user)
-{
-    if ($user['align'] > 0) {
-        $al = $user['align'];
-    } else {
-        $al = 0;
-    }
-    if ($user['klan'] != '') {
-        $cl = '<img title="' . ClanImage($user['klan']) . '" src="i/klan/' . ClanImage($user['klan']) . '.gif" />';
-    } else {
-        $cl = '';
-    }
-    return '<div id="HP"><img src="i/align_' . $al . '.gif" />' . $cl . '<b>' . $user['login'] . '</b> [' . $user['level'] . '] <a href="inf.php?' . $user['id'] . '" target="_blank"><img src="i/inf.gif" alt="Inf"></a> <img src="i/herz.gif" alt="HP"> <img src="i/1green.gif" width="' . (150 * ($user['hp'] / $user['maxhp'])) . '" height="10"><img src="i/1silver.gif" width="' . (150 - 150 * ($user['hp'] / $user['maxhp'])) . '" height="10">: <span id="hp_value">' . $user['hp'] . ' / ' . $user['maxhp'] . '</span></div>';
-}
-
 function nick4($id, $st)
 {
     $user = db::c()->query('SELECT * FROM `users` WHERE `id` = ?i', $id)->fetch_assoc();
diff --git a/gotzamok.php b/gotzamok.php
index 285b9e0..f0de7a9 100644
--- a/gotzamok.php
+++ b/gotzamok.php
@@ -93,7 +93,7 @@ if ($user['room'] == 40) {
     </style>
 </head>
 <body>
-<h3>Приветствую тебя в замке <img src='i/klan/<?= $castleOwners['short'] ?>.gif'> <?= $castleOwners['name'] ?>, воин!</h3>
+<h3>Приветствую тебя в замке <img src='i/clan/<?= $castleOwners['short'] ?>.gif'> <?= $castleOwners['name'] ?>, воин!</h3>
 <div style="text-align: right;">
     <button onClick="hrefToFrame('city.php?bps')">Вернуться</button>
 </div>
@@ -147,7 +147,7 @@ if ($castleOwners['id'] == $user['klan']) { ?>
                                     <TD align=center width=20%>
                                         <IMG SRC="i/sh/<?= $row['img'] ?>">
                                         <BR>
-                                        <small>Положил: <?= nick::id($item['owner'])->full(1) ?><BR></small>
+                                        <small>Положил: <?= Nick::id($item['owner'])->full(1) ?><BR></small>
                                         <?php
                                         if ($_SESSION['uid'] == $item['owner'] OR $_SESSION['uid'] == $glava['glava']): ?>
                                             <A HREF="?back=<?= $item['id'] ?>">забрать</A><BR>
diff --git a/group_arena.php b/group_arena.php
index 41e68c6..ce6060d 100644
--- a/group_arena.php
+++ b/group_arena.php
@@ -11,7 +11,7 @@ function login($uid) {
     $align_img = '<img src="i/align_'.($user['align']?$user['align']:0).'.gif" /> ';
     if($user['klan'] != '') {
       $clan = mysql_fetch_array(mysql_query('SELECT `id`, `name` FROM `clans` WHERE `id` = "'.$user['klan'].'" LIMIT 1'));
-      $clan_img = '<img title="'.$clan['name'].'" src="i/klan/'.$clan['name'].'.gif" /> ';
+      $clan_img = '<img title="'.$clan['name'].'" src="i/clan/'.$clan['name'].'.gif" /> ';
     } else {
       $clan_img = '';
     }
diff --git a/hell.php b/hell.php
index ebd4006..01cfc68 100644
--- a/hell.php
+++ b/hell.php
@@ -111,7 +111,7 @@
     			$select = mysql_query("SELECT DISTINCT `owner` FROM `hellround_pohod` ORDER by (SELECT SUM(`volna`) FROM `hellround_pohod` WHERE `owner` = `owner`) DESC LIMIT 10;");
     			while($f = mysql_fetch_array($select)) {
 				    $i++;
-    				echo "&nbsp; ".$i.". ".nick::id($f[0])->full(1)."<BR>";
+    				echo "&nbsp; ".$i.". ".Nick::id($f[0])->full(1)."<BR>";
     			}
     		?>
     	<center>
diff --git a/i/klan/1x1.gif b/i/clan/1x1.gif
similarity index 100%
rename from i/klan/1x1.gif
rename to i/clan/1x1.gif
diff --git a/i/klan/AD.gif b/i/clan/AD.gif
similarity index 100%
rename from i/klan/AD.gif
rename to i/clan/AD.gif
diff --git a/i/klan/AD_big.gif b/i/clan/AD_big.gif
similarity index 100%
rename from i/klan/AD_big.gif
rename to i/clan/AD_big.gif
diff --git a/i/klan/Adminion.gif b/i/clan/Adminion.gif
similarity index 100%
rename from i/klan/Adminion.gif
rename to i/clan/Adminion.gif
diff --git a/i/klan/Adminion_big.gif b/i/clan/Adminion_big.gif
similarity index 100%
rename from i/klan/Adminion_big.gif
rename to i/clan/Adminion_big.gif
diff --git a/i/klan/Admins.gif b/i/clan/Admins.gif
similarity index 100%
rename from i/klan/Admins.gif
rename to i/clan/Admins.gif
diff --git a/i/klan/Admins_big.gif b/i/clan/Admins_big.gif
similarity index 100%
rename from i/klan/Admins_big.gif
rename to i/clan/Admins_big.gif
diff --git a/i/klan/Angels.gif b/i/clan/Angels.gif
similarity index 100%
rename from i/klan/Angels.gif
rename to i/clan/Angels.gif
diff --git a/i/klan/Angels_big.gif b/i/clan/Angels_big.gif
similarity index 100%
rename from i/klan/Angels_big.gif
rename to i/clan/Angels_big.gif
diff --git a/i/klan/Anti Killer.gif b/i/clan/Anti Killer.gif
similarity index 100%
rename from i/klan/Anti Killer.gif
rename to i/clan/Anti Killer.gif
diff --git a/i/klan/Anti Killer_big.gif b/i/clan/Anti Killer_big.gif
similarity index 100%
rename from i/klan/Anti Killer_big.gif
rename to i/clan/Anti Killer_big.gif
diff --git a/i/klan/Anti War.gif b/i/clan/Anti War.gif
similarity index 100%
rename from i/klan/Anti War.gif
rename to i/clan/Anti War.gif
diff --git a/i/klan/BAKU.gif b/i/clan/BAKU.gif
similarity index 100%
rename from i/klan/BAKU.gif
rename to i/clan/BAKU.gif
diff --git a/i/klan/BAKU_big.gif b/i/clan/BAKU_big.gif
similarity index 100%
rename from i/klan/BAKU_big.gif
rename to i/clan/BAKU_big.gif
diff --git a/i/klan/Bakins.gif b/i/clan/Bakins.gif
similarity index 100%
rename from i/klan/Bakins.gif
rename to i/clan/Bakins.gif
diff --git a/i/klan/Bakins_big.gif b/i/clan/Bakins_big.gif
similarity index 100%
rename from i/klan/Bakins_big.gif
rename to i/clan/Bakins_big.gif
diff --git a/i/klan/BlackLight.gif b/i/clan/BlackLight.gif
similarity index 100%
rename from i/klan/BlackLight.gif
rename to i/clan/BlackLight.gif
diff --git a/i/klan/BoS.gif b/i/clan/BoS.gif
similarity index 100%
rename from i/klan/BoS.gif
rename to i/clan/BoS.gif
diff --git a/i/klan/BoS_big.gif b/i/clan/BoS_big.gif
similarity index 100%
rename from i/klan/BoS_big.gif
rename to i/clan/BoS_big.gif
diff --git a/i/klan/Brigada.gif b/i/clan/Brigada.gif
similarity index 100%
rename from i/klan/Brigada.gif
rename to i/clan/Brigada.gif
diff --git a/i/klan/Brigada_big.gif b/i/clan/Brigada_big.gif
similarity index 100%
rename from i/klan/Brigada_big.gif
rename to i/clan/Brigada_big.gif
diff --git a/i/klan/BrotherhoodOfSteel.gif b/i/clan/BrotherhoodOfSteel.gif
similarity index 100%
rename from i/klan/BrotherhoodOfSteel.gif
rename to i/clan/BrotherhoodOfSteel.gif
diff --git a/i/klan/COVEN.gif b/i/clan/COVEN.gif
similarity index 100%
rename from i/klan/COVEN.gif
rename to i/clan/COVEN.gif
diff --git a/i/klan/COVEN_big.gif b/i/clan/COVEN_big.gif
similarity index 100%
rename from i/klan/COVEN_big.gif
rename to i/clan/COVEN_big.gif
diff --git a/i/klan/ChampionsOfEvil.gif b/i/clan/ChampionsOfEvil.gif
similarity index 100%
rename from i/klan/ChampionsOfEvil.gif
rename to i/clan/ChampionsOfEvil.gif
diff --git a/i/klan/ChampionsOfEvil_big.gif b/i/clan/ChampionsOfEvil_big.gif
similarity index 100%
rename from i/klan/ChampionsOfEvil_big.gif
rename to i/clan/ChampionsOfEvil_big.gif
diff --git a/i/klan/DARK LEGION.gif b/i/clan/DARK LEGION.gif
similarity index 100%
rename from i/klan/DARK LEGION.gif
rename to i/clan/DARK LEGION.gif
diff --git a/i/klan/DARK LEGION_big.gif b/i/clan/DARK LEGION_big.gif
similarity index 100%
rename from i/klan/DARK LEGION_big.gif
rename to i/clan/DARK LEGION_big.gif
diff --git a/i/klan/DRAGON.gif b/i/clan/DRAGON.gif
similarity index 100%
rename from i/klan/DRAGON.gif
rename to i/clan/DRAGON.gif
diff --git a/i/klan/DRAGON_big.gif b/i/clan/DRAGON_big.gif
similarity index 100%
rename from i/klan/DRAGON_big.gif
rename to i/clan/DRAGON_big.gif
diff --git a/i/klan/DW.gif b/i/clan/DW.gif
similarity index 100%
rename from i/klan/DW.gif
rename to i/clan/DW.gif
diff --git a/i/klan/DW_big.gif b/i/clan/DW_big.gif
similarity index 100%
rename from i/klan/DW_big.gif
rename to i/clan/DW_big.gif
diff --git a/i/klan/Dark Knight.gif b/i/clan/Dark Knight.gif
similarity index 100%
rename from i/klan/Dark Knight.gif
rename to i/clan/Dark Knight.gif
diff --git a/i/klan/DarkAlliance.gif b/i/clan/DarkAlliance.gif
similarity index 100%
rename from i/klan/DarkAlliance.gif
rename to i/clan/DarkAlliance.gif
diff --git a/i/klan/DarkBrotherhood.gif b/i/clan/DarkBrotherhood.gif
similarity index 100%
rename from i/klan/DarkBrotherhood.gif
rename to i/clan/DarkBrotherhood.gif
diff --git a/i/klan/DarkBrotherhood_big.gif b/i/clan/DarkBrotherhood_big.gif
similarity index 100%
rename from i/klan/DarkBrotherhood_big.gif
rename to i/clan/DarkBrotherhood_big.gif
diff --git a/i/klan/DarkClan.gif b/i/clan/DarkClan.gif
similarity index 100%
rename from i/klan/DarkClan.gif
rename to i/clan/DarkClan.gif
diff --git a/i/klan/DarkClan_big.gif b/i/clan/DarkClan_big.gif
similarity index 100%
rename from i/klan/DarkClan_big.gif
rename to i/clan/DarkClan_big.gif
diff --git a/i/klan/DarkImmortals.gif b/i/clan/DarkImmortals.gif
similarity index 100%
rename from i/klan/DarkImmortals.gif
rename to i/clan/DarkImmortals.gif
diff --git a/i/klan/DarkImmortals_big.gif b/i/clan/DarkImmortals_big.gif
similarity index 100%
rename from i/klan/DarkImmortals_big.gif
rename to i/clan/DarkImmortals_big.gif
diff --git a/i/klan/DarkLaw.gif b/i/clan/DarkLaw.gif
similarity index 100%
rename from i/klan/DarkLaw.gif
rename to i/clan/DarkLaw.gif
diff --git a/i/klan/DarkLegion.gif b/i/clan/DarkLegion.gif
similarity index 100%
rename from i/klan/DarkLegion.gif
rename to i/clan/DarkLegion.gif
diff --git a/i/klan/DarkSouls.gif b/i/clan/DarkSouls.gif
similarity index 100%
rename from i/klan/DarkSouls.gif
rename to i/clan/DarkSouls.gif
diff --git a/i/klan/DarkSouls_big.gif b/i/clan/DarkSouls_big.gif
similarity index 100%
rename from i/klan/DarkSouls_big.gif
rename to i/clan/DarkSouls_big.gif
diff --git a/i/klan/Domino.gif b/i/clan/Domino.gif
similarity index 100%
rename from i/klan/Domino.gif
rename to i/clan/Domino.gif
diff --git a/i/klan/Domino_big.gif b/i/clan/Domino_big.gif
similarity index 100%
rename from i/klan/Domino_big.gif
rename to i/clan/Domino_big.gif
diff --git a/i/klan/Dragons.gif b/i/clan/Dragons.gif
similarity index 100%
rename from i/klan/Dragons.gif
rename to i/clan/Dragons.gif
diff --git a/i/klan/Dragons_big.gif b/i/clan/Dragons_big.gif
similarity index 100%
rename from i/klan/Dragons_big.gif
rename to i/clan/Dragons_big.gif
diff --git a/i/klan/Dynamo.gif b/i/clan/Dynamo.gif
similarity index 100%
rename from i/klan/Dynamo.gif
rename to i/clan/Dynamo.gif
diff --git a/i/klan/Elite.gif b/i/clan/Elite.gif
similarity index 100%
rename from i/klan/Elite.gif
rename to i/clan/Elite.gif
diff --git a/i/klan/Elite_big.gif b/i/clan/Elite_big.gif
similarity index 100%
rename from i/klan/Elite_big.gif
rename to i/clan/Elite_big.gif
diff --git a/i/klan/Envoys of Hell.gif b/i/clan/Envoys of Hell.gif
similarity index 100%
rename from i/klan/Envoys of Hell.gif
rename to i/clan/Envoys of Hell.gif
diff --git a/i/klan/Envoys of Hell_big.gif b/i/clan/Envoys of Hell_big.gif
similarity index 100%
rename from i/klan/Envoys of Hell_big.gif
rename to i/clan/Envoys of Hell_big.gif
diff --git a/i/klan/EoH.gif b/i/clan/EoH.gif
similarity index 100%
rename from i/klan/EoH.gif
rename to i/clan/EoH.gif
diff --git a/i/klan/EoH_big.gif b/i/clan/EoH_big.gif
similarity index 100%
rename from i/klan/EoH_big.gif
rename to i/clan/EoH_big.gif
diff --git a/i/klan/Eon.gif b/i/clan/Eon.gif
similarity index 100%
rename from i/klan/Eon.gif
rename to i/clan/Eon.gif
diff --git a/i/klan/Eon_big.gif b/i/clan/Eon_big.gif
similarity index 100%
rename from i/klan/Eon_big.gif
rename to i/clan/Eon_big.gif
diff --git a/i/klan/Equilibrium.gif b/i/clan/Equilibrium.gif
similarity index 100%
rename from i/klan/Equilibrium.gif
rename to i/clan/Equilibrium.gif
diff --git a/i/klan/Equillibrium.gif b/i/clan/Equillibrium.gif
similarity index 100%
rename from i/klan/Equillibrium.gif
rename to i/clan/Equillibrium.gif
diff --git a/i/klan/Erathia.gif b/i/clan/Erathia.gif
similarity index 100%
rename from i/klan/Erathia.gif
rename to i/clan/Erathia.gif
diff --git a/i/klan/FLAME STARS.gif b/i/clan/FLAME STARS.gif
similarity index 100%
rename from i/klan/FLAME STARS.gif
rename to i/clan/FLAME STARS.gif
diff --git a/i/klan/FaF.gif b/i/clan/FaF.gif
similarity index 100%
rename from i/klan/FaF.gif
rename to i/clan/FaF.gif
diff --git a/i/klan/FaF_big.gif b/i/clan/FaF_big.gif
similarity index 100%
rename from i/klan/FaF_big.gif
rename to i/clan/FaF_big.gif
diff --git a/i/klan/FallenAngels.gif b/i/clan/FallenAngels.gif
similarity index 100%
rename from i/klan/FallenAngels.gif
rename to i/clan/FallenAngels.gif
diff --git a/i/klan/FallenAngels_big.gif b/i/clan/FallenAngels_big.gif
similarity index 100%
rename from i/klan/FallenAngels_big.gif
rename to i/clan/FallenAngels_big.gif
diff --git a/i/klan/Family.gif b/i/clan/Family.gif
similarity index 100%
rename from i/klan/Family.gif
rename to i/clan/Family.gif
diff --git a/i/klan/Family_big.gif b/i/clan/Family_big.gif
similarity index 100%
rename from i/klan/Family_big.gif
rename to i/clan/Family_big.gif
diff --git a/i/klan/Fast and Furious.gif b/i/clan/Fast and Furious.gif
similarity index 100%
rename from i/klan/Fast and Furious.gif
rename to i/clan/Fast and Furious.gif
diff --git a/i/klan/Fast and Furious_big.gif b/i/clan/Fast and Furious_big.gif
similarity index 100%
rename from i/klan/Fast and Furious_big.gif
rename to i/clan/Fast and Furious_big.gif
diff --git a/i/klan/Forestelfs.gif b/i/clan/Forestelfs.gif
similarity index 100%
rename from i/klan/Forestelfs.gif
rename to i/clan/Forestelfs.gif
diff --git a/i/klan/Freemen.gif b/i/clan/Freemen.gif
similarity index 100%
rename from i/klan/Freemen.gif
rename to i/clan/Freemen.gif
diff --git a/i/klan/FromHell.gif b/i/clan/FromHell.gif
similarity index 100%
rename from i/klan/FromHell.gif
rename to i/clan/FromHell.gif
diff --git a/i/klan/FromHell_big.gif b/i/clan/FromHell_big.gif
similarity index 100%
rename from i/klan/FromHell_big.gif
rename to i/clan/FromHell_big.gif
diff --git a/i/klan/Funs of Anime.gif b/i/clan/Funs of Anime.gif
similarity index 100%
rename from i/klan/Funs of Anime.gif
rename to i/clan/Funs of Anime.gif
diff --git a/i/klan/Funs of Anime_big.gif b/i/clan/Funs of Anime_big.gif
similarity index 100%
rename from i/klan/Funs of Anime_big.gif
rename to i/clan/Funs of Anime_big.gif
diff --git a/i/klan/GUS.gif b/i/clan/GUS.gif
similarity index 100%
rename from i/klan/GUS.gif
rename to i/clan/GUS.gif
diff --git a/i/klan/GUS_big.gif b/i/clan/GUS_big.gif
similarity index 100%
rename from i/klan/GUS_big.gif
rename to i/clan/GUS_big.gif
diff --git a/i/klan/GoD.gif b/i/clan/GoD.gif
similarity index 100%
rename from i/klan/GoD.gif
rename to i/clan/GoD.gif
diff --git a/i/klan/GoD_big.gif b/i/clan/GoD_big.gif
similarity index 100%
rename from i/klan/GoD_big.gif
rename to i/clan/GoD_big.gif
diff --git a/i/klan/Guards.gif b/i/clan/Guards.gif
similarity index 100%
rename from i/klan/Guards.gif
rename to i/clan/Guards.gif
diff --git a/i/klan/Haiducii.gif b/i/clan/Haiducii.gif
similarity index 100%
rename from i/klan/Haiducii.gif
rename to i/clan/Haiducii.gif
diff --git a/i/klan/Haiducii_big.gif b/i/clan/Haiducii_big.gif
similarity index 100%
rename from i/klan/Haiducii_big.gif
rename to i/clan/Haiducii_big.gif
diff --git a/i/klan/Harbour.gif b/i/clan/Harbour.gif
similarity index 100%
rename from i/klan/Harbour.gif
rename to i/clan/Harbour.gif
diff --git a/i/klan/HellMix.gif b/i/clan/HellMix.gif
similarity index 100%
rename from i/klan/HellMix.gif
rename to i/clan/HellMix.gif
diff --git a/i/klan/HellMix_big.gif b/i/clan/HellMix_big.gif
similarity index 100%
rename from i/klan/HellMix_big.gif
rename to i/clan/HellMix_big.gif
diff --git a/i/klan/HighTech.gif b/i/clan/HighTech.gif
similarity index 100%
rename from i/klan/HighTech.gif
rename to i/clan/HighTech.gif
diff --git a/i/klan/HighTech_big.gif b/i/clan/HighTech_big.gif
similarity index 100%
rename from i/klan/HighTech_big.gif
rename to i/clan/HighTech_big.gif
diff --git a/i/klan/IMPS.gif b/i/clan/IMPS.gif
similarity index 100%
rename from i/klan/IMPS.gif
rename to i/clan/IMPS.gif
diff --git a/i/klan/Immortals.gif b/i/clan/Immortals.gif
similarity index 100%
rename from i/klan/Immortals.gif
rename to i/clan/Immortals.gif
diff --git a/i/klan/Immortals_big.gif b/i/clan/Immortals_big.gif
similarity index 100%
rename from i/klan/Immortals_big.gif
rename to i/clan/Immortals_big.gif
diff --git a/i/klan/Iscariot.gif b/i/clan/Iscariot.gif
similarity index 100%
rename from i/klan/Iscariot.gif
rename to i/clan/Iscariot.gif
diff --git a/i/klan/Iscariot_big.gif b/i/clan/Iscariot_big.gif
similarity index 100%
rename from i/klan/Iscariot_big.gif
rename to i/clan/Iscariot_big.gif
diff --git a/i/klan/JackalClan.gif b/i/clan/JackalClan.gif
similarity index 100%
rename from i/klan/JackalClan.gif
rename to i/clan/JackalClan.gif
diff --git a/i/klan/JackalClan_big.gif b/i/clan/JackalClan_big.gif
similarity index 100%
rename from i/klan/JackalClan_big.gif
rename to i/clan/JackalClan_big.gif
diff --git a/i/klan/JoD.gif b/i/clan/JoD.gif
similarity index 100%
rename from i/klan/JoD.gif
rename to i/clan/JoD.gif
diff --git a/i/klan/JoD_big.gif b/i/clan/JoD_big.gif
similarity index 100%
rename from i/klan/JoD_big.gif
rename to i/clan/JoD_big.gif
diff --git a/i/klan/KNL.gif b/i/clan/KNL.gif
similarity index 100%
rename from i/klan/KNL.gif
rename to i/clan/KNL.gif
diff --git a/i/klan/Keepers of Flame.gif b/i/clan/Keepers of Flame.gif
similarity index 100%
rename from i/klan/Keepers of Flame.gif
rename to i/clan/Keepers of Flame.gif
diff --git a/i/klan/Keepers of Flame_big.gif b/i/clan/Keepers of Flame_big.gif
similarity index 100%
rename from i/klan/Keepers of Flame_big.gif
rename to i/clan/Keepers of Flame_big.gif
diff --git a/i/klan/Knights of Darkness.gif b/i/clan/Knights of Darkness.gif
similarity index 100%
rename from i/klan/Knights of Darkness.gif
rename to i/clan/Knights of Darkness.gif
diff --git a/i/klan/Longriders.gif b/i/clan/Longriders.gif
similarity index 100%
rename from i/klan/Longriders.gif
rename to i/clan/Longriders.gif
diff --git a/i/klan/MIBS.gif b/i/clan/MIBS.gif
similarity index 100%
rename from i/klan/MIBS.gif
rename to i/clan/MIBS.gif
diff --git a/i/klan/MIBS_big.gif b/i/clan/MIBS_big.gif
similarity index 100%
rename from i/klan/MIBS_big.gif
rename to i/clan/MIBS_big.gif
diff --git a/i/klan/MIB_big.gif b/i/clan/MIB_big.gif
similarity index 100%
rename from i/klan/MIB_big.gif
rename to i/clan/MIB_big.gif
diff --git a/i/klan/MafIA.gif b/i/clan/MafIA.gif
similarity index 100%
rename from i/klan/MafIA.gif
rename to i/clan/MafIA.gif
diff --git a/i/klan/MafIA_big.gif b/i/clan/MafIA_big.gif
similarity index 100%
rename from i/klan/MafIA_big.gif
rename to i/clan/MafIA_big.gif
diff --git a/i/klan/Mercenaries.gif b/i/clan/Mercenaries.gif
similarity index 100%
rename from i/klan/Mercenaries.gif
rename to i/clan/Mercenaries.gif
diff --git a/i/klan/Mercenaries_big.gif b/i/clan/Mercenaries_big.gif
similarity index 100%
rename from i/klan/Mercenaries_big.gif
rename to i/clan/Mercenaries_big.gif
diff --git a/i/klan/MiB.gif b/i/clan/MiB.gif
similarity index 100%
rename from i/klan/MiB.gif
rename to i/clan/MiB.gif
diff --git a/i/klan/NorthPalmira.gif b/i/clan/NorthPalmira.gif
similarity index 100%
rename from i/klan/NorthPalmira.gif
rename to i/clan/NorthPalmira.gif
diff --git a/i/klan/Novxani.gif b/i/clan/Novxani.gif
similarity index 100%
rename from i/klan/Novxani.gif
rename to i/clan/Novxani.gif
diff --git a/i/klan/Novxani_big.gif b/i/clan/Novxani_big.gif
similarity index 100%
rename from i/klan/Novxani_big.gif
rename to i/clan/Novxani_big.gif
diff --git a/i/klan/OgniBaku.gif b/i/clan/OgniBaku.gif
similarity index 100%
rename from i/klan/OgniBaku.gif
rename to i/clan/OgniBaku.gif
diff --git a/i/klan/OgniBaku_big.gif b/i/clan/OgniBaku_big.gif
similarity index 100%
rename from i/klan/OgniBaku_big.gif
rename to i/clan/OgniBaku_big.gif
diff --git a/i/klan/OldBaku.gif b/i/clan/OldBaku.gif
similarity index 100%
rename from i/klan/OldBaku.gif
rename to i/clan/OldBaku.gif
diff --git a/i/klan/OldMiB.gif b/i/clan/OldMiB.gif
similarity index 100%
rename from i/klan/OldMiB.gif
rename to i/clan/OldMiB.gif
diff --git a/i/klan/PhantomsofChaos.gif b/i/clan/PhantomsofChaos.gif
similarity index 100%
rename from i/klan/PhantomsofChaos.gif
rename to i/clan/PhantomsofChaos.gif
diff --git a/i/klan/PitBull.gif b/i/clan/PitBull.gif
similarity index 100%
rename from i/klan/PitBull.gif
rename to i/clan/PitBull.gif
diff --git a/i/klan/RMercenaries.gif b/i/clan/RMercenaries.gif
similarity index 100%
rename from i/klan/RMercenaries.gif
rename to i/clan/RMercenaries.gif
diff --git a/i/klan/RMiB.gif b/i/clan/RMiB.gif
similarity index 100%
rename from i/klan/RMiB.gif
rename to i/clan/RMiB.gif
diff --git a/i/klan/RMiB_big.gif b/i/clan/RMiB_big.gif
similarity index 100%
rename from i/klan/RMiB_big.gif
rename to i/clan/RMiB_big.gif
diff --git a/i/klan/Rastanoobs.gif b/i/clan/Rastanoobs.gif
similarity index 100%
rename from i/klan/Rastanoobs.gif
rename to i/clan/Rastanoobs.gif
diff --git a/i/klan/RecruitBoS.gif b/i/clan/RecruitBoS.gif
similarity index 100%
rename from i/klan/RecruitBoS.gif
rename to i/clan/RecruitBoS.gif
diff --git a/i/klan/RecruitDarkClan.gif b/i/clan/RecruitDarkClan.gif
similarity index 100%
rename from i/klan/RecruitDarkClan.gif
rename to i/clan/RecruitDarkClan.gif
diff --git a/i/klan/RecruitDarkClan_big.gif b/i/clan/RecruitDarkClan_big.gif
similarity index 100%
rename from i/klan/RecruitDarkClan_big.gif
rename to i/clan/RecruitDarkClan_big.gif
diff --git a/i/klan/RedCross.gif b/i/clan/RedCross.gif
similarity index 100%
rename from i/klan/RedCross.gif
rename to i/clan/RedCross.gif
diff --git a/i/klan/ResidentForce.gif b/i/clan/ResidentForce.gif
similarity index 100%
rename from i/klan/ResidentForce.gif
rename to i/clan/ResidentForce.gif
diff --git a/i/klan/ResidentForce_big.gif b/i/clan/ResidentForce_big.gif
similarity index 100%
rename from i/klan/ResidentForce_big.gif
rename to i/clan/ResidentForce_big.gif
diff --git a/i/klan/Ritter.gif b/i/clan/Ritter.gif
similarity index 100%
rename from i/klan/Ritter.gif
rename to i/clan/Ritter.gif
diff --git a/i/klan/Ritter_big.gif b/i/clan/Ritter_big.gif
similarity index 100%
rename from i/klan/Ritter_big.gif
rename to i/clan/Ritter_big.gif
diff --git a/i/klan/SOVETSKI.gif b/i/clan/SOVETSKI.gif
similarity index 100%
rename from i/klan/SOVETSKI.gif
rename to i/clan/SOVETSKI.gif
diff --git a/i/klan/SOVETSKI_big.gif b/i/clan/SOVETSKI_big.gif
similarity index 100%
rename from i/klan/SOVETSKI_big.gif
rename to i/clan/SOVETSKI_big.gif
diff --git a/i/klan/SPoAN.gif b/i/clan/SPoAN.gif
similarity index 100%
rename from i/klan/SPoAN.gif
rename to i/clan/SPoAN.gif
diff --git a/i/klan/ScorpionS.gif b/i/clan/ScorpionS.gif
similarity index 100%
rename from i/klan/ScorpionS.gif
rename to i/clan/ScorpionS.gif
diff --git a/i/klan/ScorpionS_big.gif b/i/clan/ScorpionS_big.gif
similarity index 100%
rename from i/klan/ScorpionS_big.gif
rename to i/clan/ScorpionS_big.gif
diff --git a/i/klan/ScreamOfDeath.gif b/i/clan/ScreamOfDeath.gif
similarity index 100%
rename from i/klan/ScreamOfDeath.gif
rename to i/clan/ScreamOfDeath.gif
diff --git a/i/klan/SecondReality.gif b/i/clan/SecondReality.gif
similarity index 100%
rename from i/klan/SecondReality.gif
rename to i/clan/SecondReality.gif
diff --git a/i/klan/SecondReality_big.gif b/i/clan/SecondReality_big.gif
similarity index 100%
rename from i/klan/SecondReality_big.gif
rename to i/clan/SecondReality_big.gif
diff --git a/i/klan/SoT.gif b/i/clan/SoT.gif
similarity index 100%
rename from i/klan/SoT.gif
rename to i/clan/SoT.gif
diff --git a/i/klan/Stalkers.gif b/i/clan/Stalkers.gif
similarity index 100%
rename from i/klan/Stalkers.gif
rename to i/clan/Stalkers.gif
diff --git a/i/klan/TARMANS.gif b/i/clan/TARMANS.gif
similarity index 100%
rename from i/klan/TARMANS.gif
rename to i/clan/TARMANS.gif
diff --git a/i/klan/TARMANS_big.gif b/i/clan/TARMANS_big.gif
similarity index 100%
rename from i/klan/TARMANS_big.gif
rename to i/clan/TARMANS_big.gif
diff --git a/i/klan/TBR.gif b/i/clan/TBR.gif
similarity index 100%
rename from i/klan/TBR.gif
rename to i/clan/TBR.gif
diff --git a/i/klan/TBR_big.gif b/i/clan/TBR_big.gif
similarity index 100%
rename from i/klan/TBR_big.gif
rename to i/clan/TBR_big.gif
diff --git a/i/klan/TS.gif b/i/clan/TS.gif
similarity index 100%
rename from i/klan/TS.gif
rename to i/clan/TS.gif
diff --git a/i/klan/TS_big.gif b/i/clan/TS_big.gif
similarity index 100%
rename from i/klan/TS_big.gif
rename to i/clan/TS_big.gif
diff --git a/i/klan/Tabula Rasa.gif b/i/clan/Tabula Rasa.gif
similarity index 100%
rename from i/klan/Tabula Rasa.gif
rename to i/clan/Tabula Rasa.gif
diff --git a/i/klan/Tabula Rasa_big.gif b/i/clan/Tabula Rasa_big.gif
similarity index 100%
rename from i/klan/Tabula Rasa_big.gif
rename to i/clan/Tabula Rasa_big.gif
diff --git a/i/klan/The-Justice.gif b/i/clan/The-Justice.gif
similarity index 100%
rename from i/klan/The-Justice.gif
rename to i/clan/The-Justice.gif
diff --git a/i/klan/TriAda.gif b/i/clan/TriAda.gif
similarity index 100%
rename from i/klan/TriAda.gif
rename to i/clan/TriAda.gif
diff --git a/i/klan/TriAda_big.gif b/i/clan/TriAda_big.gif
similarity index 100%
rename from i/klan/TriAda_big.gif
rename to i/clan/TriAda_big.gif
diff --git a/i/klan/Uravniteli.gif b/i/clan/Uravniteli.gif
similarity index 100%
rename from i/klan/Uravniteli.gif
rename to i/clan/Uravniteli.gif
diff --git a/i/klan/VampireS.gif b/i/clan/VampireS.gif
similarity index 100%
rename from i/klan/VampireS.gif
rename to i/clan/VampireS.gif
diff --git a/i/klan/VampireS_big.gif b/i/clan/VampireS_big.gif
similarity index 100%
rename from i/klan/VampireS_big.gif
rename to i/clan/VampireS_big.gif
diff --git a/i/klan/Ventrue.gif b/i/clan/Ventrue.gif
similarity index 100%
rename from i/klan/Ventrue.gif
rename to i/clan/Ventrue.gif
diff --git a/i/klan/Ventrue_big.gif b/i/clan/Ventrue_big.gif
similarity index 100%
rename from i/klan/Ventrue_big.gif
rename to i/clan/Ventrue_big.gif
diff --git a/i/klan/VersuS.gif b/i/clan/VersuS.gif
similarity index 100%
rename from i/klan/VersuS.gif
rename to i/clan/VersuS.gif
diff --git a/i/klan/VersuS_big.gif b/i/clan/VersuS_big.gif
similarity index 100%
rename from i/klan/VersuS_big.gif
rename to i/clan/VersuS_big.gif
diff --git a/i/klan/ViP.gif b/i/clan/ViP.gif
similarity index 100%
rename from i/klan/ViP.gif
rename to i/clan/ViP.gif
diff --git a/i/klan/ViP_big.gif b/i/clan/ViP_big.gif
similarity index 100%
rename from i/klan/ViP_big.gif
rename to i/clan/ViP_big.gif
diff --git a/i/klan/Volnye.gif b/i/clan/Volnye.gif
similarity index 100%
rename from i/klan/Volnye.gif
rename to i/clan/Volnye.gif
diff --git a/i/klan/WBoys.gif b/i/clan/WBoys.gif
similarity index 100%
rename from i/klan/WBoys.gif
rename to i/clan/WBoys.gif
diff --git a/i/klan/WBoys_big.gif b/i/clan/WBoys_big.gif
similarity index 100%
rename from i/klan/WBoys_big.gif
rename to i/clan/WBoys_big.gif
diff --git a/i/klan/WildHearts.gif b/i/clan/WildHearts.gif
similarity index 100%
rename from i/klan/WildHearts.gif
rename to i/clan/WildHearts.gif
diff --git a/i/klan/WildHearts_big.gif b/i/clan/WildHearts_big.gif
similarity index 100%
rename from i/klan/WildHearts_big.gif
rename to i/clan/WildHearts_big.gif
diff --git a/i/klan/Wildplain.gif b/i/clan/Wildplain.gif
similarity index 100%
rename from i/klan/Wildplain.gif
rename to i/clan/Wildplain.gif
diff --git a/i/klan/align_1.99.gif b/i/clan/align_1.99.gif
similarity index 100%
rename from i/klan/align_1.99.gif
rename to i/clan/align_1.99.gif
diff --git a/i/klan/align_4_big.gif b/i/clan/align_4_big.gif
similarity index 100%
rename from i/klan/align_4_big.gif
rename to i/clan/align_4_big.gif
diff --git a/i/klan/aton.gif b/i/clan/aton.gif
similarity index 100%
rename from i/klan/aton.gif
rename to i/clan/aton.gif
diff --git a/i/klan/aton_big.gif b/i/clan/aton_big.gif
similarity index 100%
rename from i/klan/aton_big.gif
rename to i/clan/aton_big.gif
diff --git a/i/klan/izbrannie.gif b/i/clan/izbrannie.gif
similarity index 100%
rename from i/klan/izbrannie.gif
rename to i/clan/izbrannie.gif
diff --git a/i/klan/izbrannie_big.gif b/i/clan/izbrannie_big.gif
similarity index 100%
rename from i/klan/izbrannie_big.gif
rename to i/clan/izbrannie_big.gif
diff --git a/i/klan/legion.gif b/i/clan/legion.gif
similarity index 100%
rename from i/klan/legion.gif
rename to i/clan/legion.gif
diff --git a/i/klan/legion_big.gif b/i/clan/legion_big.gif
similarity index 100%
rename from i/klan/legion_big.gif
rename to i/clan/legion_big.gif
diff --git a/i/klan/oNe durEx.gif b/i/clan/oNe durEx.gif
similarity index 100%
rename from i/klan/oNe durEx.gif
rename to i/clan/oNe durEx.gif
diff --git a/i/klan/oNe durEx_big.gif b/i/clan/oNe durEx_big.gif
similarity index 100%
rename from i/klan/oNe durEx_big.gif
rename to i/clan/oNe durEx_big.gif
diff --git a/i/klan/pAdonki_big.gif b/i/clan/pAdonki_big.gif
similarity index 100%
rename from i/klan/pAdonki_big.gif
rename to i/clan/pAdonki_big.gif
diff --git a/i/klan/radminion.gif b/i/clan/radminion.gif
similarity index 100%
rename from i/klan/radminion.gif
rename to i/clan/radminion.gif
diff --git a/i/klan/serv/help.gif b/i/clan/serv/help.gif
similarity index 100%
rename from i/klan/serv/help.gif
rename to i/clan/serv/help.gif
diff --git a/i/klan/skomorokh.gif b/i/clan/skomorokh.gif
similarity index 100%
rename from i/klan/skomorokh.gif
rename to i/clan/skomorokh.gif
diff --git a/i/klan/skomorokh_big.gif b/i/clan/skomorokh_big.gif
similarity index 100%
rename from i/klan/skomorokh_big.gif
rename to i/clan/skomorokh_big.gif
diff --git a/i/klan/ttz.gif b/i/clan/ttz.gif
similarity index 100%
rename from i/klan/ttz.gif
rename to i/clan/ttz.gif
diff --git a/i/klan/xXx.gif b/i/clan/xXx.gif
similarity index 100%
rename from i/klan/xXx.gif
rename to i/clan/xXx.gif
diff --git a/i/klan/xXx_big.gif b/i/clan/xXx_big.gif
similarity index 100%
rename from i/klan/xXx_big.gif
rename to i/clan/xXx_big.gif
diff --git a/lab.php b/lab.php
index acd0369..c5990d7 100644
--- a/lab.php
+++ b/lab.php
@@ -355,7 +355,7 @@ Mysql_query("update `users` set `hp`=`maxhp` where `login`='".$user['login']."'"
 <body leftmargin=5 topmargin=0 marginwidth=0 marginheight=0 bgcolor=#e2e0e0 onload="top.setHP(<?=$user['hp']?>,<?=$user['maxhp']?>)">
 <?
 
-		echo nick($user);
+		echo Nick::id($user)->battle();
         echo" <a href=\"#\" onclick=\"javascript:if (confirm('Желаете выбраться из квестового лабиринта? Теряете все, что здесь нашли.')){ location.href='lab.php?eexit=1';}\">Выйти?</a>";
 		echo "<table border=0 width=100%><tr><td colspan=4><font color=red>".$msg; 	echo "</font>";
 		if($room['exit']==1) {
@@ -384,7 +384,7 @@ echo"Всего в Квестовом Лабиринте: <b>".$u_lab_kol."</b>
   echo"<b>В этой комнате:</b>";
   echo"<br><li><u>Игроки:</u>";
   while($items = mysql_fetch_array($data3)){		
-			echo "<BR>"; echo nick::id($items['id'])->full();
+			echo "<BR>"; echo Nick::id($items['id'])->full();
   }
   echo"<br><li><u>Мобы:</u>";
 		while($items = mysql_fetch_array($data4)){
diff --git a/lab2.php b/lab2.php
index 2200223..3754512 100644
--- a/lab2.php
+++ b/lab2.php
@@ -356,7 +356,7 @@ Mysql_query("update `users` set `hp`=`maxhp` where `login`='".$user['login']."'"
 <body leftmargin=5 topmargin=0 marginwidth=0 marginheight=0 bgcolor=#e2e0e0 onload="top.setHP(<?=$user['hp']?>,<?=$user['maxhp']?>)">
 <?
 
-		echo nick($user);
+		echo Nick::id($user)->battle();
         echo" <a href=\"#\" onclick=\"javascript:if (confirm('Желаете выбраться из лабиринта? Теряете все что здесь нашли.')){ location.href='lab.php?eexit=1';}\">Выйти?</a>";
 		echo "<table border=0 width=100%><tr><td colspan=4><font color=red>".$msg; 	echo "</font>";
 		if($room['exit']==1) {
@@ -385,7 +385,7 @@ echo"Всего в Лабиринте: <b>".$u_lab_kol."</b> чел. <small><a h
   echo"<b>В этой комнате:</b>";
   echo"<br><li><u>Игроки:</u>";
   while($items = mysql_fetch_array($data3)){		
-			echo "<BR>"; echo nick::id($items['id'])->full();
+			echo "<BR>"; echo Nick::id($items['id'])->full();
   }
   echo"<br><li><u>Мобы:</u>";
 		while($items = mysql_fetch_array($data4)){
diff --git a/labirint.php b/labirint.php
index daaba82..c709ce5 100644
--- a/labirint.php
+++ b/labirint.php
@@ -217,7 +217,7 @@ if($user['room'] == 1052) {
           $bts = explode(';', $bot_ids);
           $is = 0;
           while($is <= count($bts)) {
-            $nicks .= nick::id($bts[$is])->full(1).', ';
+            $nicks .= Nick::id($bts[$is])->full(1).', ';
             $i_d .= $bts[$is].', ';
             $is++;
           }
@@ -227,7 +227,7 @@ if($user['room'] == 1052) {
           if($user1['invis'] == 1) {
             $rr = "<b>невидимка</b> и <b>".$nicks."</b>";
           } else {
-            $rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".$nicks."</b>";
+            $rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".$nicks."</b>";
           }
 
 		  if(!mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE ".$who."")) { die('Error #1'.$who); }
@@ -245,7 +245,7 @@ if($user['room'] == 1052) {
 		  }
           $t1 = explode(";", $bd['t1']);
 		  $ttt = 1;
-		  addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+		  addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 		  mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = "'.$btl_pix['battle'].'" LIMIT 1');
 		  mysql_query("UPDATE `users` SET `battle` = '".$bd['id']."', `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
 		  header("Location: fbattle.php");
diff --git a/library.php b/library.php
index 62bf933..52cb39f 100644
--- a/library.php
+++ b/library.php
@@ -138,7 +138,7 @@ elseif($_GET['lib_room']=='archive')
 			('{$dress['id']}','{$user[id]}','{$dress['name']}','{$dress['type']}',{$dress['massa']},{$dress['cost']},'{$dress['img']}',{$dress['maxdur']},{$dress['isrep']},'{$dress['gsila']}','{$dress['glovk']}','{$dress['ginta']}','{$dress['gintel']}','{$dress['ghp']}','{$dress['gnoj']}','{$dress['gtopor']}','{$dress['gdubina']}','{$dress['gmech']}','{$dress['gfire']}','{$dress['gwater']}','{$dress['gair']}','{$dress['gearth']}','{$dress['glight']}','{$dress['ggray']}','{$dress['gdark']}','{$dress['needident']}','{$dress['nsila']}','{$dress['nlovk']}','{$dress['ninta']}','{$dress['nintel']}','{$dress['nmudra']}','{$dress['nvinos']}','{$dress['nnoj']}','{$dress['ntopor']}','{$dress['ndubina']}','{$dress['nmech']}','{$dress['nfire']}','{$dress['nwater']}','{$dress['nair']}','{$dress['nearth']}','{$dress['nlight']}','{$dress['ngray']}','{$dress['ndark']}',
 			'{$dress['mfkrit']}','{$dress['mfakrit']}','{$dress['mfuvorot']}','{$dress['mfauvorot']}','{$dress['bron1']}','{$dress['bron3']}','{$dress['bron2']}','{$dress['bron4']}','{$dress['maxu']}','{$dress['minu']}','{$dress['magic']}','{$dress['nlevel']}','{$dress['nalign']}','".(($dress['goden'])?($dress['goden']*24*60*60+time()):"")."','{$dress['goden']}','{$dress['razdel']}','{$dress['gmp']}','{$dress['gmeshok']}','{$dress['encicl']}','{$dress['artefact']}','0'
 			) ;");  
-        addchp ('У Вас есть все необходимые страницы. Сложив их в нужном порядке, Вы получаете <strong>Книгу Комментатора [1]','{[]}'.nick::id($user['id'])->short().'{[]}');
+        addchp ('У Вас есть все необходимые страницы. Сложив их в нужном порядке, Вы получаете <strong>Книгу Комментатора [1]','{[]}'.Nick::id($user['id'])->short().'{[]}');
         }
         
     }
@@ -220,7 +220,7 @@ elseif($_GET['lib_room']='magic_craft')
     			) ;");  
             mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
             VALUES ('','0','{$user['id']}','\"".$user['login']."\" создал свиток ".$dress['name']."  ',1,'".time()."');");
-            addchp ('Вы успешно создали свиток <strong>'.$dress['name'].'</strong>!','{[]}'.nick::id($user['id'])->short().'{[]}');
+            addchp ('Вы успешно создали свиток <strong>'.$dress['name'].'</strong>!','{[]}'.Nick::id($user['id'])->short().'{[]}');
         }
     }
         
diff --git a/magic/8cure30.php b/magic/8cure30.php
index aa5fd46..60b5fcf 100644
--- a/magic/8cure30.php
+++ b/magic/8cure30.php
@@ -42,7 +42,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/attack.php b/magic/attack.php
index 06b4e4b..478bf4b 100644
--- a/magic/attack.php
+++ b/magic/attack.php
@@ -67,7 +67,7 @@ if ($user['battle'] > 0) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attack.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -95,11 +95,11 @@ if ($user['battle'] > 0) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -157,8 +157,8 @@ if ($user['battle'] > 0) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}',"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 
diff --git a/magic/attack_t.php b/magic/attack_t.php
index 3e27c43..decd76f 100644
--- a/magic/attack_t.php
+++ b/magic/attack_t.php
@@ -78,7 +78,7 @@ elseif (!$us['online']) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attack_t.gif> <B>{$user['login']}</B>, применив силу Света, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -106,11 +106,11 @@ elseif (!$us['online']) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -168,8 +168,8 @@ elseif (!$us['online']) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
 					addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
diff --git a/magic/attackbot.php b/magic/attackbot.php
index 906a7e9..e83c533 100644
--- a/magic/attackbot.php
+++ b/magic/attackbot.php
@@ -61,7 +61,7 @@ if ($user['battle'] > 0) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
diff --git a/magic/attackk.php b/magic/attackk.php
index b8226a9..633a433 100644
--- a/magic/attackk.php
+++ b/magic/attackk.php
@@ -53,7 +53,7 @@ if ($user['battle'] > 0) {
     $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
     if ($jert['id'] != $user['id']) {
         addch("<img src=i/magic/attack.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно " . $action . " на &quot;{$_POST['target']}&quot;");
-        addchp('<font color=red>Внимание!</font> На вас ' . $action . ' <B>' . $user['login'] . '</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}' . nick::id($jert['id'])->short() . '{[]}');
+        addchp('<font color=red>Внимание!</font> На вас ' . $action . ' <B>' . $user['login'] . '</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}' . Nick::id($jert['id'])->short() . '{[]}');
         //destructitem($row['id']);
         $bet = 1;
         //арх
@@ -81,11 +81,11 @@ if ($user['battle'] > 0) {
             } else {
                 $ttt = 1;
             }
-            addch("<b>" . nick::id($user['id'])->short() . "</b> вмешался в <a href=logs.php?log=" . $id . " target=_blank>поединок »»</a>.  ", $user['room']);
+            addch("<b>" . Nick::id($user['id'])->short() . "</b> вмешался в <a href=logs.php?log=" . $id . " target=_blank>поединок »»</a>.  ", $user['room']);
 
             //mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-            addlog($jert['battle'], '<span class=date>' . date("H:i") . '</span> ' . nick::id($user['id'])->short() . ' вмешался в поединок!<BR>');
+            addlog($jert['battle'], '<span class=date>' . date("H:i") . '</span> ' . Nick::id($user['id'])->short() . ' вмешался в поединок!<BR>');
 
             mysql_query('UPDATE `battle` SET `teams` = \'' . serialize($battle) . '\', `t' . $ttt . '`=CONCAT(`t' . $ttt . '`,\';' . $user['id'] . '\')  WHERE `id` = ' . $jert['battle'] . ' ;');
             mysql_query("UPDATE users SET `battle` =" . $jert['battle'] . ",`zayavka`=0 WHERE `id`= " . $user['id']);
@@ -145,8 +145,8 @@ if ($user['battle'] > 0) {
             // создаем лог
 
 
-            $rr = "<b>" . nick::id($user['id'])->full(1) . "</b> и <b>" . nick::id($jert['id'])->full(1) . "</b>";
-            addch("<a href=logs.php?log=" . $id . " target=_blank>Бой</a> между <B><b>" . nick::id($user['id'])->short() . "</b> и <b>" . nick::id($jert['id'])->short() . "</b> начался.   ", $user['room']);
+            $rr = "<b>" . Nick::id($user['id'])->full(1) . "</b> и <b>" . Nick::id($jert['id'])->full(1) . "</b>";
+            addch("<a href=logs.php?log=" . $id . " target=_blank>Бой</a> между <B><b>" . Nick::id($user['id'])->short() . "</b> и <b>" . Nick::id($jert['id'])->short() . "</b> начался.   ", $user['room']);
 
             //mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}',"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 
diff --git a/magic/attackk_close.php b/magic/attackk_close.php
index 7d81962..7478d31 100644
--- a/magic/attackk_close.php
+++ b/magic/attackk_close.php
@@ -76,7 +76,7 @@ elseif (!$us['online']) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attackk_close.gif> <B>{$user['login']}</B>, применив магию закрытого кулачного кровавого нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -132,8 +132,8 @@ elseif (!$us['online']) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}',"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 
diff --git a/magic/attackk_open.php b/magic/attackk_open.php
index 6696ad8..c912322 100644
--- a/magic/attackk_open.php
+++ b/magic/attackk_open.php
@@ -76,7 +76,7 @@ if ($user['battle'] > 0) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attackk_open.gif> <B>{$user['login']}</B>, применив магию закрытого кулачного нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -132,8 +132,8 @@ if ($user['battle'] > 0) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}',"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 
diff --git a/magic/battack.php b/magic/battack.php
index 0a26f0b..98f7629 100644
--- a/magic/battack.php
+++ b/magic/battack.php
@@ -78,7 +78,7 @@ elseif (!$us['online']) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attackb.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -106,11 +106,11 @@ elseif (!$us['online']) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -168,8 +168,8 @@ elseif (!$us['online']) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
 					addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
diff --git a/magic/bexit.php b/magic/bexit.php
index 57af7d5..34ce64b 100644
--- a/magic/bexit.php
+++ b/magic/bexit.php
@@ -16,9 +16,9 @@ if ($user['battle'] == 0) {
 
 			//unset($fbattle->battle[$user['id']]);
 			if($us['sex'] == 1) {
-				addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вышла из боя!<BR>');
+				addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вышла из боя!<BR>');
 			} else {
-				addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вышел из боя!<BR>');
+				addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вышел из боя!<BR>');
 			}
    
 					$bd = mysql_fetch_array(mysql_query ('SELECT * FROM `battle` WHERE `id` = '.$user['battle'].' LIMIT 1;'));
@@ -47,7 +47,7 @@ if ($user['battle'] == 0) {
                     mysql_query("UPDATE `inventory` SET `duration`=`duration`+1 WHERE `type` <>12 AND `dressed` = 1 AND `owner` = '{$user['id']}';");
                     $magictime=time()+(10*60);
                     mysql_query("INSERT INTO `effects` (`owner`,`name`,`time`,`type`) values ('".$user['id']."','Путы','$magictime',10);");
-                   addchp ('<font color=red>Внимание!</font> Вы вышли из боя! ','{[]}'.nick::id($user['id'])->short().'{[]}');
+                   addchp ('<font color=red>Внимание!</font> Вы вышли из боя! ','{[]}'.Nick::id($user['id'])->short().'{[]}');
 					mysql_query("UPDATE `battle` SET `teams` = '".serialize($battle)."', `t".$ttt."`='".implode(";",$tu)."'  WHERE `id` = ".$user['battle']." ;");
                     mysql_query('UPDATE users SET `battle` =0, `hp` = 0 WHERE `id` = '.$user['id'].';');
                     header("Location:fbattle.php");                    
diff --git a/magic/brat.php b/magic/brat.php
index 4935e12..a083391 100644
--- a/magic/brat.php
+++ b/magic/brat.php
@@ -51,7 +51,7 @@ elseif ($user['zayavka'] > 0) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/brat.gif> <B>{$user['login']}</B>, применив магию темных сил, внезапно ".$action." в бой за &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> За Вас '.$action.' в бой <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> За Вас '.$action.' в бой <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -78,11 +78,11 @@ elseif ($user['zayavka'] > 0) {
 					} else {
 						$ttt = 2;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -141,8 +141,8 @@ elseif ($user['zayavka'] > 0) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}',"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 
diff --git a/magic/c30_100.php b/magic/c30_100.php
index 4bf4039..cc0fc1f 100644
--- a/magic/c30_100.php
+++ b/magic/c30_100.php
@@ -39,7 +39,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cityattack.php b/magic/cityattack.php
index cf55b63..9b799a3 100644
--- a/magic/cityattack.php
+++ b/magic/cityattack.php
@@ -34,7 +34,7 @@ if ($user['room'] == 20) {
         $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
         if ($jert['id'] != $user['id']) {
             addch("<img src=i/magic/attack.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно " . $action . " на &quot;{$_POST['target']}&quot;");
-            addchp('<font color=red>Внимание!</font> На вас ' . $action . ' <B>' . $user['login'] . '</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}' . nick::id($jert['id'])->short() . '{[]}');
+            addchp('<font color=red>Внимание!</font> На вас ' . $action . ' <B>' . $user['login'] . '</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}' . Nick::id($jert['id'])->short() . '{[]}');
             //destructitem($row['id']);
             $bet = 1;
             //арх
@@ -61,11 +61,11 @@ if ($user['room'] == 20) {
                 } else {
                     $ttt = 1;
                 }
-                addch("<b>" . nick::id($user['id'])->short() . "</b> вмешался в <a href=logs.php?log=" . $id . " target=_blank>поединок »»</a>.  ", $user['room']);
+                addch("<b>" . Nick::id($user['id'])->short() . "</b> вмешался в <a href=logs.php?log=" . $id . " target=_blank>поединок »»</a>.  ", $user['room']);
 
                 //mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-                addlog($jert['battle'], '<span class=date>' . date("H:i") . '</span> ' . nick::id($user['id'])->short() . ' вмешался в поединок!<BR>');
+                addlog($jert['battle'], '<span class=date>' . date("H:i") . '</span> ' . Nick::id($user['id'])->short() . ' вмешался в поединок!<BR>');
 
                 mysql_query('UPDATE `battle` SET `teams` = \'' . serialize($battle) . '\', `t' . $ttt . '`=CONCAT(`t' . $ttt . '`,\';' . $user['id'] . '\')  WHERE `id` = ' . $jert['battle'] . ' ;');
                 mysql_query("UPDATE users SET `battle` =" . $jert['battle'] . ",`zayavka`=0,`hit`=0,`parry`=0,`krit`=0,`counter`=0,`hp2`=0 WHERE `id`= " . $user['id']);
@@ -124,8 +124,8 @@ if ($user['room'] == 20) {
                 // создаем лог
 
 
-                $rr = "<b>" . nick::id($user['id'])->full(1) . "</b> и <b>" . nick::id($jert['id'])->full(1) . "</b>";
-                addch("<a href=logs.php?log=" . $id . " target=_blank>Бой</a> между <B><b>" . nick::id($user['id'])->short() . "</b> и <b>" . nick::id($jert['id'])->short() . "</b> начался.   ", $user['room']);
+                $rr = "<b>" . Nick::id($user['id'])->full(1) . "</b> и <b>" . Nick::id($jert['id'])->full(1) . "</b>";
+                addch("<a href=logs.php?log=" . $id . " target=_blank>Бой</a> между <B><b>" . Nick::id($user['id'])->short() . "</b> и <b>" . Nick::id($jert['id'])->short() . "</b> начался.   ", $user['room']);
 
                 //mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}',"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 
@@ -133,7 +133,7 @@ if ($user['room'] == 20) {
                 if ($us['login'] == "Общий Враг") {
                     $jert['id'] = 3954;
                 }
-                $rr = "<b>" . nick::id($user['id'])->full(1) . "</b> и <b>" . nick::id($jert['id'])->full(1) . "</b>";
+                $rr = "<b>" . Nick::id($user['id'])->full(1) . "</b> и <b>" . Nick::id($jert['id'])->full(1) . "</b>";
                 addlog($id, "Часы показывали <span class=date>" . date("Y.m.d H.i") . "</span>, когда " . $rr . " бросили вызов друг другу. <BR>");
 
                 if ($jert['id'] && $user['id'] && $jert['id'] < 999999) {
diff --git a/magic/clone.php b/magic/clone.php
index 3903ffe..e9515aa 100644
--- a/magic/clone.php
+++ b/magic/clone.php
@@ -31,7 +31,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' породил своего клона '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/clones.php b/magic/clones.php
index 7520eb5..9e12eda 100644
--- a/magic/clones.php
+++ b/magic/clones.php
@@ -24,8 +24,8 @@ if($user['battle'] == 0) {
 	} else {	
 	  $ttt = 2;
 	}
-    $lo = nick::id($user['id'])->short();
-    $los = nick::id($bot)->short();
+    $lo = Nick::id($user['id'])->short();
+    $los = Nick::id($bot)->short();
 	addlog($user['battle'], '<span class=date>'.date("H:i").'</span> '.$lo.' породил своего клона '.$los.'.<BR>');	
 	mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = "'.$user['battle'].'" LIMIT 1');	
 	mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1");							
diff --git a/magic/cpattack.php b/magic/cpattack.php
index 0ab8438..fdc0309 100644
--- a/magic/cpattack.php
+++ b/magic/cpattack.php
@@ -78,7 +78,7 @@ elseif (!$us['online']) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attack.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -106,11 +106,11 @@ elseif (!$us['online']) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -168,8 +168,8 @@ elseif (!$us['online']) {
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
 
diff --git a/magic/cure120.php b/magic/cure120.php
index bf6bfb6..20f589e 100644
--- a/magic/cure120.php
+++ b/magic/cure120.php
@@ -42,7 +42,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+120</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+120</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 					
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
diff --git a/magic/cure150.php b/magic/cure150.php
index c7584a0..4f5d0d7 100644
--- a/magic/cure150.php
+++ b/magic/cure150.php
@@ -42,7 +42,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+150</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+150</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 					
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
diff --git a/magic/cure30.php b/magic/cure30.php
index 482f4e4..1584387 100644
--- a/magic/cure30.php
+++ b/magic/cure30.php
@@ -42,7 +42,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cure300.php b/magic/cure300.php
index 0a87e47..9fd31a7 100644
--- a/magic/cure300.php
+++ b/magic/cure300.php
@@ -41,7 +41,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+300</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+300</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+300</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cure30_100.php b/magic/cure30_100.php
index 9bf52be..455048b 100644
--- a/magic/cure30_100.php
+++ b/magic/cure30_100.php
@@ -39,7 +39,7 @@ echo "12";
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cure30_8.php b/magic/cure30_8.php
index 5426c3c..16f19ef 100644
--- a/magic/cure30_8.php
+++ b/magic/cure30_8.php
@@ -36,7 +36,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+30</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cure45.php b/magic/cure45.php
index 642daf3..98ab1f4 100644
--- a/magic/cure45.php
+++ b/magic/cure45.php
@@ -41,7 +41,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+45</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+45</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cure60.php b/magic/cure60.php
index f22750d..9bc60a1 100644
--- a/magic/cure60.php
+++ b/magic/cure60.php
@@ -41,7 +41,7 @@ if ($_SESSION['uid'] == null) header("Location: index.php");
 				}
 				if ($user['battle'] > 0) {
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>\') WHERE `id` = '.$us['battle'].'');
-					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
+					$fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии '.(($us['id']!=$user['id'])?"на ".Nick::id($us['id'])->short():"").' и восстановил'.$action.' уровень жизни <B>+60</B> ['.($hp).'/'.$us['maxhp'].']<BR>');
 					//$fbattle->AddToLog('');
 						mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");							
 					
diff --git a/magic/cure_20.php b/magic/cure_20.php
index 781c880..047059c 100644
--- a/magic/cure_20.php
+++ b/magic/cure_20.php
@@ -15,7 +15,7 @@ if($user['battle'] <= 0) {
 } elseif($user['battle'] > 0 && $user['hp'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
-  $lod = nick::id($user['id'])->short();
+  $lod = Nick::id($user['id'])->short();
   $hp = floor($user['maxhp']*0.2);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 20%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/cure_35.php b/magic/cure_35.php
index 54c394b..f8ab4c2 100644
--- a/magic/cure_35.php
+++ b/magic/cure_35.php
@@ -15,7 +15,7 @@ if($user['battle'] <= 0) {
 } elseif($user['battle'] > 0 && $user['hp'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.35);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 35%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/cure_50.php b/magic/cure_50.php
index 9844b3d..9f020f2 100644
--- a/magic/cure_50.php
+++ b/magic/cure_50.php
@@ -15,7 +15,7 @@ if($user['battle'] <= 0) {
 } elseif($user['battle'] > 0 && $user['hp'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.5);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 50%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/cure_rep_120.php b/magic/cure_rep_120.php
index c9d674a..749f9d3 100644
--- a/magic/cure_rep_120.php
+++ b/magic/cure_rep_120.php
@@ -19,7 +19,7 @@ if($user['level'] < 6) {
       }
       if($user['invis'] == 1) { $hp = '??'; $maxhp = '??'; } else { $hp = $user['hp']; $maxhp = $user['maxhp']; }
       mysql_query('UPDATE `users` SET `hp` = "'.$user['hp'].'" WHERE `id` = "'.$user['id'].'" LIMIT 1');
-      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+120</b> ['.($hp).'/'.$maxhp.']<BR>');
+      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+120</b> ['.($hp).'/'.$maxhp.']<BR>');
       mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");
       $fbattle->write_log();
       echo "<font style=\"color: Red;\"><b>Свиток использован ...</b></font>";
diff --git a/magic/cure_rep_150.php b/magic/cure_rep_150.php
index 84e1d27..34f80e3 100644
--- a/magic/cure_rep_150.php
+++ b/magic/cure_rep_150.php
@@ -19,7 +19,7 @@ if($user['level'] < 8) {
       }
       if($user['invis'] == 1) { $hp = '??'; $maxhp = '??'; } else { $hp = $user['hp']; $maxhp = $user['maxhp']; }
       mysql_query('UPDATE `users` SET `hp` = "'.$user['hp'].'" WHERE `id` = "'.$user['id'].'" LIMIT 1');
-      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+150</b> ['.($hp).'/'.$maxhp.']<BR>');
+      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+150</b> ['.($hp).'/'.$maxhp.']<BR>');
       mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");
       $fbattle->write_log();
       echo "<font style=\"color: Red;\"><b>Свиток использован ...</b></font>";
diff --git a/magic/cure_rep_180.php b/magic/cure_rep_180.php
index a2c9381..998dba4 100644
--- a/magic/cure_rep_180.php
+++ b/magic/cure_rep_180.php
@@ -19,7 +19,7 @@ if($user['level'] < 8) {
       }
       if($user['invis'] == 1) { $hp = '??'; $maxhp = '??'; } else { $hp = $user['hp']; $maxhp = $user['maxhp']; }
       mysql_query('UPDATE `users` SET `hp` = "'.$user['hp'].'" WHERE `id` = "'.$user['id'].'" LIMIT 1');
-      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+180</b> ['.($hp).'/'.$maxhp.']<BR>');
+      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+180</b> ['.($hp).'/'.$maxhp.']<BR>');
       mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");
       $fbattle->write_log();
       echo "<font style=\"color: Red;\"><b>Свиток использован ...</b></font>";
diff --git a/magic/cure_rep_270.php b/magic/cure_rep_270.php
index 5ae4913..3df73e0 100644
--- a/magic/cure_rep_270.php
+++ b/magic/cure_rep_270.php
@@ -19,7 +19,7 @@ if($user['level'] < 8) {
       }
       if($user['invis'] == 1) { $hp = '??'; $maxhp = '??'; } else { $hp = $user['hp']; $maxhp = $user['maxhp']; }
       mysql_query('UPDATE `users` SET `hp` = "'.$user['hp'].'" WHERE `id` = "'.$user['id'].'" LIMIT 1');
-      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+270</b> ['.($hp).'/'.$maxhp.']<BR>');
+      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+270</b> ['.($hp).'/'.$maxhp.']<BR>');
       mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");
       $fbattle->write_log();
       echo "<font style=\"color: Red;\"><b>Свиток использован ...</b></font>";
diff --git a/magic/cure_rep_360.php b/magic/cure_rep_360.php
index a83fddc..45325f8 100644
--- a/magic/cure_rep_360.php
+++ b/magic/cure_rep_360.php
@@ -19,7 +19,7 @@ if($user['level'] < 8) {
       }
       if($user['invis'] == 1) { $hp = '??'; $maxhp = '??'; } else { $hp = $user['hp']; $maxhp = $user['maxhp']; }
       mysql_query('UPDATE `users` SET `hp` = "'.$user['hp'].'" WHERE `id` = "'.$user['id'].'" LIMIT 1');
-      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+360</b> ['.($hp).'/'.$maxhp.']<BR>');
+      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+360</b> ['.($hp).'/'.$maxhp.']<BR>');
       mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");
       $fbattle->write_log();
       echo "<font style=\"color: Red;\"><b>Свиток использован ...</b></font>";
diff --git a/magic/cure_rep_90.php b/magic/cure_rep_90.php
index a02ed2a..20c7103 100644
--- a/magic/cure_rep_90.php
+++ b/magic/cure_rep_90.php
@@ -19,7 +19,7 @@ if($user['level'] < 6) {
       }
       if($user['invis'] == 1) { $hp = '??'; $maxhp = '??'; } else { $hp = $user['hp']; $maxhp = $user['maxhp']; }
       mysql_query('UPDATE `users` SET `hp` = "'.$user['hp'].'" WHERE `id` = "'.$user['id'].'" LIMIT 1');
-      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+90</b> ['.($hp).'/'.$maxhp.']<BR>');
+      $fbattle->AddToLog('<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' использовал'.$action.' заклятие восстановления энергии и восстановил'.$action.' уровень жизни <b>+90</b> ['.($hp).'/'.$maxhp.']<BR>');
       mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");
       $fbattle->write_log();
       echo "<font style=\"color: Red;\"><b>Свиток использован ...</b></font>";
diff --git a/magic/eattack.php b/magic/eattack.php
index ebe0cde..d489324 100644
--- a/magic/eattack.php
+++ b/magic/eattack.php
@@ -83,7 +83,7 @@ elseif ($user['zayavka'] > 0) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attack.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -111,11 +111,11 @@ elseif ($user['zayavka'] > 0) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -181,8 +181,8 @@ $outok=1;
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
 
diff --git a/magic/ebattack.php b/magic/ebattack.php
index 6e07dfa..0a1a559 100644
--- a/magic/ebattack.php
+++ b/magic/ebattack.php
@@ -83,7 +83,7 @@ elseif ($user['zayavka'] > 0) {
 			$jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '{$_POST['target']}' LIMIT 1;"));
 			if($jert['id']!=$user['id']) {
 				addch("<img src=i/magic/attackb.gif> <B>{$user['login']}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.nick::id($jert['id'])->short().'{[]}');
+				addchp ('<font color=red>Внимание!</font> На вас '.$action.' <B>'.$user['login'].'</B>.<BR>\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ','{[]}'.Nick::id($jert['id'])->short().'{[]}');
 				//destructitem($row['id']);
 				$bet=1;
 				//арх
@@ -111,11 +111,11 @@ elseif ($user['zayavka'] > 0) {
 					} else {
 						$ttt = 1;
 					}
-					addch ("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
+					addch ("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.  ",$user['room']);
 
 					//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>\') WHERE `id` = '.$jert['battle'].'');
 
-					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+					addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 
 					mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 					mysql_query("UPDATE users SET `battle` =".$jert['battle'].",`zayavka`=0 WHERE `id`= ".$user['id']);
@@ -181,8 +181,8 @@ $outok=1;
 					// создаем лог
 
 
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
 					addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
diff --git a/magic/elem_ally_air.php b/magic/elem_ally_air.php
index 68b9922..7829a1a 100644
--- a/magic/elem_ally_air.php
+++ b/magic/elem_ally_air.php
@@ -31,7 +31,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_ally_earth.php b/magic/elem_ally_earth.php
index 2fd2b1d..9c8c73e 100644
--- a/magic/elem_ally_earth.php
+++ b/magic/elem_ally_earth.php
@@ -31,7 +31,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_ally_fire.php b/magic/elem_ally_fire.php
index 802d0c3..3c450b6 100644
--- a/magic/elem_ally_fire.php
+++ b/magic/elem_ally_fire.php
@@ -31,7 +31,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_ally_water.php b/magic/elem_ally_water.php
index 83e887b..3d8146e 100644
--- a/magic/elem_ally_water.php
+++ b/magic/elem_ally_water.php
@@ -31,7 +31,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_foe_air.php b/magic/elem_foe_air.php
index 53b99ae..bc97610 100644
--- a/magic/elem_foe_air.php
+++ b/magic/elem_foe_air.php
@@ -36,7 +36,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_foe_earth.php b/magic/elem_foe_earth.php
index 0580173..4000e21 100644
--- a/magic/elem_foe_earth.php
+++ b/magic/elem_foe_earth.php
@@ -36,7 +36,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_foe_fire.php b/magic/elem_foe_fire.php
index 5339fa3..3bfd4f9 100644
--- a/magic/elem_foe_fire.php
+++ b/magic/elem_foe_fire.php
@@ -36,7 +36,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/elem_foe_water.php b/magic/elem_foe_water.php
index 6854a34..1320c75 100644
--- a/magic/elem_foe_water.php
+++ b/magic/elem_foe_water.php
@@ -36,7 +36,7 @@ if ($user['battle'] == 0) {
 			$ttt = 2;
 		}					
 		//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' породил своего клона '.nick::id($bot)->short().'<BR>\') WHERE `id` = '.$user['battle'].';');
-		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вызвал '.nick::id($bot)->short().'<BR>');
+		addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вызвал '.Nick::id($bot)->short().'<BR>');
 					
 		mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = '.$user['battle'].' ;');
 		
diff --git a/magic/healing.php b/magic/healing.php
index ac897fd..d20b7d4 100644
--- a/magic/healing.php
+++ b/magic/healing.php
@@ -86,7 +86,7 @@ if ($receiver['battle'] != $user['battle']) {
 
         if ($user['battle'] > 0) {
             db::c()->query('UPDATE `battle` SET `to1` = ?i, `to2` = ?i WHERE `id` = ?i', time(), time(), $user['battle']);
-            $fbattle->AddToLog('<span class=date>' . date("H:i") . '</span> ' . nick::id($user['id'])->short() . ' колдует заклятие лечения и восстанавливает ' . (($receiver['id'] != $user['id']) ? nick::id($receiver['id'])->short() : "себе") . ' здоровье <B>' . $magic_power . '</B> [' . ($new_hp) . '/' . $receiver['maxhp'] . ']<BR>');
+            $fbattle->AddToLog('<span class=date>' . date("H:i") . '</span> ' . Nick::id($user['id'])->short() . ' колдует заклятие лечения и восстанавливает ' . (($receiver['id'] != $user['id']) ? Nick::id($receiver['id'])->short() : "себе") . ' здоровье <B>' . $magic_power . '</B> [' . ($new_hp) . '/' . $receiver['maxhp'] . ']<BR>');
             $fbattle->write_log();
         }
 
diff --git a/magic/note.php b/magic/note.php
index 6dbb18b..dd7559f 100644
--- a/magic/note.php
+++ b/magic/note.php
@@ -11,5 +11,5 @@ echo"В тексте не должно присутствовать подряд
 }else{
 $mess  = $_POST['target'];
 if ($user['sex'] == 1) {$action="выкрикнул";}	else {$action="выкрикнула";}
-addlog($user['battle'],'<span class=sysdate>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$action.': '.$mess.'<BR>');
+addlog($user['battle'],'<span class=sysdate>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$action.': '.$mess.'<BR>');
 }
diff --git a/magic/unclone.php b/magic/unclone.php
index 78c901d..d306246 100644
--- a/magic/unclone.php
+++ b/magic/unclone.php
@@ -56,7 +56,7 @@ if ($user['battle'] == 0) {
 			$t2 = implode(";",$t2);
 			
 			//mysql_query('UPDATE `logs` SET `log` = CONCAT(`log`,\'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' переманил клона '.nick::id($bot)->short().' на свою сторону<BR>\') WHERE `id` = '.$user['battle'].';');
-			addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' переманил клона '.nick::id($bot)->short().' на свою сторону<BR>');
+			addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' переманил клона '.Nick::id($bot)->short().' на свою сторону<BR>');
 			mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t1` = \''.$t1.'\', `t2` = \''.$t2.'\'  WHERE `id` = '.$user['battle'].' ;');
 			
 			mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1;");
diff --git a/magic/usability_klan/attack.php b/magic/usability_klan/attack.php
index 26fba15..ef94322 100644
--- a/magic/usability_klan/attack.php
+++ b/magic/usability_klan/attack.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `klan`, `attack` FROM `abils_klan` WHERE `klan` = "'.$user['klan'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-$los = nick::id($user['id'])->short();
+$los = Nick::id($user['id'])->short();
 $effect = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `owner` = '{$us['id']}' AND `time` > '".time()."' AND `type` = '227' LIMIT 1")); 
 
 if($vip['attack'] <= 0) {
@@ -57,7 +57,7 @@ if($vip['attack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attack.gif> <B>{$lo}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -84,7 +84,7 @@ if($vip['attack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE users SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -119,10 +119,10 @@ if($vip['attack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
 
-      $ld = nick::id($user['id'])->full(1);
-      $lds = nick::id($user['id'])->short();
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      $lds = Nick::id($user['id'])->short();
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` = {$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/usability_klan/attack_blood.php b/magic/usability_klan/attack_blood.php
index bb055ba..2d2d54c 100644
--- a/magic/usability_klan/attack_blood.php
+++ b/magic/usability_klan/attack_blood.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `klan`, `bloodattack` FROM `abils_klan` WHERE `klan` = "'.$user['klan'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-$los = nick::id($user['id'])->short();
+$los = Nick::id($user['id'])->short();
 $effect = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `owner` = '{$us['id']}' AND `time` > '".time()."' AND `type` = '227' LIMIT 1")); 
 
 if($vip['bloodattack'] <= 0) {
@@ -57,7 +57,7 @@ if($vip['bloodattack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attackb.gif> <B>{$lo}</B>, применив магию кровавого нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -84,7 +84,7 @@ if($vip['bloodattack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\'), `blood` = 1 WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE `users` SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -119,10 +119,10 @@ if($vip['bloodattack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
 
-      $ld = nick::id($user['id'])->full(1);
-      $lds = nick::id($user['id'])->short();
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      $lds = Nick::id($user['id'])->short();
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/usability_klan/clone.php b/magic/usability_klan/clone.php
index 0c40d4a..5f4ab1c 100644
--- a/magic/usability_klan/clone.php
+++ b/magic/usability_klan/clone.php
@@ -24,8 +24,8 @@ if($user['battle'] == 0) {
 	} else {	
 	  $ttt = 2;
 	}
-    $lo = nick::id($user['id'])->short();
-    $los = nick::id($bot)->short();
+    $lo = Nick::id($user['id'])->short();
+    $los = Nick::id($bot)->short();
 	addlog($user['battle'], '<span class=date>'.date("H:i").'</span> '.$lo.' породил своего клона '.$los.'.<BR>');	
 	mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = "'.$user['battle'].'" LIMIT 1');	
 	mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1");							
diff --git a/magic/usability_klan/close_battle.php b/magic/usability_klan/close_battle.php
index 6b77e08..aea0a03 100644
--- a/magic/usability_klan/close_battle.php
+++ b/magic/usability_klan/close_battle.php
@@ -11,7 +11,7 @@ if($user['battle'] <= 0) {
   echo 'Магия исчерпала себя ...';
 } else {
   $vip['closebattle'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' закрыл поединок от внешних вмешательств!<BR>');
   mysql_query('UPDATE `battle` SET `open` = 0 WHERE `id` = "'.$battle['id'].'" LIMIT 1');
   mysql_query('UPDATE `abils_klan` SET `closebattle` = "'.$vip['closebattle'].'" WHERE `klan` = "'.$vip['klan'].'" LIMIT 1');
diff --git a/magic/usability_klan/heal20.php b/magic/usability_klan/heal20.php
index 9c6d6a1..b9842c1 100644
--- a/magic/usability_klan/heal20.php
+++ b/magic/usability_klan/heal20.php
@@ -20,7 +20,7 @@ if($user['battle'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
   $vip['heal20'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.2);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 20%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/usability_klan/heal35.php b/magic/usability_klan/heal35.php
index dc51c9b..ac128c0 100644
--- a/magic/usability_klan/heal35.php
+++ b/magic/usability_klan/heal35.php
@@ -20,7 +20,7 @@ if($user['battle'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
   $vip['heal35'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['hp']+35);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 35%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/usability_klan/heal50.php b/magic/usability_klan/heal50.php
index 721bdb2..4aa60ff 100644
--- a/magic/usability_klan/heal50.php
+++ b/magic/usability_klan/heal50.php
@@ -20,7 +20,7 @@ if($user['battle'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
   $vip['heal50'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.5);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 50%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/usability_klan/note.php b/magic/usability_klan/note.php
index 4f93253..298153e 100644
--- a/magic/usability_klan/note.php
+++ b/magic/usability_klan/note.php
@@ -28,7 +28,7 @@ if($_POST['target'] == '' || $_POST['target'] == "") {
     $action = "выкрикнула";
   }
   $vip['comment'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($user['battle'], '<span class=sysdate>'.date("H:i").'</span> '.$lod.' '.$action.': '.$mess.'<BR>');
   mysql_query('UPDATE `abils_klan` SET `comment` = "'.$vip['comment'].'" WHERE `klan` = "'.$vip['klan'].'" LIMIT 1');
 }
diff --git a/magic/usability_klan/open_battle.php b/magic/usability_klan/open_battle.php
index cbf1b5a..600855a 100644
--- a/magic/usability_klan/open_battle.php
+++ b/magic/usability_klan/open_battle.php
@@ -13,7 +13,7 @@ if($user['battle'] <= 0) {
   echo 'Магия исчерпала себя ...';
 } else {
   $vip['openbattle'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' открыл поединок для внешних вмешательств!<BR>');
   mysql_query('UPDATE `battle` SET `open` = 1 WHERE `id` = "'.$battle['id'].'" LIMIT 1');
   mysql_query('UPDATE `abils_klan` SET `openbattle` = "'.$vip['openbattle'].'" WHERE `klan` = "'.$vip['klan'].'" LIMIT 1');
diff --git a/magic/usability_klan/reamdeath.php b/magic/usability_klan/reamdeath.php
index 0f91553..bf04b8d 100644
--- a/magic/usability_klan/reamdeath.php
+++ b/magic/usability_klan/reamdeath.php
@@ -19,7 +19,7 @@ if(!isset($battle['id'])) {
 } elseif(!$us['online']) {
   echo "Персонаж не в игре!";
 } else {
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' применил заклятие &quot;Поднять мертвого&quot;, и воскресил персонажа <b>'.$us['login'].'</b>!<BR>');
   mysql_query('UPDATE `users` SET `hp` = `maxhp` WHERE `id` = "'.$us['id'].'" LIMIT 1');
   $vip['reamdeath'] -= 1;
diff --git a/magic/usability_klan/unclone.php b/magic/usability_klan/unclone.php
index ba28fbf..5201885 100644
--- a/magic/usability_klan/unclone.php
+++ b/magic/usability_klan/unclone.php
@@ -52,7 +52,7 @@ if($user['battle'] == 0) {
 	  $t1 = implode(";", $t1);
 	  $t2 = implode(";", $t2);
 
-	  addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' переманил клона '.nick::id($bot)->short().' на свою сторону<BR>');
+	  addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' переманил клона '.Nick::id($bot)->short().' на свою сторону<BR>');
 	  mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t1` = \''.$t1.'\', `t2` = \''.$t2.'\'  WHERE `id` = '.$user['battle'].' LIMIT 1');
 	  mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1");							
       echo "Вы переманили клона";
diff --git a/magic/usability_user/attack.php b/magic/usability_user/attack.php
index bd27a78..a1aed0f 100644
--- a/magic/usability_user/attack.php
+++ b/magic/usability_user/attack.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `uid`, `attack` FROM `abils_user` WHERE `uid` = "'.$user['id'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-if($user['invis'] == 1) { $los = '<i><b>невидимка</b></i>'; } else { $los = nick::id($user['id'])->short(); }
+if($user['invis'] == 1) { $los = '<i><b>невидимка</b></i>'; } else { $los = Nick::id($user['id'])->short(); }
 $effect = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `owner` = '{$us['id']}' AND `time` > '".time()."' AND `type` = '227' LIMIT 1")); 
 
 if($vip['attack'] <= 0) {
@@ -57,7 +57,7 @@ if($vip['attack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attack.gif> <B>{$lo}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -84,7 +84,7 @@ if($vip['attack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE users SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -119,10 +119,10 @@ if($vip['attack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
 
-      $ld = nick::id($user['id'])->full(1);
-      if($user['invis'] == 1) { $lds = '<i><b>невидимка</b></i>'; } else { $lds = nick::id($user['id'])->short(); }
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      if($user['invis'] == 1) { $lds = '<i><b>невидимка</b></i>'; } else { $lds = Nick::id($user['id'])->short(); }
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` = {$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/usability_user/attack_blood.php b/magic/usability_user/attack_blood.php
index b4f6dc8..cb0e041 100644
--- a/magic/usability_user/attack_blood.php
+++ b/magic/usability_user/attack_blood.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `uid`, `bloodattack` FROM `abils_user` WHERE `uid` = "'.$user['id'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-$los = nick::id($user['id'])->short();
+$los = Nick::id($user['id'])->short();
 $effect = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `owner` = '{$us['id']}' AND `time` > '".time()."' AND `type` = '227' LIMIT 1")); 
 
 if($vip['bloodattack'] <= 0) {
@@ -57,7 +57,7 @@ if($vip['bloodattack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attackb.gif> <B>{$lo}</B>, применив магию кровавого нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -84,7 +84,7 @@ if($vip['bloodattack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\'), `blood` = 1 WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE `users` SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -119,10 +119,10 @@ if($vip['bloodattack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
 
-      $ld = nick::id($user['id'])->full(1);
-      $lds = nick::id($user['id'])->short();
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      $lds = Nick::id($user['id'])->short();
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/usability_user/clone.php b/magic/usability_user/clone.php
index e516430..44dc5bf 100644
--- a/magic/usability_user/clone.php
+++ b/magic/usability_user/clone.php
@@ -24,8 +24,8 @@ if($user['battle'] == 0) {
 	} else {	
 	  $ttt = 2;
 	}
-    if($user['invis'] == 1)	{ $lo = '<i><b>невидимка</b></i>'; } else { $lo = nick::id($user['id'])->short(); }
-    if($user['invis'] == 1)	{ $los = '<i><b>невидимка</b></i>'; } else { $los = nick::id($bot)->short(); }
+    if($user['invis'] == 1)	{ $lo = '<i><b>невидимка</b></i>'; } else { $lo = Nick::id($user['id'])->short(); }
+    if($user['invis'] == 1)	{ $los = '<i><b>невидимка</b></i>'; } else { $los = Nick::id($bot)->short(); }
 	addlog($user['battle'], '<span class=date>'.date("H:i").'</span> '.$lo.' породил своего клона '.$los.'.<BR><hr>');	
 	mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$bot.'\')  WHERE `id` = "'.$user['battle'].'" LIMIT 1');	
 	mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = ".$user['battle']." LIMIT 1");							
diff --git a/magic/usability_user/close_battle.php b/magic/usability_user/close_battle.php
index 43a7ef5..5135fd2 100644
--- a/magic/usability_user/close_battle.php
+++ b/magic/usability_user/close_battle.php
@@ -11,7 +11,7 @@ if($user['battle'] <= 0) {
   echo 'Магия исчерпала себя ...';
 } else {
   $vip['closebattle'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' закрыл поединок от внешних вмешательств!<BR>');
   mysql_query('UPDATE `battle` SET `open` = 0 WHERE `id` = "'.$battle['id'].'" LIMIT 1');
   mysql_query('UPDATE `abils_user` SET `closebattle` = "'.$vip['closebattle'].'" WHERE `id` = "'.$vip['id'].'" LIMIT 1');
diff --git a/magic/usability_user/heal20.php b/magic/usability_user/heal20.php
index 3daedb4..d21e666 100644
--- a/magic/usability_user/heal20.php
+++ b/magic/usability_user/heal20.php
@@ -20,7 +20,7 @@ if($user['battle'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
   $vip['heal20'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.2);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 20%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/usability_user/heal35.php b/magic/usability_user/heal35.php
index 8cd13eb..c3eb185 100644
--- a/magic/usability_user/heal35.php
+++ b/magic/usability_user/heal35.php
@@ -20,7 +20,7 @@ if($user['battle'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
   $vip['heal35'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.35);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 35%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/usability_user/heal50.php b/magic/usability_user/heal50.php
index d478e4b..089258d 100644
--- a/magic/usability_user/heal50.php
+++ b/magic/usability_user/heal50.php
@@ -20,7 +20,7 @@ if($user['battle'] <= 0) {
   echo 'Вы мертвы ...';
 } else {
   $vip['heal50'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   $hp = floor($user['maxhp']*0.5);
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' использовал заклятие Воcстановление энергии 50%.<BR>');
   $user['hp'] += $hp;
diff --git a/magic/usability_user/note.php b/magic/usability_user/note.php
index 81fde0a..418e00c 100644
--- a/magic/usability_user/note.php
+++ b/magic/usability_user/note.php
@@ -28,7 +28,7 @@ if($_POST['target'] == '' || $_POST['target'] == "") {
     $action = "выкрикнула";
   }
   $vip['comment'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($user['battle'], '<span class=sysdate>'.date("H:i").'</span> '.$lod.' '.$action.': '.$mess.'<BR>');
   mysql_query('UPDATE `abils_user` SET `comment` = "'.$vip['comment'].'" WHERE `id` = "'.$vip['id'].'" LIMIT 1');
 }
diff --git a/magic/usability_user/open_battle.php b/magic/usability_user/open_battle.php
index c75a445..ff60a6b 100644
--- a/magic/usability_user/open_battle.php
+++ b/magic/usability_user/open_battle.php
@@ -13,7 +13,7 @@ if($user['battle'] <= 0) {
   echo 'Магия исчерпала себя ...';
 } else {
   $vip['openbattle'] -= 1;
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' открыл поединок для внешних вмешательств!<BR>');
   mysql_query('UPDATE `battle` SET `open` = 1 WHERE `id` = "'.$battle['id'].'" LIMIT 1');
   mysql_query('UPDATE `abils_user` SET `openbattle` = "'.$vip['openbattle'].'" WHERE `id` = "'.$vip['id'].'" LIMIT 1');
diff --git a/magic/usability_user/reamdeath.php b/magic/usability_user/reamdeath.php
index a16139c..a0a0a03 100644
--- a/magic/usability_user/reamdeath.php
+++ b/magic/usability_user/reamdeath.php
@@ -19,7 +19,7 @@ if(!isset($battle['id'])) {
 } elseif(!$us['online']) {
   echo "Персонаж не в игре!";
 } else {
-  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+  if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
   addlog($battle['id'], '<span class=date>'.date("H:i").'</span> '.$lod.' применил заклятие &quot;Поднять мертвого&quot;, и воскресил персонажа <b>'.$us['login'].'</b>!<BR>');
   mysql_query('UPDATE `users` SET `hp` = `maxhp` WHERE `id` = "'.$us['id'].'" LIMIT 1');
   $vip['reamdeath'] -= 1;
diff --git a/magic/usability_user/unclone.php b/magic/usability_user/unclone.php
index 9196067..45e92ed 100644
--- a/magic/usability_user/unclone.php
+++ b/magic/usability_user/unclone.php
@@ -55,7 +55,7 @@ if($user['battle'] == 0) {
 	  $t1 = implode(";", $t1);
 	  $t2 = implode(";", $t2);
 
-	  addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' переманил клона '.nick::id($bot)->short().' на свою сторону.<BR>');
+	  addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' переманил клона '.Nick::id($bot)->short().' на свою сторону.<BR>');
 	  mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t1` = \''.$t1.'\', `t2` = \''.$t2.'\'  WHERE `id` = "'.$user['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE `battle` SET `to1` = '".time()."', `to2` = '".time()."' WHERE `id` = '".$user['battle']."' LIMIT 1");							
       echo mysql_error();
diff --git a/magic/usability_vip/attack.php b/magic/usability_vip/attack.php
index c01a678..df3a506 100644
--- a/magic/usability_vip/attack.php
+++ b/magic/usability_vip/attack.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `uid`, `attack` FROM `abils_vip` WHERE `uid` = "'.$user['id'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-$los = nick::id($user['id'])->short();
+$los = Nick::id($user['id'])->short();
 $effect = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `owner` = '{$us['id']}' AND `time` > '".time()."' AND `type` = '227' LIMIT 1")); 
 
 
@@ -57,7 +57,7 @@ if($vip['attack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attack.gif> <B>{$lo}</B>, применив магию нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -84,7 +84,7 @@ if($vip['attack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE users SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -119,10 +119,10 @@ if($vip['attack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
         
-      $ld = nick::id($user['id'])->full(1);
-      $lds = nick::id($user['id'])->short();
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      $lds = Nick::id($user['id'])->short();
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` = {$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/usability_vip/attack_blood.php b/magic/usability_vip/attack_blood.php
index f675a51..ab5e164 100644
--- a/magic/usability_vip/attack_blood.php
+++ b/magic/usability_vip/attack_blood.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `uid`, `bloodattack` FROM `abils_vip` WHERE `uid` = "'.$user['id'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-$los = nick::id($user['id'])->short();
+$los = Nick::id($user['id'])->short();
 $effect = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `owner` = '{$us['id']}' AND `time` > '".time()."' AND `type` = '227' LIMIT 1")); 
 
 if($vip['bloodattack'] <= 0) {
@@ -56,7 +56,7 @@ if($vip['bloodattack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attackb.gif> <B>{$lo}</B>, применив магию кровавого нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -83,7 +83,7 @@ if($vip['bloodattack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\'), `blood` = 1 WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE `users` SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -118,10 +118,10 @@ if($vip['bloodattack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
 
-      $ld = nick::id($user['id'])->full(1);
-      $lds = nick::id($user['id'])->short();
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      $lds = Nick::id($user['id'])->short();
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/usability_vip/pers_blood.php b/magic/usability_vip/pers_blood.php
index b5e88f3..30c13df 100644
--- a/magic/usability_vip/pers_blood.php
+++ b/magic/usability_vip/pers_blood.php
@@ -5,7 +5,7 @@ $owntravma = mysql_fetch_array(mysql_query("SELECT `id` FROM `effects` WHERE `ow
 $us_b = mysql_fetch_array(mysql_query("SELECT `type`, `open` FROM `battle` WHERE `id` = '{$us['battle']}' LIMIT 1"));
 $vip = mysql_fetch_array(mysql_query('SELECT `id`, `uid`, `pers_attack` FROM `abils_vip` WHERE `uid` = "'.$user['id'].'" LIMIT 1'));
 if($user['invis'] == 1) { $lo = '<i><b>невидимка</b></i>'; } else { $lo = $user['login']; }
-$los = nick::id($user['id'])->short();
+$los = Nick::id($user['id'])->short();
 
 if($vip['pers_attack'] <= 0) {
   echo "Магия исчерпала себя ...";
@@ -50,7 +50,7 @@ if($vip['pers_attack'] <= 0) {
   $jert = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `login` = '".mysql_real_escape_string($_POST['target'])."' LIMIT 1"));
   if($jert['id'] != $user['id']) {
 	addch("<img src=i/magic/attackb.gif> <B>{$lo}</B>, применив магию кровавого нападения, внезапно ".$action." на &quot;{$_POST['target']}&quot;");
-    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.nick::id($jert['id'])->short().'{[]}');
+    addchp('<font color=red>Внимание!</font> На вас '.$action.' <b>'.$lo.'</b>.<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}'.Nick::id($jert['id'])->short().'{[]}');
 
 	if($jert['id'] > _BOTSEPARATOR_) {
 	  $arha = mysql_fetch_array(mysql_query('SELECT * FROM `bots` WHERE `prototype` = '.$jert['id'].' LIMIT 1'));
@@ -77,7 +77,7 @@ if($vip['pers_attack'] <= 0) {
 	  }
 
       addch("<b>".$los."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
-      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = nick::id($user['id'])->short(); }
+      if($user['invis'] == 1) { $lod = '<i><b>невидимка</b></i>'; } else { $lod = Nick::id($user['id'])->short(); }
       addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.$lod.' вмешался в поединок!<BR>');
       mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\'), `blood` = 1 WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE `users` SET `battle` = ".$jert['battle'].", `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
@@ -112,10 +112,10 @@ if($vip['pers_attack'] <= 0) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");
 	  }
 
-      $ld = nick::id($user['id'])->full(1);
-      $lds = nick::id($user['id'])->short();
-      $rr = "<b>".$ld."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";
-	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".nick::id($jert['id'])->short()."</b> начался.", $user['room']);
+      $ld = Nick::id($user['id'])->full(1);
+      $lds = Nick::id($user['id'])->short();
+      $rr = "<b>".$ld."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <b>".$lds."</b> и <b>".Nick::id($jert['id'])->short()."</b> начался.", $user['room']);
       addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
       mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']} OR `id` = {$jert['id']}");
 	  header("Location: fbattle.php");
diff --git a/magic/vampir.php b/magic/vampir.php
index c31f154..46abc5e 100644
--- a/magic/vampir.php
+++ b/magic/vampir.php
@@ -123,8 +123,8 @@ if ($user['battle'] > 0) {
 					}
 
 					// создаем лог
-					$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($us['id'])->full(1)."</b>";
-					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".nick::id($user['id'])->short()."</b> и <b>".nick::id($us['id'])->short()."</b> начался.   ",$user['room']);
+					$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($us['id'])->full(1)."</b>";
+					addch ("<a href=logs.php?log=".$id." target=_blank>Бой</a> между <B><b>".Nick::id($user['id'])->short()."</b> и <b>".Nick::id($us['id'])->short()."</b> начался.   ",$user['room']);
 
 					//mysql_query("INSERT INTO `logs` (`id`,`log`) VALUES('{$id}','Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>');");
 					addlog($id,'Часы показывали <span class=date>'.date("Y.m.d H.i").'</span>, когда '.$rr.' бросили вызов друг другу. <BR>');
diff --git a/magic/vips.php b/magic/vips.php
index 78d9198..ba3026a 100644
--- a/magic/vips.php
+++ b/magic/vips.php
@@ -44,7 +44,7 @@ if($user['align'] != 2.99 && $user['login'] != "father") {
       echo '<b style=\'color: Red;\'>Персонажу '.$us['login'].', '.$t.' '.$types[$type].' аккаунт. Сроком '.$srok.'</b>';
       $txt = 'Ангел <b>'.$user['login'].'</b> '.$add.' вам <b>'.$types[$type].' аккаунт</b>, сроком '.$srok.'';
 
-      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.nick::id($us['id'])->short().'{[]}');
+      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.Nick::id($us['id'])->short().'{[]}');
     } elseif($type == 2) {
       if($us['vip'] == 1) {
         $vip['sokr'] = 1; $vip['zash'] = 1; $vip['invisible'] = 1; $vip['attack'] = 1; $vip['bloodattack'] = 1;
@@ -66,7 +66,7 @@ if($user['align'] != 2.99 && $user['login'] != "father") {
       echo '<b style=\'color: Red;\'>Персонажу '.$us['login'].', '.$t.' '.$types[$type].' аккаунт. Сроком '.$srok.'</b>';
       $txt = 'Ангел <b>'.$user['login'].'</b> '.$add.' вам <b>'.$types[$type].' аккаунт</b>, сроком '.$srok.'';
 
-      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.nick::id($us['id'])->short().'{[]}');
+      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.Nick::id($us['id'])->short().'{[]}');
     } elseif($type == 3) {
       if($us['vip'] == 1) {
         $vip['sokr'] = 1; $vip['zash'] = 1; $vip['invisible'] = 1; $vip['attack'] = 1; $vip['bloodattack'] = 1;
@@ -88,7 +88,7 @@ if($user['align'] != 2.99 && $user['login'] != "father") {
       echo '<b style=\'color: Red;\'>Персонажу '.$us['login'].', '.$t.' '.$types[$type].' аккаунт. Сроком '.$srok.'</b>';
       $txt = 'Ангел <b>'.$user['login'].'</b> '.$add.' вам <b>'.$types[$type].' аккаунт</b>, сроком '.$srok.'';
 
-      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.nick::id($us['id'])->short().'{[]}');
+      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.Nick::id($us['id'])->short().'{[]}');
     }
   } else {
     if(isset($vip['id'])) {
@@ -108,7 +108,7 @@ if($user['align'] != 2.99 && $user['login'] != "father") {
       echo '<b style=\'color: Red;\'>Персонажу '.$us['login'].', выдан '.$types[$type].' аккаунт. Сроком '.$srok.'</b>';
       $txt = 'Ангел <b>'.$user['login'].'</b> '.$add.' вам <b>'.$types[$type].' аккаунт</b>, сроком '.$srok.'';
 
-      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.nick::id($us['id'])->short().'{[]}');
+      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.Nick::id($us['id'])->short().'{[]}');
       
     } else {
       if($type == 1) {
@@ -128,7 +128,7 @@ if($user['align'] != 2.99 && $user['login'] != "father") {
       echo '<b style=\'color: Red;\'>Персонажу '.$us['login'].', выдан '.$types[$type].' аккаунт. Сроком '.$srok.'</b>';
       $txt = 'Ангел <b>'.$user['login'].'</b> присвоил вам <b>'.$types[$type].' аккаунт</b>, сроком '.$srok.'';
 
-      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.nick::id($us['id'])->short().'{[]}');
+      addchp('<font color=red>Внимание!</font> '.$txt, '{[]}'.Nick::id($us['id'])->short().'{[]}');
     }
   }
 }
\ No newline at end of file
diff --git a/magic/wis_air_h1.php b/magic/wis_air_h1.php
index cb2e53b..0528109 100644
--- a/magic/wis_air_h1.php
+++ b/magic/wis_air_h1.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_air_h2.php b/magic/wis_air_h2.php
index e97428a..9d35996 100644
--- a/magic/wis_air_h2.php
+++ b/magic/wis_air_h2.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_air_h3.php b/magic/wis_air_h3.php
index 3d68da3..1b43029 100644
--- a/magic/wis_air_h3.php
+++ b/magic/wis_air_h3.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_air_m1.php b/magic/wis_air_m1.php
index d629e22..7c5d538 100644
--- a/magic/wis_air_m1.php
+++ b/magic/wis_air_m1.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_air_m2.php b/magic/wis_air_m2.php
index 4c5bcdf..d913fb6 100644
--- a/magic/wis_air_m2.php
+++ b/magic/wis_air_m2.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_air_m3.php b/magic/wis_air_m3.php
index 6cdeabe..f249b03 100644
--- a/magic/wis_air_m3.php
+++ b/magic/wis_air_m3.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_air_o1.php b/magic/wis_air_o1.php
index 05348fe..98c57f4 100644
--- a/magic/wis_air_o1.php
+++ b/magic/wis_air_o1.php
@@ -54,9 +54,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_air_o2.php b/magic/wis_air_o2.php
index 9792392..d6be159 100644
--- a/magic/wis_air_o2.php
+++ b/magic/wis_air_o2.php
@@ -55,9 +55,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_air_o3.php b/magic/wis_air_o3.php
index f81a122..6f154a6 100644
--- a/magic/wis_air_o3.php
+++ b/magic/wis_air_o3.php
@@ -55,9 +55,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_air_t1.php b/magic/wis_air_t1.php
index ed60f63..8e676dc 100644
--- a/magic/wis_air_t1.php
+++ b/magic/wis_air_t1.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_air_t2.php b/magic/wis_air_t2.php
index f680eb7..d4884b1 100644
--- a/magic/wis_air_t2.php
+++ b/magic/wis_air_t2.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_air_t3.php b/magic/wis_air_t3.php
index a6d0489..98cbe93 100644
--- a/magic/wis_air_t3.php
+++ b/magic/wis_air_t3.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_earth_d1.php b/magic/wis_earth_d1.php
index 5c142d6..0f27593 100644
--- a/magic/wis_earth_d1.php
+++ b/magic/wis_earth_d1.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_earth_d2.php b/magic/wis_earth_d2.php
index 3561ebb..b60b25e 100644
--- a/magic/wis_earth_d2.php
+++ b/magic/wis_earth_d2.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_earth_d3.php b/magic/wis_earth_d3.php
index 4247c63..d95689b 100644
--- a/magic/wis_earth_d3.php
+++ b/magic/wis_earth_d3.php
@@ -60,7 +60,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -96,7 +96,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_earth_g1.php b/magic/wis_earth_g1.php
index 4adabf8..34c8901 100644
--- a/magic/wis_earth_g1.php
+++ b/magic/wis_earth_g1.php
@@ -58,9 +58,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_earth_g2.php b/magic/wis_earth_g2.php
index fc26b03..a8de35f 100644
--- a/magic/wis_earth_g2.php
+++ b/magic/wis_earth_g2.php
@@ -57,9 +57,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_earth_g3.php b/magic/wis_earth_g3.php
index e7677b4..a9202a8 100644
--- a/magic/wis_earth_g3.php
+++ b/magic/wis_earth_g3.php
@@ -56,9 +56,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_earth_k1.php b/magic/wis_earth_k1.php
index ce282de..680ffa3 100644
--- a/magic/wis_earth_k1.php
+++ b/magic/wis_earth_k1.php
@@ -55,7 +55,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -91,7 +91,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_earth_k2.php b/magic/wis_earth_k2.php
index a6037cc..a022c4a 100644
--- a/magic/wis_earth_k2.php
+++ b/magic/wis_earth_k2.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_earth_k3.php b/magic/wis_earth_k3.php
index 59e5093..47998ff 100644
--- a/magic/wis_earth_k3.php
+++ b/magic/wis_earth_k3.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_earth_m1.php b/magic/wis_earth_m1.php
index ec8f754..50832cd 100644
--- a/magic/wis_earth_m1.php
+++ b/magic/wis_earth_m1.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_earth_m2.php b/magic/wis_earth_m2.php
index 0b59d3b..aeaadd4 100644
--- a/magic/wis_earth_m2.php
+++ b/magic/wis_earth_m2.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_earth_m3.php b/magic/wis_earth_m3.php
index 5238d3b..7016866 100644
--- a/magic/wis_earth_m3.php
+++ b/magic/wis_earth_m3.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_fire_i1.php b/magic/wis_fire_i1.php
index c277172..809969e 100644
--- a/magic/wis_fire_i1.php
+++ b/magic/wis_fire_i1.php
@@ -56,9 +56,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_fire_i2.php b/magic/wis_fire_i2.php
index d2e9eb9..d1c0163 100644
--- a/magic/wis_fire_i2.php
+++ b/magic/wis_fire_i2.php
@@ -57,9 +57,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_fire_i3.php b/magic/wis_fire_i3.php
index 6f0ea21..a06f349 100644
--- a/magic/wis_fire_i3.php
+++ b/magic/wis_fire_i3.php
@@ -56,9 +56,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_fire_p1.php b/magic/wis_fire_p1.php
index 655666b..3ff26ac 100644
--- a/magic/wis_fire_p1.php
+++ b/magic/wis_fire_p1.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_fire_p2.php b/magic/wis_fire_p2.php
index 5aeaea8..1e2bd3a 100644
--- a/magic/wis_fire_p2.php
+++ b/magic/wis_fire_p2.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_fire_p3.php b/magic/wis_fire_p3.php
index 692339b..dcc541d 100644
--- a/magic/wis_fire_p3.php
+++ b/magic/wis_fire_p3.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_fire_t1.php b/magic/wis_fire_t1.php
index 8c69031..e8f4c54 100644
--- a/magic/wis_fire_t1.php
+++ b/magic/wis_fire_t1.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_fire_t2.php b/magic/wis_fire_t2.php
index ee694f6..b088518 100644
--- a/magic/wis_fire_t2.php
+++ b/magic/wis_fire_t2.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_fire_t3.php b/magic/wis_fire_t3.php
index b8601a6..2a794ff 100644
--- a/magic/wis_fire_t3.php
+++ b/magic/wis_fire_t3.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_fire_v1.php b/magic/wis_fire_v1.php
index e8340ed..d9d41dc 100644
--- a/magic/wis_fire_v1.php
+++ b/magic/wis_fire_v1.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_fire_v2.php b/magic/wis_fire_v2.php
index 3d754c3..1b987c5 100644
--- a/magic/wis_fire_v2.php
+++ b/magic/wis_fire_v2.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_fire_v3.php b/magic/wis_fire_v3.php
index e2358f9..b6da506 100644
--- a/magic/wis_fire_v3.php
+++ b/magic/wis_fire_v3.php
@@ -89,7 +89,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -97,12 +97,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_water_ch1.php b/magic/wis_water_ch1.php
index c67533e..a6fa825 100644
--- a/magic/wis_water_ch1.php
+++ b/magic/wis_water_ch1.php
@@ -57,9 +57,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_water_ch2.php b/magic/wis_water_ch2.php
index 948b235..d282803 100644
--- a/magic/wis_water_ch2.php
+++ b/magic/wis_water_ch2.php
@@ -57,9 +57,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
       $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_water_ch3.php b/magic/wis_water_ch3.php
index 6b63513..d07e66a 100644
--- a/magic/wis_water_ch3.php
+++ b/magic/wis_water_ch3.php
@@ -57,9 +57,9 @@ if ($user['battle'] == 0) {
       echo "<font color=red><b>На персонажа ".$_POST['target']." наложено заклятие </b></font>".$log_text;
         $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if($user['id']==$us_in['id'])
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');      
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на себя заклятие </font></b>'.$log_text.' <BR>');
         else
-      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.' на '.nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
+      addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.' на '.Nick::id($us_in['id'])->short().' заклятие </font></b>'.$log_text.' <BR>');
       $bet=1;
       mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");$outok=1;
       
diff --git a/magic/wis_water_o1.php b/magic/wis_water_o1.php
index 36338d0..d8c22e1 100644
--- a/magic/wis_water_o1.php
+++ b/magic/wis_water_o1.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_water_o2.php b/magic/wis_water_o2.php
index aa61884..a07d280 100644
--- a/magic/wis_water_o2.php
+++ b/magic/wis_water_o2.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_water_o3.php b/magic/wis_water_o3.php
index 72459f5..d32cf71 100644
--- a/magic/wis_water_o3.php
+++ b/magic/wis_water_o3.php
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
 			$tar_team = "B1";
 			}
             
-        $targeted=' на '.nick::id($target)->short();
+        $targeted=' на '.Nick::id($target)->short();
         //dmg >0 - go
         $all_dmg=unserialize($bat['damage']);
         $all_exp=unserialize($bat['exp']);
@@ -96,12 +96,12 @@ if ($user['battle'] == 0) {
         $all_exp[$user['id']]+=SolveExp($user['id'],$target,$dmg);
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
-         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+         addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
         else 
          echo "Не нарушайте покой мертвых!";
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         //проверка hp>0
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
diff --git a/magic/wis_water_r1.php b/magic/wis_water_r1.php
index 35f3788..3654380 100644
--- a/magic/wis_water_r1.php
+++ b/magic/wis_water_r1.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_water_r2.php b/magic/wis_water_r2.php
index e412bb8..8762173 100644
--- a/magic/wis_water_r2.php
+++ b/magic/wis_water_r2.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_water_r3.php b/magic/wis_water_r3.php
index e08aef2..10cd05b 100644
--- a/magic/wis_water_r3.php
+++ b/magic/wis_water_r3.php
@@ -61,7 +61,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
 
         //mass magic
          mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -97,7 +97,7 @@ if ($user['battle'] == 0) {
 
         //сработало
         if($dmg>0) $hit='-1'; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if($dmg>0)
         {
             if($us)
diff --git a/magic/wis_water_tr1.php b/magic/wis_water_tr1.php
index 925712b..191e2e9 100644
--- a/magic/wis_water_tr1.php
+++ b/magic/wis_water_tr1.php
@@ -55,7 +55,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -91,7 +91,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_water_tr2.php b/magic/wis_water_tr2.php
index 3ed30ff..f614e4e 100644
--- a/magic/wis_water_tr2.php
+++ b/magic/wis_water_tr2.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/magic/wis_water_tr3.php b/magic/wis_water_tr3.php
index 8d32fca..7fa13bf 100644
--- a/magic/wis_water_tr3.php
+++ b/magic/wis_water_tr3.php
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
             case 'e':$sel='mearth';break;
         };
          $sex_action="применил";if($user['sex']==0) $sex_action.="а";
-        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
+        addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
        
         //mass magic
         mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
         
         //сработало
         if($dmg>0) $hit=1; else $hit=0;
-            $action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
+            $action=preg_replace("/Х/",Nick::id($target)->short(),magic_log($elem,$hit,$target));
         if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
         if($dmg>0)
         {
diff --git a/podzem/atk.php b/podzem/atk.php
index eacaa59..266c675 100644
--- a/podzem/atk.php
+++ b/podzem/atk.php
@@ -49,7 +49,7 @@ if($jert['id']!=$user['id']) {
 
 
 
-addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок1!<BR>');
+addlog($jert['battle'],'<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок1!<BR>');
 
 mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'`=CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\')  WHERE `id` = '.$jert['battle'].' ;');
 
diff --git a/podzem_brat.php b/podzem_brat.php
index 626f1a1..866e1a0 100644
--- a/podzem_brat.php
+++ b/podzem_brat.php
@@ -1,6 +1,6 @@
 <?php
 $frt=mysql_query("select user_id from `labirint` where glava='".$glava."'");
 while($rbb=mysql_fetch_array($frt)){
-addchp ('<b>'.$user["login"].'</b> поднял предмет "'.$mis.'".   ','{[]}'.nick::id($rbb["user_id"])->short().'{[]}');
+addchp ('<b>'.$user["login"].'</b> поднял предмет "'.$mis.'".   ','{[]}'.Nick::id($rbb["user_id"])->short().'{[]}');
 }
 
diff --git a/post.php b/post.php
index ea6cc18..42febf2 100644
--- a/post.php
+++ b/post.php
@@ -85,7 +85,7 @@ if ($_SESSION['receiverName']) {
 <div style="text-align: center;"><?php if (isset($statusMessage)) err($statusMessage); ?></div>
 <legend>Услуги почты платные: 1 кредит.</legend>
 <?php if ($_SESSION['receiverName']): ?>
-    Получатель: <?= nick::id($receiverId)->full() ?>
+    Получатель: <?= Nick::id($receiverId)->full() ?>
     <a href="?change">Сменить</a>
     <table width=100%>
         <tr>
diff --git a/startpodzemel.php b/startpodzemel.php
index a44a4f0..96c0773 100644
--- a/startpodzemel.php
+++ b/startpodzemel.php
@@ -75,7 +75,7 @@ $id = mysql_insert_id();
 					// апдейтим бота
 mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1;");
 					// создаем лог
-$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($bot)->full(1)."</b>";
+$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($bot)->full(1)."</b>";
 addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']};");
 
diff --git a/tower.php b/tower.php
index 1090a54..83b9c68 100644
--- a/tower.php
+++ b/tower.php
@@ -135,7 +135,7 @@ $bania->get_fond();
 	while($in = mysql_fetch_array($lss)) {
 	  $i++;
 	  if($i > 1) { $lors .= ", "; }
-	  $lors .= nick::id($in[0])->full(1);
+	  $lors .= Nick::id($in[0])->full(1);
       $lors .= ltrim(",", $lors);
 	}
     if($lors == '') {
diff --git a/towerin.php b/towerin.php
index 3b7925d..e391868 100644
--- a/towerin.php
+++ b/towerin.php
@@ -131,11 +131,11 @@ if($_POST['attack']) {
 	  } else {	
 		$ttt = 1; $ttt2 = 2;
 	  }
-	  addch("<b>".nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);				
-	  addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' вмешался в поединок!<BR>');
+	  addch("<b>".Nick::id($user['id'])->short()."</b> вмешался в <a href=logs.php?log=".$id." target=_blank>поединок »»</a>.", $user['room']);
+	  addlog($jert['battle'], '<span class=date>'.date("H:i").'</span> '.Nick::id($user['id'])->short().' вмешался в поединок!<BR>');
 	  mysql_query('UPDATE `battle` SET `teams` = \''.serialize($battle).'\', `t'.$ttt.'` = CONCAT(`t'.$ttt.'`,\';'.$user['id'].'\'), `to'.$ttt.'` = \''.time().'\', `to'.$ttt2.'` = \''.(time()-1).'\'  WHERE `id` = "'.$jert['battle'].'" LIMIT 1');
 	  mysql_query("UPDATE `users` SET `battle` = '".$jert['battle']."', `zayavka` = 0 WHERE `id` = '".$user['id']."' LIMIT 1");
-	  mysql_query('UPDATE `deztow_turnir` SET `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span>  ".nick::id($user['id'])->full(1)." вмешался в поединок против ".nick::id($jert['id'])->full(1)." <a href=\"logs.php?log={$jert['battle']}\" target=_blank>»»</a><BR>".'\') WHERE `active` = TRUE LIMIT 1');
+	  mysql_query('UPDATE `deztow_turnir` SET `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span>  ".Nick::id($user['id'])->full(1)." вмешался в поединок против ".Nick::id($jert['id'])->full(1)." <a href=\"logs.php?log={$jert['battle']}\" target=_blank>»»</a><BR>".'\') WHERE `active` = TRUE LIMIT 1');
 	  header("Location: fbattle.php");
 	} else {
 	  if($bot) {
@@ -156,11 +156,11 @@ if($_POST['attack']) {
 		mysql_query("UPDATE `users` SET `battle` = {$id} WHERE `id` = {$jert['id']} LIMIT 1");					
 	  }
 
-	  $rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($jert['id'])->full(1)."</b>";	
-	  addch("<B><b>".nick::id($user['id'])->short()."</b> , применив магию нападения, внезапно напал на <b>".nick::id($jert['id'])->short()."</b>.", $user['room']);
+	  $rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($jert['id'])->full(1)."</b>";
+	  addch("<B><b>".Nick::id($user['id'])->short()."</b> , применив магию нападения, внезапно напал на <b>".Nick::id($jert['id'])->short()."</b>.", $user['room']);
 	  addlog($id, "Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." бросили вызов друг другу. <BR>");
 	  mysql_query("UPDATE `users` SET `battle` = {$id}, `zayavka` = 0 WHERE (`id` = {$user['id']} OR `id` = {$jert['id']})");	
-	  mysql_query('UPDATE `deztow_turnir` SET `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span>  ".nick::id($user['id'])->full(1)." напал на ".nick::id($jert['id'])->full(1)." завязался <a href=\"logs.php?log={$id}\" target=_blank>бой »»</a><BR>".'\') WHERE `active` = TRUE LIMIT 1');
+	  mysql_query('UPDATE `deztow_turnir` SET `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span>  ".Nick::id($user['id'])->full(1)." напал на ".Nick::id($jert['id'])->full(1)." завязался <a href=\"logs.php?log={$id}\" target=_blank>бой »»</a><BR>".'\') WHERE `active` = TRUE LIMIT 1');
 	  header("Location: fbattle.php");
 	}			
   } else {
@@ -220,7 +220,7 @@ while($u = mysql_fetch_array($list)) {
     mysql_query("UPDATE `users` SET `in_tower` = 0, `room` = '31' WHERE `id` = '".$u['id']."'");
 	mysql_query("UPDATE `online` SET  `room` = '31' WHERE `id` = '".$u['id']."'");
 
-	mysql_query('UPDATE `deztow_turnir` SET `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span> ".nick::id($u['id'])->full(1)." повержен и выбывает из турнира<br />".'\') WHERE `active` = TRUE LIMIT 1');
+	mysql_query('UPDATE `deztow_turnir` SET `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span> ".Nick::id($u['id'])->full(1)." повержен и выбывает из турнира<br />".'\') WHERE `active` = TRUE LIMIT 1');
 	addchp('<font color=red>Внимание!</font> Вы выбыли из турнира Башни Смерти.', '{[]}'.$u['login'].'{[]}');		
 	header('Location: tower.php');
   }
@@ -246,7 +246,7 @@ if(($kol_pl+$ls) < 2 && ($tur_data['start_time']+60) <= time()) {
   mysql_query("UPDATE `users` SET `money` = (`money`+'".$tur['coin']."'), `in_tower` = 0, `room` = 31 WHERE `id` = '".$user['id']."' LIMIT 1");
   mysql_query("UPDATE `online` SET  `room` = 31 WHERE `id` = '".$user['id']."' LIMIT 1");
 
-  mysql_query('UPDATE `deztow_turnir` SET `winner` = \''.$user['id'].'\', `winnerlog` = \''.nick::id($user['id'])->full(1).'\', `endtime` = \''.time().'\', `active` = FALSE, `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span> Турнир завершен. Победитель : ".nick::id($user['id'])->full(1)." Приз : <b>".$tur['coin']."</b> кр. <br />".'\') WHERE `active` = TRUE LIMIT 1');
+  mysql_query('UPDATE `deztow_turnir` SET `winner` = \''.$user['id'].'\', `winnerlog` = \''.Nick::id($user['id'])->full(1).'\', `endtime` = \''.time().'\', `active` = FALSE, `log` = CONCAT(`log`,\''."<span class=date>".date("d.m.y H:i")."</span> Турнир завершен. Победитель : ".Nick::id($user['id'])->full(1)." Приз : <b>".$tur['coin']."</b> кр. <br />".'\') WHERE `active` = TRUE LIMIT 1');
   addchp('<font color=red>Внимание!</font> Поздравляем! Вы победитель турнира Башни смерти! Получаете <b>'.$tur['coin'].'</b> кр.', '{[]}'.$user['login'].'{[]}');
   AddChatSystem('<font color=red>Внимание!</font> Битва в Башне Смерти завершена. Победитель : <b>'.$user['login'].' ['.$user['level'].']</b>');
   if($tur['art'] == 1) { $bs_art = 0; } else { $bs_art = 0; } #1
@@ -305,7 +305,7 @@ function closehint3() {
 <div id=hint4 class=ahint></div>
 <TABLE width=100% cellspacing=0 cellpadding=0>
 
-<TR><TD><? echo nick($user); ?></TD>
+<TR><TD><?= Nick::id($user)->battle() ?></TD>
 <TD class='H3' align=right><?=$rooms[$user['room']];?>&nbsp; &nbsp;
 <IMG SRC=i/tower/attack.gif WIDTH=66 HEIGHT=24 ALT="Напасть на..." style="cursor:hand" onclick="findlogin('Напасть на','towerin.php','attack')">
 </TD>
diff --git a/ul_clans.php b/ul_clans.php
index c330b8b..c410f49 100644
--- a/ul_clans.php
+++ b/ul_clans.php
@@ -39,11 +39,11 @@ if ($_GET['id']) {
     while ($row = $query->fetch_assoc()) {
     //    $id = $row['id'];
     //    $s = $row['short'];
-    //    echo "<img src='i/klan/",$s,".gif'> $s";
+    //    echo "<img src='i/clan/",$s,".gif'> $s";
     //    echo '  <form action="ul_clans.php" method="GET">';
     //    echo "<input name='klan' type='hidden' value='$id'>";
     //    echo '<input type="submit" name="id" value=Перейти к замку1></form><hr>';
-        $frm = "<img src='i/align_%s.gif'> <img src='i/klan/%s.gif'> %s<br><form action='ul_clans.php' method='GET'></form><input name='klan' type='hidden' value='%s'><input type='submit' value='Вход'>";
+        $frm = "<img src='i/align_%s.gif'> <img src='i/clan/%s.gif'> %s<br><form action='ul_clans.php' method='GET'></form><input name='klan' type='hidden' value='%s'><input type='submit' value='Вход'>";
         echo sprintf($frm,$row['align'],$row['short'],$row['name'],$row['id']);
     }
 }
diff --git a/wall_build.php b/wall_build.php
index 04e8ea9..aeeb20f 100644
--- a/wall_build.php
+++ b/wall_build.php
@@ -269,7 +269,7 @@ if($user['intel']>=40 && $priz_magic<80)
 				'{$dress['mfkrit']}','{$dress['mfakrit']}','{$dress['mfuvorot']}','{$dress['mfauvorot']}','{$dress['bron1']}','{$dress['bron3']}','{$dress['bron2']}','{$dress['bron4']}','{$dress['maxu']}','{$dress['minu']}','{$dress['magic']}','{$dress['nlevel']}','{$dress['nalign']}','".(($dress['goden'])?($dress['goden']*24*60*60+time()):"")."','{$dress['goden']}','{$dress['razdel']}','{$dress['gmp']}','{$dress['gmeshok']}','{$dress['encicl']}','{$dress['artefact']}','{$dur}'
 				) ;");
     mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) VALUES ('','0','{$user['id']}','\"".$user['login']."\" откопал предмет: \"".$dress['name']."\" ".$dresscount."id:(".$dressid.") [0/".$dress['maxdur']."] в разломе',1,'".time()."');");
-    addchp ('Вы выкопали свиток <strong>'.$dress['name'].'</strong>. ','{[]}'.nick::id($v)->short().'{[]}');
+    addchp ('Вы выкопали свиток <strong>'.$dress['name'].'</strong>. ','{[]}'.Nick::id($v)->short().'{[]}');
 }
 //у нас нет кирки
     if($inv_all['id']==0 && $in_dig['can_get_kirka']<$tm)
@@ -438,7 +438,7 @@ mysql_query("UPDATE variables set value=value+1 where var='digger';");
 mysql_query("UPDATE users set money=money+{$priz} where id='{$user['id']}';");
 if($priz>0) 
 {
-	addchp ('Вы выкопали '.$priz.' кр. ','{[]}'.nick::id($v)->short().'{[]}');
+	addchp ('Вы выкопали '.$priz.' кр. ','{[]}'.Nick::id($v)->short().'{[]}');
 	mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
     VALUES ('','0','{$user['id']}','\"".$user['login']."\" получил на стройке ".$priz." кр. ',1,'".time()."');");
 $_POST['digger']=0;
@@ -446,7 +446,7 @@ $_POST['digger']=0;
 
 if($dress['name']!='') 
 {
-	addchp ('Вы выкопали '.$dress['name'].'!','{[]}'.nick::id($v)->short().'{[]}');
+	addchp ('Вы выкопали '.$dress['name'].'!','{[]}'.Nick::id($v)->short().'{[]}');
 	mysql_query("INSERT INTO `delo` (`id` , `author` ,`pers`, `text`, `type`, `date`) 
     VALUES ('','0','{$user['id']}','\"".$user['login']."\" получил на стройке ".$dress['name']."',1,'".time()."');");
 $_POST['digger']=0;
@@ -487,7 +487,7 @@ $_POST['digstart']=0;
     else
     //на нас напал Младшенький
     {
-   addchp ('<font color=red>Внимание!</font> На Вас напал Младший Враг из Глубин!','{[]}'.nick::id($v)->short().'{[]}'); 
+   addchp ('<font color=red>Внимание!</font> На Вас напал Младший Враг из Глубин!','{[]}'.Nick::id($v)->short().'{[]}');
     $nb = mysql_fetch_array(mysql_query("SELECT count(`id`) FROM `bots` WHERE `name` LIKE 'Младший Враг из Глубин%';"));
 	mysql_query("INSERT INTO `bots` (`name`,`prototype`,`battle`,`hp`) values ('Младший Враг из Глубин ".($nb[0]+1)."','1990','','450');");
 	$bot = mysql_insert_id();
@@ -511,7 +511,7 @@ $_POST['digstart']=0;
 	mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1;");
 
 	// создаем лог
-	$rr = "<b>".nick::id($user['id'])->full(1)."</b> и <b>".nick::id($bot)->full(1)."</b>";
+	$rr = "<b>".Nick::id($user['id'])->full(1)."</b> и <b>".Nick::id($bot)->full(1)."</b>";
 
     addlog($id,"Часы показывали <span class=date>".date("Y.m.d H.i")."</span>, когда ".$rr." сошлись в поединке. <BR>");
 
diff --git a/zayavka.php b/zayavka.php
index 476285f..f638f58 100644
--- a/zayavka.php
+++ b/zayavka.php
@@ -225,13 +225,13 @@ class zayavka
         $rr = "<input type=\"radio\" " . ((in_array($user['id'], $row['team1']) || in_array($user['id'], $row['team2']) || $row['team2']) ? "disabled " : "") . " name=\"gocombat\" value=\"{$row['id']}\" /><font class=date>{$row['podan']}</font> ";
 
         foreach ($row['team1'] as $k => $v) {
-            $rr .= nick::id($v)->full(1);
+            $rr .= Nick::id($v)->full(1);
         }
 
         if ($row['team2']) {
             $rr .= " <i>против</i> ";
             foreach ($row['team2'] as $k => $v) {
-                $rr .= nick::id($v)->full(1);
+                $rr .= Nick::id($v)->full(1);
             }
         }
 
@@ -266,7 +266,7 @@ class zayavka
             if ($k != 0) {
                 $rr .= ", ";
             }
-            $rr .= nick::id($v)->full(1);
+            $rr .= Nick::id($v)->full(1);
         }
 
         $rr .= ") <i>против</i> <b>{$row['t2c']}</b>({$range2})(";
@@ -275,7 +275,7 @@ class zayavka
             if ($k != 0) {
                 $rr .= ", ";
             }
-            $rr .= nick::id($v)->full(1);
+            $rr .= Nick::id($v)->full(1);
         }
 
         if (count($row['team2']) == 0) {
@@ -315,18 +315,18 @@ class zayavka
         $rr = "<input type=\"radio\" " . ((in_array($user['id'], $row['team1']) || in_array($user['id'], $row['team2'])) ? "disabled " : "") . " name=\"gocombat\" value=\"{$row['id']}\" /><font class=\"date\">{$row['podan']}</font> (";
 
         if ($row['bots'] == '7') {
-            $rr .= nick::id(10962)->full(1);
+            $rr .= Nick::id(10962)->full(1);
             $rr .= ", ";
-            $rr .= nick::id(10964)->full(1);
+            $rr .= Nick::id(10964)->full(1);
             $rr .= ", ";
-            $rr .= nick::id(10965)->full(1);
+            $rr .= Nick::id(10965)->full(1);
             $rr .= ", ";
         } elseif ($row['bots'] == '8' || $row['bots'] == '13') {
-            $rr .= nick::id(10124)->full(1);
+            $rr .= Nick::id(10124)->full(1);
             $rr .= ", ";
-            $rr .= nick::id(10125)->full(1);
+            $rr .= Nick::id(10125)->full(1);
             $rr .= ", ";
-            $rr .= nick::id(10126)->full(1);
+            $rr .= Nick::id(10126)->full(1);
             $rr .= ", ";
         }
 
@@ -334,7 +334,7 @@ class zayavka
             if ($k != 0) {
                 $rr .= ", ";
             }
-            $rr .= nick::id($v)->full(1);
+            $rr .= Nick::id($v)->full(1);
         }
 
         if (count($row['team1']) == 0 && $row['bots'] == 0) {
@@ -533,7 +533,7 @@ VALUES ("?s","?s",?i,?i,?i,"?s","?s",?i,?i,?i,?i)',
                 if ($k != 0) {
                     $rr .= ", ";
                 }
-                $rr .= nick::id($v)->full(1);
+                $rr .= Nick::id($v)->full(1);
                 //TODO Написать добавлялку в чат для определённого чеговека. Плясать от AddChatSystem().[3]
                 #addchp('<font color=red>Внимание!</font> Ваш бой начался!<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}' . nick::id($v)->short() . '{[]}');
             }
@@ -544,7 +544,7 @@ VALUES ("?s","?s",?i,?i,?i,"?s","?s",?i,?i,?i,?i)',
                 if ($k != 0) {
                     $rr .= ", ";
                 }
-                $rr .= nick::id($v)->full(1);
+                $rr .= Nick::id($v)->full(1);
                 //TODO Написать добавлялку в чат для определённого чеговека. Плясать от AddChatSystem().[4]
                 #addchp('<font color=red>Внимание!</font> Ваш бой начался!<br />\'; top.frames[\'main\'].location=\'fbattle.php\'; var z = \'   ', '{[]}' . nick::id($v)->short() . '{[]}');
             }
@@ -610,7 +610,7 @@ if (!empty($_POST['open'])) {
 <TABLE width=100% cellspacing=1 cellpadding=1>
     <TR>
         <TD colspan=5>
-            <?php if (!empty($level)) echo nick($user); ?>
+            <?php if (!empty($level)) {echo Nick::id($user)->battle();} ?>
         </TD>
         <TD colspan=4 align=right>
             <INPUT TYPE=button value="Вернуться" onclick="location.href='main.php?top=<?= mt_rand() ?>';">
@@ -650,19 +650,19 @@ if (!empty($_POST['open'])) {
                 }
                 if (!empty($_POST['back2'])) {
                     $z = $zay->getlist(2, null, $user['zayavka']);
-                    AddChatSystem('Внимание!' . nick::id($user['id'])->short() . ' отозвал заявку.');
+                    AddChatSystem('Внимание!' . Nick::id($user['id'])->short() . ' отозвал заявку.');
                     echo $zay->delteam($user['id'], $user['zayavka'], 2);
                 }
                 if (!empty($_POST['cansel'])) {
                     $z = $zay->getlist(2, null, $user['zayavka']);
                     echo $zay->delteam($z[$user['zayavka']]['team2'][0], $user['zayavka'], 2);
-                    AddChatSystem('Внимание!' . nick::id($user['id'])->short() . ' отказался от поединка.');
+                    AddChatSystem('Внимание!' . Nick::id($user['id'])->short() . ' отказался от поединка.');
                 }
                 if (!empty($_POST['confirm2']) AND empty($user['zayavka'])) {
                     $z = $zay->getlist(2, null, $_REQUEST['gocombat']);
                     $toper = db::c()->query('SELECT `klan` FROM `users` WHERE `id` = ?i', $z[$_REQUEST['gocombat']]['team1'][0])->fetch_assoc();
                     if ($user['klan'] != $toper['klan'] || $user['klan'] == '') {
-                        AddChatSystem('Внимание!' . nick::id($user['id'])->short() . ' принял заявку, нужно принять вызов или отказать.');
+                        AddChatSystem('Внимание!' . Nick::id($user['id'])->short() . ' принял заявку, нужно принять вызов или отказать.');
                     }
                     echo $zay->addteam(2, 2);
                     echo "</b></font><BR>Ожидаем подтверждения боя. <input type=submit name=back2 value='Отозвать заявку'>";
@@ -694,7 +694,7 @@ if (!empty($_POST['open'])) {
                 $z = $zay->getlist(2, null, $user['zayavka']);
                 if ($zay->user_status($user['id']) == 1) {
                     if (count($z[$user['zayavka']]['team2']) > 0) {
-                        echo "<B><font color=red>Внимание! " . nick::id($z[$user['zayavka']]['team2'][0])->full(1) . " принял заявку на бой, нужно отказать или принять вызов.</font></b> <input type=submit value='Битва!' name=gofi> <input type=submit value='Отказать' name=cansel>";
+                        echo "<B><font color=red>Внимание! " . Nick::id($z[$user['zayavka']]['team2'][0])->full(1) . " принял заявку на бой, нужно отказать или принять вызов.</font></b> <input type=submit value='Битва!' name=gofi> <input type=submit value='Отказать' name=cansel>";
                     } else {
                         if ($z[$user['zayavka']]['level'] == 2) {
                             echo "Заявка на бой подана, ожидаем противника. <input type=submit name=back value='Отозвать заявку'>";
@@ -723,7 +723,7 @@ if (!empty($_POST['open'])) {
 
                                     $id = mysql_insert_id();
                                     mysql_query("UPDATE `bots` SET `battle` = {$id} WHERE `id` = {$bot} LIMIT 1");
-                                    $rr = "<b>" . nick::id($user['id'])->full(1) . "</b> и <b>" . nick::id($bot)->full(1) . "</b>";
+                                    $rr = "<b>" . Nick::id($user['id'])->full(1) . "</b> и <b>" . Nick::id($bot)->full(1) . "</b>";
                                     addlog($id, "Часы показывали <span class=date>" . date("Y.m.d H.i") . "</span>, когда " . $rr . " бросили вызов друг другу. <BR>");
                                     mysql_query("UPDATE users SET `battle` ={$id},`zayavka`=0 WHERE `id`= {$user['id']};");
                                     die("<script>location.href='fbattle.php';</script>");
@@ -845,12 +845,12 @@ if (!empty($_POST['goconfirm']) AND empty($user['zayavka'])) {
 				<TD align=center>';
     foreach ($z[$_POST['gocombat']]['team1'] as $k => $v) {
         if ($k != 0) $rr .= "<BR>";
-        echo nick::id($v)->full(1);
+        echo Nick::id($v)->full(1);
     }
     echo '</TD><TD align=center>';
     foreach ($z[$_POST['gocombat']]['team2'] as $k => $v) {
         if ($k != 0) $rr .= "<BR>";
-        echo nick::id($v)->full(1);
+        echo Nick::id($v)->full(1);
     }
     echo '</TD></TR><TR>';
 
@@ -1042,7 +1042,7 @@ if ($get == 'current') {
             if ($k > 0) {
                 echo ",";
             }
-            nick::id($v)->full();
+            Nick::id($v)->full();
         }
         echo " против ";
         $z = explode(";", $row['t2']);
@@ -1050,7 +1050,7 @@ if ($get == 'current') {
             if ($k > 0) {
                 echo ",";
             }
-            nick::id($v)->full();
+            Nick::id($v)->full();
         }
         echo "<img src='i/fighttype{$row['type']}.gif'> <a href='logs.php?log={$row['id']}' target=_blank>»»</a><br />";
     }