From f24910e5d2f7e95d8d030e124e33d5da5ac9c05d Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Sun, 20 Aug 2023 00:52:03 +0200
Subject: [PATCH 1/6] Artifacts backpack window GUI improvements

---
 client/widgets/CArtifactsOfHeroBackpack.cpp |  1 +
 client/windows/CHeroBackpackWindow.cpp      | 23 +++++++++++++++++----
 client/windows/CHeroBackpackWindow.h        |  5 +++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/client/widgets/CArtifactsOfHeroBackpack.cpp b/client/widgets/CArtifactsOfHeroBackpack.cpp
index 18a704a19..2bf968cdf 100644
--- a/client/widgets/CArtifactsOfHeroBackpack.cpp
+++ b/client/widgets/CArtifactsOfHeroBackpack.cpp
@@ -84,6 +84,7 @@ void CArtifactsOfHeroBackpack::scrollBackpack(int offset)
 		slot = slot + 1;
 	}
 	redraw();
+	setRedrawParent(true);
 }
 
 void CArtifactsOfHeroBackpack::updateBackpackSlots()
diff --git a/client/windows/CHeroBackpackWindow.cpp b/client/windows/CHeroBackpackWindow.cpp
index b491bf57d..424388e5b 100644
--- a/client/windows/CHeroBackpackWindow.cpp
+++ b/client/windows/CHeroBackpackWindow.cpp
@@ -14,17 +14,32 @@
 #include "../gui/Shortcut.h"
 
 #include "../widgets/Buttons.h"
+#include "../widgets/Images.h"
+#include "CMessage.h"
+#include "render/Canvas.h"
 
 CHeroBackpackWindow::CHeroBackpackWindow(const CGHeroInstance * hero)
-	: CWindowObject(PLAYER_COLORED)
+	: CWindowObject((EOptions)0)
 {
 	OBJECT_CONSTRUCTION_CAPTURING(255-DISPOSE);
-	
-	arts = std::make_shared<CArtifactsOfHeroBackpack>(Point(-100, -170));
+
+	stretchedBackground = std::make_shared<CFilledTexture>("DIBOXBCK", Rect(0, 0, 410, 425));
+	pos.w = stretchedBackground->pos.w;
+	pos.h = stretchedBackground->pos.h;
+	center();
+
+
+	arts = std::make_shared<CArtifactsOfHeroBackpack>(/*Point(-100, -170)*/Point(10, 10));
 	arts->setHero(hero);
 	addSet(arts);
 
 	addCloseCallback(std::bind(&CHeroBackpackWindow::close, this));
 
-	quitButton = std::make_shared<CButton>(Point(242, 200), "hsbtns.def", CButton::tooltip(""), [this]() { close(); }, EShortcut::GLOBAL_RETURN);
+	quitButton = std::make_shared<CButton>(Point(173, 385), "IOKAY32.def", CButton::tooltip(""), [this]() { close(); }, EShortcut::GLOBAL_RETURN);
+}
+
+void CHeroBackpackWindow::showAll(Canvas &to)
+{
+	CIntObject::showAll(to);
+	CMessage::drawBorder(PlayerColor(1), to.getInternalSurface(), pos.w+28, pos.h+29, pos.x-14, pos.y-15);
 }
diff --git a/client/windows/CHeroBackpackWindow.h b/client/windows/CHeroBackpackWindow.h
index fefd1902d..df9aeb08d 100644
--- a/client/windows/CHeroBackpackWindow.h
+++ b/client/windows/CHeroBackpackWindow.h
@@ -12,6 +12,8 @@
 #include "../widgets/CWindowWithArtifacts.h"
 #include "CWindowObject.h"
 
+class CFilledTexture;
+
 class CHeroBackpackWindow : public CWindowObject, public CWindowWithArtifacts
 {
 public:
@@ -20,4 +22,7 @@ public:
 private:
 	std::shared_ptr<CArtifactsOfHeroBackpack> arts;
 	std::shared_ptr<CButton> quitButton;
+	std::shared_ptr<CFilledTexture> stretchedBackground;
+
+	void showAll(Canvas &to) override;
 };

From cab6fb76aac20c3137796c26d1eef9b94f5d1d09 Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Sun, 20 Aug 2023 17:45:43 +0200
Subject: [PATCH 2/6] Draft version of backpack button + new setting for
 original H3 UI mode

---
 Mods/vcmi/Sprites/buttons/backpack.json       |   8 ++++++++
 Mods/vcmi/Sprites/buttons/backpackNormal.png  | Bin 0 -> 3008 bytes
 Mods/vcmi/Sprites/buttons/backpackPressed.png | Bin 0 -> 2848 bytes
 Mods/vcmi/config/vcmi/english.json            |   2 ++
 Mods/vcmi/config/vcmi/polish.json             |   2 ++
 client/windows/CHeroWindow.cpp                |  18 +++++++++++++-----
 config/schemas/settings.json                  |   7 ++++++-
 7 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 Mods/vcmi/Sprites/buttons/backpack.json
 create mode 100644 Mods/vcmi/Sprites/buttons/backpackNormal.png
 create mode 100644 Mods/vcmi/Sprites/buttons/backpackPressed.png

