Merge pull request #75 from PiZZAD0X/MacroRewrite

Macro rewrite

CHANGELOG.md

@@ -1,9 +1,54 @@
 # Changelog
 All notable changes to this project will be documented in this file.
-Version Numbers Mainly refer to the UO Modpack addition.
+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]
 ### 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.
+- stringtable.xml and corresponding macros.
+- Gear System gear type config macro for later editing and addition of gear types.
+- `EDEN_CHECK` macro to exit on !is3den state.
+- `VERSION_CHECK(VERSIONNUM)` macro to exit on below `VERSIONNUM` input: eg. `VERSION_CHECK(103)` exits script if version is 102 or below.
+- Added Gear Preset selection system.
+- Added `USMC 1980s Woodland` gear preset.
+- Added `US 1960s Woodland` gear preset.
+- Added `UK 2015 MTP` gear preset.
+- Added `UK 1980s Woodland` gear preset.
+- Added `UK 2010s MTP` gear preset.
+- Added `UK 1980s Desert` gear preset.
+- Added `MSV 1980s Woodland` gear preset.
+- Added `Iraq 1980s Desert` gear preset.
+- Added `Insurgents 90s Woodland` gear preset.
+
+### Changed
+- Gear system now applies loadouts via EH inside 3den instead of on mission init.
+- AI Drivers activation through InitPost.
+- Hostage activation through InitPost.
+- ACRE add radio event now removes all radios before adding defined radios.
+- SafeStart defaults to lowered and on safe but no longer emptied magazine.
+- Start in Parachute activation through InitPost.
+- ACRE module adds radios to the ground if it cannot fit them in unit gear.
+- Safe Start adds unloaded magazine to the ground if it cannot fit it in unit gear.
+- Briefing Module displays tabs conditionally based on content (no longer shows empty tabs or entries).
+
+### Fixed
+- Macro for SelfActions Cfg CfgClasses.
+- Cut Grass Animation EH
+- View Map Self Action condition
+- AO Limit Soft Notification
+- CaptureZone var and teamcontrolling var
+- End Conditions CaptureZone checking
+- End Conditions attribute AttrLoad and AttrSave
+- Debug display naming
+
+### Removed
+
+
+
+## [1.0.2] - 2018-22-02
+### Added
 - [HC] Enabled module
 - [HC] New locality check macro for module (checks for HC, reexecutes function if on wrong locality)
 - MarkerControl module input now accepts 3den layers - adds all markers from named layer
@@ -12,7 +57,6 @@ Version Numbers Mainly refer to the UO Modpack addition.
 - Added CoverMap module
 - Added ACE Arsenal Gear System
 
-
 ### Changed
 - Build batch made dynamic to dir path and game registry path
 - Changed all Tracking/Untracking functions to include a server locality check and recall
@@ -30,38 +74,32 @@ Version Numbers Mainly refer to the UO Modpack addition.
 - Combined SoftAO and AO module, now as a setting inside the module
 - Changed Map and Compass remover to work through expression inits
 
-### Fixed
-- [HC] Collecting/Spawning function
-
-### Removed
-- [HC] Artillery & IED functions
-
-## [1.0.2] - 2018-12-02
-### Added
-
-### Changed
-
 ### Fixed
 - Endconditions script not running properly
 - Parachute JiP error
 - Acre API
 - Acre Channel Names
 - Setuptimer client race condition error
-### Removed
+- [HC] Collecting/Spawning function
 
+### Removed
+- [HC] Artillery & IED functions
 
 
 ## [1.0.1] - 2018-11-11
 ### Added
 - Added Button to setup respawn and settings in 3den
 - Added Map Compass Remover
 - Added Hostage Module
+
 ### Changed
 - Removed briefing limitations
 - Made more Modules independent
+
 ### Fixed
 - Ai Driver wasn't being added when ace menued
 - Too much briefing being displayer
 - Gear locality
 - Gear works more reliable
+
 ### Removed

uo_sys_framework/ACREModule/cfg3DEN/ACRE/Blufor.hpp

