Merge pull request #24 from hikawiier/waaagh

celebrate 1002?

command.php

@@ -138,7 +138,7 @@ if($hp > 0){
 						global $elements_info;
 						include_once GAME_ROOT.'./include/game/elementmix.func.php';
 						$emax = get_emix_itme_max();
-						foreach($elements_info as $e_key=>$e_info) ${'etaginfo'.$e_key} ="<span title=\"".print_elements_tags($e_key)."\">";
+						foreach($elements_info as $e_key=>$e_info) ${'etaginfo'.$e_key} ="<span tooltip=\"".print_elements_tags($e_key)."\">";
 					}
 					$mode = $itemcmd;
 				}

gamedata/cache/combatcfg_1.php

 <?php
 
+//暂时放在这里……
+//是否允许销毁尸体（1：开启）
+$allow_destory_corpse = 0;
+//销毁尸体会导致rp上升最多多少点
+$rpup_destory_corpse = 233;
+//如果允许销毁尸体 以下哪些种类的尸体不可以被销毁
+$no_destory_corpse_type = Array();
+
 //基础反击率
 $counter_obbs =  Array('N' => 60, 'P' => 65, 'K' => 65, 'G' => 50, 'C' => 35, 'D' => 0, 'F'=> 35, 'J'=> 20);
 //各种攻击方式的射程，射程大者可以反击射程小者，此外射程为0则代表不能反击任何系但也不能被任何系反击
