Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.hemtt/project.toml
View File

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

2
addons/advanced_ballistics/XEH_postInit.sqf
View File

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

2
addons/advanced_ballistics/XEH_preInit.sqf
View File

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

0
addons/advanced_ballistics/initKeybinds.sqf → addons/advanced_ballistics/initKeybinds.inc.sqf
View File

0
addons/advanced_ballistics/initSettings.sqf → addons/advanced_ballistics/initSettings.inc.sqf
View File

2
addons/advanced_fatigue/XEH_preInit.sqf
View File

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

0
addons/advanced_fatigue/initSettings.sqf → addons/advanced_fatigue/initSettings.inc.sqf
View File

2
addons/advanced_throwing/XEH_preInit.sqf
View File

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

0
addons/advanced_throwing/initSettings.sqf → addons/advanced_throwing/initSettings.inc.sqf
View File

2
addons/ai/XEH_preInit.sqf
View File

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

0
addons/ai/initSettings.sqf → addons/ai/initSettings.inc.sqf
View File

2
addons/arsenal/XEH_preInit.sqf
View File

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

0
addons/arsenal/initSettings.sqf → addons/arsenal/initSettings.inc.sqf
View File

2
addons/arsenal/missions/Arsenal.VR/XEH_postInit.sqf
View File

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

4
addons/artillerytables/XEH_postInit.sqf
View File

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

2
addons/artillerytables/XEH_preInit.sqf
View File

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

0
addons/artillerytables/dev/checkConfigs.sqf → addons/artillerytables/dev/checkConfigs.inc.sqf
View File

0
addons/artillerytables/dev/showShotInfo.sqf → addons/artillerytables/dev/showShotInfo.inc.sqf
View File

0
addons/artillerytables/initSettings.sqf → addons/artillerytables/initSettings.inc.sqf
View File

2
addons/atragmx/XEH_postInit.sqf
View File

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

0
addons/atragmx/initKeybinds.sqf → addons/atragmx/initKeybinds.inc.sqf
View File

2
addons/attach/functions/fnc_detach.sqf
View File

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

2
addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf
View File

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

2
addons/ballistics/functions/fnc_statTextStatement_weaponMuzzleVelocity.sqf
View File

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

2
addons/captives/XEH_preInit.sqf
View File

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

0
addons/captives/initSettings.sqf → addons/captives/initSettings.inc.sqf
View File

2
addons/cargo/XEH_preInit.sqf
View File

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

0
addons/cargo/initSettings.sqf → addons/cargo/initSettings.inc.sqf
View File

2
addons/casings/XEH_preInit.sqf
View File

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

0
addons/casings/initSettings.sqf → addons/casings/initSettings.inc.sqf
View File

2
addons/common/XEH_preInit.sqf
View File

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

2
addons/common/functions/fnc_checkFiles.sqf
View File

@ -63,7 +63,7 @@ private _oldCompats = [];
} forEach _addons;
if (_oldAddons isNotEqualTo []) then {
_oldAddons = _oldAddons apply {"%1.pbo", _x};
_oldAddons = _oldAddons apply { format ["%1.pbo", _x] };
private _errorMsg = "";
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 ", ")];

0
addons/common/initSettings.sqf → addons/common/initSettings.inc.sqf
View File

2
addons/cookoff/XEH_preInit.sqf
View File

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

0
addons/cookoff/initSettings.sqf → addons/cookoff/initSettings.inc.sqf
View File

2
addons/csw/XEH_preInit.sqf
View File

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

0
addons/csw/initSettings.sqf → addons/csw/initSettings.inc.sqf
View File

2
addons/dagr/XEH_postInit.sqf
View File

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

0
addons/dagr/initKeybinds.sqf → addons/dagr/initKeybinds.inc.sqf
View File

2
addons/dragging/XEH_postInit.sqf
View File

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

2
addons/dragging/XEH_preInit.sqf
View File

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

0
addons/dragging/initKeybinds.sqf → addons/dragging/initKeybinds.inc.sqf
View File

0
addons/dragging/initSettings.sqf → addons/dragging/initSettings.inc.sqf
View File

2
addons/explosives/XEH_preInit.sqf
View File

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

0
addons/explosives/initSettings.sqf → addons/explosives/initSettings.inc.sqf
View File

2
addons/fastroping/XEH_preInit.sqf
View File

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

0
addons/fastroping/initSettings.sqf → addons/fastroping/initSettings.inc.sqf
View File

2
addons/fcs/XEH_postInit.sqf
View File

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

