Merge pull request #157 from hikawiier/waaagh

fix more

include/game/clubslct.func.php

@@ -191,12 +191,13 @@ function lostclub(&$data=NULL)
 
 function selectclub($id)
 {
-	global $name, $club;
+	global $name, $club, $udata;
 	if ($club!=0) return 1;
 	if (!$id) return 2;
 
 	$t1_list = valid_getclublist_t1($udata);
 	$t2_list = valid_getclublist_t2($udata);
+
 	if(in_array($id,$t1_list) || in_array($id,$t2_list))
 	{
 		$club = $id; 

include/game/item.func.php

@@ -966,7 +966,7 @@ function itemuse($itmn,&$data=NULL) {
 					$is = 1;
 					$isk = '';
 				}
-				$clbpara['opened_pack'] = $itm; //记录打开福袋
+				$clbpara['opened_pack'] = $oitm; //记录打开福袋
 			}
 		}else{//一般礼品盒
 			$file = config('present',$gamecfg);

include/game/revcombat.calc.php

@@ -12,8 +12,8 @@ namespace revcombat
 		if(!empty($pa['wep_range']) && $pd['wep_range'] >= $pa['wep_range']) return 1;
 		# 鏖战状态下无视射程反击（爆系武器除外）
 		if((isset($pd['is_dfight']) || isset($pa['is_dfight'])) && !empty($pd['wep_range'])) return 1;
-		#「直感」触发后可以超射程反击：
-		if(isset($pd['skill_c2_intuit']))
+		#「直感」触发后可以超射程反击（爆系武器除外）
+		if(isset($pd['skill_c2_intuit']) && !empty($pa['wep_range']))
 		{
 			$sk_dice = diceroll(99);
 			$sk_lvl = get_skilllvl('c2_intuit',$pd);

include/news.func.php

@@ -26,16 +26,17 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 	$old_nicknews = Array
 	(
 		//使用道具发送的news统一不带头衔，以后要不要带以后再说
-		'teammake' => 'c',
-		'teamjoin' => 'c',
-		'teamquit' => 'c',
+		'teammake' => Array('b','c'),
+		'teamjoin' => Array('b','c'),
+		'teamquit' => Array('b','c'),
 		'newgm' => 'd',
 		'newpc' => 'd',
 		'hack' => 'b',
 		'hack2' => 'b',
-		'itemmix' => 'd',
-		'syncmix' => 'c',
-		'overmix' => 'c',
+		//合成消息显示头衔太丑了
+		//'itemmix' => 'd',
+		//'syncmix' => 'c',
+		//'overmix' => 'c',
 		'senditem' => 'd',
 		'csl_wthchange' => 'c',
 		'csl_hack' => 'b',