Macro team briefings & end conditions, fixed end condition capturezone

PiZZAD0X · Sep 1, 2019 · bb5f124 · bb5f124
1 parent 2827dfa
commit bb5f124
Show file tree

Hide file tree

Showing 26 changed files with 1,554 additions and 3,792 deletions.
diff --git a/addons/briefing/XEH_preClientInit.sqf b/addons/briefing/XEH_preClientInit.sqf
@@ -6,17 +6,55 @@ EXEC_CHECK(CLIENT);
         private _briefing = [];
         switch (side player) do {
             case west: {
-                #include "functions\defines\blufor_briefing.hpp"
+                BRIEFINGTEAMEXEC(Blufor);
             };
             case east: {
-                #include "functions\defines\opfor_briefing.hpp"
+                BRIEFINGTEAMEXEC(Opfor);
             };
             case independent: {
-                #include "functions\defines\indfor_briefing.hpp"
+                BRIEFINGTEAMEXEC(Indfor);
             };
             case civilian: {
-                #include "functions\defines\civilian_briefing.hpp"
+                BRIEFINGTEAMEXEC(Civilian);
             };
         };
+        if (GETMVAR(MissionNotes_Enable,false)) then {
+            private _notesStr = "";
+             private _notesAuthor = GETMVAR(MissionNotes_Author,"");
+            if !(_notesAuthor isEqualTo "") then {
+                _notesStr = _notesStr + "<font color='#5BD527' size='14.0'><h1>Author:</h1></font color><br/>" + _notesAuthor + "<br/><br/>";
+            };
+            private _notesTesters = GETMVAR(MissionNotes_Testers,"");
+            if !(_notesTesters isEqualTo "") then {
+                _notesStr = _notesStr + "<font color='#5BD527' size='14.0'><h1>Testers:</h1></font color><br/>" + _notesTesters + "<br/><br/>";
+            };
+            private _notesConditions = GETMVAR(MissionNotes_Conditions,"");
+            if !(_notesConditions isEqualTo "") then {
+                _notesStr = _notesStr + "<font color='#5BD527' size='14.0'><h1>End Conditions:</h1></font color><br/>" + _notesConditions + "<br/><br/>";
+            };
+            private _notesCustom = GETMVAR(MissionNotes_Custom,"");
+            if !(_notesCustom isEqualTo "") then {
+                _notesStr = _notesStr + "<font color='#5BD527' size='14.0'><h1>Mission Specific Notes:</h1></font color><br/>" + _notesCustom + "<br/><br/>";
+            };
+            private _notesChange = GETMVAR(MissionNotes_Changelog,"");
+            if !(_notesChange isEqualTo "") then {
+                _notesStr = _notesStr + "<font color='#5BD527' size='14.0'><h1>Mission Changelog:</h1></font color><br/>" + _notesChange;
+            };
+            if !(_notesStr isEqualTo "") then {
+                NEWTAB("Mission Notes:"),
+                    _notesStr
+                ENDTAB;
+            };
+            private _gamemastermsg = "<font color='#5BD527' size='14.0'><h1>Game Mastering:</h1></font color><br/>";
+            if (GETMVAR(MissionNotes_GM,false)) then {
+                _gamemastermsg = _gamemastermsg + "This mission is designed for game mastering and can be manipulated as per Mission Notes";
+            } else {
+                _gamemastermsg = _gamemastermsg + "This mission is not designed for game mastering and should only be manipulated for technical, administrative or diagnostic purposes.";
+            };
+            NEWTAB("Game Mastering"),
+                _gamemastermsg
+            ENDTAB;
+        };
+        DISPLAYBRIEFING();
     }] call CBA_fnc_waitUntilAndExecute;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/briefing/cfg3den/cfg3denMenuCategories.hpp b/addons/briefing/cfg3den/cfg3denMenuCategories.hpp
diff --git a/addons/briefing/display3DEN/Menu.hpp b/addons/briefing/display3DEN/Menu.hpp
@@ -1,3 +1,9 @@
+#define BRIEFINGTEAMMENUMAIN(TEAMNAME,ICONNAME) class GVAR(DOUBLES(Configure,TEAMNAME)) {\
+    text = QUOTE(Configure TEAMNAME Briefing);\
+    action = QUOTE(edit3DENMissionAttributes QQGVAR(DOUBLES(Menu,TEAMNAME)));\
+    picture = QUOTE(\a3\3DEN\Data\Displays\Display3DEN\PanelRight\ICONNAME.paa);\
+}
+
 class GVAR(Folder) {
     text = "Configure Briefings";
     items[] = {
@@ -6,34 +12,15 @@ class GVAR(Folder) {
         QGVAR(Configure_Blufor),
         QGVAR(Configure_Opfor),
         QGVAR(Configure_Indfor),
-        QGVAR(Configure_Civ)
+        QGVAR(Configure_Civilian)
     };
     picture = "\a3\3DEN\Data\Cfg3DEN\Comment\texture_ca.paa";
 };
 
-class GVAR(Configure_Blufor) {
-    text = "Configure Blufor Briefing";
-    action = QUOTE(edit3DENMissionAttributes QQGVAR(Blufor));
-    picture = "\a3\3DEN\Data\Displays\Display3DEN\PanelRight\side_west_ca.paa";
-};
-
-class GVAR(Configure_Opfor) {
-    text = "Configure Opfor Briefing";
-    action = QUOTE(edit3DENMissionAttributes QQGVAR(Opfor));
-    picture = "\a3\3DEN\Data\Displays\Display3DEN\PanelRight\side_east_ca.paa";
-};
-
-class GVAR(Configure_Indfor) {
-    text = "Configure Indfor Briefing";
-    action = QUOTE(edit3DENMissionAttributes QQGVAR(Indfor));
-    picture = "\a3\3DEN\Data\Displays\Display3DEN\PanelRight\side_guer_ca.paa";
-};
-
-class GVAR(Configure_Civ) {
-    text = "Configure Civilian Briefing";
-    action = QUOTE(edit3DENMissionAttributes QQGVAR(Civilian));
-    picture = "\a3\3DEN\Data\Displays\Display3DEN\PanelRight\side_civ_ca.paa";
-};
+BRIEFINGTEAMMENUMAIN(Blufor,side_west_ca);
+BRIEFINGTEAMMENUMAIN(Opfor,side_east_ca);
+BRIEFINGTEAMMENUMAIN(Indfor,side_guer_ca);
+BRIEFINGTEAMMENUMAIN(Civilian,side_civ_ca);
 
 class GVAR(Notes_Configure) {
     text = "Configure Mission Notes";