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

overheating: ironing out bugs

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-13 21:07:32 -03:00
parent 67ca93a5f8
commit a97b767283
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/overheating/CfgEventHandlers.hpp
View File

@ -1,6 +1,6 @@
class Extended_PreInit_EventHandlers { class Extended_PreInit_EventHandlers {
class ADDON { class ADDON {
init = QUOTE( call COMPILE_FILE(XEH_preInit.sqf) ); init = QUOTE( call COMPILE_FILE(XEH_preInit) );
}; };
}; };
@ -15,7 +15,7 @@ class Extended_FiredBIS_EventHandlers {
class Extended_Take_EventHandlers { class Extended_Take_EventHandlers {
class CAManBase { class CAManBase {
class GVAR(UnjamReload) { class GVAR(UnjamReload) {
clientTake = QUOTE( if (_this select 0 == ACE_player && {(_this select 1) in [ARR_3(uniformContainer (_this select 0), vestContainer (_this select 0), backpackContainer (_this select 0))]} && {_this select 2 == currentMagazine (_this select 0)}) then {_vehicle = vehicle (_this select 0); [ARR_4(_vehicle, currentWeapon _vehicle, true)] call FUNC(clearJam)}; ); clientTake = QUOTE( if (_this select 0 == ACE_player && {(_this select 1) in [ARR_3(uniformContainer (_this select 0), vestContainer (_this select 0), backpackContainer (_this select 0))]} && {_this select 2 == currentMagazine (_this select 0)}) then {_vehicle = vehicle (_this select 0); [ARR_3(_vehicle, currentWeapon _vehicle, true)] call FUNC(clearJam)}; );
}; };
}; };
}; };

2
addons/overheating/CfgSounds.hpp
View File

@ -1,6 +1,6 @@
class CfgSounds { class CfgSounds {
class ACE_BarrelSwap { class ACE_BarrelSwap {
sound[] = {QUOTE(PATHOF(sounds\barrelswap.ogg)),5,1,200}; sound[] = {QUOTE(PATHTOF(sounds\barrelswap.ogg)),5,1,200};
titles[] = {}; titles[] = {};
}; };
}; };

8
addons/overheating/CfgVehicles.hpp
View File

@ -15,17 +15,17 @@ class CfgVehicles {
statement = QUOTE( [_player, currentWeapon _player] call FUNC(swapBarrel); ); statement = QUOTE( [_player, currentWeapon _player] call FUNC(swapBarrel); );
showDisabled = 0; showDisabled = 0;
priority = 3; priority = 3;
icon = QUOTE(PATHOF(UI\spare_barrel_ca.paa)); icon = QUOTE(PATHTOF(UI\spare_barrel_ca.paa));
hotkey = "B"; hotkey = "B";
}; };
}; };
class ACE_CheckTemperature { class ACE_CheckTemperature {
displayName = "$STR_ACE_Overheating_CheckTemperatureShort"; displayName = "$STR_ACE_Overheating_CheckTemperatureShort";
condition = QUOTE( currentWeapon _player in [primaryWeapon _player, secondaryWeapon _player, handgunWeapon _player] ); condition = QUOTE( currentWeapon _player in [ARR_3(primaryWeapon _player, secondaryWeapon _player, handgunWeapon _player)] );
statement = QUOTE( [_player, currentWeapon _player] call FUNC(CheckTemperature); ); statement = QUOTE( [ARR_2(_player, currentWeapon _player)] call FUNC(CheckTemperature); );
showDisabled = 0; showDisabled = 0;
priority = 3.1; priority = 3.1;
icon = QUOTE(PATHOF(UI\temp_ca.paa)); icon = QUOTE(PATHTOF(UI\temp_ca.paa));
hotkey = "P"; hotkey = "P";
}; };
}; };

2
addons/overheating/CfgWeapons.hpp
View File

@ -6,7 +6,7 @@ class CfgWeapons {
displayname = "$STR_ACE_Overheating_SpareBarrelName"; displayname = "$STR_ACE_Overheating_SpareBarrelName";
descriptionshort = "$STR_ACE_Overheating_SpareBarrelDescription"; descriptionshort = "$STR_ACE_Overheating_SpareBarrelDescription";
//model = ""; //model = "";
picture = QUOTE(PATHOF(UI\spare_barrel_ca.paa)); picture = QUOTE(PATHTOF(UI\spare_barrel_ca.paa));
scope = 2; scope = 2;
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 50; mass = 50;

8
addons/overheating/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {"ACE_SpareBarrel"}; weapons[] = {"ACE_SpareBarrel"};
requiredVersion = 0.60; requiredVersion = 0.60;
requiredAddons[] = {ACE_Core, ACE_Interaction}; requiredAddons[] = {ace_common, ace_interaction};
version = "0.95"; version = "0.95";
versionStr = "0.95"; versionStr = "0.95";
versionAr[] = {0,95,0}; versionAr[] = {0,95,0};
@ -16,11 +16,11 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
class ACE_Core_Default_Keys { class ACE_Default_Keys {
class clearJam { class clearJam {
displayName = "$STR_ACE_Overheating_UnjamWeapon"; displayName = "$STR_ACE_Overheating_UnjamWeapon";
condition = QUOTE( [_player] call EFUNC(common,canUseWeapon) && {currentWeapon _player in (_player getVariable [QUOTE(QGVAR(jammedWeapons)), []])} ); condition = QUOTE( [_player] call EFUNC(common,canUseWeapon) && {currentWeapon _player in (_player getVariable [ARR_2(QUOTE(QGVAR(jammedWeapons)), [])])} );
statement = QUOTE( [_player, currentMuzzle _player, false] call FUNC(clearJam); ); statement = QUOTE( [ARR_3(_player, currentMuzzle _player, false)] call FUNC(clearJam); );
key = 19; key = 19;
shift = 1; shift = 1;
control = 0; control = 0;

2
addons/overheating/functions/fnc_checkTemperature.sqf
View File

@ -6,7 +6,7 @@ _this spawn {
_weapon = _this select 1; _weapon = _this select 1;
// Calculate cool down of weapon since last shot // Calculate cool down of weapon since last shot
_string = format [GVAR(%1), _weapon]; _string = format [QGVAR(%1), _weapon];
_overheat = _player getVariable [_string, [0, 0]]; _overheat = _player getVariable [_string, [0, 0]];
_temperature = _overheat select 0; _temperature = _overheat select 0;
_time = _overheat select 1; _time = _overheat select 1;