-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix Acre Channel bug, Export Formatting * Add ACRE Vehicle Preset to vehicle variables * Fix duplicate Briefing * Fix itemRandomOrg error * Fix Endscreen client side * Fix JIP bug, JIP teleport to vehicles * Add build number * Add AI Driver logging * Fix aiDrivers * Make game-mastering dependent on mission notes * Add force removal for vehicle teleport action in edge cases * Fix for wrong ACRE channels being set (#131)
- Loading branch information
TheTrainDoctor
authored
May 8, 2019
1 parent
e3262d8
commit b3c2b0d
Showing
28 changed files
with
412 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| #include "CfgAttributes\EarSettingAttribute.hpp" | ||
| #include "CfgAttributes\RadioSelectAttribute.hpp" | ||
| #include "CfgAttributes\ChannelSelectAttribute.hpp" | ||
| #include "CfgAttributes\AdditionalLanguageAttribute.hpp" | ||
| #include "CfgAttributes\AdditionalLanguageAttribute.hpp" | ||
| #include "CfgAttributes\VehicleRadioPresetAttribute.hpp" |
30 changes: 30 additions & 0 deletions
30
uo_sys_framework/ACREModule/cfgAttributes/VehicleRadioPresetAttribute.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| class EGVAR(ACRE,VehicleRadioPresetAttribute): 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 = ['Default','Blufor','Opfor','Indfor','Civilian'];\ | ||
| {\ | ||
| 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 {}; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| class EGVAR(ACRE,PreInit) { | ||
| clientInit = "call compile preProcessFileLineNumbers '\x\UO_FW\addons\Main\ACREModule\cfgXEH\init\ClientPreInit.sqf';"; | ||
| serverInit = "call compile preProcessFileLineNumbers '\x\UO_FW\addons\Main\ACREModule\cfgXEH\init\ServerPreInit.sqf';"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* Description: Sets ACRE Presets and ACRE unit settings | ||
| * Arguments: | ||
| * N/A | ||
| * Return Value: | ||
| * ARRAY | ||
| * Author | ||
| * PiZZADOX & Sacher | ||
| */ | ||
|
|
||
| #define COMPONENT ACRE | ||
| #include "\x\UO_FW\addons\Main\script_macros.hpp" | ||
| EXEC_CHECK(SERVER); | ||
| if !(UO_FW_Server_ACREModule_Allowed) exitwith {}; | ||
|
|
||
| [QEGVAR(Core,SettingsLoaded), { | ||
| if(GETMVAR(SCRAMBLE_Enabled,false)) then | ||
| { | ||
| { | ||
| private _vehicle = _x; | ||
| if(GETVAR(_vehicle,VehicleACRE_Enabled,false)) then { | ||
|
|
||
| private _preset = ["default2", "default3", "default4", "default"]; | ||
| private _names = ["Default","Blufor","Opfor","Indfor","Civilian"]; | ||
| private _var = GETVAR(_vehicle,VehicleACREPreset,"Default"); | ||
| private _index = _names find _var; | ||
| //ignore if Default or not found | ||
| if(_index > 0) then { | ||
| private _selectedPresetIndex = _index - 1; | ||
| private _selectedPreset = _preset select _selectedPresetIndex; | ||
| LOG_2("Setting vehicle %1 to preset %2",_vehicle,_selectedPreset); | ||
| [_vehicle, _selectedPreset] call acre_api_fnc_setVehicleRacksPreset; | ||
|
|
||
| }; | ||
|
|
||
| }; | ||
|
|
||
|
|
||
| }forEach vehicles; | ||
| }; | ||
|
|
||
| }] call CBA_fnc_addEventHandler; |
26 changes: 16 additions & 10 deletions
26
uo_sys_framework/AIDriversModule/cfgFunctions/EH/fn_InitPost.sqf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,34 @@ | ||
| #define COMPONENT AIDrivers | ||
| #include "\x\UO_FW\addons\Main\script_macros.hpp" | ||
| EXEC_CHECK(ALL); | ||
| EXEC_CHECK(SERVER); | ||
| if !(UO_FW_Server_AIDRIVERSMODULE_Allowed) exitwith {}; | ||
|
|
||
| params ["_vehicle"]; | ||
|
|
||
| //IGNORE_PRIVATE_WARNING ["_thisArgs"]; | ||
|
|
||
| [QEGVAR(Core,SettingsLoaded), { | ||
| private _vehicle = _thisArgs; | ||
| [{(CBA_missionTime > 0)},{ | ||
| params ["_vehicle"]; | ||
| private _allowNV = GETMVAR(NVEnabled,false); | ||
| private _allowFlip = GETMVAR(FlipEnabled,false); | ||
| if (GETMVAR(AllVehs,false)) exitwith { | ||
| private _allowFlip = GETMVAR(FlipEnabled,false); | ||
| private _allVeh = GETMVAR(AllVehs,false); | ||
| private _inClasses = (typeOf _vehicle) in (GETMVAR(VehClasses,[])); | ||
| private _option = GETVAR(_vehicle,VehEnabled,false); | ||
|
|
||
| LOG_4("Trying to add AI Drivers to %1 _allVehicles=%2 _inClasses=%3 _option=%4", _vehicle,_allVeh,_inClasses,_option); | ||
|
|
||
| if (_allVeh) exitwith { | ||
| [QGVAR(Enabled_Event),[_vehicle,_allowNV,_allowFlip]] call CBA_fnc_globalEventJIP; | ||
| [QEGVAR(Core,RegisterModuleEvent), ["AI Drivers", "Module for adding AI Drivers to vehicles", "BlackHawk, PiZZADOX and Sacher"]] call CBA_fnc_globalEventJIP; | ||
| }; | ||
| if ((typeOf _vehicle) in (GETMVAR(VehClasses,[]))) exitwith { | ||
| if (_inClasses) exitwith { | ||
| [QEGVAR(Core,RegisterModuleEvent), ["AI Drivers", "Module for adding AI Drivers to vehicles", "BlackHawk, PiZZADOX and Sacher"]] call CBA_fnc_globalEventJIP; | ||
| [QGVAR(Enabled_Event),[_vehicle,_allowNV,_allowFlip]] call CBA_fnc_globalEventJIP; | ||
| }; | ||
| if (GETVAR(_vehicle,VehEnabled,false)) then { | ||
| if (_option) then { | ||
| private _allowNV = GETVAR(_vehicle,VehNVEnabled,false); | ||
| private _allowFlip = GETVAR(_vehicle,VehFlipEnabled,false); | ||
| private _allowFlip = GETVAR(_vehicle,VehFlipEnabled,false); | ||
| [QGVAR(Enabled_Event),[_vehicle,_allowNV,_allowFlip]] call CBA_fnc_globalEventJIP; | ||
| [QEGVAR(Core,RegisterModuleEvent), ["AI Drivers", "Module for adding AI Drivers to vehicles", "BlackHawk, PiZZADOX and Sacher"]] call CBA_fnc_globalEventJIP; | ||
| }; | ||
| }, _vehicle] call CBA_fnc_addEventHandlerArgs; | ||
|
|
||
| }, _vehicle] call CBA_fnc_WaitUntilAndExecute; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.