core -> config

This commit is contained in:
bux578 2015-01-13 16:32:15 +01:00
parent 992b3f721b
commit f2ef2fa886
5 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
class CfgVehicles { class CfgVehicles {
class Module_F; class Module_F;
class ACE_ModuleNameTags : Module_F { class ACE_ModuleNameTags : Module_F {
author = "$STR_ACE_Core_ACETeam"; author = "$STR_ACE_Common_ACETeam";
category = "ACE"; category = "ACE";
displayName = "Name Tags"; displayName = "Name Tags";
function = FUNC(moduleNameTags); function = FUNC(moduleNameTags);

View File

@ -17,7 +17,7 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
class ACE_Core_Default_Keys { class ACE_Common_Default_Keys {
class showNames { class showNames {
displayName = "$STR_ACE_NameTags_ShowNames"; displayName = "$STR_ACE_NameTags_ShowNames";
condition = "true"; condition = "true";
@ -30,7 +30,7 @@ class ACE_Core_Default_Keys {
}; };
}; };
class ACE_Core_Options { class ACE_Common_Options {
class showPlayerNames { class showPlayerNames {
displayName = "$STR_ACE_NameTags_ShowPlayerNames"; displayName = "$STR_ACE_NameTags_ShowPlayerNames";
default = 1; default = 1;

View File

@ -30,8 +30,8 @@ _data = [_type] call FUNC(getVehicleData);
_isAir = _data select 0; _isAir = _data select 0;
_data = _data select 1; _data = _data select 1;
_turretUnits = [_data, { _vehicle turretUnit (_x select 0) } ] call EFUNC(Core,map); _turretUnits = [_data, { _vehicle turretUnit (_x select 0) } ] call EFUNC(common,map);
_turretRoles = [_data, { _x select 1 } ] call EFUNC(Core,map); _turretRoles = [_data, { _x select 1 } ] call EFUNC(common,map);
_roleType = CARGO; _roleType = CARGO;
@ -78,7 +78,7 @@ _roleImages = ROLE_IMAGES;
{ {
_unit = _x select 0; _unit = _x select 0;
_roleType = _x select 1; _roleType = _x select 1;
_text = _text + format["<t size='1.5' shadow='true'>%1</t> <t size='1.3'><img image='%2'></t><br/>", [_unit] call EFUNC(Core,getName), _roleImages select _roleType]; _text = _text + format["<t size='1.5' shadow='true'>%1</t> <t size='1.3'><img image='%2'></t><br/>", [_unit] call EFUNC(common,getName), _roleImages select _roleType];
} forEach _toShow; } forEach _toShow;

View File

@ -44,7 +44,7 @@ _color = if !(group _target == group _player) then {
[[1, 1, 1, _alpha], [1, 0, 0, _alpha], [0, 1, 0, _alpha], [0, 0, 1, _alpha], [1, 1, 0, _alpha]] select (["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find (if (_target == _player) then {0} else {assignedTeam _target})) max 0 [[1, 1, 1, _alpha], [1, 0, 0, _alpha], [0, 1, 0, _alpha], [0, 0, 1, _alpha], [1, 1, 0, _alpha]] select (["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find (if (_target == _player) then {0} else {assignedTeam _target})) max 0
}; };
_name = [_target, true] call EFUNC(Core,getName); _name = [_target, true] call EFUNC(common,getName);
_rank = TEXTURES_RANKS select ((["PRIVATE", "CORPORAL", "SERGEANT", "LIEUTENANT", "CAPTAIN", "MAJOR", "COLONEL"] find rank _target) + 1); _rank = TEXTURES_RANKS select ((["PRIVATE", "CORPORAL", "SERGEANT", "LIEUTENANT", "CAPTAIN", "MAJOR", "COLONEL"] find rank _target) + 1);
_size = [0, 1] select (profileNamespace getVariable ["ACE_showPlayerRanks", true]); _size = [0, 1] select (profileNamespace getVariable ["ACE_showPlayerRanks", true]);

View File

@ -22,8 +22,8 @@ if !(_activated) exitWith {};
GVAR(Module) = true; GVAR(Module) = true;
[_logic, QGVAR(PlayerNamesViewDistance), "PlayerNamesViewDistance" ] call EFUNC(Core,readNumericParameterFromModule); [_logic, QGVAR(PlayerNamesViewDistance), "PlayerNamesViewDistance" ] call EFUNC(common,readNumericParameterFromModule);
[_logic, QGVAR(ShowNamesForAI), "ShowNamesForAI" ] call EFUNC(Core,readBooleanParameterFromModule); [_logic, QGVAR(ShowNamesForAI), "ShowNamesForAI" ] call EFUNC(common,readBooleanParameterFromModule);
[_logic, QGVAR(CrewInfoVisibility), "Visibility" ] call EFUNC(Core,readNumericParameterFromModule); [_logic, QGVAR(CrewInfoVisibility), "Visibility" ] call EFUNC(common,readNumericParameterFromModule);
diag_log text "[ACE]: NameTags Module Initialized."; diag_log text "[ACE]: NameTags Module Initialized.";