From 024158db5bc71d51f5ad94225b69765677f76ac7 Mon Sep 17 00:00:00 2001 From: Timi007 Date: Fri, 29 Oct 2021 15:49:42 +0200 Subject: [PATCH 1/3] Move zeus category name to stringtable --- addons/zeus/functions/fnc_moduleArtillery.sqf | 2 +- addons/zeus/functions/fnc_moduleTargetKnowledge.sqf | 6 +++--- addons/zeus/functions/fnc_moduleUnflipVehicle.sqf | 2 +- addons/zeus/stringtable.xml | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/zeus/functions/fnc_moduleArtillery.sqf b/addons/zeus/functions/fnc_moduleArtillery.sqf index cca0fa5..5af1f6e 100644 --- a/addons/zeus/functions/fnc_moduleArtillery.sqf +++ b/addons/zeus/functions/fnc_moduleArtillery.sqf @@ -16,7 +16,7 @@ * */ -["Metis", LLSTRING(artillery), +[LLSTRING(categoryName), LLSTRING(artillery), { params [["_modulePosition", [0,0,0], [[]]]]; diff --git a/addons/zeus/functions/fnc_moduleTargetKnowledge.sqf b/addons/zeus/functions/fnc_moduleTargetKnowledge.sqf index 5ef0ea1..82071f0 100644 --- a/addons/zeus/functions/fnc_moduleTargetKnowledge.sqf +++ b/addons/zeus/functions/fnc_moduleTargetKnowledge.sqf @@ -16,7 +16,7 @@ * */ -["Metis", LLSTRING(AI_targetKnowledge), +[LLSTRING(categoryName), LLSTRING(AI_targetKnowledge), { params ["", "_attachedObj"]; [_attachedObj] call FUNC(getTargetKnowledge); @@ -24,7 +24,7 @@ "\a3\ui_f\data\igui\cfg\holdactions\holdaction_search_ca.paa" ] call zen_custom_modules_fnc_register; -["Metis", LLSTRING(AI_forgetTarget), +[LLSTRING(categoryName), LLSTRING(AI_forgetTarget), { params ["", "_attachedObj"]; ["FORGET", [_attachedObj]] call FUNC(setTargetKnowledge); @@ -32,7 +32,7 @@ "\a3\ui_f\data\igui\cfg\simpletasks\types\unknown_ca.paa" ] call zen_custom_modules_fnc_register; -["Metis", LLSTRING(AI_revealTarget), +[LLSTRING(categoryName), LLSTRING(AI_revealTarget), { params ["", "_attachedObj"]; ["REVEAL", [_attachedObj]] call FUNC(setTargetKnowledge); diff --git a/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf b/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf index fd38e44..d62426e 100644 --- a/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf +++ b/addons/zeus/functions/fnc_moduleUnflipVehicle.sqf @@ -16,7 +16,7 @@ * */ -["Metis", LLSTRING(unflipVehicle), +[LLSTRING(categoryName), LLSTRING(unflipVehicle), { params["", ["_vehicle", objNull, [objNull]]]; diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index 0f07110..ca22616 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -1,6 +1,12 @@ + + + Metis + Metis + + Metis Zeus From e9885288ef522598c45620ef130d127dfe71403f Mon Sep 17 00:00:00 2001 From: Timi007 Date: Fri, 29 Oct 2021 16:00:35 +0200 Subject: [PATCH 2/3] Replace 2 edit boxes with vector --- addons/zeus/functions/fnc_artyFireMissionHE.sqf | 2 +- addons/zeus/functions/fnc_moduleArtillery.sqf | 3 +-- addons/zeus/stringtable.xml | 10 +++------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/addons/zeus/functions/fnc_artyFireMissionHE.sqf b/addons/zeus/functions/fnc_artyFireMissionHE.sqf index ca7300c..50fc8ff 100644 --- a/addons/zeus/functions/fnc_artyFireMissionHE.sqf +++ b/addons/zeus/functions/fnc_artyFireMissionHE.sqf @@ -31,7 +31,7 @@ params [ LLSTRING(artillery_firemission_he), [ ["EDIT", LLSTRING(artillery_ammoAmount), ["4"]], - ["COMBO", LLSTRING(artillery_airburst), [[0, 1, 2 , 3], [LLSTRING(artillery_airburst_no), LLSTRING(artillery_airburst_low), LLSTRING(artillery_airburst_med), LLSTRING(artillery_airburst_high)], 0]], + ["COMBO", LLSTRING(artillery_airburst), [[0, 1, 2, 3], [LLSTRING(artillery_airburst_no), LLSTRING(artillery_airburst_low), LLSTRING(artillery_airburst_med), LLSTRING(artillery_airburst_high)], 0]], ["COMBO", LLSTRING(artillery_delayType), [[0, 1, 2], [LLSTRING(artillery_delay), LLSTRING(artillery_durationWithAmmo), LLSTRING(artillery_durationWithDelay)], 0]], ["EDIT", LLSTRING(artillery_delay), ["1"]], ["EDIT", LLSTRING(artillery_duration), ["60"]] diff --git a/addons/zeus/functions/fnc_moduleArtillery.sqf b/addons/zeus/functions/fnc_moduleArtillery.sqf index 5af1f6e..af02d4e 100644 --- a/addons/zeus/functions/fnc_moduleArtillery.sqf +++ b/addons/zeus/functions/fnc_moduleArtillery.sqf @@ -26,8 +26,7 @@ [ ["COMBO", LLSTRING(artillery_ammoType), [[0, 1, 2, 3], ["HE (155mm)","HE (82mm)","SMOKE","ILLUM"], 0]], ["COMBO", LLSTRING(artillery_centerPositionType), [[0, 1], [LLSTRING(artillery_modulePos), LLSTRING(artillery_customPos)], 0]], - ["EDIT", LLSTRING(artillery_centerPositionXPos), ["0000"]], - ["EDIT", LLSTRING(artillery_centerPositionYPos), ["0000"]], + ["VECTOR", LLSTRING(artillery_centerPosition), [[0, 0]]], ["EDIT", LLSTRING(artillery_areaLenght), ["100"]], ["EDIT", LLSTRING(artillery_areaWidth), ["100"]], ["EDIT", LLSTRING(artillery_areaAngle), ["0000"]], diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index ca22616..e4625d3 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -94,13 +94,9 @@ Target location Zielort - - X Coordinate (Target location only) - X Koordinate (nur Zielort) - - - Y Coordinate (Target location only) - Y Koordinate (nur Zielort) + + Coordinate (Target location only) + Koordinate (nur Zielort) Total amount of shells From d7c5512351f4d5bef1a61d1892dbf45cbef269e9 Mon Sep 17 00:00:00 2001 From: Timi007 Date: Fri, 29 Oct 2021 16:22:15 +0200 Subject: [PATCH 3/3] Revert "Replace 2 edit boxes with vector" This reverts commit e9885288ef522598c45620ef130d127dfe71403f. --- addons/zeus/functions/fnc_artyFireMissionHE.sqf | 2 +- addons/zeus/functions/fnc_moduleArtillery.sqf | 3 ++- addons/zeus/stringtable.xml | 10 +++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/zeus/functions/fnc_artyFireMissionHE.sqf b/addons/zeus/functions/fnc_artyFireMissionHE.sqf index 50fc8ff..ca7300c 100644 --- a/addons/zeus/functions/fnc_artyFireMissionHE.sqf +++ b/addons/zeus/functions/fnc_artyFireMissionHE.sqf @@ -31,7 +31,7 @@ params [ LLSTRING(artillery_firemission_he), [ ["EDIT", LLSTRING(artillery_ammoAmount), ["4"]], - ["COMBO", LLSTRING(artillery_airburst), [[0, 1, 2, 3], [LLSTRING(artillery_airburst_no), LLSTRING(artillery_airburst_low), LLSTRING(artillery_airburst_med), LLSTRING(artillery_airburst_high)], 0]], + ["COMBO", LLSTRING(artillery_airburst), [[0, 1, 2 , 3], [LLSTRING(artillery_airburst_no), LLSTRING(artillery_airburst_low), LLSTRING(artillery_airburst_med), LLSTRING(artillery_airburst_high)], 0]], ["COMBO", LLSTRING(artillery_delayType), [[0, 1, 2], [LLSTRING(artillery_delay), LLSTRING(artillery_durationWithAmmo), LLSTRING(artillery_durationWithDelay)], 0]], ["EDIT", LLSTRING(artillery_delay), ["1"]], ["EDIT", LLSTRING(artillery_duration), ["60"]] diff --git a/addons/zeus/functions/fnc_moduleArtillery.sqf b/addons/zeus/functions/fnc_moduleArtillery.sqf index af02d4e..5af1f6e 100644 --- a/addons/zeus/functions/fnc_moduleArtillery.sqf +++ b/addons/zeus/functions/fnc_moduleArtillery.sqf @@ -26,7 +26,8 @@ [ ["COMBO", LLSTRING(artillery_ammoType), [[0, 1, 2, 3], ["HE (155mm)","HE (82mm)","SMOKE","ILLUM"], 0]], ["COMBO", LLSTRING(artillery_centerPositionType), [[0, 1], [LLSTRING(artillery_modulePos), LLSTRING(artillery_customPos)], 0]], - ["VECTOR", LLSTRING(artillery_centerPosition), [[0, 0]]], + ["EDIT", LLSTRING(artillery_centerPositionXPos), ["0000"]], + ["EDIT", LLSTRING(artillery_centerPositionYPos), ["0000"]], ["EDIT", LLSTRING(artillery_areaLenght), ["100"]], ["EDIT", LLSTRING(artillery_areaWidth), ["100"]], ["EDIT", LLSTRING(artillery_areaAngle), ["0000"]], diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index e4625d3..ca22616 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -94,9 +94,13 @@ Target location Zielort - - Coordinate (Target location only) - Koordinate (nur Zielort) + + X Coordinate (Target location only) + X Koordinate (nur Zielort) + + + Y Coordinate (Target location only) + Y Koordinate (nur Zielort) Total amount of shells