Merge pull request #116 from unitedoperations/dev

Dev to master
unitedoperations · Apr 30, 2019 · 75ea0cb · 75ea0cb
2 parents 0a48ff4 + 2f17596
commit 75ea0cb
Show file tree

Hide file tree

Showing 56 changed files with 874 additions and 510 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ Thumbs.db
 *.log
 *.zip
 *.7z
+.vscode
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,30 @@ All notable changes to this project will be documented in this file.
 The version number refer to VERSION define in script_mod.
 The date refers to the date when changes have been merged into DEV branch.
 
-## [Unreleased]
+## [1.0.6]
+### Added
+- View Distance limit sliders now avaliable!
+  - Note: Minimumn view-distance enforced by Arma is 200 meters.
+- Added unit babel language
+
+### Changed
+- CaptureZone modules used hint, changed to hintSilent
+- The extraction end-condition is now longer dependent upon another end-condition to fire.
+
+### Fixed
+- All run "module on respawn" settings are now configurable.
+- Individual ticketed respawns now fully functional
+- Team tickets and unlimited respawn options now functional
+- Respawn as a different faction is now functional
+- Spectator is now at the correct location
+- ACRE Set Radio Channel now works correctly
+- ACRE Set Ear now works correctly
+
+### Removed
+
+### Known Issues
+
+## [1.0.5]
 ### Added
 - Legacy mission support switches for functions: `EGVAR(Core,Version_UpdatedNumber)` and `EGVAR(Core,Version_CreatedNumber)` available in PreInit past `EGVAR(Core,Enabled)` check. Can be used for specific function changes and redirects based on version changes. Functions specific to an older version should be placed in an additional `\Legacy\` folder.
 - Gear System CBA Events for loading 3den attribute unit and vehicle loadouts, as well as forcing specific loadouts to units and vehicles.
@@ -44,8 +67,7 @@ The date refers to the date when changes have been merged into DEV branch.
 - Debug display naming
 
 ### Removed
-
-
+- N/A
 
 ## [1.0.2] - 2018-22-02
 ### Added

diff --git a/uo_sys_framework/ACREModule/cfgAttributeCategories/Object.hpp b/uo_sys_framework/ACREModule/cfgAttributeCategories/Object.hpp
@@ -36,7 +36,7 @@ class EGVAR(ACRE,UnitOptions) {
             control = QEGVAR(ACRE,EarSetting);
             expression = ENTITY_EXPRESSION;
             condition = "objectControllable";
-            defaultValue = "0";
+            defaultValue = "1";
         };
         class EGVAR(ACRE,LR_RADIO_Enabled) {
             property = QEGVAR(ACRE,LR_RADIO_Enabled);
@@ -63,7 +63,7 @@ class EGVAR(ACRE,UnitOptions) {
             control = QEGVAR(ACRE,EarSetting);
             expression = ENTITY_EXPRESSION;
             condition = "objectControllable";
-            defaultValue = "0";
+            defaultValue = "1";
         };
         class EGVAR(ACRE,PK_RADIO_Enabled) {
             property = QEGVAR(ACRE,PK_RADIO_Enabled);
@@ -90,7 +90,17 @@ class EGVAR(ACRE,UnitOptions) {
             control = QEGVAR(ACRE,EarSetting);
             expression = ENTITY_EXPRESSION;
             condition = "objectControllable";
-            defaultValue = "0";
+            defaultValue = "1";
+        };
+        class EGVAR(ACRE,AdditionalLanguage) {
+            displayName = "Additional Language";
+            tooltip = "Selected Language will be added to the list of spoken Babbel langauges. The language must be defined in the main acre settings.";
+            property = QEGVAR(ACRE,AdditionalLanguage);
+            control = QEGVAR(ACRE,AdditionalLanguageAttribute);
+            typeName = "STRING";
+            expression = ENTITY_EXPRESSION;
+            condition = "objectControllable";
+            defaultValue = "'None'";
         };
     };
 };
diff --git a/uo_sys_framework/ACREModule/cfgAttributes.hpp b/uo_sys_framework/ACREModule/cfgAttributes.hpp
@@ -1,3 +1,4 @@
 #include "CfgAttributes\EarSettingAttribute.hpp"
 #include "CfgAttributes\RadioSelectAttribute.hpp"
 #include "CfgAttributes\ChannelSelectAttribute.hpp"
+#include "CfgAttributes\AdditionalLanguageAttribute.hpp"
diff --git a/uo_sys_framework/ACREModule/cfgAttributes/AdditionalLanguageAttribute.hpp b/uo_sys_framework/ACREModule/cfgAttributes/AdditionalLanguageAttribute.hpp
@@ -0,0 +1,30 @@
+class EGVAR(ACRE,AdditionalLanguageAttribute): Combo {
+    //save the lbData from the selected entry upon exit
+    attributeSave = "\
+        private _value = ((_this controlsGroupCtrl 100) lbData lbCurSel (_this controlsGroupCtrl 100));\
+        private _unit = ((get3denselected 'object') select 0);\
+        private _name = gettext (_config >> 'property');\
+        _unit setvariable [_name,_value];\
+        _value\
+    ";
+    //_this - config, _value - saved value
+    attributeLoad="\
+        private _control = (_this controlsGroupCtrl 100);\
+        private _name = gettext (_config >> 'property');\
+        private _unit = ((get3denselected 'object') select 0);\
+        private _nameArray = ['None','English','Russian','French','Arabic','Greek','BluforCustomLanguage1','BluforCustomLanguage2','OpforCustomLanguage1','OpforCustomLanguage2','IndforCustomLanguage1','IndforCustomLanguage2','CivCustomLanguage1','CivCustomLanguage2'];\
+        {\
+            private _index = _control lbadd _x;\
+            _control lbsetdata [_index,_x];\
+            _control lbsetValue [_index,_foreachIndex];\
+            if (_value isEqualto (_control lbData _index)) then {\
+                _control lbSetCurSel _index;\
+                _unit setvariable [_name,_value];\
+            };\
+        } foreach _nameArray;\
+    ";
+    class Controls: Controls {
+        class Title: Title {};
+        class Value: Value {};
+    };
+};
diff --git a/uo_sys_framework/ACREModule/cfgXEH/init/ClientPreInit.sqf b/uo_sys_framework/ACREModule/cfgXEH/init/ClientPreInit.sqf
@@ -12,8 +12,6 @@
 EXEC_CHECK(CLIENT);
 if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
 
-#define RADIONETARRAY(TEAMNAME) \
-[(GETMVAR(RADIONET_NAME1##TEAMNAME,"")),(GETMVAR(RADIONET_NAME2##TEAMNAME,"")),(GETMVAR(RADIONET_NAME3##TEAMNAME,"")),(GETMVAR(RADIONET_NAME4##TEAMNAME,"")),(GETMVAR(RADIONET_NAME5##TEAMNAME,"")),(GETMVAR(RADIONET_NAME6##TEAMNAME,"")),(GETMVAR(RADIONET_NAME7##TEAMNAME,""))]
 
 [QGVAR(Init_Event), {
     if !(GETMVAR(Enabled,false)) exitwith {};
@@ -32,6 +30,21 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
         };
         //Channel names stuff
         LOG("ACRE Init");
+
+        _radioNetNamesBlufor = [(GETMVAR(RADIONET_NAME1_Blufor ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Blufor ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Blufor ,"PLTNET 3")),
+        (GETMVAR(RADIONET_NAME4_Blufor ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Blufor ,"Coy")),(GETMVAR(RADIONET_NAME6_Blufor ,"Cas")),(GETMVAR(RADIONET_NAME7_Blufor ,"Fires"))];
+
+         _radioNetNamesOpfor = [(GETMVAR(RADIONET_NAME1_Opfor ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Opfor ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Opfor ,"PLTNET 3")),
+        (GETMVAR(RADIONET_NAME4_Opfor ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Opfor ,"Coy")),(GETMVAR(RADIONET_NAME6_Opfor ,"Cas")),(GETMVAR(RADIONET_NAME7_Opfor ,"Fires"))];
+
+         _radioNetNamesIndfor = [(GETMVAR(RADIONET_NAME1_Indfor ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Indfor ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Indfor ,"PLTNET 3")),
+        (GETMVAR(RADIONET_NAME4_Indfor ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Indfor ,"Coy")),(GETMVAR(RADIONET_NAME6_Indfor ,"Cas")),(GETMVAR(RADIONET_NAME7_Indfor ,"Fires"))];
+
+         _radioNetNamesCiv = [(GETMVAR(RADIONET_NAME1_Civ ,"PLTNET 1")),(GETMVAR(RADIONET_NAME2_Civ ,"PLTNET 2")),(GETMVAR(RADIONET_NAME3_Civ ,"PLTNET 3")),
+        (GETMVAR(RADIONET_NAME4_Civ ,"PLTNET 4")),(GETMVAR(RADIONET_NAME5_Civ ,"Coy")),(GETMVAR(RADIONET_NAME6_Civ ,"Cas")),(GETMVAR(RADIONET_NAME7_Civ ,"Fires"))];
+
+
+
         if ((GETMVAR(RADIONET_Enabled_BLUFOR,false)) && {(side player isEqualTo west)}) then {
             {
                 private _index = _forEachIndex + 1;
@@ -42,7 +55,7 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                         [_x, GVAR(Preset_BLUFOR), _index, _label, _name] call acre_api_fnc_setPresetChannelField;
                     } forEach ["ACRE_PRC117F", "ACRE_PRC148", "ACRE_PRC152"];
                 };
-            } foreach RADIONETARRAY(BLUFOR);
+            } foreach _radioNetNamesBlufor;
         };
         if ((GETMVAR(RADIONET_Enabled_OPFOR,false)) && {(side player isEqualTo east)}) then {
             {
@@ -54,7 +67,7 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                         [_x, GVAR(Preset_OPFOR), _index, _label, _name] call acre_api_fnc_setPresetChannelField;
                     } forEach ["ACRE_PRC117F", "ACRE_PRC148", "ACRE_PRC152"];
                 };
-            } foreach RADIONETARRAY(OPFOR);
+            } foreach _radioNetNamesOpfor;
         };
         if ((GETMVAR(RADIONET_Enabled_Indfor,false)) && {(side player isEqualTo independent)}) then {
             {
@@ -66,7 +79,7 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                         [_x, GVAR(Preset_Indfor), _index, _label, _name] call acre_api_fnc_setPresetChannelField;
                     } forEach ["ACRE_PRC117F", "ACRE_PRC148", "ACRE_PRC152"];
                 };
-            } foreach RADIONETARRAY(INDEPENDENT);
+            } foreach _radioNetNamesIndfor;
         };
         if ((GETMVAR(RADIONET_Enabled_Civ,false)) && {(side player isEqualTo civilian)}) then {
             {
@@ -78,20 +91,20 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                         [_x, GVAR(Preset_Civ), _index, _label, _name] call acre_api_fnc_setPresetChannelField;
                     } forEach ["ACRE_PRC117F", "ACRE_PRC148", "ACRE_PRC152"];
                 };
-            } foreach RADIONETARRAY(CIVILIAN);
+            } foreach  _radioNetNamesCiv;
         };
 
         if (GETMVAR(RADIONET_Enabled_BLUFOR,false)) then {
-            LOG_1("Setting Netnames. Blu: %1",(RADIONETARRAY(BLUFOR)));
+            LOG_1("Setting Netnames. Blu: %1",(_radioNetNamesBlufor));
         };
         if (GETMVAR(RADIONET_Enabled_OPFOR,false)) then {
-            LOG_1("Setting Netnames. Opf: %1",(RADIONETARRAY(OPFOR)));
+            LOG_1("Setting Netnames. Opf: %1",(_radioNetNamesOpfor));
         };
         if (GETMVAR(RADIONET_Enabled_INDEPENDENT,false)) then {
-            LOG_1("Setting Netnames. Ind: %1",(RADIONETARRAY(INDEPENDENT)));
+            LOG_1("Setting Netnames. Ind: %1",(_radioNetNamesIndfor));
         };
         if (GETMVAR(RADIONET_Enabled_Civ,false)) then {
-            LOG_1("Setting Netnames. Civ: %1",(RADIONETARRAY(CIVILIAN)));
+            LOG_1("Setting Netnames. Civ: %1",( _radioNetNamesCiv));
         };
 
         [{(!isNull player) && {(!isNull acre_player)} && {([] call acre_api_fnc_isInitialized)}},{
@@ -232,6 +245,22 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                     } forEach [QGVAR(Babel_Custom_Civ),QGVAR(Babel_Custom2_Civ)];
                 } forEach _CURRENTBABEL_LANGUAGES;
 
+                _additonalLanguage = GETPLVAR(AdditionalLanguage,"None");
+                _lang = ["None","English","Russian","French","Arabic","Greek","BluforCustomLanguage1","BluforCustomLanguage2",
+                "OpforCustomLanguage1","OpforCustomLanguage2","IndforCustomLanguage1","IndforCustomLanguage2","CivCustomLanguage1","CivCustomLanguage2"];
+
+                _possibleLang = ["None","en","ru","fr","ar","gk","cl1","cl2","cl3","cl4","cl5","cl6","cl7","cl8"];
+
+
+                _addIndex = _lang find _additonalLanguage;
+                //ignore None by index
+                if(_addIndex > 0) then
+                {
+                    _ACRE_BLUFOR_BABEL_LANGUAGES pushBackUnique (_possibleLang select _addIndex);
+                    _ACRE_OPFOR_BABEL_LANGUAGES pushBackUnique (_possibleLang select _addIndex);
+                    _ACRE_Indfor_BABEL_LANGUAGES pushBackUnique (_possibleLang select _addIndex);
+                    _ACRE_Civ_BABEL_LANGUAGES pushBackUnique (_possibleLang select _addIndex);
+                };
 
                 if (GVAR(Babel_Enabled_BLUFOR) && {(side player isEqualTo west)}) then {
                     _ACRE_BLUFOR_BABEL_LANGUAGES call acre_api_fnc_babelSetSpokenLanguages;
@@ -344,7 +373,7 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                         [_radioID, _result] call acre_api_fnc_setRadioChannel;
                     };
 
-                    [_radioID, (["CENTER", "LEFT", "RIGHT"] select (GETPLVAR(SR_RADIO_EAR,0)))] call acre_api_fnc_setRadioSpatial;
+                    [_radioID, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(SR_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
                 };
             } forEach ["ACRE_PRC343", "ACRE_SEM52SL"];
 
@@ -357,7 +386,7 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                     } else {
                         [_radioID, _result] call acre_api_fnc_setRadioChannel;
                     };
-                    [_radioID, (["CENTER", "LEFT", "RIGHT"] select (GETPLVAR(LR_RADIO_EAR,0)))] call acre_api_fnc_setRadioSpatial;
+                    [_radioID, ([ "LEFT","CENTER", "RIGHT"] select (GETPLVAR(LR_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
                 };
             } forEach ["ACRE_PRC343", "ACRE_PRC148", "ACRE_PRC152"];
 
@@ -372,7 +401,7 @@ if !(UO_FW_Server_ACREModule_Allowed) exitwith {};
                             [_radioID, _result] call acre_api_fnc_setRadioChannel;
                         };
                     };
-                    [_radioID, (["CENTER", "LEFT", "RIGHT"] select (GETPLVAR(PK_RADIO_EAR,0)))] call acre_api_fnc_setRadioSpatial;
+                    [_radioID, (["LEFT","CENTER", "RIGHT"] select (GETPLVAR(PK_RADIO_EAR,1)))] call acre_api_fnc_setRadioSpatial;
                 };
             } forEach ["ACRE_PRC117F", "ACRE_PRC77", "ACRE_SEM70"];
         };

diff --git a/uo_sys_framework/BriefingModule/defines/blufor_briefing.hpp b/uo_sys_framework/BriefingModule/defines/blufor_briefing.hpp
@@ -118,7 +118,7 @@ if (GETMVAR(NATO_BLUFOR,false)) then {
         _execStr = _execStr + "<font color='#5BD527' size='14.0'><h1>Commanders Intent:</h1></font color><br/>" + _execCIntent + "<br/><br/>";
     };
 
-    private _execManeuver = GETMVAR(NATO_EXECUTION_INTENT_BLUFOR,"");
+    private _execManeuver = GETMVAR(NATO_EXECUTION_MANEUVER_BLUFOR,"");
     if !(_execManeuver isEqualTo "") then {
         _execStr = _execStr + "<font color='#5BD527' size='14.0'><h1>Maneuver:</h1></font color><br/>" + _execManeuver + "<br/><br/>";
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ Thumbs.db @@
     *.log
     *.zip
     *.7z
+    .vscode