Update nicks

fix:{revattr.func.php}

新增：
在加入游戏时新增头衔选择框；
在账户界面、历史优胜与玩家排行界面增加头衔显示；
在winner表中加入nick,ss,mss字段；
为头衔增加样式显示，具体在resource中的$title_desc添加&修改；

修复：
不能用枪托打人的问题；
小头像显示异常的问题；

game.php

@@ -3,6 +3,7 @@
 define('CURSCRIPT', 'game');
 require './include/common.inc.php';
 require GAME_ROOT.'./include/game.func.php';
+require GAME_ROOT.'./include/game/titles.func.php';
 
 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); } 
 if($mode == 'quit') {

gamedata/cache/resources_1.php

@@ -89,7 +89,7 @@ $typeinfo = Array(
 	90=>'各路党派',
 	91=>'各路党派',
 	92=>'种火',
-	);
+);
 $killmsginfo = Array(
 	0=>'',
 	1=>'任务完结。',
@@ -111,47 +111,47 @@ $killmsginfo = Array(
 	90=>'你弱爆了！',
 	91=>'你弱爆了！',
 	92=>'怜悯覆唱……让希望的执念……成为焰火……'
-	);
+);
 $stateinfo = Array
-	(
-		0=>'正常存活',
-		1=>'睡眠状态',
-		2=>'治疗状态',
-		3=>'静养状态',
-		5=>'最后幸存',
-		6=>'解除禁区',
-		10 => '莫名身亡',
-		11 => '禁区停留',
-		12 => '毒发身亡',
-		13 => '意外死亡',
-		14 => '入侵失败',
-		15 => '黑幕抹杀',
-		16 => '黑幕抹杀',
-		17 => '遭遇天灾',
-		18 => '烧伤不治',
-		20 => '玩家杀害',
-		21 => '玩家杀害',
-		22 => '玩家杀害',
-		23 => '玩家杀害',
-		24 => '玩家杀害',
-		25 => '玩家杀害',
-		26 => '误食毒物',
-		27 => '误触陷阱',
-		28 => '死亡笔记',
-		29 => '玩家杀害',
-		30 => '误触机关',
-		31 => 'L5病发',
-		32 => '挂机受罚',
-		33 => '天降软妹，无福消受',
-		34 => '溶剂作用',
-		35 => '救济',
-		36 => '惨遭腰斩',
-		37 => '身首异处',
-		38 => '业火灼烧',
-		39 => '武器反噬',
-		40 => '以身试法',
-		42 => '独自脱离'
-	);
+(
+	0=>'正常存活',
+	1=>'睡眠状态',
+	2=>'治疗状态',
+	3=>'静养状态',
+	5=>'最后幸存',
+	6=>'解除禁区',
+	10 => '莫名身亡',
+	11 => '禁区停留',
+	12 => '毒发身亡',
+	13 => '意外死亡',
+	14 => '入侵失败',
+	15 => '黑幕抹杀',
+	16 => '黑幕抹杀',
+	17 => '遭遇天灾',
+	18 => '烧伤不治',
+	20 => '玩家杀害',
+	21 => '玩家杀害',
+	22 => '玩家杀害',
+	23 => '玩家杀害',
+	24 => '玩家杀害',
+	25 => '玩家杀害',
+	26 => '误食毒物',
+	27 => '误触陷阱',
+	28 => '死亡笔记',
+	29 => '玩家杀害',
+	30 => '误触机关',
+	31 => 'L5病发',
+	32 => '挂机受罚',
+	33 => '天降软妹，无福消受',
+	34 => '溶剂作用',
+	35 => '救济',
+	36 => '惨遭腰斩',
+	37 => '身首异处',
+	38 => '业火灼烧',
+	39 => '武器反噬',
+	40 => '以身试法',
+	42 => '独自脱离'
+);
 $lwinfo = Array(
 	0 => '',
 	1 => '任务执行成功率下降，重新计算成功率。',
@@ -977,9 +977,9 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'ZA' => '代码漏洞',
 	'ZB'=> '称号卡',
 	'Z' => '特殊',#不可合并
-	);
+);
 
-/*$itemspkinfo2 = Array(
+$itemspkinfo = Array(
 	'A' => '全系防御',
 	'a' => '属性防御',
 	'B' => '伤害抹消',
@@ -995,10 +995,10 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'G' => '防弹',
 	'g' => '同志',
 	'H' => 'HP制御',
-	'h' => '伤害制御',//废弃
+	'h' => '伤害制御',
 	'I' => '防冻',
 	'i' => '冻气',
-	'J' => '超量素材', //中国玩家没素质
+	'J' => '超量素材', 
 	'j' => '多重',
 	'K' => '防斩',
 	'k' => '冰华',
@@ -1023,13 +1023,14 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'w' => '音波',
 	'X' => '直死', //NPC专用
 	'x' => '奇迹',
+	'y' => '破格', //属穿
 	'Z' => '菁英',
 	'z' => '天然',
 	'-' => '精神抽取',
 	'*' => '灵魂抽取',
 	'+' => '技能抽取',
 	'^' => '背包',
-	); */
+);
 
 $iteminfo_tooltip_desc = Array
 (
@@ -1195,58 +1196,16 @@ $itemspkinfo_tooltip = Array
 	'^' => Array('title' => "装备后，可使用「背包」相关指令存储物品。",),
 );
 
-$itemspkinfo = Array(
-	'A' => '全系防御',
-	'a' => '属性防御',
-	'B' => '伤害抹消',
-	'b' => '属性抹消',
-	'C' => '防投',
-	'c' => '重击辅助',
-	'D' => '防爆',
-	'd' => '爆炸',
-	'E' => '绝缘',
-	'e' => '电击',	
-	'F' => '防符',
-	'f' => '灼焰',
-	'G' => '防弹',
-	'g' => '同志',
-	'H' => 'HP制御',
-	'h' => '伤害制御',
-	'I' => '防冻',
-	'i' => '冻气',
-	'J' => '超量素材', 
-	'j' => '多重',
-	'K' => '防斩',
-	'k' => '冰华',
-	'L' => '致残',
-	'l' => '热恋',
-	'M' => '陷阱探测',
-	'm' => '陷阱迎击',
-	'N' => '冲击',
-	'n' => '贯穿',
-	'o' => '一发',
-	'P' => '防殴',
-	'p' => '带毒',
-	'q' => '防毒',
-	'R' => '混沌伤害',
-	'r' => '连击',
-	'S' => '消音',
-	's' => '调整',
-	'U' => '防火',
-	'u' => '火焰',
-	'v' => '灵魂绑定',
-	'W' => '隔音',
-	'w' => '音波',
-	'X' => '直死', //NPC专用
-	'x' => '奇迹',
-	'y' => '破格', //属穿
-	'Z' => '菁英',
-	'z' => '天然',
-	'-' => '精神抽取',
-	'*' => '灵魂抽取',
-	'+' => '技能抽取',
-	'^' => '背包',
-	);
+//头衔文字效果：
+//因为一些历史遗留问题，这部分样式文本会直接存进数据库的news表里，所以……不要超过200个字……
+//什么历史遗留问题？……就是现在所有$nick都是 $nick.' '.$name 这样存进同一个字段里的……这没法拆啊！
+$title_desc = Array
+(
+	# class-样式 title-提示悬浮框 img-图片url，会覆盖样式与悬浮框 
+	'参展者' => Array('title'=>"参展者就是参加会展的人……你还记得自己是来参加动漫展的吧？"),
+	'补给掠夺者' => Array('class'=>'yellow', 'title'=>"你是真能吃啊！"),
+	'弱子' => Array('img'=>"img/nicktest.png",)
+);
 
 //club20 元素大师：
 //元素列表 可能需要一些布灵布灵的特效

gamedata/sql/all.sql

