Skip to content

Commit 8529c66

Browse files
ChrSacherChrSacher
authored
Merge pull request #20 from Reyfin/master
Fixed gear issue, Fixed Briefing Enabling
2 parents 29a07a0 + b58ff8d commit 8529c66

File tree

13 files changed

+54
-43
lines changed

13 files changed

+54
-43
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
3-
3+
Version Numbers mainly refer to the UO Modpack addition.
44
## [Unreleased]
55
### Changed
66

@@ -15,6 +15,9 @@ All notable changes to this project will be documented in this file.
1515
- Made more Modules independent
1616
### Fixed
1717
- Ai Driver wasn't being added when ace menued
18+
- Too much briefing being displayer
19+
- Gear locality
20+
- Gear works more reliable
1821
### Removed
1922

2023

‎UnitedOperationsFramework.pbo

445 Bytes
Binary file not shown.

‎UnitedOperationsFramework.pbo.bak

181 Bytes
Binary file not shown.

‎UnitedOperationsFramework/BriefingModule/defines/blufor_briefing.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ if ((missionNamespace getVariable ["UO_FW_BRIEFING_BLUFOR_APPENDIX",false])) the
112112
UO_FW_DEBUG("No appendix found for BLUFOR!","No appendix found for BLUFOR!")
113113
};
114114
};
115-
115+
if((missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_ENABLE",false])) then
116+
{
116117
//Mission Notes
117118
NEWTAB("Mission Notes:")
118119
"<font color='#5BD527'><h1>Author:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_AUTHOR",""]) + "<br/><br/>" +
@@ -124,7 +125,7 @@ ENDTAB
124125

125126
private _gamemastermsg = "";
126127

127-
if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128+
if (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128129
_gamemastermsg = "This mission is designed for game mastering and can be manipulated as per Mission Notes";
129130
} else {
130131
_gamemastermsg = "This mission is not designed for game mastering and should only be manipulated for technical, administrative or diagnostic purposes.";
@@ -134,5 +135,5 @@ if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
134135
NEWTAB("Game Mastering")
135136
"<font color='#5BD527'><h1>Game Mastering:</h1></font color><br/>" + _gamemastermsg
136137
ENDTAB;
137-
138+
};
138139
DISPLAYBRIEFING()

‎UnitedOperationsFramework/BriefingModule/defines/civilian_briefing.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ if ((missionNamespace getVariable ["UO_FW_BRIEFING_CIVILIAN_APPENDIX",false])) t
112112
UO_FW_DEBUG("No appendix found for CIVILIAN!","No appendix found for CIVILIAN!")
113113
};
114114
};
115-
115+
if((missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_ENABLE",false])) then
116+
{
116117
//Mission Notes
117118
NEWTAB("Mission Notes:")
118119
"<font color='#5BD527'><h1>Author:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_AUTHOR",""]) + "<br/><br/>" +
@@ -124,7 +125,7 @@ ENDTAB
124125

125126
private _gamemastermsg = "";
126127

127-
if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128+
if (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128129
_gamemastermsg = "This mission is designed for game mastering and can be manipulated as per Mission Notes";
129130
} else {
130131
_gamemastermsg = "This mission is not designed for game mastering and should only be manipulated for technical, administrative or diagnostic purposes.";
@@ -134,5 +135,5 @@ if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
134135
NEWTAB("Game Mastering")
135136
"<font color='#5BD527'><h1>Game Mastering:</h1></font color><br/>" + _gamemastermsg
136137
ENDTAB;
137-
138+
};
138139
DISPLAYBRIEFING()

‎UnitedOperationsFramework/BriefingModule/defines/indfor_briefing.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ if ((missionNamespace getVariable ["UO_FW_BRIEFING_INDFOR_APPENDIX",false])) the
112112
UO_FW_DEBUG("No appendix found for INDFOR!","No appendix found for INDFOR!")
113113
};
114114
};
115-
115+
if((missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_ENABLE",false])) then
116+
{
116117
//Mission Notes
117118
NEWTAB("Mission Notes:")
118119
"<font color='#5BD527'><h1>Author:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_AUTHOR",""]) + "<br/><br/>" +
@@ -124,7 +125,7 @@ ENDTAB
124125

125126
private _gamemastermsg = "";
126127

127-
if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128+
if (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128129
_gamemastermsg = "This mission is designed for game mastering and can be manipulated as per Mission Notes";
129130
} else {
130131
_gamemastermsg = "This mission is not designed for game mastering and should only be manipulated for technical, administrative or diagnostic purposes.";
@@ -134,5 +135,5 @@ if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
134135
NEWTAB("Game Mastering")
135136
"<font color='#5BD527'><h1>Game Mastering:</h1></font color><br/>" + _gamemastermsg
136137
ENDTAB;
137-
138+
};
138139
DISPLAYBRIEFING()

‎UnitedOperationsFramework/BriefingModule/defines/opfor_briefing.hpp

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,27 +112,30 @@ if ((missionNamespace getVariable ["UO_FW_BRIEFING_OPFOR_APPENDIX",false])) then
112112
UO_FW_DEBUG("No appendix found for OPFOR!","No appendix found for OPFOR!")
113113
};
114114
};
115+
if((missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_ENABLE",false])) then
116+
{
117+
//Mission Notes
118+
NEWTAB("Mission Notes:")
119+
"<font color='#5BD527'><h1>Author:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_AUTHOR",""]) + "<br/><br/>" +
120+
"<font color='#5BD527'><h1>Testers:</h1></font color><br/>" +(missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_TESTERS",""]) + "<br/><br/>" +
121+
"<font color='#5BD527'><h1>End Conditions:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_CONDITIONS",""]) + "<br/><br/>" +
122+
"<font color='#5BD527'><h1>Mission Specific Notes:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_CUSTOM",""]) + "<br/><br/>" +
123+
"<font color='#5BD527'><h1>Mission Changelog:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_CHANGELOG",""])
124+
ENDTAB
115125

