机制与杂项调整

gamedata/cache/addnpc_1.php

@@ -482,7 +482,7 @@ $anpcinfo = array
 			'itmk2' => 'WF',
 			'itme2' => 500,
 			'itms2' => 100,
-			'itmsk2' => 'cd',
+			'itmsk2' => 'crd',
 			),
 		1 => array
 			(
@@ -509,7 +509,7 @@ $anpcinfo = array
 			'itmk2' => 'WG',
 			'itme2' => 500,
 			'itms2' => 6,
-			'itmsk2' => 'd',
+			'itmsk2' => 'rdy',
 			),
 		),
 	),
@@ -1458,8 +1458,6 @@ $anpcinfo = array
 		'inf' => '',
 		'state' => 1,
 		'rage' => 5,
-		'pose'=> 0,
-		'tactic' => 4,
 		'killnum' => 0,
 		'teamID' => '',
 		'teampsss' => '',
@@ -1499,11 +1497,13 @@ $anpcinfo = array
 			0 => array
 			(
 			'name' => '红暮',
-			'club' => 98,
+			'club' => 98,	
+			'pose'=> 2,
+			'tactic' => 3,
 			'mhp' => 20800,
 			'msp' => 2800,
-			'att' => 1100,
-			'def' => 1500,
+			'att' => 3300,
+			'def' => 2500,
 			'skills' => 15566,
 			'icon' => 7,
 			'wep' => '喷气式红杀重铁剑',
@@ -1545,6 +1545,8 @@ $anpcinfo = array
 			(
 			'name' => '蓝凝',
 			'club' => 10,
+			'pose'=> 1,
+			'tactic' => 3,
 			'mhp' => 9999998,
 			'msp' => 1600,
 			'att' => 199900,

gamedata/cache/clubskills_1.php

@@ -2139,11 +2139,11 @@ $cskills = Array
 		'pvars' => Array('skill-active','skillpara|c20_sparkle-active_t'),
 		'lockdesc' => Array(
 			'skillpara|c20_sparkle-active_t' => '已失去火花。',
-			'lvl' => '13级时解锁',
+			'lvl' => '15级时解锁',
 		),
 		'unlock' => Array(
 			'skillpara|c20_sparkle-active_t' => '[:skillpara|c20_sparkle-active_t:] < 1',
-			'lvl' => '[:lvl:] >= 13',
+			'lvl' => '[:lvl:] >= 15',
 		),
 	),
 	'c20_lotus' => Array
@@ -2172,11 +2172,11 @@ $cskills = Array
 		'pvars' => Array('skillpara|c20_lotus-active_t'),
 		'lockdesc' => Array(
 			'skillpara|c20_lotus-active_t' => '黑莲花已经用光了。',
-			'lvl' => '17级时解锁',
+			'lvl' => '21级时解锁',
 		),
 		'unlock' => Array(
 			'skillpara|c20_lotus-active_t' => '[:skillpara|c20_lotus-active_t:] < 3',
-			'lvl' => '[:lvl:] >= 17',
+			'lvl' => '[:lvl:] >= 21',
 		),
 	),
 	'inf_zombie' => Array

gamedata/club21cfg.php

@@ -53,7 +53,8 @@ $itmsk_extract_rate = array(
     '*' => 200,
     '+' => 200,
     '^' => 1200,
-    '🧰' => 200
+    '🧰' => 200,
+	'🍎' => 1000
 );
 //itm
 $itm_extract_rate = array(

include/game/console.func.php

@@ -62,7 +62,7 @@
 		$skind = Array(0=>'itm',1=>'trap',2=>'pc');
 
 		//过滤输入名称中的非法字符
-		$nm = preg_replace('/[,\#;\p{Cc}]+|锋利的|电气|毒性|[\r\n]|-改|<|>|\"/u','',$nm);
+		//$nm = preg_replace('/[,\#;\p{Cc}]+|锋利的|电气|毒性|[\r\n]|-改|<|>|\"/u','',$nm);
 		//过滤输入名称首尾的空格
 		$nm = preg_replace('/^\s+|\s+$/m','', $nm);
 		//过滤类别

include/game/elementmix.calc.php

@@ -145,7 +145,7 @@
 			# 次优先：检查拆解关键词匹配道具名时的事件（改为手动添加判断条件）
 			if(strpos($t['itm'],'方块')!==false || strpos($t['itm'],'宝石方块')!==false)
 			{
-				$ev = strpos($t['itm'],'方块')!==false ? 400 : 1000;
+				$ev = strpos($t['itm'],'宝石方块')!==false ? 1000 : 400;
 				$ekey = rand(0,5);
 				$ev_arr[$ekey] += $ev;
 				continue; 

include/game/item.func.php

@@ -1348,12 +1348,18 @@ function itemuse($itmn,&$data=NULL) {
 			$dice = rand ( 0, 99 );
 			$dice2 = rand ( 0, 99 );
 			$skill = array ('WP' => $wp, 'WK' => $wk, 'WG' => $wg, 'WC' => $wc, 'WD' => $wd, 'WF' => $wf );
+			$skill_advanced = array ('WJ' => $wg, 'WB' => $wc );
 			arsort ( $skill );
 			$skill_keys = array_keys ( $skill );
+			$skill_advanced_keys = array_keys ( $skill_advanced );			
 			$nowsk = substr ( $wepk, 0, 2 );
+			if (strlen($wepk) > 2) $subsk = 'W'.$wepk[2];
 			$maxsk = $skill_keys [0];
-			if (($skill [$nowsk] != $skill [$maxsk]) && ($dice < 30)) {
-				$wepk = $maxsk;
+			// 复合武器只要其中一个类别是最高就不会改系
+			// 上位武器熟练超过1200不会改系，可能算加强六系称号
+			if (((!in_array($nowsk, $skill_advanced_keys) && ($skill [$nowsk] != $skill [$maxsk]) && (empty($subsk) || ((!empty($subsk) && !in_array($subsk, $skill_advanced_keys) && ($skill [$subsk] != $skill [$maxsk]))))) || (in_array($nowsk, $skill_advanced_keys) && ($skill_advanced [$nowsk] < 1200))) && ($dice < 30))
+			{
+				$wepk = substr_replace($wepk, $maxsk, 0, 2);
 				$kind = "更改了{$wep}的<span class=\"yellow\">类别</span>！";
 			} elseif (($weps != $nosta) && ($dice2 < 70)) {
 				$weps += ceil ( $wepe / 2 );