From 7893d9f359937bee6d2886f0d5054cfbf73341d1 Mon Sep 17 00:00:00 2001 From: nomisum Date: Wed, 14 Oct 2015 00:52:14 +0200 Subject: [PATCH] localization, buy menu, story --- init.sqf | 2 +- mission_setup/teleport.sqf | 3 +- player/bluforOpforTeleportListener.sqf | 25 +--- spawn/gui/_dialogs.hpp | 176 ++++++++++++------------- spawn/gui/dialogConvertFunctions.sqf | 40 +++--- spawn/gui/refreshRussianUI.sqf | 63 +++++---- spawn/gui/refreshUSUI.sqf | 63 +++++---- stringtable.xml | 78 +++++++++-- 8 files changed, 253 insertions(+), 197 deletions(-) diff --git a/init.sqf b/init.sqf index dfa2a424..ec777d06 100644 --- a/init.sqf +++ b/init.sqf @@ -163,7 +163,7 @@ if (hasInterface) then { checkSpawnButton = { if (player != opfor_teamlead) then { - 0 = [[worldSize/2,worldSize/2,0],"Breaking Contact - Waiting for Spawn."] execVM "helpers\establishingShot.sqf"; + 0 = [[worldSize/2,worldSize/2,0],""] execVM "helpers\establishingShot.sqf"; } else { disableSerialization; waitUntil {!(isNull ([] call BIS_fnc_displayMission))}; diff --git a/mission_setup/teleport.sqf b/mission_setup/teleport.sqf index f0e39dd2..4c455496 100644 --- a/mission_setup/teleport.sqf +++ b/mission_setup/teleport.sqf @@ -3,7 +3,8 @@ checkWater = { if (surfaceIsWater _this) then { - throw ((str _pos) + " is covered in water :("); // localize "str_GRAD_spawn_on_water" // [] call EFUNC(common,displayTextStructured); + _string = localize "str_GRAD_spawn_on_water"; + [_string] call EFUNC(common,displayTextStructured); // }; }; diff --git a/player/bluforOpforTeleportListener.sqf b/player/bluforOpforTeleportListener.sqf index 5c0ab5db..24be7105 100644 --- a/player/bluforOpforTeleportListener.sqf +++ b/player/bluforOpforTeleportListener.sqf @@ -1,29 +1,6 @@ -createBluforSpawnLimitsMarkers = { - _pos = _this; - /*_inner_marker = createMarkerLocal ["inner_marker", _pos]; - _inner_marker setMarkerTypeLocal "mil_unknown"; - _inner_marker setMarkerColorLocal "ColorEast"; - _inner_marker setMarkerShapeLocal "ELLIPSE"; - _inner_marker setMarkerSizeLocal [BLUFOR_SPAWN_DISTANCE, BLUFOR_SPAWN_DISTANCE]; - _inner_marker setMarkerBrushLocal "SolidBorder"; - - _outer_marker = createMarkerLocal ["outer_marker", _pos]; - _outer_marker setMarkerTypeLocal "mil_unknown"; - _outer_marker setMarkerColorLocal "ColorEast"; - _outer_marker setMarkerShapeLocal "ELLIPSE"; - _outer_marker setMarkerSizeLocal [BLUFOR_SPAWN_DISTANCE, BLUFOR_SPAWN_DISTANCE]; - _outer_marker setMarkerBrushLocal "Border";*/ -}; - _OPFOR_TELEPORT_TARGET_listener = { _pos = _this select 1; - - - _pos call createBluforSpawnLimitsMarkers; - if (player == blufor_teamlead) then { - hintSilent "Jetzt Spawnpunkt aussuchen!"; - }; - + // do nothing at all : TODO CLEANUP }; "OPFOR_TELEPORT_TARGET" addPublicVariableEventHandler _OPFOR_TELEPORT_TARGET_listener; diff --git a/spawn/gui/_dialogs.hpp b/spawn/gui/_dialogs.hpp index 8c0bb302..eeebd1d0 100644 --- a/spawn/gui/_dialogs.hpp +++ b/spawn/gui/_dialogs.hpp @@ -27,92 +27,92 @@ class russianSupplyGUI class russian_gui_btn_anfordern_1: RscButton { idc = 1501; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = -3 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_btn_anfordern_2: RscButton { idc = 1502; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_btn_anfordern_3: RscButton { idc = 1503; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 12.5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_btn_anfordern_4: RscButton { idc = 1504; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 20 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_btn_anfordern_5: RscButton { idc = 1505; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 27.5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_btn_anfordern_6: RscButton { idc = 1506; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 35 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_btn_anfordern_7: RscButton { idc = 1507; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 42.5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; }; class russian_gui_pic_1: RscPicture @@ -322,9 +322,9 @@ class russianSupplyGUI { idc = 1301; text = "lade ..."; - x = -3 * GUI_GRID_W + GUI_GRID_X; + x = -3.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -332,9 +332,9 @@ class russianSupplyGUI { idc = 1302; text = "lade ..."; - x = 5 * GUI_GRID_W + GUI_GRID_X; + x = 4.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -342,9 +342,9 @@ class russianSupplyGUI { idc = 1303; text = "lade ..."; - x = 12.5 * GUI_GRID_W + GUI_GRID_X; + x = 12 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -352,9 +352,9 @@ class russianSupplyGUI { idc = 1304; text = "lade ..."; - x = 20 * GUI_GRID_W + GUI_GRID_X; + x = 19.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -362,9 +362,9 @@ class russianSupplyGUI { idc = 1305; text = "lade ..."; - x = 27.5 * GUI_GRID_W + GUI_GRID_X; + x = 27 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -372,9 +372,9 @@ class russianSupplyGUI { idc = 1306; text = "lade ..."; - x = 35 * GUI_GRID_W + GUI_GRID_X; + x = 34.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -382,46 +382,45 @@ class russianSupplyGUI { idc = 1307; text = "lade ..."; - x = 42.5 * GUI_GRID_W + GUI_GRID_X; + x = 42 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; - class russian_gui_text_legend_price: RscStructuredText + class russian_gui_text_legend_namedisplay: RscStructuredText { - idc = -1; - text = "Kosten"; + idc = 1401; + text = $STR_GRAD_buy_legend_vehicle; x = -9 * GUI_GRID_W + GUI_GRID_X; - y = 14 * GUI_GRID_H + GUI_GRID_Y; + y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 5 * GUI_GRID_W; h = 1 * GUI_GRID_H; - colorText[] = {1,1,1,0.5}; + colorText[] = {0.5,0.5,0.5,1}; colorBackground[] = {-1,-1,-1,0}; }; - class russian_gui_text_legend_countleft: RscStructuredText + class russian_gui_text_legend_price: RscStructuredText { - idc = -1; - text = "Anzahl verf."; + idc = 1402; + text = $STR_GRAD_buy_legend_price; x = -9 * GUI_GRID_W + GUI_GRID_X; - y = 12 * GUI_GRID_H + GUI_GRID_Y; + y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 5 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorText[] = {1,1,1,0.5}; colorBackground[] = {-1,-1,-1,0}; }; - class russian_gui_text_legend_namedisplay: RscStructuredText + class russian_gui_text_legend_countleft: RscStructuredText { - idc = -1; - text = "Fahrzeug"; + idc = 1403; + text = $STR_GRAD_buy_legend_count; x = -9 * GUI_GRID_W + GUI_GRID_X; - y = 10 * GUI_GRID_H + GUI_GRID_Y; + y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 5 * GUI_GRID_W; h = 1 * GUI_GRID_H; - colorText[] = {0.5,0.5,0.5,1}; + colorText[] = {1,1,1,0.5}; colorBackground[] = {-1,-1,-1,0}; }; - class russian_gui_text_headline: RscStructuredTextHeadline { idc = 1600; @@ -442,13 +441,13 @@ class russianSupplyGUI w = 4.5 * GUI_GRID_W; h = 2.5 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; - tooltip = "Verbleibende Credits"; + tooltip = $STR_GRAD_buy_credits_hint; lineSpacing = 0.4; }; class russian_gui_btn_close: RscButtonSmall { idc = -1; - text = "Schließen"; + text = $STR_GRAD_buy_exit; x = 43.5 * GUI_GRID_W + GUI_GRID_X; y = 1 * GUI_GRID_H + GUI_GRID_Y; w = 5 * GUI_GRID_W; @@ -495,92 +494,92 @@ class USSupplyGUI class US_gui_btn_anfordern_1: RscButton { idc = 3501; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = -3 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_btn_anfordern_2: RscButton { idc = 3502; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_btn_anfordern_3: RscButton { idc = 3503; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 12.5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_btn_anfordern_4: RscButton { idc = 3504; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 20 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_btn_anfordern_5: RscButton { idc = 3505; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 27.5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_btn_anfordern_6: RscButton { idc = 3506; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 35 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_btn_anfordern_7: RscButton { idc = 3507; - text = "Anfordern"; + text = $STR_GRAD_buy_order; x = 42.5 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,1}; - tooltip = "Fahrzeug anfordern"; + tooltip = $STR_GRAD_buy_order_hint; onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderUSVehicle.sqf';"; }; class US_gui_pic_1: RscPicture @@ -790,9 +789,9 @@ class USSupplyGUI { idc = 3301; text = "lade ..."; - x = -3 * GUI_GRID_W + GUI_GRID_X; + x = -3.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -800,9 +799,9 @@ class USSupplyGUI { idc = 3302; text = "lade ..."; - x = 5 * GUI_GRID_W + GUI_GRID_X; + x = 3.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -810,9 +809,9 @@ class USSupplyGUI { idc = 3303; text = "lade ..."; - x = 12.5 * GUI_GRID_W + GUI_GRID_X; + x = 12 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -820,9 +819,9 @@ class USSupplyGUI { idc = 3304; text = "lade ..."; - x = 20 * GUI_GRID_W + GUI_GRID_X; + x = 19.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -830,9 +829,9 @@ class USSupplyGUI { idc = 3305; text = "lade ..."; - x = 27.5 * GUI_GRID_W + GUI_GRID_X; + x = 27 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -840,9 +839,9 @@ class USSupplyGUI { idc = 3306; text = "lade ..."; - x = 35 * GUI_GRID_W + GUI_GRID_X; + x = 34.5 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; @@ -850,15 +849,26 @@ class USSupplyGUI { idc = 3307; text = "lade ..."; - x = 42.5 * GUI_GRID_W + GUI_GRID_X; + x = 42 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; - w = 6 * GUI_GRID_W; + w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; }; + class US_gui_text_legend_namedisplay: RscStructuredText + { + idc = 3401; + text = "Fahrzeug"; + x = -9 * GUI_GRID_W + GUI_GRID_X; + y = 10 * GUI_GRID_H + GUI_GRID_Y; + w = 5 * GUI_GRID_W; + h = 1 * GUI_GRID_H; + colorText[] = {0.5,0.5,0.5,1}; + colorBackground[] = {-1,-1,-1,0}; + }; class US_gui_text_legend_price: RscStructuredText { - idc = -1; + idc = 3402; text = "Kosten"; x = -9 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; @@ -869,7 +879,7 @@ class USSupplyGUI }; class US_gui_text_legend_countleft: RscStructuredText { - idc = -1; + idc = 3403; text = "Anzahl verf."; x = -9 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; @@ -878,18 +888,6 @@ class USSupplyGUI colorText[] = {1,1,1,0.5}; colorBackground[] = {-1,-1,-1,0}; }; - class US_gui_text_legend_namedisplay: RscStructuredText - { - idc = -1; - text = "Fahrzeug"; - x = -9 * GUI_GRID_W + GUI_GRID_X; - y = 10 * GUI_GRID_H + GUI_GRID_Y; - w = 5 * GUI_GRID_W; - h = 1 * GUI_GRID_H; - colorText[] = {0.5,0.5,0.5,1}; - colorBackground[] = {-1,-1,-1,0}; - }; - class US_gui_text_headline: RscStructuredTextHeadline { idc = 3600; @@ -910,13 +908,13 @@ class USSupplyGUI w = 4.5 * GUI_GRID_W; h = 2.5 * GUI_GRID_H; colorBackground[] = {-1,-1,-1,0}; - tooltip = "Verbleibende Credits"; + tooltip = $STR_GRAD_buy_credits_hint; lineSpacing = 0.4; }; class US_gui_btn_close: RscButtonSmall { idc = -1; - text = "Schließen"; + text = $STR_GRAD_buy_exit; x = 43.5 * GUI_GRID_W + GUI_GRID_X; y = 1 * GUI_GRID_H + GUI_GRID_Y; w = 5 * GUI_GRID_W; diff --git a/spawn/gui/dialogConvertFunctions.sqf b/spawn/gui/dialogConvertFunctions.sqf index e53fcb17..4c1eb99a 100644 --- a/spawn/gui/dialogConvertFunctions.sqf +++ b/spawn/gui/dialogConvertFunctions.sqf @@ -8,6 +8,14 @@ creditString = { _string }; +pricedisplayString = { + _price = _this select 0; + + _string = "" + _price + " cr "; + + _string +}; + // RUSSIANS @@ -149,17 +157,17 @@ russian_IDC_to_pricedisplay = { switch (_idc) do { - case 1501: { _pricedisplay = ((russianSupplies select 1) select 4); }; - case 1502: { _pricedisplay = ((russianSupplies select 2) select 4); }; - case 1503: { _pricedisplay = ((russianSupplies select 3) select 4); }; - case 1504: { _pricedisplay = ((russianSupplies select 4) select 4); }; - case 1505: { _pricedisplay = ((russianSupplies select 5) select 4); }; - case 1506: { _pricedisplay = ((russianSupplies select 6) select 4); }; - case 1507: { _pricedisplay = ((russianSupplies select 7) select 4); }; + case 1501: { _pricedisplay = ((russianSupplies select 1) select 3); }; + case 1502: { _pricedisplay = ((russianSupplies select 2) select 3); }; + case 1503: { _pricedisplay = ((russianSupplies select 3) select 3); }; + case 1504: { _pricedisplay = ((russianSupplies select 4) select 3); }; + case 1505: { _pricedisplay = ((russianSupplies select 5) select 3); }; + case 1506: { _pricedisplay = ((russianSupplies select 6) select 3); }; + case 1507: { _pricedisplay = ((russianSupplies select 7) select 3); }; default {}; }; - _pricedisplaystring = [_pricedisplay] call creditString; + _pricedisplaystring = [_pricedisplay] call pricedisplayString; _pricedisplaystring @@ -376,17 +384,17 @@ US_IDC_to_pricedisplay = { switch (_idc) do { - case 3501: { _pricedisplay = ((USSupplies select 1) select 4); }; - case 3502: { _pricedisplay = ((USSupplies select 2) select 4); }; - case 3503: { _pricedisplay = ((USSupplies select 3) select 4); }; - case 3504: { _pricedisplay = ((USSupplies select 4) select 4); }; - case 3505: { _pricedisplay = ((USSupplies select 5) select 4); }; - case 3506: { _pricedisplay = ((USSupplies select 6) select 4); }; - case 3507: { _pricedisplay = ((USSupplies select 7) select 4); }; + case 3501: { _pricedisplay = ((USSupplies select 1) select 3); }; + case 3502: { _pricedisplay = ((USSupplies select 2) select 3); }; + case 3503: { _pricedisplay = ((USSupplies select 3) select 3); }; + case 3504: { _pricedisplay = ((USSupplies select 4) select 3); }; + case 3505: { _pricedisplay = ((USSupplies select 5) select 3); }; + case 3506: { _pricedisplay = ((USSupplies select 6) select 3); }; + case 3507: { _pricedisplay = ((USSupplies select 7) select 3); }; default {}; }; - _pricedisplaystring = [_pricedisplay] call creditString; + _pricedisplaystring = [_pricedisplay] call pricedisplayString; _pricedisplaystring diff --git a/spawn/gui/refreshRussianUI.sqf b/spawn/gui/refreshRussianUI.sqf index bbb1f75b..13086172 100644 --- a/spawn/gui/refreshRussianUI.sqf +++ b/spawn/gui/refreshRussianUI.sqf @@ -27,8 +27,9 @@ resetRussianUI = { disableSerialization; - _buttonRelease = "Anfordern"; - _headlineRelease = ["Nachschub anfordern"] call headlineString; + _buttonRelease = localize "str_GRAD_buy_order"; + _headlineString = localize "str_GRAD_buy_headline"; + _headlineRelease = [_headlineString] call headlineString; disableSerialization; _display = findDisplay 1000; @@ -60,8 +61,8 @@ refreshRussianOrder = { // if (DEBUG) then { diag_log format ["_bool is %1, _eta is %2",_bool, _eta];}; - _headlineBlocked = "Anforderung läuft"; - _refreshPleasewait = format ["noch %1 s",_eta]; + _headlineBlocked = localize "str_GRAD_buy_calling"; + _refreshPleasewait = format ["ETA %1 s",_eta]; if (_bool) then { @@ -113,9 +114,9 @@ refreshRussianUI = { //if (DEBUG) then {diag_log format ["_outOfStockIndicator is %1",_outOfStockIndicator]; }; - _pleasewait = "Bitte warten"; - _headlineBlocked = "Anforderung läuft"; - _moneyLeft = "" + str (_array select 0) + ""; + _pleasewait = localize "str_GRAD_buy_plswait"; + _headlineBlocked = localize "str_GRAD_buy_calling"; + _moneyLeft = "" + str (_array select 0) + " cr "; //diag_log format ["_array is %1, _moneyLeft is %2",_array,_moneyLeft]; @@ -213,85 +214,91 @@ refreshRussianUI = { _namedisplay_1 = (_array select 1) select 1; _countleft_1 = (_array select 1) select 2; - _pricedisplay_1 = (_array select 1) select 3; - _eta_1 = (_array select 1) select 4; + _pricedisplay_1 = (_array select 1) select 4; + //_eta_1 = (_array select 1) select 4; _namedisplay_2 = (_array select 2) select 1; _countleft_2 = (_array select 2) select 2; - _pricedisplay_2 = (_array select 2) select 3; - _eta_2 = (_array select 2) select 4; + _pricedisplay_2 = (_array select 2) select 4; + //_eta_2 = (_array select 2) select 4; _namedisplay_3 = (_array select 3) select 1; _countleft_3 = (_array select 3) select 2; - _pricedisplay_3 = (_array select 3) select 3; - _eta_3 = (_array select 3) select 4; + _pricedisplay_3 = (_array select 3) select 4; + //_eta_3 = (_array select 3) select 4; _namedisplay_4 = (_array select 4) select 1; _countleft_4 = (_array select 4) select 2; - _pricedisplay_4 = (_array select 4) select 3; - _eta_4 = (_array select 4) select 4; + _pricedisplay_4 = (_array select 4) select 4; + //_eta_4 = (_array select 4) select 4; _namedisplay_5 = (_array select 5) select 1; _countleft_5 = (_array select 5) select 2; - _pricedisplay_5 = (_array select 5) select 3; - _eta_5 = (_array select 5) select 4; + _pricedisplay_5 = (_array select 5) select 4; + //_eta_5 = (_array select 5) select 4; _namedisplay_6 = (_array select 6) select 1; _countleft_6 = (_array select 6) select 2; - _pricedisplay_6 = (_array select 6) select 3; - _eta_6 = (_array select 6) select 4; + _pricedisplay_6 = (_array select 6) select 4; + //_eta_6 = (_array select 6) select 4; _namedisplay_7 = (_array select 7) select 1; _countleft_7 = (_array select 7) select 2; - _pricedisplay_7 = (_array select 7) select 3; - _eta_7 = (_array select 7) select 4; + _pricedisplay_7 = (_array select 7) select 4; + //_eta_7 = (_array select 7) select 4; //if (DEBUG) then { diag_log format ["typeName _namedisplay_1: %1",typeName _namedisplay_1]; }; + _name = "" + localize "str_GRAD_buy_legend_vehicle" + ""; + _price = "" + localize "str_GRAD_buy_legend_price" + ""; + _count = "" + localize "str_GRAD_buy_legend_count" + ""; + _display displayCtrl 1401 ctrlSetStructuredText parsetext _name; + _display displayCtrl 1402 ctrlSetStructuredText parsetext _price; + _display displayCtrl 1403 ctrlSetStructuredText parsetext _count; _display displayCtrl 1101 ctrlSetStructuredText parseText ([_namedisplay_1] call centerString); _display displayCtrl 1201 ctrlSetStructuredText parseText ([_countleft_1] call centerAndConvertToString); - _display displayCtrl 1301 ctrlSetStructuredText parseText ([_pricedisplay_1] call centerAndConvertToString); + _display displayCtrl 1301 ctrlSetStructuredText parseText ([_pricedisplay_1] call centerString); //_display displayCtrl 1401 ctrlSetStructuredText parseText _eta_1; // ctrlSetText [1501, _pleasewait]; _display displayCtrl 1102 ctrlSetStructuredText parseText ([_namedisplay_2] call centerString); _display displayCtrl 1202 ctrlSetStructuredText parseText ([_countleft_2] call centerAndConvertToString); - _display displayCtrl 1302 ctrlSetStructuredText parseText ([_pricedisplay_2] call centerAndConvertToString); + _display displayCtrl 1302 ctrlSetStructuredText parseText ([_pricedisplay_2] call centerString); //_display displayCtrl 1402 ctrlSetStructuredText parseText _eta_2; // ctrlSetText [1502, _pleasewait]; _display displayCtrl 1103 ctrlSetStructuredText parseText ([_namedisplay_3] call centerString); _display displayCtrl 1203 ctrlSetStructuredText parseText ([_countleft_3] call centerAndConvertToString); - _display displayCtrl 1303 ctrlSetStructuredText parseText ([_pricedisplay_3] call centerAndConvertToString); + _display displayCtrl 1303 ctrlSetStructuredText parseText ([_pricedisplay_3] call centerString); //_display displayCtrl 1403 ctrlSetStructuredText parseText _eta_3; // ctrlSetText [1503, _pleasewait]; _display displayCtrl 1104 ctrlSetStructuredText parseText ([_namedisplay_4] call centerString); _display displayCtrl 1204 ctrlSetStructuredText parseText ([_countleft_4] call centerAndConvertToString); - _display displayCtrl 1304 ctrlSetStructuredText parseText ([_pricedisplay_4] call centerAndConvertToString); + _display displayCtrl 1304 ctrlSetStructuredText parseText ([_pricedisplay_4] call centerString); //_display displayCtrl 1404 ctrlSetStructuredText parseText _eta_4; // ctrlSetText [1504, _pleasewait]; _display displayCtrl 1105 ctrlSetStructuredText parseText ([_namedisplay_5] call centerString); _display displayCtrl 1205 ctrlSetStructuredText parseText ([_countleft_5] call centerAndConvertToString); - _display displayCtrl 1305 ctrlSetStructuredText parseText ([_pricedisplay_5] call centerAndConvertToString); + _display displayCtrl 1305 ctrlSetStructuredText parseText ([_pricedisplay_5] call centerString); _display displayCtrl 1106 ctrlSetStructuredText parseText ([_namedisplay_6] call centerString); _display displayCtrl 1206 ctrlSetStructuredText parseText ([_countleft_6] call centerAndConvertToString); - _display displayCtrl 1306 ctrlSetStructuredText parseText ([_pricedisplay_6] call centerAndConvertToString); + _display displayCtrl 1306 ctrlSetStructuredText parseText ([_pricedisplay_6] call centerString); _display displayCtrl 1107 ctrlSetStructuredText parseText ([_namedisplay_7] call centerString); _display displayCtrl 1207 ctrlSetStructuredText parseText ([_countleft_7] call centerAndConvertToString); - _display displayCtrl 1307 ctrlSetStructuredText parseText ([_pricedisplay_7] call centerAndConvertToString); + _display displayCtrl 1307 ctrlSetStructuredText parseText ([_pricedisplay_7] call centerString); disableSerialization; diff --git a/spawn/gui/refreshUSUI.sqf b/spawn/gui/refreshUSUI.sqf index 82829414..2c956d02 100644 --- a/spawn/gui/refreshUSUI.sqf +++ b/spawn/gui/refreshUSUI.sqf @@ -2,8 +2,8 @@ resetUSUI = { disableSerialization; - _buttonRelease = "Anfordern"; - _headlineRelease = ["Nachschub anfordern"] call headlineString; + _buttonRelease = localize "str_GRAD_buy_order"; + _headlineString = localize "str_GRAD_buy_headline"; disableSerialization; _display = findDisplay 3000; @@ -35,8 +35,8 @@ refreshUSOrder = { //if (DEBUG) then { diag_log format ["_bool is %1, _eta is %2",_bool, _eta];}; - _headlineBlocked = "Anforderung läuft"; - _refreshPleasewait = format ["noch %1 s",_eta]; + _headlineBlocked = localize "str_GRAD_buy_calling"; + _refreshPleasewait = format ["ETA %1 s",_eta]; if (_bool) then { @@ -86,9 +86,9 @@ refreshUSUI = { //if (DEBUG) then {diag_log format ["_outOfStockIndicator is %1",_outOfStockIndicator]; }; - _pleasewait = "Bitte warten"; - _headlineBlocked = "Anforderung läuft"; - _moneyLeft = "" + str (_array select 0) + ""; + _pleasewait = localize "str_GRAD_buy_plswait"; + _headlineBlocked = localize "str_GRAD_buy_calling"; + _moneyLeft = "" + str (_array select 0) + " cr "; disableSerialization; @@ -194,85 +194,90 @@ refreshUSUI = { _namedisplay_1 = (_array select 1) select 1; _countleft_1 = (_array select 1) select 2; - _pricedisplay_1 = (_array select 1) select 3; - _eta_1 = (_array select 1) select 4; + _pricedisplay_1 = (_array select 1) select 4; + //_eta_1 = (_array select 1) select 4; _namedisplay_2 = (_array select 2) select 1; _countleft_2 = (_array select 2) select 2; - _pricedisplay_2 = (_array select 2) select 3; - _eta_2 = (_array select 2) select 4; + _pricedisplay_2 = (_array select 2) select 4; + //_eta_2 = (_array select 2) select 4; _namedisplay_3 = (_array select 3) select 1; _countleft_3 = (_array select 3) select 2; - _pricedisplay_3 = (_array select 3) select 3; - _eta_3 = (_array select 3) select 4; + _pricedisplay_3 = (_array select 3) select 4; + //_eta_3 = (_array select 3) select 4; _namedisplay_4 = (_array select 4) select 1; _countleft_4 = (_array select 4) select 2; - _pricedisplay_4 = (_array select 4) select 3; - _eta_4 = (_array select 4) select 4; + _pricedisplay_4 = (_array select 4) select 4; + //_eta_4 = (_array select 4) select 4; _namedisplay_5 = (_array select 5) select 1; _countleft_5 = (_array select 5) select 2; - _pricedisplay_5 = (_array select 5) select 3; - _eta_5 = (_array select 5) select 4; + _pricedisplay_5 = (_array select 5) select 4; + //_eta_5 = (_array select 5) select 4; _namedisplay_6 = (_array select 6) select 1; _countleft_6 = (_array select 6) select 2; - _pricedisplay_6 = (_array select 6) select 3; - _eta_6 = (_array select 6) select 4; + _pricedisplay_6 = (_array select 6) select 4; + //_eta_6 = (_array select 6) select 4; _namedisplay_7 = (_array select 7) select 1; _countleft_7 = (_array select 7) select 2; - _pricedisplay_7 = (_array select 7) select 3; - _eta_7 = (_array select 7) select 4; + _pricedisplay_7 = (_array select 7) select 4; + //_eta_7 = (_array select 7) select 4; //if (DEBUG) then { diag_log format ["typeName _namedisplay_1: %1",typeName _namedisplay_1]; }; - + _name = "" + localize "str_GRAD_buy_legend_vehicle" + ""; + _price = "" + localize "str_GRAD_buy_legend_price" + ""; + _count = "" + localize "str_GRAD_buy_legend_count" + ""; + _display displayCtrl 3401 ctrlSetStructuredText parsetext _name; + _display displayCtrl 3402 ctrlSetStructuredText parsetext _price; + _display displayCtrl 3403 ctrlSetStructuredText parsetext _count; _display displayCtrl 3101 ctrlSetStructuredText parseText ([_namedisplay_1] call centerString); _display displayCtrl 3201 ctrlSetStructuredText parseText ([_countleft_1] call centerAndConvertToString); - _display displayCtrl 3301 ctrlSetStructuredText parseText ([_pricedisplay_1] call centerAndConvertToString); + _display displayCtrl 3301 ctrlSetStructuredText parseText ([_pricedisplay_1] call centerString); //_display displayCtrl 1401 ctrlSetStructuredText parseText _eta_1; // ctrlSetText [3501, _pleasewait]; _display displayCtrl 3102 ctrlSetStructuredText parseText ([_namedisplay_2] call centerString); _display displayCtrl 3202 ctrlSetStructuredText parseText ([_countleft_2] call centerAndConvertToString); - _display displayCtrl 3302 ctrlSetStructuredText parseText ([_pricedisplay_2] call centerAndConvertToString); + _display displayCtrl 3302 ctrlSetStructuredText parseText ([_pricedisplay_2] call centerString); //_display displayCtrl 1402 ctrlSetStructuredText parseText _eta_2; // ctrlSetText [3502, _pleasewait]; _display displayCtrl 3103 ctrlSetStructuredText parseText ([_namedisplay_3] call centerString); _display displayCtrl 3203 ctrlSetStructuredText parseText ([_countleft_3] call centerAndConvertToString); - _display displayCtrl 3303 ctrlSetStructuredText parseText ([_pricedisplay_3] call centerAndConvertToString); + _display displayCtrl 3303 ctrlSetStructuredText parseText ([_pricedisplay_3] call centerString); //_display displayCtrl 1403 ctrlSetStructuredText parseText _eta_3; // ctrlSetText [3503, _pleasewait]; _display displayCtrl 3104 ctrlSetStructuredText parseText ([_namedisplay_4] call centerString); _display displayCtrl 3204 ctrlSetStructuredText parseText ([_countleft_4] call centerAndConvertToString); - _display displayCtrl 3304 ctrlSetStructuredText parseText ([_pricedisplay_4] call centerAndConvertToString); + _display displayCtrl 3304 ctrlSetStructuredText parseText ([_pricedisplay_4] call centerString); //_display displayCtrl 1404 ctrlSetStructuredText parseText _eta_4; // ctrlSetText [3504, _pleasewait]; _display displayCtrl 3105 ctrlSetStructuredText parseText ([_namedisplay_5] call centerString); _display displayCtrl 3205 ctrlSetStructuredText parseText ([_countleft_5] call centerAndConvertToString); - _display displayCtrl 3305 ctrlSetStructuredText parseText ([_pricedisplay_5] call centerAndConvertToString); + _display displayCtrl 3305 ctrlSetStructuredText parseText ([_pricedisplay_5] call centerString); _display displayCtrl 3106 ctrlSetStructuredText parseText ([_namedisplay_6] call centerString); _display displayCtrl 3206 ctrlSetStructuredText parseText ([_countleft_6] call centerAndConvertToString); - _display displayCtrl 3306 ctrlSetStructuredText parseText ([_pricedisplay_6] call centerAndConvertToString); + _display displayCtrl 3306 ctrlSetStructuredText parseText ([_pricedisplay_6] call centerString); _display displayCtrl 3107 ctrlSetStructuredText parseText ([_namedisplay_7] call centerString); _display displayCtrl 3207 ctrlSetStructuredText parseText ([_countleft_7] call centerAndConvertToString); - _display displayCtrl 3307 ctrlSetStructuredText parseText ([_pricedisplay_7] call centerAndConvertToString); + _display displayCtrl 3307 ctrlSetStructuredText parseText ([_pricedisplay_7] call centerString); disableSerialization; diff --git a/stringtable.xml b/stringtable.xml index 06680758..507887ba 100644 --- a/stringtable.xml +++ b/stringtable.xml @@ -1,11 +1,11 @@ - - + + - You want to know the full story? Check back later - You want to know the full story? Check back later - Du willst die ganze Wahrheit wissen? Schau später nochmal rein. + Cold war is at the brink of turning hot. CIA has gathered information about so called 'nationalist separatists of Russian origin' who became hold of an military radio truck. They plan to transmit control commands to obsolete russian satellites, spinning them into GPS-satellites, thus disabling NATOs eyes and ears. Even though Moscow denies to have a part in this, uniforms and equipment of the rebels speak another language. Stationed US troops have to strike hard and fast before its too late. + Cold war is at the brink of turning hot. CIA has gathered information about so called 'nationalist separatists of Russian origin' who became hold of an military radio truck. They plan to transmit control commands to obsolete russian satellites, spinning them into GPS-satellites, thus disabling NATOs eyes and ears. Even though Moscow denies to have a part in this, uniforms and equipment of the rebels speak another language. Stationed US troops have to strike hard and fast before its too late. + Der Kalte Krieg ist kurz davor, heiß zu werden. Die CIA hat Informationen über sogenannte 'natonalistische Separatisten russischer Herkunft', die in Besitz eines militärischen Kommunikations-LKW gekommen sind. Mit dessen Hilfe planen sie, Steuerungskommandos an ausgediente russische Satelliten zu senden, diese auf Kollisionskurs zu GPS-Satelliten zu lenken und so der NATO Augen und Ohren zu nehmen. Auch wenn Moskau eine Beteiligung zurückweist, sprechen Uniformen und Ausrüstung der Rebellen eine andere Sprache. Stationierte US-Truppen müssen jetzt hart und schnell zuschlagen, bevor es zu spät ist. @@ -20,13 +20,13 @@ - Both sides can choose from a selection of vehicles to buy at their base (ACE-Interaction). Buying is only possible for Commanders though. While US troops rely on mobile light vehicles and air superiority, Russians have more heavily armored toys to play with. + Both sides can choose from a selection of vehicles to buy at their base (ACE-Interaction). Buying is only possible for Commanders though. While US troops rely on mobile light vehicles and air superiority, Russians have more heavily armored toys to play with. For each player on the server there is a small bonus in money. - Both sides can choose from a selection of vehicles to buy at their base (ACE-Interaction). Buying is only possible for Commanders though. While US troops rely on mobile light vehicles and air superiority, Russians have more heavily armored toys to play with. + Both sides can choose from a selection of vehicles to buy at their base (ACE-Interaction). Buying is only possible for Commanders though. While US troops rely on mobile light vehicles and air superiority, Russians have more heavily armored toys to play with. For each player on the server there is a small bonus in money. - Beide Seiten können eine Auswahl von Fahrzeugen an ihrer Basis kaufen (ACE-Interaktion). Kaufen ist nur für die Commander möglich. Während die Amerikaner sich auf leichte, mobile Fahrzeuge und Luftüberlegenheit verlassen, haben die Russen stärker gepanzerte Fahrzeuge zur Verfügung. + Beide Seiten können eine Auswahl von Fahrzeugen an ihrer Basis kaufen (ACE-Interaktion). Kaufen ist nur für die Commander möglich. Während die Amerikaner sich auf leichte, mobile Fahrzeuge und Luftüberlegenheit verlassen, haben die Russen stärker gepanzerte Fahrzeuge zur Verfügung. Für jeden Spieler auf dem Server gibt es einen kleinen Geldbonus. @@ -146,6 +146,67 @@ Spectator Spettatore + + + + Order + Order + Anfordern + + + Order + Order + Anfordern + + + Order vehicle + Order vehicle + Fahrzeug anfordern + + + Close + Close + Schließen + + + Remaining credits + Remaining credits + Verbleibende Credits + + + Price + Price + Preis + + + Count left + Count left + Anz. verf. + + + Type + Type + Typ + + + Call reinforcements + Call reinforcements + Nachschub anfordern + + + Calling... + Calling... + Anforderung läuft... + + + Please wait. + Please wait. + Bitte warten. + + + + + CSSA3 Initiated. Press 'F1' for more help. You can hide the HUD at any time by pressing 'H' CSSA3 Inizializzato. Premi 'F1' per aiuto. Puoi nascondere l'HUD quando vuoi premendo 'H' @@ -361,6 +422,5 @@ Switch to third person. Passa alla terza persona. -