mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
f83c605958
* Add jamming coef to change or disable jamming. * change max to 5 * add setting for overheating effects distance, unjaming on barrel swap, increase rate of fire with heat - add setting for overheating effects distance - add unjaming on barrel swap, with setting - add increase rate of fire with heat, with setting - fix some formatting * little tweaks * add overheating cookoff feature - add overheating cookoff feature - add documentation - bugfixes/improvements * Update ace3-config-entries.md * Update overheating-framework.md * Update addons/overheating/XEH_postInit.sqf Co-authored-by: jonpas <jonpas33@gmail.com> * Update addons/overheating/XEH_postInit.sqf Co-authored-by: jonpas <jonpas33@gmail.com> * Update addons/overheating/functions/fnc_firedEH.sqf Co-authored-by: jonpas <jonpas33@gmail.com> * Update addons/overheating/stringtable.xml Co-authored-by: jonpas <jonpas33@gmail.com> * Update docs/wiki/feature/overheating.md Co-authored-by: jonpas <jonpas33@gmail.com> * Update addons/overheating/stringtable.xml Co-authored-by: jonpas <jonpas33@gmail.com> * Update addons/overheating/functions/fnc_jamWeapon.sqf Co-authored-by: jonpas <jonpas33@gmail.com> * Update addons/overheating/functions/fnc_jamWeapon.sqf Co-authored-by: jonpas <jonpas33@gmail.com> * remove extra underwater cooling, make cookoffCoef enable cookoff - add coef setting for heat generation per shot - merge cookoff setting into cookoff coef setting - remove check for water that increased cooling - change max rof increase from heat to 10% - change ammo heating to a less linear formula - change cookoffCoef to effect inginition tempurature instead of heat amount - delay cookoff shot until any firing animation is done - update strings based on feedback * Update stringtable.xml * add cookoff notification * improvements from play testing - move ammo heat loop into seperate function with a tighter loop - factor rain into cooling calculation - handle cooling while swimming - merge cookoff take event handler into fnc_handleTakeEH - fix case where cookoff could potentially come from underbarrel weapon muzzle - only add TakeEH if required by enabled settings - improve cookoff muzzle/mode handling * fix missing semi that I swear I already fixed before pushing * Update overheating-framework.md * Update fnc_updateAmmoTemperature.sqf * include wind speed in cooling calculation * cool with X - add ace interactions to allow cooling with water sources when Ace X is loaded - add documentation for cooling - move getting barrel mass to a function * documentation formatting * Add config array for weapon jam types, as not all weapon can get all types IRL. * remove variable that's not required * add some compat entries for RHS * fix merge conflict * fix a happy little accident * move to CBA settings, minor styling. * Update error message in fnc_jamWeapon.sqf Co-authored-by: jonpas <jonpas33@gmail.com> * Apply suggestions from code review Co-authored-by: TyroneMF <TyroneMF@hotmail.com> Co-authored-by: jonpas <jonpas33@gmail.com> Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
146 lines
6.1 KiB
C++
146 lines
6.1 KiB
C++
class CfgVehicles {
|
|
class Man;
|
|
|
|
class CAManBase: Man {
|
|
class ACE_SelfActions {
|
|
class ACE_Equipment {
|
|
class GVAR(UnJam) {
|
|
displayName = CSTRING(UnjamWeapon);
|
|
condition = QUOTE( GVAR(enabled) && {[_player] call FUNC(canUnjam)} );
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = QUOTE( [ARR_2(_player, currentMuzzle _player)] call FUNC(clearJam); );
|
|
showDisabled = 0;
|
|
icon = QPATHTOEF(common,UI\repack_ca.paa);
|
|
};
|
|
class GVAR(SwapBarrel) {
|
|
displayName = CSTRING(SwapBarrel);
|
|
condition = QUOTE( [ARR_2(_player, currentWeapon _player)] call FUNC(canSwapBarrel) );
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = QUOTE( [ARR_3(_player, _player, currentWeapon _player)] call FUNC(swapBarrel); );
|
|
showDisabled = 0;
|
|
icon = QPATHTOF(UI\spare_barrel_ca.paa);
|
|
};
|
|
class GVAR(CheckTemperature) {
|
|
displayName = CSTRING(CheckTemperatureShort);
|
|
condition = QUOTE( GVAR(enabled) && {switch (currentWeapon _player) do {case (''): {false}; case (primaryWeapon _player); case (handgunWeapon _player): {true}; default {false}}} );
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = QUOTE( [ARR_3(_player, _player, currentWeapon _player)] call FUNC(checkTemperature); );
|
|
showDisabled = 0;
|
|
icon = QPATHTOF(UI\temp_ca.paa);
|
|
};
|
|
class GVAR(CheckTemperatureSpareBarrels) {
|
|
displayName = CSTRING(CheckTemperatureSpareBarrelsShort);
|
|
condition = QUOTE((_player) call FUNC(canCheckSpareBarrelsTemperatures) );
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = QUOTE( [_player] call FUNC(checkSpareBarrelsTemperatures); );
|
|
showDisabled = 0;
|
|
icon = QUOTE(PATHTOF(UI\temp_ca.paa));
|
|
};
|
|
class GVAR(CoolWeaponWithItem) {
|
|
displayName = CSTRING(CoolWeaponWithItem);
|
|
condition = QUOTE(GVAR(enabled) && {isClass(configfile >> 'CfgPatches' >> 'acex_field_rations')});
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = "true";
|
|
showDisabled = 0;
|
|
insertChildren = QUOTE(_player call FUNC(getConsumableChildren));
|
|
icon = QPATHTOF(UI\pour_water_ca.paa);
|
|
};
|
|
};
|
|
};
|
|
|
|
class ACE_Actions {
|
|
class ACE_Weapon {
|
|
class GVAR(SwapBarrel) {
|
|
displayName = CSTRING(SwapBarrel);
|
|
condition = QUOTE( [ARR_2(_player, currentWeapon _target)] call FUNC(canSwapBarrel) );
|
|
statement = QUOTE([ARR_3(_player, _target, currentWeapon _target)] call FUNC(swapBarrelAssistant););
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
icon = QUOTE(PATHTOF(UI\spare_barrel_ca.paa));
|
|
};
|
|
class GVAR(CheckTemperature) {
|
|
displayName = CSTRING(CheckTemperatureShort);
|
|
condition = QUOTE( GVAR(enabled) && {switch (currentWeapon _target) do {case ('ACE_FakePrimaryWeapon'); case (''): {false}; case (primaryWeapon _target); case (handgunWeapon _target): {true}; default {false}}} );
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = QUOTE( [ARR_3(_player, _target, currentWeapon _target)] call FUNC(checkTemperature); );
|
|
icon = QUOTE(PATHTOF(UI\temp_ca.paa));
|
|
};
|
|
class GVAR(CoolWeaponWithItem) {
|
|
displayName = CSTRING(CoolWeaponWithItem);
|
|
condition = QUOTE(GVAR(enabled) && {isClass(configfile >> 'CfgPatches' >> 'acex_field_rations')});
|
|
exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"};
|
|
statement = "true";
|
|
showDisabled = 0;
|
|
insertChildren = QUOTE(_player call FUNC(getConsumableChildren));
|
|
icon = QPATHTOF(UI\pour_water_ca.paa);
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
class ReammoBox_F;
|
|
class NATO_Box_Base;
|
|
class EAST_Box_Base;
|
|
class IND_Box_Base;
|
|
class FIA_Box_Base_F;
|
|
|
|
class Box_NATO_Support_F: NATO_Box_Base {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class B_supplyCrate_F: ReammoBox_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class Box_East_Support_F: EAST_Box_Base {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class O_supplyCrate_F: B_supplyCrate_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class Box_IND_Support_F: IND_Box_Base {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class Box_FIA_Support_F: FIA_Box_Base_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class I_supplyCrate_F: B_supplyCrate_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class IG_supplyCrate_F: ReammoBox_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class C_supplyCrate_F: ReammoBox_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,2);
|
|
};
|
|
};
|
|
|
|
class ACE_Box_Misc: Box_NATO_Support_F {
|
|
class TransportMagazines {
|
|
MACRO_ADDMAGAZINE(ACE_SpareBarrel,6);
|
|
};
|
|
};
|
|
};
|