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

More fixes

Browse Source 
Thanks guys
This commit is contained in:
IngoKauffmann 2015-08-15 19:23:02 +02:00
parent 26c54b352a
commit a8c263b6cc
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/rearm/ACE_Settings.hpp
View File

@ -1,9 +1,9 @@
class ACE_Settings {
class GVAR(level) {
displayName = LSTRING(RearmSettings_level_DisplayName);
description = LSTRING(RearmSettings_level_Description);
displayName = CSTRING(RearmSettings_level_DisplayName);
description = CSTRING(RearmSettings_level_Description);
value = 1;
typeName = "SCALAR";
values[] = {LSTRING(RearmSettings_vehicle), LSTRING(RearmSettings_magazine), LSTRING(RearmSettings_caliber)};
values[] = {CSTRING(RearmSettings_vehicle), CSTRING(RearmSettings_magazine), CSTRING(RearmSettings_caliber)};
};
};

2
addons/rearm/functions/fnc_canPickUpAmmo.sqf
View File

@ -18,4 +18,4 @@
params ["_unit", "_target"];
!(isNull ace_player || {!(ace_player isKindOf "CAManBase")} || {!local ace_player} || { (_target distance ace_player) > 7})
!(isNull _unit || {!(_unit isKindOf "CAManBase")} || {!local _unit} || { (_target distance _unit) > 7})

5
addons/rearm/functions/script_component.hpp
View File

@ -1,6 +1 @@
#include "\z\ace\addons\rearm\script_component.hpp"
#define CALIBERS [ 6, 7, 8, 13, 19, 20, 25, 30, 35, 40, 60, 70, 80, 82, 100, 105, 120, 122, 125, 155, 230, 250]
#define DURATION_PICKUP [ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 13, 10]
#define DURATION_REARM [ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 7, 7, 7, 7, 7, 8, 10, 10, 10, 10, 27, 20]
#define COUNT [500, 500, 400, 100, 50, 50, 40, 25, 34, 10, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1]

13
addons/rearm/script_component.hpp
View File

@ -1,4 +1,17 @@
#define COMPONENT rearm
#include "\z\ace\addons\main\script_mod.hpp"
#ifdef DEBUG_ENABLED_REARM
#define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_REARM
#define DEBUG_SETTINGS DEBUG_SETTINGS_REARM
#endif
#include "\z\ace\addons\main\script_macros.hpp"
#define CALIBERS [ 6, 7, 8, 13, 19, 20, 25, 30, 35, 40, 60, 70, 80, 82, 100, 105, 120, 122, 125, 155, 230, 250]
#define DURATION_PICKUP [ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, 3, 4, 5, 5, 5, 5, 13, 10]
#define DURATION_REARM [ 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 7, 7, 7, 7, 7, 8, 10, 10, 10, 10, 27, 20]
#define COUNT [500, 500, 400, 100, 50, 50, 40, 25, 34, 10, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1]