Skip to content

Commit

Permalink
Merge pull request #91 from AndreasBrostrom/disabled-cyanide
Browse files Browse the repository at this point in the history
Disabled cyanide
  • Loading branch information
AndreasBrostrom authored Sep 30, 2022
2 parents 7faf2b8 + 5b235d2 commit 0a99bac
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 deletions optionals/ace_compat/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Extended_Respawn_EventHandlers {
class CAManBase {
class ADDON {
respawn = QUOTE(_this call COMPILE_FILE(XEH_respawn));
};
};
//class CAManBase {
// class ADDON {
// respawn = QUOTE(_this call COMPILE_FILE(XEH_respawn));
// };
//};
};
52 changes: 26 additions & 26 deletions optionals/ace_compat/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
class CfgVehicles {
class Man;
class CAManBase: Man {
class ACE_SelfActions {
class BlackOrder_Ace_Actions {
condition = QUOTE(faction player in [ARR_6('OPF_BlackOrder_F','OPF_BlackOrder_SCI_F','OPF_BlackOrder_MP_F','IND_BlackOrder_F','IND_BlackOrder_SCI_F','IND_BlackOrder_MP_F')]);
displayName = ECSTRING(common,BlackOrder_Display);
exceptions[] = {"isNotInside","notOnMap","isNotSitting"};
icon = QPATHTOF(UI\icon_action_co.paa);
priority = 0;
showDisabled = 1;
statement = "";
class BlackOrder_Cyanide {
displayName = CSTRING(Action_Cyanide_Display);
condition = QUOTE(!_player getVariable [ARR_2(QQGVAR(cyanide_flag), false)]);
statement = "";
icon = QPATHTOF(UI\icon_cyanide_co.paa);
class BlackOrder_Cyanide_Take {
displayName = CSTRING(Action_Cyanide_Take_Display);
condition = QUOTE(!_player getVariable [ARR_2(QQGVAR(cyanide_flag), false)]);
statement = QUOTE(_player spawn {sleep (random [ARR_3(5, 10, 15)]; [_this] call ace_medical_fnc_setCardiacArrest;}); (_player setVariable [ARR_2(QQGVAR(cyanide_flag), true)])));
icon = "";
};
};
};
};
};
// class Man;
// class CAManBase: Man {
// class ACE_SelfActions {
// class BlackOrder_Ace_Actions {
// condition = QUOTE(faction player in [ARR_6('OPF_BlackOrder_F','OPF_BlackOrder_SCI_F','OPF_BlackOrder_MP_F','IND_BlackOrder_F','IND_BlackOrder_SCI_F','IND_BlackOrder_MP_F')]);
// displayName = ECSTRING(common,BlackOrder_Display);
// exceptions[] = {"isNotInside","notOnMap","isNotSitting"};
// icon = QPATHTOF(UI\icon_action_co.paa);
// priority = 0;
// showDisabled = 1;
// statement = "";
// class BlackOrder_Cyanide {
// displayName = CSTRING(Action_Cyanide_Display);
// condition = QUOTE(!_player getVariable [ARR_2(QQGVAR(cyanide_flag), false)]);
// statement = "";
// icon = QPATHTOF(UI\icon_cyanide_co.paa);
// class BlackOrder_Cyanide_Take {
// displayName = CSTRING(Action_Cyanide_Take_Display);
// condition = QUOTE(!_player getVariable [ARR_2(QQGVAR(cyanide_flag), false)]);
// statement = QUOTE(_player spawn {sleep (random [ARR_3(5, 10, 15)]; [_this] call ace_medical_fnc_setCardiacArrest;}); (_player setVariable [ARR_2(QQGVAR(cyanide_flag), true)])));
// icon = "";
// };
// };
// };
// };
// };

class Weapon_Base_F;
class Weapon_srifle_DMR_03_blackorder_F : Weapon_Base_F {
Expand Down

0 comments on commit 0a99bac

Please sign in to comment.