@@ -1,169 +1,169 @@
-class UO_FW_BLUFOR_ACRE_RadioTypes_CAT {
+class EGVAR(Acre,RadioTypes_CAT_BLUFOR) {
     displayName = "Radio Configuration";
     collapsed = 0;
     class Attributes {
-        class UO_FW_ACRE_BLUFOR_SR_Type {
-            property = "UO_FW_ACRE_BLUFOR_SR_Type";
+        class EGVAR(Acre,SR_Type_BLUFOR) {
+            property = QEGVAR(Acre,SR_Type_BLUFOR);
             displayName = "Short Range Radio Type";
             tooltip = "Sets the short range radio type for the side";
-            control = "UO_FW_ACRE_SR_Select";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            control = QEGVAR(Acre,SR_SELECT);
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "0";
         };
-        class UO_FW_ACRE_BLUFOR_LR_Type {
-            property = "UO_FW_ACRE_BLUFOR_LR_Type";
+        class EGVAR(Acre,LR_Type_BLUFOR) {
+            property = QEGVAR(Acre,LR_Type_BLUFOR);
             displayName = "Long Range Radio Type";
             tooltip = "Sets the long range radio type for the side";
-            control = "UO_FW_ACRE_LR_Select";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            control = QEGVAR(Acre,LR_SELECT);
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "0";
         };
-        class UO_FW_ACRE_BLUFOR_PK_Type {
-            property = "UO_FW_ACRE_BLUFOR_PK_Type";
+        class EGVAR(Acre,PK_Type_BLUFOR) {
+            property = QEGVAR(Acre,PK_Type_BLUFOR);
             displayName = "Long Range Pack Radio Type";
             tooltip = "Sets the long range pack radio type for the side";
-            control = "UO_FW_ACRE_PK_Select";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            control = QEGVAR(Acre,PK_SELECT);
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "0";
         };
     };
 };
 
-class UO_FW_BLUFOR_ACRE_SETTINGS_RADIONET_CAT {
+class EGVAR(Acre,RADIONET_CAT_BLUFOR) {
     displayName = "Radio Net Configuration";
     collapsed = 0;
     class Attributes {
-        class UO_FW_ACRE_BLUFOR_RADIONET_Enabled {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_Enabled";
+        class EGVAR(Acre,RADIONET_Enabled_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_Enabled_BLUFOR);
             displayName = "Enable Radio Net Channel Names";
             control = "CheckBoxState";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "false";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME1 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME1";
+        class EGVAR(Acre,RADIONET_NAME1_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME1_BLUFOR);
             displayName = "Channel 1 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'PLTNET 1'";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME2 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME2";
+        class EGVAR(Acre,RADIONET_NAME2_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME2_BLUFOR);
             displayName = "Channel 2 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'PLTNET 2'";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME3 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME3";
+        class EGVAR(Acre,RADIONET_NAME3_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME3_BLUFOR);
             displayName = "Channel 3 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'PLTNET 3'";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME4 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME4";
+        class EGVAR(Acre,RADIONET_NAME4_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME4_BLUFOR);
             displayName = "Channel 4 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'PLTNET 4'";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME5 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME5";
+        class EGVAR(Acre,RADIONET_NAME5_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME5_BLUFOR);
             displayName = "Channel 5 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'COY'";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME6 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME6";
+        class EGVAR(Acre,RADIONET_NAME6_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME6_BLUFOR);
             displayName = "Channel 6 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'CAS'";
         };
-        class UO_FW_ACRE_BLUFOR_RADIONET_NAME7 {
-            property = "UO_FW_ACRE_BLUFOR_RADIONET_NAME7";
+        class EGVAR(Acre,RADIONET_NAME7_BLUFOR) {
+            property = QEGVAR(Acre,RADIONET_NAME7_BLUFOR);
             displayName = "Channel 7 Name";
             tooltip = "Sets the name of the channel";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "'FIRES'";
         };
     };
 };
 
-class UO_FW_BLUFOR_ACRE_SETTINGS_BABEL_CAT {
+class EGVAR(Acre,BABEL_CAT_BLUFOR) {
     displayName = "Babel Configuration";
     collapsed = 1;
     class Attributes {
-        class UO_FW_ACRE_BLUFOR_BABEL_Enabled {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_Enabled";
+        class EGVAR(Acre,BABEL_Enabled_BLUFOR) {
+            property = QEGVAR(Acre,Babel_Enabled_BLUFOR);
             displayName = "Enable Babel Languages";
             control = "CheckBoxState";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "false";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_EN {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_EN";
+        class EGVAR(Acre,BABEL_EN_BLUFOR) {
+            property = QEGVAR(Acre,Babel_EN_BLUFOR);
             displayName = "English";
             tooltip = "Enables the language for this side";
             control = "CheckBox";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "true";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_RU {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_RU";
+        class EGVAR(Acre,BABEL_RU_BLUFOR) {
+            property = QEGVAR(Acre,Babel_RU_BLUFOR);
             displayName = "Russian";
             tooltip = "Enables the language for this side";
             control = "CheckBox";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "false";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_FR {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_FR";
+        class EGVAR(Acre,BABEL_FR_BLUFOR) {
+            property = QEGVAR(Acre,Babel_FR_BLUFOR);
             displayName = "French";
             tooltip = "Enables the language for this side";
             control = "CheckBox";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "false";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_AR {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_AR";
+        class EGVAR(Acre,BABEL_AR_BLUFOR) {
+            property = QEGVAR(Acre,Babel_AR_BLUFOR);
             displayName = "Arabic";
             tooltip = "Enables the language for this side";
             control = "CheckBox";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "false";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_GK {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_GK";
+        class EGVAR(Acre,BABEL_GK_BLUFOR) {
+            property = QEGVAR(Acre,Babel_GK_BLUFOR);
             displayName = "Greek";
             tooltip = "Enables the language for this side";
             control = "CheckBox";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "false";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_Custom {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_Custom";
+        class EGVAR(Acre,BABEL_Custom_BLUFOR) {
+            property = QEGVAR(Acre,Babel_Custom_BLUFOR);
             displayName = "Custom Language";
             tooltip = "Define a custom language for this side";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "''";
         };
-        class UO_FW_ACRE_BLUFOR_BABEL_Custom2 {
-            property = "UO_FW_ACRE_BLUFOR_BABEL_Custom2";
+        class EGVAR(Acre,BABEL_Custom2_BLUFOR) {
+            property = QEGVAR(Acre,Babel_Custom2_BLUFOR);
             displayName = "Custom Language 2";
             tooltip = "Define a custom language for this side";
             control = "EditShort";
-            expression = UO_FW_SCENARIO_EXPRESSION;
+            expression = SCENARIO_EXPRESSION;
             defaultValue = "''";
         };
     };