From 8169bdcd099b9be2b242983655c220bf085b6248 Mon Sep 17 00:00:00 2001 From: nomisum Date: Mon, 21 Mar 2016 01:15:08 +0100 Subject: [PATCH] added detachable radio unit --- init.sqf | 2 +- mission.sqm | 8 +- mission_setup/teleport.sqf | 53 +--- player/radioAttached.sqf | 25 ++ server/russianMarker.sqf | 15 +- server/spawnBluforHQ.sqf | 2 - server/teleportListener.sqf | 19 +- spawn/addInteractions.sqf | 60 +++- spawn/gui/_dialogs.hpp | 154 +++++++--- spawn/gui/addPublicVariableEventhandler.sqf | 19 +- spawn/gui/orderRussianVehicle.sqf | 7 +- spawn/gui/pic/rus_carryradio.paa | Bin 0 -> 46814 bytes spawn/gui/refreshRussianUI.sqf | 17 +- spawn/supplyDropOnMarker.sqf | 59 +--- stringtable.xml | 317 +++----------------- 15 files changed, 314 insertions(+), 443 deletions(-) create mode 100644 player/radioAttached.sqf create mode 100644 spawn/gui/pic/rus_carryradio.paa diff --git a/init.sqf b/init.sqf index 9f68a104..592dcde1 100644 --- a/init.sqf +++ b/init.sqf @@ -244,7 +244,6 @@ if (hasInterface) then { checkJIP = { if ((OPFOR_TELEPORT_TARGET select 0 != 0) && didJIP && time > jipTime) then { player setDamage 1; - ["forced"] spawn CSSA3_fnc_createSpectateDialog; } else { if (!didJIP) exitWith { [] call checkSpawnButton; @@ -323,6 +322,7 @@ if (hasInterface) then { [] execVM "player\opforOpforTeleportListener.sqf"; diag_log format ["setup: opforOpforTeleportListener initiated"]; [] execVM "player\bluforRussianPointsListener.sqf"; [] spawn checkJIP; diag_log format ["setup: createStartHints initiated"]; + player setVariable ["radioAttached",false]; // for use in detaching radio from radio truck }; diff --git a/mission.sqm b/mission.sqm index 9bfaf74b..062303ce 100644 --- a/mission.sqm +++ b/mission.sqm @@ -16,10 +16,10 @@ class EditorData }; class Camera { - pos[]={1653.5035,82.990616,6004.2529}; - dir[]={0.044427481,-0.65623856,0.75325894}; - up[]={0.038638279,0.75455058,0.6551035}; - aside[]={0.99827683,-4.8836228e-007,-0.058877323}; + pos[]={1613.2671,12.056331,5392.2759}; + dir[]={0.16499333,-0.23893414,-0.95695496}; + up[]={0.040601429,0.97103274,-0.23548557}; + aside[]={-0.98549837,7.8856829e-008,-0.16991524}; }; }; binarizationWanted=0; diff --git a/mission_setup/teleport.sqf b/mission_setup/teleport.sqf index f2d6ef2d..7502367c 100644 --- a/mission_setup/teleport.sqf +++ b/mission_setup/teleport.sqf @@ -8,7 +8,18 @@ checkWater = { }; }; -if (str player == "opfor_teamlead") then { +opforTeleporting = { + OPFOR_TELEPORT_TARGET = _this; + publicVariableServer "OPFOR_TELEPORT_TARGET"; + debugLog("opfor published target"); + + OPFOR_TELEPORTED = true; + publicVariable "OPFOR_TELEPORTED"; +}; + +// executed on player only anyway?! +// if (player == opfor_teamlead) then { + [ "teleportClickOpf", "onMapSingleClick", @@ -23,42 +34,4 @@ if (str player == "opfor_teamlead") then { }; } ] call BIS_fnc_addStackedEventHandler; -}; - -if (str player == "blufor_teamlead") then { - [ - "teleportClickBlu", - "onMapSingleClick", - { - try { - if (OPFOR_TELEPORT_TARGET select 0 == 0) then { throw "opfor not yet teleported" }; - - ["teleportClickBlu", "onMapSingleClick"] call BIS_fnc_removeStackedEventHandler; - - //_pos call bluforTeleporting; - } catch { - hint str _exception; - }; - } - ] call BIS_fnc_addStackedEventHandler; -}; - -opforTeleporting = { - OPFOR_TELEPORT_TARGET = _this; - publicVariableServer "OPFOR_TELEPORT_TARGET"; - debugLog("opfor published target"); - - OPFOR_TELEPORTED = true; - publicVariable "OPFOR_TELEPORTED"; -}; - -bluforTeleporting = { - - BLUFOR_TELEPORT_TARGET = _this; - publicVariableServer "BLUFOR_TELEPORT_TARGET"; - - BLUFOR_TELEPORTED = true; - publicVariable "BLUFOR_TELEPORTED"; -}; - - +// }; \ No newline at end of file diff --git a/player/radioAttached.sqf b/player/radioAttached.sqf new file mode 100644 index 00000000..1c3cfe74 --- /dev/null +++ b/player/radioAttached.sqf @@ -0,0 +1,25 @@ + +// put away weapon +[player] call ace_weaponselect_fnc_putWeaponAway; +sleep 1.1; +radioSuitcaseCarry = "Land_Suitcase_F" createvehicle getpos player; +radioSuitcaseCarry attachTo [player, [-0.03,-.1,-0.26], "RightHandMiddle1"]; +radioSuitcaseCarry setVectorDirAndUp [[1,0,0],[0,0,1]]; +player setVariable ["radioAttached",true]; +publicVariable "radioSuitcaseCarry"; + +// checks +while {true} do { + if (!alive player) exitWith {}; // if player is dead + if (currentWeapon player != "") exitWith {}; // if player switches to weapon + if (!(player getVariable ["radioAttached",false])) exitWith {}; // if player lost the radio in another way (put it back) + sleep 0.5; +}; + +if (player getVariable ["radioAttached",false]) then { + radioSuitcaseDropped = createVehicle ['Land_SatellitePhone_F', [getPos player select 0, (getPos player select 1) - 0.5,0], [], 0, 'CAN_COLLIDE']; + publicVariable "radioSuitcaseDropped"; +}; + +player setVariable ["radioAttached",false]; +deleteVehicle radioSuitcaseCarry; \ No newline at end of file diff --git a/server/russianMarker.sqf b/server/russianMarker.sqf index 4b70c463..feeec55c 100644 --- a/server/russianMarker.sqf +++ b/server/russianMarker.sqf @@ -10,7 +10,7 @@ bluforSurrendered = { }; funkwagenIsSending = { - ((funkwagen getVariable ["tf_range",0]) == 50000) || (inflamed funkwagen); + ((funkwagen getVariable ["tf_range",0]) == 50000) || funkwagen getVariable ["detachableRadio", 0] == 2; }; booleanEqual = { @@ -61,8 +61,17 @@ sleep 2; // give it time, boy - possible fix for "Undefined variable in expressi if (!alive funkwagen) exitWith { [] call bluforCaptured; }; - - [getPos funkwagen select 0, getPos funkwagen select 1] call setRussianMarkerPosition; + if (funkwagen getVariable ["detachableRadio", 0] == 0 || funkwagen getVariable ["detachableRadio", 0] == 1) then { + [getPos funkwagen select 0, getPos funkwagen select 1] call setRussianMarkerPosition; + } else { + if (!isNil "radioSuitcaseDropped") then { + [getPos radioSuitcaseDropped select 0, getPos radioSuitcaseDropped select 1] call setRussianMarkerPosition; + }; + if (!isNil "radioSuitcaseCarry") then { + [getPos radioSuitcaseCarry select 0, getPos radioSuitcaseCarry select 1] call setRussianMarkerPosition; + }; + }; + sleep 1; }; diff --git a/server/spawnBluforHQ.sqf b/server/spawnBluforHQ.sqf index b458c7c4..f17bd678 100644 --- a/server/spawnBluforHQ.sqf +++ b/server/spawnBluforHQ.sqf @@ -266,8 +266,6 @@ spawnOpforHQ = { /* listener to remove spawn pad and actionhelper, when its time */ BUY_OPTION_OPFOR = { if (BUY_OPTION_OPFOR) exitWith {}; - detach rusActionHelper; - deleteVehicle rusActionHelper; hideObjectGlobal RUS_SPAWN_PAD; }; "BUY_OPTION_OPFOR" addPublicVariableEventHandler BUY_OPTION_OPFOR; diff --git a/server/teleportListener.sqf b/server/teleportListener.sqf index 05fab672..cb0de11c 100644 --- a/server/teleportListener.sqf +++ b/server/teleportListener.sqf @@ -1,23 +1,17 @@ createOpforStuff = { _position = _this; - - if (USE_FIREPLACE_INSTEAD_OF_RADIO_TRUCK) then { - funkwagen = "land_campfire" createVehicle _position; - } else { - funkwagen = [_position, 0, 1, "rhs_gaz66_r142_vv"] call spawnStuff; - }; + + funkwagen = [_position, 0, 1, "rhs_gaz66_r142_vv"] call spawnStuff; + // used for detachable radio unit + funkwagen setVariable ["detachableRadio", 0, true]; sleep 1; [funkwagen] call clearInventory; - + // hide light covers for optical reasons funkwagen animate ["light_hide",1]; sleep 0.1; - rusActionHelper = createVehicle ["Land_SatellitePhone_F", [(getPos funkwagen select 0) + 2, (getPos funkwagen select 1) - 1, 0.5], [], 0, "NONE"]; - rusActionHelper attachTo [funkwagen, [-1.34,-2.26,0.1]]; - rusActionHelper setVectorDirAndUp [[1,0,0],[0,0,1]]; - [getPos funkwagen, 50] call spawnOpforHQ; @@ -51,7 +45,6 @@ _OPFOR_TELEPORT_TARGET_listener = { _BLUFOR_TELEPORT_TARGET_listener = { _pos = _this select 1; publicVariable "BLUFOR_TELEPORT_TARGET"; - [] spawn { sleep 2; // just to make sure no one is missed, send again (dirty fix for spawn prob?) publicVariable "BLUFOR_TELEPORT_TARGET"; @@ -75,4 +68,4 @@ if (!isMultiplayer) then { waitUntil {BLUFOR_TELEPORT_TARGET select 0 != 0}; [0, OPFOR_TELEPORT_TARGET] call _this; }; -}; +}; \ No newline at end of file diff --git a/spawn/addInteractions.sqf b/spawn/addInteractions.sqf index b782604a..087f038f 100644 --- a/spawn/addInteractions.sqf +++ b/spawn/addInteractions.sqf @@ -19,8 +19,6 @@ _rusAction = ["RusBuyMenu", (localize "str_GRAD_buy_vehicles"), "", }, {side player == east}] call ace_interact_menu_fnc_createAction; ["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_rusAction] call ace_interact_menu_fnc_addActionToClass; -["land_campfire", 0, ["ACE_MainActions"], _rusAction] call ace_interact_menu_fnc_addActionToClass; - _destroyAction = ["usDestroyMenu", (localize "str_GRAD_destroy_vehicle"), "", { @@ -28,7 +26,63 @@ _destroyAction = ["usDestroyMenu", (localize "str_GRAD_destroy_vehicle"), "", }, {side player == west}] call ace_interact_menu_fnc_createAction; ["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_destroyAction] call ace_interact_menu_fnc_addActionToClass; -["land_campfire", 0, ["ACE_MainActions"],_destroyAction] call ace_interact_menu_fnc_addActionToClass; + +_destroyActionPortableRadio = ["usDestroyMenuDropped", (localize "str_GRAD_destroy_vehicle"), "", + { + [60, [_this select 0], {((_this select 0) select 0) setdamage 1; BLUFOR_CAPTURED = TRUE; publicVariable "BLUFOR_CAPTURED";}, {hint "Cancelled action"}, (localize "str_GRAD_destroying_radio")] call ace_common_fnc_progressBar; + }, + {side player == west}] call ace_interact_menu_fnc_createAction; +["Land_SatellitePhone_F", 0, ["ACE_MainActions"],_destroyActionPortableRadio] call ace_interact_menu_fnc_addActionToClass; + +_destroyActionPortableRadio = ["usDestroyMenuPortable", (localize "str_GRAD_destroy_vehicle"), "", + { + [60, [_this select 0], {((_this select 0) select 0) setdamage 1; BLUFOR_CAPTURED = TRUE; publicVariable "BLUFOR_CAPTURED";}, {hint "Cancelled action"}, (localize "str_GRAD_destroying_radio")] call ace_common_fnc_progressBar; + }, + {side player == west}] call ace_interact_menu_fnc_createAction; +["Land_Suitcase_F", 0, ["ACE_MainActions"],_destroyActionPortableRadio] call ace_interact_menu_fnc_addActionToClass; + + + _detachRadioAction = ["RusDetachMenu", (localize "str_GRAD_detach_radio"), "", + { + [6, [_this select 0], { + ((_this select 0) select 0) setVariable ["detachableRadio", 2, true]; + [] execVM "player\radioAttached.sqf"; + }, {hint "Cancelled action"}, (localize "str_GRAD_detaching_radio")] call ace_common_fnc_progressBar; + }, + {side player == east && ((_this select 0) getVariable ["detachableRadio", 0] == 1)}] call ace_interact_menu_fnc_createAction; +["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_detachRadioAction] call ace_interact_menu_fnc_addActionToClass; + + _attachRadioAction = ["RusDetachMenu", (localize "str_GRAD_attach_radio"), "", + { + [6, [_this select 0], { + ((_this select 0) select 0) setVariable ["detachableRadio", 1, true]; + + radioSuitcaseAttached = createVehicle ['Land_SatellitePhone_F', [(getPos ((_this select 0) select 0) select 0) + 2, (getPos ((_this select 0) select 0) select 1) - 1, 0.5], [], 0, 'NONE']; + radioSuitcaseAttached attachTo [((_this select 0) select 0), [-1.34,-2.26,0.1]]; + radioSuitcaseAttached setVectorDirAndUp [[1,0,0],[0,0,1]]; + player setVariable ["radioAttached",false]; + }, {hint "Cancelled action"}, (localize "str_GRAD_attaching_radio")] call ace_common_fnc_progressBar; + }, + {side player == east && ((_this select 0) getVariable ["detachableRadio", 0] == 2)}] call ace_interact_menu_fnc_createAction; +["rhs_gaz66_r142_vv", 0, ["ACE_MainActions"],_attachRadioAction] call ace_interact_menu_fnc_addActionToClass; + +////////////// attach action to dropped radio + _droppedRadioAction = ["droppedRadioMenu", (localize "str_GRAD_pickup_radio"), "", + { + [0.5, [_this select 0], { + deleteVehicle ((_this select 0) select 0); + [] execVM "player\radioAttached.sqf"; + }, {hint "Cancelled action"}, (localize "str_GRAD_pickup_radio")] call ace_common_fnc_progressBar; + }, + {side player == east && funkwagen getVariable ["detachableRadio", 0] == 2}] call ace_interact_menu_fnc_createAction; +["Land_SatellitePhone_F", 0, ["ACE_MainActions"],_droppedRadioAction] call ace_interact_menu_fnc_addActionToClass; + + +_dropRadioAction = ["ACE_MainActions", (localize "str_GRAD_drop_radio"), "", + {(player setVariable ["radioAttached",false];}, + {side player == east && (player getVariable ["radioAttached",false])}] call ace_interact_menu_fnc_createAction; + +[player, 0, ["ACE_MainActions"], _dropRadioAction] call ace_interact_menu_fnc_addActionToObject; diff --git a/spawn/gui/_dialogs.hpp b/spawn/gui/_dialogs.hpp index 4a642f3c..0dd8748b 100644 --- a/spawn/gui/_dialogs.hpp +++ b/spawn/gui/_dialogs.hpp @@ -16,7 +16,7 @@ class russianSupplyGUI idc = 1999; x = -10 * GUI_GRID_W + GUI_GRID_X; y = 0 * GUI_GRID_H + GUI_GRID_Y; - w = 60 * GUI_GRID_W; + w = 64 * GUI_GRID_W; h = 19 * GUI_GRID_H; colorBackground[] = {0,0,0,0.8}; }; @@ -30,7 +30,7 @@ class russianSupplyGUI { idc = 1501; text = $STR_GRAD_buy_order; - x = -3 * GUI_GRID_W + GUI_GRID_X; + x = -6.75 * 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; @@ -43,7 +43,7 @@ class russianSupplyGUI { idc = 1502; text = $STR_GRAD_buy_order; - x = 5 * GUI_GRID_W + GUI_GRID_X; + x = 1.25 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; @@ -56,7 +56,7 @@ class russianSupplyGUI { idc = 1503; text = $STR_GRAD_buy_order; - x = 12.5 * GUI_GRID_W + GUI_GRID_X; + x = 8.75 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; @@ -69,7 +69,7 @@ class russianSupplyGUI { idc = 1504; text = $STR_GRAD_buy_order; - x = 20 * GUI_GRID_W + GUI_GRID_X; + x = 16.25 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; @@ -82,7 +82,7 @@ class russianSupplyGUI { idc = 1505; text = $STR_GRAD_buy_order; - x = 27.5 * GUI_GRID_W + GUI_GRID_X; + x = 23.75 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; @@ -95,7 +95,7 @@ class russianSupplyGUI { idc = 1506; text = $STR_GRAD_buy_order; - x = 35 * GUI_GRID_W + GUI_GRID_X; + x = 31.25 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; @@ -108,7 +108,20 @@ class russianSupplyGUI { idc = 1507; text = $STR_GRAD_buy_order; - x = 42.5 * GUI_GRID_W + GUI_GRID_X; + x = 38.75 * 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 = $STR_GRAD_buy_order_hint; + onButtonClick = "disableSerialization; [_this select 0] execVM 'spawn\gui\orderRussianVehicle.sqf';"; + }; + class russian_gui_btn_anfordern_8: RscButton + { + idc = 1508; + text = $STR_GRAD_buy_order; + x = 46.25 * GUI_GRID_W + GUI_GRID_X; y = 16 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 2 * GUI_GRID_H; @@ -120,7 +133,7 @@ class russianSupplyGUI class russian_gui_pic_1: RscPicture { idc = 1001; - x = -3.5 * GUI_GRID_W + GUI_GRID_X; + x = -7.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; @@ -130,7 +143,7 @@ class russianSupplyGUI class russian_gui_pic_2: RscPicture { idc = 1002; - x = 4.5 * GUI_GRID_W + GUI_GRID_X; + x = 0.75 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; @@ -140,7 +153,7 @@ class russianSupplyGUI class russian_gui_pic_3: RscPicture { idc = 1003; - x = 12 * GUI_GRID_W + GUI_GRID_X; + x = 8.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; @@ -150,7 +163,7 @@ class russianSupplyGUI class russian_gui_pic_4: RscPicture { idc = 1004; - x = 19.5 * GUI_GRID_W + GUI_GRID_X; + x = 15.75 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; @@ -160,7 +173,7 @@ class russianSupplyGUI class russian_gui_pic_5: RscPicture { idc = 1005; - x = 27 * GUI_GRID_W + GUI_GRID_X; + x = 23.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; @@ -170,7 +183,7 @@ class russianSupplyGUI class russian_gui_pic_6: RscPicture { idc = 1006; - x = 34.5 * GUI_GRID_W + GUI_GRID_X; + x = 30.75 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; @@ -180,18 +193,28 @@ class russianSupplyGUI class russian_gui_pic_7: RscPicture { idc = 1007; - x = 42 * GUI_GRID_W + GUI_GRID_X; + x = 38.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 6 * GUI_GRID_H; text = "spawn\gui\pic\rus_static_mg.paa"; }; + + class russian_gui_pic_8: RscPicture + { + idc = 1008; + x = 45.75 * GUI_GRID_W + GUI_GRID_X; + y = 3.5 * GUI_GRID_H + GUI_GRID_Y; + w = 7 * GUI_GRID_W; + h = 6 * GUI_GRID_H; + text = "spawn\gui\pic\rus_carryradio.paa"; + }; class russian_gui_text_namedisplay_1: RscStructuredText { idc = 1101; text = "lade..."; - x = -3.5 * GUI_GRID_W + GUI_GRID_X; + x = -7.25 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -201,7 +224,7 @@ class russianSupplyGUI { idc = 1102; text = "lade ..."; - x = 4.5 * GUI_GRID_W + GUI_GRID_X; + x = 0.75 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -211,7 +234,7 @@ class russianSupplyGUI { idc = 1103; text = "lade ..."; - x = 12 * GUI_GRID_W + GUI_GRID_X; + x = 8.25 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -221,7 +244,7 @@ class russianSupplyGUI { idc = 1104; text = "lade ..."; - x = 19.5 * GUI_GRID_W + GUI_GRID_X; + x = 15.75 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -231,7 +254,7 @@ class russianSupplyGUI { idc = 1105; text = "lade ..."; - x = 27 * GUI_GRID_W + GUI_GRID_X; + x = 23.25 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -241,7 +264,7 @@ class russianSupplyGUI { idc = 1106; text = "lade ..."; - x = 34.5 * GUI_GRID_W + GUI_GRID_X; + x = 30.75 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -251,7 +274,17 @@ class russianSupplyGUI { idc = 1107; text = "lade ..."; - x = 42 * GUI_GRID_W + GUI_GRID_X; + x = 38.25 * GUI_GRID_W + GUI_GRID_X; + y = 10 * GUI_GRID_H + GUI_GRID_Y; + w = 6.5 * GUI_GRID_W; + h = 1 * GUI_GRID_H; + colorBackground[] = {-1,-1,-1,0}; + }; + class russian_gui_text_namedisplay_8: RscStructuredText + { + idc = 1108; + text = "lade ..."; + x = 45.75 * GUI_GRID_W + GUI_GRID_X; y = 10 * GUI_GRID_H + GUI_GRID_Y; w = 6.5 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -261,7 +294,7 @@ class russianSupplyGUI { idc = 1201; text = "lade ..."; - x = -3 * GUI_GRID_W + GUI_GRID_X; + x = -6.75 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -271,7 +304,7 @@ class russianSupplyGUI { idc = 1202; text = "lade ..."; - x = 5 * GUI_GRID_W + GUI_GRID_X; + x = 1.25 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -281,7 +314,7 @@ class russianSupplyGUI { idc = 1203; text = "lade ..."; - x = 12.5 * GUI_GRID_W + GUI_GRID_X; + x = 8.75 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -291,7 +324,7 @@ class russianSupplyGUI { idc = 1204; text = "lade ..."; - x = 20 * GUI_GRID_W + GUI_GRID_X; + x = 16.25 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -301,7 +334,7 @@ class russianSupplyGUI { idc = 1205; text = "lade ..."; - x = 27.5 * GUI_GRID_W + GUI_GRID_X; + x = 23.75 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -311,7 +344,7 @@ class russianSupplyGUI { idc = 1206; text = "lade ..."; - x = 35 * GUI_GRID_W + GUI_GRID_X; + x = 31.25 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -321,7 +354,17 @@ class russianSupplyGUI { idc = 1207; text = "lade ..."; - x = 42.5 * GUI_GRID_W + GUI_GRID_X; + x = 38.75 * GUI_GRID_W + GUI_GRID_X; + y = 12 * GUI_GRID_H + GUI_GRID_Y; + w = 6 * GUI_GRID_W; + h = 1 * GUI_GRID_H; + colorBackground[] = {-1,-1,-1,0}; + }; + class russian_gui_text_countleft_8: RscStructuredText + { + idc = 1208; + text = "lade ..."; + x = 45.75 * GUI_GRID_W + GUI_GRID_X; y = 12 * GUI_GRID_H + GUI_GRID_Y; w = 6 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -331,7 +374,7 @@ class russianSupplyGUI { idc = 1301; text = "lade ..."; - x = -3.5 * GUI_GRID_W + GUI_GRID_X; + x = -7.25 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -341,7 +384,7 @@ class russianSupplyGUI { idc = 1302; text = "lade ..."; - x = 4.5 * GUI_GRID_W + GUI_GRID_X; + x = 0.75 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -351,7 +394,7 @@ class russianSupplyGUI { idc = 1303; text = "lade ..."; - x = 12 * GUI_GRID_W + GUI_GRID_X; + x = 8.25 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -361,7 +404,7 @@ class russianSupplyGUI { idc = 1304; text = "lade ..."; - x = 19.5 * GUI_GRID_W + GUI_GRID_X; + x = 15.75 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -371,7 +414,7 @@ class russianSupplyGUI { idc = 1305; text = "lade ..."; - x = 27 * GUI_GRID_W + GUI_GRID_X; + x = 23.25 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -381,7 +424,7 @@ class russianSupplyGUI { idc = 1306; text = "lade ..."; - x = 34.5 * GUI_GRID_W + GUI_GRID_X; + x = 30.75 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -391,7 +434,17 @@ class russianSupplyGUI { idc = 1307; text = "lade ..."; - x = 42 * GUI_GRID_W + GUI_GRID_X; + x = 38.25 * GUI_GRID_W + GUI_GRID_X; + y = 14 * GUI_GRID_H + GUI_GRID_Y; + w = 7 * GUI_GRID_W; + h = 1 * GUI_GRID_H; + colorBackground[] = {-1,-1,-1,0}; + }; + class russian_gui_text_pricedisplay_8: RscStructuredText + { + idc = 1308; + text = "lade ..."; + x = 45.75 * GUI_GRID_W + GUI_GRID_X; y = 14 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 1 * GUI_GRID_H; @@ -434,7 +487,7 @@ class russianSupplyGUI class russian_gui_tooltip_1: RscStructuredTextTooltip { idc = 1801; - x = -3.5 * GUI_GRID_W + GUI_GRID_X; + x = -7.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -447,7 +500,7 @@ class russianSupplyGUI class russian_gui_tooltip_2: RscStructuredTextTooltip { idc = 1802; - x = 4.5 * GUI_GRID_W + GUI_GRID_X; + x = 0.75 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -460,7 +513,7 @@ class russianSupplyGUI class russian_gui_tooltip_3: RscStructuredTextTooltip { idc = 1803; - x = 12 * GUI_GRID_W + GUI_GRID_X; + x = 8.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -473,7 +526,7 @@ class russianSupplyGUI class russian_gui_tooltip_4: RscStructuredTextTooltip { idc = 1804; - x = 19.5 * GUI_GRID_W + GUI_GRID_X; + x = 15.75 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -486,7 +539,7 @@ class russianSupplyGUI class russian_gui_tooltip_5: RscStructuredTextTooltip { idc = 1805; - x = 27 * GUI_GRID_W + GUI_GRID_X; + x = 23.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -499,7 +552,7 @@ class russianSupplyGUI class russian_gui_tooltip_6: RscStructuredTextTooltip { idc = 1806; - x = 34.5 * GUI_GRID_W + GUI_GRID_X; + x = 30.75 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -512,7 +565,7 @@ class russianSupplyGUI class russian_gui_tooltip_7: RscStructuredTextTooltip { idc = 1807; - x = 42 * GUI_GRID_W + GUI_GRID_X; + x = 38.25 * GUI_GRID_W + GUI_GRID_X; y = 3.5 * GUI_GRID_H + GUI_GRID_Y; w = 7 * GUI_GRID_W; h = 12 * GUI_GRID_H; @@ -522,6 +575,19 @@ class russianSupplyGUI onMouseEnter = "disableSerialization; [1000,1807] execVM 'spawn\gui\showControl.sqf';"; onMouseExit = "disableSerialization; [1000,[1807]] execVM 'spawn\gui\hideControl.sqf';"; }; + class russian_gui_tooltip_8: RscStructuredTextTooltip + { + idc = 1808; + x = 45.75 * GUI_GRID_W + GUI_GRID_X; + y = 3.5 * GUI_GRID_H + GUI_GRID_Y; + w = 7 * GUI_GRID_W; + h = 12 * GUI_GRID_H; + colorBackground[] = {0,0,0,0.8}; + text = "loading"; + size = 0.028; + onMouseEnter = "disableSerialization; [1000,1808] execVM 'spawn\gui\showControl.sqf';"; + onMouseExit = "disableSerialization; [1000,[1808]] execVM 'spawn\gui\hideControl.sqf';"; + }; class russian_gui_text_headline: RscStructuredTextHeadline { @@ -1256,7 +1322,7 @@ class gui_spawn_opfor colorText[] = {0,0,0,1}; colorBackground[] = {0.81,0.55,0.12,1}; tooltip = $STR_GRAD_choose_spawn_location; - onButtonClick = "openMap [true,false]; [] execVM 'mission_setup\teleport.sqf'; closeDialog 0"; + onButtonClick = "openMap [true,false]; player linkitem 'itemMap'; [] execVM 'mission_setup\teleport.sqf'; closeDialog 0"; }; }; }; diff --git a/spawn/gui/addPublicVariableEventhandler.sqf b/spawn/gui/addPublicVariableEventhandler.sqf index 4565e32c..2b0d2faa 100644 --- a/spawn/gui/addPublicVariableEventhandler.sqf +++ b/spawn/gui/addPublicVariableEventhandler.sqf @@ -32,7 +32,7 @@ fillRussianSupplies = { [ "rhs_gaz66o_vdv", "GAZ-66", - 30, + 3, 200, "200 cr", 1, @@ -177,6 +177,19 @@ fillRussianSupplies = { (_this select 0) addItemCargoGlobal ['ACE_Sandbag_empty',100]; }, format['%1
%2
%3','100 Sandbags','2 Static Dshkm','(4 Backpacks)'] + ], + [ + "Land_SatellitePhone_F", + "Detachable Radio Unit", + 1, + 500, + "500 cr", + 1, + [[]], + { + }, + format['%1
%2
%3','Detachable Radio Unit','','Detach the radio unit from the radio truck (ACE Interact) as a suitcase which you can carry around. Downside is: Sending takes 2x the time and turning the device off is not possible.'] + ] ]; @@ -226,7 +239,7 @@ fillUSSupplies = { [ hmmwv_transport, "HMMWV Transport", - 30, + 5, 200, "200 cr", 1, @@ -325,7 +338,7 @@ fillUSSupplies = { 2, 2500, "2500 cr", - 2, + 1, [[]], { clearWeaponCargoGlobal (_this select 0); diff --git a/spawn/gui/orderRussianVehicle.sqf b/spawn/gui/orderRussianVehicle.sqf index eb3c4e6e..148f68c3 100644 --- a/spawn/gui/orderRussianVehicle.sqf +++ b/spawn/gui/orderRussianVehicle.sqf @@ -7,6 +7,7 @@ _tempRussian_4 = (russianSupplies select 4); _tempRussian_5 = (russianSupplies select 5); _tempRussian_6 = (russianSupplies select 6); _tempRussian_7 = (russianSupplies select 7); +_tempRussian_8 = (russianSupplies select 8); _oldMoney = (russianSupplies select 0); _price = [_idc] call russian_IDC_to_price; @@ -34,12 +35,13 @@ switch (_selector) do { case 5: { _tempRussian_5 = [_idc,_tempRussian_5] call calculateRussianVehicleCall; }; case 6: { _tempRussian_6 = [_idc,_tempRussian_6] call calculateRussianVehicleCall; }; case 7: { _tempRussian_7 = [_idc,_tempRussian_7] call calculateRussianVehicleCall; }; + case 8: { _tempRussian_8 = [_idc,_tempRussian_8] call calculateRussianVehicleCall; }; default {}; }; // dont fucking buy without stock dude -> exit with hint -if (count _tempRussian_1 == 1 || count _tempRussian_2 == 1 || count _tempRussian_3 == 1 || count _tempRussian_4 == 1 || count _tempRussian_5 == 1 || count _tempRussian_6 == 1 || count _tempRussian_7 == 1) exitWith { +if (count _tempRussian_1 == 1 || count _tempRussian_2 == 1 || count _tempRussian_3 == 1 || count _tempRussian_4 == 1 || count _tempRussian_5 == 1 || count _tempRussian_6 == 1 || count _tempRussian_7 == 1 || count _tempRussian_8 == 1) exitWith { [russianSupplies,false,_idc,"","",""] call refreshRussianUI; player say3D "rhs_rus_land_rc_01"; }; @@ -92,7 +94,8 @@ _tempSupplies = _tempRussian_4, _tempRussian_5, _tempRussian_6, - _tempRussian_7 + _tempRussian_7, + _tempRussian_8 ]; [_tempSupplies,false,0,_vehicleOrdered,_vehicleExtras,_vehicleCalls,_vehicleEta] call refreshRussianUI; diff --git a/spawn/gui/pic/rus_carryradio.paa b/spawn/gui/pic/rus_carryradio.paa new file mode 100644 index 0000000000000000000000000000000000000000..52e9537be6f0c2257fc01571b845efd0c7ca13e6 GIT binary patch literal 46814 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 W%elEx!g8#v2cv7o#^6>+uKxv;#>lJy literal 0 HcmV?d00001 diff --git a/spawn/gui/refreshRussianUI.sqf b/spawn/gui/refreshRussianUI.sqf index 87b2b25e..efda1aae 100644 --- a/spawn/gui/refreshRussianUI.sqf +++ b/spawn/gui/refreshRussianUI.sqf @@ -42,6 +42,7 @@ resetRussianUI = { ctrlSetText [1505, _buttonRelease]; ctrlSetText [1506, _buttonRelease]; ctrlSetText [1507, _buttonRelease]; + ctrlSetText [1508, _buttonRelease]; ctrlEnable [1501, true]; ctrlEnable [1502, true]; @@ -50,6 +51,7 @@ resetRussianUI = { ctrlEnable [1505, true]; ctrlEnable [1506, true]; ctrlEnable [1507, true]; + ctrlEnable [1508, true]; VEHICLE_ORDERED_EAST = [false,0]; publicVariable "VEHICLE_ORDERED_EAST"; @@ -77,6 +79,7 @@ refreshRussianOrder = { ctrlSetText [1505, _refreshPleasewait]; ctrlSetText [1506, _refreshPleasewait]; ctrlSetText [1507, _refreshPleasewait]; + ctrlSetText [1508, _refreshPleasewait]; ctrlEnable [1501, false]; ctrlEnable [1502, false]; @@ -85,6 +88,7 @@ refreshRussianOrder = { ctrlEnable [1505, false]; ctrlEnable [1506, false]; ctrlEnable [1507, false]; + ctrlEnable [1508, false]; //if (DEBUG) then { diag_log format ["_bool is %1, _eta is %2",_bool, _eta];}; @@ -136,6 +140,7 @@ refreshRussianUI = { ctrlSetText [1505, _pleasewait]; ctrlSetText [1506, _pleasewait]; ctrlSetText [1507, _pleasewait]; + ctrlSetText [1508, _pleasewait]; }; [VEHICLE_ORDERED_EAST] call refreshRussianOrder; @@ -150,6 +155,7 @@ refreshRussianUI = { ctrlEnable [1505, false]; ctrlEnable [1506, false]; ctrlEnable [1507, false]; + ctrlEnable [1508, false]; // eradicate spawn pad ctrlEnable [1701, false]; @@ -169,6 +175,8 @@ refreshRussianUI = { _display displayCtrl 1506 ctrlCommit 0; _display displayCtrl 1507 ctrlSetFade 1; _display displayCtrl 1507 ctrlCommit 0; + _display displayCtrl 1508 ctrlSetFade 1; + _display displayCtrl 1508 ctrlCommit 0; // eradicate spawn pad _display displayCtrl 1701 ctrlSetFade 1; @@ -230,6 +238,7 @@ refreshRussianUI = { _display displayCtrl 1805 ctrlSetStructuredText parseText ((_array select 5) select 8); _display displayCtrl 1806 ctrlSetStructuredText parseText ((_array select 6) select 8); _display displayCtrl 1807 ctrlSetStructuredText parseText ((_array select 7) select 8); + _display displayCtrl 1808 ctrlSetStructuredText parseText ((_array select 8) select 8); }; @@ -267,7 +276,9 @@ refreshRussianUI = { _countleft_7 = (_array select 7) select 2; _pricedisplay_7 = (_array select 7) select 4; //_eta_7 = (_array select 7) select 4; - + _namedisplay_8 = (_array select 8) select 1; + _countleft_8 = (_array select 8) select 2; + _pricedisplay_8 = (_array select 8) select 4; //if (DEBUG) then { diag_log format ["typeName _namedisplay_1: %1",typeName _namedisplay_1]; }; @@ -321,6 +332,10 @@ refreshRussianUI = { _display displayCtrl 1207 ctrlSetStructuredText parseText ([_countleft_7] call centerAndConvertToString); _display displayCtrl 1307 ctrlSetStructuredText parseText ([_pricedisplay_7] call centerString); + _display displayCtrl 1108 ctrlSetStructuredText parseText ([_namedisplay_8] call centerString); + _display displayCtrl 1208 ctrlSetStructuredText parseText ([_countleft_8] call centerAndConvertToString); + _display displayCtrl 1308 ctrlSetStructuredText parseText ([_pricedisplay_8] call centerString); + disableSerialization; _display displayCtrl 1700 ctrlSetStructuredText parseText _moneyLeft; diff --git a/spawn/supplyDropOnMarker.sqf b/spawn/supplyDropOnMarker.sqf index de560c39..85099105 100644 --- a/spawn/supplyDropOnMarker.sqf +++ b/spawn/supplyDropOnMarker.sqf @@ -12,11 +12,17 @@ spawnSupplyDrop = { _vehicleType = _this select 0; //ammocrate class for blufor, feel free to change to whichever box you desire _pos = _this select 1; - _chuteType = "B_Parachute_02_F"; //parachute for blufor, for opfor and greenfor replace the 'B' with 'O' or 'G' respectively - _init = _this select 2; _calls = _this select 3; + // if there is nothing to be spawned + if (_vehicleType == "Land_SatellitePhone_F") exitWith { + radioSuitcaseAttached = createVehicle ['Land_SatellitePhone_F', [(getPos funkwagen select 0) + 2, (getPos funkwagen select 1) - 1, 0.5], [], 0, 'NONE']; + radioSuitcaseAttached attachTo [funkwagen, [-1.34,-2.26,0.1]]; + radioSuitcaseAttached setVectorDirAndUp [[1,0,0],[0,0,1]]; + funkwagen setVariable ['detachableRadio', 1, true]; + }; + _vehicle = createVehicle [_vehicleType, _pos, [], 0, "NONE"]; _vehicle allowDamage false; _road = [getPos _vehicle] call BIS_fnc_nearestRoad; @@ -37,51 +43,4 @@ spawnSupplyDrop = { [_vehicle, nil, _init] call BIS_fnc_initVehicle; }; sleep 0.1; -}; - /* - _origWind = wind; - _origWindForce = windStr; - - - setWind [0, 0, true]; - 0 setWindForce 0; - - //if (DEBUG) then {diag_log format ["%1",_pos]; }; - - _chute = createVehicle [_chuteType, [100, 100, 200], [], 0, "FLY"]; - - _chute setPos [_pos select 0, _pos select 1, 50]; - _chute setVelocity [0,0,0]; - - [_chute] spawn { - _chuty = _this select 0; - - while {!isNull _chuty} do { - _chuty setVelocity [0,0,velocity _chuty select 2]; - sleep 0.1; - }; - }; - - - _vehicle = createVehicle [_vehicleType, position _chute, [], 0, "NONE"]; - - [_vehicle] call _calls; - sleep 0.1; - - // adjust vehicle (remove lamp covers and stuff) - if (count _init > 0) then { - [_vehicle, nil, _init] call BIS_fnc_initVehicle; - }; - sleep 0.1; - - - - - _vehicle attachTo [_chute, [0, 0, -0.5]]; - waitUntil {position _vehicle select 2 < 0.6 || isNull _chute}; - detach _vehicle; - _vehicle setPos [position _vehicle select 0, position _vehicle select 1, 0]; - - 0 setWindForce _origWindForce; - setWind [_origWind select 0, _origWind select 1, true]; - };*/ \ No newline at end of file +}; \ No newline at end of file diff --git a/stringtable.xml b/stringtable.xml index 2ad03858..dd20907b 100644 --- a/stringtable.xml +++ b/stringtable.xml @@ -3,61 +3,33 @@ - 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. - 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 - 'nationalistische 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. + Der Kalte Krieg ist kurz davor, heiß zu werden. Die CIA hat Informationen über sogenannte 'nationalistische 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. - US has to find and destroy the Russian radio truck before it ends its transmission. Russians have to - protect their truck. + US has to find and destroy the Russian radio truck before it ends its transmission. Russians have to protect their truck. - US has to find and destroy the Russian radio truck before it ends its transmission. Russians have to - protect their truck. + US has to find and destroy the Russian radio truck before it ends its transmission. Russians have to protect their truck. - Die Amerikaner müssen den Funkwagen der Russen finden und zerstören, bevor er seine Übertragung - abschließen kann. Die Russen müssen ihn vor diesem Schicksal bewahren. + Die Amerikaner müssen den Funkwagen der Russen finden und zerstören, bevor er seine Übertragung abschließen kann. Die Russen müssen ihn vor diesem Schicksal bewahren. - 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. 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. 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. 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. Für jeden - Spieler auf dem Server gibt es einen kleinen Geldbonus. + 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. @@ -326,245 +298,36 @@ Please wait. Bitte warten. + + Detach radio unit + Detach radio unit + Sendeeinheit ausbauen + + + Detach radio unit... + Detaching radio unit... + Baue Sendeeinheit aus... + + + Attach radio unit + Attach radio unit + Sendeeinheit einbauen + + + Attaching radio unit... + Attaching radio unit... + Baue Sendeeinheit ein... + + + Pick up radio unit + Pick up radio unit + Sendeeinheit aufnehmen + + + Drop radio unit + Drop radio unit + Sendeeinheit ablegen + - - - CSSA3 Initiated. Press 'F1' for more help. You can hide the HUD at any time by pressing 'H' - - 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' - - - Freecam - Visuale libera - - - First Person - Prima Persona - - - Third Person - Terza Persona - - - Close - Chiudi - - - Respawn: - Respawn: - - - Unit you are currently spectating. - L'unita' che stai attualmente guardando - - - Time until respawn - Tempo rimanente prima del respawn - - - Spectating: - Assistendo da spettatore: - - - Favourite - Preferito - - - Settings [F2] - Settaggi [F2] - - - CSSA3 Settings - Settaggi CSSA3 - - - Help [F1] - Aiuto [F1] - - - Do you really want to quit? <br /> <br />You will automatically be returned to the - spectator script within 5 seconds, unless the escape menu is open. - - Vuoi veramente uscire? <br /> <br />Ritornerai automaticamente allo script spettatore - entro 5 secondi, se il men? escape non ? aperto. - - - - - BLUFOR - BLUFOR - BLUFOR - Ouest - BLUFOR - BLUFOR - BLUFOR - FORÇAS AZUIS - Синие - ALIADOS - - - - OPFOR - OPFOR - OPFOR - Est - OPFOR - OPFOR - OPFOR - Forças Opositoras - Красные - ENEMIGO - - - - Civilian - Civilian - Civilista - Civil - Zivilist - Civile - Cywil - Civil - Гражданский - Civil - - - - - Move Camera: '<t color='#ff0000'>W, A, S, D</t>' - <br />- Camera Altitude: '<t color='#ff0000'>Q, Z</t>' - <br />- Smooth Move: '<t color='#ff0000'>LMB + RMB</t>' - <br />- Switch View Perspective: '<t color='#ff0000'>1, 2, 3</t>' - <br />- Object Interact: '<t color='#ff0000'>Hold LMB on object.</t>' - <br />- Tilt Camera: '<t color='#ff0000'>Ctrl + RMB + Mouse Move</t>' - <br />- Rotate Camera: '<t color='#ff0000'>RMB + Mouse Move</t>' - <br />- Reset Camera: '<t color='#ff0000'>Num 5</t>' - <br />- Toggle Optic Mode: '<t color='#ff0000'>N</t>' - <br />- Hide units list: '<t color='#ff0000'>Tab</t>' - <br />- Hide HUD: '<t color='#ff0000'>H</t>' - <br />- Settings: '<t color='#ff0000'>F2</t>' - <br />- Help: '<t color='#ff0000'>F1</t>' - <br />- Map: '<t color='#ff0000'>M</t>'<br /> - <br />Script by Cyrokrypto - - - Movimenti della fotocamera: '<t color='#ff0000'>W, A, S, D</t>' - <br />- Altezza della fotocamera: '<t color='#ff0000'>Q, Z</t>' - <br />- Movimento fluido: '<t color='#ff0000'>pulsante sinistro mouse + pulsante destro - mouse </t>' - <br />- Cambiare prospettiva di visuale: '<t color='#ff0000'>1, 2, 3</t>' - <br />- Interazione con gli oggetti: '<t color='#ff0000'>Tieni il pulsante sinistro del - mouse sull'oggetto.</t>' - <br />- Inclina la fotocamera: '<t color='#ff0000'>Ctrl + pulsante destro mouse + muovi il - mouse</t>' - <br />- Ruota la fotocamera: '<t color='#ff0000'>pulsante destro mouse + muovi il mouse</t>' - <br />- Resetta la fotocamera: '<t color='#ff0000'>Pulsante 5 del Tastierino Numerico </t>' - <br />- Cambia modalita' di visione: '<t color='#ff0000'>N</t>' - <br />- Nascondi la lista unita': '<t color='#ff0000'>Tab</t>' - <br />- Nascondi HUD: '<t color='#ff0000'>H</t>' - <br />- Settings: '<t color='#ff0000'>F2</t>' - <br />- Aiuto: '<t color='#ff0000'>F1</t>' - <br />- Mappa: '<t color='#ff0000'>M</t>'<br /> - <br />Script by Cyrokrypto - <br />Translation by Nemesi - - - - - - Add / Remove - Add / Remove - Aggiungi / Rimuovi - - - Units: - Units: - Units: - - - All - All - Tutti - - - Players - Players - Giocatori - - - Independent - Indipendenti - - - Favourites - Preferiti - - - Drag a unit here to add or remove it from your favourites. - Trascina un'unita' qui per aggiungerla o rimuoverla dai preferiti - - - - - - Show Unit Names - Mostra i nomi delle unit? - - - Display a unit's name in floating text. - Mostra il nome di un'unit? come testo fluttuante - - - Show Unit Tags - Mostra le tag delle unit? - - - Show floating tags above units. - Mostra le tag fluttuanti sopra le unit?. - - - View Distance: - Distanza visiva - - - Enable Click To Interact: This is an experimental feature, click and hold LMB on a unit or vehicle - to interact with it. - - Abilita il click per l'interazione: questa e' una caratteristica sperimentale, clicca e tieni - premuto il tasto sinistro del mouse su un'unita' o su un veicolo per interagire con esso. - - - - Enabled Click To Interact - "Click per l'interazione" abilitato - - - Preload Camera - Precarica la fotocamera - - - Enabling this will reduce lag and visual artifacts when selecting a new unit. This comes at the - cost of a slight delay before the camera is repositioned. - - Abilitando questa funzione si ridurranno il lag e gli artefatti visivi quando si seleziona una - nuova unita'. Questo viene a scapito di un piccolo ritardo prima che la fotocamera sia riposizionata. - - - - - - - Switch to free camera and centre on this unit. - Passa alla fotocamera libera e centra su questa unit? - - - Switch to first person. - Passa alla prima persona. - - - Switch to third person. - Passa alla terza persona. - - - + \ No newline at end of file