Merge pull request #16 from hikawiier/waaagh

port back BIG

Merge pull request #16 from hikawiier/waaagh
port back BIG
a550e6fd · Nemo Ma · GitHub · f3f8d36f · 22c5a6af · a550e6fd
Commit a550e6fd authored Jan 30, 2023 by Nemo Ma Committed by GitHub Jan 30, 2023
20 changed files
--- a/img/f_10a.gif
+++ b/img/f_10a.gif
--- a/img/f_11a.gif
+++ b/img/f_11a.gif
--- a/img/f_12a.gif
+++ b/img/f_12a.gif
--- a/img/f_13a.gif
+++ b/img/f_13a.gif
--- a/img/f_1a.gif
+++ b/img/f_1a.gif
--- a/img/f_2a.gif
+++ b/img/f_2a.gif
--- a/img/f_3a.gif
+++ b/img/f_3a.gif
--- a/img/f_4a.gif
+++ b/img/f_4a.gif
--- a/img/f_5a.gif
+++ b/img/f_5a.gif
--- a/img/f_6a.gif
+++ b/img/f_6a.gif
--- a/img/f_7a.gif
+++ b/img/f_7a.gif
--- a/img/f_8a.gif
+++ b/img/f_8a.gif
--- a/img/f_9a.gif
+++ b/img/f_9a.gif
--- a/img/n_104.gif
+++ b/img/n_104.gif
--- a/img/n_104a.gif
+++ b/img/n_104a.gif
--- a/img/n_104old.gif
+++ b/img/n_104old.gif
--- a/img/n_52a.gif
+++ b/img/n_52a.gif
--- a/img/n_7a.gif
+++ b/img/n_7a.gif
--- a/include/game.func.php
+++ b/include/game.func.php
@@ -5,11 +5,19 @@ if(!defined('IN_GAME')) {
 }
 function init_playerdata(){
-	global $lvl,$baseexp,$exp,$gd,$icon,$arbe,$arhe,$arae,$arfe,$weather,$fog,$weps,$arbs,$log,$upexp,$lvlupexp,$iconImg,$ardef;
+	global $lvl,$baseexp,$exp,$gd,$icon,$arbe,$arhe,$arae,$arfe,$weather,$fog,$weps,$arbs,$log,$upexp,$lvlupexp,$iconImg,$iconImgB,$ardef;
 	$upexp = round(($lvl*$baseexp)+(($lvl+1)*$baseexp));
 	$lvlupexp = $upexp - $exp;
-	$iconImg = $gd.'_'.$icon.'.gif';
+	$iconImg = $gd.'_'.$icon; $iconImgB = NULL;
+	if(file_exists('img/'.$iconImg.'a.gif'))
+	{
+		$iconImgB = $iconImg.'a.gif';
+	}
+	else 
+	{
+		$iconImg = $iconImg.'.gif';
+	}
 	$ardef = $arbe + $arhe + $arae + $arfe;
 	if(($weather == 8)||($weather == 9)||($weather == 12)) {
 		$fog = true;
@@ -181,7 +189,7 @@ function init_profile(){
 function init_battle($ismeet = 0){
 	global $wep,$wepk;
-	global $w_type,$w_name,$w_gd,$w_sNo,$w_icon,$w_lvl,$w_rage,$w_hp,$w_sp,$w_mhp,$w_msp,$w_wep,$w_wepk,$w_wepe,$w_sNoinfo,$w_iconImg,$w_hpstate,$w_spstate,$w_ragestate,$w_wepestate,$w_isdead,$hpinfo,$spinfo,$rageinfo,$wepeinfo,$fog,$typeinfo,$sexinfo,$infinfo,$w_exp,$w_upexp,$baseexp,$w_pose,$w_tactic,$w_inf,$w_infdata;
+	global $w_type,$w_name,$w_gd,$w_sNo,$w_icon,$w_lvl,$w_rage,$w_hp,$w_sp,$w_mhp,$w_msp,$w_wep,$w_wepk,$w_wepe,$w_sNoinfo,$w_iconImg,$w_iconImgB,$w_hpstate,$w_spstate,$w_ragestate,$w_wepestate,$w_isdead,$hpinfo,$spinfo,$rageinfo,$wepeinfo,$fog,$typeinfo,$sexinfo,$infinfo,$w_exp,$w_upexp,$baseexp,$w_pose,$w_tactic,$w_inf,$w_infdata;
 	global $n_type,$n_name,$n_gd,$n_sNo,$n_icon,$n_hp,$n_mhp,$n_sp,$n_msp,$n_rage,$n_wep,$n_wepk,$n_wepe,$n_lvl,$n_pose,$n_tactic,$n_inf;
 	$w_upexp = round(($w_lvl*$baseexp)+(($w_lvl+1)*$baseexp));
@@ -288,7 +296,15 @@ function init_battle($ismeet = 0){
 		}
 		$w_sNoinfo = "$typeinfo[$w_type]({$sexinfo[$w_gd]}{$w_sNo}号)";
 	 	$w_i = $w_type > 0 ? 'n' : $w_gd;
-		$w_iconImg = $w_i.'_'.$w_icon.'.gif';
+		$w_iconImg = $w_i.'_'.$w_icon; $w_iconImgB = NULL;
+		if(file_exists('img/'.$w_iconImg.'a.gif'))
+		{
+			$w_iconImgB = $w_iconImg.'a.gif';
+		}
+		else 
+		{
+			$w_iconImg = $w_iconImg.'.gif';
+		}
 		if($w_inf) {
 			$w_infdata = '';
 			foreach ($infinfo as $inf_ky => $inf_nm) {

--- a/templates/default/battle.htm
+++ b/templates/default/battle.htm
@@ -173,106 +173,112 @@
 	body {background-image: url("../../img/location/34.jpg");background-position: center;}
 	</style>
  <!--{/if}-->
-<table border="0" width=720px height=380px cellspacing="0" cellpadding="0" valign="middle">
+<TABLE border="0" width=720px height=430px align="center" cellspacing="0" cellpadding="0" class="battle">
-	<TR align="center" >
+	<tr>
-		<TD valign="middle" class="b5">
+		<td class="b8" valign="top" rowspan=2>
-			<TABLE border="0" width=720px height=380px align="center" cellspacing="0" cellpadding="0" class="battle">
+			<div style="position:relative;width:140px;height:340px;">
+				<!--{if $w_iconImgB}-->
+				<IMG src="img/$w_iconImgB" style="border:0;height:340px;position:absolute;left:0px;top:0px;<!--{if $w_hp==0}-->filter: grayscale(100%)<!--{/if}-->" />
+				<!--{else}-->
+				<IMG src="img/$w_iconImg" style="border:0;height:80px;<!--{if $w_hp==0}-->filter: grayscale(100%)<!--{/if}-->" />
+				<!--{/if}-->
+			</div>
+		</td>
+		<td colspan=2 width=580px>
+			<table border="0" cellspacing="0" height=75px width=580px cellpadding="0" width="100%" valign="middle">
 				<tr>
-					<td>
+					<td class="b1" colspan=2 height=20px><span>Lv. $w_lvl</span></td>											
-						<table border="0" cellspacing="0" cellpadding="0" width="100%">
+					<td class="b1" colspan=2><span>$w_name</span></td>											
-							<tr>
+					<td class="b1" colspan=2><span>$w_sNoinfo</span><!--{if $club==19}--> 【<span class="lime">报应点数：<span id="anum">$w_rp</span></span>】<!--{/if}--></td>											
-								<td>
+				</tr>
-									<table border="0"  cellspacing="0" cellpadding="0" valign="top" width="100%">
-										<tr>
-											<td class="b1" colspan=2 height=20px><span>Lv. $w_lvl</span></td>											
-											<td class="b1" colspan=2><span>$w_name</span></td>											
-											<td class="b1" colspan=2><span>$w_sNoinfo</span><!--{if $club==19}--> 【<span class="lime">报应点数：<span id="anum">$w_rp</span></span>】<!--{/if}--></td>											
-											<td class="b5" rowspan=4 width=140px colspan=1 height=80px><IMG src="img/$w_iconImg" height=80px border="0" align="middle" <!--{if $w_hp==0}-->style="filter:Xray()"<!--{/if}--> /></td>
-										</tr>
-										<tr>
-											<td class="b2" width=75px height=20px><span>{lang rage}</span></td>
-											<td class="b3" width=90px><span>$w_ragestate</span></td>
-											<td class="b2" width=75px><span>{lang sp}</span></td>
-											<td class="b3" width=90px><span>$w_spstate</span></td>
-											<td class="b2" width=100px><span>{lang hp}</span></td>
-											<td class="b3" width=145px><span>$w_hpstate</span></td>
-										</tr>
-										<tr>
-											<td class="b2" height=20px><span>{lang wep}{lang effect}</span></td>
-											<td class="b3"><span>$w_wepestate</span></td>
-											<td class="b2"><span>{lang wep}{lang kind1}</span></td>
-											<td class="b3"><span><!--{if $w_wepk != ''}-->$w_wepk_words<!--{else}-->？？？<!--{/if}--></span></td>
-											<td class="b2"><span>{lang wep}</span></td>
-											<td class="b3"><span>$w_wep_words</span></td>
-										</tr>
-										<tr>
-											<td class="b2" height=20px><span>{lang tactic}</span></td>
-											<td class="b3"><span><!--{if $w_tactic >= 0}-->$tacinfo[$w_tactic]<!--{else}-->？？？<!--{/if}--></span></td>
-											<td class="b2"><span>{lang pose}</span></td>
-											<td class="b3"><span><!--{if $w_pose >= 0}-->$poseinfo[$w_pose]<!--{else}-->？？？<!--{/if}--></span></td>
-											<td class="b2"><span>{lang inf}</span></td>
-											<td class="b3"><span><!--{if $w_infdata}-->$w_infdata<!--{else}-->无<!--{/if}--></span></td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-						</table>
-					</td>
-				</TR>
 				<tr>
-					<TD class="b3" height="100%">
+					<td class="b2" width=70px height=20px><span>{lang rage}</span></td>
-						<span><B><FONT color="#ff0000" size="5" face="黑体">$battle_title</FONT></B></span>
+					<td class="b3" width=95px><span>$w_ragestate</span></td>
-					</TD>
+					<td class="b2" width=70px><span>{lang sp}</span></td>
-				</TR>
+					<td class="b3" width=105px><span>$w_spstate</span></td>
+					<td class="b2" width=70px><span>{lang hp}</span></td>
+					<td class="b3" width=170px><span>$w_hpstate</span></td>
+				</tr>
 				<tr>
-					<td>
+					<td class="b2" height=20px><span>{lang wep}{lang effect}</span></td>
-						<table border="0" width=720px cellspacing="0" cellpadding="0" valign="middle">
+					<td class="b3"><span>$w_wepestate</span></td>
-							<tr>
+					<td class="b2"><span>{lang wep}{lang kind1}</span></td>
-								<td class="b5" rowspan=4 colspan=1 width=140px height=80px><IMG src="img/$iconImg" height=80px border="0" align="middle" <!--{if $hp==0}-->style="filter:Xray()"<!--{/if}--> /></td>
+					<td class="b3"><span><!--{if $w_wepk != ''}-->$w_wepk_words<!--{else}-->？？？<!--{/if}--></span></td>
-								<td class="b1" colspan=2 height=20px><span>$typeinfo[$type]({$sexinfo[$gd]}{$sNo}号)</span></td>
+					<td class="b2"><span>{lang wep}</span></td>
-								<td class="b1" colspan=2><span>$name</span></td>
+					<td class="b3"><span>$w_wep_words</span></td>
-								<td class="b1" colspan=2><span>Lv. $lvl</span></td>
-							</tr>
-							<tr>
-								<td class="b2" width=100px height=20px><span>{lang hp}</span></td>
-								<td class="b3" width=145px><span><span class="$hpcolor">$hp / $mhp</span></span></td>
-								<td class="b2" width=75px><span>{lang sp}</span></td>
-								<td class="b3" width=90px><span>$sp / $msp</span></td>
-								<td class="b2" width=75px><span>{lang rage}</span></td>
-								<td class="b3" width=90px><span><!--{if $rage >=30}--><span class="yellow">$rage</span><!--{else}-->$rage<!--{/if}--></span></td>
-							</tr>
-							<tr>
-								<td class="b2" height=20px><span>{lang wep}</span></td>
-								<td class="b3"><span>$wep_words</span></td>
-								<td class="b2"><span>{lang wep}{lang kind1}</span></td>
-								<td class="b3"><span>$wepk_words</span></td>
-								<td class="b2"><span>{lang wep}{lang effect}</span></td>
-								<td class="b3"><span>$wepe</span></td>
-							</tr>
-							<tr>
-								<td class="b2" height=20px><span>{lang inf}</span></td>
-								<td class="b3">
-									<span>
-										<!--{if $inf}-->
-											<!--{loop $infinfo $key $val}-->
-												<!--{if strpos($inf,$key)!==false}-->
-													$val
-												<!--{/if}-->
-											<!--{/loop}-->
-										<!--{else}-->
-										无
-										<!--{/if}-->
-									</span>
-								</td>
-								<td class="b2"><span>{lang pose}</span></td>
-								<td class="b3"><span>$poseinfo[$pose]</span></td>
-								<td class="b2"><span>{lang tactic}</span></td>
-								<td class="b3"><span>$tacinfo[$tactic]</span></td>
-							</tr>
-						</table>
-					</td>
 				</tr>
-			</TABLE>
+				<tr>
+					<td class="b2" height=20px><span>{lang tactic}</span></td>
+					<td class="b3"><span><!--{if $w_tactic >= 0}-->$tacinfo[$w_tactic]<!--{else}-->？？？<!--{/if}--></span></td>
+					<td class="b2"><span>{lang pose}</span></td>
+					<td class="b3"><span><!--{if $w_pose >= 0}-->$poseinfo[$w_pose]<!--{else}-->？？？<!--{/if}--></span></td>
+					<td height="20px" class="b2"><span>{lang inf}</span></td>
+					<td class="b3"><span><!--{if $w_infdata}-->$w_infdata<!--{else}-->无<!--{/if}--></span></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<TD class="b8" height=270px width=440px>
+			<div style="position:relative;height:268px;width:438px;display: flex;align-items:center;justify-content: center;">
+					<span><B><FONT color="#ff0000" size="5" face="黑体">$battle_title</FONT></B></span>
+			</div>
 		</TD>
+		<td class="b8" width=140px rowspan="2" valign="bottom">
+			<div style="position:relative;width:140px;height:350px;">
+				<!--{if $iconImgB}-->
+					<IMG src="img/$iconImgB" style="border:0;height:340px;position:absolute;left:0px;bottom:-10px;<!--{if $hp==0}-->filter: grayscale(100%)<!--{/if}-->" />
+				<!--{else}-->
+					<IMG src="img/$iconImg" style="border:0;height:80px;position:absolute;left:0;bottom:0;<!--{if $hp==0}-->filter: grayscale(100%)<!--{/if}-->" />
+				<!--{/if}-->
+			</div>
+		</td>
 	</TR>
-</table>
+	<tr>
+		<td colspan=2 width=580px>
+			<table border="0" width=580px height=80px cellspacing="0" cellpadding="0" valign="middle">
+				<tr>
+					<td class="b1" colspan=2 height=20px><span>$typeinfo[$type]({$sexinfo[$gd]}{$sNo}号)</span></td>
+					<td class="b1" colspan=2><span>$name</span></td>
+					<td class="b1" colspan=2><span>Lv. $lvl</span></td>
+				</tr>
+				<tr>
+					<td class="b2" width=70px height=20px><span>{lang hp}</span></td>
+					<td class="b3" width=170px><span><span class="$hpcolor">$hp / $mhp</span></span></td>
+					<td class="b2" width=70px><span>{lang sp}</span></td>
+					<td class="b3" width=105px><span>$sp / $msp</span></td>
+					<td class="b2" width=70px><span>{lang rage}</span></td>
+					<td class="b3" width=95px><span><!--{if $rage >=30}--><span class="yellow">$rage</span><!--{else}-->$rage<!--{/if}--></span></td>
+				</tr>
+				<tr>
+					<td class="b2" height=20px><span>{lang wep}</span></td>
+					<td class="b3"><span>$wep_words</span></td>
+					<td class="b2"><span>{lang wep}{lang kind1}</span></td>
+					<td class="b3"><span>$wepk_words</span></td>
+					<td class="b2"><span>{lang wep}{lang effect}</span></td>
+					<td class="b3"><span>$wepe</span></td>
+				</tr>
+				<tr>
+					<td class="b2" height=20px><span>{lang inf}</span></td>
+					<td class="b3">
+						<span>
+							<!--{if $inf}-->
+								<!--{loop $infinfo $key $val}-->
+									<!--{if strpos($inf,$key)!==false}-->
+										$val
+									<!--{/if}-->
+								<!--{/loop}-->
+							<!--{else}-->
+							无
+							<!--{/if}-->
+						</span>
+					</td>
+					<td class="b2"><span>{lang pose}</span></td>
+					<td class="b3"><span>$poseinfo[$pose]</span></td>
+					<td class="b2"><span>{lang tactic}</span></td>
+					<td class="b3"><span>$tacinfo[$tactic]</span></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</TABLE>