interim2

gamedata/sql/players.sql

@@ -148,6 +148,16 @@ CREATE TABLE bra_players (
   statusc int(10) NOT NULL default '0',
   statusd int(10) NOT NULL default '0',
   statuse int(10) NOT NULL default '0',
+  clbstatusa int(10) NOT NULL default '0',
+  clbstatusb int(10) NOT NULL default '0',
+  clbstatusc int(10) NOT NULL default '0',
+  clbstatusd int(10) NOT NULL default '0',
+  clbstatuse int(10) NOT NULL default '0',
+  nikstatusa int(10) NOT NULL default '0',
+  nikstatusb int(10) NOT NULL default '0',
+  nikstatusc int(10) NOT NULL default '0',
+  nikstatusd int(10) NOT NULL default '0',
+  nikstatuse int(10) NOT NULL default '0',
   element0 mediumint unsigned NOT NULL default '0',
   element1 mediumint unsigned NOT NULL default '0',
   element2 mediumint unsigned NOT NULL default '0',

include/game/achievement.func.php

@@ -1085,13 +1085,13 @@ function check_item_achievement($nn,$i,$ie,$is,$ik,$isk)
 		if ($uu>9999999) $uu=9999999;
 		update_achievement(55,$nn,$uu);
 		if (((int)fetch_achievement(55,$nn)>=17777) && (check_achievement(55,$nn))<999) {
-			done_achievement(54,999,$nn);
+			done_achievement(55,999,$nn);
 			$db->query("UPDATE {$tablepre}users SET credits=credits WHERE username='".$nn."'" );
 			$db->query("UPDATE {$tablepre}users SET credits2=credits2+200 WHERE username='".$nn."'" );
 			include_once GAME_ROOT.'./include/game/titles.func.php';
 			get_title("无情补丁",$nn);
 			}
-			elseif ((int)fetch_achievement(55,$nn)>=77777 && (check_achievement(55,$nn)<2)) {
+			elseif ((int)fetch_achievement(55,$nn)>=1777 && (check_achievement(55,$nn)<2)) {
 			done_achievement(55,2,$nn);
 			$db->query("UPDATE {$tablepre}users SET credits=credits WHERE username='".$nn."'" );
 			$db->query("UPDATE {$tablepre}users SET credits2=credits2+50 WHERE username='".$nn."'" );

include/game/clubskills.func.php

@@ -1047,7 +1047,7 @@ function get_clubskill_bonus_spd($clb,$skl)
 	$r=1;
 	for ($i=1; $i<=2; $i++)
 	{
-		if ($clb==13) $r*=(1-$clskl[13][${'a'.$i}][1]/100);	//超能力者称号
+		if ($clb==9) $r*=(1-$clskl[13][${'a'.$i}][1]/100);	//超能力者称号
 	}
 	return $r;
 }

include/game/dice.func.php

+<?php
+
+if(!defined('IN_GAME')) {
+	exit('Access Denied');
+}
+// File to process all dice related actions.
+// Moving all logic related to $dice here
+// 这样「奇迹的篝火」类头衔也好处理一点。
+
+// So basically, replace all $dice rands and implement new dice items.
+// Let's roll.
+
+require_once './include/common.inc.php';
+
+function diceroll($dice){
+    global $rp, $nick;
+    global $log;
+    global $nikstatusa, $nikstatuse;
+    $result = rand(0, $dice);
+
+    //process 孤注一掷
+    if($nikstatusa == 1){
+        //set dice to max value
+        $result = $dice;
+        //reset
+        $nikstatusa = $nikstatuse = 0;
+    }elseif($nikstatusa == 2){
+        //set dice to mid value
+        $result = round($dice / 2);
+        $nikstatusa = $nikstatuse = 0;
+    }elseif($nikstatusa == 3){
+        //set dice to 1
+        $result = 1;
+        $nikstatusa = $nikstatuse = 0;
+    }
+
+    if($nick =="奇迹的篝火"){
+        $log .= "你本次骰子的检定结果为：<br><span class=\"red\">$result</span>＼<span class=\"yellow\">$dice</span>！<br>";
+    }
+    $log .= "【DEBUG】你本次骰子的检定结果为：<br><span class=\"red\">$result</span>＼<span class=\"yellow\">$dice</span>！<br>";
+    return $result;
+}
+
+?>
\ No newline at end of file

include/game/item.func.php

@@ -789,7 +789,10 @@ function itemuse($itmn) {
 		$log.="你打开了<span class=\"yellow\">$itm</span>。<br>";
 		if(strpos( $itmk, 'ps' ) === 0){//银色盒子
 			include_once config('randomitem',$gamecfg);
-			$dice = rand(1,100);
+			//1st case of the new diceroll system.
+			include_once GAME_ROOT.'./include/game/dice.func.php';
+			$dice = diceroll(100);
+			//$dice = rand(1,100);
 			if($dice <= 75){//一般物品
 				$itemflag = $itmlow;
 			}elseif($dice <= 95){//中级道具
@@ -869,6 +872,11 @@ function itemuse($itmn) {
 		$trapresult = $db->query("SELECT * FROM {$tablepre}maptrap WHERE pls = '$pls' AND itme>='$itme'");
 		$trpnum = $db->num_rows($trapresult);
 		$itms--;
+		if ($itms <= 0) {
+			$log .= "<span class=\"red\">$itm</span>用光了。<br>";
+			$itm = $itmk = $itmsk = '';
+			$itme = $itms = 0;
+		}
 		if ($trpnum>0){
 			$itemno = rand(0,$trpnum-1);
 			$db->data_seek($trapresult,$itemno);

templates/default/end.htm

@@ -437,7 +437,7 @@
 把手上缠绕着和少女手腕上相同的丝带；<br>
 剑柄上闪耀着亮蓝色的条形霓虹灯光；<br>
 底端的刃上则是闪耀的橙色火焰。<br><br>
-<img border="0" src="/img/Miracle Campfire.jpg"><br><br>
+<img border="0" src="/img/miracle_campfire.jpg"><br><br>
 <span class="linen">“Unlimited Code Works: Miracle Campfire, Activate.”</span><br>
 少女伸出了左手，示意着你接过武器。<br>
 不知道被什么驱使，你接过了这柄看起来沉重却无比轻盈的武器。<br>

templates/default/winnerlist.htm

@@ -30,7 +30,9 @@
 			<TD class="b3"><!--{if $info['hkill']}--><span class="white"><u><a href="user_profile.php?playerID=$info['hkp']">$info['hkp']</a></u></span><!--{else}--><span class="grey">无</span><!--{/if}--></TD>
 			<TD class="b3">
 				<span>
+					<!--{if $info['wmode'] && $info['wmode'] != 1 && $info['wmode'] !=4 && $info['wmode'] != 6}--><span class="white"><a href="winner.php?command=info&gnum=$info[gid]">🥇</a></span><!--{else}-->　<!--{/if}-->
 					<input type="button" value="角色信息" <!--{if $info['wmode'] && $info['wmode'] != 1 && $info['wmode'] !=4 && $info['wmode'] != 6}-->onclick="$('command').value='info';$('gnum').value='$gid';document.info.submit();"<!--{else}-->disabled<!--{/if}-->>
+					<!--{if $info['wmode'] && $info['wmode'] !=4}--><span class="white"><a href="winner.php?command=news&gnum=$info[gid]">📼</a></span><!--{else}-->　<!--{/if}-->
 					<input type="button" value="该局状况" <!--{if $info['wmode'] && $info['wmode'] !=4}-->onclick="$('command').value='news';$('gnum').value='$gid';document.info.submit();"<!--{else}-->disabled<!--{/if}-->>
 				</span>
 			</TD>