From 9bb47d0aa1d6cde828c37901d30f55e3458a1fe5 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 1 Oct 2022 13:53:18 +0100
Subject: [PATCH] Add tooltips and new reload icon

---
 data/language/en-GB.txt                |   3 +++
 resources/g2/icons/reload.png          | Bin 0 -> 339 bytes
 resources/g2/sprites.json              |   5 +++++
 src/openrct2-ui/windows/AssetPacks.cpp |   6 +++---
 src/openrct2/localisation/StringIds.h  |   3 +++
 src/openrct2/sprites.h                 |   3 ++-
 6 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 resources/g2/icons/reload.png

diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt
index 8df376085a..a75d74c589 100644
--- a/data/language/en-GB.txt
+++ b/data/language/en-GB.txt
@@ -3627,6 +3627,9 @@ STR_6519    :Extras
 STR_6520    :Asset Packs
 STR_6521    :Low Priority
 STR_6522    :High Priority
+STR_6523    :Decrease the priority of the selected asset pack.
+STR_6524    :Increase the priority of the selected asset pack.
+STR_6525    :Reload all assets in the game with the enabled asset packs.
 
 #############
 # Scenarios #
diff --git a/resources/g2/icons/reload.png b/resources/g2/icons/reload.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba00136461693af203e9b03f76f972e4fe0cafdf
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQajKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijS1AIbUfwVFM!~fs?|3An7f3E-ewDkUN{_D$y`-9n+=d%N49cy}dffRR1
zkYDhBIAHMdXZ!>d<}C1tEM{QfI}E~%$MaXD00ozLx;Tbt1iN1F7HUx7VGhWyKlPVC
zXHr*L%!ApJn2ygfy87EVqik38k{dl9T|PCD+jKgoEqJ$z@4b=!!t^gkPjK;{m(ECM
z^SIdBA+{*L|ESf?PPaF;XD@1eIdEd*?;ys~zJsv`?2E1^{>}aWYQw2J%>hv_J?d9m
zPCu}y>m$cW#yx6GyDYyxkyhxg2>skU$6f!~`OA$D7oD8a)LkC<MWJh={@Sk$>(e>+
U?tXC~0q9-^Pgg&ebxsLQ053R<H2?qr

literal 0
HcmV?d00001

diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json
index b184d9938a..9490ca65bc 100644
--- a/resources/g2/sprites.json
+++ b/resources/g2/sprites.json
@@ -550,6 +550,11 @@
         "x_offset": 5,
         "y_offset": 5
     },
+    {
+        "path": "icons/reload.png",
+        "x_offset": 2,
+        "y_offset": 2
+    },
     {
         "path": "font/latin/ae-uc-small.png",
         "y_offset": 0,
diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp
index 7ca86c74a4..6dcc854448 100644
--- a/src/openrct2-ui/windows/AssetPacks.cpp
+++ b/src/openrct2-ui/windows/AssetPacks.cpp
@@ -38,9 +38,9 @@ enum WindowAssetPacksWidgetIdx {
 static rct_widget WindowAssetPacksWidgets[] = {
     WINDOW_SHIM(WINDOW_TITLE, WW, WH),
     MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::Scroll,  WindowColour::Secondary, SCROLL_VERTICAL),
-    MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_ARROW_UP, STR_NONE),
-    MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_ARROW_DOWN, STR_NONE),
-    MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_ROTATE_ARROW, STR_NONE),
+    MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_ARROW_UP, STR_DECREASE_PRIOTITY_TIP),
+    MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_ARROW_DOWN, STR_INCREASE_PRIOTITY_TIP),
+    MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_RELOAD, STR_RELOAD_ASSET_PACKS_TIP),
     WIDGETS_END,
 };
 // clang-format on
diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h
index 97a0df4d10..ea628b71b6 100644
--- a/src/openrct2/localisation/StringIds.h
+++ b/src/openrct2/localisation/StringIds.h
@@ -3910,6 +3910,9 @@ enum : uint16_t
     STR_ASSET_PACKS = 6520,
     STR_LOW_PRIORITY = 6521,
     STR_HIGH_PRIORITY = 6522,
+    STR_DECREASE_PRIOTITY_TIP = 6523,
+    STR_INCREASE_PRIOTITY_TIP = 6524,
+    STR_RELOAD_ASSET_PACKS_TIP = 6525,
 
     // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
     /* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index 010c3a7a33..c202cb50c8 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -902,8 +902,9 @@ enum
 
     SPR_G2_ARROW_UP = SPR_G2_BEGIN + 152,
     SPR_G2_ARROW_DOWN = SPR_G2_BEGIN + 153,
+    SPR_G2_RELOAD = SPR_G2_BEGIN + 154,
 
-    SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 154,
+    SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 155,
 
     SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN,
     SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,