bugfix

fixed a bug that makes NPC encounterable even when gamestate < 50
Addressed an oddity that makes it possible to pull traits from item that got their names changed.

gamedata/cache/resources_1.php

@@ -1133,6 +1133,7 @@ $itemspkinfo = Array(
 	'🧰' => '工具',
 	'🍎' => '水果',
 	//'|' => '<:DUMMY:>', //箭矢用的分隔符
+	//'🔰' => ' ', //判定物品已经被残想兵器改过名，用来干掉一些应该干掉的判定
 );
 
 //club20 元素大师：

include/game/club21.func.php

@@ -44,6 +44,13 @@
 		
 		if (isset($clbpara['skillpara']['c21_sacrifice']['active'])) $sacrifice_flag = $clbpara['skillpara']['c21_sacrifice']['active'];
 
+		// See if there's a 🔰 hidden in $itmsk, if they do, output an easter egg and skip the entire process.
+		if (strpos($itmsk, '🔰') !== false) {
+			$log .= "「为啥为啥小问号！物品已经动过了！<br>物品纯度已打破，这可啥都做不了！」<br><br>";
+			$log .= "…………似乎你没办法从这个物品上抽取代码片段了……这是为什么呢？<br>";
+			return;
+		}
+
 		// 判断itmk是否以'D'或'W'开头
 		if (strpos($itmk, 'D') === 0 || strpos($itmk, 'W') === 0) {
 			// 给代码片段命名

include/game/item2.func.php

@@ -645,8 +645,11 @@ function nametag($item){
 	$mark = '■';
 	$rn0 = $rn;
 	$rn = $mark.$rename.$mark;
+	//Let's add another invisible branding
+	$rnsk .= '🔰';
 	$rnsk = str_replace('Z','x',$rnsk);
 	$log .= "{$rn0}已改名为<span class=\"yellow\">$rn</span>！武器的菁英属性已经抹消。<br>";
+
 	if(${'itms'.$ntitm} != $nosta){
 		${'itms'.$ntitm} --;
 		if(${'itms'.$ntitm} <= 0){

include/game/search.func.php

@@ -666,7 +666,7 @@ function discover($schmode = 0,&$data=NULL)
 
 			# 不管是活人还是死人，都只会在处于相同视界的情况下遭遇
 			# 死斗模式无视视界限制
-			if($horizon == $edata['horizon'] || (!$edata['type'] && $gamestate == 50))
+			if(($horizon == $edata['horizon'] && $gamestate < 50) || (!$edata['type'] && $gamestate >= 50))
 			{
 				if($edata['hp'] <= 0)
 				{