Browse Source

Change Fight Stats block to include a portrait.

KeyMasterOfGozer 4 years ago
parent
commit
25f80537e1
1 changed files with 45 additions and 10 deletions
  1. 45 10
      locations/fight.qsrc

+ 45 - 10
locations/fight.qsrc

@@ -330,6 +330,7 @@ if $ARGS[0] = 'printStats':
 		fightPStats['Clone'] = opp_clone[i]
 		fightPStats['Stun'] = opp_stun[i]
 		fightPStats['Timer'] = opp_timer[i]
+		$fightPStats['Image'] = $opp_image[i]
 	else
 		$fightPStats['Name'] = $pcs_name[i]
 		fightPStats['Health'] = pcs_health[i]
@@ -340,14 +341,40 @@ if $ARGS[0] = 'printStats':
 		fightPStats['Clone'] = pcs_clone[i]
 		fightPStats['Stun'] = pcs_stun[i]
 		fightPStats['Timer'] = pcs_timer[i]
+		$fightPStats['Image'] = $pcs_image[i]
 	end
 
-	'<b><<$fightPStats["Name"]>></b> life <b><font color = red><<fightPStats["Health"]>></font></b>, mana <b><font color = blue><<fightPStats["Mana"]>></font></b>, willpower <b><font color = green><<fightPStats["Willpower"]>></font></b>, initiative <b><font color = orange><<fightPStats["Timer"]>></font></b>'
-	if fightPStats['Shield'] > 0:'<b><font color = purple>Protection <<fightPStats["Shield"]>> units</font></b>'
-	if fightPStats['Clone'] > 0:'<b><font color = purple>Clones active <<fightPStats["Clone"]>> </font></b>'
-	if fightPStats['Fog'] > 0:'<b><font color = purple>Obscuring Fog <<fightPStats["Fog"]>> units</font></b>'
-	if fightPStats['Stun'] > 0:'<b><font color = purple>Stunned <<fightPStats["Stun"]>> rounds</font></b>'
-	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
+	$fightStatRowText = "
+	<tr>
+		<td rowspan=4 align=right valign=center>
+			<img HEIGHT=70 src='<<$fightPStats['Image']>>'>
+			<br> <b><<$fightPStats['Name']>></b>
+		</td>
+		<td align=right> Life </td>
+		<td align=right> <b><font color = red><<fightPStats['Health']>></font></b> </td>
+		<td rowspan=4 align=left valign=center>"
+			if fightPStats['Shield'] > 0:$fightStatRowText += "<b><font color = purple>Protection <<fightPStats['Shield']>> units</font></b><br>"
+			if fightPStats['Clone'] > 0:$fightStatRowText += "<b><font color = purple>Clones active <<fightPStats['Clone']>> </font></b><br>"
+			if fightPStats['Fog'] > 0:$fightStatRowText += "<b><font color = purple>Obscuring Fog <<fightPStats['Fog']>> units</font></b><br>"
+			if fightPStats['Stun'] > 0:$fightStatRowText += "<b><font color = purple>Stunned <<fightPStats['Stun']>> rounds</font></b>"
+	$fightStatRowText += "
+		</td>
+	</tr>
+	<tr>
+		<td align=right> Mana </td>
+		<td align=right> <b><font color = blue><<fightPStats['Mana']>></font></b> </td>
+	</tr>
+	<tr>
+		<td align=right> Willpower </td>
+		<td align=right> <b><font color = green><<fightPStats['Willpower']>></font></b> </td>
+	</tr>
+	<tr>
+		<td align=right> Initiative </td>
+		<td align=right> <b><font color = orange><<fightPStats['Timer']>></font></b> </td>
+	</tr><tr><td colspan=4 bgcolor=grey></td></tr>"
+
+	$result = $fightStatRowText
+
 
 	killvar 'i'
 	killvar 'fightPStats'
@@ -355,23 +382,31 @@ if $ARGS[0] = 'printStats':
 end
 
 if $ARGS[0] = 'statDisplay':
-	'<b>= = = = = = = = = = = O p p o n e n t s = = = = = = = = = = =</b>'
+	$fightStatText = "
+	<table border=1><th colspan=4><b><font size=12>Opponents</font></b></th>
+	"
 	j = 0
 	:OppLoopRC1
 	if j < arrsize('opp_health'):
-		gs 'fight', 'printStats', 'opp', j
+		$fightStatText += func('fight', 'printStats', 'opp', j)
 		j += 1
 		jump 'OppLoopRC1'
 	end
+	$fightStatText += "</table>"
+	*pl func('cleanHTML',$fightStatText)
 	*nl
-	'<b>= = = = = = = = = = = = A l l i e s = = = = = = = = = = = = =</b>'
+	$fightStatText = "
+	<table border=1><th colspan=4><b><font size=12>Opponents</font></b></th>
+	"
 	j = 0
 	:PCSLoopRC1
 	if j < arrsize('pcs_health'):
-		gs 'fight', 'printStats', 'pcs', j
+		$fightStatText += func('fight', 'printStats', 'pcs', j)
 		j += 1
 		jump 'PCSLoopRC1'
 	end
+	$fightStatText += "</table>"
+	*pl func('cleanHTML',$fightStatText)
 end
 
 if $ARGS[0] = 'result_check':