Watch - NEW WATCH ALERT, ONLY $2499.99!!! (#623)

**When merged this pull request will:** - Adds two new watches ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
KAT-Advanced-Medical · Oct 15, 2024 · c925306 · c925306
1 parent 2d58179
commit c925306
Show file tree

Hide file tree

Showing 17 changed files with 535 additions and 4 deletions.
diff --git a/addons/watch/CfgWeapons.hpp b/addons/watch/CfgWeapons.hpp
@@ -7,4 +7,18 @@ class CfgWeapons {
         displayName = CSTRING(KatminDisplayName);
         picture = QPATHTOF(UI\watch_katmin.paa);
     };
+    class KAT_Cavmin: ItemWatch {
+        ACE_hideItemType = "Watch";
+        author = "Mazinski";        
+        descriptionShort = CSTRING(CavminDescription);
+        displayName = CSTRING(CavminDisplayName);
+        picture = QPATHTOF(UI\watch_cavmin.paa);
+    };
+    class KAT_STS: ItemWatch {
+        ACE_hideItemType = "Watch";
+        author = "Mazinski";        
+        descriptionShort = CSTRING(STSDescription);
+        displayName = CSTRING(STSDisplayName);
+        picture = QPATHTOF(UI\watch_sts.paa);
+    };
 };
diff --git a/addons/watch/RscTitles.hpp b/addons/watch/RscTitles.hpp
@@ -208,4 +208,214 @@ class RscTitles
             };
         };
     };
+    class KAT_Cavmin
+    {
+        idd = 20935;
+        enableSimulation = 1;
+        movingEnable = 0;
+        fadeIn=0;
+        fadeOut=1;
+        duration = 10e10;
+        onLoad = "uiNamespace setVariable ['KAT_Cavmin', _this select 0];";
+        class controls
+        {
+            class CavminImage: RscPicture
+            {
+                idc = 20800;
+                text = "\x\kat\addons\watch\UI\watch_cavmin.paa";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(15));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(18.5));
+                w = QUOTE(FRAME_W(25));
+                h = QUOTE(FRAME_H(25));
+            };
+            class CavminCompass: CavminImage
+            {
+                idc = 20802;
+                text = "\x\kat\addons\watch\UI\watch_cavmin_compass.paa";
+            };
+            class CavminOverlay: CavminImage
+            {
+                idc = 20803;
+                text = "\x\kat\addons\watch\UI\watch_cavmin_face.paa";
+            };
+            class CavminTime: RscText
+            {
+                idc = 20804;
+                style = ST_CENTER;
+                shadow = 0;
+                font = "EtelkaMonospacePro";
+                text = "12:00"; //--- ToDo: Localize;
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(6.2));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(5.7));
+                w = QUOTE(FRAME_W(7.5));
+                h = QUOTE(FRAME_H(4));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,1};
+                sizeEx = QUOTE(FRAME_H(3));
+            };
+            class CavminHR: RscText
+            {
+                idc = 20805;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "EtelkaMonospaceProBold";
+                text = "80"; //--- ToDo: Localize;
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(7.2));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(9.1));
+                w = QUOTE(FRAME_W(2.5));
+                h = QUOTE(FRAME_H(1.5));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,1};
+                sizeEx = QUOTE(FRAME_H(2));
+            };
+            class CavminAltitude: RscText
+            {
+                idc = 20806;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "EtelkaMonospaceProBold";
+                text = "1000";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(0.3));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(9.1));
+                w = QUOTE(FRAME_W(2.5));
+                h = QUOTE(FRAME_H(1.5));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,1};
+                sizeEx = QUOTE(FRAME_H(2));
+            };
+            class CavminBearing: RscText
+            {
+                idc = 20807;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "EtelkaMonospaceProBold";
+                text = "1000";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(6.2));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(8.8));
+                w = QUOTE(FRAME_W(7.5));
+                h = QUOTE(FRAME_H(4));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,1};
+                sizeEx = QUOTE(FRAME_H(2.5));
+            };
+        };
+    };
+    class KAT_sts
+    {
+        idd = 21935;
+        enableSimulation = 1;
+        movingEnable = 0;
+        fadeIn=0;
+        fadeOut=1;
+        duration = 10e10;
+        onLoad = "uiNamespace setVariable ['KAT_STS', _this select 0];";
+        class controls
+        {
+            class STSImage: RscPicture
+            {
+                idc = 21800;
+                text = "\x\kat\addons\watch\UI\watch_sts.paa";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(15));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(18.5));
+                w = QUOTE(FRAME_W(25));
+                h = QUOTE(FRAME_H(25));
+            };
+            class StsBigAlt: STSImage
+            {
+                idc = 21802;
+                text = "\x\kat\addons\watch\UI\watch_sts_bigAlt.paa";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(15));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(20.65));
+                w = QUOTE(FRAME_W(25));
+                h = QUOTE(FRAME_H(25));
+            };
+            class StsSmallAlt: StsBigAlt
+            {
+                idc = 21803;
+                text = "\x\kat\addons\watch\UI\watch_sts_smallAlt.paa";
+            };
+            class STSTime: RscText
+            {
+                idc = 21804;
+                style = ST_CENTER;
+                shadow = 0;
+                font = "PuristaSemibold";
+                text = "12:00"; //--- ToDo: Localize;
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(6.2));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(3.6));
+                w = QUOTE(FRAME_W(7.5));
+                h = QUOTE(FRAME_H(4));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,0.9};
+                sizeEx = QUOTE(FRAME_H(2.5));
+            };
+            class STSHR: RscText
+            {
+                idc = 21805;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "PuristaMedium";
+                text = "80"; //--- ToDo: Localize;
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(8.2));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(6));
+                w = QUOTE(FRAME_W(2.5));
+                h = QUOTE(FRAME_H(1.5));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,0.9};
+                sizeEx = QUOTE(FRAME_H(2));
+            };
+            class STSO2: RscText
+            {
+                idc = 21806;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "PuristaMedium";
+                text = "1000";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(-0.6));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(6));
+                w = QUOTE(FRAME_W(2.5));
+                h = QUOTE(FRAME_H(1.5));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,0.9};
+                sizeEx = QUOTE(FRAME_H(2));
+            };
+            class STSAltitude: RscText
+            {
+                idc = 21807;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "PuristaSemibold";
+                text = "1000";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(6.3));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(13.4));
+                w = QUOTE(FRAME_W(7.5));
+                h = QUOTE(FRAME_H(4));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,0.9};
+                sizeEx = QUOTE(FRAME_H(2.2));
+            };
+            class STSDescent: RscText
+            {
+                idc = 21808;
+                style = ST_CENTER;
+                valign = "middle";
+                shadow = 0;
+                font = "PuristaSemibold";
+                text = "0";
+                x = QUOTE(SAFEZONE_X_RIGHTEDGE - FRAME_W(25) - FRAME_W(1));
+                y = QUOTE(SAFEZONE_Y_LOWEDGE - FRAME_H(11.1));
+                w = QUOTE(FRAME_W(2.5));
+                h = QUOTE(FRAME_H(1.7));
+                colorBackground[] = {0,0,0,0};
+                colorText[] = {1,1,1,0.9};
+                sizeEx = QUOTE(FRAME_H(1));
+            };
+        };
+    };
 };
