Merge pull request #16 from tuntematonjr/dev

Update 1.4.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See the thing burning!!!!
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Arma version
+ - CBA version
+ - This mod version
+
+**List of all active mods:**
+ - 
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -19,9 +19,11 @@ extensions/vcproj32/*
 extensions/vcproj64/*
 hemtt
 hemtt.exe
+pohja.sqf
 release/*
 releases/*
 sqfvm.exe
+template/*
 texHeaders.bin
 Thumbs.db
 tools/temp

addons/briefingtime/XEH_postInit_client.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 if (isMultiplayer) then {
-    [{ ADDON && !isnil "cba_missiontime" }, {
+    [{ ADDON && !isNil "cba_missiontime" }, {
         if (GVAR(enable)) then {
             GVAR(Notifications) = [];
 

addons/briefingtime/XEH_postInit_server.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 if (isMultiplayer) then {
-    [{ ADDON && !isnil "cba_missiontime" }, {
+    [{ ADDON && !isNil "cba_missiontime" }, {
         if (GVAR(enable)) then {
 
             _handle = [{

addons/briefingtime/config.cpp

@@ -7,9 +7,9 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_interaction","ace_interact_menu","tunuti_main"};
+        requiredAddons[] = {"ace_interaction","ace_interact_menu",MAIN_ADDON_STR};
         author = "Tuntematon"; 
-        authorUrl = TUN_UTILITY_GITHUBLINK;
+        authorUrl = GITHUBLINK;
         VERSION_CONFIG;
     };
 };

addons/briefingtime/script_component.hpp

@@ -2,8 +2,8 @@
 #define COMPONENT_BEAUTIFIED BriefingTime
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-// #define DEBUG_MODE_FULL
-#define DISABLE_COMPILE_CACHE
+#define DEBUG_MODE_FULL
+//#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_BRIEFINGTIME
     #define DEBUG_MODE_FULL

addons/main/config.cpp

@@ -9,7 +9,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"cba_main","cba_xeh","cba_settings","ace_common","ace_main"};
         author = "Tuntematon";
-        authorUrl = TUN_UTILITY_GITHUBLINK;
+        authorUrl = GITHUBLINK;
         VERSION_CONFIG;
     };
 };
@@ -26,7 +26,7 @@ class CfgMods {
         hideName        = "false";              // Hide the extension name in main menu and extension menu
         hidePicture     = "false";              // Hide the extension picture in the extension menu
 
-        action          = TUN_UTILITY_GITHUBLINK; // Website URL, that can accessed from the expansions menu 
+        action          = GITHUBLINK; // Website URL, that can accessed from the expansions menu 
         actionName      = "Github";              // label of button/tooltip in extension menu
         description     = "It's unclear where this will show"; // Probably in context with action
 

addons/main/script_macros.hpp

@@ -10,4 +10,5 @@
 
 #define TUNUTI_FIND_MAPDISPLAY ([53, 52, 37, 12, nil] select ([53, 52, 37, 12] findIf {!isNull findDisplay _x}))
 
-#define TUN_UTILITY_GITHUBLINK "https://github.com/tuntematonjr/Tun-Utilities"
+#define GITHUBLINK             "https://github.com/tuntematonjr/Tun-Utilities"
+#define MAIN_ADDON_STR         QUOTE(MAIN_ADDON)

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 1
-#define MINOR 3
-#define PATCH 5
-#define BUILD 12042024
+#define MINOR 4
+#define PATCH 0
+#define BUILD 3

addons/planningmode/config.cpp

@@ -7,9 +7,9 @@ class CfgPatches {
         units[] = { };
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"tunuti_main"};
+        requiredAddons[] = {MAIN_ADDON_STR};
         author = "Tuntematon";
-        authorUrl = TUN_UTILITY_GITHUBLINK;
+        authorUrl = GITHUBLINK;
         VERSION_CONFIG;
     };
 };

addons/planningmode/functions/fnc_losCheck.sqf

@@ -54,7 +54,7 @@ if (_enable) then {
 
 				private _markerBlock = createMarkerLocal [format["%2_%1", _forEachIndex, _prefixText], _pos];
 
-				if (!isnull _obj) then {
+				if (!isNull _obj) then {
 					private _name =  getText(configOf _obj >> "Displayname");
 					_markerBlock setMarkerTextLocal "Block";
 					_color = "ColorYellow";

addons/planningmode/script_component.hpp

@@ -2,8 +2,8 @@
 #define COMPONENT_BEAUTIFIED PlanningMode
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-// #define DEBUG_MODE_FULL
-#define DISABLE_COMPILE_CACHE
+#define DEBUG_MODE_FULL
+//#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_PLANNINGMODE
     #define DEBUG_MODE_FULL

addons/radiochannels/XEH_postInit_server.sqf

@@ -8,7 +8,7 @@ if (GVAR(enable)) then {
 	!isNil "TFAR_defaultFrequencies_lr_east" && 
 	!isNil "TFAR_defaultFrequencies_lr_independent" && 
 	ADDON &&
-	!isnil "cba_missiontime" }, {
+	!isNil "cba_missiontime" }, {
 		[] call FUNC(serverInit);
 	}, (diag_tickTime + 10)] call CBA_fnc_waitUntilAndExecute;
 };

addons/radiochannels/config.cpp

@@ -7,9 +7,9 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_interaction","ace_interact_menu","tfar_core","tunuti_main"};
+        requiredAddons[] = {"ace_interaction","ace_interact_menu","tfar_core",MAIN_ADDON_STR};
         author = "Tuntematon";
-        authorUrl = TUN_UTILITY_GITHUBLINK;
+        authorUrl = GITHUBLINK;
         VERSION_CONFIG;
         skipWhenMissingDependencies = 1;
     };

addons/radiochannels/functions/fnc_serverInit.sqf

@@ -74,8 +74,8 @@ FILTER(_groupsIndependent,{ if (_x in _playableUnits) exitWith {true}; false } f
 	{
 		private _group = _x;
 		private _isCommandElement = _group getVariable [QGVAR(isCommandElement), false];
-		private _commandTrimmed = ((groupID _group) splitString GVAR(trimNames)) select 0;
-		private _squadNameTrimmed = (groupID _group);
+		private _commandTrimmed = ((groupId _group) splitString GVAR(trimNames)) select 0;
+		private _squadNameTrimmed = (groupId _group);
 		private _lrFrequency = nil;
 		private _srFrequency = nil;
 		private _lrData = [];

addons/radiochannels/script_component.hpp

@@ -2,8 +2,8 @@
 #define COMPONENT_BEAUTIFIED RadioChannels
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-// #define DEBUG_MODE_FULL
-#define DISABLE_COMPILE_CACHE
+#define DEBUG_MODE_FULL
+//#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_RADIOCHANNELS
     #define DEBUG_MODE_FULL

addons/startmarkers/config.cpp

@@ -7,9 +7,9 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"tunuti_main"};
+        requiredAddons[] = {MAIN_ADDON_STR};
         author = "Tuntematon";
-        authorUrl = TUN_UTILITY_GITHUBLINK;
+        authorUrl = GITHUBLINK;
         VERSION_CONFIG;
     };
 };

addons/startmarkers/functions/fnc_updateData.sqf

@@ -15,6 +15,8 @@
 
 LOG("Runned update data");
 
+#define CHECKGPS(GPSITEMS,UNITITEMS,UNIT)    ((GPSITEMS findIf {_x in UNITITEMS} ) isNotEqualTo -1 || (getNumber (configOf vehicle UNIT >> "enableGPS") isEqualTo 1))
+
 private _westSquadHash = GVAR(squadMarkersWestData);
 private _eastSquadHash = GVAR(squadMarkersEastData);
 private _resistanceSquadHash = GVAR(squadMarkersIndependentData);
@@ -34,26 +36,35 @@ private _updateTime = _time;
 
 private _allowedSide = GVAR(allowedSidesStarmarker);
 private _bftAlwaysOn = GVAR(bftAlwaysOn);
+private _gpsItems = GVAR(bftItems);
 
-if (!isServer || (cba_missiontime > 0) && GVAR(enableBFT)) then {
+if (!isServer || (_time > 0) && GVAR(enableBFT)) then {
     _allowedSide = GVAR(allowedSidesBFT);
 };
 
 if (_time < 1) then {
     _updateTime = -1;
 };
 
-{   
+{
     private _group = _x;
     private _side = side _group;
     if (_side in _allowedSide) then {
         private _leader = leader _group;
         private _hasGPS = true; //True to make sure data is collected at briefing
-
+        private _units = (units _group);
         if (_time > 0) then {
-            private _items = assignedItems _leader + items _leader;
-            MAP(_items,toLower _x);
-            _hasGPS = (( GVAR(bftItems) findIf {_x in _items} ) isNotEqualTo -1 || (getNumber (configOf vehicle _leader >> "enableGPS") isEqualTo 1));
+            {
+                private _unit = _x;
+                //skip units in respawn
+                if !(_unit getVariable ["tunres_Respawn_isWaitingRespawn", false]) then { continue };
+                private _items = assignedItems _unit + items _unit;
+                MAP(_items,toLower _x);
+                _hasGPS = CHECKGPS(_gpsItems,_items,_unit);
+                if (_hasGPS) exitWith {
+                    _leader = _unit;
+                };
+            } forEach _units;
         };
 
         if (_group getVariable [QGVAR(enableMarker), true] && {_hasGPS || _bftAlwaysOn}) then {
@@ -78,7 +89,7 @@ if (_time < 1) then {
             };
         };
     };
-} forEach allgroups; 
+} forEach allGroups; 
 
 private _vehiclesToCreateMarkers = [];
 private _playableUnits = playableUnits + switchableUnits;
@@ -87,7 +98,7 @@ private _showUnmanned = GVAR(showUnmanned);
 {
     private _vehicle = _x; 
     private _side = _vehicle getVariable [QGVAR(vehicleSide), (_vehicle getVariable ["Tun_startmarkers_vehicleSide", sideLogic])]; // "tunuti_startmarkers_vehicleSide"
-    if ( _vehicle getVariable [QGVAR(enableMarker), true] && { _side in _allowedSide } && { alive _vehicle }) then {
+    if ( _vehicle getVariable [QGVAR(enableMarker), true] && { _side in _allowedSide } && { alive _vehicle } && {!(_vehicle getVariable ["tunres_MSP_isMSP", false])}) then {
 
         private _pos = getPosWorld _vehicle;
         private _direction = getDir _vehicle;

addons/startmarkers/script_component.hpp

@@ -2,8 +2,8 @@
 #define COMPONENT_BEAUTIFIED StartMarkers
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-// #define DEBUG_MODE_FULL
-#define DISABLE_COMPILE_CACHE
+#define DEBUG_MODE_FULL
+//#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_STARTMARKERS
     #define DEBUG_MODE_FULL

addons/unconinfo/CfgEventHandlers.hpp

@@ -15,4 +15,4 @@ class Extended_PostInit_EventHandlers {
         init = QUOTE(call COMPILE_FILE(XEH_postInit));
         clientInit = QUOTE(call COMPILE_FILE(XEH_postInit_client));
     };
-};
+};