2.1.0

tuntematonjr · Jun 5, 2022 · 883c28d · 883c28d
1 parent 365067a
commit 883c28d
Show file tree

Hide file tree

Showing 32 changed files with 904 additions and 98 deletions.
diff --git a/addons/artycomputer_models/$PREFIX$ b/addons/artycomputer_models/$PREFIX$
diff --git a/addons/firesupport/$PREFIX$ b/addons/firesupport/$PREFIX$
diff --git a/addons/firesupport/Convert_dialog.hpp b/addons/firesupport/Convert_dialog.hpp
@@ -0,0 +1,78 @@
+//Exported via Arma Dialog Creator (https://github.com/kayler-renslow/arma-dialog-creator)
+
+#include "CustomControlClasses.hpp"
+class tun_firesupport_convertDialog
+{
+	idd = MAINCONVERT_IDD;
+	enableSimulation = false;
+	class ControlsBackground
+	{
+		class tun_firesupport_convert_background
+		{
+			type = 0;
+			idc = -1;
+			x = safeZoneX + safeZoneW * 0.3;
+			y = safeZoneY + safeZoneH * 0.175;
+			w = safeZoneW * 0.4;
+			h = safeZoneH * 0.575;
+			style = 0;
+			text = "";
+			colorBackground[] = GUI_BCG_MENU;
+			colorText[] = {0.2431,0.1725,0.3333,1};
+			font = "PuristaMedium";
+			sizeEx = (((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1);
+		};
+
+	};
+	class Controls
+	{
+		class tun_firesupport_convert_header : tun_firesupport_header_base
+		{
+			x = safeZoneX + safeZoneW * 0.325;
+			y = safeZoneY + safeZoneH * 0.2;
+			w = safeZoneW * 0.35;
+			h = safeZoneH * 0.05;
+			text = "$STR_tun_firesupport_converter_header";
+
+
+		};
+		class tun_firesupport_convert_swtEditBox : tun_default_editBox
+		{
+			idc = SWTDATA;
+			x = safeZoneX + safeZoneW * 0.325;
+			y = safeZoneY + safeZoneH * 0.52777778;
+			w = safeZoneW * 0.35;
+			h = safeZoneH * 0.19722223;
+			text = "$STR_tun_firesupport_converter_swtEditBoxText";
+			style = 16+2;		
+		};
+		class tun_firesupport_convert_tunEditBox : tun_firesupport_convert_swtEditBox
+		{
+			idc = TUNDATA;
+			y = safeZoneY + safeZoneH * 0.26851852;
+			text = "$STR_tun_firesupport_converter_firesupportEditBoxText";		
+
+		};
+		class tun_firesupport_swt_to_firesupport_button : RscButton
+		{
+			idc = -1;
+			x = safeZoneX + safeZoneW * 0.3625;
+			y = safeZoneY + safeZoneH * 0.47222223;
+			w = safeZoneW * 0.096875;
+			h = safeZoneH * 0.0462963;
+			text = "To Firesupport";
+			onButtonClick = "[false] call tun_firesupport_fnc_convertData";
+			colorBackground[] = GUI_BCG_COLOR;
+			colorBackgroundActive[]  = GUI_BCG_COLOR;
+		};
+		class tun_firesupport_firesupport_to_swt_button : tun_firesupport_swt_to_firesupport_button
+		{
+			idc = -1;
+			x = safeZoneX + safeZoneW * 0.540625;
+			text = "To SWT";
+			onButtonClick = "[true] call tun_firesupport_fnc_convertData";
+		};
+
+	};
+
+};
diff --git a/addons/firesupport/CustomControlClasses.hpp b/addons/firesupport/CustomControlClasses.hpp
@@ -14,23 +14,24 @@ class RscTree;
 class RscCombo;
 class RscXSliderH;
 class RscCheckBox;
+#include "\a3\ui_f\hpp\definecommoncolors.inc"
+#include "\a3\ui_f\hpp\definecommoncolors.inc"
 
-#define GUI_USER_COLORBACKGROUND	{ 		"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.13])", 		"(profilenamespace getvariable ['GUI_BCG_RGB_G',0.54])", 		"(profilenamespace getvariable ['GUI_BCG_RGB_B',0.21])", 		1 	}
+//#define GUI_BCG_COLOR	{ 		"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.13])", 		"(profilenamespace getvariable ['GUI_BCG_RGB_G',0.54])", 		"(profilenamespace getvariable ['GUI_BCG_RGB_B',0.21])", 		1 	}
 
 class tun_default_editBox : RscEdit
 {
 	autocomplete = "";
 	borderSize = 0.01;
-	colorBorder[] = GUI_USER_COLORBACKGROUND;
+	colorBorder[] = GUI_BCG_COLOR;
 	colorBackground[] = {0.2,0.2,0.2,0.2};
 	colorDisabled[] = {0,0,0,0};
-	colorSelection[] = GUI_USER_COLORBACKGROUND;
+	colorSelection[] = GUI_BCG_COLOR;
 	colorText[] = {1,1,1,1};
 	canModify = true;
 	shadow = 0;
 };
 
-
 class tun_firesupport_coordinate_preset : tun_default_editBox
 {
 	text = "000";
@@ -41,7 +42,7 @@ class tun_firesupport_coordinate_preset : tun_default_editBox
 
 class tun_default_text : RscText
 {
-	colorBackground[] = GUI_USER_COLORBACKGROUND;
+	colorBackground[] = GUI_BCG_COLOR;
 	colorText[] = {1,1,1,1};	
 };
 
@@ -51,4 +52,13 @@ class tun_default_CheckBox : RscCheckBox
 	h = safeZoneH * 0.025;	
 };
 
+class tun_firesupport_header_base : RscText 
+{
+	type = 0;
+	idc = -1;
+	style = 32+2;
+	shadow = 2;
+	colorBackground[] = GUI_BCG_COLOR;
+	colorText[] = GUI_TITLETEXT_COLOR;
+};
 #endif
diff --git a/addons/firesupport/Firesupport_dialog.hpp b/addons/firesupport/Firesupport_dialog.hpp
@@ -107,7 +107,7 @@ class Firesupport_dialog
 			w = safeZoneW * 0.1421875;
 			h = safeZoneH * 0.21481482;
 			borderSize = 0.01;
-			colorBorder[] = GUI_USER_COLORBACKGROUND;
+			colorBorder[] = GUI_BCG_COLOR;
 			colorLines[] = {1,1,1,1};
 			colorBackground[] = {0.2,0.2,0.2,0.2};
 			onTreeSelChanged = "[] call tun_firesupport_fnc_setValues";
@@ -129,6 +129,7 @@ class Firesupport_dialog
 			x = safeZoneX + safeZoneW * 0.378125;
 			y = safeZoneY + safeZoneH * 0.27870371;
 			tooltip = "$STR_tun_firesupport_coordinates_tooltip_easting";
+			onKeyUp = "[] call tun_firesupport_fnc_firingPosMarker";
 
 		};
 		class tun_firesupport_easting_text : tun_default_text 
@@ -171,6 +172,7 @@ class Firesupport_dialog
 			x = safeZoneX + safeZoneW * 0.378125;
 			y = safeZoneY + safeZoneH * 0.34351852;
 			tooltip = "$STR_tun_firesupport_coordinates_tooltip_easting";
+			onKeyUp = "[] call tun_firesupport_fnc_firingPosMarker; [false] call tun_firesupport_fnc_check_values;";
 
 		};
 		class tun_firesupport_northing_end_point_value : tun_firesupport_easting_end_point_value 