diff --git a/Mods/vcmi/Sprites/buttons/backpack.json b/Mods/vcmi/Sprites/buttons/backpack.json
new file mode 100644
index 000000000..a74a8c3a1
--- /dev/null
+++ b/Mods/vcmi/Sprites/buttons/backpack.json
@@ -0,0 +1,8 @@
+{
+	"basepath" : "buttons/",
+	"images" :
+	[
+		{ "frame" : 0, "file" : "backpackNormal.png"},
+		{ "frame" : 1, "file" : "backpackPressed.png"}
+	]
+}
diff --git a/Mods/vcmi/Sprites/buttons/backpackNormal.png b/Mods/vcmi/Sprites/buttons/backpackNormal.png
new file mode 100644
index 0000000000000000000000000000000000000000..541ec56c55f3481806c72726246a4a2ec2b1f30b
GIT binary patch
literal 3008
zcmV;x3qSOUP)<h;3K|Lk000e1NJLTq001-q001Tk0ssI21OzWE000YzNkl<ZSP9Ko
z$+F})a*PcCGhdg@^2L(AO*b8+!&qO{tz#WVYMbhpBoK?t!K{+TOdp^;yvkydU?9T7
z-2?nj|M(BT{QECNR76a~OjShx>q`;I|8)`f?Avg6;c;Pn&A)&Az74nTPu2Uj_w{`-
z_fq-yKQWQrk^TBB;=5Pai@!s>S442%m%gvy=I`(OaYY#`#J=?o^!`pe?)T#Lez5kJ
zAAhkcBH7C_(ZBxX=dWMC8WH`+ufP2KFaPXO%v{9FBMa#>VHLSnjHcbNxG-l`W{oD-
zj9Fq7B4R?LDG`2crr{ppqV3zch{#MUvKy&t6fLjFXl9L5Rp!cMQLby{FuuH0n4W*e
zgLlG&rAZW(NgZa(V?|-nj4uzP%qkwnh&eNhs_J8C^ANR&FyT38B#G#p{ychSD#y`;
zm?J9igk)w!4bvpMX0X!badf>_Xw#3Od;e+5zwL4essl(B@1mgY`wQ|MF^r{BREY`!
zR+);bm<UyN#god^P0jlAaj<Y}cAlr1o~t71(WEO4la=+it7g<|MmSdfa+oq*Ud+Ok
zhSakuDc>L>%L0UFQso_DG!@3XNdyr-x{B~?@$~A(Cj3x5;s{nun35xcNHXIw+MIKA
zt4vjWola+UlZ`EITFnIaQto}#Pmjh`SEPt~qCz61`^6~hjZ@<i<4C|xfUNv!D4K%x
zHDff%Kso2)YFfEVOT@ApIY~_@qq355rT6xFU4*5GSa%~=Yx0_I%xat^NETsN%7AGm
z9&B1sa;~I~x*|9sipb+Ip^Yl0Qf-1nu1I3?sH0o2I#>SZ?+bOUYD$gr3TjGgMQ<Xa
zYb~|*I;R5Fb*Kb|2Z;#ad)V|8Yy?e!7gPn&nqh)_5-rTdC>ii~mzPB%i8k^S0LbOo
z3>7`Q9mpIoJxrdBJLj|UbC@ajZp~yg&aCUYig<c153|;kKL+sg(a;LXQiXS{6{1?i
z4GoTHy2-PvP&H+)c(m`q5s@-AK^G>WvYz!AIvUD*3?n8Lehd??VTcK&yIHQOW;obV
z75M7|O)7MZG3R0dc+iYdO_8o^fuUHyRzI*IqQbn8OH!fU(EfMk486%TjAG-F8Q>{H
z3uh#HVMl`UH@(5un|UO-pmDKAB?y$*!|&!@YxdqgQ7nmK6sz)PfzJst1Di(u*QXCd
z*S}_}ut!a<-u{RG@zSjuJkXW&c?HYeeH*X|X{oFbM$JJg0VWpEM@BN>DpZkKkK;Jw
z9L=&~O=l4hA~J$kjHc7`56?C|YE|z#SG-m&&t^Of1x%998AIRV1I*oD9Sj*=>p4*J
zVS)}Rtj{9Lb4JXC(0dc5;@S;HB*IYy`T!l#x7S6)V|4VD@W+Ox2{$3nbdPTGF@Qn<
zpou4a&hkVBflQ)_Klp3_-3pT#1-$~I(O)!ui6}OdWF{v#1#CPQWJgtUc{g6W0naO{
zR_j9qeUw$B+fA0BvYj?iH<x>MAU~#q`Rrj1!Gu}@&mo|QcW|48uOI>wN;t@vn8C47
zgbb854GE$d6#+F@ls-+Rse%ov78kNvaa|#ly|+xtDhkcL0t>_jGT4*~a7+Pan2<j-
zuTn%AgCyo1+)X9tbcl=sZMJDfIQsxT&IwF3WnnVq%*N21Osb>l+7wfw9Y19=G_|V5
z@?fw-fi$q<beJiRY)Yc?nz^E$V2J>=a1!b0O_m$U?>jiaOPLNNnqq5CQEtICccc#_
zP!M2YSy2~Q0I&YM;&VE%0xGYe+!YE|nL=_L19D8fRuJC=TOw=?iR7xTKu+EMFN2xS
z>DTgA?BC0}8yr-^9lmJuI?1`<nmqaDB@uX`m9()43Gd1vq=Zg@eX7bAbFORlG2oY&
zx+<E~xFh~DGpOU{C>0*vIv_#K<mh%N{=&L2ee8~W%U2d1t(_Op#3D_};pqUu${b3n
zcFqZzMAf9CqVm}ld1GlND&XOjH3qFYL8{9EyUK4@W_e>C$6!cVUPUK5NufGWyt>xv
ztzGkK3KvwQH-p$sB`Po@o~6uQrDk(^Q#7e(EuVr$qw|`~z#p^$-Ygl|gEg8frbq9c
z8M{|Fyaj3MmcgpBU4_i$Nyyg5VL;H3j_&TnRxF(9v^I-C^ig;ZKovemIMzi(y?5)a
zh^=>RMx0If(c}+5Jw6_g%yjS8RN+hkNNie{I}x?ks1hhnrwpVpV$MaxeW)rALkBP{
z40nZHNVvyX3o-^SdQ-`UWI+iMWV_bm@qC>ZN>#NMUM5UJY$m<;YtC-)#I4(ke7&Zr
zOb>v(U|ZozuK65YxL{PaWkSO$zphJ}KRT3_0=1fsLc=4#8iL-M>2=LJbKB4DUaTl5
zn2{D2!&|3^AIG>sN?<?vJTJ56ncCoSKF=4kd_12_pt`x7NesY%UNQ4r{y5sTR#Tk;
zHYmzgAxW(_n3rZuvKC;ott2+gFy8ps5b8{Gx%9rfaZ@nsbT@^qZRj%K{kLzQqB_%?
zD&#fY%to_HukZ(K6DMYzWM)h_UeD*__t!OgM^-C3IAJiAsFdhAr?n23&^qCwP83Q4
zW!%Bt)7!Ox!rm|(fMzNhjC|ZcrV3^K@*G<p(&1X_Lb6~KH$r$h#96e>ZQth#Grks#
zd-!6|N-3ZcOaM_%?<P@OmNFr-vAW7~KTKYCaOl?UnpPCNaRoEn0D?|ZC8HS7JYL~u
zpf%8I)r{=7^ClWyi2yGL?07+x(P$CCcN8}Q>!Jg8VQwR4hPT9SUXPr?Cb;53v<r)p
zG0~%IoMG^8x||$~R&fl)z=-aLqn6hd014m(v6>4{W75RnQ~@&_VtjPH7br|qJTG7$
zm_l#u;{%v;fY?1S%z~|8bx()NL23640fi_8i(zXeTn)p&!Jl-qiBv!*0&cDj7!3HL
z3@97MX|yCy3^(MS7+%~>3KC14QEO$x&?n5g&4;|O`AW!CMM0)dF9#dJ2|t_s>7%_d
z2TDO%S<!I_)kI!c7-eY&+qN8XM1s*Hs=7dZVFGINB4+gTg&Gpe;~12|l}9(^11yc1
z@3jgU-PYwQNk^eq@+Ybxm<lKbyShh>-4M4cx%p!EKl#E5L*FuhcoZ9DOk&jl=9-&e
zA6-5tj7C!=RSoA0cdJL$<8f4a?~+MT*!^PohzoWV!(UVBT1{%ecfrHqGy%nct$)i`
zqGX$sg3uF~GI<vZEgg(0THw*qp_uYbVEYnsg267!3=HM&Fdf#`oMSZK)O9mG?%TfU
zH477K5@Om`!`<y(u-JEr8fwJvhPV$OJZpM65=37PSih|q)dZNuR4kJ4AOJPya#(P2
zg-PxLcI^fha3|4i2rvRC;x6in6NPi4txPZoQb|&JkeWs0c|qA^d)OI#w6{%vt5{-A
zkY}Su$GC8F(w?1Rcj5VVa2>8wi1O&z;bBnpBn-n+b&M_|*IYC5T7eEH4xktI0OScd
zMSLoZ<B07*J&6^kSWW2(V4x&-L%^T}JPgK-pN4*PSfG8n02`47p9dNsz<GJDTgR>i
zT<&A2LR-)Rv*1j|aiG;a!T7cx-SrB{EY$;NX?d=EErLPG*pv0P9Vn0BIA*8gJ@Mnz
zj=|A}p(bOGs|TDX@V)=5o*;`&ie<_>bLj2fY^MCa5EE;|xdfVYS+l=>Tfe>LW=Qz^
zhw&dD7=1+K3x=AU;3tK#fy?57LpaPXKjiCX60ndkU2D_Vol~NQ<U^vUV7$5_ER2k8
zHv}v<rgaR)RMr|;Bf$ktr6O*BKfN$L;ApK{vjb;Xyw4KUlV{Lhzrn_u*@AD#(X1I}
zLI}Sw{o7xDrsK~i^7xJm^Tl2F+aCyi`t82rM6glxo{;V*2Hk3ScNwnj^<fMF*!v%X
zRNbGVTLUm<HTwK<=z9P9)_uaRzkdDt{h|L~|Nb{mOncKa+TMf!0000<MNUMnLSTZ&
CS*QyD

literal 0
HcmV?d00001

diff --git a/Mods/vcmi/Sprites/buttons/backpackPressed.png b/Mods/vcmi/Sprites/buttons/backpackPressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..316ecbdf90c962cb2b4ee7d776e01b22a8e6773f
GIT binary patch
literal 2848
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

literal 0
HcmV?d00001

diff --git a/Mods/vcmi/config/vcmi/english.json b/Mods/vcmi/config/vcmi/english.json
index 26eecc0ba..54ec6a387 100644
--- a/Mods/vcmi/config/vcmi/english.json
+++ b/Mods/vcmi/config/vcmi/english.json
@@ -173,6 +173,8 @@
 
 	"vcmi.heroWindow.openCommander.hover" : "Open commander info window",
 	"vcmi.heroWindow.openCommander.help"  : "Shows details about the commander of this hero",
+	"vcmi.heroWindow.openBackpack.hover" : "Open artifact backpack window",
+	"vcmi.heroWindow.openBackpack.help"  : "Opens window that allows easier artifact backpack management",
 
 	"vcmi.commanderWindow.artifactMessage" : "Do you want to return this artifact to the hero?",
 
diff --git a/Mods/vcmi/config/vcmi/polish.json b/Mods/vcmi/config/vcmi/polish.json
index c6a5f4231..4ab5f2959 100644
--- a/Mods/vcmi/config/vcmi/polish.json
+++ b/Mods/vcmi/config/vcmi/polish.json
@@ -173,6 +173,8 @@
 
 	"vcmi.heroWindow.openCommander.hover" : "Otwórz okno dowódcy",
 	"vcmi.heroWindow.openCommander.help"  : "Wyświetla informacje o dowódcy przynależącym do tego bohatera",
+	"vcmi.heroWindow.openBackpack.hover" : "Otwórz okno sakwy",
+	"vcmi.heroWindow.openBackpack.help"  : "Otwiera okno pozwalające łatwiej zarządzać artefaktami w sakwie",
 
 	"vcmi.commanderWindow.artifactMessage" : "Czy chcesz zwrócić ten artefakt bohaterowi?",
 
diff --git a/client/windows/CHeroWindow.cpp b/client/windows/CHeroWindow.cpp
index 771d4a521..17bed7640 100644
--- a/client/windows/CHeroWindow.cpp
+++ b/client/windows/CHeroWindow.cpp
@@ -84,11 +84,19 @@ CHeroWindow::CHeroWindow(const CGHeroInstance * hero)
 
 	quitButton = std::make_shared<CButton>(Point(609, 516), "hsbtns.def", CButton::tooltip(heroscrn[17]), [=](){ close(); }, EShortcut::GLOBAL_RETURN);
 
-	dismissLabel = std::make_shared<CTextBox>(CGI->generaltexth->jktexts[8], Rect(370, 430, 65, 35), 0, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE);
-	dismissButton = std::make_shared<CButton>(Point(454, 429), "hsbtns2.def", CButton::tooltip(heroscrn[28]), [=](){ dismissCurrent(); }, EShortcut::HERO_DISMISS);
-
-	questlogLabel = std::make_shared<CTextBox>(CGI->generaltexth->jktexts[9], Rect(510, 430, 65, 35), 0, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE);
-	questlogButton = std::make_shared<CButton>(Point(314, 429), "hsbtns4.def", CButton::tooltip(heroscrn[0]), [=](){ LOCPLINT->showQuestLog(); }, EShortcut::ADVENTURE_QUEST_LOG);
+	if(settings["general"]["enableUiEnhancements"].Bool())
+	{
+		questlogButton = std::make_shared<CButton>(Point(314, 429), "hsbtns4.def", CButton::tooltip(heroscrn[0]), [=](){ LOCPLINT->showQuestLog(); }, EShortcut::ADVENTURE_QUEST_LOG);
+		backpackButton = std::make_shared<CButton>(Point(424, 429), "buttons/backpack", CButton::tooltipLocalized("vcmi.heroWindow.Backpack"), [=](){ createBackpackWindow(); }, EShortcut::HERO_BACKPACK);
+		dismissButton = std::make_shared<CButton>(Point(534, 429), "hsbtns2.def", CButton::tooltip(heroscrn[28]), [=](){ dismissCurrent(); }, EShortcut::HERO_DISMISS);
+	}
+	else
+	{
+		dismissLabel = std::make_shared<CTextBox>(CGI->generaltexth->jktexts[8], Rect(370, 430, 65, 35), 0, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE);
+		questlogLabel = std::make_shared<CTextBox>(CGI->generaltexth->jktexts[9], Rect(510, 430, 65, 35), 0, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE);
+		dismissButton = std::make_shared<CButton>(Point(454, 429), "hsbtns2.def", CButton::tooltip(heroscrn[28]), [=](){ dismissCurrent(); }, EShortcut::HERO_DISMISS);
+		questlogButton = std::make_shared<CButton>(Point(314, 429), "hsbtns4.def", CButton::tooltip(heroscrn[0]), [=](){ LOCPLINT->showQuestLog(); }, EShortcut::ADVENTURE_QUEST_LOG);
+	}
 
 	formations = std::make_shared<CToggleGroup>(0);
 	formations->addToggle(0, std::make_shared<CToggleButton>(Point(481, 483), "hsbtns6.def", std::make_pair(heroscrn[23], heroscrn[29]), 0, EShortcut::HERO_TIGHT_FORMATION));
diff --git a/config/schemas/settings.json b/config/schemas/settings.json
index 20699af25..89a9a84f5 100644
--- a/config/schemas/settings.json
+++ b/config/schemas/settings.json
@@ -38,7 +38,8 @@
 				"autosaveCountLimit",
 				"useSavePrefix",
 				"savePrefix",
-				"startTurnAutosave"
+				"startTurnAutosave",
+				"enableUiEnhancements"
 			],
 			"properties" : {
 				"playerName" : {
@@ -126,6 +127,10 @@
 				"startTurnAutosave" : {
 					"type": "boolean",
 					"default": false
+				},
+				"enableUiEnhancements" : {
+					"type": "boolean",
+					"default": true
 				}
 			}
 		},

From 3b99f09495b633c4505178372bcaafa621eab168 Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Sun, 20 Aug 2023 18:25:57 +0200
Subject: [PATCH 3/6] Update backpack icons

---
 Mods/vcmi/Sprites/buttons/backpackNormal.png  | Bin 3008 -> 4102 bytes
 Mods/vcmi/Sprites/buttons/backpackPressed.png | Bin 2848 -> 3900 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Mods/vcmi/Sprites/buttons/backpackNormal.png b/Mods/vcmi/Sprites/buttons/backpackNormal.png
index 541ec56c55f3481806c72726246a4a2ec2b1f30b..0b7691614c33db18a421e398bd70c8e6e77dd2ac 100644
GIT binary patch
literal 4102
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
Ef&%OMF#rGn

delta 3003
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

diff --git a/Mods/vcmi/Sprites/buttons/backpackPressed.png b/Mods/vcmi/Sprites/buttons/backpackPressed.png
index 316ecbdf90c962cb2b4ee7d776e01b22a8e6773f..00471588efa38422f7fa576bf564c805232c1691 100644
GIT binary patch
literal 3900
zcmV-C55w?@P)<h;3K|Lk000e1NJLTq001-q001Tk0ssI21OzWE000jINkl<ZSP9Ko
zS&v-TajvR!&b_yLdYhgZ4);Z*NSm}pNfsF^iY3c{qri3$8wi3J2omHW&+!k)ABg>6
z<Ry6tf&h*TWD}AIUScUWBvDEjN)|<lB1LMr4LO{xr>AFnyZ4+^71ZsaB*+Nznnq7g
z_uWpNTE6eA0{DOYLIC*QcfY%^umAu8pud0RCFPM%otpfdoSNM6zugWG9{b6QKlQZ9
zy`Or51%QcVH*VaRtbwJKzhdF14^a7dmU2I+pZtl%5dg~zME;L2lMAH0cVgV+#$R51
zM~wr3n>TK}{rb-%>w^R^1ZL6e4WS_{JSUEv(bWi%MVKXVRCxA+78nsNL1GPnp0(C+
z2$3U^9Touqj3Hrh1`JUI2tiob8e@?Skq^vBgi-`a3=|P`soKnrapkJzx&W3WO^uHn
zqF6&BJe3(JjZG}7%`B`*AXP^`G8)5?4T1MQ3J{X_F-si^6UNjcAjT*R0)i~e5fV!b
zrtpjeMc~v?3~Ve_-DLl42uA=P8z&;_Pf^cN872T==Cm|u5G1is1Q1b+Nf?j>WmpJE
zaL&|gF0~X(6SfDz7hcT=GY-KZ37`S72BW%Oay1K6gO;!mE}|eJ0vkiRSp<U`W;IUA
zw-?aeiSEu)c`>P#0FpXlwNsp<*;d-y3NEp;(`jmHqc`eohUuB+bHCnR-xwx|8H~dF
z*L%g7LyX%4pIHLHB5(xoQCK1&Bu+yq2qQ1`itfIMjASBfgw!~q9plQx1p`7FJ*_P&
zBV0{LH;<Hib_7hO*{tl_TiG1;$(j9g)uRV%$Bs;0Uo4h8gROr4%73ptdUE>x+rvNj
z`r*#TaJ^fcyRfp}^Q|gbgo33r;M8E65HVW=RcCV2Js2$0l(ni8lqi%32KykaT5GJS
zrsk+YAV!}EAbzJHVZNOnIy(LD=ay!t(^k#gxYv8~%=8x@n>%}&&%N2Xw>p08RC~{C
zr8<=!Jy<=mud=xvW?IR`54yFA%?qAuXZ=xl>(cso%$1Cc7M9jf2tiB4M@>#5T}@9t
z@Z6+ek&qb(HS-8j3j%<MKsa+6EI?`|VhpvWtU-R~PWbzmIxnB!c<Pb%Q)lK5?W@ks
zBt_0Ak2N$68MDmIw$m@2okzr_)lt3X=BJaF4^&?G>D@ujCPe{>YM5H%45k)+U}G@E
zm^qt&R1k<@QPYYIYL$~@iP0~DHZcNFuP2T6)EgJO)r`h@SY94IernD-`;#~B{^!N+
zv4?7pou1z6=bPKn2MrS;Y7|&Op<biL)YQGzoB;mhk58@j!;gP<SHZ&)YuN*l0g(`y
z5gdUdtKKx92y0?NYpo2TL=nX-HJ5-8q+Yeh4^=KNY*tfKvA9yiR#w;)t7+OF$A5hB
z=H64!oIJDGxp9jUOe%>X<lJ*102D#8%uZDd88*$m&wX>(#Vaq~zq>J&X^BQbBRuvB
zA2EtYaaL1(rywQ;OMr>fDj5|~LmVRj3Lxw56l9te{WL~>>?~cmSsXu-ojp;%vzotj
zq4TvXSD*aKx0=N-Wa=m+M*x<M??bT!`MTsI@gX4@4q|8V{uj>v=D~+9-MYCx7zJx^
z>?H)T77_zNaf8O56H|J0C*jI}fjP$LG^U!5iKR(}lp9ef(yPjH&K!0+gZ|KyvynCU
z=YDa%(`jJi5Svtz&$4@(tIu-dEY}Vw6j^1RPS3C0T{itI2li#vs>_3ngPsfmBM*TU
zu2~oXyncWhF<H@AL#30Ej1TM?Ji|By1_IPXjHRzbln5|Y)l{rk6tl+#*DL15SGo(A
ze_$)0!|r9-{t3hpat-JhVhjBk7$iuHn0u42F0_(Snpz~qb4yZ9O;(1I5EFySb>&(Q
zj1y%vA6Z19vV;%RUrHD|JewCgY{LK*M+f&eH^=6^54Vgh>rU{6e>%T*zvr?9dT#<R
z2qH<~!Lsl6LD)EB4f-f~5!P3>SOZOtl<N^7wPX!CtFUi?6}cy#n}Bfc0|Qut1ndwK
zLPuQBTw;h>DY@GZv=dcKQnP2)9o?6<YR-|VWp-C1dF}0um;ddrMzLlfV!lAeCRshJ
zwWg*VBDsofH(Z|c<qx)Q-dyJxOYT7BYL1>YprCp0G@YDMm;RMp2B~u>J~A6)R8SxR
z+86^1l%&qft3I(bEZACVR?WSo(b-4mzxC|yzj%J(+Rgr#PB-qX@LxXv?)G;7cb=JR
z@b$vKv)Gj|wxj#w-r8n}u(DY=M<))|lZp)jF-k?HmC_PHM54S1Y$-}vg%-3b&OGtN
zX1Cj2Su_Mr6AxIhh)kp)UKTYmb7YulCM&(XS$C}p-Mrg>=wRa;-#p^;_{#a^@BHak
zzwz9o3m@M6+3PFw?b@;3vT*UG@BR7Ty!Oh4VP8y|^!nik|8i%xoj&)}E@$!9o&I1H
z%hkXbOssLF*~Y8_EORu%>|^7$*Op?8BB->06hqWpC>bItIk#3ZM-SDmEe>lHduVrs
z0aiP{QOlk^yX)Yznca8v_!qx?;-Sypzjb42rT4@mGniC!+jcg7^{HLI{kso6{`q!y
zZTQ+-8?8oi_H_I0%iZO*k?I?S5X+DOjq?J4G|*rQN_PsPG$U%gmfWQ>(`e1IiUrbS
z6qSn2nq>iwQmfiMbJZdbfA<g9zW>+nPtQ!H!*{!ve{}f7(XTvx<npclKmYhvb7t3f
z{_Kx_>&fZ&u5AtP_rVt@kJOjf$EzFpIFDO{5F?i|NJ-OK7h?o88ex$b{R7EVs^b_T
zmi1{26`=qyPIH}vqjOgIEujlnw`!>|D0v=P&?SbW{PgveyGx_r`})Dg)ZP5{^A8^g
z2X<8s9c-IggF6eO9G2I{_m)QOrfoEnRwEhbabq(dk3!)gNyQM7f|m!>EEHC%utr0w
ze`n8V&TTB+VbQD<<|IjDjK-?c3L%twot!h9{ZOmeiZYtm%w4%XK$KCzi)-UyKkVOI
z&&VeUUAeaThu{7+JNv}TFZ}RFFL$h=qep6*Nr^djxVCRsc5rX?)WeN5qkH#<>c7a&
zk|9%e1>~IdAw*Z*$+=#)yRp2eq|J~AHD7^OF)yTPf`}oqMcB8ydS_*{yJ>69%F^n{
z8knlM;|FT<?R0f*7@{2BS5FQ7$A7I|xv_crAcxV`=TEgxeWulFy4ksEb;_PNGPQR;
z^PaOT*|V$q=A}*%G=*Xe2vTO3QjRKnTiKE60^mcWB#A!4j;1m`21CyK!Wxx!ED!@Y
zi)qD4#OQf<D>?OW>*R?>Ewf}`b31H}qN=fom)^gZxYH+}{{2ev^YyiO?St-c%+=Hk
z^GJeg-En^yXIqYpRmm8<vkp}48t+x9Y0L4EWCDO91kkl9BZ{g|q9Q*;Qr#*b(jR&0
z7RUEar3tKUjGV*%D86%T^U96hp1JCC&&<zEr-O0qZ28qKUwFEF_1<yh`^$q5Z}s22
z)H(auY~qNuQ^BpR&}zEv?Lx)6l$gcZ=7i{-p%6oANNt>O>!i($rMd!%lU6ed#1iEU
zM1!1I69udVW3`Z#IRuKF2ZL~Par^r1!SdSJA}p>9w+5lR9bS6ncHCMCk+=H3)o@8d
zg;%iRz~gan1m`cV7rEDd5uvn<J!52DG@s}^W&N^RGiN4}lgNmu66Ugg5hMx(fof{@
z&!;z6#xcZZ-3^Oaig`$#sid}9Pv&=3z~K8=d(50Uyt9(uy`Q(Lu2M03cUMBe!OO-*
zap_98R&zJ*Y+btA9p^Cw4Nl}zY-*<?dC(0!;8s-og7%!`8MMPK+fy{?jL}|H;TQvJ
zr`#We@yO3iC!(E_roq^At?uUAE+Jf59j~m9GiO>g*X!or|J&=Y{BnK&eD=s^ra!#h
zf8))y<<;R^?{97o!_CFP_O`Cc07c|n#g4K*5o8t{RV{{3h82w}8$nU*QLxot(Hb2B
zSc0wXeDO}NU3VX@hRyA8Z2wf@xnR{Y`}bAbtwaE>E%eql3u}=84(zVX%~XE)ueUFM
z&}%o`+)Vl#XXeg4IuntW)<)y7GeHTA{jsWMKqL^0oLcSVKQ>NVSJ95Aqz)+5)hewL
zYb{aY$QY9*4y`Lh_U_8a;`YdgD8pfxuDcV5YFbi}4<4vbH<GAYP);3he*0?&5`zni
zgO!c^*pd3_Q`4PJ9*WSayTb>j8Z}!nP_@#`u$hrlCxVEwr?Tk8bERn07RWOUz4)l{
zGAKwGSyiVhT}vi&W2A&&Hf76kqvwe*MA428p$OtVAK70$ytfj9)T?f`mArescYAe2
zghi0yFb;+x4_r^pq21M|pO|gdR7w$Hni!{A%?RiiBq}aH@Z3axN0uUL;ulf1iO~*Q
z8y<^F5+TN-2sXxXKfnCp_IM<_+S#b!EH%F1&ZeJ8A8T;$?n;>~5?OBD8?@W$7f!aS
zsVVUYs+noG5@X<<t6RN(5JY3F2;_waVeQ;WH9D1}h8+;rv50yK6C<TRn24+?<E-N#
z0znDhktwG;=tX8KX0DO!-;+K5xpuu~CB|x|)iWGM0(ofPRK1?`HuFc1HBTICCJven
zmnO8lKHj&d^76UmH{a_*43;!d+QsX{NrzVsP^(oPH<^``qAd?PDXJz4D1~kbv;iXx
zZ{`e(!nbyeM&<kJ+F)G7=|(ml@t#?G>g;1Hi_3$RRnK(m?!XZ3pVv84H8aPL)K)rq
z3_LF4rOx=htG#1~tII2cPIugxGRmeLtu=vFb^vPo=ZsEtK4u8f(Ul}t59VHHHi@&w
zQef>$A}ffK0-g@4j3GzZ-7GqNJ^t#2jcBf)e{1>p;p(2bEHAVjJ9ly8*4@GSW^w<*
z`m1ksRPS&c57~gMt@lScx9Tpi_^4>*6j{|D){>8!4~YD6Qw=KP^sOMiqkc=rk~Y=~
zazO=qru+liF%z1|DMSbG#)Z{a&#w-PkXS3iF+^kC(o(*-xT!#Bbo}U9n{;PY3;Ck#
z-%`^rqE}L)+!xi<7^8C&L`<Acxpq8<2yb6}2dXnVgM9ER9(;kM{HF2+MjsuFWuY@@
z`D?2UP|=oHUz6(}T&c5=2d|ymCk+(<WO^bm&-NzQ?7;5M4gUjuqy?09jbnKL0000<
KMNUMnLSTZu?0@F~

delta 2842
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


From b53894ac2d93c44460e52a6668fcc81fbf9554cf Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Sun, 20 Aug 2023 18:57:53 +0200
Subject: [PATCH 4/6] Add artifact slots backgrounds

---
 .../Sprites/heroWindow/artifactSlotEmpty.png  | Bin 0 -> 133 bytes
 client/widgets/CArtifactsOfHeroBackpack.cpp   |  19 ++++++++++++++----
 client/widgets/CArtifactsOfHeroBackpack.h     |   1 +
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png

diff --git a/Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png b/Mods/vcmi/Sprites/heroWindow/artifactSlotEmpty.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0dec09728fc1f413e050d6702087aee95298970
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u%3?!3ZZJGq6cmjMvT!Hk?+1)8#w#I7mhdkHY
z1Nkf^L4LsvK#+Olf)|jl;_2cTQo)$)z_w^%!GQ%^x!A&tUmOT6;1~X;5iKfr_2G#^
aUWP9dWghHLS*r|G&*16m=d#Wzp$P!0i6>wH

literal 0
HcmV?d00001

diff --git a/client/widgets/CArtifactsOfHeroBackpack.cpp b/client/widgets/CArtifactsOfHeroBackpack.cpp
index 2bf968cdf..80aab5d67 100644
--- a/client/widgets/CArtifactsOfHeroBackpack.cpp
+++ b/client/widgets/CArtifactsOfHeroBackpack.cpp
@@ -14,6 +14,7 @@
 #include "../gui/Shortcut.h"
 
 #include "Buttons.h"
+#include "Images.h"
 #include "GameSettings.h"
 #include "IHandlerBase.h"
 #include "ObjectLists.h"
@@ -29,12 +30,22 @@ CArtifactsOfHeroBackpack::CArtifactsOfHeroBackpack(const Point & position)
 	pos += position;
 
 	const auto backpackCap = VLC->settings()->getInteger(EGameSettings::HEROES_BACKPACK_CAP);
-	auto visibleCapasityMax = HERO_BACKPACK_WINDOW_SLOT_LINES * HERO_BACKPACK_WINDOW_SLOT_COLUMNS;
+	auto visibleCapacityMax = HERO_BACKPACK_WINDOW_SLOT_LINES * HERO_BACKPACK_WINDOW_SLOT_COLUMNS;
 	if(backpackCap >= 0)
-		visibleCapasityMax = visibleCapasityMax > backpackCap ? backpackCap : visibleCapasityMax;
+		visibleCapacityMax = visibleCapacityMax > backpackCap ? backpackCap : visibleCapacityMax;
 
-	backpack.resize(visibleCapasityMax);
+	backpack.resize(visibleCapacityMax);
+	backpackSlotsBackgrounds.resize(visibleCapacityMax);
 	size_t artPlaceIdx = 0;
+
+	for(int i = 0; i < HERO_BACKPACK_WINDOW_SLOT_LINES * HERO_BACKPACK_WINDOW_SLOT_COLUMNS; i++)
+	{
+		auto artifactSlotBackground = std::make_shared<CPicture>("heroWindow/artifactSlotEmpty",
+			Point(46 * (i % HERO_BACKPACK_WINDOW_SLOT_COLUMNS), 46 * (i / HERO_BACKPACK_WINDOW_SLOT_COLUMNS)));
+
+		backpackSlotsBackgrounds.emplace_back(artifactSlotBackground);
+	}
+
 	for(auto & artPlace : backpack)
 	{
 		artPlace = std::make_shared<CHeroArtPlace>(
@@ -45,7 +56,7 @@ CArtifactsOfHeroBackpack::CArtifactsOfHeroBackpack(const Point & position)
 		artPlaceIdx++;
 	}
 
-	if(backpackCap < 0 || visibleCapasityMax < backpackCap)
+	if(backpackCap < 0 || visibleCapacityMax < backpackCap)
 	{
 		auto onCreate = [](size_t index) -> std::shared_ptr<CIntObject>
 		{
diff --git a/client/widgets/CArtifactsOfHeroBackpack.h b/client/widgets/CArtifactsOfHeroBackpack.h
index f504ba62c..f3735795e 100644
--- a/client/widgets/CArtifactsOfHeroBackpack.h
+++ b/client/widgets/CArtifactsOfHeroBackpack.h
@@ -31,6 +31,7 @@ public:
 
 private:
 	std::shared_ptr<CListBoxWithCallback> backpackListBox;
+	std::vector<std::shared_ptr<CPicture>> backpackSlotsBackgrounds;
 	const size_t HERO_BACKPACK_WINDOW_SLOT_COLUMNS = 8;
 	const size_t HERO_BACKPACK_WINDOW_SLOT_LINES = 8;
 };

From b73f9325ad763a0ddebbdbc4ac409b42026e3e15 Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Mon, 21 Aug 2023 16:56:50 +0200
Subject: [PATCH 5/6] Fixes from code review

---
 client/widgets/CArtifactsOfHeroBackpack.cpp | 17 +++++++++--------
 client/widgets/CArtifactsOfHeroBackpack.h   |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/widgets/CArtifactsOfHeroBackpack.cpp b/client/widgets/CArtifactsOfHeroBackpack.cpp
index 80aab5d67..90ecd7567 100644
--- a/client/widgets/CArtifactsOfHeroBackpack.cpp
+++ b/client/widgets/CArtifactsOfHeroBackpack.cpp
@@ -28,20 +28,22 @@ CArtifactsOfHeroBackpack::CArtifactsOfHeroBackpack(const Point & position)
 {
 	OBJECT_CONSTRUCTION_CAPTURING(255 - DISPOSE);
 	pos += position;
+	setRedrawParent(true);
 
 	const auto backpackCap = VLC->settings()->getInteger(EGameSettings::HEROES_BACKPACK_CAP);
-	auto visibleCapacityMax = HERO_BACKPACK_WINDOW_SLOT_LINES * HERO_BACKPACK_WINDOW_SLOT_COLUMNS;
+	auto visibleCapacityMax = HERO_BACKPACK_WINDOW_SLOT_ROWS * HERO_BACKPACK_WINDOW_SLOT_COLUMNS;
 	if(backpackCap >= 0)
 		visibleCapacityMax = visibleCapacityMax > backpackCap ? backpackCap : visibleCapacityMax;
 
 	backpack.resize(visibleCapacityMax);
-	backpackSlotsBackgrounds.resize(visibleCapacityMax);
 	size_t artPlaceIdx = 0;
 
-	for(int i = 0; i < HERO_BACKPACK_WINDOW_SLOT_LINES * HERO_BACKPACK_WINDOW_SLOT_COLUMNS; i++)
+	const int slotSizeWithMargin = 46;
+
+	for(int i = 0; i < visibleCapacityMax; i++)
 	{
 		auto artifactSlotBackground = std::make_shared<CPicture>("heroWindow/artifactSlotEmpty",
-			Point(46 * (i % HERO_BACKPACK_WINDOW_SLOT_COLUMNS), 46 * (i / HERO_BACKPACK_WINDOW_SLOT_COLUMNS)));
+			Point(slotSizeWithMargin * (i % HERO_BACKPACK_WINDOW_SLOT_COLUMNS), slotSizeWithMargin * (i / HERO_BACKPACK_WINDOW_SLOT_COLUMNS)));
 
 		backpackSlotsBackgrounds.emplace_back(artifactSlotBackground);
 	}
@@ -49,7 +51,7 @@ CArtifactsOfHeroBackpack::CArtifactsOfHeroBackpack(const Point & position)
 	for(auto & artPlace : backpack)
 	{
 		artPlace = std::make_shared<CHeroArtPlace>(
-			Point(46 * (artPlaceIdx % HERO_BACKPACK_WINDOW_SLOT_COLUMNS), 46 * (artPlaceIdx / HERO_BACKPACK_WINDOW_SLOT_COLUMNS)));
+			Point(slotSizeWithMargin * (artPlaceIdx % HERO_BACKPACK_WINDOW_SLOT_COLUMNS), slotSizeWithMargin * (artPlaceIdx / HERO_BACKPACK_WINDOW_SLOT_COLUMNS)));
 		artPlace->setArtifact(nullptr);
 		artPlace->leftClickCallback = std::bind(&CArtifactsOfHeroBase::leftClickArtPlace, this, _1);
 		artPlace->rightClickCallback = std::bind(&CArtifactsOfHeroBase::rightClickArtPlace, this, _1);
@@ -67,8 +69,8 @@ CArtifactsOfHeroBackpack::CArtifactsOfHeroBackpack(const Point & position)
 			scrollBackpack(static_cast<int>(pos) * HERO_BACKPACK_WINDOW_SLOT_COLUMNS - backpackPos);
 		};
 		backpackListBox = std::make_shared<CListBoxWithCallback>(
-			posMoved, onCreate, Point(0, 0), Point(0, 0), HERO_BACKPACK_WINDOW_SLOT_LINES, 0, 0, 1,
-			Rect(HERO_BACKPACK_WINDOW_SLOT_COLUMNS * 46 + 10, 0, HERO_BACKPACK_WINDOW_SLOT_LINES * 46 - 5, 0));
+				posMoved, onCreate, Point(0, 0), Point(0, 0), HERO_BACKPACK_WINDOW_SLOT_ROWS, 0, 0, 1,
+				Rect(HERO_BACKPACK_WINDOW_SLOT_COLUMNS * slotSizeWithMargin + 10, 0, HERO_BACKPACK_WINDOW_SLOT_ROWS * slotSizeWithMargin - 5, 0));
 	}
 }
 
@@ -95,7 +97,6 @@ void CArtifactsOfHeroBackpack::scrollBackpack(int offset)
 		slot = slot + 1;
 	}
 	redraw();
-	setRedrawParent(true);
 }
 
 void CArtifactsOfHeroBackpack::updateBackpackSlots()
diff --git a/client/widgets/CArtifactsOfHeroBackpack.h b/client/widgets/CArtifactsOfHeroBackpack.h
index f3735795e..e6767a601 100644
--- a/client/widgets/CArtifactsOfHeroBackpack.h
+++ b/client/widgets/CArtifactsOfHeroBackpack.h
@@ -33,5 +33,5 @@ private:
 	std::shared_ptr<CListBoxWithCallback> backpackListBox;
 	std::vector<std::shared_ptr<CPicture>> backpackSlotsBackgrounds;
 	const size_t HERO_BACKPACK_WINDOW_SLOT_COLUMNS = 8;
-	const size_t HERO_BACKPACK_WINDOW_SLOT_LINES = 8;
+	const size_t HERO_BACKPACK_WINDOW_SLOT_ROWS = 8;
 };

From 28fe28adf59ef9130e6adf9eb2dabf9c7eae691f Mon Sep 17 00:00:00 2001
From: Dydzio <blood990@gmail.com>
Date: Mon, 21 Aug 2023 17:08:15 +0200
Subject: [PATCH 6/6] Fix player coloring

---
 client/windows/CHeroBackpackWindow.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/windows/CHeroBackpackWindow.cpp b/client/windows/CHeroBackpackWindow.cpp
index 424388e5b..46bcfda40 100644
--- a/client/windows/CHeroBackpackWindow.cpp
+++ b/client/windows/CHeroBackpackWindow.cpp
@@ -17,6 +17,7 @@
 #include "../widgets/Images.h"
 #include "CMessage.h"
 #include "render/Canvas.h"
+#include "CPlayerInterface.h"
 
 CHeroBackpackWindow::CHeroBackpackWindow(const CGHeroInstance * hero)
 	: CWindowObject((EOptions)0)
@@ -41,5 +42,5 @@ CHeroBackpackWindow::CHeroBackpackWindow(const CGHeroInstance * hero)
 void CHeroBackpackWindow::showAll(Canvas &to)
 {
 	CIntObject::showAll(to);
-	CMessage::drawBorder(PlayerColor(1), to.getInternalSurface(), pos.w+28, pos.h+29, pos.x-14, pos.y-15);
+	CMessage::drawBorder(PlayerColor(LOCPLINT->playerID), to.getInternalSurface(), pos.w+28, pos.h+29, pos.x-14, pos.y-15);
 }