Tools - Add HEMTT SQF support and fix commas are not semicolons (#9663)

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
This commit is contained in:
BrettMayson 2023-12-06 21:20:47 -06:00 committed by GitHub
parent acca95d204
commit 464ab0cefb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
210 changed files with 129 additions and 134 deletions

View File

@ -18,14 +18,12 @@ include = [
[version] [version]
git_hash = 0 git_hash = 0
# Unused in HEMTT v1.11 or higher, kept for backwards compatibility
[asc] [asc]
enabled = true enabled = true
exclude = [ exclude = [
"/initsettings.sqf", ".inc.sqf",
"/initkeybinds.sqf",
"/xeh_prep.sqf",
"/dev/", "/dev/",
"medical_ai/statemachine.sqf",
"common/functions/fnc_dummy.sqf", "common/functions/fnc_dummy.sqf",
"zeus/functions/fnc_zeusAttributes.sqf", "zeus/functions/fnc_zeusAttributes.sqf",
] ]

View File

@ -1,6 +1,6 @@
#include "script_component.hpp" #include "script_component.hpp"
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"
GVAR(currentbulletID) = -1; GVAR(currentbulletID) = -1;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40); GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40);
GVAR(dutyList) = createHashMap; GVAR(dutyList) = createHashMap;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -11,6 +11,6 @@ if (isServer) then {
GVAR(assignNVGstate) = false; GVAR(assignNVGstate) = false;
}; };
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -9,7 +9,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
// Arsenal events // Arsenal events
[QGVAR(statsToggle), { [QGVAR(statsToggle), {

View File

@ -82,7 +82,7 @@ cba_diagnostic_projectileMaxLines = 10;
_x hideObject false; _x hideObject false;
} forEach allMissionObjects ""; } forEach allMissionObjects "";
private _unit = objNull, private _unit = objNull;
// Update VR unit gear // Update VR unit gear
{ {

View File

@ -31,6 +31,6 @@
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
#include "dev\showShotInfo.sqf" #include "dev\showShotInfo.inc.sqf"
#include "dev\checkConfigs.sqf" #include "dev\checkConfigs.inc.sqf"
#endif #endif

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -1,6 +1,6 @@
#include "script_component.hpp" #include "script_component.hpp"
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"
GVAR(active) = false; GVAR(active) = false;
GVAR(initialised) = false; GVAR(initialised) = false;

View File

@ -16,7 +16,7 @@
* Public: No * Public: No
*/ */
params ["_attachToVehicle","_unit"], params ["_attachToVehicle","_unit"];
TRACE_2("params",_attachToVehicle,_unit); TRACE_2("params",_attachToVehicle,_unit);
private _attachedList = _attachToVehicle getVariable [QGVAR(attached), []]; private _attachedList = _attachToVehicle getVariable [QGVAR(attached), []];

View File

@ -48,7 +48,7 @@ if (_magIsForCurrentWeapon && {["ace_advanced_ballistics"] call EFUNC(common,isM
private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths"); private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths");
private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift); private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
if (_abShift != 0) then { if (_abShift != 0) then {
_abAdjustText = " [AB]", _abAdjustText = " [AB]";
_muzzleVelocity = _abShift; _muzzleVelocity = _abShift;
}; };
}; };

View File

@ -44,7 +44,7 @@ if (_magazine isEqualTo "") then {
private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths"); private _barrelLengthTable = getArray (_configAmmo >> "ACE_barrelLengths");
private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift); private _abShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, 0] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
if (_abShift != 0) then { if (_abShift != 0) then {
_abAdjustText = " [AB]", _abAdjustText = " [AB]";
_muzzleVelocity = _abShift; _muzzleVelocity = _abShift;
}; };
}; };

View File

