Skip to content

Commit

Permalink
Field Manual - Remove all use of +=, cleanup magwell capitlization (#…
Browse files Browse the repository at this point in the history 
…9494)

* Field Manual - Cleanup toml

* Fix magwell capitilization

* asc - skip fnc_zeusAttributes as it's hardcoded to be blocked

* Eliminate all use of += in fieldmanual

* Update sqfc.json
  • Loading branch information
@PabstMirror
PabstMirror authored Oct 16, 2023
1 parent 124baca commit 9873bf5
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 51 deletions.
1 change: 1 addition & 0 deletions .hemtt/project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ exclude = [
"/dev/",
"medical_ai/statemachine.sqf",
"common/functions/fnc_dummy.sqf",
"zeus/functions/fnc_zeusAttributes.sqf",
]

[hemtt.config]
Expand Down
2 changes: 1 addition & 1 deletion addons/compat_rhs_usf3/CfgMagazineWells.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ class CfgMagazineWells {
ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_n)};
};
class ace_hellfire_L {
ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_L)};
ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_l)};
};
};
83 changes: 42 additions & 41 deletions addons/fieldmanual/CfgHints.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@
- Size = '9'
*/

// INDENT - %11
// SELF INTERACT KEYBIND - %12
// INTERACT KEYBIND - %13
#define BASE_ARGUMENTS "' '", \
QUOTE([ARR_2('ACE3 Common', QQEGVAR(interact_menu,selfInteractKey))] call FUNC(getKeybindName)), \
QUOTE([ARR_2('ACE3 Common', QQEGVAR(interact_menu,interactKey))] call FUNC(getKeybindName))

// MEDCIAL MENU KEYBIND - %14
#define MEDICAL_MENU_KEYBIND QUOTE([ARR_2('ACE3 Common', QQEGVAR(medical_gui,openMedicalMenuKey))] call FUNC(getKeybindName))


