Skip to content

Commit 2762ed3

Browse files
johnb432johnb432
committed
1.6.6.0
1 parent 2a49f16 commit 2762ed3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+132
-64
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 56 additions & 0 deletions

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion

‎LICENSE‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
MIT License
2+
13
Copyright (c) 2018 cineafx (gear script), 2021 johnb432
24

35
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -10,10 +12,10 @@ furnished to do so, subject to the following conditions:
1012
The above copyright notice and this permission notice shall be included in all
1113
copies or substantial portions of the Software.
1214

13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
14-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
15-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
16-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
17-
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
18-
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
19-
OR OTHER DEALINGS IN THE SOFTWARE.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎addons/main/XEH_postInit.sqf‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,66 +27,66 @@ if (!hasInterface) exitWith {};
2727

2828
// Add Drag Bodies module
2929
if (!isNil "ace_dragging") then {
30-
#include "modules\module_dragBodies.sqf"
30+
#include "modules\module_dragBodies.inc.sqf"
3131
};
3232
}] call CBA_fnc_addEventHandlerArgs;
3333

3434
// Add functionality
35-
#include "modules\functionality_dragBodies.sqf"
35+
#include "modules\functionality_dragBodies.inc.sqf"
3636

3737
// Add modules
38-
#include "modules\module_behaviourCrew.sqf"
39-
#include "modules\module_captive.sqf"
40-
#include "modules\module_carBomb.sqf"
41-
#include "modules\module_channelVisibility.sqf"
42-
#include "modules\module_configureDoors.sqf"
43-
#include "modules\module_createResupply.sqf"
44-
#include "modules\module_deleteObjectForced.sqf"
45-
#include "modules\module_deleteZeus.sqf"
46-
#include "modules\module_dogAttack.sqf"
47-
#include "modules\module_dustStorm.sqf"
48-
#include "modules\module_garrisonBuilding.sqf"
49-
#include "modules\module_gearScript.sqf"
50-
#include "modules\module_grassRender.sqf"
51-
#include "modules\module_mapMarkers.sqf"
52-
#include "modules\module_missionEndModifier.sqf"
53-
#include "modules\module_missionObjectCounter.sqf"
54-
#include "modules\module_pauseTime.sqf"
55-
#include "modules\module_removeGrenades.sqf"
56-
#include "modules\module_suicideBomber.sqf"
57-
#include "modules\module_switchUnit.sqf"
58-
#include "modules\module_toggleConsciousnessForced.sqf"
59-
#include "modules\module_trackUnitDeath.sqf"
60-
#include "modules\module_unitParadrop.sqf"
61-
#include "modules\module_unitParadropAction.sqf"
62-
#include "modules\module_vehicleExplosionPrevention.sqf"
38+
#include "modules\module_behaviourCrew.inc.sqf"
39+
#include "modules\module_captive.inc.sqf"
40+
#include "modules\module_carBomb.inc.sqf"
41+
#include "modules\module_channelVisibility.inc.sqf"
42+
#include "modules\module_configureDoors.inc.sqf"
43+
#include "modules\module_createResupply.inc.sqf"
44+
#include "modules\module_deleteObjectForced.inc.sqf"
45+
#include "modules\module_deleteZeus.inc.sqf"
46+
#include "modules\module_dogAttack.inc.sqf"
47+
#include "modules\module_dustStorm.inc.sqf"
48+
#include "modules\module_garrisonBuilding.inc.sqf"
49+
#include "modules\module_gearScript.inc.sqf"
50+
#include "modules\module_grassRender.inc.sqf"
51+
#include "modules\module_mapMarkers.inc.sqf"
52+
#include "modules\module_missionEndModifier.inc.sqf"
53+
#include "modules\module_missionObjectCounter.inc.sqf"
54+
#include "modules\module_pauseTime.inc.sqf"
55+
#include "modules\module_removeGrenades.inc.sqf"
56+
#include "modules\module_suicideBomber.inc.sqf"
57+
#include "modules\module_switchUnit.inc.sqf"
58+
#include "modules\module_toggleConsciousnessForced.inc.sqf"
59+
#include "modules\module_trackUnitDeath.inc.sqf"
60+
#include "modules\module_unitParadrop.inc.sqf"
61+
#include "modules\module_unitParadropAction.inc.sqf"
62+
#include "modules\module_vehicleExplosionPrevention.inc.sqf"
6363

