From 3f85fdae37e28c90d518c3b0717897d9ecb6142e Mon Sep 17 00:00:00 2001
From: NiteKat <dcm254@gmail.com>
Date: Wed, 13 Oct 2021 18:28:09 -0400
Subject: [PATCH] Add mWhoHit Indicators

Adds mWhoHit indicator graphics to the monster health bar.
---
 CMakeLists.txt                                  |   1 +
 Packaging/resources/assets/data/monstertags.pcx | Bin 0 -> 1753 bytes
 Source/qol/monhealthbar.cpp                     |  12 ++++++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 Packaging/resources/assets/data/monstertags.pcx

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa19d1f58..fc50da9da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -716,6 +716,7 @@ set(devilutionx_assets
   data/health.pcx
   data/panel8buc.pcx
   data/panel8bucp.pcx
+  data/monstertags.pcx
   data/resistance.pcx
   data/talkbutton.pcx
   data/xpbar.pcx
diff --git a/Packaging/resources/assets/data/monstertags.pcx b/Packaging/resources/assets/data/monstertags.pcx
new file mode 100644
index 0000000000000000000000000000000000000000..b43dcf95a8ac161acbebdecac7a8f7de94a8fec1
GIT binary patch
literal 1753
zcmd;LW#nK00v?831|3EnMi84Mz{tlyx+a7TXBioeF&;d1jFI6ekUDt$;HjgG3`f9B
zMiB1^Bg0`Z4@d&JhZz|Tfw@4{K<*(%1~Bh9n1>;UrW4gzB>SK)0J;S~!sXIgs4fL_
z5iSLD;VuR9;4X#9L0t;d32`Zy2Mhozy7b^-RHuTu2&aO%aHoQKaHqoLpiYJ9gg6y$
zE;ZeH6xFR@F2b!~F5InP9^9=kIjCD<I-za_bEzDzUr^l&<|5n*=EB_y=E2<xlY_by
zrW5K`FqaIs@_@3~e?&eTWzjhV=Fk5h9{yiN<sT#Cdj^KR3=CZi4B-q6lK;UH|5Q{y
zfJG-VFhnshC<Ei_@BIIN!vFnN`S6C}@L`6wHiqy}21!YVfBP2v?+O2xsq(>x;kYA1
zzaB%l6oVW)!;4d=u5a3OYTmrP{r#I88dek*E{%$s<LTM$=vZlKnPF%crm5+osAw!H
zDb2^n!_I!<?5j=Nug_n4Z1T*V?Y(O%>ldUI%#29x^^2%=_Q|(&jMp~{P}O#nl+)!E
zlxAh;`TuyyyNf+{kJO#nUb<&R&gxmoGrD8j>q08>Ju?&RqXSJm9MmlhWeqjNq(nGG
zxEcOG+Wh6@wC9`a?#wT^(35n$I_ONI@o{hYjn2}uttDEGg!458qLg^-#W_^@nE6>5
z{_oxUW!khCwY3j&a&AONpZD}UZeg)sU45mJ(quWg8cE4CQBi+EK}%j<Wll~WR@Tp-
zKi|7|@64GqJ9g|?ym;}HDN|ZoTZ@Z})6&u+BO`r$d~9uP_4M@Q<m3be1^@s54**nJ
BTUG!7

literal 0
HcmV?d00001

diff --git a/Source/qol/monhealthbar.cpp b/Source/qol/monhealthbar.cpp
index f2519f242..a18bcafcb 100644
--- a/Source/qol/monhealthbar.cpp
+++ b/Source/qol/monhealthbar.cpp
@@ -17,6 +17,7 @@ namespace {
 Art healthBox;
 Art resistance;
 Art health;
+Art playerExpTags;
 
 } // namespace
 
@@ -28,6 +29,7 @@ void InitMonsterHealthBar()
 	LoadMaskedArt("data\\healthbox.pcx", &healthBox, 1, 1);
 	LoadArt("data\\health.pcx", &health);
 	LoadMaskedArt("data\\resistance.pcx", &resistance, 6, 1);
+	LoadMaskedArt("data\\monstertags.pcx", &playerExpTags, 5, 1);
 
 	if ((healthBox.surface == nullptr)
 	    || (health.surface == nullptr)
@@ -134,6 +136,16 @@ void DrawMonsterHealthBar(const Surface &out)
 			}
 		}
 	}
+
+	int tagOffset = 5;
+	for (int i = 0; i < MAX_PLRS; i++) {
+		if (1 << i & monster.mWhoHit) {
+			DrawArt(out, position + Displacement { tagOffset, height - 31 }, &playerExpTags, i + 1);
+		} else if (Players[i].plractive) {
+			DrawArt(out, position + Displacement { tagOffset, height - 31 }, &playerExpTags, 0);
+		}
+		tagOffset += playerExpTags.w();
+	}
 }
 
 } // namespace devilution