Merge pull request #14 from hikawiier/waaagh

Add hiddenplsinfo

.gitignore

@@ -36,10 +36,8 @@ gamedata/clearlog.php
 # DTS Cache Files
 gamedata/bak/
 gamedata/templates/
-templates/default/areainfo.htm
 templates/default/lastgb.htm
 templates/default/lastnews.htm
-templates/default/move.htm
 
 # PSD Material
 *.psd

command.php

@@ -599,7 +599,7 @@ if($hp <= 0) {
 
 
 if(isset($url)){$gamedata['url'] = $url;}
-$gamedata['innerHTML']['pls'] = $plsinfo[$pls];
+$gamedata['innerHTML']['pls'] = (!isset($plsinfo[$pls]) && isset($hplsinfo[$pgroup])) ? $hplsinfo[$pgroup][$pls] : $plsinfo[$pls];
 $gamedata['innerHTML']['anum'] = $alivenum;
 
 ob_clean();

gamedata/cache/resources_1.php

@@ -110,43 +110,46 @@ $killmsginfo = Array(
 	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 => '独自脱离');
+$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 => '独自脱离'
+	);
 $lwinfo = Array(
 	0 => '',
 	1 => '任务执行成功率下降，重新计算成功率。',
@@ -1254,6 +1257,25 @@ $plsinfo = Array(
 	33=>'雏菊之丘',
 	34=>'英灵殿'
 );
+$hplsinfo = Array
+(
+	# 隐藏地点列表。位于哪组隐藏地点是通过使用players表内字段'pgroup'判断的。隐藏地点的编号不能与标准地点编号重复。
+	# 0是标准地图组。另附：254号被我用来扔销毁过的尸体了……如果登记成一个地图的话，倒也不会在里面摸到尸体，但是……怎么说呢……阴气太重了！
+	# TODO：还有一个大工程没做：只能听到同一地图组内的声音信息。现在先偷懒设置成隐藏地图内不会产生声音了。
+	1 => Array
+	(
+		101 => '测试地图1A',
+		102 => '测试地图2A',
+		103 => '测试地图3A',
+	),
+	2 => Array
+	(
+		111 => '测试地图1B',
+		112 => '测试地图2B',
+		113 => '测试地图3B',
+		114 => '测试地图4B',
+	),
+);
 $xyinfo = Array(
 	0=>'B-2',
 	1=>'A-6',
@@ -1290,6 +1312,7 @@ $xyinfo = Array(
 	32=>'J-2',
 	33=>'F-4',
 	34=>'J-10',
+	'hidden'=>'■-■',
 );
 $areainfo = Array
 	(
@@ -1328,6 +1351,9 @@ $areainfo = Array
 	32=>"最近突然在地平线远端出现的第二座大型建筑，<BR>感觉有种不祥的气息……<br>",
 	33=>"风祭森林的最深处。<BR>被盛开的雏菊花覆盖着的山丘。<BR>山丘上貌似有个身影坐着，<BR>还是离她远一点为妙。<BR>",
 	34=>"总而言之这里就是英灵殿了。<BR>",
+	101 => '位于狭窄甬道两侧的灯光随着你的步调依盏亮起……又在你身后悄然熄灭。回过神来时，你已置身于一片黑暗中了。<BR>',
+	102 => '空旷的大厅内，零星竖立着几根残破不堪的支撑柱。<BR>不知是不是错觉……你感到有什么东西隐藏在立柱背后的阴影里。<BR>',
+	103 => '敞开的穹顶从夜空接引下一束清冷月光。<br>在月光映照下，你的前方已是一片坦途。<br>',
 );
 
 

gamedata/sql/players.sql

@@ -35,6 +35,7 @@ CREATE TABLE bra_players (
   mss mediumint unsigned NOT NULL default '0',
   att mediumint unsigned NOT NULL default '0',
   def mediumint unsigned NOT NULL default '0',
+  pgroup tinyint unsigned NOT NULL DEFAULT '0',
   pls tinyint unsigned NOT NULL default '0',
   lvl tinyint unsigned NOT NULL default '0',
   `exp` smallint unsigned NOT NULL default '0',
@@ -136,17 +137,12 @@ CREATE TABLE bra_players (
   debuffb int(10) NOT NULL default '0',
   debuffc int(10) NOT NULL default '0',
   vcode char(1) not null default '',
-  gemstate tinyint(3) unsigned NOT NULL DEFAULT '0',
-  gemname char(30) NOT NULL default '',
-  gempower char(5) not null default '0',
-  gemexp smallint unsigned NOT NULL default '0',
-  gemlvl tinyint unsigned NOT NULL default '0',
-  clbpara text NOT NULL,
   statusa int(10) NOT NULL default '0',
   statusb int(10) NOT NULL default '0',
   statusc int(10) NOT NULL default '0',
   statusd int(10) NOT NULL default '0',
   statuse int(10) NOT NULL default '0',
+  clbpara text NOT NULL,
   clbstatusa int(10) NOT NULL default '0',
   clbstatusb int(10) NOT NULL default '0',
   clbstatusc int(10) NOT NULL default '0',

include/admin/npcmng.php

@@ -114,12 +114,20 @@ if($command == 'kill' || $command == 'live' || $command == 'del') {
 		if(!$npc) {
 			$cmd_info = "找不到角色 ".$npcdata[$no]['name']." 。";
 		}else{
+			$npc['str_clbpara'] = '';
+			if(isset($npc['clbpara'])) $npc['str_clbpara'] = $npc['clbpara'];
 			$command = 'check';
 		}
 	}
 } elseif($command == 'submitedit') {
-	if(is_array($clbpara)) $clbpara = json_encode($clbpara);
-	$db->query("UPDATE {$tablepre}players SET gd='$gd',icon='$icon',club='$club',sNo='$sNo',hp='$hp',mhp='$mhp',sp='$sp',msp='$msp',att='$att',def='$def',pls='$pls',lvl='$lvl',exp='$exp',clbstatusa='$clbstatusa',clbstatusb='$clbstatusb',clbstatusc='$clbstatusc',clbstatusd='$clbstatusd',clbstatuse='$clbstatuse',clbpara='$clbpara',money='$money',bid='$bid',inf='$inf',rage='$rage',pose='$pose',tactic='$tactic',killnum='$killnum',wp='$wp',wk='$wk',wg='$wg',wc='$wc',wd='$wd',wf='$wf',teamID='$teamID',teamPass='$teamPass',wep='$wep',wepk='$wepk',wepe='$wepe',weps='$weps',wepsk='$wepsk',arb='$arb',arbk='$arbk',arbe='$arbe',arbs='$arbs',arbsk='$arbsk',arh='$arh',arhk='$arhk',arhe='$arhe',arhs='$arhs',arhsk='$arhsk',ara='$ara',arak='$arak',arae='$arae',aras='$aras',arask='$arask',arf='$arf',arfk='$arfk',arfe='$arfe',arfs='$arfs',arfsk='$arfsk',art='$art',artk='$artk',arte='$arte',arts='$arts',artsk='$artsk',itm0='$itm0',itmk0='$itmk0',itme0='$itme0',itms0='$itms0',itmsk0='$itmsk0',itm1='$itm1',itmk1='$itmk1',itme1='$itme1',itms1='$itms1',itmsk1='$itmsk1',itm2='$itm2',itmk2='$itmk2',itme2='$itme2',itms2='$itms2',itmsk2='$itmsk2',itm3='$itm3',itmk3='$itmk3',itme3='$itme3',itms3='$itms3',itmsk3='$itmsk3',itm4='$itm4',itmk4='$itmk4',itme4='$itme4',itms4='$itms4',itmsk4='$itmsk4',itm5='$itm5',itmk5='$itmk5',itme5='$itme5',itms5='$itms5',itmsk5='$itmsk5',itm6='$itm6',itmk6='$itmk6',itme6='$itme6',itms6='$itms6',itmsk6='$itmsk6' where pid='$pid'");
+	if(isset($str_clbpara))
+	{
+		$clbpara = Array();
+		$tmp_clbpara = json_decode(htmlspecialchars_decode($str_clbpara),1);
+		foreach($tmp_clbpara as $key=>$res) $clbpara[$key] = $res;
+		$clbpara = json_encode($clbpara);
+	}
+	$db->query("UPDATE {$tablepre}players SET gd='$gd',icon='$icon',club='$club',sNo='$sNo',hp='$hp',mhp='$mhp',sp='$sp',msp='$msp',att='$att',def='$def',pgroup='$pgroup',pls='$pls',lvl='$lvl',exp='$exp',clbstatusa='$clbstatusa',clbstatusb='$clbstatusb',clbstatusc='$clbstatusc',clbstatusd='$clbstatusd',clbstatuse='$clbstatuse',clbpara='$clbpara',money='$money',bid='$bid',inf='$inf',rage='$rage',pose='$pose',tactic='$tactic',killnum='$killnum',wp='$wp',wk='$wk',wg='$wg',wc='$wc',wd='$wd',wf='$wf',teamID='$teamID',teamPass='$teamPass',wep='$wep',wepk='$wepk',wepe='$wepe',weps='$weps',wepsk='$wepsk',arb='$arb',arbk='$arbk',arbe='$arbe',arbs='$arbs',arbsk='$arbsk',arh='$arh',arhk='$arhk',arhe='$arhe',arhs='$arhs',arhsk='$arhsk',ara='$ara',arak='$arak',arae='$arae',aras='$aras',arask='$arask',arf='$arf',arfk='$arfk',arfe='$arfe',arfs='$arfs',arfsk='$arfsk',art='$art',artk='$artk',arte='$arte',arts='$arts',artsk='$artsk',itm0='$itm0',itmk0='$itmk0',itme0='$itme0',itms0='$itms0',itmsk0='$itmsk0',itm1='$itm1',itmk1='$itmk1',itme1='$itme1',itms1='$itms1',itmsk1='$itmsk1',itm2='$itm2',itmk2='$itmk2',itme2='$itme2',itms2='$itms2',itmsk2='$itmsk2',itm3='$itm3',itmk3='$itmk3',itme3='$itme3',itms3='$itms3',itmsk3='$itmsk3',itm4='$itm4',itmk4='$itmk4',itme4='$itme4',itms4='$itms4',itmsk4='$itmsk4',itm5='$itm5',itmk5='$itmk5',itme5='$itme5',itms5='$itms5',itmsk5='$itmsk5',itm6='$itm6',itmk6='$itmk6',itme6='$itme6',itms6='$itms6',itmsk6='$itmsk6' where pid='$pid'");
 	if(!$db->affected_rows()){
 		$cmd_info = "无法修改角色 $name";
 	} else {
@@ -132,7 +140,9 @@ include template('admin_npcmng');
 
 
 function dbsearch($start,$checkmode,$checkinfo){
-	global $showlimit,$db,$tablepre,$resultinfo,$cmd_info,$plsinfo;
+	global $showlimit,$db,$tablepre,$resultinfo,$cmd_info,$plsinfo,$hplsinfo;
+	//登记非功能性地点信息时合并隐藏地点
+	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 	$limitstr = " LIMIT $start,$showlimit";
 	if(($checkmode == 'name')&&($checkinfo)) {
 		$result = $db->query("SELECT * FROM {$tablepre}players WHERE name LIKE '%{$checkinfo}%' AND type>'0'".$limitstr);

include/admin/pcmng.php

@@ -117,12 +117,20 @@ if($command == 'kill' || $command == 'live' || $command == 'del') {
 		if(!$pc) {
 			$cmd_info = "找不到角色 ".$pcdata[$no]['name']." 。";
 		}else{
+			$pc['str_clbpara'] = '';
+			if(isset($pc['clbpara'])) $pc['str_clbpara'] = $pc['clbpara'];
 			$command = 'check';
 		}
 	}
 } elseif($command == 'submitedit') {
-	if(is_array($clbpara)) $clbpara = json_encode($clbpara);
-	$db->query("UPDATE {$tablepre}players SET gd='$gd',icon='$icon',club='$club',sNo='$sNo',hp='$hp',mhp='$mhp',sp='$sp',msp='$msp',ss='$ss',mss='$mss',att='$att',def='$def',pls='$pls',achievement='$achievement',exp='$exp',clbstatusa='$clbstatusa',clbstatusb='$clbstatusb',clbstatusc='$clbstatusc',clbstatusd='$clbstatusd',clbstatuse='$clbstatuse',clbpara='$clbpara',money='$money',bid='$bid',inf='$inf',rage='$rage',pose='$pose',tactic='$tactic',killnum='$killnum',wp='$wp',wk='$wk',wg='$wg',wc='$wc',wd='$wd',wf='$wf',teamID='$teamID',achievement='$achievement',wep='$wep',wepk='$wepk',wepe='$wepe',weps='$weps',wepsk='$wepsk',arb='$arb',arbk='$arbk',arbe='$arbe',arbs='$arbs',arbsk='$arbsk',arh='$arh',arhk='$arhk',arhe='$arhe',arhs='$arhs',arhsk='$arhsk',ara='$ara',arak='$arak',arae='$arae',aras='$aras',arask='$arask',arf='$arf',arfk='$arfk',arfe='$arfe',arfs='$arfs',arfsk='$arfsk',art='$art',artk='$artk',arte='$arte',arts='$arts',artsk='$artsk',itm0='$itm0',itmk0='$itmk0',itme0='$itme0',itms0='$itms0',itmsk0='$itmsk0',itm1='$itm1',itmk1='$itmk1',itme1='$itme1',itms1='$itms1',itmsk1='$itmsk1',itm2='$itm2',itmk2='$itmk2',itme2='$itme2',itms2='$itms2',itmsk2='$itmsk2',itm3='$itm3',itmk3='$itmk3',itme3='$itme3',itms3='$itms3',itmsk3='$itmsk3',itm4='$itm4',itmk4='$itmk4',itme4='$itme4',itms4='$itms4',itmsk4='$itmsk4',itm5='$itm5',itmk5='$itmk5',itme5='$itme5',itms5='$itms5',itmsk5='$itmsk5',itm6='$itm6',itmk6='$itmk6',itme6='$itme6',itms6='$itms6',itmsk6='$itmsk6' where pid='$pid'");
+	if(isset($str_clbpara))
+	{
+		$clbpara = Array();
+		$tmp_clbpara = json_decode(htmlspecialchars_decode($str_clbpara),1);
+		foreach($tmp_clbpara as $key=>$res) $clbpara[$key] = $res;
+		$clbpara = json_encode($clbpara);
+	}
+	$db->query("UPDATE {$tablepre}players SET gd='$gd',icon='$icon',club='$club',sNo='$sNo',hp='$hp',mhp='$mhp',sp='$sp',msp='$msp',ss='$ss',mss='$mss',att='$att',def='$def',pgroup='$pgroup',pls='$pls',achievement='$achievement',exp='$exp',clbstatusa='$clbstatusa',clbstatusb='$clbstatusb',clbstatusc='$clbstatusc',clbstatusd='$clbstatusd',clbstatuse='$clbstatuse',clbpara='$clbpara',money='$money',bid='$bid',inf='$inf',rage='$rage',pose='$pose',tactic='$tactic',killnum='$killnum',wp='$wp',wk='$wk',wg='$wg',wc='$wc',wd='$wd',wf='$wf',teamID='$teamID',achievement='$achievement',wep='$wep',wepk='$wepk',wepe='$wepe',weps='$weps',wepsk='$wepsk',arb='$arb',arbk='$arbk',arbe='$arbe',arbs='$arbs',arbsk='$arbsk',arh='$arh',arhk='$arhk',arhe='$arhe',arhs='$arhs',arhsk='$arhsk',ara='$ara',arak='$arak',arae='$arae',aras='$aras',arask='$arask',arf='$arf',arfk='$arfk',arfe='$arfe',arfs='$arfs',arfsk='$arfsk',art='$art',artk='$artk',arte='$arte',arts='$arts',artsk='$artsk',itm0='$itm0',itmk0='$itmk0',itme0='$itme0',itms0='$itms0',itmsk0='$itmsk0',itm1='$itm1',itmk1='$itmk1',itme1='$itme1',itms1='$itms1',itmsk1='$itmsk1',itm2='$itm2',itmk2='$itmk2',itme2='$itme2',itms2='$itms2',itmsk2='$itmsk2',itm3='$itm3',itmk3='$itmk3',itme3='$itme3',itms3='$itms3',itmsk3='$itmsk3',itm4='$itm4',itmk4='$itmk4',itme4='$itme4',itms4='$itms4',itmsk4='$itmsk4',itm5='$itm5',itmk5='$itmk5',itme5='$itme5',itms5='$itms5',itmsk5='$itmsk5',itm6='$itm6',itmk6='$itmk6',itme6='$itme6',itms6='$itms6',itmsk6='$itmsk6' where pid='$pid'");
 	if(!$db->affected_rows()){
 		$cmd_info = "无法修改角色 $name";
 	} else {
@@ -136,7 +144,9 @@ include template('admin_pcmng');
 
 
 function dbsearch($start,$checkmode,$checkinfo){
-	global $showlimit,$db,$tablepre,$resultinfo,$cmd_info;
+	global $showlimit,$db,$tablepre,$resultinfo,$cmd_info,$plsinfo,$hplsinfo;
+	//登记非功能性地点信息时合并隐藏地点
+	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 	$limitstr = " LIMIT $start,$showlimit";
 	if(($checkmode == 'name')&&($checkinfo)) {
 		$result = $db->query("SELECT * FROM {$tablepre}players WHERE name LIKE '%{$checkinfo}%' AND type='0'".$limitstr);

include/game.func.php

@@ -422,7 +422,7 @@ function destory_corpse(&$edata)
 {
 	if($edata)
 	{
-		$edata['state'] = 16; $edata['hp'] = 0; $edata['money'] = 0; $edata['pls'] = 99;
+		$edata['state'] = 16; $edata['hp'] = 0; $edata['money'] = 0; $edata['pls'] = 254;
 		$edata['weps'] = 0;$edata['arbs'] = 0;$edata['arhs'] = 0;$edata['aras'] = 0;$edata['arfs'] = 0;$edata['arts'] = 0;
 		$edata['itms0'] = 0;$edata['itms1'] = 0;$edata['itms2'] = 0;$edata['itms3'] = 0;$edata['itms4'] = 0;$edata['itms5'] = 0;$edata['itms6'] = 0;
 		player_save($edata);

include/game/battle.func.php

@@ -176,6 +176,9 @@ function senditem(){
 
 	$edata = $db->fetch_array($result);
 	if($edata['pls'] != $pls) {
+		//登记非功能性地点信息时合并隐藏地点
+		global $hplsinfo;
+		foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 		$log .= '<span class="yellow">'.$edata['name'].'</span>已经离开了<span class="yellow">'.$plsinfo[$pls].'</span>。<br>';
 		$mode = 'command';
 		$action = '';

include/game/combat.func.php

@@ -57,6 +57,9 @@ function combat($active = 1, $wep_kind = '') {
 		$edata = $db->fetch_array ( $result );
 		
 		if ($edata ['pls'] != $pls) {
+			//登记非功能性地点信息时合并隐藏地点
+			global $hplsinfo;
+			foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 			$log .= "<span class=\"yellow\">" . $edata ['name'] . "</span>已经离开了<span class=\"yellow\">$plsinfo[$pls]</span>。<br>";
 			$action = '';
 			$mode = 'command';
@@ -2116,6 +2119,11 @@ function exprgup(&$lv_a, $lv_d, &$exp, $isplayer, &$rg) {
 }
 
 function addnoise($wp_kind, $wsk, $ntime, $npls, $nid1, $nid2, $nmode) {
+	
+	//在隐藏地图内不会传出声音信息
+	global $plsinfo;
+	if(!array_key_exists($npls,$plsinfo)) return;
+	
 	if ((($wp_kind == 'G') && (strpos ( $wsk, 'S' ) === false)) || ($wp_kind == 'F')) {
 		global $noisetime, $noisepls, $noiseid, $noiseid2, $noisemode;
 		$noisetime = $ntime;

include/game/depot.func.php

@@ -41,7 +41,7 @@
 			$log.="无法转移安全箱权限！可能是对方的权限等级比你高。<br>";
 			return;
 		}
-		if(count(depot_getlist($n,$t))<=0) 
+		if(count(depot_getlist($tn,$tt))<=0) 
 		{
 			$log.="对方没有在安全箱内存过东西！<br>";
 			return;

include/game/itemplace.func.php

@@ -5,7 +5,9 @@ if (! defined ( 'IN_GAME' )) {
 
 function get_item_place($which)
 {
-	global $plsinfo,$gamecfg;
+	global $plsinfo,$hplsinfo,$gamecfg;
+	//登记非功能性地点信息时合并隐藏地点
+	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 	//获取某物品的获取方式，如刷新地点或商店是否有卖等
 	$result="";
 	$file = config('mapitem',$gamecfg);

include/game/revcombat.func.php

@@ -105,7 +105,10 @@
 	function rev_combat(&$pa,&$pd,$active,$wep_kind='') 
 	{
 		global $log,$mode,$main,$cmd,$action,$db,$tablepre,$now,$nosta,$hdamage,$hplayer;
-		global $infinfo,$plsinfo,$battle_title,$message;
+		global $infinfo,$plsinfo,$hplsinfo,$battle_title,$message;
+
+		//登记非功能性地点信息时合并隐藏地点
+		foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 
 		$battle_title = '战斗发生';
 

include/game/search.func.php

@@ -5,23 +5,44 @@ if(!defined('IN_GAME')) {
 }
 
 function move($moveto = 99) {
-	global $lvl,$log,$pls,$plsinfo,$inf,$hp,$mhp,$sp,$def,$club,$arealist,$areanum,$hack,$areainfo,$gamestate,$pose,$weather;
+	global $lvl,$log,$pls,$pgroup,$plsinfo,$hplsinfo,$inf,$hp,$mhp,$sp,$def,$club,$arealist,$areanum,$hack,$areainfo,$gamestate,$pose,$weather;
 	global $gamestate;
 	$f=false;
 	if ($pls==34 && $gamestate<50) $f=true;
 	if ($moveto==34 && $gamestate<50) $f=true;
 	$plsnum = sizeof($plsinfo);
-	if(($moveto == 'main')||($moveto < 0 )||($moveto >= $plsnum)){
-		$log .= '请选择正确的移动地点。<br>';
-		return;
-	} elseif($pls == $moveto){
+
+	if($pls == $moveto)
+	{
 		$log .= '相同地点，不需要移动。<br>';
 		return;
-	} elseif(array_search($moveto,$arealist) <= $areanum && !$hack){
-		$log .= $plsinfo[$moveto].'是禁区，还是离远点吧！<br>';
-		return;
 	}
 
+	if(!isset($plsinfo[$pls]) && isset($hplsinfo[$pgroup]))
+	{
+		//玩家位于隐藏地点组内，不能通过常规移动方式回到标准地点，也不能移动到其他隐藏地点组
+		if(!array_key_exists($moveto,$hplsinfo[$pgroup]))
+		{
+			$log .= "地图上没有{$hplsinfo[$pgroup][$moveto]}啊？<br>";
+			return;
+		}
+		$hpls_flag = true;
+	}
+	else
+	{
+		//玩家位于标准地点组内
+		if(($moveto == 'main')||($moveto < 0 )||($moveto >= $plsnum))
+		{
+			$log .= '请选择正确的移动地点。<br>';
+			return;
+		} 
+		elseif(array_search($moveto,$arealist) <= $areanum && !$hack)
+		{
+			$log .= $plsinfo[$moveto].'是禁区，还是离远点吧！<br>';
+			return;
+		}
+		$hpls_flag = false;
+	}
 
 	//足部受伤，20；足球社，12；冻伤，30；正常，15；去gamecfg里改吧
 	$movesp = 15;
@@ -50,9 +71,18 @@ function move($moveto = 99) {
 	$sp -= $movesp;
 	$moved = false;
 	if($weather == 11) {//龙卷风
-		if($hack){$pls = rand(0,sizeof($plsinfo)-1);}
-		else {$pls = rand($areanum+1,sizeof($plsinfo)-1);$pls=$arealist[$pls];}
-		$log = ($log . "龙卷风把你吹到了<span class=\"yellow\">$plsinfo[$pls]</span>！<br>");
+		if($hpls_flag)
+		{
+			$pls = array_rand($hplsinfo[$pgroup]);
+			$moveto_info = $hplsinfo[$pgroup][$pls];
+		}
+		else 
+		{
+			if($hack){$pls = rand(0,sizeof($plsinfo)-1);}
+			else {$pls = rand($areanum+1,sizeof($plsinfo)-1);$pls=$arealist[$pls];}
+			$moveto_info = $plsinfo[$pls];
+		}
+		$log = ($log . "龙卷风把你吹到了<span class=\"yellow\">$moveto_info</span>！<br>");
 		$moved = true;
 	} elseif($weather == 13) {//冰雹
 		$damage = round($mhp/12) + rand(0,20);
@@ -125,8 +155,10 @@ function move($moveto = 99) {
 		}
 	} 
 	if(!$moved) {
+		if(!$hpls_flag) $pgroup = 0;
 		$pls = $moveto;
-		$log .= "消耗<span class=\"yellow\">{$movesp}</span>点体力，移动到了<span class=\"yellow\">$plsinfo[$pls]</span>。<br>";
+		$moveto_info = $hpls_flag ? $hplsinfo[$pgroup][$pls] : $plsinfo[$pls];
+		$log .= "消耗<span class=\"yellow\">{$movesp}</span>点体力，移动到了<span class=\"yellow\">{$moveto_info}</span>。<br>";
 	}else{$f=false;}
 	
 	
@@ -170,12 +202,21 @@ function move($moveto = 99) {
 }
 
 function search(){
-	global $lvl,$log,$pls,$arealist,$areanum,$hack,$plsinfo,$club,$sp,$gamestate,$pose,$weather,$hp,$mhp,$def,$inf;
+	global $lvl,$log,$pls,$pgroup,$arealist,$areanum,$hack,$plsinfo,$hplsinfo,$club,$sp,$gamestate,$pose,$weather,$hp,$mhp,$def,$inf;
 	
 	
-	if(array_search($pls,$arealist) <= $areanum && !$hack){
-		$log .= $plsinfo[$pls].'是禁区，还是赶快逃跑吧！<br>';
-		return;
+	if(!isset($plsinfo[$pls]) && isset($hplsinfo[$pgroup]))
+	{
+		$hpls_flag = true;
+	}
+	else 
+	{
+		if(array_search($pls,$arealist) <= $areanum && !$hack)
+		{
+			$log .= $plsinfo[$pls].'是禁区，还是赶快逃跑吧！<br>';
+			return;
+		}
+		$hpls_flag = false;
 	}
 
 	//腕部受伤，20；冻伤：30；侦探社，12；正常，15；改到gamecfg
@@ -203,9 +244,18 @@ function search(){
 	}
 
 	if($weather == 11) {//龙卷风
-		if($hack){$pls = rand(0,sizeof($plsinfo)-1);}
-		else {$pls = rand($areanum+1,sizeof($plsinfo)-1);$pls=$arealist[$pls];}
-		$log = ($log . "龙卷风把你吹到了<span class=\"yellow\">$plsinfo[$pls]</span>！<br>");
+		if($hpls_flag)
+		{
+			$pls = array_rand($hplsinfo[$pgroup]);
+			$moveto_info = $hplsinfo[$pgroup][$pls];
+		}
+		else 
+		{
+			if($hack){$pls = rand(0,sizeof($plsinfo)-1);}
+			else {$pls = rand($areanum+1,sizeof($plsinfo)-1);$pls=$arealist[$pls];}
+			$moveto_info = $plsinfo[$pls];
+		}
+		$log = ($log . "龙卷风把你吹到了<span class=\"yellow\">$moveto_info</span>！<br>");
 		$moved = true;
 	} elseif($weather == 13) {//冰雹
 		$damage = round($mhp/12) + rand(0,20);

include/game/song.inc.php

  <?php
  //require_once './include/common.inc.php';
  function sing($sn){
-	global $log,$msg,$now,$pls,$name,$nick,$plsinfo,$ss,$mss,$noiseinfo,$arte;
+	global $log,$msg,$now,$pls,$name,$nick,$plsinfo,$hplsinfo,$ss,$mss,$noiseinfo,$arte;
 	global $db,$tablepre;
 	global $att,$def;
 	global $wep,$wepk,$weps,$wepes,$wepsk;
 	global $rp;
 	
+	//登记非功能性地点信息时合并隐藏地点
+	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
+
 	//$log.=$sn.'_'.$now.'_'.$pls.'_'.$name."<br>";
 	$r=$arte;
 	include_once GAME_ROOT.'./include/game/combat.func.php';

include/global.func.php

@@ -373,11 +373,15 @@ function save_combatinfo(){
 }
 
 function getchat($last,$team='',$limit=0) {
-	global $db,$tablepre,$chatlimit,$chatinfo,$plsinfo;
+	global $db,$tablepre,$chatlimit,$chatinfo,$plsinfo,$hplsinfo;
 	$limit = $limit ? $limit : $chatlimit;
 	$result = $db->query("SELECT * FROM {$tablepre}chat WHERE cid>'$last' AND (type!='1' OR (type='1' AND recv='$team')) ORDER BY cid desc LIMIT $limit");
 	$chatdata = Array('lastcid' => $last, 'msg' => array());
 	if(!$db->num_rows($result)){$chatdata = array('lastcid' => $last, 'msg' => '');return $chatdata;}
+
+	//登记非功能性地点信息时合并隐藏地点
+	$tplsinfo = $plsinfo;
+	foreach($hplsinfo as $hgroup=>$hpls) $tplsinfo += $hpls;
 	
 	while($chat = $db->fetch_array($result)) {
 		//if(!$chatdata['lastcid']){$chatdata['lastcid'] = $chat['cid'];}
@@ -391,9 +395,9 @@ function getchat($last,$team='',$limit=0) {
 			$msg = "<span class=\"lime\">【{$chatinfo[$chat['type']]}】{$chat['send']}：{$chat['msg']}".date("\(H:i:s\)",$chat['time']).'</span><br>';
 		} elseif($chat['type'] == '3') {
 			if ($chat['msg']){
-				$msg = "<span class=\"red\">【{$plsinfo[$chat['recv']]}】{$chat['send']}：{$chat['msg']} ".date("\(H:i:s\)",$chat['time']).'</span><br>';
+				$msg = "<span class=\"red\">【{$tplsinfo[$chat['recv']]}】{$chat['send']}：{$chat['msg']} ".date("\(H:i:s\)",$chat['time']).'</span><br>';
 			} else {
-				$msg = "<span class=\"red\">【{$plsinfo[$chat['recv']]}】{$chat['send']} 什么都没说就死去了 ".date("\(H:i:s\)",$chat['time']).'</span><br>';
+				$msg = "<span class=\"red\">【{$tplsinfo[$chat['recv']]}】{$chat['send']} 什么都没说就死去了 ".date("\(H:i:s\)",$chat['time']).'</span><br>';
 			}
 		} elseif($chat['type'] == '4') {
 			$msg = "<span class=\"yellow\">【{$chatinfo[$chat['type']]}】{$chat['msg']}".date("\(H:i:s\)",$chat['time']).'</span><br>';

include/news.func.php

@@ -6,7 +6,7 @@ if(!defined('IN_GAME')) {
 
 
 function  nparse_news($start = 0, $range = 0  ){//$type = '') {
-	global $week,$nowep,$db,$tablepre,$lwinfo,$plsinfo,$wthinfo,$typeinfo,$exdmginf,$newslimit;
+	global $week,$nowep,$db,$tablepre,$lwinfo,$plsinfo,$hplsinfo,$wthinfo,$typeinfo,$exdmginf,$newslimit;
 	//$file = $file ? $file : $newsfile;	
 	//$ninfo = openfile($file);
 	$range = $range == 0 ? $newslimit : $range ;
@@ -31,6 +31,8 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 			$nday = $day;
 		}
 
+		//登记非功能性地点信息时合并隐藏地点 为什么会有两个news.func.php？？？
+		foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 		//死法（除DN外）：道具名登记在$d上；第四个参数：没有检查到特殊样式的给一个红色
 		if(strpos($news,'death')!==false && $news!=='death28' && isset($d)) $d = parse_itm_desc($d,'m',0,"red");
 		//赠送道具、吃到毒补给、陷阱、改变天气、强化武器、唱歌、打开礼物盒：道具名登记在$c上；

include/system.func.php

@@ -494,7 +494,7 @@ function gameover($time = 0, $mode = '', $winname = '') {
 function movehtm($atime = 0) {
 	global $plsinfo,$arealist,$areanum,$hack,$pls,$xyinfo,$areahour,$areaadd;
 
-	$movehtm = GAME_ROOT.TPLDIR.'/move.htm';
+	/*$movehtm = GAME_ROOT.TPLDIR.'/move.htm';
 	$movedata = '<option value="main">■ 移动 ■<br />';
 
 	foreach($plsinfo as $key => $value) {
@@ -502,15 +502,16 @@ function movehtm($atime = 0) {
 		$movedata .= "<option value=\"$key\"><!--{if \$pls == $key}--><--现在位置--><!--{else}-->$value($xyinfo[$key])<!--{/if}--><br />";
 		}
 	} 
-	writeover($movehtm,$movedata);
+	writeover($movehtm,$movedata);*/
 	
-	$areahtm = GAME_ROOT.TPLDIR.'/areainfo.htm';
+	/*$areahtm = GAME_ROOT.TPLDIR.'/areainfo.htm';
 	$areadata = '<span class="evergreen"><b>现在的禁区是：</b></span>';
 	for($i=0;$i<=$areanum;$i++){
 		$areadata .= '&nbsp;'.$plsinfo[$arealist[$i]];
 	}
-	$areadata .= '<br><span class="evergreen"><b>下回的禁区是：</b></span>';
+	$areadata .= '<br><span class="evergreen"><b>下回的禁区是：</b></span>';*/
 	
+	$areadata = '';
 	if(!$atime){
 		global $areatime;
 		$atime = $areatime;
@@ -551,8 +552,9 @@ function movehtm($atime = 0) {
 			$areadata .= '&nbsp;'.$plsinfo[$arealist[$areanum+$areaadd*2+$i]].'&nbsp;';
 		}
 	}
-	writeover($areahtm,$areadata);
-	return;
+	return $areadata;
+	//writeover($areahtm,$areadata);
+	//return;
 }
 
 function addnpc($type,$sub,$num,$time = 0,$clbstatus=NULL,$aitem=NULL,$apls=NULL) {

itemhelp.php

@@ -23,6 +23,8 @@ if(filemtime($mapitemfile) > filemtime($writefile))
 	$file = config('mapitem',$gamecfg);
 	$itemlist = openfile($file);
 	$in = sizeof($itemlist);
+	//登记非功能性地点信息时合并隐藏地点
+	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
 	for($i = 1; $i < $in; $i++) 
 		if(!empty($itemlist[$i]) && strpos($itemlist[$i],',')!==false)
 		{

news.php

@@ -7,7 +7,7 @@ require './include/game.func.php';
 //$t_s=getmicrotime();
 //require_once GAME_ROOT.'./include/JSON.php';
 require_once GAME_ROOT.'./include/news.func.php';
-
+include_once GAME_ROOT.'./include/system.func.php';
 
 $newsfile = GAME_ROOT.'./gamedata/newsinfo.php';
 $newshtm = GAME_ROOT.TPLDIR.'/newsinfo.htm';

templates/default/admin_npcmng.htm

@@ -255,8 +255,8 @@
 			<td><input size="20" type="text" name="itms6" value="{$npc['itms6']}" maxlength="20"></td>
 		</tr>
 		<tr>
-			<td></td>
-			<td></td>
+			<td>位置组</td>
+			<td><input size="20" type="text" name="pgroup" value="{$npc['pgroup']}" maxlength="20"></td>
 			<td>子类型</td>
 			<td><input size="20" type="text" name="artsk" value="{$npc['artsk']}" maxlength="20"></td>
 			<td>子类型</td>
@@ -280,7 +280,7 @@
 		</tr>
 		<tr>
 			<td>社团参数集</td>
-			<td><textarea cols="20" rows="4" style="overflow:auto" name="clbpara">{$npc['clbpara']}</textarea></td>
+			<td><textarea cols="20" rows="4" style="overflow:auto" name="str_clbpara">{$npc['str_clbpara']}</textarea></td>
 		</tr>
 	</table>
 	<input type="submit" value="修改NPC数值" onclick="$('command').value = 'submitedit'">

templates/default/admin_pcmng.htm

@@ -265,8 +265,8 @@
 		<tr>
 			<td>最大歌魂</td>
 			<td><input size="20" type="text" name="mss" value="{$pc['mss']}" maxlength="20"></td>
-			<td></td>
-			<td></td>
+			<td>位置组</td>
+			<td><input size="20" type="text" name="pgroup" value="{$pc['pgroup']}" maxlength="20"></td>
 			<td></td>
 			<td></td>
 		</tr>
@@ -288,7 +288,7 @@
 		</tr>
 		<tr>
 			<td>社团参数集</td>
-			<td><textarea cols="20" rows="4" style="overflow:auto" name="clbpara">{$pc['clbpara']}</textarea></td>
+			<td><textarea cols="20" rows="4" style="overflow:auto" name="str_clbpara">{$pc['str_clbpara']}</textarea></td>
 		</tr>
 	</table>
 	<input type="submit" value="修改玩家数值" onclick="$('command').value = 'submitedit'">

templates/default/areainfo.htm

-<span class="evergreen"><b>现在的禁区是：</b></span>&nbsp;无月之影&nbsp;精灵中心&nbsp;光坂高校&nbsp;守矢神社&nbsp;端点<br><span class="evergreen"><b>下回的禁区是：</b></span><b>13时30分：</b> &nbsp;英灵殿&nbsp;&nbsp;秋之镇&nbsp;&nbsp;键刃墓场&nbsp;&nbsp;RF高校&nbsp;；<b>14时10分：</b> &nbsp;夏之镇&nbsp;&nbsp;圣Gradius学园&nbsp;&nbsp;雏菊之丘&nbsp;&nbsp;三体星&nbsp;；<b>14时50分：</b> &nbsp;风祭森林&nbsp;&nbsp;天使队移动格纳库&nbsp;&nbsp;和田町研究所&nbsp;&nbsp;初始之树&nbsp;
+<span class="evergreen b"><b>现在的禁区是：</b></span>
\ No newline at end of file
+<!--{loop range(0,$areanum) $i}-->$plsinfo[$arealist[$i]]&nbsp;<!--{/loop}-->
+<br><span class="evergreen b"><b>下回的禁区是：</b></span>
+<!--{eval $areadata = movehtm();}-->
+$areadata
\ No newline at end of file

templates/default/command.htm

@@ -3,7 +3,7 @@
 <input type="hidden" id="subcmd" name="subcmd" value="">
 现在想要做什么？<br /><br />
 
-<input type="button" class="cmdbutton" id="search" name="search" value="搜寻" onclick="$('command').value='search';postCmd('gamecmd','command.php');this.disabled=true;" <!--{if array_search($pls,$arealist) <= $areanum && !$hack}-->disabled<!--{/if}-->>
+<input type="button" class="cmdbutton" id="search" name="search" value="搜寻" onclick="$('command').value='search';postCmd('gamecmd','command.php');this.disabled=true;" <!--{if (array_search($pls,$arealist) <= $areanum && !$hack) && (isset($plsinfo[$pls]) && !isset($hplsinfo[$pgroup]))}-->disabled<!--{/if}-->>
 <select id="moveto" name="moveto" onchange="$('command').value='move';postCmd('gamecmd','command.php');this.disabled=true;">
 {template move}
 </select>

templates/default/game.htm

@@ -16,7 +16,12 @@
 				<tr>
 					<td height="20" class="b1">
 						<div>
-							<span class="yellow" id="pls">$plsinfo[$pls]</span>【<span class="red">剩余：<span id="anum">$alivenum</span>人</span>】
+							<!--{if !isset($plsinfo[$pls]) && isset($hplsinfo[$pgroup])}-->
+								<span class="yellow" id="pls">$hplsinfo[$pgroup][$pls]</span>
+							<!--{else}--> 
+								<span class="yellow" id="pls">$plsinfo[$pls]</span>
+							<!--{/if}-->
+							【<span class="red">剩余：<span id="anum">$alivenum</span>人</span>】
 						</div>
 					</td>
 				</tr>

templates/default/move.htm

-<option value="main">■ 移动 ■<br /><option value="2"><!--{if $pls == 2}--><--现在位置--><!--{else}-->RF高校(H-3)<!--{/if}--><br /><option value="3"><!--{if $pls == 3}--><--现在位置--><!--{else}-->雪之镇(B-6)<!--{/if}--><br /><option value="4"><!--{if $pls == 4}--><--现在位置--><!--{else}-->索拉利斯(F-10)<!--{/if}--><br /><option value="5"><!--{if $pls == 5}--><--现在位置--><!--{else}-->指挥中心(D-6)<!--{/if}--><br /><option value="6"><!--{if $pls == 6}--><--现在位置--><!--{else}-->梦幻馆(H-6)<!--{/if}--><br /><option value="7"><!--{if $pls == 7}--><--现在位置--><!--{else}-->清水池(F-3)<!--{/if}--><br /><option value="8"><!--{if $pls == 8}--><--现在位置--><!--{else}-->白穗神社(E-10)<!--{/if}--><br /><option value="9"><!--{if $pls == 9}--><--现在位置--><!--{else}-->墓地(J-4)<!--{/if}--><br /><option value="10"><!--{if $pls == 10}--><--现在位置--><!--{else}-->麦斯克林(I-8)<!--{/if}--><br /><option value="11"><!--{if $pls == 11}--><--现在位置--><!--{else}-->对天使用作战本部(D-8)<!--{/if}--><br /><option value="12"><!--{if $pls == 12}--><--现在位置--><!--{else}-->夏之镇(F-9)<!--{/if}--><br /><option value="13"><!--{if $pls == 13}--><--现在位置--><!--{else}-->三体星(H-4)<!--{/if}--><br /><option value="16"><!--{if $pls == 16}--><--现在位置--><!--{else}-->常磐森林(I-2)<!--{/if}--><br /><option value="17"><!--{if $pls == 17}--><--现在位置--><!--{else}-->常磐台中学(A-5)<!--{/if}--><br /><option value="18"><!--{if $pls == 18}--><--现在位置--><!--{else}-->秋之镇(G-4)<!--{/if}--><br /><option value="20"><!--{if $pls == 20}--><--现在位置--><!--{else}-->春之镇(I-7)<!--{/if}--><br /><option value="21"><!--{if $pls == 21}--><--现在位置--><!--{else}-->圣Gradius学园(F-7)<!--{/if}--><br /><option value="22"><!--{if $pls == 22}--><--现在位置--><!--{else}-->初始之树(J-6)<!--{/if}--><br /><option value="23"><!--{if $pls == 23}--><--现在位置--><!--{else}-->幻想世界(A-8)<!--{/if}--><br /><option value="24"><!--{if $pls == 24}--><--现在位置--><!--{else}-->永恒的世界(C-9)<!--{/if}--><br /><option value="25"><!--{if $pls == 25}--><--现在位置--><!--{else}-->妖精驿站(D-2)<!--{/if}--><br /><option value="26"><!--{if $pls == 26}--><--现在位置--><!--{else}-->键刃墓场(A-1)<!--{/if}--><br /><option value="27"><!--{if $pls == 27}--><--现在位置--><!--{else}-->花菱商厦(F-8)<!--{/if}--><br /><option value="28"><!--{if $pls == 28}--><--现在位置--><!--{else}-->FARGO前基地(E-1)<!--{/if}--><br /><option value="29"><!--{if $pls == 29}--><--现在位置--><!--{else}-->风祭森林(F-5)<!--{/if}--><br /><option value="30"><!--{if $pls == 30}--><--现在位置--><!--{else}-->天使队移动格纳库(F-6)<!--{/if}--><br /><option value="31"><!--{if $pls == 31}--><--现在位置--><!--{else}-->和田町研究所(J-1)<!--{/if}--><br /><option value="32"><!--{if $pls == 32}--><--现在位置--><!--{else}-->SCP研究设施(J-2)<!--{/if}--><br /><option value="33"><!--{if $pls == 33}--><--现在位置--><!--{else}-->雏菊之丘(F-4)<!--{/if}--><br /><option value="34"><!--{if $pls == 34}--><--现在位置--><!--{else}-->英灵殿(J-10)<!--{/if}--><br />
+<option value="main">■ 移动 ■</option>
\ No newline at end of file
+<optgroup label="移动地点列表：">
+<!--加载隐藏地点移动列表-->
+<!--{if !isset($plsinfo[$pls]) && isset($hplsinfo[$pgroup])}-->
+	<!--{loop $hplsinfo[$pgroup] $key $value}-->
+			<!--{if $pls == $key}--><optgroup label="■ 现在位置 ■">
+			<!--{else}--><option value="$key">$value($xyinfo['hidden'])</option>
+			<!--{/if}-->
+	<!--{/loop}-->
+<!--加载标准地点可移动列表-->
+<!--{else}--> 
+	<!--{loop $plsinfo $key $value}-->
+		<!--{if (array_search($key,$arealist) > $areanum || $hack)}-->
+			<!--{if $pls == $key}--><optgroup label="■ 现在位置 ■">
+			<!--{else}--><option value="$key">$value($xyinfo[$key])</option>
+			<!--{/if}-->
+		<!--{/if}-->
+	<!--{/loop}-->
+<!--{/if}-->
\ No newline at end of file