@@ -384,6 +384,7 @@ DROP TABLE IF EXISTS `acbra2_winners`;
 CREATE TABLE `acbra2_winners` (
   `gid` smallint(5) unsigned NOT NULL DEFAULT '0',
   `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `nick` text NOT NULL,
   `name` char(15) NOT NULL DEFAULT '',
   `pass` char(32) NOT NULL DEFAULT '',
   `gd` char(1) NOT NULL DEFAULT 'm',
@@ -395,6 +396,8 @@ CREATE TABLE `acbra2_winners` (
   `mhp` smallint(5) unsigned NOT NULL DEFAULT '0',
   `sp` smallint(5) unsigned NOT NULL DEFAULT '0',
   `msp` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ss` smallint unsigned NOT NULL default '0',
+  `mss` smallint unsigned NOT NULL default '0',
   `att` smallint(5) unsigned NOT NULL DEFAULT '0',
   `def` smallint(5) unsigned NOT NULL DEFAULT '0',
   `pls` tinyint(3) unsigned NOT NULL DEFAULT '0',

include/admin/gamecheck.php

@@ -41,6 +41,11 @@ if($gamestate >= 20){
 //$db->query("ALTER TABLE {$tablepre}users ADD validgames smallint unsigned NOT NULL default '0' AFTER credits");
 //$db->query("ALTER TABLE {$tablepre}users ADD wingames smallint unsigned NOT NULL default '0' AFTER validgames");
 
+//哇 还是老祖宗留下的方法好啊
+$db->query("ALTER TABLE {$tablepre}winners ADD nick text not null AFTER type");
+$db->query("ALTER TABLE {$tablepre}winners ADD ss smallint unsigned NOT NULL default '0' AFTER msp");
+$db->query("ALTER TABLE {$tablepre}winners ADD mss smallint unsigned NOT NULL default '0' AFTER ss");
+
 include template('admin_menu');
 
 ?>
\ No newline at end of file

include/game.func.php

@@ -10,7 +10,7 @@ function init_playerdata(){
 	$upexp = round(($lvl*$baseexp)+(($lvl+1)*$baseexp));
 	$lvlupexp = $upexp - $exp;
 	$iconImg = $gd.'_'.$icon.'.gif'; 
-	$iconImgB = $gd.'_'.$icon.'a.gif'; 
+	if(file_exists('img/'.$gd.'_'.$icon.'a.gif')) $iconImgB = $gd.'_'.$icon.'a.gif'; 
 	$ardef = $arbe + $arhe + $arae + $arfe;
 	if(($weather == 8)||($weather == 9)||($weather == 12)) {
 		$fog = true;

include/game/battle.func.php

@@ -239,7 +239,8 @@ function senditem(){
 				$log .= "你将<span class=\"yellow\">${'w_itm'.$i}</span>送给了<span class=\"yellow\">$w_name</span>。<br>";
 				$w_log = "<span class=\"yellow\">$name</span>将<span class=\"yellow\">${'w_itm'.$i}</span>送给了你。";
 				if(!$w_type){logsave($w_pid,$now,$w_log,'t');}
-				addnews($now,'senditem',$nick.' '.$name,$w_name,$itm);
+				include_once GAME_ROOT.'./include/game/titles.func.php';
+				addnews($now,'senditem',get_title_desc($nick).' '.$name,$w_name,$itm);
 				w_save($w_pid);
 				$itm = $itmk = $itmsk = '';
 				$itme = $itms = 0;

include/game/item.func.php

@@ -4,8 +4,13 @@ if (! defined ( 'IN_GAME' )) {
 	exit ( 'Access Denied' );
 }
 
+include_once GAME_ROOT.'./include/game/titles.func.php';
+
 function itemuse($itmn) {
 	global $mode, $log, $nosta, $pid, $name, $state, $now,$nick,$achievement,$club;
+
+	$nickinfo = get_title_desc($nick);
+
 	if ($itmn < 1 || $itmn > 6) {
 		$log .= '此道具不存在，请重新选择。';
 		$mode = 'command';
@@ -223,7 +228,7 @@ function itemuse($itmn) {
 			$result = $db->query ( "SELECT * FROM {$tablepre}players WHERE pid='$itmsk'" );
 			$wdata = $db->fetch_array ( $result );
 			$log .= "糟糕，<span class=\"yellow\">$itm</span>中被<span class=\"yellow\">{$wdata['name']}</span>掺入了毒药！你受到了<span class=\"dmg\">$damage</span>点伤害！<br>";
-			addnews ( $now, 'poison', $nick.' '.$name, $wdata ['name'], $itm );
+			addnews ( $now, 'poison', $nickinfo.' '.$name, $wdata ['name'], $itm );
 		} else {
 			$log .= "糟糕，<span class=\"yellow\">$itm</span>有毒！你受到了<span class=\"dmg\">$damage</span>点伤害！<br>";
 		}
@@ -888,7 +893,7 @@ function itemuse($itmn) {
 		list($in,$ik,$ie,$is,$isk) = explode(',',$plist1[$rand1]);
 		global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$mode;
 		$itm0 = $in;$itmk0=$ik;$itme0=$ie;$itms0=$is;$itmsk0=$isk;
-		addnews($now,'present',$nick.' '.$name,$itm,$in);
+		addnews($now,'present',$nickinfo.' '.$name,$itm,$in);
 		$itms1--;
 		if ($itms1 <= 0) {
 			$log .= "<span class=\"red\">$itm</span>用光了。<br>";
@@ -905,7 +910,7 @@ function itemuse($itmn) {
 		list($in,$ik,$ie,$is,$isk) = explode(',',$plist1[$rand1]);
 		global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$mode;
 		$itm0 = $in;$itmk0=$ik;$itme0=$ie;$itms0=$is;$itmsk0=$isk;
-		addnews($now,'present',$nick.' '.$name,$itm,$in);
+		addnews($now,'present',$nickinfo.' '.$name,$itm,$in);
 		$itms1--;
 		if ($itms1 <= 0) {
 			$log .= "<span class=\"red\">$itm</span>用光了。<br>";
@@ -1122,7 +1127,7 @@ function itemuse($itmn) {
 			$tm = $now - $corpseprotect;//尸体保护
 			$db->query ( "UPDATE {$tablepre}players SET weps='0',arbs='0',arhs='0',aras='0',arfs='0',arts='0',itms0='0',itms1='0',itms2='0',itms3='0',itms4='0',itms5='0',itms6='0',money='0' WHERE hp <= 0 AND endtime <= $tm" );
 			$cnum = $db->affected_rows ();
-			addnews ( $now, 'corpseclear', $nick.' '.$name, $cnum );
+			addnews ( $now, 'corpseclear', $nickinfo.' '.$name, $cnum );
 			$log .= "使用了<span class=\"yellow\">$itm</span>。<br>突然刮起了一阵怪风，吹走了地上的{$cnum}具尸体！<br>";
 			$itms --;
 			
@@ -1210,7 +1215,7 @@ function itemuse($itmn) {
 				$kind = "提高了{$wep}的<span class=\"yellow\">攻击力</span>！";
 			}
 			$log .= "你使用了<span class=\"yellow\">$itm</span>，{$kind}";
-			addnews ( $now, 'newwep', $nick.' '.$name, $itm, $wep );
+			addnews ( $now, 'newwep', $nickinfo.' '.$name, $itm, $wep );
 			if (strpos ( $wep, '-改' ) === false) {
 				$wep = $wep . '-改';
 			}
@@ -1332,7 +1337,7 @@ function itemuse($itmn) {
 				$wp = $wk = $wg = $wc = $wd = $wf = 8010;
 				$att = $def = 13337;
 				$club = 15;
-				addnews ( $now, 'suisidefail',$nick.' '.$name );
+				addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
 				$itm = $itmk = $itmsk = '';
 				$itme = $itms = 0;
 			} else {
@@ -1418,7 +1423,7 @@ function itemuse($itmn) {
 				death ( 'SCP', '', 0, $itm );
 			} else {
 				$club = 17;
-				addnews ( $now, 'notworthit', $nick.' '.$name );
+				addnews ( $now, 'notworthit', $nickinfo.' '.$name );
 			}
 			$itms --;
 			if($itms <= 0){
@@ -1432,7 +1437,7 @@ function itemuse($itmn) {
 			addnpc ( 7, 0,1);
 			addnpc ( 7, 1,1);
 			addnpc ( 7, 2,1);
-			addnews ($now , 'secphase',$nick.' '.$name);
+			addnews ($now , 'secphase',$nickinfo.' '.$name);
 			$itm = $itmk = $itmsk = '';
 			$itme = $itms = 0;
 		} elseif ($itm == '破灭之诗') {
@@ -1444,19 +1449,19 @@ function itemuse($itmn) {
 			include_once GAME_ROOT . './include/game/item2.func.php';
 			$log .= '世界响应着这旋律，产生了异变……<br>';
 			wthchange( $itm,$itmsk);
-			addnews ($now , 'thiphase',$nick.' '.$name);
+			addnews ($now , 'thiphase',$nickinfo.' '.$name);
 			$hack = 1;
 			$log .= '因为破灭之歌的作用，全部锁定被打破了！<br>';
 			//include_once GAME_ROOT.'./include/system.func.php';
 			movehtm();
-			addnews($now,'hack2',$nick.' '.$name);
+			addnews($now,'hack2',$nickinfo.' '.$name);
 			save_gameinfo();
 			$itm = $itmk = $itmsk = '';
 			$itme = $itms = 0;
 		} elseif ($itm == '黑色碎片') {
 			include_once GAME_ROOT . './include/system.func.php';
 			$log .= '你已经呼唤了一个未知的存在，现在寻找并击败她，<br>并且搜寻她的游戏解除钥匙吧！<br>';
-			addnews ($now , 'dfphase', $nick.' '.$name);
+			addnews ($now , 'dfphase', $nickinfo.' '.$name);
 			addnpc ( 12, 0,1);
 			
 			$itm = $itmk = $itmsk = '';
@@ -1796,7 +1801,7 @@ function itemuse($itmn) {
 				$wp = $wk = $wg = $wc = $wd = $wf = 8010;
 				$att = $def = 13337;
 				$club = 15;
-				addnews ( $now, 'suisidefail',$nick.' '.$name );
+				addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
 			}
 			elseif ($itme == 17 || $itme > 22){ //状态机社团以及不存在的社团
 				$log .="但是什么都没有发生！";
@@ -1857,7 +1862,7 @@ function itemuse($itmn) {
 			$wp = $wk = $wg = $wc = $wd = $wf = 8010;
 			$att = $def = 13337;
 			//$club = 15; 因为是神力嘛！↓但是下面这个还是要适用的。
-			addnews ( $now, 'suisidefail',$nick.' '.$name );
+			addnews ( $now, 'suisidefail',$nickinfo.' '.$name );
 			//销毁物品
 			$itm = $itmk = $itmsk = '';
 			$itme = $itms = 0;

include/game/item2.func.php

@@ -3,6 +3,8 @@ if(!defined('IN_GAME')) {
 	exit('Access Denied');
 }
 
+include_once GAME_ROOT.'./include/game/titles.func.php';
+
 function use_func_item($usemode,$item)
 {
 	if ($usemode=="poison"){poison($item);}
@@ -62,7 +64,7 @@ function wthchange($itm,$itmsk){
 	global $now,$log,$weather, $wthinfo, $name,$nick;
 	$weathertd = $weather;
 	if($weather >= 14 && $weather <= 17){
-		addnews ( $now, 'wthfail', $nick.' '.$name, $weather, $itm );
+		addnews ( $now, 'wthfail', get_title_desc($nick).' '.$name, $weather, $itm );
 		$log .= "你使用了{$itm}。<br /><span class=\"red\">但是恶劣的天气并未发生任何变化！</span><br />";
 	}else{
 		if($itmsk==99){$weather = rand ( 0, 13 );}//随机全天气
@@ -100,7 +102,7 @@ function wthchange($itm,$itmsk){
 		} else {
 			include_once GAME_ROOT . './include/system.func.php';
 			save_gameinfo ();
-			addnews ( $now, 'wthchange', $nick.' '.$name, $weather, $itm );
+			addnews ( $now, 'wthchange', get_title_desc($nick).' '.$name, $weather, $itm );
 			$log .= "你使用了<span class=\"yellow\">{$itm}</span>。<br />天气突然转变成了<span class=\"red\">$wthinfo[$weather]</span>！<br />";
 		}
 	}
@@ -135,7 +137,7 @@ function hack($itmn = 0) {
 		$log .= '入侵禁区控制系统成功了！全部禁区都被解除了！<br>';
 		include_once GAME_ROOT.'./include/system.func.php';
 		movehtm();
-		addnews($now,'hack',$nick.' '.$name);
+		addnews($now,'hack',get_title_desc($nick).' '.$name);
 		storyputchat($now,'hack');
 		save_gameinfo();
 	} else {
@@ -507,7 +509,7 @@ function qianghua($itmn = 0) {
 			}else{$flag = false;}
 	  }	
   }	
-  addnews ( $now, 'newwep2',$nick.' '.$name, $baoshi, $o_itm );
+  addnews ( $now, 'newwep2',get_title_desc($nick).' '.$name, $baoshi, $o_itm );
 	if ($flag){
 
 	 $log .= "<span class=\"yellow\">『一道神圣的闪光照耀在你的眼睛上，当你恢复视力时，发现你的装备闪耀着彩虹般的光芒』</span><br>";

include/game/itemmain.func.php

@@ -12,6 +12,8 @@ if(!defined('IN_GAME')) {
 	exit('Access Denied');
 }
 
+include_once GAME_ROOT.'./include/game/titles.func.php';
+
 function trap(){
 	global $log,$cmd,$mode,$iteminfo,$itm0,$itmk0,$itme0,$itms0,$itmsk0,$nick;
 	global $name,$now,$hp,$db,$tablepre,$bid,$lvl,$pid,$type,$tactic,$club,$skills,$rp;
@@ -83,7 +85,7 @@ function trap(){
 			$hp -= $damage; $tmp_club=$club;
 		 
 			if($playerflag){
-				addnews($now,'trap',$nick.' '.$name,$trname,$itm0);
+				addnews($now,'trap',get_title_desc($nick).' '.$name,$trname,$itm0);
 			}
 			$log .= "糟糕，你触发了{$trperfix}陷阱<span class=\"yellow\">$itm0</span>！受到<span class=\"dmg\">$damage</span>点伤害！<br>";
 			$rp = $rp / 2; //尝试修复RP踩雷可能不削半问题
@@ -126,7 +128,7 @@ function trap(){
 			}
 		}else{
 			if($playerflag){
-				addnews($now,'trapdef',$nick.' '.$name,$trname,$itm0);
+				addnews($now,'trapdef',get_title_desc($nick).' '.$name,$trname,$itm0);
 				if(!$selflag){
 					$w_log = "<span class=\"yellow\">{$name}触发了你设置的陷阱{$itm0}，但是没有受到任何伤害！</span><br>";
 					logsave ( $itmsk0, $now, $w_log ,'b');
@@ -146,7 +148,7 @@ function trap(){
 		include_once GAME_ROOT.'./include/game/achievement.func.php';
 		//check_trap_miss_achievement($achievement,$selflag,$itm0,$itme0);
 		if($playerflag && !$selflag){
-			addnews($now,'trapmiss',$nick.' '.$name,$trname,$itm0);
+			addnews($now,'trapmiss',get_title_desc($nick).' '.$name,$trname,$itm0);
 			$w_log = "<span class=\"yellow\">{$name}回避了你设置的陷阱{$itm0}！</span><br>";
 			logsave ( $itmsk0, $now, $w_log ,'b');
 		}
@@ -571,7 +573,7 @@ function itemmix($mlist, $itemselect=-1) {
 			$isntove=true;
 			if ($isoverlay==true){
 				$log.="<span class=\"red\">超量失败！所有素材消失！说明写这段代码的人还是一个有良知，明是非的中国人！</span><br>";
-				addnews($now,'mixfail',$nick.' '.$name,$itm0);
+				addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 				foreach($mlist as $val){
 					${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 					${'itme'.$val} = ${'itms'.$val} = 0;
@@ -586,7 +588,7 @@ function itemmix($mlist, $itemselect=-1) {
 		if ($isoverlay==true){
 			if ((strlen(${'itmk'.$val})<4)||((substr(${'itmk'.$val},2,2)!=$ostar)&&($ostar!=0))){
 				$log.="<span class=\"red\">超量失败！所有素材消失！说明写这段代码的人还是一个有良知，明是非的中国人！</span><br>";
-				addnews($now,'mixfail',$nick.' '.$name,$itm0);
+				addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 				foreach($mlist as $val){
 					${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 					${'itme'.$val} = ${'itms'.$val} = 0;
@@ -599,7 +601,7 @@ function itemmix($mlist, $itemselect=-1) {
 			if ((strlen(${'itmk'.$val})>=4)&&(strpos(${'itmsk'.$val},'J')!==false)){
 				if (substr(${'itmk'.$val},2,2)!=$ostar){
 					$log.="<span class=\"red\">超量失败！所有素材消失！说明写这段代码的人还是一个有良知，明是非的中国人！</span><br>";
-					addnews($now,'mixfail',$nick.' '.$name,$itm0);
+					addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 					foreach($mlist as $val){
 						${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 						${'itme'.$val} = ${'itms'.$val} = 0;
@@ -613,7 +615,7 @@ function itemmix($mlist, $itemselect=-1) {
 		if ($issyncro==true){
 			if ((strlen(${'itmk'.$val})<4)&&($isntsyn==false)){
 				$log.="<span class=\"red\">同调失败！所有素材消失！真是大快人心啊！</span><br>";
-				addnews($now,'mixfail',$nick.' '.$name,$itm0);
+				addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 				foreach($mlist as $val){
 					${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 					${'itme'.$val} = ${'itms'.$val} = 0;
@@ -622,7 +624,7 @@ function itemmix($mlist, $itemselect=-1) {
 			}
 			if (strpos(${'itmsk'.$val},'s')!==false){
 				$log.="<span class=\"red\">同调失败！所有素材消失！真是大快人心啊！</span><br>";
-				addnews($now,'mixfail',$nick.' '.$name,$itm0);
+				addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 				foreach($mlist as $val){
 					${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 					${'itme'.$val} = ${'itms'.$val} = 0;
@@ -640,7 +642,7 @@ function itemmix($mlist, $itemselect=-1) {
 					continue;
 				}else{
 					$log.="<span class=\"red\">同调失败！所有素材消失！真是大快人心啊！</span><br>";
-					addnews($now,'mixfail',$nick.' '.$name,$itm0);
+					addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 					foreach($mlist as $val){
 						${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 						${'itme'.$val} = ${'itms'.$val} = 0;
@@ -680,7 +682,7 @@ function itemmix($mlist, $itemselect=-1) {
 				${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 				${'itme'.$val} = ${'itms'.$val} = 0;
 			}
-			addnews($now,'mixfail',$nick.' '.$name,$itm0);
+			addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 			return;
 		}
 		if ($itemselect==-1)
@@ -748,7 +750,7 @@ function itemmix($mlist, $itemselect=-1) {
 				${'itm'.$val} = ${'itmk'.$val} = ${'itmsk'.$val} = '';
 				${'itme'.$val} = ${'itms'.$val} = 0;
 			}
-			addnews($now,'mixfail',$nick.' '.$name,$itm0);
+			addnews($now,'mixfail',get_title_desc($nick).' '.$name,$itm0);
 			return;
 		}
 		if ($itemselect==-1)
@@ -818,7 +820,7 @@ function itemmix($mlist, $itemselect=-1) {
 		list($itm0,$itmk0,$itme0,$itms0,$itmsk0) = $minfo['result'];
 		$log .= "<span class=\"yellow\">$itmstr</span>合成了<span class=\"yellow\">{$minfo['result'][0]}</span><br>";
 		//var_dump($minfo['result'][0]);
-		addnews($now,'itemmix',$nick.' '.$name,$itm0);
+		addnews($now,'itemmix',get_title_desc($nick).' '.$name,$itm0);
 		//if($club == 5) { $wd += 2; }
 		//else { $wd+=1; }
 		$wd+=1;

include/game/revattr.func.php

@@ -24,16 +24,22 @@
 		{
 			$w1 = substr ($pa['wepk'], 1, 1 );
 			$w2 = substr ($pa['wepk'], 2, 1 );
-			if ((($w1 == 'G')||($w1=='J')) && ($pa['weps'] == $nosta)) 
+			# 这里是判断双系武器没有弹药的情况下 能否使用第二系武器
+			if((($w1 == 'G')||($w1=='J')) && ($pa['weps'] == $nosta)) 
 			{
-				$pa['wep_kind']= $w2 ? $w2 : 'P';
-				if($pa['wep_kind'] == 'P') $pa['is_wpg'] = true;
+				$pa['wep_kind']= $w2 ? $w2 : $w1;
 			}
 			else 
 			{
 				$pa['wep_kind'] = $w1;
 			}
 		}
+		# 这里是最终判断是否为枪托打人的环节
+		if(($pa['wep_kind'] == 'G' || $pa['wep_kind'] == 'J') && ($pa['weps'] == $nosta))
+		{
+			$pa['wep_kind'] = 'P';
+			$pa['is_wpg'] = 1;
+		}
 		return;
 	}
 

include/game/revcombat.func.php

@@ -7,6 +7,7 @@
 	include_once GAME_ROOT.'./include/game/attr.func.php';
 	include_once GAME_ROOT.'./include/game/revattr.func.php';
 	include_once GAME_ROOT.'./include/game/combat.func.php';
+	include_once GAME_ROOT.'./include/game/titles.func.php';
 
 	# 战斗准备流程：
 	# pa、pd分别代表先制发现者与被先制发现者；
@@ -666,8 +667,9 @@
 		$db->query ( "INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('3','$now','$lwname','$dpls','$lastword')" );
 
 		//发送news
-		$kname = $pa['type'] ? $pa['name'] : $pa['nick'].' '.$pa['name'];
-		addnews ($now,'death'.$pd['state'],$pd['name'],$pd['type'],$pa['name'],$pa['wep_name'],$lastword );
+		$kname = $pa['type'] ? $pa['name'] : get_title_desc($pa['nick']).' '.$pa['name'];
+		$dname = $pd['type'] ? $pd['name'] : get_title_desc($pd['nick']).' '.$pd['name'];
+		addnews ($now,'death'.$pd['state'],$pd['name'],$dname,$kname,$pa['wep_name'],$lastword );
 
 		return $lastword;
 	}
@@ -680,6 +682,8 @@
 
 		$revival_flag = 0;
 
+		$dname = $pd['type'] ? $pd['name'] : get_title_desc($pd['nick']).' '.$pd['name'];
+
 		#极光天气下，玩家有10%概率、NPC有1%概率无条件复活
 		if (!$revival_flag && $weather == 17)
 		{
@@ -689,7 +693,7 @@
 			{
 				#奥罗拉复活效果
 				$revival_flag = 17; //保存复活标记为通过奥罗拉复活
-				addnews($now,'aurora_revival',$pd['name']);
+				addnews($now,'aurora_revival',$dname);
 				$pd['hp'] += min($pd['mhp'],max($aurora_dice,1)); 
 				$pd['sp'] += min($pd['msp'],max($aurora_dice,1));
 				$pd['state'] = 0;
@@ -703,7 +707,7 @@
 		{
 			#决死结界复活效果：
 			$revival_flag = 99; //保存复活标记为通过奥罗拉复活
-			addnews($now,'revival',$pd['name']);	//玩家春哥附体称号的处理
+			addnews($now,'revival',$dname);	//玩家春哥附体称号的处理
 			$pd['hp'] = $pd['mhp']; $pd['sp'] = $pd['msp'];
 			$pd['state'] = 0; $pd['club'] = 17;
 			$log .= '<span class="yellow">但是，由于及时按下BOMB键，'.$pd['nm'].'原地满血复活了！</span><br>';

include/game/song.inc.php

  <?php
  //require_once './include/common.inc.php';
+
+ include_once GAME_ROOT.'./include/game/titles.func.php';
+ 
  function sing($sn){
 	global $log,$msg,$now,$pls,$name,$nick,$plsinfo,$hplsinfo,$ss,$mss,$noiseinfo,$arte;
 	global $db,$tablepre;
@@ -34,7 +37,7 @@
 		$db->query ( "UPDATE {$tablepre}players SET def=def+30 WHERE `pls` ={$pls} AND hp>0 AND type=0 ");
 		$def+=30;
 		addnoise($sn,'__',$now,$pls,0,0,$sn);
-		addnews($now,'song',$nick.' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
+		addnews($now,'song',get_title_desc($nick).' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
 		return;
 		
 	}elseif ($sn=="Crow Song"){
@@ -50,7 +53,7 @@
 		$db->query ("UPDATE {$tablepre}players SET att=att+30 WHERE `pls`={$pls} AND hp>0 AND type=0");
 		$att+=30;
 		addnoise($sn,'__',$now,$pls,0,0,$sn);
-		addnews($now,'song',$nick.' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
+		addnews($now,'song',get_title_desc($nick).' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
 		return;
 	
 	
@@ -68,7 +71,7 @@
 		$mss=$ss;
 		$rp-=50;
 		addnoise($sn,'__',$now,$pls,0,0,$sn);
-		addnews($now,'song',$nick.' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
+		addnews($now,'song',get_title_desc($nick).' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
 		return;
 	
 	
@@ -87,7 +90,7 @@
 		$db->query ( "UPDATE {$tablepre}players SET weps=wepes=55 WHERE `pls` ={$pls} AND hp>0 AND type=0 ");
 		$db->query ( "UPDATE {$tablepre}players SET wepsk='z' WHERE `pls` ={$pls} AND hp>0 AND type=0 ");
 		addnoise($sn,'__',$now,$pls,0,0,$sn);
-		addnews($now,'song',$nick.' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
+		addnews($now,'song',get_title_desc($nick).' '.$name,$plsinfo[$pls],$noiseinfo[$sn]);
 		return;
 	}
 	

include/game/special.func.php

@@ -5,6 +5,8 @@ if(!defined('IN_GAME')) {
 	exit('Access Denied');
 }
 
+include_once GAME_ROOT.'./include/game/titles.func.php';
+
 function getword(){
 	global $db,$tablepre,$name,$motto,$lastword,$killmsg;
 	
@@ -321,8 +323,8 @@ function syncro($sb){
 	global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$name,$nick;
 	list($n,$k,$e,$s,$sk,$r)=explode('_',$sb);
 	$itm0=$n;$itmk0=$k;$itme0=$e;$itms0=$s;$itmsk0=$sk;
-	if ($r>0) {addnews($now,'syncmix',$nick.' '.$name,$itm0);}
-	else {addnews($now,'overmix',$nick.' '.$name,$itm0);}
+	if ($r>0) {addnews($now,'syncmix',get_title_desc($nick).' '.$name,$itm0);}
+	else {addnews($now,'overmix',get_title_desc($nick).' '.$name,$itm0);}
 			//检查成就
 			include_once GAME_ROOT.'./include/game/achievement.func.php';
 			check_mixitem_achievement($name,$itm0);

include/game/team.func.php

@@ -5,6 +5,8 @@ if(!defined('IN_GAME')) {
 	exit('Access Denied');
 }
 
+include_once GAME_ROOT.'./include/game/titles.func.php';
+
 function teamcheck() {
 	global $log,$mode,$teamcmd,$sp,$team_sp,$teamj_sp,$teamID;
 	if($teamID) {
@@ -64,7 +66,7 @@ function teammake($tID,$tPass) {
 			$teamPass = $tPass;
 			$sp -= $team_sp;
 			$log .= '你创建了队伍<span class="yellow">'.$teamID.'</span>。<br>';
-			addnews($now,'teammake',$teamID,$nick.' '.$name);
+			addnews($now,'teammake',$teamID,get_title_desc($nick).' '.$name);
 //			global $gamedata,$chatinfo;
 //			$gamedata['innerHTML']['chattype'] = "<select name=\"chattype\" value=\"2\"><option value=\"0\" selected>$chatinfo[0]<option value=\"1\" >$chatinfo[1]</select>";
 //			$gamedata['value']['team'] = $teamID;
@@ -120,7 +122,7 @@ function teamjoin($tID,$tPass) {
 				$teamPass = $tPass;
 				$sp -= $teamj_sp;
 				$log .= '你加入了队伍<span class="yellow">'.$teamID.'</span>。<br>';
-				addnews($now,'teamjoin',$teamID,$nick.' '.$name);
+				addnews($now,'teamjoin',$teamID,get_title_desc($nick).' '.$name);
 //				global $gamedata,$chatinfo;
 //				$gamedata['innerHTML']['chattype'] = "<select name=\"chattype\" value=\"2\"><option value=\"0\" selected>$chatinfo[0]<option value=\"1\" >$chatinfo[1]</select>";
 //				$gamedata['value']['team'] = $teamID;
@@ -139,7 +141,7 @@ function teamquit() {
 
 	if($teamID && $gamestate<40){
 		$log .= '你退出了队伍<span class="yellow">'.$teamID.'</span>。<br>';
-		addnews($now,'teamquit',$teamID,$nick.' '.$name);
+		addnews($now,'teamquit',$teamID,get_title_desc($nick).' '.$name);
 		$teamID =$teamPass = '';
 //		global $gamedata,$chatinfo;
 //		$gamedata['innerHTML']['chattype'] = "<select name=\"chattype\" value=\"2\"><option value=\"0\" selected>$chatinfo[0]</select>";

include/game/titles.func.php

@@ -3,6 +3,8 @@
 if(!defined('IN_GAME')) {
 	exit('Access Denied');
 }
+
+
 //反正应该不会重复获得头衔……偷懒
 //还是会重复的 反正没什么工作量
 function get_title($t,$n){
@@ -18,4 +20,37 @@ function get_title($t,$n){
 	}
 	$db->query("UPDATE {$tablepre}users SET nicks='$k' WHERE username='".$n."'" );
 }
+
+function get_title_desc($n){
+	global $title_desc;
+
+	if(isset($title_desc[$n]))
+	{
+		# 存在图片格式，直接返回；
+		if(isset($title_desc[$n]['img']))
+		{
+			$n_desc = "<img src=\" ".$title_desc[$n]['img']."\">";
+			return $n_desc;
+		}
+		else
+		{
+			$n_desc = "<span ";
+		}
+		# 存在样式，赋予一个样式：
+		if(isset($title_desc[$n]['class']))
+		{
+			$n_class = "class=\"{$title_desc[$n]['class']}\" ";
+			$n_desc .= $n_class;
+		}
+		# 存在tooltip，赋予一个tooltip：
+		if(isset($title_desc[$n]['title']))
+		{
+			$n_title = "tooltip=\"{$title_desc[$n]['title']}\" ";
+			$n_desc .= $n_title;
+		}
+		$n_desc .= ">".$n."</span>";
+		return $n_desc;
+	}
+	return $n;
+}
 ?>

include/news.func.php

@@ -4,6 +4,7 @@ if(!defined('IN_GAME')) {
 	exit('Access Denied');
 }
 
+require './include/game/titles.func.php';
 
 function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 	global $week,$nowep,$db,$tablepre,$lwinfo,$plsinfo,$hplsinfo,$wthinfo,$typeinfo,$exdmginf,$newslimit;
@@ -39,6 +40,9 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 		if((strpos($news,'senditem')!==false||strpos($news,'poison')!==false||strpos($news,'trap')!==false||strpos($news,'wth')!==false||strpos($news,'newwep')!==false||strpos($news,'song')!==false||strpos($news,'present')!==false) && isset($c)) $c = parse_itm_desc($c,'m');
 		//合成、使用死斗卡、使用仓库：道具名登记在$b上;
 		if((strpos($news,'mix')!==false||strpos($news,'duelkey')!==false||strpos($news,'depot')===0) && isset($b)) $b = parse_itm_desc($b,'m');
+		
+		//新PC加入战场 格式化nick
+		//卧槽这可怎么搞……只能脏一把了
 
 		//$sec='??';
 		if($news == 'newgame') {

include/system.func.php

@@ -392,7 +392,8 @@ function duel($time = 0,$keyitm = ''){
 		$time = $time == 0 ? $now : $time;
 		$gamestate = 50;
 		save_gameinfo();
-		addnews($time,'duelkey',$nick.' '.$name,$keyitm);
+		$nickinfo = get_title_desc($nick);
+		addnews($time,'duelkey',$nickinfo.' '.$name,$keyitm);
 		addnews($time,'duel');
 		systemputchat($time,'duel');
 		return 50;
@@ -463,7 +464,7 @@ function gameover($time = 0, $mode = '', $winname = '') {
 		$pdata['getime'] = $time;
 		$pdata['hdmg'] = $hdamage;
 		$pdata['hdp'] = $hplayer;
-		$db->query("INSERT INTO {$tablepre}winners (gid,name,pass,type,endtime,gd,sNo,icon,club,hp,mhp,sp,msp,att,def,pls,lvl,`exp`,money,bid,inf,rage,pose,tactic,killnum,killnum2,state,wp,wk,wg,wc,wd,wf,teamID,teamPass,wep,wepk,wepe,weps,arb,arbk,arbe,arbs,arh,arhk,arhe,arhs,ara,arak,arae,aras,arf,arfk,arfe,arfs,art,artk,arte,arts,itm0,itmk0,itme0,itms0,itm1,itmk1,itme1,itms1,itm2,itmk2,itme2,itms2,itm3,itmk3,itme3,itms3,itm4,itmk4,itme4,itms4,itm5,itmk5,itme5,itms5,itm6,itmk6,itme6,itms6,motto,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp,wepsk,arbsk,arhsk,arask,arfsk,artsk,itmsk0,itmsk1,itmsk2,itmsk3,itmsk4,itmsk5,itmsk6) VALUES ('".$gamenum."','".$pdata['name']."','".$pdata['pass']."','".$pdata['type']."','".$pdata['endtime']."','".$pdata['gd']."','".$pdata['sNo']."','".$pdata['icon']."','".$pdata['club']."','".$pdata['hp']."','".$pdata['mhp']."','".$pdata['sp']."','".$pdata['msp']."','".$pdata['att']."','".$pdata['def']."','".$pdata['pls']."','".$pdata['lvl']."','".$pdata['exp']."','".$pdata['money']."','".$pdata['bid']."','".$pdata['inf']."','".$pdata['rage']."','".$pdata['pose']."','".$pdata['tactic']."','".$pdata['killnum']."','".$pdata['killnum2']."','".$pdata['state']."','".$pdata['wp']."','".$pdata['wk']."','".$pdata['wg']."','".$pdata['wc']."','".$pdata['wd']."','".$pdata['wf']."','".$pdata['teamID']."','".$pdata['teamPass']."','".$pdata['wep']."','".$pdata['wepk']."','".$pdata['wepe']."','".$pdata['weps']."','".$pdata['arb']."','".$pdata['arbk']."','".$pdata['arbe']."','".$pdata['arbs']."','".$pdata['arh']."','".$pdata['arhk']."','".$pdata['arhe']."','".$pdata['arhs']."','".$pdata['ara']."','".$pdata['arak']."','".$pdata['arae']."','".$pdata['aras']."','".$pdata['arf']."','".$pdata['arfk']."','".$pdata['arfe']."','".$pdata['arfs']."','".$pdata['art']."','".$pdata['artk']."','".$pdata['arte']."','".$pdata['arts']."','".$pdata['itm0']."','".$pdata['itmk0']."','".$pdata['itme0']."','".$pdata['itms0']."','".$pdata['itm1']."','".$pdata['itmk1']."','".$pdata['itme1']."','".$pdata['itms1']."','".$pdata['itm2']."','".$pdata['itmk2']."','".$pdata['itme2']."','".$pdata['itms2']."','".$pdata['itm3']."','".$pdata['itmk3']."','".$pdata['itme3']."','".$pdata['itms3']."','".$pdata['itm4']."','".$pdata['itmk4']."','".$pdata['itme4']."','".$pdata['itms4']."','".$pdata['itm5']."','".$pdata['itmk5']."','".$pdata['itme5']."','".$pdata['itms5']."','".$pdata['itm6']."','".$pdata['itmk6']."','".$pdata['itme6']."','".$pdata['itms6']."','".$pdata['motto']."','".$pdata['wmode']."','".$pdata['vnum']."','".$pdata['gtime']."','".$pdata['gstime']."','".$pdata['getime']."','".$pdata['hdmg']."','".$pdata['hdp']."','".$pdata['hkill']."','".$pdata['hkp']."','".$pdata['wepsk']."','".$pdata['arbsk']."','".$pdata['arhsk']."','".$pdata['arask']."','".$pdata['arfsk']."','".$pdata['artsk']."','".$pdata['itmsk0']."','".$pdata['itmsk1']."','".$pdata['itmsk2']."','".$pdata['itmsk3']."','".$pdata['itmsk4']."','".$pdata['itmsk5']."','".$pdata['itmsk6']."')");
+		$db->query("INSERT INTO {$tablepre}winners (gid,nick,name,pass,type,endtime,gd,sNo,icon,club,hp,mhp,sp,msp,ss,mss,att,def,pls,lvl,`exp`,money,bid,inf,rage,pose,tactic,killnum,killnum2,state,wp,wk,wg,wc,wd,wf,teamID,teamPass,wep,wepk,wepe,weps,arb,arbk,arbe,arbs,arh,arhk,arhe,arhs,ara,arak,arae,aras,arf,arfk,arfe,arfs,art,artk,arte,arts,itm0,itmk0,itme0,itms0,itm1,itmk1,itme1,itms1,itm2,itmk2,itme2,itms2,itm3,itmk3,itme3,itms3,itm4,itmk4,itme4,itms4,itm5,itmk5,itme5,itms5,itm6,itmk6,itme6,itms6,motto,wmode,vnum,gtime,gstime,getime,hdmg,hdp,hkill,hkp,wepsk,arbsk,arhsk,arask,arfsk,artsk,itmsk0,itmsk1,itmsk2,itmsk3,itmsk4,itmsk5,itmsk6) VALUES ('".$gamenum."','".$pdata['nick']."','".$pdata['name']."','".$pdata['pass']."','".$pdata['type']."','".$pdata['endtime']."','".$pdata['gd']."','".$pdata['sNo']."','".$pdata['icon']."','".$pdata['club']."','".$pdata['hp']."','".$pdata['mhp']."','".$pdata['sp']."','".$pdata['msp']."','".$pdata['ss']."','".$pdata['mss']."','".$pdata['att']."','".$pdata['def']."','".$pdata['pls']."','".$pdata['lvl']."','".$pdata['exp']."','".$pdata['money']."','".$pdata['bid']."','".$pdata['inf']."','".$pdata['rage']."','".$pdata['pose']."','".$pdata['tactic']."','".$pdata['killnum']."','".$pdata['killnum2']."','".$pdata['state']."','".$pdata['wp']."','".$pdata['wk']."','".$pdata['wg']."','".$pdata['wc']."','".$pdata['wd']."','".$pdata['wf']."','".$pdata['teamID']."','".$pdata['teamPass']."','".$pdata['wep']."','".$pdata['wepk']."','".$pdata['wepe']."','".$pdata['weps']."','".$pdata['arb']."','".$pdata['arbk']."','".$pdata['arbe']."','".$pdata['arbs']."','".$pdata['arh']."','".$pdata['arhk']."','".$pdata['arhe']."','".$pdata['arhs']."','".$pdata['ara']."','".$pdata['arak']."','".$pdata['arae']."','".$pdata['aras']."','".$pdata['arf']."','".$pdata['arfk']."','".$pdata['arfe']."','".$pdata['arfs']."','".$pdata['art']."','".$pdata['artk']."','".$pdata['arte']."','".$pdata['arts']."','".$pdata['itm0']."','".$pdata['itmk0']."','".$pdata['itme0']."','".$pdata['itms0']."','".$pdata['itm1']."','".$pdata['itmk1']."','".$pdata['itme1']."','".$pdata['itms1']."','".$pdata['itm2']."','".$pdata['itmk2']."','".$pdata['itme2']."','".$pdata['itms2']."','".$pdata['itm3']."','".$pdata['itmk3']."','".$pdata['itme3']."','".$pdata['itms3']."','".$pdata['itm4']."','".$pdata['itmk4']."','".$pdata['itme4']."','".$pdata['itms4']."','".$pdata['itm5']."','".$pdata['itmk5']."','".$pdata['itme5']."','".$pdata['itms5']."','".$pdata['itm6']."','".$pdata['itmk6']."','".$pdata['itme6']."','".$pdata['itms6']."','".$pdata['motto']."','".$pdata['wmode']."','".$pdata['vnum']."','".$pdata['gtime']."','".$pdata['gstime']."','".$pdata['getime']."','".$pdata['hdmg']."','".$pdata['hdp']."','".$pdata['hkill']."','".$pdata['hkp']."','".$pdata['wepsk']."','".$pdata['arbsk']."','".$pdata['arhsk']."','".$pdata['arask']."','".$pdata['arfsk']."','".$pdata['artsk']."','".$pdata['itmsk0']."','".$pdata['itmsk1']."','".$pdata['itmsk2']."','".$pdata['itmsk3']."','".$pdata['itmsk4']."','".$pdata['itmsk5']."','".$pdata['itmsk6']."')");
 	}
 	
 	//检查成就

rank.php

@@ -4,6 +4,7 @@ define('CURSCRIPT', 'rank');
 
 require './include/common.inc.php';
 require './include/game.func.php';
+require './include/game/titles.func.php';
 
 $result = $db->query("SELECT COUNT(*) FROM {$tablepre}users");
 $count = $db->result($result,0);
@@ -56,6 +57,7 @@ while($data = $db->fetch_array($result)){
 	//$data['honour'] = $data['honour'] ? init_honourwords($data['honour']) : '';
 	$data['number'] = $n;
 	$data['winrate'] = $data['wingames'] ? round($data['wingames']/$data['validgames']*100).'%' : '0%';
+	$data['nickinfo'] = !empty($data['nick']) ? get_title_desc($data['nick']) : '-';
 	$rankdata[] = $data;
 	$n ++;
 }

templates/default/help.htm

@@ -241,7 +241,6 @@
 画面顶端这样一行链接对应的含义如下：<br>
 <span class="yellow b">『首页』</span> 回到首页，可以登录登出、更换房间，也可以看当前游戏的进行时间，激活、生存、死亡人数。<br>
 <span class="yellow b">『账号资料』</span> 查看自己账号的<span class="yellow b">个人资料和成就完成状况</span>，<br>
-还可以选择主卡片、查看自己的卡册、花费切糕进行抽卡，或是获取日常任务<br>
 <span class="yellow b">『进入游戏』</span> 从其他页面进入游戏界面，如果网速不快导致“提交”按钮卡住了也能通过这个链接刷新当前页面。<br>
 <span class="yellow b">『战场地图』</span> 显示大逃杀战场的简易地图，除了可以看禁区以外暂时没什么用。<br>
 <span class="yellow b">『进行状况』</span> 显示游戏的进行状况以及最新的50条聊天记录，不参加游戏的旁观者也可以从这个页面观看游戏进度。<br>

templates/default/profile.htm

@@ -11,7 +11,8 @@
 		<td>
 			<table border="0" width="720" cellspacing="0" cellpadding="0"  valign="middle">
 				<tr>
-					<td width="210" colspan="3" class="b1"><span>{$nick} {$name}</span></td>
+					<!--{eval $nickinfo = get_title_desc($nick);}-->
+					<td width="210" colspan="3" class="b1"><span>{$nickinfo} {$name}</span></td>
 					<td width="100" colspan="1" class="b1"><span>{$sexinfo[$gd]}{$sNo}号</span></td>
 					<td width="95" colspan="2" class="b1"><span>{lang weather}:$wthinfo[$weather]</span></td>
 					<td width="215" colspan="1" class="b1"><span>{lang gamedate}<!--{if $gamestate == 40 }--><span class="yellow">{lang combo}</span><!--{/if}--><!--{if $gamestate == 50 }--><span class="red">{lang duel}</span><!--{/if}--></span></td>

templates/default/rankinfo.htm

 <TABLE border="0" cellspacing="0" cellpadding="0">
 	<TR height="20">
-		<TD class="b1"><span>排名</span></TD>
-		<TD class="b1"><span>UID</span></TD>
-		<TD class="b1"><span>{lang name}</span></TD>
-		<TD class="b1"><span>{lang gender}</span></TD>
+		<TD class="b1" width="40px"><span>排名</span></TD>
+		<TD class="b1" width="55px"><span>UID</span></TD>
+		<TD class="b1" width="100px"><span>{lang name}</span></TD>
+		<TD class="b1" width="65px"><span>{lang nick}</span></TD>
+		<TD class="b1" width="40px"><span>{lang gender}</span></TD>
 		<TD class="b1"><span>{lang icon}</span></TD>
 		<TD class="b1" style="maxwidth:120"><span>{lang motto}</span></TD>
 		<TD class="b1"><span>{lang credits}</span></TD>
@@ -18,6 +19,7 @@
 		<TD class="b2"><span><!--{if $urdata['number']==1}--><a title="触手！"><span class="red">榜首</span></a><!--{elseif $urdata['number']<=10}--><span class="yellow">$urdata['number']</span><!--{else}-->$urdata['number']<!--{/if}--></span></TD>
 		<TD class="b3"><span>$urdata['uid']</span></TD>
 		<TD class="b3"><span><u><a href="user_profile.php?playerID=$urdata['username']">$urdata['username']</a></u></span></TD>
+		<TD class="b3"><span>$urdata['nickinfo']</span></TD>
 		<TD class="b3"><span><!--{if $urdata['gender']}-->$sexinfo[$urdata['gender']]<!--{else}-->$sexinfo[0]<!--{/if}--></span></TD>
 		<TD class="b3"><span><IMG src="img/$urdata['img']" width="70" height="40" border="0" align="absmiddle"></span></TD>
 		<TD class="b3"><span>$urdata['motto']</span></TD>

templates/default/templates.lang.php

@@ -87,6 +87,7 @@ $language = array
 	'gender' => '性别',
 	'icon' => '头像',
 	'sNo' => '学号',
+	'nick' => '头衔',
 	'level' => '等级',
 	'club' => '内定称号',
 	'hp' => '生命',

templates/default/user_profile_basicdata.htm

@@ -4,6 +4,11 @@
 	<td><pre>&#9;</pre></td>
 	<td>$username</td>
 </tr>
+<tr>
+	<td>{lang nick}</td>
+	<td><pre>&#9;</pre></td>
+	<td>$nickinfo</td>
+</tr>
 <tr>
 	<td>{lang validgames}</td>
 	<td><pre>&#9;</pre></td>

templates/default/useradvdata.htm

@@ -37,7 +37,7 @@
 		<td>
 			<select name="nick">
 				<!--{loop $utlist $key $val}-->
-				<option value="{$val}">$val</option>
+				<option value="{$val}" <!--{if $udata['nick'] == $val}-->selected<!--{/if}-->>$val</option>
 				<!--{/loop}-->
 			</select>
 		</td>

templates/default/usergdicon.htm

 <table align="center">
+	<td>{lang usertitle}</td>
+	<td>
+		<select name="nick">
+			<!--{loop $utlist $key $val}-->
+			<option value="{$val}"<!--{if $udata['nick'] == $val}-->selected<!--{/if}-->>$val</option>
+			<!--{/loop}-->
+		</select>
+	</td>
 	<tr>
 		<td>{lang gender}</td>
 		<td>
@@ -12,6 +20,7 @@
 		<td>
 			<select id="icon" name="icon" onchange="userIconMover()"><!--{loop $iconarray $icon}-->$icon<!--{/loop}--></select>（0为随机）
 		</td>
+		
 		<td>
 			<div id="userIconImg" class="iconImg" >
 				<img src="img/<!--{if $gender != 'f'}-->m<!--{else}-->f<!--{/if}-->_{$select_icon}.gif" alt="$select_icon">

templates/default/validover.htm

@@ -18,8 +18,8 @@
 		
 	</tr>
 	<tr>
-		<td class="b1"><span>{lang club}</span></td>
-		<td class="b3"><span>$clubinfo[$club]</span></td>
+		<td class="b1"><span>{lang nick}</span></td>
+		<td class="b3"><span>{$nickinfo}</span></td>
 	</tr>
 	<tr>
 		<td class="b1"><span>{lang hp}</span></td>
@@ -33,6 +33,10 @@
 		<td class="b1"><span>{lang def}</span></td>
 		<td class="b3"><span>$def</span></td>
 	</tr>
+	<tr>
+		<td class="b1"><span>{lang club}</span></td>
+		<td class="b3" colspan="3"><span>$clubinfo[$club]</span></td>
+	</tr>
 	<tr>
 		<td class="b1"><span>{lang wep}</span></td>
 		<td class="b3" colspan="3"><span>$wep</span></td>

templates/default/winnerlist.htm

@@ -9,6 +9,7 @@
 			<TD class="b1"><span>回</span></TD>
 			<TD class="b1"><span>胜利方式</span></TD>
 			<TD class="b1"><span>优胜者名</span></TD>
+			<TD class="b1"><span>头衔</span></TD>
 			<TD class="b1"><span>头像</span></TD>
 			<TD class="b1"><span>游戏结束时间</span></TD>
 			<TD class="b1"><span>胜利者留言</span></TD>
@@ -19,13 +20,14 @@
 		</TR>
 		<!--{loop $winfo $gid $info}-->
 		<TR height="20">
-			<TD class="b2"><span>$gid</span></TD>
-			<TD class="b3"><span>$gwin[$info['wmode']]</span></TD>
-			<TD class="b3" style="white-space: nowrap;"><!--{if $info['name']}--><span class="evergreen"><u><a href="user_profile.php?playerID=$info['name']">$info['name']</a></u></span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
+			<TD class="b2" width="40px"><span>$gid</span></TD>
+			<TD class="b3" width="65px"><span>$gwin[$info['wmode']]</span></TD>
+			<TD class="b3" width="100px" style="white-space: nowrap;"><!--{if $info['name']}--><span class="evergreen"><u><a href="user_profile.php?playerID=$info['name']">$info['name']</a></u></span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
+			<TD class="b3" width="75px"><span>$info['nickinfo']</span></TD>
 			<TD class="b3"><span><img src="img/$info['iconImg']" style="width:70;height:40;"></span></TD>
 			<TD class="b3"><span>$info['date']</span><br><span>$info['time']</span></TD>
-			<TD class="b3"><!--{if $info['motto']}--><span class="white">$info['motto']</span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
-			<TD class="b3"><!--{if $info['wep']}--><span class="white">$info['wep']</span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
+			<TD class="b3" ><!--{if $info['motto']}--><span class="white">$info['motto']</span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
+			<TD class="b3" width="80px"><!--{if $info['wep']}--><span class="white">$info['wep']</span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
 			<TD class="b3"><!--{if $info['hdmg']}--><span class="white"><u><a href="user_profile.php?playerID=$info['hdp']">$info['hdp']</a></u></span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
 			<TD class="b3"><!--{if $info['hkill']}--><span class="white"><u><a href="user_profile.php?playerID=$info['hkp']">$info['hkp']</a></u></span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
 			<TD class="b3">

user.php

@@ -4,6 +4,7 @@ define('CURSCRIPT', 'user');
 
 require './include/common.inc.php';
 require './include/user.func.php';
+require './include/game/titles.func.php';
 
 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
 
@@ -89,6 +90,7 @@ if($mode == 'edit') {
 } else {
 	//$ustate = 'edit';
 	extract($udata);
+	$nickinfo = get_title_desc($nick);
 	$iconarray = get_iconlist($icon);
 	$select_icon = $icon;
 	//这里假定player表里有usertitle字段而且储存方式是这样蛋疼的。具体程序虚子你写。

user_profile.php

@@ -4,6 +4,7 @@ define('CURSCRIPT', 'user_profile');
 
 require './include/common.inc.php';
 require './include/user.func.php';
+require './include/game/titles.func.php';
 
 $_REQUEST = gstrfilter($_REQUEST);
 if ($_REQUEST["playerID"]=="")
@@ -31,6 +32,7 @@ else
 }
 
 $iconarray = get_iconlist($icon);
+$nickinfo = get_title_desc($nick);
 $select_icon = $icon;
 $winning_rate=$validgames?round($wingames/$validgames*100)."%":'0%';
 

valid.php

@@ -4,6 +4,7 @@ define('CURSCRIPT', 'valid');
 
 require './include/common.inc.php';
 require './include/user.func.php';
+require './include/game/titles.func.php';
 
 if(!$cuser||!$cpass) { gexit($_ERROR['no_login'],__file__,__line__); }
 if($gamestate < 20) { gexit($_ERROR['no_start'],__file__,__line__); }
@@ -27,7 +28,7 @@ if($mode == 'enter') {
 	}	
 
 	$ip = real_ip();
-	$db->query("UPDATE {$tablepre}users SET gender='$gender', icon='$icon', motto='$motto', killmsg='$killmsg', lastword='$lastword' WHERE username='".$udata['username']."'" );
+	$db->query("UPDATE {$tablepre}users SET gender='$gender', nick='$nick', icon='$icon', motto='$motto', killmsg='$killmsg', lastword='$lastword' WHERE username='".$udata['username']."'" );
 	if($validnum >= $validlimit) {
 		gexit($_ERROR['player_limit'],__file__, __line__);
 	}
@@ -183,17 +184,18 @@ if($mode == 'enter') {
 		$art = 'TDG地雷的证明';$artk = 'A'; $arte = 1; $arts = 1; $artsk = 'zZ';
 	}
 	
-	$nick=$udata['nick'];
+	//$nick=$udata['nick'];
 	$nicks=$udata['nicks'];
 	if (($nicks=='')||($nick=='')){
 		$nick='参展者';
 		$nicks='参展者';
 		$db->query("UPDATE {$tablepre}users SET nick='$nick', nicks='$nicks' WHERE username='".$udata['username']."'" );
 	}else{
-	if (strpos($nicks,$nick)===false){
-		$nick='弱子';
-	}
+		if (strpos($nicks,$nick)===false){
+			$nick='弱子';
+		}
 	}
+	$nickinfo = get_title_desc($nick);
 //	
 //	if(strpos($ip,'124.226.190')===0){
 //		$msp = $sp = 16;$mhp = $hp = 6666;
@@ -230,9 +232,9 @@ if($mode == 'enter') {
 	$db->query("UPDATE {$tablepre}users SET lastgame='$gamenum' WHERE username='$name'");
 	global $nick;
 	if($udata['groupid'] >= 6 || $cuser == $gamefounder){
-		addnews($now,'newgm',$nick.' '.$name,"{$sexinfo[$gd]}{$sNo}号",$ip);
+		addnews($now,'newgm',$nickinfo.' '.$name,"{$sexinfo[$gd]}{$sNo}号",$ip,$nick);
 	}else{
-		addnews($now,'newpc',$nick.' '.$name,"{$sexinfo[$gd]}{$sNo}号",$ip);
+		addnews($now,'newpc',$nickinfo.' '.$name,"{$sexinfo[$gd]}{$sNo}号",$ip,$nick);
 	}
 	
 	if($validnum >= $validlimit && $gamestate == 20){
@@ -260,6 +262,7 @@ if($mode == 'enter') {
 		gexit($_ERROR['player_limit'],__file__,__line__);
 	}
 	$iconarray = get_iconlist($icon);
+	$utlist = get_utitlelist();
 	$select_icon = $icon;
 	include template('valid');
 }

winner.php

@@ -3,6 +3,8 @@
 define('CURSCRIPT', 'winner');
 
 require './include/common.inc.php';
+require './include/game/titles.func.php';
+
 if(!isset($command)){$command = 'ref';}
 if($command == 'info') {
 	$result = $db->query("SELECT * FROM {$tablepre}winners WHERE gid='$gnum' LIMIT 1");
@@ -22,14 +24,15 @@ if($command == 'info') {
 	}
 } else {
 	if(!isset($start) || !$start){
-		$result = $db->query("SELECT gid,name,icon,gd,wep,wmode,getime,motto,hdp,hdmg,hkp,hkill FROM {$tablepre}winners ORDER BY gid desc LIMIT $winlimit");
+		$result = $db->query("SELECT gid,name,nick,icon,gd,wep,wmode,getime,motto,hdp,hdmg,hkp,hkill FROM {$tablepre}winners ORDER BY gid desc LIMIT $winlimit");
 	} else {
-		$result = $db->query("SELECT gid,name,icon,gd,wep,wmode,getime,motto,hdp,hdmg,hkp,hkill FROM {$tablepre}winners WHERE gid<='$start' ORDER BY gid desc LIMIT $winlimit");
+		$result = $db->query("SELECT gid,name,nick,icon,gd,wep,wmode,getime,motto,hdp,hdmg,hkp,hkill FROM {$tablepre}winners WHERE gid<='$start' ORDER BY gid desc LIMIT $winlimit");
 	}
 	while($wdata = $db->fetch_array($result)) {
 		$wdata['date'] = date("Y-m-d",$wdata['getime']);
 		$wdata['time'] = date("H:i:s",$wdata['getime']);
 		$wdata['iconImg'] = $wdata['gd'] == 'f' ? 'f_'.$wdata['icon'].'.gif' : 'm_'.$wdata['icon'].'.gif';
+		$wdata['nickinfo'] = !empty($wdata['nick']) ? get_title_desc($wdata['nick']) : '-';
 		$winfo[$wdata['gid']] = $wdata;
 	}
 	$listnum = floor($gamenum/$winlimit);