@@ -188,7 +190,7 @@ class Firesupport_dialog
 			y = safeZoneY + safeZoneH * 0.31574075;
 			text = "$STR_tun_firesupport_northing_end_point";
 		};
-		
+
 		class tun_firesupport_ammo_count : tun_default_editBox 
 		{
 			idc = COUNT_IDC;
@@ -282,17 +284,13 @@ class Firesupport_dialog
 			text = "Value";
 			tooltip = "$STR_tun_firesupport_eta_tooltip";
 		};
-		class tun_firesupport_header : RscText 
+		class tun_firesupport_header : tun_firesupport_header_base 
 		{
-			type = 0;
-			idc = -1;
 			x = safeZoneX + safeZoneW * 0.22447917;
 			y = safeZoneY + safeZoneH * 0.18518519;
 			w = safeZoneW * 0.55104167;
 			h = safeZoneH * 0.05;
-			style = 32+2;
 			text = "$STR_tun_firesupport_Header";
-			shadow = 2;
 
 		};
 		class tun_firesupport_status : tun_default_text 
@@ -423,7 +421,7 @@ class Firesupport_dialog
 			y = safeZoneY + safeZoneH * 0.27870371;
 			w = safeZoneW * 0.1375;
 			h = safeZoneH * 0.02962963;
