Skip to content

Commit

Permalink
Misc - Fix FAKs not showing up inside vehicles (#580)
Browse files Browse the repository at this point in the history 
**When merged this pull request will:**
- Title

### IMPORTANT

- [Development Guidelines](https://ace3.acemod.org/wiki/development/)
are read, understood and applied.
- Title of this PR uses our standard template `Component -
Add|Fix|Improve|Change|Make|Remove {changes}`.
  • Loading branch information
@MiszczuZPolski
MiszczuZPolski authored Aug 8, 2024
1 parent 7ffcc56 commit dfa3229
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions addons/misc/CfgVehicles.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ class CfgVehicles {
class KAT_Equipment {
displayName = CSTRING(Kat_Equipment);
icon = QPATHTOF(ui\KAM_Iteraction_Logo.paa);
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};

class Armband {
displayName = CSTRING(Armband_Sling);
Expand Down Expand Up @@ -915,6 +916,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_DisplayItems);
condition = QUOTE([ARR_2(_player,'kat_IFAK')] call ACEFUNC(common,hasItem));
statement = QUOTE([ARR_2(_player,0)] call FUNC(FAK_displayContent));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\IFAK_DisplayItems.paa);
};
Expand All @@ -923,6 +925,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_Slot_1);
condition = QUOTE([ARR_4(_player,'kat_IFAK',0,1)] call FUNC(FAK_checkSlot));
statement = QUOTE([ARR_4(_player,'kat_IFAK',0,1)] call FUNC(FAK_unpack));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\IFAK.paa);
};
Expand Down Expand Up @@ -958,6 +961,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_DisplayItems);
condition = QUOTE([ARR_2(_player,'kat_IFAK_Magazine')] call ACEFUNC(common,hasMagazine));
statement = QUOTE([ARR_2(_player,0)] call FUNC(FAK_displayContent));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\IFAK_DisplayItems.paa);
};
Expand All @@ -966,6 +970,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_Slot_1);
condition = QUOTE([ARR_4(_player,'kat_IFAK_Magazine',0,1)] call FUNC(FAK_checkSlot));
statement = QUOTE([ARR_4(_player,'kat_IFAK_Magazine',0,1)] call FUNC(FAK_unpack));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\IFAK.paa);
};
Expand Down Expand Up @@ -1028,6 +1033,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_DisplayItems);
condition = QUOTE([ARR_2(_player,'kat_AFAK')] call ACEFUNC(common,hasItem));
statement = QUOTE([ARR_2(_player,1)] call FUNC(FAK_displayContent));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\AFAK_DisplayItems.paa);
};
Expand All @@ -1036,6 +1042,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_Slot_1);
condition = QUOTE([ARR_4(_player,'kat_AFAK',1,1)] call FUNC(FAK_checkSlot));
statement = QUOTE([ARR_4(_player,'kat_AFAK',1,1)] call FUNC(FAK_unpack));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\AFAK.paa);
};
Expand Down Expand Up @@ -1083,6 +1090,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_DisplayItems);
condition = QUOTE([ARR_2(_player,'kat_AFAK_Magazine')] call ACEFUNC(common,hasMagazine));
statement = QUOTE([ARR_2(_player,1)] call FUNC(FAK_displayContent));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\AFAK_DisplayItems.paa);
};
Expand All @@ -1091,6 +1099,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_Slot_1);
condition = QUOTE([ARR_4(_player,'kat_AFAK_Magazine',1,1)] call FUNC(FAK_checkSlot));
statement = QUOTE([ARR_4(_player,'kat_AFAK_Magazine',1,1)] call FUNC(FAK_unpack));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\AFAK.paa);
};
Expand Down Expand Up @@ -1177,6 +1186,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_DisplayItems);
condition = QUOTE([ARR_2(_player,'kat_MFAK')] call ACEFUNC(common,hasItem));
statement = QUOTE([ARR_2(_player,2)] call FUNC(FAK_displayContent));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\MFAK_DisplayItems.paa);
};
Expand All @@ -1185,6 +1195,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_Slot_1);
condition = QUOTE([ARR_4(_player,'kat_MFAK',2,1)] call FUNC(FAK_checkSlot));
statement = QUOTE([ARR_4(_player,'kat_MFAK',2,1)] call FUNC(FAK_unpack));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\MFAK.paa);
};
Expand Down Expand Up @@ -1244,6 +1255,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_DisplayItems);
condition = QUOTE([ARR_2(_player,'kat_MFAK_Magazine')] call ACEFUNC(common,hasMagazine));
statement = QUOTE([ARR_2(_player,2)] call FUNC(FAK_displayContent));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\MFAK_DisplayItems.paa);
};
Expand All @@ -1252,6 +1264,7 @@ class CfgVehicles {
displayName = CSTRING(FAK_Slot_1);
condition = QUOTE([ARR_4(_player,'kat_MFAK_Magazine',2,1)] call FUNC(FAK_checkSlot));
statement = QUOTE([ARR_4(_player,'kat_MFAK_Magazine',2,1)] call FUNC(FAK_unpack));
exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"};
showDisabled = 0;
icon = QPATHTOF(ui\MFAK.paa);
};
Expand Down

0 comments on commit dfa3229

Please sign in to comment.