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

Change ace_map settings to use CBA init directly (#5984)

Browse Source 
* Make default channel setting a list

* Convert more map settings to CBA

* Give BFT settings own category

* Remove '?' from end of setting display names

* Fix mistake of ACE_Settings removal (movedToSQF = 1)

* Move settings to initSettings.sqf
This commit is contained in:
mharis001 2018-01-28 16:50:28 -05:00 committed by PabstMirror
parent 6ce8b8473a
commit b30e188d1a
5 changed files with 189 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -102,6 +102,7 @@ Luigi "Luigium" Myrini <luigium@outlook.fr>
Macusercom <macusercom@gmail.com>
MarcBook
meat <p.humberdroz@gmail.com>
mharis001 <mhariszakar@gmail.com>
Michail Nikolaev
MikeMatrix <m.braun92@gmail.com>
nic547 <nic547@outlook.com>

62
addons/map/ACE_Settings.hpp
View File

@ -1,74 +1,32 @@
class ACE_Settings {
class GVAR(BFT_Interval) {
category = CSTRING(Module_DisplayName);
value = 1.0;
typeName = "SCALAR";
displayName = CSTRING(BFT_Interval_DisplayName);
description = CSTRING(BFT_Interval_Description);
sliderSettings[] = {0, 30, 1, 1};
movedToSQF = 1;
};
class GVAR(BFT_Enabled) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(BFT_Enabled_DisplayName);
description = CSTRING(BFT_Enabled_Description);
movedToSQF = 1;
};
class GVAR(BFT_HideAiGroups) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(BFT_HideAiGroups_DisplayName);
description = CSTRING(BFT_HideAiGroups_Description);
movedToSQF = 1;
};
class GVAR(BFT_ShowPlayerNames) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(BFT_ShowPlayerNames_DisplayName);
description = CSTRING(BFT_ShowPlayerNames_Description);
movedToSQF = 1;
};
class GVAR(mapIllumination) {
category = CSTRING(Module_DisplayName);
value = 1;
typeName = "BOOL";
displayName = CSTRING(MapIllumination_DisplayName);
description = CSTRING(MapIllumination_Description);
movedToSQF = 1;
};
class GVAR(mapGlow) {
category = CSTRING(Module_DisplayName);
value = 1;
typeName = "BOOL";
displayName = CSTRING(MapGlow_DisplayName);
description = CSTRING(MapGlow_Description);
movedToSQF = 1;
};
class GVAR(mapShake) {
category = CSTRING(Module_DisplayName);
value = 1;
typeName = "BOOL";
displayName = CSTRING(MapShake_DisplayName);
description = CSTRING(MapShake_Description);
movedToSQF = 1;
};
class GVAR(mapLimitZoom) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(MapLimitZoom_DisplayName);
description = CSTRING(MapLimitZoom_Description);
movedToSQF = 1;
};
class GVAR(mapShowCursorCoordinates) {
category = CSTRING(Module_DisplayName);
value = 0;
typeName = "BOOL";
displayName = CSTRING(MapShowCursorCoordinates_DisplayName);
description = CSTRING(MapShowCursorCoordinates_Description);
movedToSQF = 1;
};
class GVAR(defaultChannel) {
category = CSTRING(Module_DisplayName);
value = -1;
typeName = "SCALAR";
displayName = CSTRING(DefaultChannel_DisplayName);
description = CSTRING(DefaultChannel_Description);
sliderSettings[] = {-1, 5, -1, -1};
movedToSQF = 1;
};
};

2
addons/map/XEH_preInit.sqf
View File

@ -7,4 +7,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
#include "initSettings.sqf"
ADDON = true;

90
addons/map/initSettings.sqf Normal file
View File

