Merge branch 'amarillonmc:nachster' into nachster

.gitignore

@@ -82,6 +82,10 @@ vendor
 # env file
 .env
 
+
+# daemon
+daemon*
+
 # 录像文件
 records
 

alive.php

@@ -172,12 +172,19 @@ if($gamblingon){
 							//发news
 							$gbinfo .= "花费{$cost_credits2}切糕购买了{$bnum}份{$iteminfo['item']}。<br>";
 							addnews($now,'gpost',$sponsor_title.' '.$udata['username'],$iteminfo['item'],$bdata['nick'].' '.$bdata['name'],$bdata['pls'],$bnum);
-							//打包快递给快递员 返回新生成的快递员pid
-							$gclb = Array('clbpara'=>Array('sponsor'=>$uid,'post'=>$bet,'postid'=>6),); //记录赞助者的uid、收货方的pid、道具位置
-							$gitem = Array(6,$iteminfo['item'],$iteminfo['itmk'],$iteminfo['itme'],$iteminfo['itms']*$bnum,$iteminfo['itmsk']);//打包快递
-							//include_once GAME_ROOT.'./include/system.func.php';
-							$nid = addnpc($gnpctype,$gnpcsub,1,$now,$gclb,$gitem,$bdata['pls'])[0];
+							
+							# 为快递员NPC添加一些自定义参数
+							$gnpcdata = Array();
+							$gnpcdata['pls'] = $bdata['pls'];
+							$gnpcdata['clbpara'] = Array('sponsor'=>$uid,'post'=>$bet,'postid'=>6);
+							$gnpcdata['itm6'] = $iteminfo['item']; $gnpcdata['itmk6'] = $iteminfo['itmk']; 
+							$gnpcdata['itme6'] = $iteminfo['itme']; $gnpcdata['itms6'] = $iteminfo['itms']*$bnum;
+							$gnpcdata['itmsk6'] = $iteminfo['itmsk'];
+							
+							# 召唤快递员NPC，获取其PID
+							$nid = addnpc($gnpctype,$gnpcsub,1,$now,$gnpcdata)[0];
 							$gbinfo .= "快递员已带着你赞助的商品前往{$bdata['name']}所在的位置！谢谢惠顾~<br>";
+							
 							//存一条发快递记录到gambling表里，一个玩家在快递被接收前不能发第二份快递。防止有人狂买低价商品挤爆players表。
 							//有过投注记录
 							if($gbnum && isset($gbeddata[$udata['uid']])) $db->query("UPDATE {$tablepre}gambling SET bnid='$nid' WHERE uid='$uid'");

api.php

@@ -46,9 +46,9 @@
     if ($tdata['weps'] && $tdata['wepe']) {
       $list[] = array(
         "key" => "wep",
-        "type" => parse_info_desc($tdata['wepk'], 'k'),
-        "name" => $tdata['wep'],
-        "props" => $tdata['wepsk'] ? parse_info_desc($tdata['wepsk'], 'sk', 'wepsk', 1) : '',
+        "type" => parse_kinfo_desc($tdata['wepk'], $tdata['wepsk']),
+        "name" => parse_nameinfo_desc($tdata['wep'],$tdata['horizon']),
+        "props" => $tdata['wepsk'] ? parse_skinfo_desc($tdata['wepsk'], $tdata['wepk'] , 1) : '',
         "quality" => $tdata['wepe'],
         "durability" => $tdata['weps'],
       );
@@ -57,9 +57,9 @@
     if ($tdata['arbs'] && $tdata['arbe']) {
       $list[] = array(
         "key" => "arb",
-        "type" => parse_info_desc($tdata['arbk'], 'k'),
-        "name" => $tdata['arb'],
-        "props" => $tdata['arbsk'] ? parse_info_desc($tdata['arbsk'], 'sk', 'arbsk', 1) : '',
+        "type" => parse_kinfo_desc($tdata['arbk'], $tdata['arbsk']),
+        "name" => parse_nameinfo_desc($tdata['arb'],$tdata['horizon']),
+        "props" => $tdata['arbsk'] ? parse_skinfo_desc($tdata['arbsk'], $tdata['arbk'] , 1) : '',
         "quality" => $tdata['arbe'],
         "durability" => $tdata['arbs'],
       );
@@ -68,9 +68,9 @@
     if ($tdata['arhs']) {
       $list[] = array(
         "key" => "arh",
-        "type" => parse_info_desc($tdata['arhk'], 'k'),
-        "name" => $tdata['arh'],
-        "props" => $tdata['arhsk'] ? parse_info_desc($tdata['arhsk'], 'sk', 'arhsk', 1) : '',
+        "type" => parse_kinfo_desc($tdata['arhk'], $tdata['arhsk']),
+        "name" => parse_nameinfo_desc($tdata['arh'],$tdata['horizon']),
+        "props" => $tdata['arhsk'] ? parse_skinfo_desc($tdata['arhsk'], $tdata['arhk'] , 1) : '',
         "quality" => $tdata['arhe'],
         "durability" => $tdata['arhs'],
       );
@@ -79,9 +79,9 @@
     if ($tdata['aras']) {
       $list[] = array(
         "key" => "ara",
-        "type" => parse_info_desc($tdata['arak'], 'k'),
-        "name" => $tdata['ara'],
-        "props" => $tdata['arask'] ? parse_info_desc($tdata['arask'], 'sk', 'arask', 1) : '',
+        "type" => parse_kinfo_desc($tdata['arak'], $tdata['arask']),
+        "name" => parse_nameinfo_desc($tdata['ara'],$tdata['horizon']),
+        "props" => $tdata['arask'] ? parse_skinfo_desc($tdata['arask'], $tdata['arak'] , 1) : '',
         "quality" => $tdata['arae'],
         "durability" => $tdata['aras'],
       );
@@ -90,9 +90,9 @@
     if ($tdata['arfs']) {
       $list[] = array(
         "key" => "arf",
-        "type" => parse_info_desc($tdata['arfk'], 'k'),
-        "name" => $tdata['arf'],
-        "props" => $tdata['arfsk'] ? parse_info_desc($tdata['arfsk'], 'sk', 'arfsk', 1) : '',
+        "type" => parse_kinfo_desc($tdata['arfk'], $tdata['arfsk']),
+        "name" => parse_nameinfo_desc($tdata['arf'],$tdata['horizon']),
+        "props" => $tdata['arfsk'] ? parse_skinfo_desc($tdata['arfsk'], $tdata['arfk'] , 1) : '',
         "quality" => $tdata['arfe'],
         "durability" => $tdata['arfs'],
       );
@@ -101,9 +101,9 @@
     if ($tdata['arts']) {
       $list[] = array(
         "key" => "art",
-        "type" => parse_info_desc($tdata['artk'], 'k'),
-        "name" => $tdata['art'],
-        "props" => $tdata['artsk'] ? parse_info_desc($tdata['artsk'], 'sk', 'artsk', 1) : '',
+        "type" => parse_kinfo_desc($tdata['artk'], $tdata['artsk']),
+        "name" => parse_nameinfo_desc($tdata['art'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['artsk'], $tdata['artk'] , 1) : '',
         "quality" => $tdata['arte'],
         "durability" => $tdata['arts'],
       );
@@ -112,9 +112,9 @@
     if ($tdata['itms0']) {
       $list[] = array(
         "key" => "itm0",
-        "type" => parse_info_desc($tdata['itmk0'], 'k'),
-        "name" => $tdata['itm0'],
-        "props" => $tdata['itmsk0'] ? parse_info_desc($tdata['itmsk0'], 'sk', 'itmsk0', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk0'], $tdata['itmsk0']),
+        "name" => parse_nameinfo_desc($tdata['itm0'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk0'], $tdata['itmk0'] , 1) : '',
         "quality" => $tdata['itme0'],
         "durability" => $tdata['itms0'],
       );
@@ -123,9 +123,9 @@
     if ($tdata['itms1']) {
       $list[] = array(
         "key" => "itm1",
-        "type" => parse_info_desc($tdata['itmk1'], 'k'),
-        "name" => $tdata['itm1'],
-        "props" => $tdata['itmsk1'] ? parse_info_desc($tdata['itmsk1'], 'sk', 'itmsk1', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk1'], $tdata['itmsk1']),
+        "name" => parse_nameinfo_desc($tdata['itm1'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk1'], $tdata['itmk1'] , 1) : '',
         "quality" => $tdata['itme1'],
         "durability" => $tdata['itms1'],
       );
@@ -134,9 +134,9 @@
     if ($tdata['itms2']) {
       $list[] = array(
         "key" => "itm2",
-        "type" => parse_info_desc($tdata['itmk2'], 'k'),
-        "name" => $tdata['itm2'],
-        "props" => $tdata['itmsk2'] ? parse_info_desc($tdata['itmsk2'], 'sk', 'itmsk2', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk2'], $tdata['itmsk2']),
+        "name" => parse_nameinfo_desc($tdata['itm2'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk2'], $tdata['itmk2'] , 1) : '',
         "quality" => $tdata['itme2'],
         "durability" => $tdata['itms2'],
       );
@@ -145,9 +145,9 @@
     if ($tdata['itms3']) {
       $list[] = array(
         "key" => "itm3",
-        "type" => parse_info_desc($tdata['itmk3'], 'k'),
-        "name" => $tdata['itm3'],
-        "props" => $tdata['itmsk3'] ? parse_info_desc($tdata['itmsk3'], 'sk', 'itmsk3', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk3'], $tdata['itmsk3']),
+        "name" => parse_nameinfo_desc($tdata['itm3'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk3'], $tdata['itmk3'] , 1) : '',
         "quality" => $tdata['itme3'],
         "durability" => $tdata['itms3'],
       );
@@ -156,9 +156,9 @@
     if ($tdata['itms4']) {
       $list[] = array(
         "key" => "itm4",
-        "type" => parse_info_desc($tdata['itmk4'], 'k'),
-        "name" => $tdata['itm4'],
-        "props" => $tdata['itmsk4'] ? parse_info_desc($tdata['itmsk4'], 'sk', 'itmsk4', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk4'], $tdata['itmsk4']),
+        "name" => parse_nameinfo_desc($tdata['itm4'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk4'], $tdata['itmk4'] , 1) : '',
         "quality" => $tdata['itme4'],
         "durability" => $tdata['itms4'],
       );
@@ -167,9 +167,9 @@
     if ($tdata['itms5']) {
       $list[] = array(
         "key" => "itm5",
-        "type" => parse_info_desc($tdata['itmk5'], 'k'),
-        "name" => $tdata['itm5'],
-        "props" => $tdata['itmsk5'] ? parse_info_desc($tdata['itmsk5'], 'sk', 'itmsk5', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk5'], $tdata['itmsk5']),
+        "name" => parse_nameinfo_desc($tdata['itm5'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk5'], $tdata['itmk5'] , 1) : '',
         "quality" => $tdata['itme5'],
         "durability" => $tdata['itms5'],
       );
@@ -178,9 +178,9 @@
     if ($tdata['itms6']) {
       $list[] = array(
         "key" => "itm6",
-        "type" => parse_info_desc($tdata['itmk6'], 'k'),
-        "name" => $tdata['itm6'],
-        "props" => $tdata['itmsk6'] ? parse_info_desc($tdata['itmsk6'], 'sk', 'itmsk6', 1) : '',
+        "type" => parse_kinfo_desc($tdata['itmk6'], $tdata['itmsk6']),
+        "name" => parse_nameinfo_desc($tdata['itm6'],$tdata['horizon']),
+        "props" => $tdata['artsk'] ? parse_skinfo_desc($tdata['itmsk6'], $tdata['itmk6'] , 1) : '',
         "quality" => $tdata['itme6'],
         "durability" => $tdata['itms6'],
       );

command.php

@@ -487,12 +487,6 @@ if($hp > 0){
 			if(strpos($command,'pose') === 0) {
 				$cpose = substr($command,4,1);
 				if(in_array($cpose,$apose)){
-					if($cpose == 8 && isset($clbpara['starttimes']['pose8']) && ($now < ($clbpara['starttimes']['pose8'] + 60))){
-						$log .= "现在无法切换至{$poseinfo[$cpose]}。剩余冷却时间：".round($clbpara['starttimes']['pose8'] + 60 - $now)."秒。<br>";
-						goto command_end_flag;
-					} elseif($cpose == 8) {
-						$clbpara['starttimes']['pose8'] = $now;
-					}
 					$pose = $cpose;
 					$log .= "基础姿态变为<span class=\"yellow\">$poseinfo[$pose]</span>。<br> ";
 					$mode = 'command';
@@ -510,6 +504,19 @@ if($hp > 0){
 					$log .= "<span class=\"yellow\">这种策略太奇怪了！</span><br> ";
 					$mode = 'command';
 				}
+			} elseif(strpos($command,'hor') === 0) {
+				$chor = substr($command,3,1);
+				if(isset($horizoninfo[$chor])){
+					$horizon = $chor;
+					$log .= "视界切换为<span class=\"yellow\">$horizoninfo[$chor]</span>。<br> ";
+					# 切换视界后，丢失所有视野
+					lost_searchmemory('all',$pdata); 
+					# 向页面发送刷新标记
+					$log .= "<span id='HsUipfcGhU'></span>"; 
+				}else{
+					$log .= "<span class=\"yellow\">这种想法太奇怪了！</span><br> ";
+				}
+				$mode = 'command';
 			} elseif(strpos($command,'inf') === 0) {
 				$infpos = substr($command,3,1);
 				chginf($infpos);

gamedata/cache/combatcfg_1.php

@@ -142,19 +142,19 @@ $weather_active_r = Array(
 //姿态对攻击力的影响始终生效（1：只在作出先制攻击时生效）
 $pose_attack_active = 0;
 //姿态对攻击力的影响（单位：百分比加算）
-$pose_attack_modifier = Array(0,100,0,-25,25,-50,50,-777,0);
+$pose_attack_modifier = Array(0,100,0,-25,25,-50,50,-777);
 //姿态对防御力的影响始终生效（1：只在受到先制攻击伤害时生效）
 $pose_defend_active = 0;
 //姿态对防御力的影响（单位：百分比加算）
-$pose_defend_modifier = Array(0,25,0,-25,-50,-50,-466,777,10);
+$pose_defend_modifier = Array(0,25,0,-25,-50,-50,-466,777);
 //姿态对遇敌率的影响（遇敌率越低道具发现率越高）
-$pose_find_modifier = Array(0,15,20,-20,20,5,80,85,10);
+$pose_find_modifier = Array(0,15,20,-20,20,5,80,85);
 //姿态对躲避率的影响
-$pose_hide_modifier = Array(0,-25,-10,-10,10,-25,-80,-40,0);
+$pose_hide_modifier = Array(0,-25,-10,-10,10,-25,-80,-40);
 //姿态对先制率的影响（单位：百分比加算）（计算方式：进攻方姿态先制率-防守方姿态先制率）
-$pose_active_modifier = Array(0,0,50,0,25,-5,5,-100,0);
+$pose_active_modifier = Array(0,0,50,0,25,-5,5,-100);
 //姿态对反击率的影响（单位：百分比加算）
-$pose_counter_modifier = Array(0,0,0,0,0,-100,0,-100,0);
+$pose_counter_modifier = Array(0,0,0,0,0,-100,0,-100);
 
 //'通常','','重视防御','重视反击','重视躲避'
 //应战策略对攻击力的影响始终生效（1：只在作出反击时生效）

gamedata/cache/dialogue_1.php

@@ -18,6 +18,27 @@ $dialogues = Array
 		4 => '什么？',
 		5 => '没等你反应过来，那位不速之客便已切断了通讯。<br>你呆望着恢复如常的界面，试图厘清这段语焉不详的讯息究竟有何含义……',
 	),
+	// Time for this to be used!
+	'club21entry' => Array
+	(
+		0 => '你将这个蛋状物捧在手心，<br>你发现它上面并没有什么开关或缝隙。',
+		1 => '正在你觉得是不是买到了个玩笑的时候。<br>蛋突然破成了四瓣！<br>随后从蛋中冒出来大量灰黑色，青蓝色，深紫色的像丝带一样的东西，<br>向着你的心口直刺而来！',
+		2 => '你猝不及防，被这些丝带一样的东西击中，顿时，大量的数据塞满了你的大脑！<br>你头像炸开一样，不禁蹲躺了下去……',
+		3 => '<span class="grey">🎶Ρжжηψψρип ρип, ρжжηψψρжжρип ρип<br>
+		ρψψρип ρип, ρип ρип ρжжηψψρжж ρδ<br>
+		ρжжηψψρип ρип, ρжжηψψρжжρип ρип<br>
+		ρψψρип ρип, ρип ρип ρжжηψψρжж ρδ🎶<br></span>
+		<span class="glitch1">“开开心心感叹号，<br>
+		搞搞弄弄真快活！<br>
+		此地犹如三重彩，<br>
+		不愧吾等折腾多！”<br></span>
+		<span class="grey">🎶Ρжжηψψρип ρип, ρжжηψψρжжρип ρип<br>
+		ρψψρип ρип, ρип ρип ρжжηψψρжж ρδ<br>
+		ρжжηψψρип ρип, ρжжηψψρжжρип ρип<br>
+		ρψψρип ρип, ρип ρип ρжжηψψρжж ρδ🎶<br></span>',
+		4 => '你似乎看到了，听到了，感觉到了一个模糊的场景，<br>但你不知道这是什么。',
+		5 => '大量类似的场景掠过你的脑海，而你已经无力吸收。<br>你浑身疼痛，不禁口吐鲜血，无助地等待着一切结束。',
+	),
 );
 
 # 单组对白中哪一页对话会显示头像：
@@ -34,6 +55,7 @@ $dialogue_icon = Array
 $dialogue_log = Array
 (
 	'thiphase' => "<span class='lime'>※ 权限重载完成，控制模块已解锁。</span><br>……这又是什么时候的事？<br><br>",
+	'club21entry' => "<span class='yellow'>虽然打开了蛋，但你被其中的<span class='glitchb'>数据风暴</span>狂暴吸入，受到了大量的伤害！</span><br>你屁滚尿流地重新站了起来。<br><br>",
 );
 
 # 单组对白结束时提供选择肢：

gamedata/cache/elementmix_1.php

@@ -123,6 +123,7 @@
 		'R' => 11, //馄饨伤害
 		'N' => 68, //冲击
 		'n' => 89, //贯穿
+		'y' => 90, //破格
 		'r' => 144, //连击
 		//属性攻击：
 		'u' => 52, //火焰
@@ -286,7 +287,9 @@
 	$submix_list = array
 	( 	
 		Array('stuff'=>Array('u','x','z'),'result'=>'f','obbs'=>33), 
-		Array('stuff'=>Array('i','x','z'),'result'=>'k','obbs'=>33), 
+		Array('stuff'=>Array('i','x','z'),'result'=>'k','obbs'=>33),
+		//伤害制御：5个奇迹……现在的机制的话，大概是0.67*0.67*0.01的概率
+		Array('stuff'=>Array('x','x','x','x','x'),'result'=>'h','obbs'=>1),
 	);
 	# 随机的次要特征组合配方 注意：指定属性（sk_*）一定要放到最前面
 	$random_submix_list = Array
@@ -352,6 +355,8 @@
 		'DA' => Array('盾','掌','手套','朋友','匣子','鱼鳞','力场盾','鱼竿','手表','手环','镣铐','命数','战甲A'),
 		'DF' => Array('鞋','靴','爪','加护','轨迹','脚步','飞毯','马靴','草鞋','触手','尾巴','滑板','战甲F'),
 		'H' => Array('秘药','罐头','糊糊','杏仁豆腐','烤鱼面包','章鱼须','乌鸡肉','生海带','幸运饼干','长芽土豆','眼泪','趣味'),//补给
+		'V' => Array('指南','卷轴','手册','秘籍','乐谱','知识','共鸣','秘术','法典','广告','指引','教导','语录'),//技能书
+		'M' => Array('羽毛','结晶','精华','甘露','魂','眼','心','血','魔核','宝珠','力量','勇气','波纹'),//强化药物
 		'0' => Array('怪东西','？？？','竟然是它','■■■','数据削除'),//BUG词尾：没有找到类别的情况下会变成这个
 	);
 
@@ -361,9 +366,13 @@
 	$itmk_to_itmsk_tags = Array
 	(
 		//攻击面特征
-		'W' => Array('u','e','i','w','p','d','r','f','k','R','S','o','n','N'),
+		'W' => Array('u','e','i','w','p','d','r','f','k','R','S','o','n','N','y'),
+		//可以直接由元素得到的攻击面特征
+		'W_0' => Array('u','e','i','w','p','d','S'),
 		//防御面特征
 		'D' => Array('P','K','C','G','D','F','U','E','I','W','q','M','a','A','B','b'),
+		//可以直接由元素得到的防御面特征
+		'D_0' => Array('P','K','C','G','D','F','U','E','I','W','q','M'),
 		//杂项特征
 		'misc' => Array('z','x','c','h','H','l','g','Z'),
 	);

gamedata/cache/gamecfg_1.php

@@ -76,6 +76,11 @@ $mrage = 500;
 //携带金钱上限
 $moneylimit = 65500;
 
+//移动需要消耗的最小SP
+$movesp = 15;
+//燃烧生命时移动时，生命&体力置换系数
+$movehp = 1;
+
 // 恢复量的设定
 //体力恢复时间(秒):*秒1点恢复
 $sleep_time = 3;

gamedata/cache/mapitem_1.php

@@ -364,13 +364,13 @@
 0,16,2,香菇,PS,35,1,,
 0,16,5,松茸,HS,50,1,,
 0,16,5,松茸,PS,50,1,,
-0,16,5,香蕉,HB,25,1,,
-0,16,5,苹果,HB,45,1,,
-99,16,6,香蕉,HB,25,1,,
-99,16,6,苹果,HB,45,1,,
-99,16,3,香蕉,PB,25,1,,
-99,16,3,苹果,PB,45,1,,
-99,16,5,烂苹果,PB2,90,1,,
+0,16,5,香蕉,HB,25,1,🍎,
+0,16,5,苹果,HB,45,1,🍎,
+99,16,6,香蕉,HB,25,1,🍎,
+99,16,6,苹果,HB,45,1,🍎,
+99,16,3,香蕉,PB,25,1,🍎,
+99,16,3,苹果,PB,45,1,🍎,
+99,16,5,烂苹果,PB2,90,1,🍎,
 99,16,10,捕兽器,TN,240,1,,
 99,16,10,捕兽器,TO,240,1,,
 0,16,7,《小黄的草帽》,DH,50,70,,
@@ -604,9 +604,9 @@
 0,29,10,水,HS,60,1,,
 0,29,5,水,PS,60,1,,
 0,29,40,天然水,HS,55,3,z,
-0,29,2,香蕉,HB,25,1,,
-0,29,4,西瓜,HB,60,1,,
-0,29,2,苹果,HB,45,1,,
+0,29,2,香蕉,HB,25,1,🍎,
+0,29,4,西瓜,HB,60,1,🍎,
+0,29,2,苹果,HB,45,1,🍎,
 0,29,1,甜生姜,HB,42,5,,
 0,29,4,甜生姜,PB2,42,5,,
 99,29,5,绳索,TN,120,1,,
@@ -616,20 +616,20 @@
 99,29,5,圣石之种,TO,240,1,,
 99,29,5,走失的猫咪,PH,400,1,,
 99,29,5,轮椅,DF,99,∞,,
-99,29,4,香蕉,HB,25,1,,
-99,29,6,西瓜,HB,60,1,,
-99,29,4,苹果,HB,45,1,,
-99,29,1,香蕉,PB,25,1,,
-99,29,2,西瓜,PB,60,1,,
-99,29,1,苹果,PB,45,1,,
-99,29,5,烂苹果,PB2,90,1,,
+99,29,4,香蕉,HB,25,1,🍎,
+99,29,6,西瓜,HB,60,1,🍎,
+99,29,4,苹果,HB,45,1,🍎,
+99,29,1,香蕉,PB,25,1,🍎,
+99,29,2,西瓜,PB,60,1,🍎,
+99,29,1,苹果,PB,45,1,🍎,
+99,29,5,烂苹果,PB2,90,1,🍎,
 99,29,20,空白符卡,X,1,1,,
 0,30,10,杯装水,HS,60,1,,
 0,30,5,杯装水,PS,60,1,,
 0,30,40,蒸馏水,HS,55,3,z,
-0,30,2,香蕉,HB,25,1,,
-0,30,4,西瓜,HB,60,1,,
-0,30,2,苹果,HB,45,1,,
+0,30,2,香蕉,HB,25,1,🍎,
+0,30,4,西瓜,HB,60,1,🍎,
+0,30,2,苹果,HB,45,1,🍎,
 0,30,7,原型武器P,WP,60,1,,
 0,30,7,原型武器K,WK,60,1,,
 0,30,7,原型武器G,WG,60,1,,
@@ -1151,14 +1151,14 @@
 0,99,4,被遗忘的伞,WP,20,1,,
 0,99,1,☆博丽护符☆,WF,60,1,d,
 0,99,1,☆山蘑菇粉☆,WC,60,1,p,
-99,99,5,香蕉,HB,25,1,,
-99,99,5,西瓜,HB,60,1,,
-99,99,5,苹果,HB,45,1,,
-99,99,1,香蕉,PB,25,1,,
-99,99,1,西瓜,PB,60,1,,
-99,99,1,苹果,PB,45,1,,
-99,99,5,烂苹果,PB2,90,1,,
-0,99,1,★全图不唯一的野生巨大香蕉★,HB,2400,1,,
+99,99,5,香蕉,HB,25,1,🍎,
+99,99,5,西瓜,HB,60,1,🍎,
+99,99,5,苹果,HB,45,1,🍎,
+99,99,1,香蕉,PB,25,1,🍎,
+99,99,1,西瓜,PB,60,1,🍎,
+99,99,1,苹果,PB,45,1,🍎,
+99,99,5,烂苹果,PB2,90,1,🍎,
+0,99,1,★全图不唯一的野生巨大香蕉★,HB,2400,1,🍎,
 0,99,2,水果刀,Z,1,1,,
 0,99,5,天然气,PB2,55,3,z,
 1,99,2,☆黄金麦克风☆,WP,256,5,w,

gamedata/cache/mixitem_1.php

@@ -118,12 +118,14 @@ $mixinfo = array
 	array('class' => 'item', 'stuff' => array('手机','笔记本电脑'),'result' => array('移动PC','EE',1,1,),),
 	array('class' => 'item', 'stuff' => array('高压线圈','原型武器G','原型武器C','某种机械设备'),'result' => array('电磁发射装置','X',1,1,''),),
 	//array('class' => 'item', 'stuff' => array('风见 幽香的ID卡','坂持 金发的ID卡','御坂 美琴的ID卡'),'result' => array('游戏解除钥匙','Y',1,1,),),
+	array('class' => 'item', 'stuff' => array('数据……碎片','全息幻象的自律回路'),'result' => array('调制解调器','Y',1,1,''),),
 	array('class' => 'item', 'stuff' => array('社员专用的ID卡','社员专用的ID卡','社员专用的ID卡'),'result' => array('游戏解除钥匙','Y',1,1,'v'),),
 	array('class' => 'item', 'stuff' => array('冰炎钥匙·炎','冰炎钥匙·冰'),'result' => array('游戏解除钥匙','Y',1,1,'Zv'),),
 	array('class' => 'item', 'stuff' => array('★荆棘式电子地雷★','★阔剑地雷★','★全图不唯一的野生巨大香蕉★'),'result' => array('★一发逆转神话★','TNc',1,1,'x'),),
 	array('class' => 'item', 'stuff' => array('水','黑色雏菊','白色方块'),'result' => array('风祭河水','Y',1,1,),),
 	array('class' => 'item', 'stuff' => array('水','黑色方块','白色雏菊'),'result' => array('仪水镜','Y',1,1,),),
 	array('class' => 'item', 'stuff' => array('风祭河水','仪水镜','白色雏菊','黑色雏菊'),'result' => array('八咫镜','DH',1,1,'b'),),
+	array('class' => 'item', 'stuff' => array('乌黑的脸','乌黑的脸','乌黑的脸','乌黑的脸','乌黑的脸'),'result' => array('😂我太酷啦！😂','Y',1,1,'xX'),),
 	
 	array('class' => 'pokemon', 'stuff' => array('《小黄的草帽》','《小黄的钓鱼竿》','《小黄的行军靴》'),'result' => array('《小黄的精灵球》','WC',386,'∞',),),
 	array('class' => 'pokemon', 'stuff' => array('《小黄的精灵球》','《小黄的收服特训》'),'result' => array('《小黄的超级球》','WC',386,'∞','Zir'),),

gamedata/cache/present_1.php

@@ -49,12 +49,12 @@
 脸,DA,1,1,,
 脸,DF,1,1,,
 脸,A,1,1,,
-脸,HH,1,1,,
-脸,HS,1,1,,
-脸,HB,1,1,,
-脸,PH,1,1,,
-脸,PS,1,1,,
-脸,PB,1,1,,
+脸,HH,1,1,🍎,
+脸,HS,1,1,🍎,
+脸,HB,1,1,🍎,
+脸,PH,1,1,🍎,
+脸,PS,1,1,🍎,
+脸,PB,1,1,🍎,
 脸,X,1,1,,
 脸,Y,1,1,,
 脸,Z,1,1,,
@@ -202,8 +202,8 @@ SSS团长的半身像,WP,55,2,,
 奇怪的液体,HB,265,11,,
 奇怪的液体,HB,265,11,,
 最强-バカ⑨制冰块,HB,99,99,,
-★黑白色的烂苹果★,HS,999,1,,
-★小得奇怪的香蕉★,HB,3600,1,,
+★黑白色的烂苹果★,HS,999,1,🍎,
+★小得奇怪的香蕉★,HB,3600,1,🍎,
 奇迹-白魔法,HB,1232,1,,
 奇迹-幻想,HB,2343,2,,
 奇迹-永恒,HB,3454,3,,
@@ -221,10 +221,10 @@ SSS团长的半身像,WP,55,2,,
 龙卷风发生器,EW,1,1,11,
 暴风雪发生器,EW,1,1,12,
 冰雹发生器,EW,1,1,13,
-生命探测器,R,1,1,,
-生命探测器,R,3,1,,
-生命探测器,R,5,1,,
-生命探测器,R,7,1,,
+生命探测器,ER,1,1,,
+生命探测器,ER,3,1,,
+生命探测器,ER,5,1,,
+生命探测器,ER,7,1,,
 广域生命探测器,ER,5,1,2,
 水果刀,Z,1,1,,
 水果刀,Z,1,1,,

gamedata/cache/resources_1.php

@@ -34,6 +34,13 @@ $action_list = Array
 	'pcover', //被敌人的协战者夹击时获得 bid为敌人协战者的id
 );
 
+//视界状态描述
+$horizoninfo = Array
+(
+	0 => '标准视界',
+	1 => '灵子视界',
+);
+
 //游戏状态描述
 $gstate = Array(0 => '<font color="grey">已结束</font>',10 => '即将开始',20 => '开放激活',30 => '停止激活',40=> '<font color="yellow">连斗中</font>',50=>'<font color="red">死斗中</font>',60=>'<font color="red">紧急状态！</font>');
 $gwin = Array(0 => '程序故障', 1 => '全部死亡',2 => '最后幸存',3 => '锁定解除',4 => '无人参加',5 => '核爆全灭',6 => 'GM中止',7=>'幻境解离');
@@ -63,7 +70,7 @@ $clubinfo = Array(
 	19=>'晶莹剔透', //决死结界、晶莹剔透合并为晶莹剔透
 	20=>'元素大师', #商店购买社团卡
 	21=>'码语行人', #商店购买社团卡
-	22=>'偶像大师', #暂定名，「除错大师」头衔奖励
+	22=>'枫火歌者', #暂定名，「除错大师」头衔奖励
 	98=>'换装迷宫',
 	99=>'第一形态'
 );
@@ -96,10 +103,10 @@ $hpinfo = Array('<span class="clan">并无大碍</span>','<span class="yellow">
 $spinfo = Array('精力充沛','略有疲惫','精疲力尽','已经死亡');
 $rageinfo = Array('平静','愤怒','暴怒','已经死亡');
 $wepeinfo = Array('不值一提','略有威胁','威力可观','无敌神器');
-$poseinfo = Array('通常','作战姿态','强袭姿态','探物姿态','偷袭姿态','治疗姿态','✧狂飙姿态✧','哨戒姿态','✧灵子姿态✧');
+$poseinfo = Array('通常','作战姿态','强袭姿态','探物姿态','偷袭姿态','治疗姿态','✧狂飙姿态✧','哨戒姿态');
 $tacinfo = Array('通常','','重视防御','重视反击','重视躲避');
 //可供玩家选择的姿态、策略
-$apose = Array(1,3,4,5,6,8);
+$apose = Array(1,3,4,5,6);
 $atac = Array(2,3,4);
 //不会生成在危险地图的NPC（执行官、女主）
 $hidding_typelist = Array(7,14);
@@ -199,7 +206,8 @@ $stateinfo = Array
 	38 => '业火灼烧',
 	39 => '武器反噬',
 	40 => '以身试法',
-	42 => '独自脱离'
+	42 => '独自脱离',
+	50 => '成为乐子'
 );
 $lwinfo = Array(
 	0 => '',
@@ -1031,13 +1039,13 @@ $iteminfo = Array(//注意顺序，AB必须在A的前面，以此类推
 	'WFK' => '魔刃',#符+斩
 	'WDG' => '巨炮',#爆+射
 	'WDF' => '落魂',#爆+符
-	'WJ' => '重型枪械',
-	'WP' => '钝器',
-	'WG' => '远程兵器',
-	'WK' => '锐器',
-	'WC' => '投掷兵器',
-	'WD' => '爆炸物',
-	'WF' => '灵力兵器',	
+	'WJ' => '重型枪械',#JAVELIN
+	'WP' => '钝器',#PUNCH
+	'WG' => '远程兵器',#GUN
+	'WK' => '锐器',#KNIFE
+	'WC' => '投掷兵器',#CAST
+	'WD' => '爆炸物',#DETONATE
+	'WF' => '灵力兵器',	#FLOWERING
 	'WQ' =>'？？？？',
 	'XA' =>'代码残片·绿',
 	'XB' =>'代码残片·紫',
@@ -1105,6 +1113,7 @@ $itemspkinfo = Array(
 	'+' => '技能抽取',
 	'^' => '背包',
 	'🧰' => '工具',
+	'🍎' => '水果',
 );
 
 //club20 元素大师：
@@ -1303,6 +1312,7 @@ $dinfo = Array(
 	39 => '“去死吧！就算你是权限[哔]也挡不住我这一击的！”<br>你狂笑着使出你自认为决定胜负的一击，噗通倒下的却是你自己。<br>“不，这不科学！”被武器背叛的你遁入了无尽的黑暗中。<br><br><div class="seedhint">………………<br>…………<br><span class="blueseed">【Ｐ】越是强大的武器，越是有使用的风险。</span><br><span class="redseed">【Ｅ】越是浓厚的杀意，会带来越大的反噬。</span><br><span class="blueseed">【Ｐ】幻境自有其制衡之道，逾矩会带来无法想象的后果。</span><br><span class="redseed">【Ｅ】帮助上只说会必杀，可没说杀的是哪一方哦。</span><br></div>',
 	40 => '“看起来好像没什么反应嘛……那是！！”<br>天空中突然降下的巨大柱状物瞬间将你的世界吞没。<br>你眼前一黑，便失去了意识。<br><br><div class="seedhint">………………<br>…………<br><span class="redseed">【Ｅ】是那位神灵啊，干嘛要招惹她呢？</span><br><span class="blueseed">【Ｐ】使用她的符卡，后果自负哟。</span><br></div>',
 	42 => '你摁下了手中的玩具般的按钮。<br>面前凭空出现了一扇闪光的门扉！<br>你毅然决然地踏了进去……<br>………………<br>…………<br>……<br>随着你独自摘下了VR设备站起身来，你松了一口气。<br>虽然其他的玩家还在这场游戏中冒死厮杀，但起码你自己毫发无伤地逃出了生天。<br>虽然这怎么说都无法让你成为胜利者，但就这一点本身，已经算是不错的成就了。<br>你回头看了一眼正显示着你所谓的死亡信息的屏幕，不禁笑了起来……<br><br>＝＝＝＝＝＝＝＝＝<br><span class="lime">独自逃脱成功！<br>你获得了20积分奖励！胜场+1！</span><br>＝＝＝＝＝＝＝＝＝<br>',
+	50 => '你的身体化作了天边的红霞。<br>想必会为虚拟幻境中的各位带来笑容吧。<br><div class="seedhint">………………<br>…………<br><span class="redseed">【Ｅ】…………………………？</span><br><span class="blueseed">【Ｐ】……………………。</span><br></div>',
 );
 
 $syschatinfo = Array(

gamedata/cache/shopitem_1.php

@@ -200,4 +200,4 @@
 17,1,20,1,提示纸条D,Y,1,1,,
 0,18,,,上级者向·测试,,,,,
 18,1,20,0,「元素大师」称号卡,ZB,20,1,,
-18,1,20,0,「码语行人」称号卡,ZB,21,1,,
\ No newline at end of file
+18,1,20,0,神秘的「🥚」,ZB,21,1,,
\ No newline at end of file

gamedata/cache/style_20190718.css

@@ -154,6 +154,34 @@ table.infotable th {
 	  0.025em 0.04em 0 #fffc00;
 	animation: glitch1 725ms infinite;
   }
+.glitchb {
+	color:rgb(30, 150, 255);
+	font-weight: bold;
+	position: relative;
+	text-shadow: 0.05em 0 0 #00fffc, -0.03em -0.04em 0 #fc00ff,
+	  0.025em 0.04em 0 #fffc00;
+	animation: glitch1 725ms infinite;
+  }
+
+  .glitchb span {
+	position: absolute;
+	top: 0;
+	left: 0;
+  }
+  
+  .glitchb span:first-child {
+	animation: glitch1 500ms infinite;
+	clip-path: polygon(0 0, 100% 0, 100% 35%, 0 35%);
+	transform: translate(-0.04em, -0.03em);
+	opacity: 0.75;
+  }
+  
+  .glitchb span:last-child {
+	animation: glitch1 375ms infinite;
+	clip-path: polygon(0 65%, 100% 65%, 100% 100%, 0 100%);
+	transform: translate(0.04em, 0.03em);
+	opacity: 0.75;
+  }
   
   .glitch1 span {
 	position: absolute;
@@ -206,6 +234,66 @@ table.infotable th {
 	}
   }
 
+  @mixin glitchCopy {
+	content: attr(data-text);
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+  }
+  
+  .glitch2 {
+	position: relative;
+	color: #fff;
+	animation: glitch-skew 1s infinite linear alternate-reverse;
+  
+	&::before {
+	  @include glitchCopy;
+	  left: 2px;
+	  text-shadow: -2px 0 #ff00c1;
+	  clip: rect(44px, 450px, 56px, 0);
+	  animation: glitch-anim 5s infinite linear alternate-reverse;
+	}
+  
+	&::after {
+	  @include glitchCopy;
+	  left: -2px;
+	  text-shadow: -2px 0 #ff00c1, 2px 2px #ff00c1;
+	  clip: rect(44px, 450px, 56px, 0);
+	  animation: glitch-anim2 5s infinite linear alternate-reverse;
+	}
+  }
+  
+  @keyframes glitch-anim {
+	$steps: 20;
+	@for $i from 0 to $steps {
+	  #{percentage($i*(1/$steps))} {
+		clip: rect(random(100) + px, 9999px, random(100) + px, 0);
+		transform: skew((random(100) / 100) + deg);
+	  }
+	}
+  }
+  
+  @keyframes glitch-anim2 {
+	$steps: 20;
+	@for $i from 0 to $steps {
+	  #{percentage($i*(1/$steps))} {
+		clip: rect(random(100) + px, 9999px, random(100) + px, 0);
+		transform: skew((random(100) / 100) + deg);
+	  }
+	}
+  }
+  
+  @keyframes glitch-skew {
+	$steps: 10;
+	@for $i from 0 to $steps {
+	  #{percentage($i*(1/$steps))} {
+		transform: skew((random(10) - 5) + deg);
+	  }
+	}
+  }
+
 @keyframes blueflicker {
 	0%, 18%, 22%, 25%, 53%, 57%, 100% {
 	  text-shadow:

gamedata/cache/tooltip_1.php

@@ -72,6 +72,15 @@ $tps_name = Array
 	'随机数之神的神力' => 2,'随机数之神的震撼' => 2,'随机数之神的摄理' => 2,'随机数之神的恶戏' => 2,
 	# 福袋惩罚物品
 	'乌黑的脸' => Array('title'=>"贪 心 不 足 蛇 吞 象"),
+	# OTHERS
+	'😂我太酷啦！😂' =>Array('class'=>'rainbow', 'title'=>"一个笑哭黄豆模样的按钮，按下后立刻将自己炸成一朵烟花（自身死亡）。"),
+	'神秘的「🥚」' =>Array('class'=>'glitch1', 'title'=>"一个神秘的蛋状物品，你潜意识觉得它可能会很大条，而且觉得它像是什么哺乳生物产生的……"),
+);
+
+$tps_name_lore = Array
+(
+	# 来自mtkkk的怪主意
+	'😂我太酷啦！😂' =>Array('class'=>'minirainbow', 'title'=>"「林董事长不在了，空降的女儿又不管事，摸了摸了……」——林氏软件员工"),
 	# LORE，看了这些内容，还不考虑拆分这个文件么？总之先搞这么多……
 	'燃素加农炮『爆炎』MK-II' => Array('title'=>"在接受好友的委托之时，一切看起来都只像一个简单的工作。"),
 	'奥术盔甲B - 炎' => Array('title'=>"但正如自己的爷爷所说过的那样，看起来简单的东西，往往背后有坑。"),
@@ -95,6 +104,9 @@ $tps_name = Array
 	'✧执念之刺' => Array('title'=>"「为什么要如此拼命呢？」10岁少女对自己好友如此问道。「不拼命的话，就无法保护将被夺走的事物了。」10岁少女的这位好友就这样说出了耍酷的台词。"),
 	'✧希望之风' => Array('title'=>"「啊！成功了！」15岁少女欢呼雀跃，但环顾四周，似乎并没有——「恭喜恭喜！」在门外等着的2位15岁少女的好友就在这个时机破门而入！"),
 	'◆火之碎片' => Array('title'=>"「在这场交易中，我最终胜你半子。」31岁女强人的意识，于随后遁入虚空。"),
+	# 更多的怪文书
+	'神秘的「🥚」' =>Array('class'=>'glitchb', 'title'=>"「你就放它一百个心，既然你这么信任我，我就没有做不出来的道理。」——克里斯汀"),
+
 );
 
 $tps_ik = Array
@@ -153,6 +165,7 @@ $tps_ik = Array
 	'XC' => Array('class'=>'yellow', 'title'=>"集齐三个同颜色的不同名代码残片，来合成单人脱出结局道具吧！",),
 	'ZB' => Array('class'=>'lime', 'title'=>"在没有决定称号的时候使用该物品，便可获得该对应称号。",),
 	'ZA' => Array('class'=>'neonyellow', 'title'=>"这个物品中似乎含有让你可以独自脱离幻境的方法……",),
+	'🥚' => Array('class'=>'purple', 'title'=>"通过提取物品产生的蛋状物品，看起来可以插回其他物品为之强化。",),
 );
 
 $tps_isk = Array

gamedata/sql/players.sql

@@ -13,7 +13,7 @@ CREATE TABLE bra_players (
   gd char(1) NOT NULL default 'm',
   race char(32) NOT NULL default '0',
   sNo smallint unsigned NOT NULL default '0',
-  icon smallint unsigned NOT NULL default '0',
+  icon varchar(255) NOT NULL DEFAULT '0',
   club tinyint unsigned NOT NULL default '0',
   endtime int(10) unsigned NOT NULL default '0',
   validtime int(10) unsigned NOT NULL default '0',
@@ -26,6 +26,7 @@ CREATE TABLE bra_players (
   cdsec int(10) unsigned NOT NULL default '0',
   cdmsec smallint(3) unsigned NOT NULL default '0',
   cdtime int(10) unsigned NOT NULL DEFAULT '0',
+  horizon tinyint unsigned NOT NULL default '0',
   action char(12) NOT NULL default '',
   bid smallint unsigned NOT NULL default '0',
   hp int(10) unsigned NOT NULL DEFAULT '0',

help.php

@@ -42,18 +42,19 @@ $npcinfo = get_npc_helpinfo($npcinfo);
 //print_r($npcinfo[14]['esub']);
 
 $ty1[1]=1; $ty1[2]=88; 
-$ty2[1]=5; $ty2[2]=6; 
+$ty2[1]=Array(5,'asub'); $ty2[2]=Array(6,'asub'); 
 $ty2a[1]=Array(19,'asub'); #真红蓝
-$ty3[1]=11;
+$ty3[1]=Array(11,'asub');
 $ty4[1]=90; $ty4[2]=92;
-$ty5[1]=2;
+//$ty5[1]=2; 
+$ty5[1] = Array(2,'asub');
 $ty6[1]=14; $ty6[2]=4; 
 $ty6e[1]=Array(14,'esub'); #女主第二形态情报
-$ty7[1]=13;
-$ty8[1]=15;
+$ty7[1]=Array(13,'asub'); 
+$ty8[1]=Array(15,'asub'); 
 $ty9[1]=22;
 $ty10[1]=21;
-$ty11[1]=89; 
+$ty11[1]=Array(89,'asub'); 
 $ty11e[1]=Array(89,'esub'); #电掣NPC第二形态情报
 $ty12[1]=24;
 $ty25a[1] = Array(25,'asub'); #佣兵NPC
@@ -61,35 +62,15 @@ $ty25a[1] = Array(25,'asub'); #佣兵NPC
 if(filemtime($vnmixfile) > filemtime($writefile) ||filemtime($mixfile) > filemtime($writefile) || filemtime($shopfile) > filemtime($writefile) || filemtime($mapitemfile) > filemtime($writefile) || filemtime($synfile) > filemtime($writefile) || filemtime($ovlfile) > filemtime($writefile) || filemtime($presentfile) > filemtime($writefile) || filemtime($boxfile) > filemtime($writefile)){
 	$mixitem = array();
 	foreach($mixinfo as $mix){
-		if($mix['class'] !== 'hidden'){
+		if($mix['class'] !== 'hidden')
+		{
 			//名字
-			$mix['result'][0] = parse_info_desc($mix['result'][0],'m');
+			$mix['result'][0] = parse_nameinfo_desc($mix['result'][0]);
 			//属性
-			$mixitmsk = '';
-			if(!empty($mix['result'][4]) && !is_numeric($mix['result'][4])){
-				/*for ($j = 0; $j < strlen($mix['result'][4]); $j++) {
-					$sub = substr($mix['result'][4],$j,1);
-					if(!empty($sub)){
-						$mixitmsk .= $itemspkinfo[$sub].'+';
-					}
-				}
-				if(!empty($mixitmsk)){$mixitmsk = substr($mixitmsk,0,-1);}*/
-				/*$mix_sk = get_itmsk_array($mix['result'][4]); $mixitmsk = '';
-				foreach($mix_sk as $sk_value)
-				{
-					if(!empty($mixitmsk)) $mixitmsk .= '+'.parse_itm_desc($sk_value,'sk');
-					else $mixitmsk = parse_itm_desc($sk_value,'sk');
-				}*/
-				$mixitmsk = parse_info_desc($mix['result'][4],'sk',$mix['result'][1]);
-			}
+			$mixitmsk = empty($mix['result'][4]) ? '' : parse_skinfo_desc($mix['result'][4],$mix['result'][1]);
 			//类别
-			$mixitmk = parse_info_desc($mix['result'][1],'k');
-			/*foreach($iteminfo as $info_key => $info_value){
-				if(strpos($mix['result'][1],$info_key)===0){
-					$mixitmk = parse_itm_desc($info_key,'k');
-					break;
-				}
-			}*/
+			$mixitmk = parse_kinfo_desc($mix['result'][1],$mix['result'][4]);
+
 			$mixitem[$mix['class']][] = array('stuff' => $mix['stuff'], 'result' => array($mix['result'][0],$mixitmk,$mix['result'][2],$mix['result'][3],$mixitmsk));
 		}
 	}
@@ -169,27 +150,12 @@ if(filemtime($vnmixfile) > filemtime($writefile) ||filemtime($mixfile) > filemti
 		if($mix['class'] !== 'hidden')
 		{
 			//名字
-			//$mix['result'][0] = parse_itm_desc($mix['result'][0],'m');
-			$mix['result'][0] = parse_info_desc($mix['result'][0],'m');
+			$mix['result'][0] = parse_nameinfo_desc($mix['result'][0]);
 			//属性
-			$mixitmsk = '';
-			if(!empty($mix['result'][4]) && !is_numeric($mix['result'][4])){
-				/*$mix_sk = get_itmsk_array($mix['result'][4]); $mixitmsk = '';
-				foreach($mix_sk as $sk_value)
-				{
-					if(!empty($mixitmsk)) $mixitmsk .= '+'.parse_itm_desc($sk_value,'sk');
-					else $mixitmsk = parse_itm_desc($sk_value,'sk');
-				}*/
-				$mixitmsk = parse_info_desc($mix['result'][4],'sk',$mix['result'][1]);
-			}
+			$mixitmsk = empty($mix['result'][4]) ? '' : parse_skinfo_desc($mix['result'][4],$mix['result'][1]);
 			//类别
-			$mixitmk = parse_info_desc($mix['result'][1],'k');
-			/*foreach($iteminfo as $info_key => $info_value){
-				if(strpos($mix['result'][1],$info_key)===0){
-					$mixitmk = parse_itm_desc($info_key,'k');
-					break;
-				}
-			}*/
+			$mixitmk = parse_kinfo_desc($mix['result'][1],$mix['result'][4]);
+			
 			$vmixitem[$mix['class']][] = array('name' => $mix['name'], 'stuff' => $mix['stuff'], 'result' => array($mix['result'][0],$mixitmk,$mix['result'][2],$mix['result'][3],$mixitmsk));
 		}
 	}

include/admin/vnmixlist.php

@@ -33,8 +33,7 @@ if(file_exists($cache_file))
 					$sk_arr = Array();
 					if(!empty($vn_info[4]))
 					{
-						$temp_mixinfo[$vn_key][$vn_type][4] = '';
-						$temp_mixinfo[$vn_key][$vn_type][4] = parse_info_desc($vn_info[4],'sk',$vn_info[1]);
+						$temp_mixinfo[$vn_key][$vn_type][4] = parse_skinfo_desc($vn_info[4],$vn_info[1]);
 					}
 				}
 			}

include/game/aievent.func.php

@@ -175,7 +175,11 @@ function aievent($rate){
 					$itmchat[] = Array('type' => '2', 'time' => $now, 'send' => '【SANMA_TK】', 'msg' => $cht); 
 				}
 				if(!empty($itmchat)){
-					$db->multi_insert("{$tablepre}chat",$itmchat);
+					foreach($itmchat as $ickey => $icvalues)
+					{
+						$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('{$icvalues['type']}','{$icvalues['time']}','{$icvalues['send']}','','{$icvalues['msg']}')");
+					}
+					//$db->multi_insert("{$tablepre}chat",$itmchat);
 				}
 			}
 			

include/game/depot.func.php

@@ -5,7 +5,7 @@
 	}
 	global $can_lootdepot_type;
 	//个人仓库最多可以储存的道具数量 0=不限制
-	$max_saveitem_num = 0;
+	$max_saveitem_num = 6;
 	//储存每件道具的手续费
 	$saveitem_cost = 20;
 	//取出道具的手续费

include/game/itemmain.func.php

@@ -131,7 +131,7 @@ function check_trap_def_event(&$pa,$damage,$playerflag=0,$selflag=0)
 	}
 
 	# 「天佑」技能判定
-	if($damage && !check_skill_unlock('buff_godbless',$data))
+	if($damage && !check_skill_unlock('buff_godbless',$pa))
 	{
 		$damage = 0;
 		$log .= "<span class=\"yellow\">「天佑」使你免疫了陷阱伤害！</span><br>";
@@ -225,7 +225,7 @@ function trap(&$data=NULL){
 				addnews($now,'trap',$name,$trname,$itm0,$nick);
 			}
 			$log .= "糟糕，你触发了{$trperfix}陷阱<span class=\"yellow\">$itm0</span>！<br>";
-			if($data['skilllog']) $log.= $data['skilllog'];
+			if(!empty($data['skilllog'])) $log.= $data['skilllog'];
 			$log .= "受到<span class=\"dmg\">$damage</span>点伤害！<br>";
 
 			# 踩雷rp结算

include/game/itemmix.func.php

@@ -400,7 +400,8 @@ function itemmix_events(&$data=NULL)
 	$wd+=1;
 
 	# 全能兄贵在合成补给品时，获得数量x2
-	if((strpos($itmk0,'H') === 0)&&($club == 16)&&($itms0 !== $nosta)){ $itms0 = ceil($itms0*2); }
+	// 16 is in the past...
+	if((strpos($itmk0,'H') === 0)&&($club == 12)&&($itms0 !== $nosta)){ $itms0 = ceil($itms0*2); }
 
 	# 拆弹专家合成爆炸物耐久*1.5
 	if(($itmk0 == 'WD' || $itmk0 == 'WDG') && ($club == 5)){ $itms0 = ceil($itms0*1.5); }

include/game/revbattle.calc.php

@@ -64,6 +64,10 @@ namespace revbattle
 		global $log,$now,$weather,$gamevars,$gamecfg;
 		global $weather_active_r,$pose_active_modifier,$pose_active_modifier,$active_obbs,$chase_active_obbs;
 
+		# 敌人处于哨戒姿态下时，不会先攻
+		if($pd['pose'] == 7) return 100;
+		if($pa['pose'] == 7) return 0;
+
 		# 获取基础先攻率：
 		if(!$mode)
 		{