116-
//Mission Notes
117-
NEWTAB("Mission Notes:")
118-
"<font color='#5BD527'><h1>Author:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_AUTHOR",""]) + "<br/><br/>" +
119-
"<font color='#5BD527'><h1>Testers:</h1></font color><br/>" +(missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_TESTERS",""]) + "<br/><br/>" +
120-
"<font color='#5BD527'><h1>End Conditions:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_CONDITIONS",""]) + "<br/><br/>" +
121-
"<font color='#5BD527'><h1>Mission Specific Notes:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_CUSTOM",""]) + "<br/><br/>" +
122-
"<font color='#5BD527'><h1>Mission Changelog:</h1></font color><br/>" + (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_CHANGELOG",""])
123-
ENDTAB
126+
private _gamemastermsg = "";
124127

125-
private _gamemastermsg = "";
128+
if (missionNamespace getVariable ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
129+
_gamemastermsg = "This mission is designed for game mastering and can be manipulated as per Mission Notes";
130+
} else {
131+
_gamemastermsg = "This mission is not designed for game mastering and should only be manipulated for technical, administrative or diagnostic purposes.";
132+
};
126133

127-
if (getMissionConfigValue ["UO_FW_BRIEFING_MISSIONNOTES_GM",false]) then {
128-
_gamemastermsg = "This mission is designed for game mastering and can be manipulated as per Mission Notes";
129-
} else {
130-
_gamemastermsg = "This mission is not designed for game mastering and should only be manipulated for technical, administrative or diagnostic purposes.";
134+
//Game Mastering
135+
NEWTAB("Game Mastering")
136+
"<font color='#5BD527'><h1>Game Mastering:</h1></font color><br/>" + _gamemastermsg
137+
ENDTAB;
131138
};
132139

133-
//Game Mastering
134-
NEWTAB("Game Mastering")
135-
"<font color='#5BD527'><h1>Game Mastering:</h1></font color><br/>" + _gamemastermsg
136-
ENDTAB;
137140

138141
DISPLAYBRIEFING()

‎UnitedOperationsFramework/Core/cfgFunctions/debug/fn_debugMessage.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414

1515
#include "\x\UO_FW\addons\main\script_macros.hpp"
16-
UO_FW_EXEC_CHECK(ALL)
16+
1717
if(!UO_FW_SERVER_FRAMEWORK_ALLOWED || !UO_FW_SERVER_DEBUG_ALLOWED) exitWith
1818
{
1919

‎UnitedOperationsFramework/Core/cfgFunctions/debug/fn_debugMessageDetailed.sqf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ params ["_basicmsg","_detailedmsg"];
1919

2020
if (isNil "UO_FW_Debug_Enabled") then
2121
{
22-
UO_FW_Debug_Enabled = (getMissionConfigValue ["UO_FW_Debug_Enabled",false]);
22+
UO_FW_Debug_Enabled = (missionNamespace getVariable ["UO_FW_Debug_Enabled",false]);
2323
};
2424
if (isNil "UO_FW_Debug_Detailed_Enabled") then
2525
{
26-
UO_FW_Debug_Detailed_Enabled = (getMissionConfigValue ["UO_FW_Debug_Detailed_Enabled",false]);
26+
UO_FW_Debug_Detailed_Enabled = (missionNamespace getVariable ["UO_FW_Debug_Detailed_Enabled",false]);
2727
};
2828
if ((UO_FW_Debug_Enabled) && !(UO_FW_Debug_Detailed_Enabled)) then
2929
{

‎UnitedOperationsFramework/Core/cfgFunctions/init/fn_init.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include "\x\UO_FW\addons\main\script_macros.hpp"
11-
UO_FW_EXEC_CHECK(ALL)
11+
1212

1313
//Universal init
1414
#include "\x\UO_FW\addons\main\Core\defines\mainSettings.hpp"

‎UnitedOperationsFramework/GearModule/cfgFunctions/common/fn_GearInit.sqf

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"" spawn
33
{
44

5-
if(!(getMissionConfigValue ["UO_FW_Gear_Enabled",false])) exitWith {};
5+
if(!(missionNamespace getVariable ["UO_FW_Gear_Enabled",false])) exitWith {};
66
//when set to false, facewear types that are whitelisted will not be removed
7-
UO_FW_force_remove_facewear = getMissionConfigValue ["UO_FW_GearFaceRemovalEnabled",false];;
7+
UO_FW_force_remove_facewear = missionNamespace getVariable ["UO_FW_GearFaceRemovalEnabled",false];;
88

99
//forces adding an item to inventory. Works only if container is specified!
10-
UO_FW_enableOverfill = getMissionConfigValue ["UO_FW_GearOverfillEnabled",false];
10+
UO_FW_enableOverfill = missionNamespace getVariable ["UO_FW_GearOverfillEnabled",false];
1111

1212
/*UO_FW_GearLoadouts = [];
1313
_gear = ["UO_FW_GearPath_1","UO_FW_GearPath_2","UO_FW_GearPath_3","UO_FW_GearPath_4","UO_FW_GearPath_5",
@@ -26,12 +26,13 @@
2626

2727
if(!isDedicated) then
2828
{
29+
if((player getVariable ["UO_FW_Gear_Groupname",""]) != "" ) then { (group player) setGroupId [(player getVariable ["UO_FW_Gear_Groupname",""])];};
2930
_type = player getVariable ["UO_FW_Gear_UnitGearType",""];
3031
if(_type != "") then
3132
{
3233
_array = [player,_type];
3334

34-
if(player getVariable ["UO_FW_Gear_Groupname",""] != "" ) then { (group player) setGroupId [player getVariable ["UO_FW_Gear_Groupname",""]];};
35+
3536
_array call UO_FW_FNC_GearScript;
3637
};
3738
};
@@ -41,22 +42,23 @@
4142
{
4243
if(!(isPlayer _x)) then
4344
{
45+
if((_x getVariable ["UO_FW_Gear_Groupname",""]) != "" ) then { (group _x) setGroupId [(_x getVariable ["UO_FW_Gear_Groupname",""])];};
4446
_type = _x getVariable ["UO_FW_Gear_UnitGearType",""];
4547
if(_type != "") then
4648
{
4749
_array = [_x,_type];
48-
if(_x getVariable ["UO_FW_Gear_Groupname",""] != "" ) then { (group _x) setGroupId [_x getVariable ["UO_FW_Gear_Groupname",""]];};
50+
4951
_array call UO_FW_FNC_GearScript;
5052
};
5153
};
5254
}forEach allUnits;
5355
{
54-
56+
if((_x getVariable ["UO_FW_Gear_Groupname",""]) != "" ) then { (group _x) setGroupId [(_x getVariable ["UO_FW_Gear_Groupname",""])];};
5557
_type = _x getVariable ["UO_FW_Gear_UnitGearType",""];
5658
if(_type != "") then
5759
{
5860
_array = [_x,_type];
59-
if(_x getVariable ["UO_FW_Gear_Groupname",""] != "" ) then { (group _x) setGroupId [_x getVariable ["UO_FW_Gear_Groupname",""]];};
61+
6062
_array call UO_FW_FNC_GearScript;
6163
};
6264

‎UnitedOperationsFramework/GearModule/cfgFunctions/common/fn_GearScript.sqf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "\x\UO_FW\addons\main\script_macros.hpp"
22
if(!hasinterface) exitWith {};
33
private ["_unit", "_type", "_groupId"];
4-
if(!(getMissionConfigValue ["UO_FW_Gear_Enabled",false])) exitWith {};
4+
if(!(missionNamespace getVariable ["UO_FW_Gear_Enabled",false])) exitWith {};
55
//waitUntil{!(isNil "UO_FW_GearLoadouts")};
66

77
_unit = _this select 0;
@@ -25,10 +25,10 @@ _unit call UO_FW_FNC_RemoveAllGear;
2525
}forEach UO_FW_GearLoadouts;*/
2626

2727
//Other Version
28-
_path = getMissionConfigValue ["UO_FW_Gear_PathToGear",""];
28+
_path = missionNamespace getVariable ["UO_FW_Gear_PathToGear","GearScript.sqf"];
2929
if(_path != "") then
3030
{
31-
_string = _this call (compile (preprocessFileLineNumbers UO_FW_Gear_PathToGear));
31+
_string = _this call (compile (preprocessFileLineNumbers _path));
3232
};
3333

3434

‎UnitedOperationsFramework/script_macros.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define UO_FW_EXEC_CHECK(ARG)\
1010
_argUpper = toUpper(#ARG);\
1111
if (isNil "UO_FW_Enabled") then {\
12-
UO_FW_Enabled = (getMissionConfigValue ["UO_FW_Enabled",false]);\
12+
UO_FW_Enabled = (missionNamespace getVariable ["UO_FW_Enabled",false]);\
1313
};\
1414
if(_argUpper == "SERVER" && (((!isServer) && isMultiplayer) || (!UO_FW_Enabled))) exitWith {}; \
1515
if(_argUpper == "CLIENT" && ((!hasinterface) || (!UO_FW_Enabled))) exitWith {};\
@@ -35,4 +35,4 @@ call compile format ['%1 = {
3535
#define ADD_GROUP(groupName) call call compile format ["%1", #groupName + package]
3636

3737
#define UO_FW_VAR(name,default)\
38-
getMissionConfigValue [#name,default];
38+
missionNamespace getVariable [#name,default];

0 commit comments

Comments
 (0)