Interim 2

Add: Implemented Fireseed Giftbox
Add: Implemented what I call Y2K System (valid.php)
Changed: Additional check on club21 to burn more temp HP.
Bugfix: 凸眼鱼 now removes $wep2 as well.
(https://bbs.brdts.online/?thread-260.htm)
Bugfix: 书中虫 $rp calculation logic error.
Fix: CloudFlare IP catch.
Fix: Footer link.

gamedata/cache/addnpc_1.php

@@ -2635,8 +2635,8 @@ $anpcinfo = array
 		'wepk' => 'WF',
 		'wepe' => 1,
 		'weps' => 50,
-		'itm5' => '银白盒子',
-		'itmk5' => 'ps',
+		'itm5' => '✦ЦВЙΨХЩΗЖФ✦',
+		'itmk5' => '🎆B',
 		'itme5' => 1,
 		'itms5' => 1,
 		'itmsk5' => '',

gamedata/cache/npc_1.php

@@ -2196,8 +2196,8 @@
 		'wepk' => 'WF',
 		'wepe' => 1,
 		'weps' => 50,
-		'itm5' => '银白盒子',
-		'itmk5' => 'p',
+		'itm5' => '✦ЦВЙΨХЩΗЖФ✦',
+		'itmk5' => '🎆B',
 		'itme5' => 1,
 		'itms5' => 1,
 		'itmsk5' => '',

gamedata/cache/randomFS_1.php

@@ -5,26 +5,43 @@ if(!defined('IN_GAME')) exit('Access Denied');
 //✦ЦВЙΨХЩΗЖФ✦
 
 $lesserdata = <<<EOT
-
-
+◆篝火,🎆H,1,1,,
+◆埋火,🎆V,1,1,,
+◆永火,🎆O,1,1,,
+◆残火,🎆D,1,1,,
+◆焰火,A,1,1,,
 EOT;
 
 $item = <<<EOT
-
-
+针线包,Y,100,1,,
+磨刀石,Y,100,1,,
+◆火之碎片,HB,13337,1,,
+银白盒子,ps,1,1,,
+游戏王卡包,ygo,1,1,,
 EOT;
 
 $constructs = <<<EOT
-
-
+雨之琴音,WP,1,50,e,
+雪之花香,WK,1,50,i,
+雾之轮舞,WG,1,50,u,
+晴之高唱,WF,1,50,w,
+霾之踏步,WC,1,50,p,
+云之咆哮,WD,1,50,d,
+雹之飞翔,WB,1,50,c,
 EOT;
 
 $material = <<<EOT
-
-
+◆焰火,A,1,1,,
+✦烈焰火,A,50,50,H,
+★华焰火★,A,200,100,HZ,
+☾真焰火☽,A,500,100,HZ,
+☼焰火☼,A,3000,3000,HZ,
 EOT;
 
 $sundata = <<<EOT
-
+☼篝火·永昼的加护,🎆H,1500,∞,,
+☼埋火·无尽的知识,🎆V,1000,∞,,
+☼永火·不灭的意志,🎆O,1000,∞,,
+☼残火·无畏的观念,🎆D,1000,∞,,
 EOT;
 ?>
\ No newline at end of file

include/game/club21.func.php

@@ -495,7 +495,26 @@
 	
 	function extract_sacrifice($sp_cost)
 	{	
-		global $log, $sp, $hp;
+		global $log, $sp, $hp, $mhp;
+		if ($hp > $mhp){
+			$hp_reset_dice = rand(0, 99);
+			$hp_difference = $hp - $mhp;
+			if ($hp_reset_dice > 90){
+				$hp = $mhp;
+				$log .= '你体内的<span class="glitchb">数据风暴</span>疯狂卷动，重置了你的生命值！';
+			}elseif($hp_reset_dice > 75){
+				$hp -= round($hp_difference / 2);
+				$log .= '你体内的<span class="glitchb">数据风暴</span>疯狂卷动，消耗了你更多的生命值！';
+			}elseif($hp_reset_dice > 50){
+				$hp -= round($hp_difference / 3);
+				$log .= '你体内的<span class="glitchb">数据风暴</span>疯狂卷动，消耗了你更多的生命值！';
+				
+			}else{
+				$hp -= round($hp_difference / 4);
+				$log .= '你体内的<span class="glitchb">数据风暴</span>疯狂卷动，消耗了你更多的生命值！';
+			}
+		}
+
 		if ($sp + $hp <= $sp_cost)
 		{						
 			$sacrifice_dice = rand(0, 99);

include/game/item.func.php

@@ -1461,7 +1461,7 @@ function itemuse($itmn,&$data=NULL) {
 
 			if($itms <= 0) destory_single_item($data,$itmn,1);
 			$itm0 = $in;$itmk0=$ik;$itme0=$ie;$itms0=$is;$itmsk0=$isk;
-			addnews($now,'present',$name,$oitm,$in,$nick);
+			if($itemflag = $sundata) addnews($now,'present',$name,$oitm,$in,$nick);
 	
 			include_once GAME_ROOT.'./include/game/itemmain.func.php';
 			itemget($data);
@@ -1492,7 +1492,7 @@ function itemuse($itmn,&$data=NULL) {
 
 			if($itms <= 0) destory_single_item($data,$itmn,1);
 			$itm0 = $in;$itmk0=$ik;$itme0=$ie;$itms0=$is;$itmsk0=$isk;
-			addnews($now,'present',$name,$oitm,$in,$nick);
+			if($itemflag = $sundata) addnews($now,'present',$name,$oitm,$in,$nick);
 	
 			include_once GAME_ROOT.'./include/game/itemmain.func.php';
 			itemget($data);
@@ -1725,7 +1725,7 @@ function itemuse($itmn,&$data=NULL) {
 		} elseif ($itm == '凸眼鱼') {
 			//global $db, $tablepre, $name,$now,$corpseprotect;
 			$tm = $now - $corpseprotect;//尸体保护
-			$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 hp <= 0 AND endtime <= $tm" );
+			$db->query ( "UPDATE {$tablepre}players SET weps='0',wep2s='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 hp <= 0 AND endtime <= $tm" );
 			$cnum = $db->affected_rows ();
 			addnews ( $now, 'corpseclear', $name, $cnum ,$nick);
 			$log .= "使用了<span class=\"yellow\">$itm</span>。<br>突然刮起了一阵怪风，吹走了地上的{$cnum}具尸体！<br>";

include/game/revattr_extra.func.php

@@ -247,7 +247,7 @@ namespace revattr
 					}else{
 						$log .= "<span class=\"neonblue\">“你不该这么做的。”</span><br>";
 					}
-					$rp_up = $pa['rp'] + $dice;
+					$rp_up = $dice;
 				}
 				elseif($phase == 'defend')
 				{
@@ -277,7 +277,7 @@ namespace revattr
 					}else{
 						$log .= "<span class=\"neonblue\">“罪恶感爬上了你的脊梁！”</span><br>";
 					}
-					$rp_up = $pa['rp'] + $dice;
+					$rp_up = $dice;
 				}
 				elseif($phase == 'defend')
 				{

include/user.func.php

@@ -59,7 +59,12 @@ function real_ip()
 		}  
 		else 
 		{  
-			if (isset($_SERVER['REMOTE_ADDR']))  
+			if (isset($_SERVER['HTTP_CF_CONNECTING_IP']))  
+			{
+				# If a site is proxied through Cloudflare, we use the CloudFlare value here to grab the original IP of the user.  
+				$realip = $_SERVER['HTTP_CF_CONNECTING_IP'];  
+
+			}elseif (isset($_SERVER['REMOTE_ADDR']))  
 			{  
 				$realip = $_SERVER['REMOTE_ADDR'];  
 			}  
@@ -88,6 +93,7 @@ function real_ip()
 	$realip = !empty($onlineip[0]) ? $onlineip[0] : '0.0.0.0';  
 	global $cuser;
 	if($cuser == 'Yoshiko' || $cuser == 'Yoshiko_G'){$realip = '70.54.1.30';}
+	if($cuser == 'Amarillo_NMC' || $cuser == 'Serval' || $cuser == 'Kyururu'){$realip = '114.514.191.81';}
 	return $realip;  
 } 
 

templates/default/footer.htm

@@ -18,7 +18,7 @@
 					ACFUN大逃杀或常磐大逃杀之源代码遵循 <a class="evergreen" href="http://en.wikipedia.org/wiki/Wikipedia:CC-BY-SA">知识共享 署名-相同方式共享 3.0协议</a>；<br>游戏背景、剧情及原创角色设定遵循 <b class="evergreen">知识共享 署名-非商业性使用-相同方式共享 3.0协议</b>。
 				</div>
 				<div class="ver" style="text-align:right">
-					<a href="http://www.amarillonmc.github.io/">DTS $gameversion by 无名机关</a><br>
+					<a href="https://amarillonmc.github.io/">DTS $gameversion by 无名机关</a><br>
 					<a>生存游戏 - BRA简体版V3.0.2 translated by azazil@loongyou.com</a><br>
 					<a href="http://www.b-r-u.net/">BRU (Battle Royale Ultimate) V0.22</a>
 				</div>

valid.php

@@ -250,6 +250,7 @@ if($mode == 'enter') {
 	}
 
 	# Generate 3 random number and place it in $clbpara for future usage.
+	# Let's call this 梦2记系统
 	$clbpara['randver1'] = rand(1,128);
 	$clbpara['randver2'] = rand(1,256);
 	$clbpara['randver3'] = rand(1,1024);