Function nick5() merged with nick class.

This commit is contained in:
lopar
2018-11-05 22:15:13 +02:00
parent 7514cd121a
commit 073d56fc6b
124 changed files with 232 additions and 245 deletions
+3 -3
View File
@@ -88,7 +88,7 @@ if ($user['battle'] == 0) {
$tar_team = "B1";
}
$targeted=' на '.nick5($target,$tar_team);
$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> '.nick5($user['id'],$us_team).' '.$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("/Х/",nick5($target,$tar_team),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)