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

Common - Use hashmap variable for canDig surfaces (#9147)

Browse Source 
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf
This commit is contained in:
PabstMirror 2023-02-09 13:16:42 -06:00 committed by GitHub
parent f67957cdde
commit cac223c6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/common/XEH_preInit.sqf
View File

@ -59,6 +59,16 @@ GVAR(hexArray) = [
"F0","F1","F2","F3","F4","F5","F6","F7","F8","F9","FA","FB","FC","FD","FE","FF" "F0","F1","F2","F3","F4","F5","F6","F7","F8","F9","FA","FB","FC","FD","FE","FF"
]; ];
GVAR(canDigSurfaces) = createHashMapFromArray [
["int_concrete",false],["int_pavement_exp",false],["int_solidwood_exp",false],["tiling",false],["roof_tiles",false],["stony",false],
["wavymetal",false],["int_wood",false],["int_tiles",false],["softwood_exp",false],["int_concrete_exp",false],["tiles_int",false],
["metalplate_exp",false],["int_metalplate_exp",false],["steel_exp",false],["metal",false],["int_lino_exp",false],["metal_int",false],
["wavymetal_exp",false],["int_metal",false],["asphalt_exp",false],["pavement_exp",false],["gridmetal_exp",false],
["rooftiles_exp",false],["rock",false],["int_mat_exp",false],["wood_int",false],["concrete_int",false],["tarmac",false],["wood",false],
["roof_tin",false],["lino_exp",false],["concrete",false],["int_softwood_exp",false], ["concrete_exp",false],["stones_exp",false],
["forest_exp",true],["snow",true],["grasstall_exp",true],["grass",true]
];
isHC = !hasInterface && !isDedicated; // deprecated because no tag isHC = !hasInterface && !isDedicated; // deprecated because no tag
missionNamespace setVariable ["ACE_isHC", ACE_isHC]; missionNamespace setVariable ["ACE_isHC", ACE_isHC];
uiNamespace setVariable ["ACE_isHC", ACE_isHC]; uiNamespace setVariable ["ACE_isHC", ACE_isHC];

20
addons/common/functions/fnc_canDig.sqf
View File

@ -4,34 +4,36 @@
* Checks if the player can dig on the surface below (enough dust). * Checks if the player can dig on the surface below (enough dust).
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit or Position (2d/3d) <OBJECT><ARRAY>
* *
* Return Value: * Return Value:
* Can Dig <BOOL> * Can Dig <BOOL>
* *
* Example: * Example:
* [ACE_player] call ace_common_fnc_canDig * [ACE_player] call ace_common_fnc_canDig
* [[1000,2000]] call ace_common_fnc_canDig
* *
* Public: No * Public: No
*/ */
params ["_unit"]; params ["_input"];
private _posASL = getPosASL _unit; private _posASL = _input;
if ((getPosATL _unit) select 2 > 0.05 || // Walking on objects, such as buildings, pavements, etc. if ((_input isEqualType objNull) && {
_posASL = getPosASL _input;
(getPosATL _unit) select 2 > 0.05 || // Walking on objects, such as buildings, pavements, etc.
{surfaceIsWater _posASL} // posATL in low water (not as low to allow awalking) is negative {surfaceIsWater _posASL} // posATL in low water (not as low to allow awalking) is negative
) exitWith {false}; }) exitWith {false};
private _surfaceClass = (surfaceType _posASL) select [1]; private _surfaceClass = (surfaceType _posASL) select [1];
private _config = configFile >> "CfgSurfaces" >> _surfaceClass; private _config = configFile >> "CfgSurfaces" >> _surfaceClass;
private _surfaceType = getText (_config >> "soundEnviron");
private _surfaceDust = getNumber (_config >> "dust");
TRACE_2("Surface",_surfaceType,_surfaceDust); TRACE_3("",_surfaceClass,getText (_config >> "soundEnviron"),getNumber (_config >> "dust"));
if (isNumber (_config >> "ACE_canDig")) then { if (isNumber (_config >> "ACE_canDig")) then {
(getNumber (_config >> "ACE_canDig")) == 1 // return (getNumber (_config >> "ACE_canDig")) == 1 // return
} else { } else {
!(_surfaceType in DIG_SURFACE_BLACKLIST) && {(_surfaceDust >= 0.1) || {_surfaceType in DIG_SURFACE_WHITELIST}} // return private _surfaceType = getText (_config >> "soundEnviron");
GVAR(canDigSurfaces) getOrDefault [_surfaceType, getNumber (_config >> "dust") >= 0.1, true] // return
}; };

15
addons/common/script_component.hpp
View File

@ -15,18 +15,3 @@
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#define DIG_SURFACE_BLACKLIST [ \
"concrete", "concrete_exp", "concrete_int", "int_concrete", "int_concrete_exp", \
"pavement_exp", "int_pavement_exp", \
"tiling", "tiles_int", "int_tiles", \
"roof_tin", "roof_tiles", "rooftiles_exp", \
"tarmac", "asphalt_exp", \
"stones_exp", "rock", "stony", \
"metal", "gridmetal_exp", "metalplate_exp", "int_metalplate_exp", "metal_int", "wavymetal", "wavymetal_exp", "int_metal", "steel_exp", \
"lino_exp", "int_lino_exp", "int_mat_exp", \
"wood", "wood_int", "int_wood", "softwood_exp", "int_softwood_exp", "int_solidwood_exp" \
]
#define DIG_SURFACE_WHITELIST ["grass", "grasstall_exp", "forest_exp", "snow"]