Merge branch 'waaagh' of https://github.com/hikawiier/phpdts into waaagh

gamedata/cache/mixitem_1.php

@@ -124,6 +124,7 @@ $mixinfo = array
 	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/npc_1.php

@@ -1759,7 +1759,7 @@
 			'itme3' => 1,
 			'itms3' => 1,
 			'itmsk3' => '',
-			'itm4' => '纳西妲真是太对我叉批辣，我好想和小草神■■■',
+			'itm4' => '纳西妲真是太对我叉批辣，我好想和小草神■■■🥵🥵🥵',
 			'itmk4' => 'X',
 			'itme4' => 1,
 			'itms4' => 1,

gamedata/cache/resources_1.php

@@ -206,7 +206,8 @@ $stateinfo = Array
 	38 => '业火灼烧',
 	39 => '武器反噬',
 	40 => '以身试法',
-	42 => '独自脱离'
+	42 => '独自脱离',
+	50 => '成为乐子'
 );
 $lwinfo = Array(
 	0 => '',
@@ -854,20 +855,20 @@ $npcchat = Array(
 	),
 	26 => Array(
 		'mtkkk' => Array(
-			0 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//meet
-			1 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//attackfine
+			0 => '“你说的对，但是L5⑨符确实可以一符拍死静流”',//meet
+			1 => '“你说得对，但是《原…[该发言已被屏蔽]”',//attackfine
 			2 => '“快说小仓唯唱歌贼好听！”',
-			3 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
+			3 => '“嘿嘿嘿，纳西妲纳西妲我的纳西妲嘿嘿嘿...🥵”',
 			4 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
-			5 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//defendfine
-			6 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
-			7 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//defendhurt
+			5 => '“你说我纯数值怪？你自己不会插一根L5吗？”',//defendfine
+			6 => '“冷知识，你就算唱了两万六千次Alicemagic防御一百六十万你也扛不住篝的丝带”',
+			7 => '“你能不能自己摸歌魂别提我款啊，把把都要被杀一次好痛苦哦”',//defendhurt
 			8 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
-			9 => '“小仓唯唱歌贼!好!听!(寄)”',//retreat
-			10 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//can't counterattack
-			11 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//out of range
-			12 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//critical
-			13 => '♪你說過在哭泣之後應該可以破涕而笑♪',	
+			9 => '“小仓唯唱歌贼！好！听！（寄）”',//retreat
+			10 => '“你心火改改改改改改全改到耐久上了？”',//can't counterattack
+			11 => '“A！C！F！U！N！大！逃！杀！设！计！师！…哦好像是我自己选的⑨符，没事了”',//out of range
+			12 => '“♪你說過在哭泣之後應該已被系统自动屏蔽🥵”',//critical
+			13 => '“♪你說過在哭泣之後應該可以破涕而笑♪”',	
 			'color' => 'yellow'
 		),
 	),
@@ -1310,6 +1311,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/tooltip_1.php

@@ -76,6 +76,8 @@ $tps_name = Array
 
 $tps_name_lore = Array
 (
+	# 来自mtkkk的怪主意
+	'😂我太酷啦！😂' =>Array('class'=>'rainbow', 'title'=>"一个流汗黄豆模样的按钮，按下后立刻将自己炸成一朵烟花（自身死亡）。",),
 	# LORE，看了这些内容，还不考虑拆分这个文件么？总之先搞这么多……
 	'燃素加农炮『爆炎』MK-II' => Array('title'=>"在接受好友的委托之时，一切看起来都只像一个简单的工作。"),
 	'奥术盔甲B - 炎' => Array('title'=>"但正如自己的爷爷所说过的那样，看起来简单的东西，往往背后有坑。"),

include/game/elementmix.calc.php

@@ -260,35 +260,50 @@
 			$data = &$pdata;
 		}
 		extract($data,EXTR_REFS);
-		$fix_flag = 0;
+		
 		# 检查固定配方
 		foreach($emix_fixlist as $ffkey => $femix)
-		{
+		{			
 			if(count($femix['stuff']) == count($emlist))
 			{
+				$fix_flag = 1;
 				foreach($femix['stuff'] as $fkey => $farr)
 				{
-					if($farr[0] == $emlist[$fkey] && $farr[1] == $emnums[$fkey]) 
+					if($farr[0] != $emlist[$fkey] || $farr[1] != $emnums[$fkey]) 
 					{
-						$fix_flag = $femix['result'];
-						# 将成功合成的条目保存在笔记内
-						if(empty($clbpara['elements']['info']['d']['d'.$ffkey])) $clbpara['elements']['info']['d']['d'.$ffkey] = 1;
+						$fix_flag = 0;
 						break;
 					}
 				}
+				if($fix_flag == 1)
+				{
+					$fix_flag = $femix['result'];
+					# 将成功合成的条目保存在笔记内
+					if(empty($clbpara['elements']['info']['d']['d'.$ffkey])) $clbpara['elements']['info']['d']['d'.$ffkey] = 1;
+					break;
+				}
 			}
 		}
 		# 如果随机配方尚未生成，先生成随机配方
 		if(empty($gamevars['rand_emixfixres'])) $gamevars['rand_emixfixres'] = esp_spawn_rand_emixfixres();
-
-		# 检查随机配方
-		foreach($gamevars['rand_emixfixres'] as $fkkey => $femix)
+		
+		if ($fix_flag == 0)
 		{
-			if(count($femix['stuff']) == count($emlist))
+			# 检查随机配方
+			foreach($gamevars['rand_emixfixres'] as $fkkey => $femix)
 			{
-				foreach($femix['stuff'] as $fkey => $farr)
+				if(count($femix['stuff']) == count($emlist))
 				{
-					if($farr[0] == $emlist[$fkey] && $farr[1] == $emnums[$fkey]) 
+					$fix_flag = 1;
+					foreach($femix['stuff'] as $fkey => $farr)
+					{
+						if($farr[0] != $emlist[$fkey] || $farr[1] != $emnums[$fkey]) 
+						{
+							$fix_flag = 0;
+							break;
+						}
+					}
+					if($fix_flag == 1)
 					{
 						$fix_flag = $rand_emix_fixlist[$fkkey]['result'];
 						break;
@@ -570,7 +585,12 @@
 					}
 					//18th fix: kudos to 低维生物
 					$delsub = $minfo['stuff'];
-					$count_delsub = count($mnifo['stuff']);
+					//$count_delsub = count($mnifo['stuff']);
+					$count_delsub = 0;
+					if(!empty($mnifo['stuff']))
+					{
+						$count_delsub = $mnifo['stuff'];
+					}
 					
 					for ($i = 0; $i < count($subtags); $i++){
 						if (in_array($subtags[$i], $minfo['stuff'])){

include/game/elementmix.func.php

@@ -129,6 +129,52 @@
 		return $smhint;
 	}
 
+	# 根据元素笔记中的已知公式快速投料
+	function quick_add_mix_elements($data)
+	{
+		global $elements_info,$r_elements_info,$gamecfg,$gamevars,$iteminfo,$itemspkinfo;
+		include config('elementmix',$gamecfg);
+		extract($data,EXTR_REFS);
+		include_once GAME_ROOT.'./include/game/itemplace.func.php';
+		if(!empty($clbpara['elements']['info']['d']))
+		{
+			foreach($emix_fixlist as $key => $list)
+			{
+				if(!empty($clbpara['elements']['info']['d']['d'.$key]))
+				{
+					$emix_arr = json_encode($list['stuff']);
+					$quickmix .= '<input type="button" value="投入" onclick="AddMixElements(' . $emix_arr .');"> ';
+					$quickmix .= "<span class=''>".parse_itemmix_resultshow($list['result'])."</span><br>";
+				}
+			}
+			$quickmix .= '</ul>';
+		}
+		if(!empty($clbpara['elements']['info']['hd']))
+		{
+			foreach($gamevars['rand_emixfixres'] as $key => $list)
+			{
+				if(!empty($clbpara['elements']['info']['hd']['h'.$key]))
+				{
+					$flag_complete = 1;
+					foreach($list['stuff'] as $skey => $slist)
+					{
+						if(empty($clbpara['elements']['info']['hd']['h'.$key]['s'.$skey]))
+						{
+							$flag_complete = 0;
+							break;
+						}
+					}
+					if($flag_complete == 0) break;
+					$emix_arr = json_encode($list['stuff']);
+					$quickmix .= '<input type="button" value="投入" onclick="AddMixElements(' . $emix_arr .');"> ';
+					$quickmix .= "<span class=''>".parse_itemmix_resultshow($rand_emix_fixlist[$key]['result'])."</span><br>";
+				}
+			}
+			$quickmix .= '</ul>';
+		}
+		return $quickmix;
+	}
+
 	/********拆解元素部分********/
 	# 把尸体打散成元素
 	function split_corpse_to_elements(&$edata,$emode)

include/game/item.func.php

@@ -15,6 +15,7 @@ function itemuse($itmn,&$data=NULL) {
 	global $upexp,$baseexp,$elec_cap;
 	//Some globals seems to be still needed... ...
 	global $itemspkinfo,$plsinfo;
+	global $pid;
 
 	if(!isset($data))
 	{
@@ -923,7 +924,7 @@ function itemuse($itmn,&$data=NULL) {
 			// 用$clbpara['opened_pack']记录打开福袋的名称，只要有这个名称，就搞事！
  			if(!empty($clbpara['opened_pack'])){
 				$log.="似乎你本轮已经打开过福袋，因此不能再打开更多的福袋！<br>";
-				$db->query("INSERT INTO {$tablepre}shopitem (kind,num,price,area,item,itmk,itme,itms,itmsk) VALUES ('17','1','20','0','$itm','$itmk','$itme','$itms','$itmsk')");
+				$db->query("INSERT INTO {$tablepre}shopitem (kind,num,price,area,item,itmk,itme,itms,itmsk) VALUES ('17','1','20','0','$itm','$itmk','$itme','1','$itmsk')");
 				$log.="<span class=\"yellow\">$itm</span>从你的手中飞出，向商店的方向飞去。<br>";
 			} 
 			if(strpos( $itmk, 'p0P' ) === 0){
@@ -1526,8 +1527,8 @@ function itemuse($itmn,&$data=NULL) {
 
 				if($club == 17){
 					$hpdown = $spdown = round($up * 1.5);
-				}elseif($club == 13){
-					$hpdown = $up+200;
+				}elseif($club == 12){
+					$hpdown = $up+250;
 					$spdown = $up;
 					//根性兄贵加成消失
 				}else{
@@ -2280,6 +2281,78 @@ function itemuse($itmn,&$data=NULL) {
 			//global $rp;
 			$rp = 0;
 			$log .= "你使用了<span class=\"yellow\">$itm</span>。你的RP归零了。<br>";
+		} elseif($itm == '😂我太酷啦！😂') {
+			$log .= "你毅然决然地高喊了一句：“我·太·酷·啦~”<br>一拳头锤碎了这个奇形怪状的按钮。<br>随后，在失去意识之前，你感觉你的身体飞上了天空。<br>";
+			# Also produce a chatlog
+			$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('0','$now','$name','','「我·太·酷·啦~」')");
+
+			# Do an initial coin toss
+			$selfdestructdice1 = diceroll(1);
+			$selfdestructdice2 = diceroll(6);
+			
+			if ($selfdestructdice1 > 0){
+				# You'll self destruct into a bunch of happy items, to bring smile to others.
+				$happyitemname = $name . "的存在意义";
+				# Firstly, we look at your stats to see how strong those would be, and how many of them would it be.
+				$happyitemeffect = round($mhp / 20);
+				$happyitemnumber = round($exp / 20);
+				# Then, we look at the dice result to see what would you explode into.
+				if ($selfdestructdice2 == 1){
+					$happyitemkind = "HH";
+				}elseif ($selfdestructdice2 == 2){
+					$happyitemkind = "HS";
+				}elseif ($selfdestructdice2 == 3){
+					$happyitemkind = "PH";
+				}elseif ($selfdestructdice2 == 4){
+					$happyitemkind = "PS";
+				}elseif ($selfdestructdice2 == 5){
+					$happyitemkind = "HM";
+				}elseif ($selfdestructdice2 == 6){
+					$happyitemkind = "TO";
+				}else{
+					$happyitemkind = "T";
+				}
+
+				# Producing a valid arealist
+				$rndhappypls= rand(1,count($plsinfo)-2);
+
+				# Process the item insertation process.
+				# But, before that, a special treatment for map traps:
+				if ($selfdestructdice2 == 6){
+					# Insert traps into maptrap table.
+					for ($i = 0; $i < $happyitemnumber; $i++){
+						$rndhappypls= rand(1,count($plsinfo)-2);
+						$db->query("INSERT INTO {$tablepre}maptrap (itm, itmk, itme, itms, itmsk, pls) VALUES ('$happyitemname', '$happyitemkind', '$happyitemeffect', '1', '$pid', '$rndhappypls')");
+					}
+					$log .= "你的身体在高空中炸出了一片烟花。<br>
+					在那烟花中，那曾经属于你的存在落在了幻境的地面上，钻进了地底下。<br>
+					想必，这会为大家带来惊喜吧……<br>";
+				}else{
+					# Insert items into mapitem table.
+					for ($i = 0; $i < $happyitemnumber; $i++){
+						$rndhappypls= rand(1,count($plsinfo)-2);
+						$db->query("INSERT INTO {$tablepre}mapitem (itm, itmk, itme, itms, itmsk, pls) VALUES ('$happyitemname', '$happyitemkind', '$happyitemeffect', '1', '$pid', '$rndhappypls')");
+					}
+					$log .= "你的身体在高空中炸出了一片烟花。<br>
+					在那烟花中，那曾经属于你的存在落在了幻境的地面上。<br>
+					想必，这会为大家带来笑容吧……<br>";
+				}
+				# Then we produce a chat for this feat.
+				$db->query("INSERT INTO {$tablepre}chat (type,`time`,send,recv,msg) VALUES ('2','$now','【幻境自检】','','检测到未经授权的地图物品！')");
+
+			}else{
+				# Nothing happens, you just self destruct.
+				$log .= "你的身体在高空中炸成了一片烟花，<br>
+				给虚拟幻境的天空带来了五彩的红霞。<br>
+				大家看到这祥瑞的天象，纷纷露出了笑容。<br>
+				这大概就是……「笑容世界」吧。<br>
+				大逃杀真是塔洛西啊！<br>";	
+			}
+			# Then we kill you to end everything.
+			include_once GAME_ROOT . './include/state.func.php';
+			death ( 'sdestruct', '', 0, $itm );
+			# But wait, since you exploded, you can't leave a body!
+			$db->query ( "UPDATE {$tablepre}players SET weps='0',arbs='0',arhs='0',aras='0',arfs='0',arts='0',itms0='0',itms1='0',itms2='0',itms3='0',itms4='0',itms5='0',itms6='0',money='0' WHERE pid = {$pid} " );
 		} else {
 			$log .= " <span class=\"yellow\">$itm</span> 该如何使用呢？<br>";
 		}

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/revattr_extra.func.php

@@ -232,10 +232,15 @@ namespace revattr
 		{
 			$rp_up = 0; $dmg_p = -1;
 			if($pd['name'] == '高中生·白神')
+			//Adding an additional check to reset a negative rp value to 1 before other rp checks to deal with an oddity.
 			{
 				if($phase == 'rp')
 				{
 					$log .= "<span class=\"yellow\">“你真的愿意对这个手无寸铁的高中女生下手么？”</span><br>";
+					if ($pa['rp'] < 0){
+						$log .= "<span class=\"glitch1\">“不管你之前积了多少德，一个决定就是一个决定。”</span><br>";
+						$pa['rp'] = 1;	
+					}
 					$dice = diceroll(444);
 					if($dice<=200){
 						$log .= "<span class=\"neonblue\">“你感觉到了罪恶感。”</span><br>";
@@ -259,7 +264,12 @@ namespace revattr
 				if($phase == 'rp')
 				{
 					$dice = diceroll(1777);
+
 					$log .= "<span class=\"yellow\">“对面似乎真的没有敌意，你还是决定要下手么？”</span><br>";
+					if ($pa['rp'] < 0){
+						$log .= "<span class=\"glitch1\">“不管你之前积了多少德，一个决定就是一个决定。”</span><br>";
+						$pa['rp'] = 1;	
+					}
 					if($dice<=200){
 						$log .= "<span class=\"neonblue\">“你感觉到了罪恶感。”</span><br>";
 					}elseif($dice<=400){
@@ -285,6 +295,10 @@ namespace revattr
 				{
 					$dice = rand(1777,4888);
 					$log .= "<span class=\"yellow\">“你对一位毫无反抗能力，并且已经表示无敌意的女高中生横下死手。”</span><br>";
+					if ($pa['rp'] < 0){
+						$log .= "<span class=\"glitch1\">“不管你之前积了多少德，一个决定就是一个决定。”</span><br>";
+						$pa['rp'] = 1;	
+					}
 					$log .= "<span class=\"neonblue\">“希望你的良心还能得以安生。”</span><br>";
 					//$log .= "<span class=\"neonblue\">“【DEBUG】你的rp上升了<span class=\"red\">$dice</span>点。”</span><br>";
 					$rp_up = $pa['rp'] + $dice;

include/game/song.inc.php

@@ -12,7 +12,11 @@
 	global $pdata;
 	
 	//登记非功能性地点信息时合并隐藏地点
-	foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
+	//To be frank, from a story perspective, hidden maps shouldn't be affected by songs anyways.
+	//Patch this out as a temp solution to the movelist oddity.
+	//foreach($hplsinfo as $hgroup=>$hpls) $plsinfo += $hpls;
+
+	//A better fix would be removing $hplsinfo from $plsinfo after processing the song. But still.
 
 	//$log.=$sn.'_'.$now.'_'.$pls.'_'.$name."<br>";
 	$r=$arte;

include/game20130526.js

@@ -481,6 +481,37 @@ function AddElementsToList(ekey,enums)
 	$('emixinfotop').style.display = 'block';
 }
 
+function AddMixElements(emix_arr) {
+	var list = $('emixlist').value;
+	var nums = $('emixnums').value;
+	var desc = $('emixinfo').innerHTML;
+	var keyarr = [];
+	var numsarr = [];
+	var descarr = [];
+	const esum = [];
+	
+	for (let i = 0; i < emix_arr.length; i++) {
+		esum[emix_arr[i][0]] = (esum[emix_arr[i][0]] || 0) + emix_arr[i][1];
+	}		
+	for (let i = 0; i < emix_arr.length; i++) {
+		if($('maxe' + emix_arr[i][0] + 'num') === null || ($('maxe' + emix_arr[i][0] + 'num').value - esum[emix_arr[i][0]]) < 0) {
+			window.alert("合成所需的元素数量不足。");
+			return;
+		}
+	}
+	for (let i = 0; i < emix_arr.length; i++) {
+		$('maxe' + emix_arr[i][0] + 'num').value -= emix_arr[i][1];
+		$('e' + emix_arr[i][0] + 'num').value = $('maxe' + emix_arr[i][0] + 'num').value;
+		keyarr.push(emix_arr[i][0]);
+		numsarr.push(emix_arr[i][1]);
+		descarr.push(emix_arr[i][1] + ' 份 ' + $('edesc' + emix_arr[i][0]).innerHTML);
+	}
+	$('emixlist').value = keyarr.join('+');
+	$('emixnums').value = numsarr.join('+');
+	$('emixinfo').innerHTML = descarr.join('、');
+	$('emixinfotop').style.display = 'block';
+}
+
 function changeVolume(cv){ 
 	var v = $('gamebgm').volume;
 	v = v+cv;

include/news.func.php

@@ -219,6 +219,8 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>被御柱创死了！";
 			} elseif($news == 'death42'){
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>活用了单人脱出程序机构，提前离开了虚拟幻境！";
+			} elseif($news == 'death50'){
+				$newsinfo .= "<span class=\"rainbow\"><li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>牺牲了自己，在虚拟幻境的天空中炸出了一片红霞！</span>";
 			} else {
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因<span class=\"red\">不明原因</span>死亡";
 			}

include/state.func.php

@@ -59,6 +59,8 @@
 			$state = 40;
 		} elseif ($death == 's_escape'){
 			$state = 42;
+		} elseif ($death == 'sdestruct'){
+			$state = 50;
 		} else {
 			$state = 10;
 		}

templates/default/elementmix.htm

@@ -59,6 +59,11 @@
 </div>
 <br>
 
+<!--根据元素笔记中已知的合成公式进行快速投料-->
+<!--{eval include_once GAME_ROOT.'./include/game/elementmix.func.php';$quickmix = quick_add_mix_elements($pdata);}-->
+<span class="yellow" >【快速合成】</span><br>
+{$quickmix}
+<br>
 <!--自带：通过投入元素数量的奇偶决定道具类别-->
 <span class="yellow" >【数术】</span><br>
 › 投入份数<span class="lime">最多(±10)</span>的一种或多种元素<br>