@@ -31,14 +39,25 @@ $def_kind = Array(
 $weather_attack_modifier = Array(10,10,0,-5,-10,-20,-15,0,0,7,20,-7,-20,-5,-10,-10,-10,10);
 //天气对防御力的影响（单位：百分比加算）
 $weather_defend_modifier = Array(10,30,0,0,-3,-15,-10,0,-20,-30,-50,-5,-20,-3,-20,5,-30,30);
+
+//姿态对攻击力的影响始终生效（1：只在作出先制攻击时生效）
+$pose_attack_active = 0;
 //姿态对攻击力的影响（单位：百分比加算）
 $pose_attack_modifier = Array(0,100,0,-25,25,-50,50);
+//姿态对防御力的影响始终生效（1：只在受到先制攻击伤害时生效）
+$pose_defend_active = 0;
 //姿态对防御力的影响（单位：百分比加算）
 $pose_defend_modifier = Array(0,25,0,-25,-50,-50,-466);
+
+//应战策略对攻击力的影响始终生效（1：只在作出反击时生效）
+$tactic_attack_active = 0;
 //应战策略对攻击力的加成（单位：百分比加算）
 $tactic_attack_modifier = Array(0,20,-25,25,-50);
+//应战策略对防御力的影响始终生效（1：只在受反击伤害时生效）
+$tactic_defend_active = 0;
 //应战策略对防御力的加成（单位：百分比加算）
 $tactic_defend_modifier = Array(0,-20,50,-25,0);
+
 //场景对攻击力的加成（单位：百分比加算） wtf
 $pls_attack_modifier = Array(
     // 无月 端点 RF高 雪镇 索拉 指挥 梦幻 清水 白穗 墓地 麦斯 对天 夏镇 三体 光坂 守矢 常林 常高 秋镇 精灵 春镇 圣G  初始 幻想 永恒 妖精 冰封 花菱 FARG 风祭 格纳 和田 SCP  雏菊 英灵

gamedata/cache/style_20190718.css

@@ -368,6 +368,7 @@ span[tooltip]:hover:before {
     content: attr(tooltip);
 	overflow-x:hidden;overflow-y:auto; padding: 3px; 
 	font: bold 10pt "微软雅黑" serif; color: white; 
+	white-space:pre-line;
 	text-shadow:3px 3px 3px #3b3535; text-align: center; text-fill-color: white; -webkit-text-fill-color: white;
 	background-size: 0; background-clip: border-box; background-color: rgba(198, 114, 199, 0.8);
 	top: 20px; left: -5px; border-radius: 2px;

help.php

@@ -130,9 +130,13 @@ if(filemtime($vnmixfile) > filemtime($writefile) ||filemtime($mixfile) > filemti
 			for ($i=0; $i<=4; $i++)
 			{
 				$mixhelpinfo .= "<td class=\"b3\" ";
-				if ($i==0)  $mixhelpinfo .= "height=20px ";
-				if ($val['stuff'][$i]!='-') $mixhelpinfo .= "title=\"".get_item_place($val['stuff'][$i])."\" ";
-				$mixhelpinfo .= "><span>{$val['stuff'][$i]}</span></td>";
+				if ($i==0)  $mixhelpinfo .= "height=20px";
+				if ($val['stuff'][$i]!='-')
+				{
+					$tooltipinfo = get_item_place($val['stuff'][$i]);
+					if(!empty($tooltipinfo)) $mixhelpinfo .= "><span tooltip=\"".$tooltipinfo."\" ";
+				}
+				$mixhelpinfo .= ">{$val['stuff'][$i]}</span></td>";
 				//修复加入悬浮提示后出现的问题。
 			}
 //			$mixhelpinfo .= "<td class=\"b3\">→</td>

include/admin/vnmixlist.php

@@ -3,6 +3,7 @@ if(!defined('IN_ADMIN')) {
 	exit('Access Denied');
 }
 require config('vnworld',$gamecfg);
+//require './include/game/itemplace.func.php';
 
 if(!isset($vncmd)){$vncmd = 'none';}
 
@@ -19,6 +20,14 @@ if(file_exists($cache_file))
 		{
 			foreach($vn_arr as $vn_type => $vn_info)
 			{
+				/*if($vn_type == 'stuff')
+				{
+					// 格式化素材来源
+					foreach($vn_info as $sid => $snm)
+					{
+						$temp_mixinfo[$vn_key][$vn_type][$sid] = "<span tooltip=\"".get_item_place($snm)."\">".$snm."</span>";
+					}
+				}*/
 				if($vn_type == 'result')
 				{
 					$temp_mixinfo[$vn_key][$vn_type][1] = $temp_vniteminfo[$vn_info[1]];
@@ -57,7 +66,7 @@ if(strpos($vncmd ,'del')===0)
 	}
 	else 
 	{
-		$vname = $flag['name'];
+		$vname = $flag['name']; $vresult = $flag['result'][0];
 		$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$vname'");
 		if(!$db->num_rows($result))
 		{
@@ -67,6 +76,7 @@ if(strpos($vncmd ,'del')===0)
 		$vdata = $db->fetch_array($result);
 		post_back_vn_cache_file($vdata,$flag);
 	}
+	adminlog('回退了配方',$vresult);
 	$cmd_info = "已回退配方{$vnid}！";
 	return;
 }

include/game.func.php

@@ -42,6 +42,11 @@ function init_profile(){
 	global $nospk,$wepsk_words,$arbsk_words,$arhsk_words,$arask_words,$arfsk_words,$artsk_words,$itmsk0_words,$itmsk1_words,$itmsk2_words,$itmsk3_words,$itmsk4_words,$itmsk5_words,$itmsk6_words;
 	global $wepk_words,$arbk_words,$arhk_words,$arak_words,$arfk_words,$artk_words,$itmk0_words,$itmk1_words,$itmk2_words,$itmk3_words,$itmk4_words,$itmk5_words,$itmk6_words;
 	global $wep,$arb,$arh,$ara,$arf,$art,$itm0,$itm1,$itm2,$itm3,$itm4,$itm5,$itm6;
+	global $definfo,$atkinfo,$pdata;
+	
+	include_once GAME_ROOT.'./include/game/revattr.func.php';
+	$atkinfo = get_base_att($pdata,$pdata,1,1);
+	$definfo = get_base_def($pdata,$pdata,1,1);
 
 	foreach (Array('wep','arb','arh','ara','arf','art','itm0','itm1','itm2','itm3','itm4','itm5','itm6') as $value) 
 	{

include/game/battle.func.php

@@ -80,7 +80,7 @@ function findteam(&$w_pdata){
 function findcorpse(&$w_pdata){
 	global $log,$mode,$main,$battle_title,$cmd,$iteminfo,$itemspkinfo;
 	global $w_type,$w_name,$w_gd,$w_sNo,$w_icon,$w_hp,$w_mhp,$w_wep,$w_wepk,$w_wepe,$w_lvl,$w_pose,$w_tactic,$w_inf,$w_rp;//,$itmsk0;
-	global $club;
+	global $club,$allow_destory_corpse,$no_destory_corpse_type;
 
 	$battle_title = '发现尸体';
 	extract($w_pdata,EXTR_PREFIX_ALL,'w');

include/game/itemmain.func.php

@@ -813,7 +813,7 @@ function itemmix($mlist, $itemselect=-1) {
 			itemreduce('itm'.$val);
 		}
 
-		global $itm0,$itmk0,$itme0,$itms0,$itmsk0;
+		global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$now;
 
 		list($itm0,$itmk0,$itme0,$itms0,$itmsk0) = $minfo['result'];
 		$log .= "<span class=\"yellow\">$itmstr</span>合成了<span class=\"yellow\">{$minfo['result'][0]}</span><br>";
@@ -998,8 +998,8 @@ function itembuy($item,$shop,$bnum=1) {
 
 function getcorpse($item){
 	global $db,$tablepre,$log,$mode;
-	global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$money,$pls,$action;
-	global $club;
+	global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$money,$pls,$action,$rp,$name;
+	global $club,$allow_destory_corpse,$no_destory_corpse_type,$rpup_destory_corpse;
 	$corpseid = strpos($action,'corpse')===0 ? str_replace('corpse','',$action) : str_replace('pacorpse','',$action);
 	if(!$corpseid || strpos($action,'corpse')===false){
 		$log .= '<span class="yellow">你没有遇到尸体，或已经离开现场！</span><br>';
@@ -1030,7 +1030,25 @@ function getcorpse($item){
 		return;
 	}
 
-	if($item == 'element_split')
+	if($item == 'destory')
+	{
+		if(!$allow_destory_corpse || in_array($w_type,$no_destory_corpse_type))
+		{
+			$log.="你还想对这具可怜的尸体干什么？麻烦给死者一点基本的尊重！<br>";
+			$action = '';
+			$mode = 'command';
+			return;
+		}
+		$log.="你销毁了{$edata['name']}的尸体。<br>但这一切值得吗……？<br>";
+		include_once GAME_ROOT.'./include/game/dice.func.php';
+		$rp += diceroll($rpup_destory_corpse);
+		addnews($now,'cdestroy',$name,$edata['name']);
+		destory_corpse($edata);
+		$action = '';
+		$mode = 'command';
+		return;
+	}
+	elseif($item == 'element_split')
 	{
 		if($club != 20)
 		{

include/game/itemplace.func.php

@@ -158,7 +158,7 @@ function get_item_place($which)
 			{
 				if ($iarea==99) $result.="每禁"; else $result.="{$iarea}禁";
 				if ($imap==99) $result.="全图随机"; else $result.="于{$plsinfo[$imap]}";
-				$result.="刷新{$inum}个
";
+				$result.="刷新{$inum}个 \r";
 			}
 		}
 	$file = config('shopitem',$gamecfg);
@@ -169,19 +169,22 @@ function get_item_place($which)
 			list($kind,$num,$price,$area,$item)=explode(',',$lst);
 			if ($item==$which)
 			{
-				$result.="{$area}禁起在商店中出售({$price}元)
";
+				$result.="{$area}禁起在商店中出售({$price}元) \r";
 			}
 		}
 	include_once config('mixitem',$gamecfg);
 	global $mixinfo;
-	foreach($mixinfo as $lst)
+	if(is_array($mixinfo))
 	{
-		if ($lst['result'][0]==$which || $lst['result'][0]==$which.' ')
+		foreach($mixinfo as $lst)
 		{
-			$result.="通过合成获取
";
-			break;
+			if ($lst['result'][0]==$which || $lst['result'][0]==$which.' ')
+			{
+				$result.="通过合成获取 \r";
+				break;
+			}
 		}
-	}	
+	}
 	$file=config('synitem',$gamecfg);
 	$synlist = openfile($file);
 	foreach($synlist as $lst)
@@ -190,7 +193,7 @@ function get_item_place($which)
 			list($item,$kind)=explode(',',$lst);
 			if ($item==$which)
 			{
-				$result.="通过同调合成获取
";
+				$result.="通过同调合成获取 \r";
 				break;
 			}
 		}
@@ -202,7 +205,7 @@ function get_item_place($which)
 			list($item,$kind)=explode(',',$lst);
 			if ($item==$which)
 			{
-				$result.="通过超量合成获取
";
+				$result.="通过超量合成获取 \r";
 				break;
 			}
 		}
@@ -214,7 +217,7 @@ function get_item_place($which)
 			list($item,$kind)=explode(',',$lst);
 			if ($item==$which)
 			{
-				$result.="打开礼品盒时有概率获得
";
+				$result.="打开礼品盒时有概率获得 \r";
 				break;
 			}
 		}
@@ -226,11 +229,62 @@ function get_item_place($which)
 			list($item,$kind)=explode(',',$lst);
 			if ($item==$which)
 			{
-				$result.="打开游戏王卡包时有概率获得
";
+				$result.="打开游戏王卡包时有概率获得 \r";
 				break;
 			}
 		}
-	if ($which=="悲叹之种") $result.="通过使用『灵魂宝石』强化物品失败获得
";
+	//打开福袋有几率获得
+	/*foreach(Array('00','O1','WC','WD','WF','WG','WK','WP','') as $rnm)
+	{
+		if(file_exists(config('random'.$rnm,$gamecfg)))
+		{
+			include_once config('random'.$rnm,$gamecfg);
+			foreach(Array('itmlow','itmmedium','itmhigh','antimeta') as $rlvl)
+			{
+				$item = explode("\r\n",$$rlvl);
+				foreach($item as $oi)
+				{
+					list($in) = explode(',',$oi);
+					if ($in==$which)
+					{
+						$result.="打开福袋时有概率获得 \r";
+						break;
+					}
+				}
+			}				
+		}
+	}
+	//NPC掉落
+	include_once config('npc',$gamecfg);
+	include_once config('addnpc',$gamecfg);
+	include_once config('evonpc',$gamecfg);
+	$nownpclist = Array();
+	$nownpclist = $npcinfo+$anpcinfo;
+	foreach($enpcinfo as $ekey => $enpcs)
+	{
+		foreach($enpcs as $sname => $enpc)
+		{
+			$nownpclist[$ekey]['sub'][$sname] = $enpc;
+		}
+	}
+	foreach($nownpclist as $npcs)
+	{
+		foreach(array('wep','arb','arh','ara','arf','art','itm1','itm2','itm3','itm4','itm5','itm6') as $nipval)
+		{
+			if(!empty($npcs['sub'])) 
+			{
+				foreach($npcs['sub'] as $npc)
+				{
+					if (isset($npc[$nipval]) && $npc[$nipval]==$which)
+					{
+						$result.="击败NPC {$npc['name']}时获得 \r";
+						break;
+					}
+				}
+			}
+		}
+	}*/
+	if ($which=="悲叹之种") $result.="通过使用『灵魂宝石』强化物品失败获得 \r";
 	return $result;
 }
 ?>

include/game/revcombat.func.php

@@ -147,6 +147,7 @@
 					$log .= npc_chat ($pd['type'],$pd['nm'], 'defend' );
 					# 反击打击实行
 					# 因为这时候进攻方(造成伤害)的一方是pd，所以向第一个位置传入pd，向第二个位置(防守方)传入pa。
+					$pd['is_counter'] = 1; //给pd一个反击标记，代表这是反击造成的伤害
 					$def_dmg = rev_attack($pd,$pa,1);
 				} 
 				else 

include/news.func.php

@@ -91,7 +91,7 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 		} elseif($news == 'revival') {
 			$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"lime\">{$a}因为及时按了BOMB键而原地满血复活了！</span><br>\n";
 		} elseif($news == 'aurora_revival')  {
-			$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"lime\">{$a}在奥罗拉的作用下原地复活了！</span></li>";
+			$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"lime\">{$a}在奥罗拉的作用下原地复活了！</span><br>\n";
 		} elseif(strpos($news,'death') === 0) {
 			if($news == 'death11') {
 				$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"yellow\">$a</span>因滞留在<span class=\"red\">禁区【{$plsinfo[$c]}】</span>死亡";
@@ -302,6 +302,8 @@ function  nparse_news($start = 0, $range = 0  ){//$type = '') {
 			$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"grey\">{$a}从安全箱中取出了道具{$b}。</span><br>\n";
 		} elseif($news == 'loot_depot') {
 			$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"grey\">{$a}将{$b}生前存放在安全箱里的东西转移到了自己的名下。哇……真是世风日下，道德沦丧啊！</span><br>\n";
+		} elseif($news == 'cdestroy') {
+			$newsinfo .= "<li>{$hour}时{$min}分{$sec}秒，<span class=\"red b\">{$a}把{$b}的尸体销毁了</span><br>\n";
 		} else {
 			$newsinfo .= "<li>$time,$news,$a,$b,$c,$d<br>\n";
 		}

templates/default/corpse.htm

 想要从尸体上拾取什么？<br><br>
 <input type="hidden" name="mode" value="corpse">
-<!--{if $club==20}-->
+<!--{if $allow_destory_corpse && !in_array($w_type,$no_destory_corpse_type)}-->
+<input type="radio" name="command" id="destory" value="destory" <!--{if !$w_money}-->checked<!--{/if}-->><a onclick=sl('destory'); href="javascript:void(0);" >销毁尸体</a><br>
+<!--{elseif $club==20}-->
 <input type="radio" name="command" id="element_split" value="element_split" <!--{if !$w_money}-->checked<!--{/if}-->><a onclick=sl('element_split'); href="javascript:void(0);" >提炼元素</a><br>
 <!--{/if}-->
 <!--{if $loot_depot_flag}-->
 <input type="radio" name="command" id="loot_depot" value="loot_depot"><a onclick=sl('loot_depot'); href="javascript:void(0);" >转移安全箱权限</a><br>
 <!--{/if}-->
-<input type="radio" name="command" id="menu" value="menu" <!--{if !$w_money && $club!=20 }-->checked<!--{/if}-->><a onclick=sl('menu'); href="javascript:void(0);" >返回</a><br><br>
+<input type="radio" name="command" id="menu" value="menu" <!--{if !$w_money && $club!=20 && !$allow_destory_corpse}-->checked<!--{/if}-->><a onclick=sl('menu'); href="javascript:void(0);" >返回</a><br><br>
 <!--{if $w_weps && $w_wepe}-->
 <input type="radio" name="command" id="wep" value="wep"><a onclick=sl('wep'); href="javascript:void(0);" >$w_wep/$w_wepk_words/$w_wepe/$w_weps<!--{if $w_wepsk_words}-->/$w_wepsk_words<!--{/if}--></a><br>
 <!--{/if}-->

templates/default/profile.htm

@@ -92,7 +92,7 @@
 				</tr>
 				<tr>
 					<td width="70" class="b2"><span>{lang att}</span></td>
-					<td width="80" class="b3"><span>$att + $wepe</span></td>
+					<td width="80" class="b3"><span>$atkinfo</span></td>
 					<td class="b2"><span>{lang money}</span></td>
 					<td class="b3"><span>$money {lang moneyunit}</span></td>
 					<td class="b2"><span><!--{if $wd >= 100}-->{lang wd}{lang skill}<!--{else}--><span class="grey">{lang wd}{lang skill}</span><!--{/if}--></span></td>
@@ -100,7 +100,7 @@
 				</tr>
 				<tr>
 					<td class="b2"><span>{lang def}</span></td>
-					<td class="b3"><span>$def + $ardef</span></td>
+					<td class="b3"><span>$definfo</span></td>
 					<td class="b2"><span>{lang inf}</span></td>
 					<td class="b3">
 						<span>

vn_postitem.php

@@ -67,7 +67,7 @@ if(isset($exmode) && strpos($exmode,'ep')===0)
 		$vlog = $flag;
 		goto error_edit2;
 	}
-	$edit_name = $flag['name'];
+	$edit_name = $flag['name']; $edit_result = $flag['result'][0];
 	unset($flag);
 	//通过检查，打包。
 	$flag = filter_post_mixlist($vsname0,$vsname1,$vsname2,$vsname3,$vsname4,$vrname,$vrk,$vre,$vrs,$vrsk0,$vrsk1,$vrsk2,$vrsk3,$vrsk4);
@@ -102,6 +102,7 @@ if(isset($exmode) && strpos($exmode,'ep')===0)
 		}
 		else 
 		{	
+			if($gmflag) vn_adminlog('编辑了配方',$edit_result);
 			$vlog .= '<span class="yellow">成功编辑了配方！</span><br>';
 			$vdata['url'] = 'vnworld.php?vtips=1';
 		}
@@ -133,7 +134,7 @@ elseif(isset($exmode) && strpos($exmode,'dp')===0)
 	}
 	else 
 	{
-		$edit_name = $flag['name'];
+		$edit_name = $flag['name']; $edit_result = $flag['result'][0];
 		unset($flag);
 		if($edit_name !== $udata['username'])
 		{
@@ -157,6 +158,7 @@ elseif(isset($exmode) && strpos($exmode,'dp')===0)
 		}
 		else 
 		{
+			if($gmflag) vn_adminlog('删除了配方',$edit_result);
 			$vlog = '删除了配方。<br>';
 			$vdata['url'] = 'vnworld.php?vtips=2';
 		}
@@ -195,7 +197,7 @@ elseif(isset($exmode) && strpos($exmode,'cs')===0)
 	}
 	else 
 	{
-		$edit_name = $flag['name'];
+		$edit_name = $flag['name']; $edit_result = $flag['result'][0];
 		unset($flag);
 		$result = $db->query("SELECT * FROM {$tablepre}users WHERE username='$edit_name'");
 		if(!$db->num_rows($result))
@@ -212,6 +214,7 @@ elseif(isset($exmode) && strpos($exmode,'cs')===0)
 		}
 		else 
 		{
+			if($gmflag) vn_adminlog('改变了以下配方状态',$edit_result,$change_status);
 			$vlog = '成功变更了配方状态。<br>';
 			$vdata['url'] = 'vnworld.php?vtips=3&vcs='.$change_status.'';
 		}
@@ -550,4 +553,14 @@ function filter_post_mixlist($vsname0,$vsname1,$vsname2,$vsname3,$vsname4,$vrnam
 	return $newarr;
 }
 
+function vn_adminlog($op,$an1='',$an2='',$an3=''){
+	global $now,$cuser;
+	$alfile = GAME_ROOT.'./gamedata/adminlog.php';
+	if($op){
+		$aldata = "$now,$cuser,$op,$an1,$an2,$an3,\n";
+		writeover($alfile,$aldata,'ab+');
+	}
+	return;
+}
+
 ?>

vnworld.php

@@ -3,6 +3,7 @@
 define('CURSCRIPT', 'vnworld');
 
 require './include/common.inc.php';
+require './include/game/itemplace.func.php';
 require config('vnworld',$gamecfg);
 
 /*** 登陆检测 ***/
@@ -34,6 +35,12 @@ if($vnmode=='none')
 			$temp_carr = $carr;
 			foreach($temp_carr as $cid => $cinfo)
 			{
+				// 格式化素材来源
+				foreach($cinfo['stuff'] as $sid => $snm)
+				{
+					$temp_carr[$cid]['stuff'][$sid] = "<span tooltip=\"".get_item_place($snm)."\">".$snm."</span>";
+				}
+				// 格式化属性
 				if(isset($cinfo['result'][4]) && is_array($cinfo['result'][4]))
 				{
 					foreach($cinfo['result'][4] as $sk)