@ -11,6 +11,6 @@ GVAR(captivityEnabled) = false;
GVAR(restraints) = keys (uiNamespace getVariable QGVAR(restraints)); GVAR(restraints) = keys (uiNamespace getVariable QGVAR(restraints));
GVAR(blindfolds) = keys (uiNamespace getVariable QGVAR(blindfolds)); GVAR(blindfolds) = keys (uiNamespace getVariable QGVAR(blindfolds));
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(initializedItemClasses) = []; GVAR(initializedItemClasses) = [];
GVAR(initializedVehicleClasses) = []; GVAR(initializedVehicleClasses) = [];

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -78,6 +78,6 @@ isHC = !hasInterface && !isDedicated; // deprecated because no tag
missionNamespace setVariable ["ACE_isHC", ACE_isHC]; missionNamespace setVariable ["ACE_isHC", ACE_isHC];
uiNamespace setVariable ["ACE_isHC", ACE_isHC]; uiNamespace setVariable ["ACE_isHC", ACE_isHC];
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -63,7 +63,7 @@ private _oldCompats = [];
} forEach _addons; } forEach _addons;
if (_oldAddons isNotEqualTo []) then { if (_oldAddons isNotEqualTo []) then {
_oldAddons = _oldAddons apply {"%1.pbo", _x}; _oldAddons = _oldAddons apply { format ["%1.pbo", _x] };
private _errorMsg = ""; private _errorMsg = "";
if (count _oldAddons > 3) then { if (count _oldAddons > 3) then {
_errorMsg = format ["The following files are outdated: %1, and %2 more.<br/>ACE Main version is %3 from %4.<br/>Loaded mods with outdated ACE files: %5", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) -3, _mainVersion, _mainSource, (_oldSources joinString ", ")]; _errorMsg = format ["The following files are outdated: %1, and %2 more.<br/>ACE Main version is %3 from %4.<br/>Loaded mods with outdated ACE files: %5", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) -3, _mainVersion, _mainSource, (_oldSources joinString ", ")];

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(initializedStaticTypes) = []; GVAR(initializedStaticTypes) = [];

View File

@ -2,7 +2,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"
GVAR(outputPFH) = -1; GVAR(outputPFH) = -1;

View File

@ -104,4 +104,4 @@ if (isNil QGVAR(maxWeightCarryRun)) then {
}; };
}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler;
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -8,7 +8,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(detonationHandlers) = []; GVAR(detonationHandlers) = [];
GVAR(excludedMines) = []; GVAR(excludedMines) = [];

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
if (isServer) then { if (isServer) then {
["Helicopter", "Deleted", LINKFUNC(unequipFRIES)] call CBA_fnc_addClassEventHandler; ["Helicopter", "Deleted", LINKFUNC(unequipFRIES)] call CBA_fnc_addClassEventHandler;

View File

@ -6,7 +6,7 @@ GVAR(position) = [0,0,0];
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"
["ace_infoDisplayChanged", { ["ace_infoDisplayChanged", {
if (!isNull ((_this select 0) displayCtrl 1713151)) then { if (!isNull ((_this select 0) displayCtrl 1713151)) then {

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
#define ARSENAL_CATEGORY_ICON QPATHTOF(ui\icon_survival.paa) #define ARSENAL_CATEGORY_ICON QPATHTOF(ui\icon_survival.paa)

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(burningPlants) = []; GVAR(burningPlants) = [];

View File

@ -13,6 +13,6 @@ GVAR(locations) = [];
// Custom deploy handlers // Custom deploy handlers
GVAR(deployHandlers) = []; GVAR(deployHandlers) = [];
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -20,6 +20,6 @@ GVAR(lastIterationIndex) = 0;
GVAR(objects) = []; GVAR(objects) = [];
GVAR(arguments) = []; GVAR(arguments) = [];
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(GForces) = []; GVAR(GForces) = [];
GVAR(GForces_Index) = 0; GVAR(GForces_Index) = 0;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
// restore gunbag info after respawn // restore gunbag info after respawn
["CAManBase", "respawn", { ["CAManBase", "respawn", {

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
if (isServer) then { if (isServer) then {
GVAR(headlessClients) = []; GVAR(headlessClients) = [];

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
["CBA_loadoutSet", { ["CBA_loadoutSet", {
params ["_unit", "_loadout", "_extendedInfo"]; params ["_unit", "_loadout", "_extendedInfo"];

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
if (!hasInterface) exitWith { ADDON = true; }; if (!hasInterface) exitWith { ADDON = true; };

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
DFUNC(repair_Statement) = { // moved from config because of build problems DFUNC(repair_Statement) = { // moved from config because of build problems
TRACE_1("repair_Statement",_this); TRACE_1("repair_Statement",_this);

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -3,4 +3,4 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"

View File

@ -1,6 +1,6 @@
#include "script_component.hpp" #include "script_component.hpp"
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"
GVAR(Menus) = ["Date", "Direction", "Wind SPD m/s", "CROSSWIND m/s", "HEADWIND m/s", "TEMP °C", "CHILL °C", "HUMIDITY %", "HEAT INDEX °C", "DEW POINT °C", "WET BULB °C", "BARO hPA", "ALTITUDE m", "DENS ALT m", "User Screen 1", "User Screen 2"]; GVAR(Menus) = ["Date", "Direction", "Wind SPD m/s", "CROSSWIND m/s", "HEADWIND m/s", "TEMP °C", "CHILL °C", "HUMIDITY %", "HEAT INDEX °C", "DEW POINT °C", "WET BULB °C", "BARO hPA", "ALTITUDE m", "DENS ALT m", "User Screen 1", "User Screen 2"];

View File

@ -2,7 +2,7 @@
#include "\a3\ui_f\hpp\defineDIKCodes.inc" #include "\a3\ui_f\hpp\defineDIKCodes.inc"
if (hasInterface) then { if (hasInterface) then {
#include "initKeybinds.sqf" #include "initKeybinds.inc.sqf"
GVAR(pfID) = -1; GVAR(pfID) = -1;

View File

@ -15,6 +15,6 @@ GVAR(laserEmitters) = createHashMap;
GVAR(trackedLaserTargets) = []; GVAR(trackedLaserTargets) = [];
GVAR(pfehID) = -1; GVAR(pfehID) = -1;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -7,6 +7,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(GroupColorCfgMappingNew) = call CBA_fnc_createNamespace; GVAR(GroupColorCfgMappingNew) = call CBA_fnc_createNamespace;

View File

@ -6,6 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
ADDON = true; ADDON = true;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
GVAR(flagCache) = createHashMap; GVAR(flagCache) = createHashMap;

View File

@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf" #include "initSettings.inc.sqf"
// init marker types // init marker types
if (isNil QGVAR(MarkersCache)) then { if (isNil QGVAR(MarkersCache)) then {

Some files were not shown because too many files have changed in this diff Show More