class CfgHints {
class ACE_FieldManual_Base {
arguments[] = {
// INDENT - %11
"' '",
// SELF INTERACT KEYBIND - %12
QUOTE([ARR_2('ACE3 Common', QQEGVAR(interact_menu,selfInteractKey))] call FUNC(getKeybindName)),
// INTERACT KEYBIND - %13
QUOTE([ARR_2('ACE3 Common', QQEGVAR(interact_menu,interactKey))] call FUNC(getKeybindName))
};
arguments[] = {BASE_ARGUMENTS};
image = "\z\ace\addons\common\data\logo_ace3_ca.paa";
tip = "<a href='https://ace3.acemod.org/'>ACE Wiki</a>";
};
Expand All @@ -25,86 +29,86 @@ class CfgHints {

class ACE_ATragMX: ACE_FieldManual_Base {
logicalOrder = 1;
arguments[] += {QUOTE('ACE_ATragMX' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_ATragMX' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_ATragMX_ShortName);
description = CSTRING(Items_ATragMX_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/atragmx'>ATragMX Wiki</a>";
};
class ACE_BodyBag: ACE_FieldManual_Base {
logicalOrder = 2;
arguments[] += {QUOTE('ACE_BodyBag' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_BodyBag' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_BodyBag_ShortName);
description = CSTRING(Items_BodyBag_Description);
};
class ACE_CableTie: ACE_FieldManual_Base {
logicalOrder = 3;
arguments[] += {QUOTE('ACE_CableTie' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_CableTie' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_CableTie_ShortName);
description = CSTRING(Items_CableTie_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/captives'>Captives Wiki</a>";
};
class ACE_Cellphone: ACE_FieldManual_Base {
logicalOrder = 4;
arguments[] += {QUOTE('ACE_Cellphone' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Cellphone' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Cellphone_ShortName);
description = CSTRING(Items_Cellphone_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/explosives'>Explosives Wiki</a>";
};
class ACE_Chemlight_Shield: ACE_FieldManual_Base {
logicalOrder = 5;
arguments[] += {QUOTE('ACE_Chemlight_Shield' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Chemlight_Shield' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Chemlight_Shield_ShortName);
description = CSTRING(Items_Chemlight_Shield_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/chemlights'>Chemlights Wiki</a>";
};
class ACE_Clackers: ACE_FieldManual_Base {
logicalOrder = 6;
arguments[] += {QUOTE('ACE_Clacker' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Clacker' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Clackers_ShortName);
description = CSTRING(Items_Clackers_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/explosives'>Explosives Wiki</a>";
};
class ACE_DAGR: ACE_FieldManual_Base {
logicalOrder = 7;
arguments[] += {QUOTE('ACE_DAGR' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_DAGR' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_DAGR_ShortName);
description = CSTRING(Items_DAGR_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/dagr'>DAGR Wiki</a>";
};
class ACE_DeadManSwitch: ACE_FieldManual_Base {
logicalOrder = 8;
arguments[] += {QUOTE('ACE_DeadManSwitch' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_DeadManSwitch' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_DeadManSwitch_ShortName);
description = CSTRING(Items_DeadManSwitch_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/explosives'>Explosives Wiki</a>";
};
class ACE_DefusalKit: ACE_FieldManual_Base {
logicalOrder = 9;
arguments[] += {QUOTE('ACE_DefusalKit' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_DefusalKit' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_DefusalKit_ShortName);
description = CSTRING(Items_DefusalKit_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/explosives'>Explosives Wiki</a>";
};
class ACE_EarPlugs: ACE_FieldManual_Base {
logicalOrder = 10;
arguments[] += {QUOTE('ACE_EarPlugs' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_EarPlugs' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_EarPlugs_ShortName);
description = CSTRING(Items_EarPlugs_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/hearing'>Hearing Wiki</a>";
};
class ACE_EntrenchingTool: ACE_FieldManual_Base {
logicalOrder = 11;
arguments[] += {QUOTE('ACE_EntrenchingTool' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_EntrenchingTool' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_EntrenchingTool_ShortName);
description = CSTRING(Items_EntrenchingTool_Description);
Expand All @@ -118,53 +122,53 @@ class CfgHints {
};
class ACE_FortifyTool: ACE_FieldManual_Base {
logicalOrder = 13;
arguments[] += {QUOTE('ACE_HuntIR_Monitor' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_HuntIR_Monitor' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_FortifyTool_ShortName);
description = CSTRING(Items_FortifyTool_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/fortify'>Fortify Wiki</a>";
};
class ACE_HuntIR_Monitor: ACE_FieldManual_Base {
logicalOrder = 14;
arguments[] += {QUOTE('ACE_CableTie' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_CableTie' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_HuntIR_Monitor_ShortName);
description = CSTRING(Items_HuntIR_Monitor_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/huntir'>HuntIR Wiki</a>";
};
class ACE_IR_Strobe: ACE_FieldManual_Base {
logicalOrder = 15;
arguments[] += {QUOTE('ACE_IR_Strobe_Item' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_IR_Strobe_Item' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_IR_Strobe_ShortName);
description = CSTRING(Items_IR_Strobe_Description);
};
class ACE_Kestrel4500: ACE_FieldManual_Base {
logicalOrder = 16;
arguments[] += {QUOTE('ACE_Kestrel4500' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Kestrel4500' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Kestrel4500_ShortName);
description = CSTRING(Items_Kestrel4500_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/kestrel4500'>Kestrel 4500 Wiki</a>";
};
class ACE_Lockpick: ACE_FieldManual_Base {
logicalOrder = 17;
arguments[] += {QUOTE('ACE_key_lockpick' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_key_lockpick' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Lockpick_ShortName);
description = CSTRING(Items_Lockpick_Description);
tip = "<a href='https://ace3.acemod.org/wiki/framework/vehiclelock-framework.html'>Vehicle Lock Wiki</a>";
};
class ACE_MapTools: ACE_FieldManual_Base {
logicalOrder = 18;
arguments[] += {QUOTE('ACE_MapTools' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_MapTools' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_MapTools_ShortName);
description = CSTRING(Items_MapTools_Description);
};
class ACE_MicroDAGR: ACE_FieldManual_Base {
logicalOrder = 19;
arguments[] += {QUOTE('ACE_microDAGR' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_microDAGR' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_MicroDAGR_ShortName);
description = CSTRING(Items_MicroDAGR_Description);
Expand All @@ -186,15 +190,15 @@ class CfgHints {
};
class ACE_Sandbag: ACE_FieldManual_Base {
logicalOrder = 22;
arguments[] += {QUOTE('ACE_Sandbag_empty' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Sandbag_empty' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Sandbag_ShortName);
description = CSTRING(Items_Sandbag_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/sandbags'>Sandbag Wiki</a>";
};
class ACE_SpareBarrels: ACE_FieldManual_Base {
logicalOrder = 23;
arguments[] += {QUOTE('ACE_SpareBarrel_Item' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_SpareBarrel_Item' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_SpareBarrels_ShortName);
description = CSTRING(Items_SpareBarrels_Description);
Expand All @@ -209,15 +213,15 @@ class CfgHints {
};
class ACE_Tripod: ACE_FieldManual_Base {
logicalOrder = 25;
arguments[] += {QUOTE('ACE_Tripod' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Tripod' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Tripod_ShortName);
description = CSTRING(Items_Tripod_Description);
tip = "<a href='https://ace3.acemod.org/wiki/feature/tripod'>Tripod Wiki</a>";
};
class ACE_UAVBattery: ACE_FieldManual_Base {
logicalOrder = 26;
arguments[] += {QUOTE('ACE_UAVBattery' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_UAVBattery' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_UAVBattery_ShortName);
description = CSTRING(Items_UAVBattery_Description);
Expand All @@ -232,7 +236,7 @@ class CfgHints {
};
class ACE_Wirecutter: ACE_FieldManual_Base {
logicalOrder = 28;
arguments[] += {QUOTE('ACE_wirecutter' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_wirecutter' call FUNC(getItemName))};
displayName = "%14";
displayNameShort = CSTRING(Items_Wirecutter_ShortName);
description = CSTRING(Items_Wirecutter_Description);
Expand Down Expand Up @@ -265,10 +269,7 @@ class CfgHints {
category = "ACE_FieldManual";

class ACE_Medical_Treatment_Base: ACE_FieldManual_Base {
arguments[] += {
// MEDICAL MENU KEYBIND - %14
QUOTE([ARR_2('ACE3 Common', QQEGVAR(medical_gui,openMedicalMenuKey))] call FUNC(getKeybindName))
};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND};
tip = "<a href='https://ace3.acemod.org/wiki/feature/medical-system'>Medical Wiki</a>";
};

Expand All @@ -280,7 +281,7 @@ class CfgHints {
};
class ACE_Adenosine: ACE_Medical_Treatment_Base {
logicalOrder = 2;
arguments[] += {QUOTE('ACE_adenosine' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_adenosine' call FUNC(getItemName))};
displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_Adenosine_ShortName);
description = CSTRING(Medical_Treatment_Adenosine_Description);
Expand All @@ -299,35 +300,35 @@ class CfgHints {
};
class ACE_Epinephrine: ACE_Medical_Treatment_Base {
logicalOrder = 5;
arguments[] += {QUOTE('ACE_epinephrine' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_epinephrine' call FUNC(getItemName))};
displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_Epinephrine_ShortName);
description = CSTRING(Medical_Treatment_Epinephrine_Description);
};
class ACE_PAK: ACE_Medical_Treatment_Base {
logicalOrder = 6;
arguments[] += {QUOTE('ACE_personalAidKit' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_personalAidKit' call FUNC(getItemName))};
displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_PAK_ShortName);
description = CSTRING(Medical_Treatment_PAK_Description);
};
class ACE_Splint: ACE_Medical_Treatment_Base {
logicalOrder = 7;
arguments[] += {QUOTE('ACE_splint' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_splint' call FUNC(getItemName))};
displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_Splint_ShortName);
description = CSTRING(Medical_Treatment_Splint_Description);
};
class ACE_SurgicalKit: ACE_Medical_Treatment_Base {
logicalOrder = 8;
arguments[] += {QUOTE('ACE_surgicalKit' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_surgicalKit' call FUNC(getItemName))};
displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_SurgicalKit_ShortName);
description = CSTRING(Medical_Treatment_SurgicalKit_Description);
};
class ACE_Tourniquet: ACE_Medical_Treatment_Base {
logicalOrder = 9;
arguments[] += {QUOTE('ACE_tourniquet' call FUNC(getItemName))};
arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_tourniquet' call FUNC(getItemName))};
displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_CAT_ShortName);
description = CSTRING(Medical_Treatment_CAT_Description);
Expand Down
2 changes: 0 additions & 2 deletions addons/fieldmanual/addon.toml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions addons/grenades/CfgMagazineWells.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class CfgMagazineWells {
class CBA_40mm_M203 {
ADDON[] = {"ACE_40mm_flare_white", "ACE_40mm_flare_red", "ACE_40mm_flare_green", "ACE_40mm_flare_ir"};
ADDON[] = {"ACE_40mm_Flare_white", "ACE_40mm_Flare_red", "ACE_40mm_Flare_green", "ACE_40mm_Flare_ir"};
};
class UGL_40x36 {
ADDON[] = {"ACE_40mm_flare_white", "ACE_40mm_flare_red", "ACE_40mm_flare_green", "ACE_40mm_flare_ir"};
ADDON[] = {"ACE_40mm_Flare_white", "ACE_40mm_Flare_red", "ACE_40mm_Flare_green", "ACE_40mm_Flare_ir"};
};
};
8 changes: 4 additions & 4 deletions optionals/tracers/CfgMagazineWells.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@ class CfgMagazineWells {
};
class CBA_762x51_M14 {
ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer_green",
"ACE_20Rnd_762x51_Mag_Tracer_yellow"
"ACE_20Rnd_762x51_Mag_tracer_green",
"ACE_20Rnd_762x51_Mag_tracer_yellow"
};
};
class CBA_762x51_G3 {
ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer_green",
"ACE_20Rnd_762x51_Mag_Tracer_yellow"
"ACE_20Rnd_762x51_Mag_tracer_green",
"ACE_20Rnd_762x51_Mag_tracer_yellow"
};
};
class CBA_762x54R_LINKS {
Expand Down
3 changes: 2 additions & 1 deletion sqfc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"xeh_prep.sqf",
"\\dev\\",
"medical_ai\\statemachine.sqf",
"common\\functions\\fnc_dummy.sqf"
"common\\functions\\fnc_dummy.sqf",
"zeus\\functions\\fnc_zeusAttributes.sqf"
],
"outputDir": "P:/",
"workerThreads": 12
Expand Down

0 comments on commit 9873bf5

Please sign in to comment.