From 662fec248cc9474ce45ff29b9da01bb4721fb7f7 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Thu, 16 Mar 2023 14:46:34 -0400 Subject: [PATCH 01/12] add settings --- addons/attributes/XEH_preInit.sqf | 1 + addons/attributes/initAttributes.sqf | 8 ++++---- addons/attributes/initSettings.sqf | 26 ++++++++++++++++++++++++++ addons/attributes/stringtable.xml | 3 +++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 addons/attributes/initSettings.sqf diff --git a/addons/attributes/XEH_preInit.sqf b/addons/attributes/XEH_preInit.sqf index 0bd28810d..abd6dae3f 100644 --- a/addons/attributes/XEH_preInit.sqf +++ b/addons/attributes/XEH_preInit.sqf @@ -23,5 +23,6 @@ GVAR(previousMarkerColors) = [] call CBA_fnc_createNamespace; // Initialize the core/default attributes #include "initAttributes.sqf" +#include "initSettings.sqf" ADDON = true; diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.sqf index 94613aaf5..ca3e65252 100644 --- a/addons/attributes/initAttributes.sqf +++ b/addons/attributes/initAttributes.sqf @@ -102,7 +102,7 @@ } forEach call EFUNC(common,getSelectedUnits); }, {rank _entity}, - {alive _entity && {_entity isKindOf "CAManBase"}} + {GVAR(enableRank) && {alive _entity && {_entity isKindOf "CAManBase"}}} ] call FUNC(addAttribute); [ @@ -140,7 +140,7 @@ } forEach call EFUNC(common,getSelectedVehicles); }, {locked _entity}, - {alive _entity && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} + {GVAR(enableVehicleLock) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} ] call FUNC(addAttribute); [ @@ -249,7 +249,7 @@ { _entity getVariable [QGVAR(respawnPos), []] param [0, sideEmpty] }, - {alive _entity && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}} + {GVAR(enableRespawn) && {alive _entity} && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}} ] call FUNC(addAttribute); [ @@ -298,7 +298,7 @@ _respawnID }, - {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}} + {GVAR(enableRespawn) && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} ] call FUNC(addAttribute); [ diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.sqf new file mode 100644 index 000000000..612a5262f --- /dev/null +++ b/addons/attributes/initSettings.sqf @@ -0,0 +1,26 @@ +[ + QGVAR(enableRank), + "CHECKBOX", + ["str_3den_object_attribute_rank_displayname", LSTRING(EnableAttribute_Description)], + [ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableVehicleLock), + "CHECKBOX", + ["str_3den_object_attribute_lock_displayname", LSTRING(EnableAttribute_Description)], + [ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableRespawn), + "CHECKBOX", + ["str_3den_multiplayer_attributecategory_respawn_displayname", LSTRING(EnableAttribute_Description)], + [ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"], + true, + false +] call CBA_fnc_addSetting; diff --git a/addons/attributes/stringtable.xml b/addons/attributes/stringtable.xml index ae0ef148d..6998d3585 100644 --- a/addons/attributes/stringtable.xml +++ b/addons/attributes/stringtable.xml @@ -368,5 +368,8 @@ 打開所選實體的Zeus屬性顯示。當選擇多個實體時（即由於選擇了一個小組），將使用懸停的實體。 Apre la visualizzazione degli attributi di Zeus per l'entità selezionata.\nQuando vengono selezionate più entità (ad es. a causa della selezione di un gruppo), verrà utilizzata l'entità al passaggio del mouse. + + Enables the related attribute(s) in the Zeus attributes display + From d90f1c28a99aed972dd70e235c244c0b4c615350 Mon Sep 17 00:00:00 2001 From: Kex Date: Mon, 17 Apr 2023 18:04:07 +0200 Subject: [PATCH 02/12] German translation --- addons/attributes/stringtable.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/attributes/stringtable.xml b/addons/attributes/stringtable.xml index 6998d3585..30c70db56 100644 --- a/addons/attributes/stringtable.xml +++ b/addons/attributes/stringtable.xml @@ -370,6 +370,7 @@ Enables the related attribute(s) in the Zeus attributes display + Zeigt die entsprechende Eigentschaft(en) im Eigenschaftsfenster an. From 5d1bd3801e56ba40b655c8cecb219deab6dadd62 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Fri, 28 Apr 2023 11:09:14 -0400 Subject: [PATCH 03/12] object and group attributes, settings page --- addons/attributes/initAttributes.sqf | 53 +++++--- addons/attributes/initSettings.sqf | 193 ++++++++++++++++++++++++++- addons/attributes/stringtable.xml | 17 +++ 3 files changed, 237 insertions(+), 26 deletions(-) diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.sqf index 51c0ef3ce..ffcc47626 100644 --- a/addons/attributes/initAttributes.sqf +++ b/addons/attributes/initAttributes.sqf @@ -6,7 +6,7 @@ "Object", "STR_A3_Arsenal", {_entity call EFUNC(common,openArsenal)}, - {alive _entity && {_entity isKindOf "CAManBase"}}, + {GVAR(enableArsenal) && {alive _entity} && {_entity isKindOf "CAManBase"}}, true ] call FUNC(addButton); @@ -23,7 +23,7 @@ }; }, {name _entity}, - {alive _entity && {_entity isKindOf "CAManBase"}} + {GVAR(enableName) && {alive _entity} && {_entity isKindOf "CAManBase"}} ] call FUNC(addAttribute); [ @@ -37,7 +37,7 @@ } forEach call EFUNC(common,getSelectedUnits); }, {skill _entity}, - {alive _entity && {!isNull group _entity && {side _entity != sideLogic}}} + {GVAR(enableSkill) && {alive _entity} && {!isNull group _entity && {side _entity != sideLogic}}} ] call FUNC(addAttribute); [ @@ -52,7 +52,7 @@ } forEach SELECTED_OBJECTS; }, {1 - damage _entity}, - {alive _entity} + {GVAR(enableHealth) && {alive _entity}} ] call FUNC(addAttribute); [ @@ -66,7 +66,7 @@ } forEach call EFUNC(common,getSelectedVehicles); }, {fuel _entity}, - {alive _entity && {getNumber (configOf _entity >> "fuelCapacity") > 0}} + {GVAR(enableFuel) && {alive _entity} && {getNumber (configOf _entity >> "fuelCapacity") > 0}} ] call FUNC(addAttribute); [ @@ -80,7 +80,7 @@ } forEach call EFUNC(common,getSelectedVehicles); }, {_entity call EFUNC(common,getVehicleAmmo)}, - {alive _entity && {_entity call EFUNC(common,getVehicleAmmo) != -1}} + {GVAR(enableAmmo) && {alive _entity} && {_entity call EFUNC(common,getVehicleAmmo) != -1}} ] call FUNC(addAttribute); [ @@ -121,7 +121,7 @@ } forEach call EFUNC(common,getSelectedUnits); }, {toUpper unitPos _entity}, - {alive _entity && {_entity isKindOf "CAManBase"}} + {GVAR(enableStance) && {alive _entity} && {_entity isKindOf "CAManBase"}} ] call FUNC(addAttribute); [ @@ -157,7 +157,7 @@ } forEach call EFUNC(common,getSelectedVehicles); }, {isEngineOn _entity}, - {alive _entity && {getNumber (configOf _entity >> "fuelCapacity") > 0} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} + {GVAR(enableEngine) && {alive _entity} && {getNumber (configOf _entity >> "fuelCapacity") > 0} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} ] call FUNC(addAttribute); [ @@ -182,7 +182,7 @@ } forEach call EFUNC(common,getSelectedVehicles); }, {isLightOn _entity}, - {alive _entity && {"true" configClasses (configOf _entity >> "Reflectors") isNotEqualTo []} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} + {GVAR(enableLights) && {alive _entity} && {"true" configClasses (configOf _entity >> "Reflectors") isNotEqualTo []} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} ] call FUNC(addAttribute); [ @@ -195,7 +195,7 @@ [_buildings, _value] call EFUNC(building_markers,set); }, {_entity getVariable [QEGVAR(building_markers,marker), ""] != ""}, - {_entity isKindOf "Building"} + {GVAR(enableBuildingMarker) && _entity isKindOf "Building"} ] call FUNC(addAttribute); [ @@ -207,7 +207,7 @@ [QEGVAR(common,setPlateNumber), [_entity, _value], _entity] call CBA_fnc_targetEvent; }, {getPlateNumber _entity}, - {alive _entity && {getText (configOf _entity >> "PlateInfos" >> "name") in selectionNames _entity}} + {GVAR(enablePlateNumber) && {alive _entity} && {getText (configOf _entity >> "PlateInfos" >> "name") in selectionNames _entity}} ] call FUNC(addAttribute); [ @@ -322,7 +322,8 @@ }, { [isDamageAllowed _entity, simulationEnabled _entity, !isObjectHidden _entity] - } + }, + {GVAR(enableStates)} ] call FUNC(addAttribute); [ @@ -348,7 +349,7 @@ }; }, {""}, - {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}} + {GVAR(enableDebugConsole) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} ] call FUNC(addAttribute); // - Group -------------------------------------------------------------------- @@ -361,7 +362,8 @@ QGVAR(edit), nil, {_entity setGroupIdGlobal [_value]}, - {groupID _entity} + {groupID _entity}, + {GVAR(enableGroupID)} ] call FUNC(addAttribute); [ @@ -376,7 +378,8 @@ } forEach units _x; } forEach SELECTED_GROUPS; }, - {skill leader _entity} + {skill leader _entity}, + {GVAR(enableGroupSkill)} ] call FUNC(addAttribute); [ @@ -399,7 +402,8 @@ [QEGVAR(common,setFormation), [_x, _value], _x] call CBA_fnc_targetEvent; } forEach SELECTED_GROUPS; }, - {formation _entity} + {formation _entity}, + {GVAR(enableGroupFormation)} ] call FUNC(addAttribute); [ @@ -418,7 +422,8 @@ [QEGVAR(common,setBehaviour), [_x, _value], _x] call CBA_fnc_targetEvent; } forEach SELECTED_GROUPS; }, - {behaviour leader _entity} + {behaviour leader _entity}, + {GVAR(enableGroupBehaviour)} ] call FUNC(addAttribute); [ @@ -437,7 +442,8 @@ [QEGVAR(common,setCombatMode), [_x, _value], _x] call CBA_fnc_targetEvent; } forEach SELECTED_GROUPS; }, - {combatMode _entity} + {combatMode _entity}, + {GVAR(enableGroupCombatMode)} ] call FUNC(addAttribute); [ @@ -454,7 +460,8 @@ [QEGVAR(common,setSpeedMode), [_x, _value], _x] call CBA_fnc_targetEvent; } forEach SELECTED_GROUPS; }, - {speedMode _entity} + {speedMode _entity}, + {GVAR(enableGroupSpeed)} ] call FUNC(addAttribute); [ @@ -474,7 +481,8 @@ } forEach units _x; } forEach SELECTED_GROUPS; }, - {toUpper unitPos leader _entity} + {toUpper unitPos leader _entity}, + {GVAR(enableGroupStance)} ] call FUNC(addAttribute); [ @@ -500,7 +508,7 @@ }; }, {""}, - {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}} + {GVAR(enableDebugConsole) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} ] call FUNC(addAttribute); // - Waypoint ----------------------------------------------------------------- @@ -518,7 +526,8 @@ _x setWaypointType _type; if (_type == "SCRIPTED") then {_x setWaypointScript _script}; } forEach SELECTED_WAYPOINTS; - } + }, + {GVAR(enableWpName)} ] call FUNC(addAttribute); [ diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.sqf index 612a5262f..39a243cfb 100644 --- a/addons/attributes/initSettings.sqf +++ b/addons/attributes/initSettings.sqf @@ -1,8 +1,83 @@ + +[ + QGVAR(enableDebugConsole), + "CHECKBOX", + ["STR_a3_rscdebugconsole_expressiontext", LSTRING(EnableAttribute_Description)], + LSTRING(DisplayName), + true, + false +] call CBA_fnc_addSetting; + +// - Object ------------------------------------------------------------------- + +[ + QGVAR(enableArsenal), + "CHECKBOX", + ["STR_A3_Arsenal", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableName), + "CHECKBOX", + ["STR_3DEN_Object_Attribute_UnitName_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableSkill), + "CHECKBOX", + ["STR_3DEN_Object_Attribute_Skill_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableHealth), + "CHECKBOX", + ["STR_3DEN_Object_Attribute_Health_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableFuel), + "CHECKBOX", + ["STR_3DEN_Object_Attribute_Fuel_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableAmmo), + "CHECKBOX", + ["STR_3DEN_Object_Attribute_Ammo_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + [ QGVAR(enableRank), "CHECKBOX", - ["str_3den_object_attribute_rank_displayname", LSTRING(EnableAttribute_Description)], - [ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"], + ["STR_3DEN_Object_Attribute_Rank_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableStance), + "CHECKBOX", + ["STR_A3_RscAttributeUnitPos_Title", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false ] call CBA_fnc_addSetting; @@ -11,7 +86,43 @@ QGVAR(enableVehicleLock), "CHECKBOX", ["str_3den_object_attribute_lock_displayname", LSTRING(EnableAttribute_Description)], - [ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableEngine), + "CHECKBOX", + [LSTRING(Engine), LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableLights), + "CHECKBOX", + [LSTRING(Lights), LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableBuildingMarker), + "CHECKBOX", + [ELSTRING(building_markers,BuildingMarker), LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enablePlateNumber), + "CHECKBOX", + [LSTRING(PlateNumber), LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false ] call CBA_fnc_addSetting; @@ -20,7 +131,81 @@ QGVAR(enableRespawn), "CHECKBOX", ["str_3den_multiplayer_attributecategory_respawn_displayname", LSTRING(EnableAttribute_Description)], - [ELSTRING(main,DisplayName), "str_3den_display3den_menubar_attributes_text"], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableStates), + "CHECKBOX", + [LSTRING(States), LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +// - Group -------------------------------------------------------------------- + +[ + QGVAR(enableGroupID), + "CHECKBOX", + ["STR_A3_RscAttributeGroupID_Title", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupSkill), + "CHECKBOX", + ["STR_3DEN_Object_Attribute_Skill_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupFormation), + "CHECKBOX", + ["STR_3DEN_Group_Attribute_Formation_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupBehaviour), + "CHECKBOX", + ["STR_3DEN_Group_Attribute_Behaviour_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupCombatMode), + "CHECKBOX", + ["STR_3DEN_Group_Attribute_CombatMode_displayName", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupSpeed), + "CHECKBOX", + ["STR_HC_Menu_Speed", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupStance), + "CHECKBOX", + ["STR_A3_RscAttributeUnitPos_Title", LSTRING(EnableAttribute_Description)], + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false ] call CBA_fnc_addSetting; diff --git a/addons/attributes/stringtable.xml b/addons/attributes/stringtable.xml index 30c70db56..692b42071 100644 --- a/addons/attributes/stringtable.xml +++ b/addons/attributes/stringtable.xml @@ -1,6 +1,23 @@ + + Zeus Enhanced - Attributes + Zeus Enhanced - Attributes + Zeus Enhanced - Atributy + Zeus Enhanced - Attribute + Zeus Enhanced - Атрибуты + Zeus Enhanced - Atrybuty + Zeus Enhanced - Attributi + Zeus Enhanced - Atributos + Zeus Enhanced - Attributs + Zeus Enhanced - 屬性 + Zeus Enhanced - 属性 + Zeus Enhanced - 속성 + Zeus Enhanced - Atributos + Zeus Enhanced - 属性 + Zeus Enhanced - Özellikler + Engine Moteur From 9c4fc441750329e7529ed6e96fb23c201ffb3c92 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Fri, 28 Apr 2023 11:22:41 -0400 Subject: [PATCH 04/12] remove Original --- addons/attributes/stringtable.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/attributes/stringtable.xml b/addons/attributes/stringtable.xml index 692b42071..844b12bbd 100644 --- a/addons/attributes/stringtable.xml +++ b/addons/attributes/stringtable.xml @@ -2,7 +2,6 @@ - Zeus Enhanced - Attributes Zeus Enhanced - Attributes Zeus Enhanced - Atributy Zeus Enhanced - Attribute From 709154b84b35b9f7054955a6c1818fdce04df0d7 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Fri, 28 Apr 2023 11:24:06 -0400 Subject: [PATCH 05/12] fixed indent --- addons/attributes/stringtable.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/attributes/stringtable.xml b/addons/attributes/stringtable.xml index 844b12bbd..2d80021d1 100644 --- a/addons/attributes/stringtable.xml +++ b/addons/attributes/stringtable.xml @@ -2,20 +2,20 @@ - Zeus Enhanced - Attributes - Zeus Enhanced - Atributy - Zeus Enhanced - Attribute - Zeus Enhanced - Атрибуты - Zeus Enhanced - Atrybuty - Zeus Enhanced - Attributi - Zeus Enhanced - Atributos - Zeus Enhanced - Attributs - Zeus Enhanced - 屬性 - Zeus Enhanced - 属性 - Zeus Enhanced - 속성 - Zeus Enhanced - Atributos - Zeus Enhanced - 属性 - Zeus Enhanced - Özellikler + Zeus Enhanced - Attributes + Zeus Enhanced - Atributy + Zeus Enhanced - Attribute + Zeus Enhanced - Атрибуты + Zeus Enhanced - Atrybuty + Zeus Enhanced - Attributi + Zeus Enhanced - Atributos + Zeus Enhanced - Attributs + Zeus Enhanced - 屬性 + Zeus Enhanced - 属性 + Zeus Enhanced - 속성 + Zeus Enhanced - Atributos + Zeus Enhanced - 属性 + Zeus Enhanced - Özellikler Engine From a8883ae3221ff73734a95a0afc90c1c33071007e Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Fri, 28 Apr 2023 15:42:47 -0400 Subject: [PATCH 06/12] remove waypoint --- addons/attributes/initAttributes.sqf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.sqf index ffcc47626..35f72d06f 100644 --- a/addons/attributes/initAttributes.sqf +++ b/addons/attributes/initAttributes.sqf @@ -526,8 +526,7 @@ _x setWaypointType _type; if (_type == "SCRIPTED") then {_x setWaypointScript _script}; } forEach SELECTED_WAYPOINTS; - }, - {GVAR(enableWpName)} + } ] call FUNC(addAttribute); [ From 1d59cd5d4392e43ed055407eedf0aaa5d5ff7ef6 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Fri, 28 Apr 2023 15:49:59 -0400 Subject: [PATCH 07/12] enableExecute --- addons/attributes/initAttributes.sqf | 6 +++--- addons/attributes/initSettings.sqf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.sqf index 35f72d06f..932436e55 100644 --- a/addons/attributes/initAttributes.sqf +++ b/addons/attributes/initAttributes.sqf @@ -195,7 +195,7 @@ [_buildings, _value] call EFUNC(building_markers,set); }, {_entity getVariable [QEGVAR(building_markers,marker), ""] != ""}, - {GVAR(enableBuildingMarker) && _entity isKindOf "Building"} + {GVAR(enableBuildingMarker) && {_entity isKindOf "Building"}} ] call FUNC(addAttribute); [ @@ -349,7 +349,7 @@ }; }, {""}, - {GVAR(enableDebugConsole) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} + {GVAR(enableExecute) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} ] call FUNC(addAttribute); // - Group -------------------------------------------------------------------- @@ -508,7 +508,7 @@ }; }, {""}, - {GVAR(enableDebugConsole) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} + {GVAR(enableExecute) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} ] call FUNC(addAttribute); // - Waypoint ----------------------------------------------------------------- diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.sqf index 39a243cfb..432efd443 100644 --- a/addons/attributes/initSettings.sqf +++ b/addons/attributes/initSettings.sqf @@ -1,6 +1,6 @@ [ - QGVAR(enableDebugConsole), + QGVAR(enableExecute), "CHECKBOX", ["STR_a3_rscdebugconsole_expressiontext", LSTRING(EnableAttribute_Description)], LSTRING(DisplayName), From dee82e030dd2db5972fde629d1fef2b9fa85bf2a Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Sat, 20 May 2023 14:20:51 -0400 Subject: [PATCH 08/12] removed tooltips --- addons/attributes/initSettings.sqf | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.sqf index 432efd443..ad5225d71 100644 --- a/addons/attributes/initSettings.sqf +++ b/addons/attributes/initSettings.sqf @@ -2,7 +2,7 @@ [ QGVAR(enableExecute), "CHECKBOX", - ["STR_a3_rscdebugconsole_expressiontext", LSTRING(EnableAttribute_Description)], + "STR_a3_rscdebugconsole_expressiontext", LSTRING(DisplayName), true, false @@ -13,7 +13,7 @@ [ QGVAR(enableArsenal), "CHECKBOX", - ["STR_A3_Arsenal", LSTRING(EnableAttribute_Description)], + "STR_A3_Arsenal", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -22,7 +22,7 @@ [ QGVAR(enableName), "CHECKBOX", - ["STR_3DEN_Object_Attribute_UnitName_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_UnitName_displayName", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -31,7 +31,7 @@ [ QGVAR(enableSkill), "CHECKBOX", - ["STR_3DEN_Object_Attribute_Skill_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_Skill_displayName", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -40,7 +40,7 @@ [ QGVAR(enableHealth), "CHECKBOX", - ["STR_3DEN_Object_Attribute_Health_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_Health_displayName", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -49,7 +49,7 @@ [ QGVAR(enableFuel), "CHECKBOX", - ["STR_3DEN_Object_Attribute_Fuel_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_Fuel_displayName", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -58,7 +58,7 @@ [ QGVAR(enableAmmo), "CHECKBOX", - ["STR_3DEN_Object_Attribute_Ammo_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_Ammo_displayName", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -67,7 +67,7 @@ [ QGVAR(enableRank), "CHECKBOX", - ["STR_3DEN_Object_Attribute_Rank_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_Rank_displayName", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -76,7 +76,7 @@ [ QGVAR(enableStance), "CHECKBOX", - ["STR_A3_RscAttributeUnitPos_Title", LSTRING(EnableAttribute_Description)], + "STR_A3_RscAttributeUnitPos_Title", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -85,7 +85,7 @@ [ QGVAR(enableVehicleLock), "CHECKBOX", - ["str_3den_object_attribute_lock_displayname", LSTRING(EnableAttribute_Description)], + "STR_3den_object_attribute_lock_displayname", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -94,7 +94,7 @@ [ QGVAR(enableEngine), "CHECKBOX", - [LSTRING(Engine), LSTRING(EnableAttribute_Description)], + LSTRING(Engine), [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -103,7 +103,7 @@ [ QGVAR(enableLights), "CHECKBOX", - [LSTRING(Lights), LSTRING(EnableAttribute_Description)], + LSTRING(Lights), [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -112,7 +112,7 @@ [ QGVAR(enableBuildingMarker), "CHECKBOX", - [ELSTRING(building_markers,BuildingMarker), LSTRING(EnableAttribute_Description)], + ELSTRING(building_markers,BuildingMarker), [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -121,7 +121,7 @@ [ QGVAR(enablePlateNumber), "CHECKBOX", - [LSTRING(PlateNumber), LSTRING(EnableAttribute_Description)], + LSTRING(PlateNumber), [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -130,7 +130,7 @@ [ QGVAR(enableRespawn), "CHECKBOX", - ["str_3den_multiplayer_attributecategory_respawn_displayname", LSTRING(EnableAttribute_Description)], + "STR_3den_multiplayer_attributecategory_respawn_displayname", [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -139,7 +139,7 @@ [ QGVAR(enableStates), "CHECKBOX", - [LSTRING(States), LSTRING(EnableAttribute_Description)], + LSTRING(States), [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -150,7 +150,7 @@ [ QGVAR(enableGroupID), "CHECKBOX", - ["STR_A3_RscAttributeGroupID_Title", LSTRING(EnableAttribute_Description)], + "STR_A3_RscAttributeGroupID_Title", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false @@ -159,7 +159,7 @@ [ QGVAR(enableGroupSkill), "CHECKBOX", - ["STR_3DEN_Object_Attribute_Skill_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Object_Attribute_Skill_displayName", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false @@ -168,7 +168,7 @@ [ QGVAR(enableGroupFormation), "CHECKBOX", - ["STR_3DEN_Group_Attribute_Formation_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Group_Attribute_Formation_displayName", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false @@ -177,7 +177,7 @@ [ QGVAR(enableGroupBehaviour), "CHECKBOX", - ["STR_3DEN_Group_Attribute_Behaviour_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Group_Attribute_Behaviour_displayName", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false @@ -186,7 +186,7 @@ [ QGVAR(enableGroupCombatMode), "CHECKBOX", - ["STR_3DEN_Group_Attribute_CombatMode_displayName", LSTRING(EnableAttribute_Description)], + "STR_3DEN_Group_Attribute_CombatMode_displayName", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false @@ -195,7 +195,7 @@ [ QGVAR(enableGroupSpeed), "CHECKBOX", - ["STR_HC_Menu_Speed", LSTRING(EnableAttribute_Description)], + "STR_HC_Menu_Speed", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false @@ -204,7 +204,7 @@ [ QGVAR(enableGroupStance), "CHECKBOX", - ["STR_A3_RscAttributeUnitPos_Title", LSTRING(EnableAttribute_Description)], + "STR_A3_RscAttributeUnitPos_Title", [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], true, false From bf4977928c38c9cb4d009d91ddc28336713d53a1 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Sat, 20 May 2023 14:50:47 -0400 Subject: [PATCH 09/12] remote tooltip --- addons/attributes/stringtable.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/attributes/stringtable.xml b/addons/attributes/stringtable.xml index 2d80021d1..30b57de13 100644 --- a/addons/attributes/stringtable.xml +++ b/addons/attributes/stringtable.xml @@ -384,9 +384,5 @@ 打開所選實體的Zeus屬性顯示。當選擇多個實體時（即由於選擇了一個小組），將使用懸停的實體。 Apre la visualizzazione degli attributi di Zeus per l'entità selezionata.\nQuando vengono selezionate più entità (ad es. a causa della selezione di un gruppo), verrà utilizzata l'entità al passaggio del mouse. - - Enables the related attribute(s) in the Zeus attributes display - Zeigt die entsprechende Eigentschaft(en) im Eigenschaftsfenster an. - From f5274f03db2d50b307a5a53dfafbcb8dfdfdcb25 Mon Sep 17 00:00:00 2001 From: Steve Zhao Date: Sat, 20 May 2023 14:51:03 -0400 Subject: [PATCH 10/12] waypoints --- addons/attributes/initAttributes.sqf | 19 +++++++--- addons/attributes/initSettings.sqf | 56 ++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.sqf index 932436e55..69f428c42 100644 --- a/addons/attributes/initAttributes.sqf +++ b/addons/attributes/initAttributes.sqf @@ -526,7 +526,9 @@ _x setWaypointType _type; if (_type == "SCRIPTED") then {_x setWaypointScript _script}; } forEach SELECTED_WAYPOINTS; - } + }, + nil, + {GVAR(enableWaypointType)} ] call FUNC(addAttribute); [ @@ -585,7 +587,8 @@ QGVAR(slider), [0, 1800, 15, false, 0], {_entity setWaypointTimeout [_value, _value, _value]}, - {random waypointTimeout _entity} + {random waypointTimeout _entity}, + {GVAR(enableWaypointTimeout)} ] call FUNC(addAttribute); [ @@ -615,7 +618,8 @@ [QEGVAR(common,setWaypointFormation), [_x, _value]] call CBA_fnc_serverEvent; } forEach SELECTED_WAYPOINTS; }, - {waypointFormation _entity} + {waypointFormation _entity}, + {GVAR(enableWaypointFormation)} ] call FUNC(addAttribute); [ @@ -641,7 +645,8 @@ [QEGVAR(common,setWaypointBehaviour), [_x, _value]] call CBA_fnc_serverEvent; } forEach SELECTED_WAYPOINTS; }, - {waypointBehaviour _entity} + {waypointBehaviour _entity}, + {GVAR(enableWaypointBehaviour)} ] call FUNC(addAttribute); [ @@ -667,7 +672,8 @@ [QEGVAR(common,setWaypointCombatMode), [_x, _value]] call CBA_fnc_serverEvent; } forEach SELECTED_WAYPOINTS; }, - {waypointCombatMode _entity} + {waypointCombatMode _entity}, + {GVAR(enableWaypointCombatMode)} ] call FUNC(addAttribute); [ @@ -691,7 +697,8 @@ [QEGVAR(common,setWaypointSpeed), [_x, _value]] call CBA_fnc_serverEvent; } forEach SELECTED_WAYPOINTS; }, - {waypointSpeed _entity} + {waypointSpeed _entity}, + {GVAR(enableWaypointSpeed)} ] call FUNC(addAttribute); // - Marker ------------------------------------------------------------------- diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.sqf index ad5225d71..ca4d3ffd1 100644 --- a/addons/attributes/initSettings.sqf +++ b/addons/attributes/initSettings.sqf @@ -209,3 +209,59 @@ true, false ] call CBA_fnc_addSetting; + +// - Waypoint ----------------------------------------------------------------- + +[ + QGVAR(enableWaypointType), + "CHECKBOX", + "STR_3DEN_Object_Attribute_Type_displayName", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointTimeout), + "CHECKBOX", + LSTRING(Timeout), + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointFormation), + "CHECKBOX", + "STR_3DEN_Group_Attribute_Formation_displayName", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointBehaviour), + "CHECKBOX", + "STR_3DEN_Group_Attribute_Behaviour_displayName", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointCombatMode), + "CHECKBOX", + "STR_3DEN_Group_Attribute_CombatMode_displayName", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointSpeed), + "CHECKBOX", + "STR_HC_Menu_Speed", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; From 18cce2e842675f6a79f6ad9bdb6e2a653e8bba44 Mon Sep 17 00:00:00 2001 From: mharis001 Date: Sat, 20 May 2023 20:53:24 -0400 Subject: [PATCH 11/12] Add remaining attributes --- addons/attributes/initAttributes.sqf | 32 +++--- addons/attributes/initSettings.sqf | 160 +++++++++++++++++++++++---- addons/damage/XEH_preInit.sqf | 4 +- addons/damage/initSettings.sqf | 8 ++ addons/garage/XEH_preInit.sqf | 4 +- addons/garage/initSettings.sqf | 8 ++ addons/inventory/XEH_preInit.sqf | 4 +- addons/inventory/initSettings.sqf | 8 ++ 8 files changed, 190 insertions(+), 38 deletions(-) create mode 100644 addons/damage/initSettings.sqf create mode 100644 addons/garage/initSettings.sqf create mode 100644 addons/inventory/initSettings.sqf diff --git a/addons/attributes/initAttributes.sqf b/addons/attributes/initAttributes.sqf index 69f428c42..d74dfd1f8 100644 --- a/addons/attributes/initAttributes.sqf +++ b/addons/attributes/initAttributes.sqf @@ -249,7 +249,7 @@ { _entity getVariable [QGVAR(respawnPos), []] param [0, sideEmpty] }, - {GVAR(enableRespawn) && {alive _entity} && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}} + {GVAR(enableRespawnPosition) && {alive _entity} && {canMove _entity} && {_entity isKindOf "AllVehicles"} && {!(_entity isKindOf "Animal")}} ] call FUNC(addAttribute); [ @@ -298,7 +298,7 @@ _respawnID }, - {GVAR(enableRespawn) && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} + {GVAR(enableRespawnVehicle) && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} ] call FUNC(addAttribute); [ @@ -508,7 +508,7 @@ }; }, {""}, - {GVAR(enableExecute) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} + {GVAR(enableGroupExecute) && {IS_ADMIN_LOGGED || {!GETMVAR(ZEN_disableCodeExecution,false)}}} ] call FUNC(addAttribute); // - Waypoint ----------------------------------------------------------------- @@ -544,7 +544,7 @@ } forEach SELECTED_WAYPOINTS; }, {waypointLoiterType _entity}, - {waypointType _entity == "LOITER"} + {GVAR(enableWaypointLoiterDirection) && {waypointType _entity == "LOITER"}} ] call FUNC(addAttribute); [ @@ -561,7 +561,7 @@ } forEach SELECTED_WAYPOINTS; }, {str waypointLoiterRadius _entity}, - {waypointType _entity == "LOITER"} + {GVAR(enableWaypointLoiterRadius) && {waypointType _entity == "LOITER"}} ] call FUNC(addAttribute); [ @@ -578,7 +578,7 @@ } forEach SELECTED_WAYPOINTS; }, {str waypointLoiterAltitude _entity}, - {waypointType _entity == "LOITER"} + {GVAR(enableWaypointLoiterAltitude) && {waypointType _entity == "LOITER"}} ] call FUNC(addAttribute); [ @@ -711,7 +711,8 @@ QGVAR(edit), nil, {_entity setMarkerText _value}, - {markerText _entity} + {markerText _entity}, + {GVAR(enableMarkerText)} ] call FUNC(addAttribute); [ @@ -729,7 +730,8 @@ // Set this color to be applied to new markers of this type GVAR(previousMarkerColors) setVariable [markerType _entity, _value]; }, - {markerColor _entity} + {markerColor _entity}, + {GVAR(enableMarkerColor)} ] call FUNC(addAttribute); [ @@ -738,7 +740,8 @@ QGVAR(slider), [0, 1, 0.1, true], {_entity setMarkerAlpha _value}, - {markerAlpha _entity} + {markerAlpha _entity}, + {GVAR(enableMarkerAlpha)} ] call FUNC(addAttribute); // - Skills ------------------------------------------------------------------- @@ -749,7 +752,7 @@ "Object", LSTRING(Skills), {[_entity, "Skills"] call FUNC(open)}, - {alive _entity && {_entity isKindOf "CAManBase"}} + {GVAR(enableSkills) && {alive _entity} && {_entity isKindOf "CAManBase"}} ] call FUNC(addButton); [ @@ -877,7 +880,7 @@ "Object", LSTRING(Abilities), {[_entity, "Abilities"] call FUNC(open)}, - {alive _entity && {_entity isKindOf "CAManBase"}} + {GVAR(enableAbilities) && {alive _entity} && {_entity isKindOf "CAManBase"}} ] call FUNC(addButton); [ @@ -919,7 +922,7 @@ "Object", LSTRING(Traits), {[_entity, "Traits"] call FUNC(open)}, - {alive _entity && {_entity isKindOf "CAManBase"}} + {GVAR(enableTraits) && {alive _entity} && {_entity isKindOf "CAManBase"}} ] call FUNC(addButton); if (isClass (configFile >> "CfgPatches" >> "ace_medical")) then { @@ -1014,7 +1017,7 @@ if (isClass (configFile >> "CfgPatches" >> "ace_explosives")) then { "Object", LSTRING(Sensors), {[_entity, "Sensors"] call FUNC(open)}, - {alive _entity && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} + {GVAR(enableSensors) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}} ] call FUNC(addButton); [ @@ -1080,7 +1083,8 @@ if (isClass (configFile >> "CfgPatches" >> "ace_explosives")) then { [ "Group", "STR_Eval_TypeSide", - {[_entity, "Side"] call FUNC(open)} + {[_entity, "Side"] call FUNC(open)}, + {GVAR(enableGroupSide)} ] call FUNC(addButton); [ diff --git a/addons/attributes/initSettings.sqf b/addons/attributes/initSettings.sqf index ca4d3ffd1..960270a9f 100644 --- a/addons/attributes/initSettings.sqf +++ b/addons/attributes/initSettings.sqf @@ -1,24 +1,5 @@ - -[ - QGVAR(enableExecute), - "CHECKBOX", - "STR_a3_rscdebugconsole_expressiontext", - LSTRING(DisplayName), - true, - false -] call CBA_fnc_addSetting; - // - Object ------------------------------------------------------------------- -[ - QGVAR(enableArsenal), - "CHECKBOX", - "STR_A3_Arsenal", - [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], - true, - false -] call CBA_fnc_addSetting; - [ QGVAR(enableName), "CHECKBOX", @@ -128,9 +109,18 @@ ] call CBA_fnc_addSetting; [ - QGVAR(enableRespawn), + QGVAR(enableRespawnPosition), + "CHECKBOX", + LSTRING(RespawnPosition), + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableRespawnVehicle), "CHECKBOX", - "STR_3den_multiplayer_attributecategory_respawn_displayname", + LSTRING(RespawnVehicle), [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], true, false @@ -145,6 +135,60 @@ false ] call CBA_fnc_addSetting; +[ + QGVAR(enableExecute), + "CHECKBOX", + "STR_a3_rscdebugconsole_expressiontext", + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableArsenal), + "CHECKBOX", + "STR_A3_Arsenal", + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableSkills), + "CHECKBOX", + LSTRING(Skills), + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableAbilities), + "CHECKBOX", + LSTRING(Abilities), + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableTraits), + "CHECKBOX", + LSTRING(Traits), + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableSensors), + "CHECKBOX", + LSTRING(Sensors), + [LSTRING(DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; + // - Group -------------------------------------------------------------------- [ @@ -210,6 +254,24 @@ false ] call CBA_fnc_addSetting; +[ + QGVAR(enableGroupExecute), + "CHECKBOX", + "STR_a3_rscdebugconsole_expressiontext", + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableGroupSide), + "CHECKBOX", + "STR_Eval_TypeSide", + [LSTRING(DisplayName), "str_a3_rscdisplaycurator_modegroups_tooltip"], + true, + false +] call CBA_fnc_addSetting; + // - Waypoint ----------------------------------------------------------------- [ @@ -221,6 +283,33 @@ false ] call CBA_fnc_addSetting; +[ + QGVAR(enableWaypointLoiterDirection), + "CHECKBOX", + "STR_3DEN_Waypoint_Attribute_LoiterDirection_displayname", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointLoiterRadius), + "CHECKBOX", + "STR_3DEN_Waypoint_Attribute_LoiterRadius_displayname", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableWaypointLoiterAltitude), + "CHECKBOX", + "STR_3DEN_Waypoint_Attribute_LoiterAltitude_displayname", + [LSTRING(DisplayName), "STR_3DEN_Waypoint_textPlural"], + true, + false +] call CBA_fnc_addSetting; + [ QGVAR(enableWaypointTimeout), "CHECKBOX", @@ -265,3 +354,32 @@ true, false ] call CBA_fnc_addSetting; + +// - Marker ------------------------------------------------------------------- + +[ + QGVAR(enableMarkerText), + "CHECKBOX", + "STR_3DEN_Marker_Attribute_Text_displayName", + [LSTRING(DisplayName), "STR_3DEN_Marker_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableMarkerColor), + "CHECKBOX", + "STR_3DEN_Marker_Attribute_Color_displayName", + [LSTRING(DisplayName), "STR_3DEN_Marker_textPlural"], + true, + false +] call CBA_fnc_addSetting; + +[ + QGVAR(enableMarkerAlpha), + "CHECKBOX", + "STR_3DEN_Marker_Attribute_Alpha_displayName", + [LSTRING(DisplayName), "STR_3DEN_Marker_textPlural"], + true, + false +] call CBA_fnc_addSetting; diff --git a/addons/damage/XEH_preInit.sqf b/addons/damage/XEH_preInit.sqf index 07511da51..5180b3587 100644 --- a/addons/damage/XEH_preInit.sqf +++ b/addons/damage/XEH_preInit.sqf @@ -6,6 +6,8 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; +#include "initSettings.sqf" + [QGVAR(setHitPointsDamage), { params ["_vehicle", "_damageValues"]; @@ -21,7 +23,7 @@ PREP_RECOMPILE_END; [_entity] call FUNC(configure); }, { - alive _entity && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}} + GVAR(enableDamage) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}} } ] call EFUNC(attributes,addButton); diff --git a/addons/damage/initSettings.sqf b/addons/damage/initSettings.sqf new file mode 100644 index 000000000..0e6811a3e --- /dev/null +++ b/addons/damage/initSettings.sqf @@ -0,0 +1,8 @@ +[ + QGVAR(enableDamage), + "CHECKBOX", + "STR_A3_NormalDamage1", + [ELSTRING(attributes,DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; diff --git a/addons/garage/XEH_preInit.sqf b/addons/garage/XEH_preInit.sqf index 722ae8119..d87a4b5e2 100644 --- a/addons/garage/XEH_preInit.sqf +++ b/addons/garage/XEH_preInit.sqf @@ -6,6 +6,8 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; +#include "initSettings.sqf" + GVAR(currentTab) = -1; GVAR(helperPos) = [0, 0, -1]; GVAR(camDistance) = 100; @@ -16,7 +18,7 @@ GVAR(camYaw) = -45; "Object", "STR_A3_Garage", {_entity call FUNC(openGarage)}, - {alive _entity && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}, + {GVAR(enableGarage) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}, true ] call EFUNC(attributes,addButton); diff --git a/addons/garage/initSettings.sqf b/addons/garage/initSettings.sqf new file mode 100644 index 000000000..e833cbfcb --- /dev/null +++ b/addons/garage/initSettings.sqf @@ -0,0 +1,8 @@ +[ + QGVAR(enableGarage), + "CHECKBOX", + "STR_A3_Garage", + [ELSTRING(attributes,DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; diff --git a/addons/inventory/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf index 8cd49f810..aace45612 100644 --- a/addons/inventory/XEH_preInit.sqf +++ b/addons/inventory/XEH_preInit.sqf @@ -6,6 +6,8 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; +#include "initSettings.sqf" + // Add inventory button to attribute display [ "Object", @@ -14,7 +16,7 @@ PREP_RECOMPILE_END; [_entity] call FUNC(configure); }, { - alive _entity && {maxLoad _entity > 0} && {!(_entity isKindOf "CAManBase")} + GVAR(enableInventory) && {alive _entity} && {maxLoad _entity > 0} && {!(_entity isKindOf "CAManBase")} } ] call EFUNC(attributes,addButton); diff --git a/addons/inventory/initSettings.sqf b/addons/inventory/initSettings.sqf new file mode 100644 index 000000000..d0c6c2496 --- /dev/null +++ b/addons/inventory/initSettings.sqf @@ -0,0 +1,8 @@ +[ + QGVAR(enableInventory), + "CHECKBOX", + "STR_A3_Gear1", + [ELSTRING(attributes,DisplayName), "STR_3DEN_Object_textPlural"], + true, + false +] call CBA_fnc_addSetting; From 92bbe3d395ac724735924c5660b18a87efacdb99 Mon Sep 17 00:00:00 2001 From: mharis001 Date: Sun, 21 May 2023 11:39:59 -0400 Subject: [PATCH 12/12] Use EGVAR --- addons/damage/XEH_preInit.sqf | 2 +- addons/damage/initSettings.sqf | 2 +- addons/garage/XEH_preInit.sqf | 2 +- addons/garage/initSettings.sqf | 2 +- addons/inventory/XEH_preInit.sqf | 2 +- addons/inventory/initSettings.sqf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/damage/XEH_preInit.sqf b/addons/damage/XEH_preInit.sqf index 5180b3587..7b403d030 100644 --- a/addons/damage/XEH_preInit.sqf +++ b/addons/damage/XEH_preInit.sqf @@ -23,7 +23,7 @@ PREP_RECOMPILE_END; [_entity] call FUNC(configure); }, { - GVAR(enableDamage) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}} + EGVAR(attributes,enableDamage) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}} } ] call EFUNC(attributes,addButton); diff --git a/addons/damage/initSettings.sqf b/addons/damage/initSettings.sqf index 0e6811a3e..348cfb0fc 100644 --- a/addons/damage/initSettings.sqf +++ b/addons/damage/initSettings.sqf @@ -1,5 +1,5 @@ [ - QGVAR(enableDamage), + QEGVAR(attributes,enableDamage), "CHECKBOX", "STR_A3_NormalDamage1", [ELSTRING(attributes,DisplayName), "STR_3DEN_Object_textPlural"], diff --git a/addons/garage/XEH_preInit.sqf b/addons/garage/XEH_preInit.sqf index d87a4b5e2..1c32c3e3f 100644 --- a/addons/garage/XEH_preInit.sqf +++ b/addons/garage/XEH_preInit.sqf @@ -18,7 +18,7 @@ GVAR(camYaw) = -45; "Object", "STR_A3_Garage", {_entity call FUNC(openGarage)}, - {GVAR(enableGarage) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}, + {EGVAR(attributes,enableGarage) && {alive _entity} && {_entity isKindOf "LandVehicle" || {_entity isKindOf "Air"} || {_entity isKindOf "Ship"}}}, true ] call EFUNC(attributes,addButton); diff --git a/addons/garage/initSettings.sqf b/addons/garage/initSettings.sqf index e833cbfcb..25682da04 100644 --- a/addons/garage/initSettings.sqf +++ b/addons/garage/initSettings.sqf @@ -1,5 +1,5 @@ [ - QGVAR(enableGarage), + QEGVAR(attributes,enableGarage), "CHECKBOX", "STR_A3_Garage", [ELSTRING(attributes,DisplayName), "STR_3DEN_Object_textPlural"], diff --git a/addons/inventory/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf index aace45612..d549bdf95 100644 --- a/addons/inventory/XEH_preInit.sqf +++ b/addons/inventory/XEH_preInit.sqf @@ -16,7 +16,7 @@ PREP_RECOMPILE_END; [_entity] call FUNC(configure); }, { - GVAR(enableInventory) && {alive _entity} && {maxLoad _entity > 0} && {!(_entity isKindOf "CAManBase")} + EGVAR(attributes,enableInventory) && {alive _entity} && {maxLoad _entity > 0} && {!(_entity isKindOf "CAManBase")} } ] call EFUNC(attributes,addButton); diff --git a/addons/inventory/initSettings.sqf b/addons/inventory/initSettings.sqf index d0c6c2496..d8dddd58e 100644 --- a/addons/inventory/initSettings.sqf +++ b/addons/inventory/initSettings.sqf @@ -1,5 +1,5 @@ [ - QGVAR(enableInventory), + QEGVAR(attributes,enableInventory), "CHECKBOX", "STR_A3_Gear1", [ELSTRING(attributes,DisplayName), "STR_3DEN_Object_textPlural"],