diff --git a/addons/watch/UI/watch_cavmin.paa b/addons/watch/UI/watch_cavmin.paa
diff --git a/addons/watch/UI/watch_cavmin_compass.paa b/addons/watch/UI/watch_cavmin_compass.paa
diff --git a/addons/watch/UI/watch_cavmin_face.paa b/addons/watch/UI/watch_cavmin_face.paa
diff --git a/addons/watch/UI/watch_sts.paa b/addons/watch/UI/watch_sts.paa
diff --git a/addons/watch/UI/watch_sts_bigAlt.paa b/addons/watch/UI/watch_sts_bigAlt.paa
diff --git a/addons/watch/UI/watch_sts_smallAlt.paa b/addons/watch/UI/watch_sts_smallAlt.paa
diff --git a/addons/watch/XEH_PREP.hpp b/addons/watch/XEH_PREP.hpp
@@ -1,2 +1,6 @@
 PREP(hideKWatch);
-PREP(showKWatch);
+PREP(hideCWatch);
+PREP(hideSWatch);
+PREP(showKWatch);
+PREP(showCWatch);
+PREP(showSWatch);
diff --git a/addons/watch/XEH_postInit.sqf b/addons/watch/XEH_postInit.sqf
@@ -14,3 +14,29 @@ if (!hasInterface) exitWith {};
 
     true
 }, { false }, [24, [false, false, false]], false] call CBA_fnc_addKeybind;
+
+["KAT Cav Watch", QGVAR(showCavmin), "Show Cavmin", {
+    // Conditions: canInteract
+    if (!([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call ACEFUNC(common,canInteractWith)) || {!('KAT_Cavmin' in assignedItems ACE_player)}) exitWith { false };
+
+    if !(GETMVAR(GVAR(CavminActive),false)) then {
+        [ACE_player] call FUNC(showCWatch);
+    } else {
+        call FUNC(hideCWatch);
+    };
+
+    true
+}, { false }, [24, [false, false, false]], false] call CBA_fnc_addKeybind;
+
+["KAT STS Watch", QGVAR(showSTS), "Show STS", {
+    // Conditions: canInteract
+    if (!([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call ACEFUNC(common,canInteractWith)) || {!('KAT_STS' in assignedItems ACE_player)}) exitWith { false };
+
+    if !(GETMVAR(GVAR(STSActive),false)) then {
+        [ACE_player] call FUNC(showSWatch);
+    } else {
+        call FUNC(hideSWatch);
+    };
+
+    true
+}, { false }, [24, [false, false, false]], false] call CBA_fnc_addKeybind;
diff --git a/addons/watch/config.cpp b/addons/watch/config.cpp
@@ -6,7 +6,9 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         units[] = { };
         weapons[] = {
-            "KAT_Katmin"
+            "KAT_Katmin",
+            "KAT_Cavmin",
+            "KAT_STS"
         };
         magazines[] = { };
         requiredAddons[] = {

diff --git a/addons/watch/functions/fnc_hideCWatch.sqf b/addons/watch/functions/fnc_hideCWatch.sqf
@@ -0,0 +1,19 @@
+#include "..\script_component.hpp"
+/*
+ * Author: Garth 'L-H' de Wet
+ * Modified: Mazinski
+ * Removes the KWatch from the screen.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * call kat_watch_fnc_hideKWatch
+ *
+ * Public: No
+ */
+GVAR(CavminActive) = false;
+"KAT_Cavmin" cutText ["","PLAIN",0,true];
diff --git a/addons/watch/functions/fnc_hideSWatch.sqf b/addons/watch/functions/fnc_hideSWatch.sqf
@@ -0,0 +1,19 @@
+#include "..\script_component.hpp"
+/*
+ * Author: Garth 'L-H' de Wet
+ * Modified: Mazinski
+ * Removes the KWatch from the screen.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * call kat_watch_fnc_hideKWatch
+ *
+ * Public: No
+ */
+GVAR(STSActive) = false;
+"KAT_STS" cutText ["","PLAIN",0,true];