-			//onLBSelChanged = "";
+			onLBSelChanged = "[] call tun_firesupport_fnc_firingPosMarker";
 		};
 		class tun_firesupport_trp2_list : tun_firesupport_trp1_list 
 		{
@@ -475,8 +473,14 @@ class Firesupport_dialog
 			idc = TOGGLEVOLLEY;
 			x = safeZoneX + safeZoneW * 0.69010417;
 			y = safeZoneY + safeZoneH * 0.34351852;
-			tooltip = "$STR_tun_firesupport_toggleVolleyFire_tooltip";
-
+			tooltip = "$STR_tun_firesupport_toggleVolleyFire_tooltip";			
+		};
+
+		class tun_firesupport_toggleMoveMap: tun_firesupport_togglevolleyfire
+		{
+			idc = TOGGLEMAPMOVE;
+			x = safeZoneX + safeZoneW * 0.69010417 + (safeZoneW * 0.015)*2;
+			tooltip = "$STR_tun_firesupport_toggleMoveMap_tooltip";			
 		};
 
 		class tun_firesupport_time_text : tun_default_text 
@@ -487,16 +491,15 @@ class Firesupport_dialog
 			w = safeZoneW * 0.09739584;
 			h = safeZoneH * 0.025;
 			text = "$STR_tun_firesupport_toggletimetext";
-			tooltip = "$STR_tun_firesupport_toggletimetext_tooltip";
-
+			tooltip = "$STR_tun_firesupport_toggletimetext_tooltip";			
 		};
+
 		class tun_firesupport_queue_list : tun_firesupport_bookmark_list 
 		{
 			idc = QUEUELIST;
-			onLBSelChanged = "";
-
-
+			onLBSelChanged = "";		
 		};
+
 		class tun_firesupport_queue_remove_button : RscButton 
 		{
 			type = 1;
@@ -507,10 +510,7 @@ class Firesupport_dialog
 			h = safeZoneH * 0.05;
 			text = "$STR_tun_firesupport_queue_remove";
 			onMouseButtonClick = "[] call tun_firesupport_fnc_removeQueue";
-			tooltip = "$STR_tun_firesupport_queue_remove_tooltip";
-
+			tooltip = "$STR_tun_firesupport_queue_remove_tooltip";			
 		};
 	};
-
-};
-
+};
diff --git a/addons/firesupport/Firesupport_idc.hpp b/addons/firesupport/Firesupport_idc.hpp
@@ -7,7 +7,7 @@
 #define EASTING_END_IDC					22206
 #define NORTHING_END_IDC				22207
 #define REMAINIG_AMMO_IDC				22208
-#define TRP LIST						22209
+//#define TRP LIST						22209
 #define ETA_IDC							22210
 #define STATUS_IDC						22211
 #define FIRE_IDC						22212
@@ -43,6 +43,9 @@
 #define QUEUELIST						22242
 #define QUEUEREMOVE						22243
 #define TOGGLEVOLLEY					22244
+#define TOGGLEMAPMOVE					22245
 
-
+#define MAINCONVERT_IDD					22250
+#define SWTDATA							22251
+#define TUNDATA							22252