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

Field Manual - Remove all use of +=, cleanup magwell capitlization (#9494)

Browse Source 
* 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
This commit is contained in:
PabstMirror 2023-10-16 01:49:23 -05:00 committed by GitHub
parent 124baca84b
commit 9873bf566c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hemtt/project.toml
View File

@ -27,6 +27,7 @@ exclude = [
"/dev/", "/dev/",
"medical_ai/statemachine.sqf", "medical_ai/statemachine.sqf",
"common/functions/fnc_dummy.sqf", "common/functions/fnc_dummy.sqf",
"zeus/functions/fnc_zeusAttributes.sqf",
] ]
[hemtt.config] [hemtt.config]

2
addons/compat_rhs_usf3/CfgMagazineWells.hpp
View File

@ -6,6 +6,6 @@ class CfgMagazineWells {
ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_n)}; ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_n)};
}; };
class ace_hellfire_L { class ace_hellfire_L {
ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_L)}; ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_l)};
}; };
}; };

83
addons/fieldmanual/CfgHints.hpp
View File

@ -6,16 +6,20 @@
- Size = '9' - 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 CfgHints {
class ACE_FieldManual_Base { class ACE_FieldManual_Base {
arguments[] = { arguments[] = {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))
};
image = "\z\ace\addons\common\data\logo_ace3_ca.paa"; image = "\z\ace\addons\common\data\logo_ace3_ca.paa";
tip = "<a href='https://ace3.acemod.org/'>ACE Wiki</a>"; tip = "<a href='https://ace3.acemod.org/'>ACE Wiki</a>";
}; };
@ -25,7 +29,7 @@ class CfgHints {
class ACE_ATragMX: ACE_FieldManual_Base { class ACE_ATragMX: ACE_FieldManual_Base {
logicalOrder = 1; logicalOrder = 1;
arguments[] += {QUOTE('ACE_ATragMX' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_ATragMX' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_ATragMX_ShortName); displayNameShort = CSTRING(Items_ATragMX_ShortName);
description = CSTRING(Items_ATragMX_Description); description = CSTRING(Items_ATragMX_Description);
@ -33,14 +37,14 @@ class CfgHints {
}; };
class ACE_BodyBag: ACE_FieldManual_Base { class ACE_BodyBag: ACE_FieldManual_Base {
logicalOrder = 2; logicalOrder = 2;
arguments[] += {QUOTE('ACE_BodyBag' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_BodyBag' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_BodyBag_ShortName); displayNameShort = CSTRING(Items_BodyBag_ShortName);
description = CSTRING(Items_BodyBag_Description); description = CSTRING(Items_BodyBag_Description);
}; };
class ACE_CableTie: ACE_FieldManual_Base { class ACE_CableTie: ACE_FieldManual_Base {
logicalOrder = 3; logicalOrder = 3;
arguments[] += {QUOTE('ACE_CableTie' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_CableTie' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_CableTie_ShortName); displayNameShort = CSTRING(Items_CableTie_ShortName);
description = CSTRING(Items_CableTie_Description); description = CSTRING(Items_CableTie_Description);
@ -48,7 +52,7 @@ class CfgHints {
}; };
class ACE_Cellphone: ACE_FieldManual_Base { class ACE_Cellphone: ACE_FieldManual_Base {
logicalOrder = 4; logicalOrder = 4;
arguments[] += {QUOTE('ACE_Cellphone' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Cellphone' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Cellphone_ShortName); displayNameShort = CSTRING(Items_Cellphone_ShortName);
description = CSTRING(Items_Cellphone_Description); description = CSTRING(Items_Cellphone_Description);
@ -56,7 +60,7 @@ class CfgHints {
}; };
class ACE_Chemlight_Shield: ACE_FieldManual_Base { class ACE_Chemlight_Shield: ACE_FieldManual_Base {
logicalOrder = 5; logicalOrder = 5;
arguments[] += {QUOTE('ACE_Chemlight_Shield' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Chemlight_Shield' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Chemlight_Shield_ShortName); displayNameShort = CSTRING(Items_Chemlight_Shield_ShortName);
description = CSTRING(Items_Chemlight_Shield_Description); description = CSTRING(Items_Chemlight_Shield_Description);
@ -64,7 +68,7 @@ class CfgHints {
}; };
class ACE_Clackers: ACE_FieldManual_Base { class ACE_Clackers: ACE_FieldManual_Base {
logicalOrder = 6; logicalOrder = 6;
arguments[] += {QUOTE('ACE_Clacker' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Clacker' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Clackers_ShortName); displayNameShort = CSTRING(Items_Clackers_ShortName);
description = CSTRING(Items_Clackers_Description); description = CSTRING(Items_Clackers_Description);
@ -72,7 +76,7 @@ class CfgHints {
}; };
class ACE_DAGR: ACE_FieldManual_Base { class ACE_DAGR: ACE_FieldManual_Base {
logicalOrder = 7; logicalOrder = 7;
arguments[] += {QUOTE('ACE_DAGR' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_DAGR' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_DAGR_ShortName); displayNameShort = CSTRING(Items_DAGR_ShortName);
description = CSTRING(Items_DAGR_Description); description = CSTRING(Items_DAGR_Description);
@ -80,7 +84,7 @@ class CfgHints {
}; };
class ACE_DeadManSwitch: ACE_FieldManual_Base { class ACE_DeadManSwitch: ACE_FieldManual_Base {
logicalOrder = 8; logicalOrder = 8;
arguments[] += {QUOTE('ACE_DeadManSwitch' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_DeadManSwitch' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_DeadManSwitch_ShortName); displayNameShort = CSTRING(Items_DeadManSwitch_ShortName);
description = CSTRING(Items_DeadManSwitch_Description); description = CSTRING(Items_DeadManSwitch_Description);
@ -88,7 +92,7 @@ class CfgHints {
}; };
class ACE_DefusalKit: ACE_FieldManual_Base { class ACE_DefusalKit: ACE_FieldManual_Base {
logicalOrder = 9; logicalOrder = 9;
arguments[] += {QUOTE('ACE_DefusalKit' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_DefusalKit' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_DefusalKit_ShortName); displayNameShort = CSTRING(Items_DefusalKit_ShortName);
description = CSTRING(Items_DefusalKit_Description); description = CSTRING(Items_DefusalKit_Description);
@ -96,7 +100,7 @@ class CfgHints {
}; };
class ACE_EarPlugs: ACE_FieldManual_Base { class ACE_EarPlugs: ACE_FieldManual_Base {
logicalOrder = 10; logicalOrder = 10;
arguments[] += {QUOTE('ACE_EarPlugs' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_EarPlugs' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_EarPlugs_ShortName); displayNameShort = CSTRING(Items_EarPlugs_ShortName);
description = CSTRING(Items_EarPlugs_Description); description = CSTRING(Items_EarPlugs_Description);
@ -104,7 +108,7 @@ class CfgHints {
}; };
class ACE_EntrenchingTool: ACE_FieldManual_Base { class ACE_EntrenchingTool: ACE_FieldManual_Base {
logicalOrder = 11; logicalOrder = 11;
arguments[] += {QUOTE('ACE_EntrenchingTool' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_EntrenchingTool' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_EntrenchingTool_ShortName); displayNameShort = CSTRING(Items_EntrenchingTool_ShortName);
description = CSTRING(Items_EntrenchingTool_Description); description = CSTRING(Items_EntrenchingTool_Description);
@ -118,7 +122,7 @@ class CfgHints {
}; };
class ACE_FortifyTool: ACE_FieldManual_Base { class ACE_FortifyTool: ACE_FieldManual_Base {
logicalOrder = 13; logicalOrder = 13;
arguments[] += {QUOTE('ACE_HuntIR_Monitor' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_HuntIR_Monitor' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_FortifyTool_ShortName); displayNameShort = CSTRING(Items_FortifyTool_ShortName);
description = CSTRING(Items_FortifyTool_Description); description = CSTRING(Items_FortifyTool_Description);
@ -126,7 +130,7 @@ class CfgHints {
}; };
class ACE_HuntIR_Monitor: ACE_FieldManual_Base { class ACE_HuntIR_Monitor: ACE_FieldManual_Base {
logicalOrder = 14; logicalOrder = 14;
arguments[] += {QUOTE('ACE_CableTie' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_CableTie' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_HuntIR_Monitor_ShortName); displayNameShort = CSTRING(Items_HuntIR_Monitor_ShortName);
description = CSTRING(Items_HuntIR_Monitor_Description); description = CSTRING(Items_HuntIR_Monitor_Description);
@ -134,14 +138,14 @@ class CfgHints {
}; };
class ACE_IR_Strobe: ACE_FieldManual_Base { class ACE_IR_Strobe: ACE_FieldManual_Base {
logicalOrder = 15; logicalOrder = 15;
arguments[] += {QUOTE('ACE_IR_Strobe_Item' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_IR_Strobe_Item' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_IR_Strobe_ShortName); displayNameShort = CSTRING(Items_IR_Strobe_ShortName);
description = CSTRING(Items_IR_Strobe_Description); description = CSTRING(Items_IR_Strobe_Description);
}; };
class ACE_Kestrel4500: ACE_FieldManual_Base { class ACE_Kestrel4500: ACE_FieldManual_Base {
logicalOrder = 16; logicalOrder = 16;
arguments[] += {QUOTE('ACE_Kestrel4500' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Kestrel4500' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Kestrel4500_ShortName); displayNameShort = CSTRING(Items_Kestrel4500_ShortName);
description = CSTRING(Items_Kestrel4500_Description); description = CSTRING(Items_Kestrel4500_Description);
@ -149,7 +153,7 @@ class CfgHints {
}; };
class ACE_Lockpick: ACE_FieldManual_Base { class ACE_Lockpick: ACE_FieldManual_Base {
logicalOrder = 17; logicalOrder = 17;
arguments[] += {QUOTE('ACE_key_lockpick' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_key_lockpick' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Lockpick_ShortName); displayNameShort = CSTRING(Items_Lockpick_ShortName);
description = CSTRING(Items_Lockpick_Description); description = CSTRING(Items_Lockpick_Description);
@ -157,14 +161,14 @@ class CfgHints {
}; };
class ACE_MapTools: ACE_FieldManual_Base { class ACE_MapTools: ACE_FieldManual_Base {
logicalOrder = 18; logicalOrder = 18;
arguments[] += {QUOTE('ACE_MapTools' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_MapTools' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_MapTools_ShortName); displayNameShort = CSTRING(Items_MapTools_ShortName);
description = CSTRING(Items_MapTools_Description); description = CSTRING(Items_MapTools_Description);
}; };
class ACE_MicroDAGR: ACE_FieldManual_Base { class ACE_MicroDAGR: ACE_FieldManual_Base {
logicalOrder = 19; logicalOrder = 19;
arguments[] += {QUOTE('ACE_microDAGR' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_microDAGR' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_MicroDAGR_ShortName); displayNameShort = CSTRING(Items_MicroDAGR_ShortName);
description = CSTRING(Items_MicroDAGR_Description); description = CSTRING(Items_MicroDAGR_Description);
@ -186,7 +190,7 @@ class CfgHints {
}; };
class ACE_Sandbag: ACE_FieldManual_Base { class ACE_Sandbag: ACE_FieldManual_Base {
logicalOrder = 22; logicalOrder = 22;
arguments[] += {QUOTE('ACE_Sandbag_empty' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Sandbag_empty' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Sandbag_ShortName); displayNameShort = CSTRING(Items_Sandbag_ShortName);
description = CSTRING(Items_Sandbag_Description); description = CSTRING(Items_Sandbag_Description);
@ -194,7 +198,7 @@ class CfgHints {
}; };
class ACE_SpareBarrels: ACE_FieldManual_Base { class ACE_SpareBarrels: ACE_FieldManual_Base {
logicalOrder = 23; logicalOrder = 23;
arguments[] += {QUOTE('ACE_SpareBarrel_Item' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_SpareBarrel_Item' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_SpareBarrels_ShortName); displayNameShort = CSTRING(Items_SpareBarrels_ShortName);
description = CSTRING(Items_SpareBarrels_Description); description = CSTRING(Items_SpareBarrels_Description);
@ -209,7 +213,7 @@ class CfgHints {
}; };
class ACE_Tripod: ACE_FieldManual_Base { class ACE_Tripod: ACE_FieldManual_Base {
logicalOrder = 25; logicalOrder = 25;
arguments[] += {QUOTE('ACE_Tripod' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_Tripod' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Tripod_ShortName); displayNameShort = CSTRING(Items_Tripod_ShortName);
description = CSTRING(Items_Tripod_Description); description = CSTRING(Items_Tripod_Description);
@ -217,7 +221,7 @@ class CfgHints {
}; };
class ACE_UAVBattery: ACE_FieldManual_Base { class ACE_UAVBattery: ACE_FieldManual_Base {
logicalOrder = 26; logicalOrder = 26;
arguments[] += {QUOTE('ACE_UAVBattery' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_UAVBattery' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_UAVBattery_ShortName); displayNameShort = CSTRING(Items_UAVBattery_ShortName);
description = CSTRING(Items_UAVBattery_Description); description = CSTRING(Items_UAVBattery_Description);
@ -232,7 +236,7 @@ class CfgHints {
}; };
class ACE_Wirecutter: ACE_FieldManual_Base { class ACE_Wirecutter: ACE_FieldManual_Base {
logicalOrder = 28; logicalOrder = 28;
arguments[] += {QUOTE('ACE_wirecutter' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, QUOTE('ACE_wirecutter' call FUNC(getItemName))};
displayName = "%14"; displayName = "%14";
displayNameShort = CSTRING(Items_Wirecutter_ShortName); displayNameShort = CSTRING(Items_Wirecutter_ShortName);
description = CSTRING(Items_Wirecutter_Description); description = CSTRING(Items_Wirecutter_Description);
@ -265,10 +269,7 @@ class CfgHints {
category = "ACE_FieldManual"; category = "ACE_FieldManual";
class ACE_Medical_Treatment_Base: ACE_FieldManual_Base { class ACE_Medical_Treatment_Base: ACE_FieldManual_Base {
arguments[] += { arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND};
// MEDICAL MENU KEYBIND - %14
QUOTE([ARR_2('ACE3 Common', QQEGVAR(medical_gui,openMedicalMenuKey))] call FUNC(getKeybindName))
};
tip = "<a href='https://ace3.acemod.org/wiki/feature/medical-system'>Medical Wiki</a>"; tip = "<a href='https://ace3.acemod.org/wiki/feature/medical-system'>Medical Wiki</a>";
}; };
@ -280,7 +281,7 @@ class CfgHints {
}; };
class ACE_Adenosine: ACE_Medical_Treatment_Base { class ACE_Adenosine: ACE_Medical_Treatment_Base {
logicalOrder = 2; logicalOrder = 2;
arguments[] += {QUOTE('ACE_adenosine' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_adenosine' call FUNC(getItemName))};
displayName = "%15"; displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_Adenosine_ShortName); displayNameShort = CSTRING(Medical_Treatment_Adenosine_ShortName);
description = CSTRING(Medical_Treatment_Adenosine_Description); description = CSTRING(Medical_Treatment_Adenosine_Description);
@ -299,35 +300,35 @@ class CfgHints {
}; };
class ACE_Epinephrine: ACE_Medical_Treatment_Base { class ACE_Epinephrine: ACE_Medical_Treatment_Base {
logicalOrder = 5; logicalOrder = 5;
arguments[] += {QUOTE('ACE_epinephrine' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_epinephrine' call FUNC(getItemName))};
displayName = "%15"; displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_Epinephrine_ShortName); displayNameShort = CSTRING(Medical_Treatment_Epinephrine_ShortName);
description = CSTRING(Medical_Treatment_Epinephrine_Description); description = CSTRING(Medical_Treatment_Epinephrine_Description);
}; };
class ACE_PAK: ACE_Medical_Treatment_Base { class ACE_PAK: ACE_Medical_Treatment_Base {
logicalOrder = 6; logicalOrder = 6;
arguments[] += {QUOTE('ACE_personalAidKit' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_personalAidKit' call FUNC(getItemName))};
displayName = "%15"; displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_PAK_ShortName); displayNameShort = CSTRING(Medical_Treatment_PAK_ShortName);
description = CSTRING(Medical_Treatment_PAK_Description); description = CSTRING(Medical_Treatment_PAK_Description);
}; };
class ACE_Splint: ACE_Medical_Treatment_Base { class ACE_Splint: ACE_Medical_Treatment_Base {
logicalOrder = 7; logicalOrder = 7;
arguments[] += {QUOTE('ACE_splint' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_splint' call FUNC(getItemName))};
displayName = "%15"; displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_Splint_ShortName); displayNameShort = CSTRING(Medical_Treatment_Splint_ShortName);
description = CSTRING(Medical_Treatment_Splint_Description); description = CSTRING(Medical_Treatment_Splint_Description);
}; };
class ACE_SurgicalKit: ACE_Medical_Treatment_Base { class ACE_SurgicalKit: ACE_Medical_Treatment_Base {
logicalOrder = 8; logicalOrder = 8;
arguments[] += {QUOTE('ACE_surgicalKit' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_surgicalKit' call FUNC(getItemName))};
displayName = "%15"; displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_SurgicalKit_ShortName); displayNameShort = CSTRING(Medical_Treatment_SurgicalKit_ShortName);
description = CSTRING(Medical_Treatment_SurgicalKit_Description); description = CSTRING(Medical_Treatment_SurgicalKit_Description);
}; };
class ACE_Tourniquet: ACE_Medical_Treatment_Base { class ACE_Tourniquet: ACE_Medical_Treatment_Base {
logicalOrder = 9; logicalOrder = 9;
arguments[] += {QUOTE('ACE_tourniquet' call FUNC(getItemName))}; arguments[] = {BASE_ARGUMENTS, MEDICAL_MENU_KEYBIND, QUOTE('ACE_tourniquet' call FUNC(getItemName))};
displayName = "%15"; displayName = "%15";
displayNameShort = CSTRING(Medical_Treatment_CAT_ShortName); displayNameShort = CSTRING(Medical_Treatment_CAT_ShortName);
description = CSTRING(Medical_Treatment_CAT_Description); description = CSTRING(Medical_Treatment_CAT_Description);

2
addons/fieldmanual/addon.toml
View File

@ -1,2 +0,0 @@
[preprocess]
enabled = false

4
addons/grenades/CfgMagazineWells.hpp
View File

@ -1,8 +1,8 @@
class CfgMagazineWells { class CfgMagazineWells {
class CBA_40mm_M203 { 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 { 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
optionals/tracers/CfgMagazineWells.hpp
View File

@ -123,14 +123,14 @@ class CfgMagazineWells {
}; };
class CBA_762x51_M14 { class CBA_762x51_M14 {
ADDON[] = { ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer_green", "ACE_20Rnd_762x51_Mag_tracer_green",
"ACE_20Rnd_762x51_Mag_Tracer_yellow" "ACE_20Rnd_762x51_Mag_tracer_yellow"
}; };
}; };
class CBA_762x51_G3 { class CBA_762x51_G3 {
ADDON[] = { ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer_green", "ACE_20Rnd_762x51_Mag_tracer_green",
"ACE_20Rnd_762x51_Mag_Tracer_yellow" "ACE_20Rnd_762x51_Mag_tracer_yellow"
}; };
}; };
class CBA_762x54R_LINKS { class CBA_762x54R_LINKS {

3
sqfc.json
View File

@ -11,7 +11,8 @@
"xeh_prep.sqf", "xeh_prep.sqf",
"\\dev\\", "\\dev\\",
"medical_ai\\statemachine.sqf", "medical_ai\\statemachine.sqf",
"common\\functions\\fnc_dummy.sqf" "common\\functions\\fnc_dummy.sqf",
"zeus\\functions\\fnc_zeusAttributes.sqf"
], ],
"outputDir": "P:/", "outputDir": "P:/",
"workerThreads": 12 "workerThreads": 12