6464
// Optionals
6565
private _cfgPatches = configFile >> "CfgPatches";
6666
GVAR(ACEClipboardLoaded) = isClass (configFile >> "ACE_Extensions" >> "ace_clipboard");
6767

6868
// Check if ACE Dragging is loaded
6969
if (!isNil "ace_dragging") then {
70-
#include "modules\module_dragAndCarry.sqf"
70+
#include "modules\module_dragAndCarry.inc.sqf"
7171
};
7272

7373
// Check if ACE Medical components are loaded
7474
if (!isNil "ace_medical_damage") then {
75-
#include "modules\module_createInjuries.sqf"
75+
#include "modules\module_createInjuries.inc.sqf"
7676
};
7777

7878
if (zen_common_aceMedicalTreatment) then {
79-
#include "modules\module_createResupplyMedical.sqf"
79+
#include "modules\module_createResupplyMedical.inc.sqf"
8080
};
8181

8282
// Check if TFAR is loaded
8383
if (isClass (_cfgPatches >> "tfar_core") || {isClass (_cfgPatches >> "task_force_radio")}) then {
84-
#include "modules\module_tfarRadioRange.sqf"
84+
#include "modules\module_tfarRadioRange.inc.sqf"
8585
};
8686

8787
// Check if RHS AFRF is loaded
8888
if (isClass (_cfgPatches >> "rhs_main_loadorder")) then {
89-
#include "modules\module_rhsAps.sqf"
89+
#include "modules\module_rhsAps.inc.sqf"
9090
};
9191
// Optionals finished
9292

‎addons/main/functions/fnc_switchUnitStart.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ if (!local _unit) then {
136136
// Check if the necessary keys were pressed for a keybind
137137
if (_comboDikPressed &&
138138
{_mainDevice == "KEYBOARD"} &&
139-
{((ace_common_keyboardInputMain getOrDefault [_mainDik, [false, 0]]) select 1) > ([0, 1] select _isDoubleTap)} // check how many times the main key was pressed
139+
{((ace_common_keyboardInputMain getOrDefault [_mainDik, [false, 0]]) select 1) > (parseNumber _isDoubleTap)} // check how many times the main key was pressed
140140
) exitWith {
141141
call FUNC(switchUnitStop);
142142
};

addons/main/modules/functionality_dragBodies.sqf renamed to addons/main/modules/functionality_dragBodies.inc.sqf

File renamed without changes.

addons/main/modules/module_behaviourCrew.sqf renamed to addons/main/modules/module_behaviourCrew.inc.sqf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
};
3838

3939
if (isNil QFUNC(addBehaviourEh)) then {
40-
#include "module_behaviourCrew_init.sqf"
40+
#include "module_behaviourCrew_init.inc.sqf"
4141
};
4242

43+
/////////////////////////_object setVariable ["ace_vehicle_damage_allowCrewInImmobile", _stayCrew, true];
44+
4345
["zen_common_execute", [{
4446
(_this select 0) allowCrewInImmobile (_this select 1);
4547
}, [_object, _stayCrew]], _object] call CBA_fnc_targetEvent;
@@ -129,7 +131,7 @@
129131
};
130132

131133
if (isNil QFUNC(addBehaviourEh)) then {
132-
#include "module_behaviourCrew_init.sqf"
134+
#include "module_behaviourCrew_init.inc.sqf"
133135
};
134136

135137
if (_addAiDriver) then {

addons/main/modules/module_behaviourCrew_init.sqf renamed to addons/main/modules/module_behaviourCrew_init.inc.sqf

File renamed without changes.

addons/main/modules/module_captive.sqf renamed to addons/main/modules/module_captive.inc.sqf

File renamed without changes.

addons/main/modules/module_carBomb.sqf renamed to addons/main/modules/module_carBomb.inc.sqf

File renamed without changes.

0 commit comments

Comments
 (0)