@ -0,0 +1,90 @@
[
QGVAR(mapIllumination),
"CHECKBOX",
[localize LSTRING(MapIllumination_DisplayName), localize LSTRING(MapIllumination_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
true,
true
] call CBA_settings_fnc_init;
[
QGVAR(mapGlow),
"CHECKBOX",
[localize LSTRING(MapGlow_DisplayName), localize LSTRING(MapGlow_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
true,
true
] call CBA_settings_fnc_init;
[
QGVAR(mapShake),
"CHECKBOX",
[localize LSTRING(MapShake_DisplayName), localize LSTRING(MapShake_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
true,
true
] call CBA_settings_fnc_init;
[
QGVAR(mapLimitZoom),
"CHECKBOX",
[localize LSTRING(MapLimitZoom_DisplayName), localize LSTRING(MapLimitZoom_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;
[
QGVAR(mapShowCursorCoordinates),
"CHECKBOX",
[localize LSTRING(MapShowCursorCoordinates_DisplayName), localize LSTRING(MapShowCursorCoordinates_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;
[
QGVAR(DefaultChannel),
"LIST",
[localize LSTRING(DefaultChannel_DisplayName), localize LSTRING(DefaultChannel_Description)],
format["ACE %1", localize LSTRING(Module_DisplayName)],
[[-1, 0, 1, 2, 3, 4, 5], [ELSTRING(common,Disabled), "STR_channel_global", "STR_channel_side", "STR_channel_command", "STR_channel_group", "STR_channel_vehicle", "STR_channel_direct"], 0],
true
] call CBA_settings_fnc_init;
// Blue Force Tracking
[
QGVAR(BFT_Enabled),
"CHECKBOX",
[localize LSTRING(BFT_Enabled_DisplayName), localize LSTRING(BFT_Enabled_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;
[
QGVAR(BFT_Interval),
"SLIDER",
[localize LSTRING(BFT_Interval_DisplayName), localize LSTRING(BFT_Interval_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
[0, 30, 1, 1],
true
] call CBA_settings_fnc_init;
[
QGVAR(BFT_ShowPlayerNames),
"CHECKBOX",
[localize LSTRING(BFT_ShowPlayerNames_DisplayName), localize LSTRING(BFT_ShowPlayerNames_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;
[
QGVAR(BFT_HideAiGroups),
"CHECKBOX",
[localize LSTRING(BFT_HideAiGroups_DisplayName), localize LSTRING(BFT_HideAiGroups_Description)],
format ["ACE %1", localize LSTRING(BFT_Module_DisplayName)],
false,
true
] call CBA_settings_fnc_init;

172
addons/map/stringtable.xml
View File

@ -18,20 +18,20 @@
<Chinese>地圖</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapIllumination_DisplayName">
<English>Map illumination?</English>
<English>Map illumination</English>
<German>Kartenbeleuchtung</German>
<Polish>Oświetlenie mapy</Polish>
<Spanish>¿Iluminación de mapa?</Spanish>
<Spanish>¿Iluminación de mapa</Spanish>
<Czech>Osvětlení mapy</Czech>
<Portuguese>Iluminação do mapa?</Portuguese>
<French>Illumination de la carte ?</French>
<Hungarian>Térkép megvilágítása?</Hungarian>
<Russian>Освещение карты?</Russian>
<Italian>Illuminazione Mappa?</Italian>
<Japanese>地図に照明?</Japanese>
<Korean>지도에 조명?</Korean>
<Chinesesimp>地图照明?</Chinesesimp>
<Chinese>地圖照明?</Chinese>
<Portuguese>Iluminação do mapa</Portuguese>
<French>Illumination de la carte</French>
<Hungarian>Térkép megvilágítása</Hungarian>
<Russian>Освещение карты</Russian>
<Italian>Illuminazione Mappa</Italian>
<Japanese>地図に照明</Japanese>
<Korean>지도에 조명</Korean>
<Chinesesimp>地图照明</Chinesesimp>
<Chinese>地圖照明</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapIllumination_Description">
<English>Simulate map lighting based on ambient lighting and player's items?</English>
@ -49,19 +49,19 @@
<Chinese>透過環境光與玩家的物品來決定地圖亮度?</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapGlow_DisplayName">
<English>Map flashlight glow?</English>
<English>Map flashlight glow</English>
<German>Kartenbeleuchtung durch Dritte erkennbar</German>
<Polish>Poświata latarki</Polish>
<Russian>Свет фонаря на карте?</Russian>
<Portuguese>Brilho de lanterna no mapa?</Portuguese>
<Spanish>Resplandor de linterna en el mapa?</Spanish>
<Czech>Nasvícení mapy pomocí baterky?</Czech>
<Italian>Luce della torcia in mappa?</Italian>
<French>Lumière de la lampe de carte ?</French>
<Japanese>地図をライトで照らしますか?</Japanese>
<Korean>지도 조명이 빛이 납니까?</Korean>
<Chinesesimp>增加地图亮度?</Chinesesimp>
<Chinese>增加地圖亮度?</Chinese>
<Russian>Свет фонаря на карте</Russian>
<Portuguese>Brilho de lanterna no mapa</Portuguese>
<Spanish>Resplandor de linterna en el mapa</Spanish>
<Czech>Nasvícení mapy pomocí baterky</Czech>
<Italian>Luce della torcia in mappa</Italian>
<French>Lumière de la lampe de carte</French>
<Japanese>地図をライトで照らしますか</Japanese>
<Korean>지도 조명이 빛이 납니까</Korean>
<Chinesesimp>增加地图亮度</Chinesesimp>
<Chinese>增加地圖亮度</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapGlow_Description">
<English>Add external glow to players who use flashlight on map?</English>
@ -79,20 +79,20 @@
<Chinese>當玩家擁有手電筒時，增加地圖亮度?</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapShake_DisplayName">
<English>Map shake?</English>
<English>Map shake</English>
<Polish>Drżenie mapy</Polish>
<Spanish>¿Temblor de mapa?</Spanish>
<Spanish>¿Temblor de mapa</Spanish>
<German>Kamerawackeln</German>
<Czech>Třesení mapy?</Czech>
<Portuguese>Tremor de mapa?</Portuguese>
<French>Tremblement de la carte ?</French>
<Hungarian>Térkép-rázkódás?</Hungarian>
<Russian>Тряска карты?</Russian>
<Italian>Scuoti la mappa?</Italian>
<Japanese>地図を揺らしますか?</Japanese>
<Korean>지도 흔들림?</Korean>
<Chinesesimp>地图震动?</Chinesesimp>
<Chinese>地圖震動?</Chinese>
<Czech>Třesení mapy</Czech>
<Portuguese>Tremor de mapa</Portuguese>
<French>Tremblement de la carte</French>
<Hungarian>Térkép-rázkódás</Hungarian>
<Russian>Тряска карты</Russian>
<Italian>Scuoti la mappa</Italian>
<Japanese>地図を揺らしますか</Japanese>
<Korean>지도 흔들림</Korean>
<Chinesesimp>地图震动</Chinesesimp>
<Chinese>地圖震動</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapShake_Description">
<English>Make map shake when walking?</English>
@ -111,20 +111,20 @@
<Chinese>走路時讓地圖有震動的感覺?</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapLimitZoom_DisplayName">
<English>Limit map zoom?</English>
<English>Limit map zoom</English>
<Polish>Ograniczony zoom</Polish>
<Spanish>¿Limitar el zoom de mapa?</Spanish>
<Spanish>¿Limitar el zoom de mapa</Spanish>
<German>Kartenvergrößerung einschränken</German>
<Czech>Omezit přiblížení mapy?</Czech>
<Portuguese>Limitar zoom do mapa?</Portuguese>
<French>Limiter le zoom de la carte ?</French>
<Hungarian>Térkép-nagyítás korlátozása?</Hungarian>
<Russian>Ограничить приближение карты?</Russian>
<Italian>Limita lo zoom in mappa?</Italian>
<Japanese>地図の拡大を制限しますか?</Japanese>
<Korean>지도 확대 제한?</Korean>
<Chinesesimp>限制地图缩放倍率?</Chinesesimp>
<Chinese>限制地圖縮放倍率?</Chinese>
<Czech>Omezit přiblížení mapy</Czech>
<Portuguese>Limitar zoom do mapa</Portuguese>
<French>Limiter le zoom de la carte</French>
<Hungarian>Térkép-nagyítás korlátozása</Hungarian>
<Russian>Ограничить приближение карты</Russian>
<Italian>Limita lo zoom in mappa</Italian>
<Japanese>地図の拡大を制限しますか</Japanese>
<Korean>지도 확대 제한</Korean>
<Chinesesimp>限制地图缩放倍率</Chinesesimp>
<Chinese>限制地圖縮放倍率</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapLimitZoom_Description">
<English>Limit the amount of zoom available for the map?</English>
@ -143,20 +143,20 @@
<Chinese>限制地圖上可允許縮放的倍率?</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapShowCursorCoordinates_DisplayName">
<English>Show cursor coordinates?</English>
<English>Show cursor coordinates</English>
<Polish>Koordynaty pod kursorem</Polish>
<Spanish>¿Mostrar coordenadas de cursor?</Spanish>
<German>Zeige Mauszeiger-Koordinaten?</German>
<Czech>Zobrazit souřadnice u kurzoru?</Czech>
<Portuguese>Mostrar coordenadas no cursor?</Portuguese>
<French>Afficher les coordonnées sur le curseur ?</French>
<Hungarian>Kurzor-koordináták mutatása?</Hungarian>
<Russian>Показывать координаты курсора?</Russian>
<Italian>Mostra coordinate sul cursore?</Italian>
<Japanese>カーソル先で座標を表示しますか?</Japanese>
<Korean>커서에 좌표를 보이게 합니까?</Korean>
<Chinesesimp>显示游标的座标?</Chinesesimp>
<Chinese>顯示游標的座標?</Chinese>
<Spanish>¿Mostrar coordenadas de cursor</Spanish>
<German>Zeige Mauszeiger-Koordinaten</German>
<Czech>Zobrazit souřadnice u kurzoru</Czech>
<Portuguese>Mostrar coordenadas no cursor</Portuguese>
<French>Afficher les coordonnées sur le curseur</French>
<Hungarian>Kurzor-koordináták mutatása</Hungarian>
<Russian>Показывать координаты курсора</Russian>
<Italian>Mostra coordinate sul cursore</Italian>
<Japanese>カーソル先で座標を表示しますか</Japanese>
<Korean>커서에 좌표를 보이게 합니까</Korean>
<Chinesesimp>显示游标的座标</Chinesesimp>
<Chinese>顯示游標的座標</Chinese>
</Key>
<Key ID="STR_ACE_Map_MapShowCursorCoordinates_Description">
<English>Show the grid coordinates on the mouse pointer?</English>
@ -271,20 +271,20 @@
<Chinese>設定每多少時間重新標示出單位位置 (秒)</Chinese>
</Key>
<Key ID="STR_ACE_Map_BFT_HideAiGroups_DisplayName">
<English>Hide AI groups?</English>
<English>Hide AI groups</English>
<Polish>Ukryj grupy AI</Polish>
<Spanish>¿Ocultar grupos de IA?</Spanish>
<German>KI-Gruppen verstecken?</German>
<Czech>Skrýt AI skupiny?</Czech>
<Portuguese>Esconder grupos de IA?</Portuguese>
<French>Cacher les groupes d'IA ?</French>
<Hungarian>AI csoportok elrejtése?</Hungarian>
<Russian>Скрыть группы ботов?</Russian>
<Italian>Nascondere gruppi IA?</Italian>
<Japanese>AI グループを非表示にしますか?</Japanese>
<Korean>인공지능 그룹을 숨깁니까?</Korean>
<Chinesesimp>隐藏AI小队?</Chinesesimp>
<Chinese>隱藏AI小隊?</Chinese>
<Spanish>¿Ocultar grupos de IA</Spanish>
<German>KI-Gruppen verstecken</German>
<Czech>Skrýt AI skupiny</Czech>
<Portuguese>Esconder grupos de IA</Portuguese>
<French>Cacher les groupes d'IA</French>
<Hungarian>AI csoportok elrejtése</Hungarian>
<Russian>Скрыть группы ботов</Russian>
<Italian>Nascondere gruppi IA</Italian>
<Japanese>AI グループを非表示にしますか</Japanese>
<Korean>인공지능 그룹을 숨깁니까</Korean>
<Chinesesimp>隐藏AI小队</Chinesesimp>
<Chinese>隱藏AI小隊</Chinese>
</Key>
<Key ID="STR_ACE_Map_BFT_HideAiGroups_Description">
<English>Hide markers for 'AI only' groups?</English>
@ -303,20 +303,20 @@
<Chinese>隱藏'AI小隊'的蹤跡?</Chinese>
</Key>
<Key ID="STR_ACE_Map_BFT_ShowPlayerNames_DisplayName">
<English>Show player names?</English>
<Polish>Pokaż imiona graczy?</Polish>
<Spanish>Mostrar nombres de los jugadores?</Spanish>
<German>Zeigen Sie die Namen der Spieler?</German>
<Czech>Zobrazit jména hráčů?</Czech>
<Portuguese>Mostrar os nomes dos jogadores?</Portuguese>
<French>Afficher les noms des joueurs ?</French>
<Hungarian>Itt található az a játékos nevét?</Hungarian>
<Russian>Показать имена игроков?</Russian>
<Italian>Mostra i nomi dei giocatori?</Italian>
<Japanese>プレイヤ名を表示しますか?</Japanese>
<Korean>플레이어 이름을 표시합니까?</Korean>
<Chinesesimp>显示玩家名称?</Chinesesimp>
<Chinese>顯示玩家名稱?</Chinese>
<English>Show player names</English>
<Polish>Pokaż imiona graczy</Polish>
<Spanish>Mostrar nombres de los jugadores</Spanish>
<German>Zeigen Sie die Namen der Spieler</German>
<Czech>Zobrazit jména hráčů</Czech>
<Portuguese>Mostrar os nomes dos jogadores</Portuguese>
<French>Afficher les noms des joueurs</French>
<Hungarian>Itt található az a játékos nevét</Hungarian>
<Russian>Показать имена игроков</Russian>
<Italian>Mostra i nomi dei giocatori</Italian>
<Japanese>プレイヤ名を表示しますか</Japanese>
<Korean>플레이어 이름을 표시합니까</Korean>
<Chinesesimp>显示玩家名称</Chinesesimp>
<Chinese>顯示玩家名稱</Chinese>
</Key>
<Key ID="STR_ACE_Map_BFT_ShowPlayerNames_Description">
<English>Show individual player names?</English>