Merge pull request #127 from hikawiier/waaagh

fix wep2

include/game/battle.func.php

@@ -115,7 +115,7 @@ function findcorpse(&$w_pdata){
 		$log .= '你发现了<span class="red">'.$w_name.'</span>的尸体！<br>';
 
 		// 初始化尸体tooltip
-		foreach (Array('wep','arb','arh','ara','arf','art','itm0','itm1','itm2','itm3','itm4','itm5','itm6') as $value) 
+		foreach (Array('wep','wep2','arb','arh','ara','arf','art','itm0','itm1','itm2','itm3','itm4','itm5','itm6') as $value) 
 		{
 			$value = 'w_'.$value;
 			if(strpos($value,'itm')!==false)

include/game/itemmain.func.php

@@ -1358,14 +1358,14 @@ function getcorpse($item,&$data=NULL)
 		return;
 	}
 	
-	if($item == 'wep') {
-		$itm0 = $edata['wep'];
-		$itmk0 = $edata['wepk'];
-		$itme0 = $edata['wepe'];
-		$itms0 = $edata['weps'];
-		$itmsk0 = $edata['wepsk'];
-		$edata['wep'] = $edata['wepk'] = $edata['wepsk'] = '';
-		$edata['wepe'] = $edata['weps'] = 0;  
+	if($item == 'wep' || $item == 'wep2') {
+		$itm0 = $edata[$item];
+		$itmk0 = $edata[$item.'k'];
+		$itme0 = $edata[$item.'e'];
+		$itms0 = $edata[$item.'s'];
+		$itmsk0 = $edata[$item.'sk'];
+		$edata[$item] = $edata[$item.'k'] = $edata[$item.'sk'] = '';
+		$edata[$item.'e'] = $edata[$item.'s'] = 0;  
 	} elseif(strpos($item,'ar') === 0) {
 		$itm0 = $edata[$item];
 		$itmk0 = $edata[$item.'k'];

include/game/search.func.php

@@ -651,7 +651,7 @@ function discover($schmode = 0,&$data=NULL)
 					//直接略过无效尸体
 					if($gamestate>=40) continue;
 					$ret = false;
-					foreach(array('money','arhs','aras','arfs','arts','itms1','itms2','itms3','itms4','itms5','itms6') as $chkval)
+					foreach(array('weps','wep2s','money','arhs','aras','arfs','arts','itms1','itms2','itms3','itms4','itms5','itms6') as $chkval)
 					{
 						if($edata[$chkval]) 
 						{

include/resources.func.php

@@ -9,7 +9,7 @@ if(!defined('IN_GAME')) {
 function get_equip_list($mode=0)
 {
 	//装备列表
-	$equip_list = Array('wep','arb','arh','ara','arf','art');
+	$equip_list = Array('wep','wep2','arb','arh','ara','arf','art');
 	$equip_list2 = Array
 	(
 		'W' => 'wep',

templates/default/corpse.htm

@@ -19,6 +19,9 @@
 <!--{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}-->
+<!--{if $w_wep2s && $w_wep2e}-->
+<input type="radio" name="command" id="wep2" value="wep2"><a onclick=sl('wep2'); href="javascript:void(0);" >$w_wep2/$w_wep2k_words/$w_wep2e/$w_wep2s<!--{if $w_wep2sk_words}-->/$w_wep2sk_words<!--{/if}--></a><br>
+<!--{/if}-->
 <!--{if $w_arbs && $w_arbe}-->
 <input type="radio" name="command" id="arb" value="arb"><a onclick=sl('arb'); href="javascript:void(0);" >$w_arb/$w_arbk_words/$w_arbe/$w_arbs<!--{if $w_arbsk_words}-->/$w_arbsk_words<!--{/if}--></a><br>
 <!--{/if}-->