0
addons/fcs/initKeybinds.sqf → addons/fcs/initKeybinds.inc.sqf
View File

2
addons/field_rations/XEH_preInit.sqf
View File

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

0
addons/field_rations/initSettings.sqf → addons/field_rations/initSettings.inc.sqf
View File

2
addons/finger/XEH_preInit.sqf
View File

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

0
addons/finger/initSettings.sqf → addons/finger/initSettings.inc.sqf
View File

2
addons/fire/XEH_preInit.sqf
View File

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

0
addons/fire/initSettings.sqf → addons/fire/initSettings.inc.sqf
View File

2
addons/fortify/XEH_preInit.sqf
View File

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

0
addons/fortify/initSettings.sqf → addons/fortify/initSettings.inc.sqf
View File

2
addons/frag/XEH_preInit.sqf
View File

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

0
addons/frag/initSettings.sqf → addons/frag/initSettings.inc.sqf
View File

2
addons/gestures/XEH_preInit.sqf
View File

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

0
addons/gestures/initSettings.sqf → addons/gestures/initSettings.inc.sqf
View File

2
addons/gforces/XEH_preInit.sqf
View File

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

0
addons/gforces/initSettings.sqf → addons/gforces/initSettings.inc.sqf
View File

2
addons/goggles/XEH_preInit.sqf
View File

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

0
addons/goggles/initSettings.sqf → addons/goggles/initSettings.inc.sqf
View File

2
addons/grenades/XEH_preInit.sqf
View File

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

0
addons/grenades/initSettings.sqf → addons/grenades/initSettings.inc.sqf
View File

2
addons/gunbag/XEH_preInit.sqf
View File

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

0
addons/gunbag/initSettings.sqf → addons/gunbag/initSettings.inc.sqf
View File

2
addons/headless/XEH_preInit.sqf
View File

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

0
addons/headless/initSettings.sqf → addons/headless/initSettings.inc.sqf
View File

2
addons/hearing/XEH_preInit.sqf
View File

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

0
addons/hearing/initSettings.sqf → addons/hearing/initSettings.inc.sqf
View File

2
addons/hitreactions/XEH_preInit.sqf
View File

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

0
addons/hitreactions/initSettings.sqf → addons/hitreactions/initSettings.inc.sqf
View File

2
addons/interact_menu/XEH_preInit.sqf
View File

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

0
addons/interact_menu/initSettings.sqf → addons/interact_menu/initSettings.inc.sqf
View File

2
addons/interaction/XEH_preInit.sqf
View File

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

0
addons/interaction/initSettings.sqf → addons/interaction/initSettings.inc.sqf
View File

2
addons/inventory/XEH_preInit.sqf
View File

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

0
addons/inventory/initSettings.sqf → addons/inventory/initSettings.inc.sqf
View File

2
addons/javelin/XEH_clientInit.sqf
View File

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

0
addons/javelin/initKeybinds.sqf → addons/javelin/initKeybinds.inc.sqf
View File

2
addons/kestrel4500/XEH_postInit.sqf
View File

@ -1,6 +1,6 @@
#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"];

0
addons/kestrel4500/initKeybinds.sqf → addons/kestrel4500/initKeybinds.inc.sqf
View File

2
addons/laser/XEH_postInit.sqf
View File

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

2
addons/laser/XEH_preInit.sqf
View File

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

0
addons/laser/initKeybinds.sqf → addons/laser/initKeybinds.inc.sqf
View File

0
addons/laser/initSettings.sqf → addons/laser/initSettings.inc.sqf
View File

2
addons/magazinerepack/XEH_preInit.sqf
View File

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

0
addons/magazinerepack/initSettings.sqf → addons/magazinerepack/initSettings.inc.sqf
View File

2
addons/map/XEH_preInit.sqf
View File

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

0
addons/map/initSettings.sqf → addons/map/initSettings.inc.sqf
View File

2
addons/map_gestures/XEH_preInit.sqf
View File

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

0
addons/map_gestures/initSettings.sqf → addons/map_gestures/initSettings.inc.sqf
View File

2
addons/maptools/XEH_preInit.sqf
View File

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

0
addons/maptools/initSettings.sqf → addons/maptools/initSettings.inc.sqf
View File

2
addons/marker_flags/XEH_preInit.sqf
View File

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

0
addons/marker_flags/initSettings.sqf → addons/marker_flags/initSettings.inc.sqf
View File

2
addons/markers/XEH_preInit.sqf
View File

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

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