diff --git a/ace_fcs.dll b/ace_fcs.dll index 189c3c0826..2cb8b86de2 100644 Binary files a/ace_fcs.dll and b/ace_fcs.dll differ diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index faa5b0f453..d4a7f8a96e 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -32,7 +32,7 @@ GVAR(openedMenuType) = _menuType; GVAR(useCursorMenu) = (vehicle ACE_player != ACE_player) || visibleMap || - (GVAR(AlwaysUseCursorSelfInteraction) && _menuType == 1); + {(_menuType == 1) && {(isWeaponDeployed ACE_player) || GVAR(AlwaysUseCursorSelfInteraction)}}; if (GVAR(useCursorMenu)) then { createDialog QGVAR(cursorMenu); // The dialog sets: diff --git a/addons/inventory/RscDisplayInventory.hpp b/addons/inventory/RscDisplayInventory.hpp index c8c93ab142..f845f50a35 100644 --- a/addons/inventory/RscDisplayInventory.hpp +++ b/addons/inventory/RscDisplayInventory.hpp @@ -39,14 +39,14 @@ class RscDisplayInventory { x = X_PART(1); y = Y_PART(1); w = W_PART(12); - h = H_PART(22.5); + h = H_PART(22.5); //default 23 }; class CA_PlayerBackground: RscText { //center player's container: decrease height because of progressbar height decrease x = X_PART(14.6); y = Y_PART(2); w = W_PART(24.4); - h = H_PART(21.5); + h = H_PART(21.5); //default 22 }; class TitleBackground: RscText { x = X_PART(14.6); @@ -87,25 +87,31 @@ class RscDisplayInventory { class BackgroundSlotPrimaryMuzzle: BackgroundSlotPrimary { x = X_PART(26.6); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); + h = H_PART(2); + }; + class BackgroundSlotPrimaryUnderBarrel: BackgroundSlotPrimary { + x = X_PART(29); + y = Y_PART(9.1); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotPrimaryFlashlight: BackgroundSlotPrimary { - x = X_PART(29.6); - y = Y_PART(9.1); - w = W_PART(2.9); + x = X_PART(31.4); + y = Y_PART(9.2); //not sure why different (double check release) + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotPrimaryOptics: BackgroundSlotPrimary { - x = X_PART(32.6); + x = X_PART(33.8); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotPrimaryMagazine: BackgroundSlotPrimary { - x = X_PART(35.6); + x = X_PART(36.2); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotSecondary: BackgroundSlotPrimary { @@ -117,25 +123,31 @@ class RscDisplayInventory { class BackgroundSlotSecondaryMuzzle: BackgroundSlotPrimary { x = X_PART(26.6); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); + h = H_PART(2); + }; + class BackgroundSlotSecondaryUnderBarrel: BackgroundSlotPrimary { + x = X_PART(29); + y = Y_PART(14.6); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotSecondaryFlashlight: BackgroundSlotPrimary { - x = X_PART(29.6); + x = X_PART(31.4); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotSecondaryOptics: BackgroundSlotPrimary { - x = X_PART(32.6); + x = X_PART(33.8); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotSecondaryMagazine: BackgroundSlotPrimary { - x = X_PART(35.6); + x = X_PART(36.2); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotHandgun: BackgroundSlotPrimary { @@ -147,25 +159,31 @@ class RscDisplayInventory { class BackgroundSlotHandgunMuzzle: BackgroundSlotPrimary { x = X_PART(26.6); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); + h = H_PART(2); + }; + class BackgroundSlotHandgunUnderBarrel: BackgroundSlotPrimary { + x = X_PART(29); + y = Y_PART(20.1); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotHandgunFlashlight: BackgroundSlotPrimary { - x = X_PART(29.6); + x = X_PART(31.4); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotHandgunOptics: BackgroundSlotPrimary { - x = X_PART(32.6); + x = X_PART(33.8); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotHandgunMagazine: BackgroundSlotPrimary { - x = X_PART(35.6); + x = X_PART(36.2); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class BackgroundSlotHeadgear: BackgroundSlotPrimary { @@ -263,7 +281,7 @@ class RscDisplayInventory { x = X_PART(1.5); y = Y_PART(22.5); w = W_PART(11); - h = H_PART(0.5); + h = H_PART(0.5); //Default 1 }; class SlotPrimary: GroundTab { x = X_PART(26.6); @@ -274,31 +292,31 @@ class RscDisplayInventory { class SlotPrimaryMuzzle: SlotPrimary { x = X_PART(26.6); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; - class SlotPrimaryGrip: SlotPrimary { - w = 0; - h = 0; - x = X_PART(39); - y = Y_PART(9); + class SlotPrimaryUnderBarrel: SlotPrimary { + x = X_PART(29); + y = Y_PART(9.1); + w = W_PART(2.3); + h = H_PART(2); }; class SlotPrimaryFlashlight: SlotPrimary { - x = X_PART(29.6); + x = X_PART(31.4); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotPrimaryOptics: SlotPrimary { - x = X_PART(32.6); + x = X_PART(33.8); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotPrimaryMagazine: SlotPrimary { - x = X_PART(35.6); + x = X_PART(36.2); y = Y_PART(9.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotSecondary: SlotPrimary { @@ -310,31 +328,31 @@ class RscDisplayInventory { class SlotSecondaryMuzzle: SlotPrimary { x = X_PART(26.6); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; - class SlotSecondaryGrip: SlotPrimary { - w = 0; - h = 0; - x = X_PART(39); - y = Y_PART(14.5); + class SlotSecondaryUnderBarrel: SlotPrimary { + x = X_PART(29); + y = Y_PART(14.59); //Why is this different? (check release) + w = W_PART(2.3); + h = H_PART(2); }; class SlotSecondaryFlashlight: SlotPrimary { - x = X_PART(29.6); + x = X_PART(31.4); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotSecondaryOptics: SlotPrimary { - x = X_PART(32.6); + x = X_PART(33.8); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotSecondaryMagazine: SlotPrimary { - x = X_PART(35.6); + x = X_PART(36.2); y = Y_PART(14.6); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotHandgun: SlotPrimary { @@ -346,31 +364,31 @@ class RscDisplayInventory { class SlotHandgunMuzzle: SlotPrimary { x = X_PART(26.6); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; - class SlotHandgunGrip: SlotPrimary { - w = 0; - h = 0; - x = X_PART(39); - y = Y_PART(20); + class SlotHandgunUnderBarrel: SlotPrimary { + x = X_PART(29); + y = Y_PART(20.1); + W = W_PART(2.3); + H = H_PART(2); }; class SlotHandgunFlashlight: SlotPrimary { - x = X_PART(29.6); + x = X_PART(31.4); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotHandgunOptics: SlotPrimary { - x = X_PART(32.6); + x = X_PART(33.8); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotHandgunMagazine: SlotPrimary { - x = X_PART(35.6); + x = X_PART(36.2); y = Y_PART(20.1); - w = W_PART(2.9); + w = W_PART(2.3); h = H_PART(2); }; class SlotHeadgear: SlotPrimary { @@ -492,7 +510,7 @@ class RscDisplayInventory { x = X_PART(15.1); y = Y_PART(22.5); w = W_PART(23.4); - h = H_PART(0.5); + h = H_PART(0.5); //Default 1 }; class ContainerMarker: GroundTab { x = X_PART(0); diff --git a/addons/main/config.cpp b/addons/main/config.cpp index 44e9c6f33e..a6a85418c3 100644 --- a/addons/main/config.cpp +++ b/addons/main/config.cpp @@ -51,6 +51,7 @@ class CfgPatches { "a3_anims_f_epc", "a3_anims_f_heli", "a3_anims_f_kart", + "a3_anims_f_mark_deployment", "a3_armor_f", "a3_armor_f_amv", "a3_armor_f_apc_wheeled_03", @@ -93,6 +94,7 @@ class CfgPatches { "a3_characters_f_heads", "a3_characters_f_indep", "a3_characters_f_kart", + "a3_characters_f_mark", "a3_characters_f_opfor", "a3_characters_f_proxies", "a3_data_f", @@ -108,6 +110,7 @@ class CfgPatches { "a3_data_f_hook", "a3_data_f_kart", "a3_data_f_kart_particleeffects", + "a3_data_f_mark", "a3_data_f_particleeffects", "a3_dubbing_radio_f", "a3_editor_f", @@ -117,6 +120,8 @@ class CfgPatches { "a3_functions_f_epa", "a3_functions_f_epc", "a3_functions_f_heli", + "a3_functions_f_mark", + "a3_functions_f_mp_mark", "a3_language_f", "a3_language_f_beta", "a3_language_f_bootcamp", @@ -127,10 +132,13 @@ class CfgPatches { "a3_language_f_gamma", "a3_language_f_heli", "a3_language_f_kart", + "a3_language_f_mark", + "a3_language_f_mp_mark", "a3_languagemissions_f", "a3_languagemissions_f_beta", "a3_languagemissions_f_gamma", "a3_languagemissions_f_kart", + "a3_languagemissions_f_mp_mark", "a3_map_altis", "a3_map_altis_scenes", "a3_map_data", @@ -149,6 +157,8 @@ class CfgPatches { "a3_missions_f_gamma", "a3_missions_f_heli", "a3_missions_f_kart", + "a3_missions_f_mark", + "a3_missions_f_mp_mark", "a3_modules_f", "a3_modules_f_beta", "a3_modules_f_beta_firingdrills", @@ -184,8 +194,12 @@ class CfgPatches { "a3_modules_f_kart", "a3_modules_f_kart_timetrials", "a3_modules_f_livefeed", + "a3_modules_f_mark", + "a3_modules_f_mark_firingdrills", + "a3_modules_f_mark_objectives", "a3_modules_f_marta", "a3_modules_f_misc", + "a3_modules_f_mp_mark", "a3_modules_f_multiplayer", "a3_modules_f_objectmodifiers", "a3_modules_f_sites", @@ -199,6 +213,7 @@ class CfgPatches { "a3_music_f_epb", "a3_music_f_epc", "a3_music_f_heli", + "a3_music_f_mark", "a3_plants_f_bush", "a3_roads_f", "a3_rocks_f", @@ -244,6 +259,8 @@ class CfgPatches { "a3_static_f_gamma_aa", "a3_static_f_gamma_at", "a3_static_f_gamma_mortar_01", + "a3_static_f_mark_designator_01", + "a3_static_f_mark_designator_02", "a3_static_f_mortar_01", "a3_structures_f", "a3_structures_f_bootcamp_civ_camping", @@ -385,6 +402,13 @@ class CfgPatches { "a3_structures_f_kart_civ_sportsgrounds", "a3_structures_f_kart_mil_flags", "a3_structures_f_kart_signs_companies", + "a3_structures_f_mark_items_military", + "a3_structures_f_mark_items_sport", + "a3_structures_f_mark_mil_flags", + "a3_structures_f_mark_training", + "a3_structures_f_mark_vr_helpers", + "a3_structures_f_mark_vr_shapes", + "a3_structures_f_mark_vr_targets", "a3_structures_f_mil", "a3_structures_f_mil_bagbunker", "a3_structures_f_mil_bagfence", @@ -416,6 +440,7 @@ class CfgPatches { "a3_supplies_f_heli_cargonets", "a3_supplies_f_heli_fuel", "a3_supplies_f_heli_slingload", + "a3_supplies_f_mark", "a3_uav_f_characters_f_gamma", "a3_uav_f_weapons_f_gamma_ammoboxes", "a3_ui_f", @@ -423,6 +448,8 @@ class CfgPatches { "a3_ui_f_curator", "a3_ui_f_heli", "a3_ui_f_kart", + "a3_ui_f_mark", + "a3_ui_f_mp_mark", "a3_uifonts_f", "a3_weapons_f", "a3_weapons_f_aaf", @@ -474,6 +501,28 @@ class CfgPatches { "a3_weapons_f_longrangerifles_m320", "a3_weapons_f_machineguns_m200", "a3_weapons_f_machineguns_zafir", + "a3_weapons_f_mark", + "a3_weapons_f_mark_acc", + "a3_weapons_f_mark_ebr", + "a3_weapons_f_mark_longrangerifles_dmr_01", + "a3_weapons_f_mark_longrangerifles_dmr_02", + "a3_weapons_f_mark_longrangerifles_dmr_03", + "a3_weapons_f_mark_longrangerifles_dmr_04", + "a3_weapons_f_mark_longrangerifles_dmr_05", + "a3_weapons_f_mark_longrangerifles_dmr_06", + "a3_weapons_f_mark_longrangerifles_gm6", + "a3_weapons_f_mark_longrangerifles_gm6_camo", + "a3_weapons_f_mark_longrangerifles_m320", + "a3_weapons_f_mark_longrangerifles_m320_camo", + "a3_weapons_f_mark_machineguns_m200", + "a3_weapons_f_mark_machineguns_mmg_01", + "a3_weapons_f_mark_machineguns_mmg_02", + "a3_weapons_f_mark_machineguns_zafir", + "a3_weapons_f_mark_rifles_khaybar", + "a3_weapons_f_mark_rifles_mk20", + "a3_weapons_f_mark_rifles_mx", + "a3_weapons_f_mark_rifles_sdar", + "a3_weapons_f_mark_rifles_trg20", "a3_weapons_f_nato", "a3_weapons_f_pistols_acpc2", "a3_weapons_f_pistols_p07", diff --git a/addons/markers/CfgEventHandlers.hpp b/addons/markers/CfgEventHandlers.hpp index 0cd959a047..e75956f440 100644 --- a/addons/markers/CfgEventHandlers.hpp +++ b/addons/markers/CfgEventHandlers.hpp @@ -1,4 +1,3 @@ - class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_FILE(XEH_preInit)); diff --git a/addons/markers/InsertMarker.hpp b/addons/markers/InsertMarker.hpp index 3cf32943c4..82712fa8f1 100644 --- a/addons/markers/InsertMarker.hpp +++ b/addons/markers/InsertMarker.hpp @@ -1,4 +1,3 @@ - class RscPicture; class RscText; class RscStructuredText; @@ -13,91 +12,34 @@ class RscXSliderH; class RscDisplayInsertMarker { onLoad = QUOTE(_this call DFUNC(initInsertMarker);); onUnload = QUOTE(_this call DFUNC(placeMarker);); - idd = 54; + // idd = 54; movingEnable = 1; class controlsBackground { - class RscText_1000: RscText { - idc = 1000; - /*x = "0 * GUI_GRID_INSERTMARKER_W + GUI_GRID_INSERTMARKER_X"; - y = "0 * GUI_GRID_INSERTMARKER_H + GUI_GRID_INSERTMARKER_Y"; - w = "8 * GUI_GRID_INSERTMARKER_W"; - h = "2.5 * GUI_GRID_INSERTMARKER_H"; - colorBackground[] = {0,0,0,0.5};*/ - }; - class Description: RscStructuredText { - colorBackground[] = {0,0,0,0.7}; - idc = 1100; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "9.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - }; + // class RscText_1000: RscText {idc = 1000;}; }; class controls { - //delete ButtonOK; - class ButtonMenuOK: RscButtonMenuOK { - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "15.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "8.9 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - // size = "0.85 * ( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; - // sizeEx = "0.85 * ( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; - text = ""; + // class ButtonMenuOK: RscButtonMenuOK {idc = 1;}; + // class ButtonMenuCancel: RscButtonMenuCancel {idc = 2;}; + // class Title: RscText {idc = 1001;}; + // class Description: RscStructuredText {idc = 1100;}; + // class DescriptionChannel: RscStructuredText {idc = 1101;}; + // class MarkerPicture: RscPicture {idc = 102;}; + // class MarkerText: RscEdit {idc = 101;}; + // class MarkerChannel: RscCombo {idc = 103;}; + + class MarkerShape: RscCombo { + idc = 1210; }; - class ButtonMenuCancel: RscButtonMenuCancel { - x = "23 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "15.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "1.1 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - - text = "X"; - colorBackground[] = {0.75,0,0,0.5}; - colorBackgroundFocused[] = {0.75,0,0,0.5}; - colorBackground2[] = {1,0,0,0.5}; + class MarkerColor: RscCombo { + idc = 1211; }; - /*class ButtonMenuInfo: RscButtonMenu { - idc = 2400; - text = "$STR_A3_RscDisplayInsertMarker_ButtonMenuInfo"; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "13.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - };*/ - delete ButtonMenuInfo; - class Title: RscText { - moving = 1; - colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.5])","(profilenamespace getvariable ['GUI_BCG_RGB_A',0.8])"}; - idc = 1001; - text = "$STR_A3_RscDisplayInsertMarker_Title"; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "8.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + class MarkerAngle: RscXSliderH { + idc = 1220; }; - delete Description; - /*class Info: RscStructuredText { - colorBackground[] = {0,0,0,0.7}; - idc = 1101; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "11.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - };*/ - delete Info; - class Picture: RscPicture { - idc = 102; - x = 0.259984; - y = 0.4; - w = 0.05; - h = 0.0666667; - }; - class Text: RscEdit { - idc = 101; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "10.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; + class MarkerAngleText: RscText { + idc = 1221; }; + /*class SizeX: RscEdit { idc = 1200; text = "10"; @@ -114,34 +56,5 @@ class RscDisplayInsertMarker { w = "5 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; };*/ - class MarkerShape: RscCombo { - idc = 1210; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "11.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - }; - class MarkerColor: RscCombo { - idc = 1211; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "12.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - }; - class MarkerAngle: RscXSliderH { - idc = 1220; - text = "10"; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "13.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - }; - class MarkerAngleText: RscText { - idc = 1221; - x = "14 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)"; - y = "14.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))"; - w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; - h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - }; }; }; diff --git a/addons/markers/XEH_postInit.sqf b/addons/markers/XEH_postInit.sqf index eea149f294..ecb4d579fe 100644 --- a/addons/markers/XEH_postInit.sqf +++ b/addons/markers/XEH_postInit.sqf @@ -11,6 +11,12 @@ if (isMultiplayer && {!isServer} && {hasInterface}) then { private "_logic"; _logic = createGroup sideLogic createUnit ["Logic", [0,0,0], [], 0, "NONE"]; - - [QGVAR(sendMarkersJIP), _logic] call EFUNC(common,serverEvent); + [QGVAR(sendMarkersJIP), [_logic]] call EFUNC(common,serverEvent); }; + + +GVAR(mapDisplaysWithDrawEHs) = []; +GVAR(currentMarkerPosition) = []; +GVAR(currentMarkerAngle) = 0; +GVAR(currentMarkerColorConfigName) = ""; +GVAR(currentMarkerConfigName) = ""; \ No newline at end of file diff --git a/addons/markers/XEH_preInit.sqf b/addons/markers/XEH_preInit.sqf index 8e07056da4..fd97aeda0c 100644 --- a/addons/markers/XEH_preInit.sqf +++ b/addons/markers/XEH_preInit.sqf @@ -3,6 +3,7 @@ ADDON = false; PREP(initInsertMarker); +PREP(mapDrawEH); PREP(onLBSelChangedColor); PREP(onLBSelChangedShape); PREP(onSliderPosChangedAngle); @@ -14,25 +15,15 @@ PREP(setMarkerNetwork); // init marker types if (isNil QGVAR(MarkersCache)) then { _config = configfile >> "CfgMarkers"; - _index = 0; - GVAR(MarkersCache) = []; for "_a" from 0 to (count _config - 1) do { _marker = _config select _a; - _scope = getNumber (_marker >> "scope"); - _name = getText (_marker >> "name"); - _icon = getText (_marker >> "icon"); - if (_scope == 2) then { - _shape lbAdd _name; - _shape lbSetValue [_index, _a]; - _shape lbSetPicture [_index, _icon]; - + _name = getText (_marker >> "name"); + _icon = getText (_marker >> "icon"); GVAR(MarkersCache) pushBack [_name, _a, _icon]; - - _index = _index + 1; }; }; }; @@ -40,39 +31,27 @@ if (isNil QGVAR(MarkersCache)) then { // init marker colors if (isNil QGVAR(MarkerColorsCache)) then { _config = configfile >> "CfgMarkerColors"; - _index = 0; - GVAR(MarkerColorsCache) = []; for "_a" from 0 to (count _config - 1) do { _marker = _config select _a; - _scope = getNumber (_marker >> "scope"); - _name = getText (_marker >> "name"); - if (_scope == 2) then { - _color lbAdd _name; - _color lbSetValue [_index, _a]; - + _name = getText (_marker >> "name"); _rgba = getArray (_marker >> "color"); - { if (typeName _x != "SCALAR") then { _rgba set [_forEachIndex, call compile _x]; }; } forEach _rgba; - _icon = format ["#(argb,8,8,3)color(%1,%2,%3,%4)", _rgba select 0, _rgba select 1, _rgba select 2, _rgba select 3]; - _color lbSetPicture [_index, _icon]; - GVAR(MarkerColorsCache) pushBack [_name, _a, _icon]; - - _index = _index + 1; }; }; }; +//Server Sync JIP markers: [QGVAR(sendMarkersJIP), FUNC(sendMarkersJIP)] call EFUNC(common,addEventHandler); ADDON = true; diff --git a/addons/markers/functions/fnc_initInsertMarker.sqf b/addons/markers/functions/fnc_initInsertMarker.sqf index e5328a7470..6ac13f9e80 100644 --- a/addons/markers/functions/fnc_initInsertMarker.sqf +++ b/addons/markers/functions/fnc_initInsertMarker.sqf @@ -1,87 +1,84 @@ -// stuff taken from bohemia, edited by commy2 +/* + * Author: BIS, commy2 + * Sets up the marker placement + * Run instead of \a3\ui_f\scripts\GUI\RscDisplayInsertMarker.sqf + * + * Arguments: + * 0: RscDisplayInsertMarker + * + * Return Value: + * Nothing + * + * Example: + * [onLoad] call ace_markers_fnc_initInsertMarker; + * + * Public: No + */ #include "script_component.hpp" #define BORDER 0.005 [{ disableserialization; - _display = _this select 0; + PARAMS_1(_display); - //Prevent Captive Players from placing markers - /*if (ACE_player getVariable ["ACE_isCaptive", false]) exitWith { + //Can't place markers when can't interact + if (!([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith))) exitWith { _display closeDisplay 2; //emulate "Cancel" button - };*/ - - // prevent vanilla key input - _display displayAddEventHandler ["KeyDown", {(_this select 1) in [200, 208]}]; + }; + //BIS Controls: _text = _display displayctrl 101; _picture = _display displayctrl 102; + _channel = _display displayctrl 103; _buttonOK = _display displayctrl 1; _buttonCancel = _display displayctrl 2; _description = _display displayctrl 1100; _title = _display displayctrl 1001; - _sizeX = _display displayctrl 1200; - _sizeY = _display displayctrl 1201; - _shape = _display displayctrl 1210; - _color = _display displayctrl 1211; - _angle = _display displayctrl 1220; - _angleText = _display displayctrl 1221; + _descriptionChannel = _display displayctrl 1101; + //ACE Controls: + // _sizeX = _display displayctrl 1200; + // _sizeY = _display displayctrl 1201; + _aceShapeLB = _display displayctrl 1210; + _aceColorLB = _display displayctrl 1211; + _aceAngleSlider = _display displayctrl 1220; + _aceAngleSliderText = _display displayctrl 1221; + + + //Install MapDrawEH on current map + _mapIDD = -1; + { + if (!isNull (findDisplay _x)) exitWith {_mapIDD = _x}; + } forEach [12, 37, 52, 53, 160]; + if (_mapIDD == -1) exitWith {ERROR("No Map?");}; + if (!(_mapIDD in GVAR(mapDisplaysWithDrawEHs))) then { + GVAR(mapDisplaysWithDrawEHs) pushBack _mapIDD; + ((finddisplay _mapIDD) displayctrl 51) ctrlAddEventHandler ["Draw", {_this call FUNC(mapDrawEH)}]; + }; + + //Calculate center position of the marker placement ctrl + _pos = ctrlPosition _picture; + _pos = [(_pos select 0) + (_pos select 2) / 2, (_pos select 1) + (_pos select 3) / 2]; + GVAR(currentMarkerPosition) = ((findDisplay _mapIDD) displayCtrl 51) ctrlMapScreenToWorld _pos; + + //Hide the bis picture: + _picture ctrlShow false; + + // prevent vanilla key input + _display displayAddEventHandler ["KeyDown", {(_this select 1) in [200, 208]}]; + + + //Focus on the text input ctrlSetFocus _text; - //Change ok button's text based on current channel - [{ - EXPLODE_2_PVT(_this,_params,_pfhId); - EXPLODE_1_PVT(_params,_buttonOK); - - if (isNull _buttonOK) exitWith { - [_pfhId] call CBA_fnc_removePerFrameHandler; - }; - - _channel = ""; - _textColor = [1,1,1,1]; - switch (call EFUNC(common,currentChannel)) do { - case ("global"): { - _channel = localize "str_channel_global"; - _textColor = [(216/255),(216/255),(216/255),1]; - }; - case ("side"): { - _channel = localize "str_channel_side"; - _textColor = [(70/255),(211/255),(252/255),1]; - }; - case ("group"): { - _channel = localize "str_channel_group"; - _textColor = [(181/255),(248/255),(98/255),1]; - }; - case ("vehicle"): { - _channel = localize "str_channel_vehicle"; - _textColor = [(255/255),(208/255),(0/255),1]; - }; - case ("direct"): { - _channel = localize "str_channel_direct"; - _textColor = [(255/255),(255/255),(255/255),1]; - }; - case ("command"): { - _channel = localize "str_channel_command"; - _textColor = [(255/255),(255/255),(70/255),1]; - }; - }; - - //If localization not found, then don't touch anything (default is RscButtonMenuOK's localized text) - if (_channel != "") then { - _buttonOK ctrlSetTextColor _textColor; - _buttonOK ctrlSetText format [localize "STR_ACE_Markers_PlaceIn", _channel]; - }; - }, 0, [_buttonOK]] call CBA_fnc_addPerFrameHandler; - //--- Background _pos = ctrlposition _text; _posX = (_pos select 0) + 0.01; _posY = _pos select 1; _posW = _pos select 2; _posH = _pos select 3; - _posY = _posY min ((safeZoneH + safeZoneY) - (6 * _posH + 8 * BORDER)); //prevent buttons being placed below bottom edge of screen + _posY = _posY min ((safeZoneH + safeZoneY) - (8 * _posH + 8 * BORDER)); //prevent buttons being placed below bottom edge of screen _pos set [0,_posX]; _pos set [1,_posY]; _text ctrlsetposition _pos; @@ -96,46 +93,67 @@ //--- Description _pos set [1,_posY - 1*_posH]; _pos set [3,6*_posH + 6 * BORDER]; + _description ctrlenable false; _description ctrlsetposition _pos; - _description ctrlsetstructuredtext parsetext format ["%1","Description:"]; //--- ToDo: Localze + _description ctrlsetstructuredtext parsetext format ["%1", (localize "str_lib_label_description")]; _description ctrlcommit 0; - _activeColor = (["IGUI","WARNING_RGB"] call bis_fnc_displaycolorget) call bis_fnc_colorRGBtoHTML; - //--- Shape _pos set [1,_posY + 1 * _posH + 2 * BORDER]; _pos set [2,_posW]; _pos set [3,_posH]; - _shape ctrlsetposition _pos; - _shape ctrlcommit 0; + _aceShapeLB ctrlsetposition _pos; + _aceShapeLB ctrlcommit 0; //--- Color _pos set [1,_posY + 2 * _posH + 3 * BORDER]; _pos set [2,_posW]; - _color ctrlsetposition _pos; - _color ctrlcommit 0; + _aceColorLB ctrlsetposition _pos; + _aceColorLB ctrlcommit 0; //--- Angle _pos set [1,_posY + 3 * _posH + 4 * BORDER]; _pos set [2,_posW]; - _angle ctrlsetposition _pos; - _angle ctrlcommit 0; + _aceAngleSlider ctrlsetposition _pos; + _aceAngleSlider ctrlcommit 0; //--- Angle Text _pos set [1,_posY + 4 * _posH + 5 * BORDER]; _pos set [2,_posW]; - _angleText ctrlsetposition _pos; - _angleText ctrlcommit 0; + _aceAngleSliderText ctrlsetposition _pos; + _aceAngleSliderText ctrlcommit 0; + + _offsetButtons = 0; + if (isMultiplayer) then { + _pos set [1,_posY + 5 * _posH + 7 * BORDER]; + _pos set [3,_posH]; + _descriptionChannel ctrlsetstructuredtext parsetext format ["%1", (localize "str_a3_cfgvehicles_modulerespawnposition_f_arguments_marker_0") + ":"]; + _descriptionChannel ctrlsetposition _pos; + _descriptionChannel ctrlcommit 0; + + _pos set [1,_posY + 6 * _posH + 7 * BORDER]; + _pos set [3,_posH]; + _channel ctrlsetposition _pos; + _channel ctrlcommit 0; + _offsetButtons = 7 * _posH + 8 * BORDER; + } else { + _descriptionChannel ctrlshow false; + _channel ctrlshow false; + _offsetButtons = 5 * _posH + 7 * BORDER; + }; //--- ButtonOK - _pos set [1,_posY + 5 * _posH + 7 * BORDER]; - _pos set [2,_posW * (8.9/10) - BORDER]; + _pos set [1,_posY + _offsetButtons]; + _pos set [2,_posW / 2 - BORDER]; + _pos set [3,_posH]; _buttonOk ctrlsetposition _pos; _buttonOk ctrlcommit 0; //--- ButtonCancel - _pos set [0,_posX + _posW * (8.9 / 10)]; - _pos set [2,_posW * (1.1 / 10)]; + _pos set [0,_posX + _posW / 2]; + _pos set [1,_posY + _offsetButtons]; + _pos set [2,_posW / 2]; + _pos set [3,_posH]; _buttonCancel ctrlsetposition _pos; _buttonCancel ctrlcommit 0; @@ -151,56 +169,41 @@ // init marker shape lb + lbClear _aceShapeLB; { - _shape lbAdd (_x select 0); - _shape lbSetValue [_forEachIndex, _x select 1]; - _shape lbSetPicture [_forEachIndex, _x select 2]; + _aceShapeLB lbAdd (_x select 0); + _aceShapeLB lbSetValue [_forEachIndex, _x select 1]; + _aceShapeLB lbSetPicture [_forEachIndex, _x select 2]; } forEach GVAR(MarkersCache); - - _shape ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedShape)}]; - _curSelShape = GETGVAR(curSelMarkerShape,0); - _shape lbSetCurSel _curSelShape; - _data = _shape lbValue _curSelShape; - _config = (configfile >> "CfgMarkers") select _data; - _icon = getText (_config >> "icon"); - _picture ctrlSetText _icon; + _aceShapeLB lbSetCurSel _curSelShape; + + //Update now and add eventHandler: + [_aceShapeLB, _curSelShape] call FUNC(onLBSelChangedShape); + _aceShapeLB ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedShape)}]; // init marker color lb + lbClear _aceColorLB; { - _color lbAdd (_x select 0); - _color lbSetValue [_forEachIndex, _x select 1]; - _color lbSetPicture [_forEachIndex, _x select 2]; + _aceColorLB lbAdd (_x select 0); + _aceColorLB lbSetValue [_forEachIndex, _x select 1]; + _aceColorLB lbSetPicture [_forEachIndex, _x select 2]; } forEach GVAR(MarkerColorsCache); - - _color ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedColor)}]; - _curSelColor = GETGVAR(curSelMarkerColor,0); - _color lbSetCurSel _curSelColor; - _data = _color lbValue _curSelColor; - _config = (configfile >> "CfgMarkerColors") select _data; - _rgba = getArray (_config >> "color"); - { - if (typeName _x != "SCALAR") then { - _rgba set [_forEachIndex, call compile _x]; - }; - } forEach _rgba; - _picture ctrlSetTextColor _rgba; + _aceColorLB lbSetCurSel _curSelColor; + + //Update now and add eventHandler: + [_aceColorLB, _curSelColor] call FUNC(onLBSelChangedColor); + _aceColorLB ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedColor)}]; // init marker angle slider - _angle sliderSetRange [-180, 180]; - _angle ctrlAddEventHandler ["SliderPosChanged", {_this call FUNC(onSliderPosChangedAngle)}]; - - _curSelAngle = GETGVAR(curSelMarkerAngle,0); - _angle sliderSetPosition _curSelAngle; - - _curSelAngle = round _curSelAngle; - if (_curSelAngle < 0) then { - _curSelAngle = _curSelAngle + 360; - }; - - _angleText ctrlSetText format [localize "STR_ACE_Markers_MarkerDirection", _curSelAngle]; + _aceAngleSlider sliderSetRange [-180, 180]; + _curSelAngle = GETGVAR(currentMarkerAngle,0); + _aceAngleSlider sliderSetPosition _curSelAngle; + //Update now and add eventHandler: + [_aceAngleSlider, _curSelAngle] call FUNC(onSliderPosChangedAngle); + _aceAngleSlider ctrlAddEventHandler ["SliderPosChanged", {_this call FUNC(onSliderPosChangedAngle)}]; }, _this] call EFUNC(common,execNextFrame); diff --git a/addons/markers/functions/fnc_mapDrawEH.sqf b/addons/markers/functions/fnc_mapDrawEH.sqf new file mode 100644 index 0000000000..2e23dacec8 --- /dev/null +++ b/addons/markers/functions/fnc_mapDrawEH.sqf @@ -0,0 +1,45 @@ +/* + * Author: PabstMirror + * Draws the current temp marker. Allows rotation. + * + * Arguments: + * 0: TheMap + * + * Return Value: + * Nothing + * + * Example: + * [theMapControl] call ace_markers_fnc_mapDrawEH; + * + * Public: No + */ +#include "script_component.hpp" + +private ["_theMap", "_sizeX", "_sizeY", "_textureConfig", "_texture", "_markerSize", "_markerShadow", "_colorConfig", "_drawColor"]; + +PARAMS_1(_theMap); + +//Only show if marker place is open: +if (isNull (findDisplay 54)) exitWith {}; +//Error checking: +if ((GVAR(currentMarkerConfigName) == "") || {GVAR(currentMarkerColorConfigName) == ""} || {GVAR(currentMarkerPosition) isEqualTo []}) exitWith {ERROR("Bad Data");}; + +_sizeX = 1; +_sizeY = 1; + +_textureConfig = configFile >> "CfgMarkers" >> GVAR(currentMarkerConfigName); +_texture = getText (_textureConfig >> "icon"); +_markerSize = getNumber (_textureConfig >> "size"); +_markerShadow = getNumber (_textureConfig >> "shadow"); +_colorConfig = (configFile >> "CfgMarkerColors" >> GVAR(currentMarkerColorConfigName)); +_drawColor = getArray (_colorConfig >> "color"); + +//Convert possible code into numbers +{ + if (typeName _x == "STRING") then { + _drawColor set [_forEachIndex, (call compile _x)]; + }; +} forEach _drawColor; +_drawColor set [3, ((_drawColor select 3) * 0.875)]; //Arma adds a slight transparency + +_theMap drawIcon [_texture, _drawColor, GVAR(currentMarkerPosition), (_sizeX * _markerSize), (_sizeY * _markerSize), GVAR(currentMarkerAngle), "", _markerShadow]; diff --git a/addons/markers/functions/fnc_onLBSelChangedColor.sqf b/addons/markers/functions/fnc_onLBSelChangedColor.sqf index a79495d442..e089569761 100644 --- a/addons/markers/functions/fnc_onLBSelChangedColor.sqf +++ b/addons/markers/functions/fnc_onLBSelChangedColor.sqf @@ -1,23 +1,28 @@ -// by commy2 +/* + * Author: commy2 + * When the color list box is changed. + * + * Arguments: + * 0: Color ListBox (idc 1211) + * 1: Selected Index + * + * Return Value: + * Nothing + * + * Example: + * [ColorLB, 5] call ace_markers_fnc_onLBSelChangedColor; + * + * Public: No + */ #include "script_component.hpp" -private ["_ctrl", "_data", "_config", "_color"]; +private ["_data", "_config"]; -_ctrl = _this select 0; -_data = _ctrl lbValue (_this select 1); +PARAMS_2(_ctrl,_index); +_data = _ctrl lbValue _index; -GVAR(curSelMarkerColor) = _this select 1; +GVAR(curSelMarkerColor) = _index; _config = (configfile >> "CfgMarkerColors") select _data; -_color = getArray (_config >> "color"); - -{ - if (typeName _x != "SCALAR") then { - _color set [_forEachIndex, call compile _x]; - }; -} forEach _color; - -((ctrlParent _ctrl) displayCtrl 102) ctrlSetTextColor _color; - GVAR(currentMarkerColorConfigName) = (configName _config); diff --git a/addons/markers/functions/fnc_onLBSelChangedShape.sqf b/addons/markers/functions/fnc_onLBSelChangedShape.sqf index 57caba8680..ff067a467b 100644 --- a/addons/markers/functions/fnc_onLBSelChangedShape.sqf +++ b/addons/markers/functions/fnc_onLBSelChangedShape.sqf @@ -1,17 +1,28 @@ -// by commy2 +/* + * Author: commy2 + * When the shape list box is changed. + * + * Arguments: + * 0: Shape ListBox (idc 1210) + * 1: Selected Index + * + * Return Value: + * Nothing + * + * Example: + * [ColorLB, 5] call ace_markers_fnc_onLBSelChangedShape; + * + * Public: No + */ #include "script_component.hpp" -private ["_ctrl", "_data", "_config", "_icon"]; +private ["_data", "_config"]; -_ctrl = _this select 0; -_data = _ctrl lbValue (_this select 1); +PARAMS_2(_ctrl,_index); +_data = _ctrl lbValue _index; -GVAR(curSelMarkerShape) = _this select 1; +GVAR(curSelMarkerShape) = _index; _config = (configfile >> "CfgMarkers") select _data; -_icon = getText (_config >> "icon"); - -((ctrlParent _ctrl) displayCtrl 102) ctrlSetText _icon; - GVAR(currentMarkerConfigName) = (configName _config); diff --git a/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf b/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf index 354fb909e1..747c0d4bbb 100644 --- a/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf +++ b/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf @@ -1,12 +1,24 @@ -// by commy2 +/* + * Author: commy2 + * Angle Slider Pos changed + * + * Arguments: + * 0: Slider (idc 1210) + * 1: Slider Data (angle: -180..180) + * + * Return Value: + * Nothing + * + * Example: + * [Slider, 2] call ace_markers_fnc_onSliderPosChangedAngle; + * + * Public: No + */ #include "script_component.hpp" -private ["_ctrl", "_data", "_direction"]; +private ["_direction"]; -_ctrl = _this select 0; -_data = _this select 1; - -GVAR(curSelMarkerAngle) = _data; +PARAMS_2(_ctrl,_data); _direction = round _data; if (_direction < 0) then { diff --git a/addons/markers/functions/fnc_placeMarker.sqf b/addons/markers/functions/fnc_placeMarker.sqf index 124e797e31..fd584c1c99 100644 --- a/addons/markers/functions/fnc_placeMarker.sqf +++ b/addons/markers/functions/fnc_placeMarker.sqf @@ -1,46 +1,36 @@ -// by commy2 +/* + * Author: commy2 + * MarkerPlacement closed + * + * Arguments: + * 0: RscDisplayInsertMarker + * 1: CloseNumber (1 = ButtonOk) + * + * Return Value: + * Nothing + * + * Example: + * [onUnloadEvent] call ace_markers_fnc_placeMarker; + * + * Public: No + */ #include "script_component.hpp" -if (_this select 1 == 1) then { - disableserialization; - _display = _this select 0; +disableserialization; +PARAMS_2(_display,_closeNum); - _pos = ctrlPosition (_display displayCtrl 102); - _pos = [ - (_pos select 0) + (_pos select 2) / 2, - (_pos select 1) + (_pos select 3) / 2 - ]; - - switch (true) do { - case (!isNull findDisplay 12): { - _pos = (findDisplay 12 displayCtrl 51) ctrlMapScreenToWorld _pos; - }; - case (!isNull findDisplay 37): { - _pos = (findDisplay 37 displayCtrl 51) ctrlMapScreenToWorld _pos; - }; - case (!isNull findDisplay 52): { - _pos = (findDisplay 52 displayCtrl 51) ctrlMapScreenToWorld _pos; - }; - case (!isNull findDisplay 53): { - _pos = (findDisplay 53 displayCtrl 51) ctrlMapScreenToWorld _pos; - }; - }; +if (_closeNum == 1) then { // set and send marker data the next frame. the actual marker isn't created yet - [ - { - - [QGVAR(setMarkerNetwork), [ - allMapMarkers select (count allMapMarkers - 1), [ - GETGVAR(currentMarkerConfigName,""), - GETGVAR(currentMarkerColorConfigName,""), - _this, - GETGVAR(currentMarkerAngle,0) - ] - ]] call EFUNC(common,globalEvent); - - }, - _pos - ] call EFUNC(common,execNextFrame); + [{ + [QGVAR(setMarkerNetwork), [ + allMapMarkers select (count allMapMarkers - 1), [ + GETGVAR(currentMarkerConfigName,""), + GETGVAR(currentMarkerColorConfigName,""), + GETGVAR(currentMarkerPosition,[]), + GETGVAR(currentMarkerAngle,0) + ] + ]] call EFUNC(common,globalEvent); + }, []] call EFUNC(common,execNextFrame); }; diff --git a/addons/markers/functions/fnc_sendMarkersJIP.sqf b/addons/markers/functions/fnc_sendMarkersJIP.sqf index 9915820d72..99eea2f2d9 100644 --- a/addons/markers/functions/fnc_sendMarkersJIP.sqf +++ b/addons/markers/functions/fnc_sendMarkersJIP.sqf @@ -1,13 +1,25 @@ -// by commy2 +/* + * Author: commy2 + * Server: Recives a dummy logic, sends marker data back to the owner. + * + * Arguments: + * 0: Logic + * + * Return Value: + * Nothing + * + * Example: + * [onUnloadEvent] call ace_markers_fnc_sendMarkerJIP; + * + * Public: No + */ #include "script_component.hpp" -private "_logic"; +PARAMS_1(_logic); -_logic = _this; - -[QGVAR(setMarkerJIP), _logic, [ - GETGVAR(allMapMarkers,[]), - GETGVAR(allMapMarkersProperties,[]), - _logic - ] +[QGVAR(setMarkerJIP), [_logic], [ +GETGVAR(allMapMarkers,[]), +GETGVAR(allMapMarkersProperties,[]), +_logic +] ] call EFUNC(common,targetEvent); diff --git a/addons/markers/functions/fnc_setMarkerJIP.sqf b/addons/markers/functions/fnc_setMarkerJIP.sqf index 74bd4f97f7..0760cc6fe5 100644 --- a/addons/markers/functions/fnc_setMarkerJIP.sqf +++ b/addons/markers/functions/fnc_setMarkerJIP.sqf @@ -1,35 +1,49 @@ -// by commy2 +/* + * Author: commy2 + * Client: Recives a marker data from server. + * + * Arguments: + * 0: Array of map marker names + * 1: Array of map marker data + * 2: Logic + * + * Return Value: + * Nothing + * + * Example: + * [[],[],dummyLogic] call ace_markers_fnc_setMarkerJIP; + * + * Public: No + */ #include "script_component.hpp" -private ["_allMapMarkers", "_allMapMarkersProperties", "_index", "_data", "_config"]; +private ["_index", "_data", "_config"]; -_allMapMarkers = _this select 0; -_allMapMarkersProperties = _this select 1; -_logic = _this select 2; +PARAMS_3(_allMapMarkers,_allMapMarkersProperties,_logic); { - _index = _allMapMarkers find _x; + _index = _allMapMarkers find _x; - if (_index != -1) then { - _data = _allMapMarkersProperties select _index; + if (_index != -1) then { + _data = _allMapMarkersProperties select _index; - _config = (configfile >> "CfgMarkers") >> (_data select 0); - if (!isClass _config) then { - WARNING("CfgMarker not found, changed to milDot"); - _config == (configFile >> "CfgMarkers" >> "MilDot"); + _config = (configfile >> "CfgMarkers") >> (_data select 0); + if (!isClass _config) then { + WARNING("CfgMarker not found, changed to milDot"); + _config == (configFile >> "CfgMarkers" >> "MilDot"); + }; + _x setMarkerTypeLocal (configName _config); + + _config = (configfile >> "CfgMarkerColors") >> (_data select 1); + if (!isClass _config) then { + WARNING("CfgMarkerColors not found, changed to Default"); + _config == (configFile >> "CfgMarkerColors" >> "Default"); + }; + _x setMarkerColorLocal (configName _config); + + _x setMarkerPosLocal (_data select 2); + _x setMarkerDirLocal (_data select 3); }; - _x setMarkerTypeLocal (configName _config); - - _config = (configfile >> "CfgMarkerColors") >> (_data select 1); - if (!isClass _config) then { - WARNING("CfgMarkerColors not found, changed to Default"); - _config == (configFile >> "CfgMarkerColors" >> "Default"); - }; - _x setMarkerColorLocal (configName _config); - - _x setMarkerPosLocal (_data select 2); - _x setMarkerDirLocal (_data select 3); - }; } forEach allMapMarkers; deleteVehicle _logic; diff --git a/addons/markers/functions/fnc_setMarkerNetwork.sqf b/addons/markers/functions/fnc_setMarkerNetwork.sqf index 194d169f24..457d5dac37 100644 --- a/addons/markers/functions/fnc_setMarkerNetwork.sqf +++ b/addons/markers/functions/fnc_setMarkerNetwork.sqf @@ -1,45 +1,61 @@ -// by commy2 +/* + * Author: commy2 + * Sets newly placed marker + * Handles the QGVAR(setMarkerNetwork) event. + * + * Arguments: + * 0: Markername + * 1: Marker Data + * + * Return Value: + * Nothing + * + * Example: + * [[],[],dummyLogic] call ace_markers_fnc_setMarkerJIP; + * + * Public: No + */ #include "script_component.hpp" -private ["_marker", "_data", "_config"]; +private ["_config"]; -_marker = _this select 0; -_data = _this select 1; +PARAMS_2(_marker,_data); +EXPLODE_4_PVT(_data,_markerClassname,_colorClassname,_markerPos,_markerDir); -_config = (configfile >> "CfgMarkers") >> (_data select 0); +_config = (configfile >> "CfgMarkers") >> _markerClassname; if (!isClass _config) then { - WARNING("CfgMarker not found, changed to milDot"); - _config == (configFile >> "CfgMarkers" >> "MilDot"); + WARNING("CfgMarker not found, changed to milDot"); + _config == (configFile >> "CfgMarkers" >> "MilDot"); }; _marker setMarkerTypeLocal (configName _config); -_config = (configfile >> "CfgMarkerColors") >> (_data select 1); +_config = (configfile >> "CfgMarkerColors") >> _colorClassname; if (!isClass _config) then { - WARNING("CfgMarkerColors not found, changed to Default"); - _config == (configFile >> "CfgMarkerColors" >> "Default"); + WARNING("CfgMarkerColors not found, changed to Default"); + _config == (configFile >> "CfgMarkerColors" >> "Default"); }; _marker setMarkerColorLocal configName _config; -_marker setMarkerPosLocal (_data select 2); -_marker setMarkerDirLocal (_data select 3); +_marker setMarkerPosLocal _markerPos; +_marker setMarkerDirLocal _markerDir; // save properties on server machine for JIP, marker editing ready if (isMultiplayer && {isServer}) then { - private ["_allMapMarkers", "_allMapMarkersProperties", "_index"]; + private ["_allMapMarkers", "_allMapMarkersProperties", "_index"]; - _allMapMarkers = GETMVAR(allMapMarkers,[]); - _allMapMarkersProperties = GETMVAR(allMapMarkersProperties,[]); + _allMapMarkers = GETGVAR(allMapMarkers,[]); + _allMapMarkersProperties = GETGVAR(allMapMarkersProperties,[]); - _index = _allMapMarkers find _marker; + _index = _allMapMarkers find _marker; - if (_index == -1) then { - _allMapMarkers pushBack _marker; - _allMapMarkersProperties pushBack _data; - } else { - _allMapMarkers set [_index, _marker]; - _allMapMarkersProperties set [_index, _data]; - }; + if (_index == -1) then { + _allMapMarkers pushBack _marker; + _allMapMarkersProperties pushBack _data; + } else { + _allMapMarkers set [_index, _marker]; + _allMapMarkersProperties set [_index, _data]; + }; - GVAR(allMapMarkers) = _allMapMarkers; - GVAR(allMapMarkersProperties) = _allMapMarkersProperties; + GVAR(allMapMarkers) = _allMapMarkers; + GVAR(allMapMarkersProperties) = _allMapMarkersProperties; }; diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index 0d2619ae40..ea6d72990a 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -11,13 +11,5 @@ Dirección: %1° Направление: %1 - - Place in: %1 - Platz in: %1 - Colocar en: %1 - Umieść na: %1 - Umístit do: %1 - Место в: %1 - \ No newline at end of file diff --git a/addons/optionsmenu/gui/pauseMenu.hpp b/addons/optionsmenu/gui/pauseMenu.hpp index 880f418a38..d6a831c2aa 100644 --- a/addons/optionsmenu/gui/pauseMenu.hpp +++ b/addons/optionsmenu/gui/pauseMenu.hpp @@ -94,4 +94,13 @@ class RscDisplayInterruptEditor3D: RscStandardDisplay { class controls { class ACE_Open_settingsMenu_Btn : ACE_Open_SettingsMenu_BtnBase {}; }; -}; \ No newline at end of file +}; +class RscDisplayMain: RscStandardDisplay { + class controls { + class ACE_Open_settingsMenu_Btn : ACE_Open_SettingsMenu_BtnBase { + action = "if (missionName != '') then {createDialog 'ACE_settingsMenu';};"; + y = "4 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + safezoneY"; + }; + }; +}; + diff --git a/addons/recoil/CfgEventHandlers.hpp b/addons/recoil/CfgEventHandlers.hpp deleted file mode 100644 index 1bf256e028..0000000000 --- a/addons/recoil/CfgEventHandlers.hpp +++ /dev/null @@ -1,43 +0,0 @@ -class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit) ); - }; -}; - -class Extended_FiredBis_EventHandlers { - class CAManBase { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == ACE_player) then {_this call FUNC(camShake); _this call FUNC(burstDispersion);};); - }; - }; - class Tank { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Car { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Helicopter { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Plane { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Ship_F { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class StaticWeapon { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; -}; diff --git a/addons/recoil/XEH_preInit.sqf b/addons/recoil/XEH_preInit.sqf deleted file mode 100644 index 2df8a83ebd..0000000000 --- a/addons/recoil/XEH_preInit.sqf +++ /dev/null @@ -1,8 +0,0 @@ -#include "script_component.hpp" - -ADDON = false; - -PREP(burstDispersion); -PREP(camShake); - -ADDON = true; diff --git a/addons/recoil/config.cpp b/addons/recoil/config.cpp index db08a49143..2b003e6c65 100644 --- a/addons/recoil/config.cpp +++ b/addons/recoil/config.cpp @@ -6,14 +6,12 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; - author[] = {"KoffeinFlummi", "TaoSensai", "commy2"}; + author[] = {"KoffeinFlummi","TaoSensai","commy2"}; authorUrl = "https://github.com/Taosenai/tmr"; VERSION_CONFIG; }; }; -#include "CfgEventHandlers.hpp" - // DOC: http://forums.bistudio.com/showthread.php?94464-explaining-the-cfgRecoils-array class CfgRecoils { #define KICKBACK 0.07 @@ -114,17 +112,18 @@ class CfgRecoils { recoil_single_titan[] = {0,0,0}; }; -class CfgCameraShake { +/*class CfgCameraShake { // Seems to be ignored by Arma defaultCaliberCoefWeaponFire = 0; -}; +};*/ // Completely disable BI's camshake on fire. -class CfgMovesBasic { +/*class CfgMovesBasic { class Default { camShakeFire = 0; }; }; + class CfgMovesMaleSdr : CfgMovesBasic { class States { class AmovPercMstpSlowWrflDnon; @@ -183,128 +182,4 @@ class CfgMovesMaleSdr : CfgMovesBasic { camShakeFire = 0; }; }; -}; - -// Ammo -class CfgAmmo { - class MissileCore; - class MissileBase: MissileCore { - GVAR(shakeMultiplier) = 2; - }; - - class BombCore; - class LaserBombCore: BombCore { - GVAR(shakeMultiplier) = 2; - }; - class Bo_Mk82: BombCore { - GVAR(shakeMultiplier) = 2; - }; - - class RocketCore; - class ArtilleryRocketCore: RocketCore { - GVAR(shakeMultiplier) = 1.4; - }; - class RocketBase: RocketCore { - GVAR(shakeMultiplier) = 1.4; - }; - - class BulletCore; - class BulletBase: BulletCore { - GVAR(shakeMultiplier) = 1; - }; - - class ShotgunCore; - class ShotgunBase: ShotgunCore { - GVAR(shakeMultiplier) = 1.1; - }; - - class ShellCore; - class ShellBase: ShellCore { - GVAR(shakeMultiplier) = 3; - }; - - class SubmunitionCore; - class SubmunitionBase: SubmunitionCore { - GVAR(shakeMultiplier) = 3; - }; - - class ShotDeployCore; - class ShotDeployBase: ShotDeployCore { - GVAR(shakeMultiplier) = 3; - }; -}; - -// Weapons -// 1. Set the recoil profiles for all fire modes. -// 2. Set the shake multiplier. This determines the camshake for the weapon. -// Ex: GVAR(shakeMultiplier) = 1; (disabled currently) - -class CfgWeapons { - class CannonCore; - class autocannon_Base_F: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class autocannon_35mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class cannon_120mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class mortar_155mm_AMOS: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class mortar_82mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - - // No camshake for gatlings - class gatling_20mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class gatling_25mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class gatling_30mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - - class MGunCore; - class MGun: MGunCore { - GVAR(shakeMultiplier) = 0; - }; - // No camshake for smoke launchers - class SmokeLauncher: MGun { - GVAR(shakeMultiplier) = 0; - }; - - // No camshake for coax machine guns - class LMG_RCWS; - class LMG_M200: LMG_RCWS { - GVAR(shakeMultiplier) = 0; - }; - class LMG_coax: LMG_RCWS { - GVAR(shakeMultiplier) = 0; - }; - class LMG_Minigun: LMG_RCWS { - GVAR(shakeMultiplier) = 0; - }; -}; - -// Vehicles -class CfgVehicles { - class LandVehicle; - class Tank: LandVehicle { - GVAR(enableCamshake) = 1; - }; - class Car: LandVehicle { - GVAR(enableCamshake) = 1; - }; - class StaticWeapon: LandVehicle { - GVAR(enableCamshake) = 1; - }; - - class Allvehicles; - class Air: Allvehicles { - GVAR(enableCamshake) = 1; - }; -}; +};*/ diff --git a/addons/recoil/functions/fnc_burstDispersion.sqf b/addons/recoil/functions/fnc_burstDispersion.sqf deleted file mode 100644 index 9467e922ff..0000000000 --- a/addons/recoil/functions/fnc_burstDispersion.sqf +++ /dev/null @@ -1,62 +0,0 @@ -// TMR: Small Arms - Recoil initialization and functions -// (C) 2013 Ryan Schultz. See LICENSE. -// Edited for compatability in ACE by KoffeinFlummi -// Edited by commy2 - -#include "script_component.hpp" - -private ["_unit", "_weapon", "_projectile"]; - -_unit = _this select 0; -_weapon = _this select 1; -_projectile = _this select 6; - -if (_weapon in ["Throw", "Put"]) exitWith {}; - -private ["_lastFired", "_burst"]; - -_lastFired = _unit getVariable [QUOTE(GVAR(lastFired)), -1]; -_burst = _unit getVariable [QUOTE(GVAR(burst)), 0]; - -if (time - _lastFired < 0.45) then { - private "_startDisperse"; - _burst = _burst + 1; - _unit setVariable [QUOTE(GVAR(burst)), _burst, false]; - - _startDisperse = [1, 3] select (cameraView == "GUNNER"); - - if (_burst > _startDisperse) then { - // Reset burst size for calcs - _burst = _burst - _startDisperse; - - // Increase dispersion cap if player is not using sights - _sightsBurst = [30, 0] select (cameraView == "GUNNER"); - - // Increase initial dispersion and cap if player is moving - if (speed _unit > 0.5) then { - _sightsBurst = 25; - _burst = _burst + 15; - }; - - // Maximum possible dispersion (without _sightsBurst mod) - _maxBurst = 50; - - if (_unit getVariable [QUOTE(EGVAR(resting,weaponRested)), false]) then {_maxBurst = 25}; - if (_unit getVariable [QUOTE(EGVAR(resting,bipodDeployed)), false]) then {_maxBurst = 18}; - - // Cap the dispersion - _burst = (_burst min _maxBurst) + _sightsBurst; - - // Add random variance - _elevAngle = (_burst / 300) - random (_burst / 300) * 2; - _travAngle = (_burst / 260) - random (_burst / 260) * 2; - - [_projectile, _travAngle, _elevAngle] call EFUNC(common,changeProjectileDirection); - }; -} else { - - // Long enough delay, reset burst - _unit setVariable [QUOTE(GVAR(burst)), 0, false]; -}; - -_unit setVariable [QUOTE(GVAR(lastFired)), time, false]; diff --git a/addons/recoil/functions/fnc_camShake.sqf b/addons/recoil/functions/fnc_camShake.sqf deleted file mode 100644 index cfe179d67b..0000000000 --- a/addons/recoil/functions/fnc_camShake.sqf +++ /dev/null @@ -1,61 +0,0 @@ -// TMR: Small Arms - Recoil initialization and functions -// (C) 2013 Ryan Schultz. See LICENSE. -// Edited for compatability in ACE by KoffeinFlummi -// Edited by commy2 - -#include "script_component.hpp" - -#define BASE_POWER 0.40 -#define BASE_TIME 0.19 -#define BASE_FREQ 13 -#define RECOIL_COEF 40 - -private ["_unit", "_weapon", "_muzzle", "_ammo"]; - -_unit = _this select 0; -_weapon = _this select 1; -_muzzle = _this select 2; -_ammo = _this select 4; - -if (_weapon in [handgunWeapon _unit, "Throw", "Put"]) exitWith {}; - -private ["_powerMod", "_timeMod", "_freqMod", "_powerCoef"]; - -_powerMod = ([0, -0.1, -0.1, 0, -0.2] select (["STAND", "CROUCH", "PRONE", "UNDEFINED", ""] find stance _unit)) + ([0, -1, 0, -1] select (["INTERNAL", "EXTERNAL", "GUNNER", "GROUP"] find cameraView)); -_timeMod = 0; -_freqMod = 0; - -_powerCoef = 0; -if (_unit != vehicle _unit) then { - _powerCoef = getNumber (configFile >> "CfgWeapons" >> _weapon >> QUOTE(GVAR(shakeMultiplier))); - _powerCoef = _powerCoef * getNumber (configFile >> "CfgAmmo" >> _ammo >> QUOTE(GVAR(shakeMultiplier))); -} else { - private ["_type", "_config", "_recoil"]; - - _type = ["recoil", "recoilProne"] select (stance _unit == "PRONE"); - - _config = configFile >> "CfgWeapons" >> _weapon; - _recoil = if (_muzzle == _weapon) then { - getText (_config >> _type) - } else { - getText (_config >> _muzzle >> _type) - }; - - _recoil = getArray (configFile >> "CfgRecoils" >> _recoil); - if (count _recoil < 2) exitWith {}; - - _powerCoef = _recoil select 1; - _powerCoef = (call compile format ["%1", _powerCoef]) * RECOIL_COEF; -}; - -if (_unit getVariable [QUOTE(EGVAR(resting,weaponRested)), false]) then {_powerMod = _powerMod - 0.07}; -if (_unit getVariable [QUOTE(EGVAR(resting,bipodDeployed)), false]) then {_powerMod = _powerMod - 0.11}; - -private "_camshake"; -_camshake = [ - _powerCoef * (BASE_POWER + _powerMod) max 0, - BASE_TIME + _timeMod max 0, - BASE_FREQ + _freqMod max 0 -]; - -addCamShake _camshake; diff --git a/addons/recoil/functions/script_component.hpp b/addons/recoil/functions/script_component.hpp deleted file mode 100644 index d104528384..0000000000 --- a/addons/recoil/functions/script_component.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#define COMPONENT recoil -#include "\z\ace\Addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_RECOIL - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_RECOIL - #define DEBUG_SETTINGS DEBUG_SETTINGS_RECOIL -#endif - -#include "\z\ace\Addons\main\script_macros.hpp" diff --git a/addons/resting/$PBOPREFIX$ b/addons/resting/$PBOPREFIX$ deleted file mode 100644 index 94f2a89f81..0000000000 --- a/addons/resting/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ace\addons\resting \ No newline at end of file diff --git a/addons/resting/CfgEventHandlers.hpp b/addons/resting/CfgEventHandlers.hpp deleted file mode 100644 index beb3c4d419..0000000000 --- a/addons/resting/CfgEventHandlers.hpp +++ /dev/null @@ -1,12 +0,0 @@ - -class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit)); - }; -}; - -class Extended_PostInit_EventHandlers { - class ADDON { - init = QUOTE( call COMPILE_FILE(XEH_postInit) ); - }; -}; diff --git a/addons/resting/CfgMoves.hpp b/addons/resting/CfgMoves.hpp deleted file mode 100644 index 3c4ab85a5c..0000000000 --- a/addons/resting/CfgMoves.hpp +++ /dev/null @@ -1,1389 +0,0 @@ -// CODE BELOW TAKEN FROM TMR, PREFIXES EDITED FOR COMPATABILITY - -#define ACE_SWAY_DEPLOY 0.02 -#define ACE_SWAY_DEPLOYPRONE 0.01 -#define ACE_SWAY_RESTED 0.04 //0.08 -#define ACE_SWAY_RESTEDPRONE 0.02 //0.04 -#define ACE_DEPLOY_TURNSPEED 0.1 - -// Arma 3 doesn't respect turnSpeed. - -class CfgMovesBasic { - class Default; - - class Actions { - class RifleStandActions; - class RifleStandActions_ace_deploy : RifleStandActions { - stop = "AmovPercMstpSrasWrflDnon_ace_deploy"; - default = "AmovPercMstpSrasWrflDnon_ace_deploy"; - turnL = "AmovPercMstpSrasWrflDnon_ace_deploy"; - turnR = "AmovPercMstpSrasWrflDnon_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLStandActions; - class RifleAdjustLStandActions_ace_deploy : RifleAdjustLStandActions { - stop = "AadjPercMstpSrasWrflDleft_ace_deploy"; - default = "AadjPercMstpSrasWrflDleft_ace_deploy"; - AdjustL = "AadjPercMstpSrasWrflDleft_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDleft_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDleft_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRStandActions; - class RifleAdjustRStandActions_ace_deploy : RifleAdjustRStandActions { - stop = "AadjPercMstpSrasWrflDright_ace_deploy"; - default = "AadjPercMstpSrasWrflDright_ace_deploy"; - AdjustRight = "AadjPercMstpSrasWrflDright_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDright_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDright_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFStandActions; - class RifleAdjustFStandActions_ace_deploy : RifleAdjustFStandActions { - stop = "AadjPercMstpSrasWrflDup_ace_deploy"; - default = "AadjPercMstpSrasWrflDup_ace_deploy"; - AdjustF = "AadjPercMstpSrasWrflDup_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDup_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDup_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBStandActions; - class RifleAdjustBStandActions_ace_deploy : RifleAdjustBStandActions { - stop = "AadjPercMstpSrasWrflDdown_ace_deploy"; - default = "AadjPercMstpSrasWrflDdown_ace_deploy"; - AdjustB = "AadjPercMstpSrasWrflDdown_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDdown_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDdown_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleKneelActions; - class RifleKneelActions_ace_deploy : RifleKneelActions { - stop = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - default = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - crouch = "AmovPknlMstpSrasWrflDnon_ace_deploy"; // TODO: this might cause issues - turnL = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - turnR = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLKneelActions; - class RifleAdjustLKneelActions_ace_deploy : RifleAdjustLKneelActions { - stop = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - default = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRKneelActions; - class RifleAdjustRKneelActions_ace_deploy : RifleAdjustRKneelActions { - stop = "AadjPknlMstpSrasWrflDright_ace_deploy"; - default = "AadjPknlMstpSrasWrflDright_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDright_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDright_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFKneelActions; - class RifleAdjustFKneelActions_ace_deploy : RifleAdjustFKneelActions { - stop = "AadjPknlMstpSrasWrflDup_ace_deploy"; - default = "AadjPknlMstpSrasWrflDup_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDup_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDup_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBKneelActions; - class RifleAdjustBKneelActions_ace_deploy : RifleAdjustBKneelActions { - stop = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - default = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleProneActions; - class RifleProneActions_ace_deploy : RifleProneActions { - stop = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - default = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - turnL = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - turnR = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLProneActions; - class RifleAdjustLProneActions_ace_deploy : RifleAdjustLProneActions { - stop = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - default = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - turnL = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - turnR = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRProneActions; - class RifleAdjustRProneActions_ace_deploy : RifleAdjustRProneActions { - stop = "AadjPpneMstpSrasWrflDright_ace_deploy"; - default = "AadjPpneMstpSrasWrflDright_ace_deploy"; - turnL = "AadjPpneMstpSrasWrflDright_ace_deploy"; - turnR = "AadjPpneMstpSrasWrflDright_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFProneActions; - class RifleAdjustFProneActions_ace_deploy : RifleAdjustFProneActions { - stop = "aadjppnemstpsraswrfldup_ace_deploy"; - default = "aadjppnemstpsraswrfldup_ace_deploy"; - turnL = "aadjppnemstpsraswrfldup_ace_deploy"; - turnR = "aadjppnemstpsraswrfldup_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBProneActions; - class RifleAdjustBProneActions_ace_deploy : RifleAdjustBProneActions { - stop = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - default = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - turnL = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - turnR = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - ////////////////////////////////////////////////////////////////////// - - class RifleStandActions_ace_rested : RifleStandActions { - stop = "AmovPercMstpSrasWrflDnon_ace_rested"; - default = "AmovPercMstpSrasWrflDnon_ace_rested"; - turnL = "AmovPercMstpSrasWrflDnon_ace_rested"; - turnR = "AmovPercMstpSrasWrflDnon_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLStandActions_ace_rested : RifleAdjustLStandActions { - stop = "AadjPercMstpSrasWrflDleft_ace_rested"; - default = "AadjPercMstpSrasWrflDleft_ace_rested"; - AdjustL = "AadjPercMstpSrasWrflDleft_ace_rested"; - turnL = "AadjPercMstpSrasWrflDleft_ace_rested"; - turnR = "AadjPercMstpSrasWrflDleft_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRStandActions_ace_rested : RifleAdjustRStandActions { - stop = "AadjPercMstpSrasWrflDright_ace_rested"; - default = "AadjPercMstpSrasWrflDright_ace_rested"; - AdjustRight = "AadjPercMstpSrasWrflDright_ace_rested"; - turnL = "AadjPercMstpSrasWrflDright_ace_rested"; - turnR = "AadjPercMstpSrasWrflDright_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFStandActions_ace_rested : RifleAdjustFStandActions { - stop = "AadjPercMstpSrasWrflDup_ace_rested"; - default = "AadjPercMstpSrasWrflDup_ace_rested"; - AdjustF = "AadjPercMstpSrasWrflDup_ace_rested"; - turnL = "AadjPercMstpSrasWrflDup_ace_rested"; - turnR = "AadjPercMstpSrasWrflDup_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBStandActions_ace_rested : RifleAdjustBStandActions { - stop = "AadjPercMstpSrasWrflDdown_ace_rested"; - default = "AadjPercMstpSrasWrflDdown_ace_rested"; - AdjustB = "AadjPercMstpSrasWrflDdown_ace_rested"; - turnR = "AadjPercMstpSrasWrflDdown_ace_rested"; - turnL = "AadjPercMstpSrasWrflDdown_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleKneelActions_ace_rested : RifleKneelActions { - stop = "AmovPknlMstpSrasWrflDnon_ace_rested"; - default = "AmovPknlMstpSrasWrflDnon_ace_rested"; - crouch = "AmovPknlMstpSrasWrflDnon_ace_rested"; - turnL = "AmovPknlMstpSrasWrflDnon_ace_rested"; - turnR = "AmovPknlMstpSrasWrflDnon_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLKneelActions_ace_rested : RifleAdjustLKneelActions { - stop = "AadjPknlMstpSrasWrflDleft_ace_rested"; - default = "AadjPknlMstpSrasWrflDleft_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDleft_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDleft_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRKneelActions_ace_rested : RifleAdjustRKneelActions { - stop = "AadjPknlMstpSrasWrflDright_ace_rested"; - default = "AadjPknlMstpSrasWrflDright_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDright_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDright_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFKneelActions_ace_rested : RifleAdjustFKneelActions { - stop = "AadjPknlMstpSrasWrflDup_ace_rested"; - default = "AadjPknlMstpSrasWrflDup_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDup_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDup_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBKneelActions_ace_rested : RifleAdjustBKneelActions { - stop = "AadjPknlMstpSrasWrflDdown_ace_rested"; - default = "AadjPknlMstpSrasWrflDdown_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDdown_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDdown_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleProneActions_ace_rested : RifleProneActions { - stop = "AmovPpneMstpSrasWrflDnon_ace_rested"; - default = "AmovPpneMstpSrasWrflDnon_ace_rested"; - turnL = "AmovPpneMstpSrasWrflDnon_ace_rested"; - turnR = "AmovPpneMstpSrasWrflDnon_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLProneActions_ace_rested : RifleAdjustLProneActions { - stop = "AadjPpneMstpSrasWrflDleft_ace_rested"; - default = "AadjPpneMstpSrasWrflDleft_ace_rested"; - turnL = "AadjPpneMstpSrasWrflDleft_ace_rested"; - turnR = "AadjPpneMstpSrasWrflDleft_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRProneActions_ace_rested : RifleAdjustRProneActions { - stop = "AadjPpneMstpSrasWrflDright_ace_rested"; - default = "AadjPpneMstpSrasWrflDright_ace_rested"; - turnL = "AadjPpneMstpSrasWrflDright_ace_rested"; - turnR = "AadjPpneMstpSrasWrflDright_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFProneActions_ace_rested : RifleAdjustFProneActions { - stop = "aadjppnemstpsraswrfldup_ace_rested"; - default = "aadjppnemstpsraswrfldup_ace_rested"; - turnL = "aadjppnemstpsraswrfldup_ace_rested"; - turnR = "aadjppnemstpsraswrfldup_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBProneActions_ace_rested : RifleAdjustBProneActions { - stop = "AadjPpneMstpSrasWrflDdown_ace_rested"; - default = "AadjPpneMstpSrasWrflDdown_ace_rested"; - turnL = "AadjPpneMstpSrasWrflDdown_ace_rested"; - turnR = "AadjPpneMstpSrasWrflDdown_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - ////////////////////////////////////////////////////////////////////// - // FFV - ////////////////////////////////////////////////////////////////////// - - class passenger_inside_1Actions; - class passenger_inside_1Actions_ace_deploy : passenger_inside_1Actions { - stop = "passenger_inside_1_Aim_ace_deploy"; - default = "passenger_inside_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_2Actions; - class passenger_inside_2Actions_ace_deploy : passenger_inside_2Actions { - stop = "passenger_inside_2_Aim_ace_deploy"; - default = "passenger_inside_2_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_3Actions; - class passenger_inside_3Actions_ace_deploy : passenger_inside_3Actions { - stop = "passenger_inside_3_Aim_ace_deploy"; - default = "passenger_inside_3_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_4Actions; - class passenger_inside_4Actions_ace_deploy : passenger_inside_4Actions { - stop = "passenger_inside_4_Aim_ace_deploy"; - default = "passenger_inside_4_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_bench_1Actions; - class passenger_bench_1Actions_ace_deploy : passenger_bench_1Actions { - stop = "passenger_bench_1_Aim_ace_deploy"; - default = "passenger_bench_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_1Actions; - class passenger_boat_1Actions_ace_deploy : passenger_boat_1Actions { - stop = "passenger_boat_1_Aim_ace_deploy"; - default = "passenger_boat_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_2Actions; - class passenger_boat_2Actions_ace_deploy : passenger_boat_2Actions { - stop = "passenger_boat_2_Aim_ace_deploy"; - default = "passenger_boat_2_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_3Actions; - class passenger_boat_3Actions_ace_deploy : passenger_boat_3Actions { - stop = "passenger_boat_3_Aim_ace_deploy"; - default = "passenger_boat_3_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_4Actions; - class passenger_boat_4Actions_ace_deploy : passenger_boat_4Actions { - stop = "passenger_boat_4_Aim_ace_deploy"; - default = "passenger_boat_4_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_1Actions; - class passenger_flatground_1Actions_ace_deploy : passenger_flatground_1Actions { - stop = "passenger_flatground_1_Aim_ace_deploy"; - default = "passenger_flatground_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_2Actions; - class passenger_flatground_2Actions_ace_deploy : passenger_flatground_2Actions { - stop = "passenger_flatground_2_Aim_ace_deploy"; - default = "passenger_flatground_2_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_3Actions; - class passenger_flatground_3Actions_ace_deploy : passenger_flatground_3Actions { - stop = "passenger_flatground_3_Aim_ace_deploy"; - default = "passenger_flatground_3_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_4Actions; - class passenger_flatground_4Actions_ace_deploy : passenger_flatground_4Actions { - stop = "passenger_flatground_4_Aim_ace_deploy"; - default = "passenger_flatground_4_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - ////////////////////////////////////////////////////////////////////// - - class passenger_inside_1Actions_ace_rested : passenger_inside_1Actions { - stop = "passenger_inside_1_Aim_ace_rested"; - default = "passenger_inside_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_2Actions_ace_rested : passenger_inside_2Actions { - stop = "passenger_inside_2_Aim_ace_rested"; - default = "passenger_inside_2_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_3Actions_ace_rested : passenger_inside_3Actions { - stop = "passenger_inside_3_Aim_ace_rested"; - default = "passenger_inside_3_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_4Actions_ace_rested : passenger_inside_4Actions { - stop = "passenger_inside_4_Aim_ace_rested"; - default = "passenger_inside_4_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_bench_1Actions_ace_rested : passenger_bench_1Actions { - stop = "passenger_bench_1_Aim_ace_rested"; - default = "passenger_bench_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_1Actions_ace_rested : passenger_boat_1Actions { - stop = "passenger_boat_1_Aim_ace_rested"; - default = "passenger_boat_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_2Actions_ace_rested : passenger_boat_2Actions { - stop = "passenger_boat_2_Aim_ace_rested"; - default = "passenger_boat_2_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_3Actions_ace_rested : passenger_boat_3Actions { - stop = "passenger_boat_3_Aim_ace_rested"; - default = "passenger_boat_3_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_4Actions_ace_rested : passenger_boat_4Actions { - stop = "passenger_boat_4_Aim_ace_rested"; - default = "passenger_boat_4_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_1Actions_ace_rested : passenger_flatground_1Actions { - stop = "passenger_flatground_1_Aim_ace_rested"; - default = "passenger_flatground_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_2Actions_ace_rested : passenger_flatground_2Actions { - stop = "passenger_flatground_2_Aim_ace_rested"; - default = "passenger_flatground_2_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_3Actions_ace_rested : passenger_flatground_3Actions { - stop = "passenger_flatground_3_Aim_ace_rested"; - default = "passenger_flatground_3_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_4Actions_ace_rested : passenger_flatground_4Actions { - stop = "passenger_flatground_4_Aim_ace_rested"; - default = "passenger_flatground_4_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - }; -}; - -class CfgMovesMaleSdr : CfgMovesBasic { - class States { - class AmovPercMstpSrasWrflDnon; - class AmovPercMstpSrasWrflDnon_ace_deploy : AmovPercMstpSrasWrflDnon { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"AmovPercMstpSrasWrflDnon_ace_deploy", 0.02}; - ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_ace_deploy", 0.02}; - InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - }; - - class aadjpercmstpsraswrfldup; - class aadjpercmstpsraswrfldup_ace_deploy : aadjpercmstpsraswrfldup { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustFStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldup_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldup_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02}; - }; - - class aadjpercmstpsraswrflddown; - class aadjpercmstpsraswrflddown_ace_deploy : aadjpercmstpsraswrflddown { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustBStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrflddown_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrflddown_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02}; - }; - - class aadjpercmstpsraswrfldright; - class aadjpercmstpsraswrfldright_ace_deploy : aadjpercmstpsraswrfldright { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustRStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldright_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldright_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02}; - }; - - class aadjpercmstpsraswrfldleft; - class aadjpercmstpsraswrfldleft_ace_deploy : aadjpercmstpsraswrfldleft { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustLStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldleft_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldleft_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldup; - class aadjpknlmstpsraswrfldup_ace_deploy : aadjpknlmstpsraswrfldup { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustFKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldup_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldup_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02}; - }; - - class amovpknlmstpsraswrfldnon; - class amovpknlmstpsraswrfldnon_ace_deploy : amovpknlmstpsraswrfldnon { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovpknlmstpsraswrfldnon_ace_deploy", 0.02}; - ConnectFrom[] = {"amovpknlmstpsraswrfldnon_ace_deploy", 0.02}; - InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02}; - }; - - class aadjpknlmstpsraswrflddown; - class aadjpknlmstpsraswrflddown_ace_deploy : aadjpknlmstpsraswrflddown { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustBKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrflddown_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrflddown_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02}; - }; - - class aadjpknlmstpsraswrfldleft; - class aadjpknlmstpsraswrfldleft_ace_deploy : aadjpknlmstpsraswrfldleft { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustLKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldleft_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldright; - class aadjpknlmstpsraswrfldright_ace_deploy : aadjpknlmstpsraswrfldright { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustRKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldright_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldright_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02}; - }; - - class aadjppnemstpsraswrfldup; - class aadjppnemstpsraswrfldup_ace_deploy : aadjppnemstpsraswrfldup { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustFProneActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldup_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldup_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02}; - }; - - class amovppnemstpsraswrfldnon; - class amovppnemstpsraswrfldnon_ace_deploy : amovppnemstpsraswrfldnon { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleProneActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovppnemstpsraswrfldnon_ace_deploy", 0.02}; - ConnectFrom[] = {"amovppnemstpsraswrfldnon_ace_deploy", 0.02}; - InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02}; - }; - - class aadjppnemstpsraswrflddown; - class aadjppnemstpsraswrflddown_ace_deploy : aadjppnemstpsraswrflddown { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustBKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrflddown_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrflddown_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02}; - }; - - class aadjppnemstpsraswrfldleft; - class aadjppnemstpsraswrfldleft_ace_deploy : aadjppnemstpsraswrfldleft { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustLKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldleft_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldleft_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02}; - }; - - class aadjppnemstpsraswrfldright; - class aadjppnemstpsraswrfldright_ace_deploy : aadjppnemstpsraswrfldright { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustRKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldright_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldright_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02}; - }; - - ///////////////////////////////////////////////////////////////////////////// - - class AmovPercMstpSrasWrflDnon_ace_rested : AmovPercMstpSrasWrflDnon { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"AmovPercMstpSrasWrflDnon_ace_rested", 0.02}; - ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_ace_rested", 0.02}; - InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - }; - - class aadjpercmstpsraswrfldup_ace_rested : aadjpercmstpsraswrfldup { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustFStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldup_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldup_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02}; - }; - - class aadjpercmstpsraswrflddown_ace_rested : aadjpercmstpsraswrflddown { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustBStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrflddown_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrflddown_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02}; - }; - - class aadjpercmstpsraswrfldright_ace_rested : aadjpercmstpsraswrfldright { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustRStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldright_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldright_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02}; - }; - - class aadjpercmstpsraswrfldleft_ace_rested : aadjpercmstpsraswrfldleft { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustLStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldleft_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldleft_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldup_ace_rested : aadjpknlmstpsraswrfldup { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustFKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldup_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldup_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02}; - }; - - class amovpknlmstpsraswrfldnon_ace_rested : amovpknlmstpsraswrfldnon { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovpknlmstpsraswrfldnon_ace_rested", 0.02}; - ConnectFrom[] = {"amovpknlmstpsraswrfldnon_ace_rested", 0.02}; - InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02}; - }; - - class aadjpknlmstpsraswrflddown_ace_rested : aadjpknlmstpsraswrflddown { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustBKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrflddown_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrflddown_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02}; - }; - - class aadjpknlmstpsraswrfldleft_ace_rested : aadjpknlmstpsraswrfldleft { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustLKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldleft_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldright_ace_rested : aadjpknlmstpsraswrfldright { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustRKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldright_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldright_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02}; - }; - - class aadjppnemstpsraswrfldup_ace_rested : aadjppnemstpsraswrfldup { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustFProneActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldup_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldup_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02}; - }; - - class amovppnemstpsraswrfldnon_ace_rested : amovppnemstpsraswrfldnon { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleProneActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovppnemstpsraswrfldnon_ace_rested", 0.02}; - ConnectFrom[] = {"amovppnemstpsraswrfldnon_ace_rested", 0.02}; - InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02}; - }; - - class aadjppnemstpsraswrflddown_ace_rested : aadjppnemstpsraswrflddown { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustBKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrflddown_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrflddown_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02}; - }; - - class aadjppnemstpsraswrfldleft_ace_rested : aadjppnemstpsraswrfldleft { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustLKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldleft_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldleft_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02}; - }; - - class aadjppnemstpsraswrfldright_ace_rested : aadjppnemstpsraswrfldright { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustRKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldright_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldright_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02}; - }; - - ////////////////////////////////////////////////////////////////////// - // FFV - ////////////////////////////////////////////////////////////////////// - - class passenger_bench_1_Aim; - class passenger_bench_1_Aim_ace_deploy : passenger_bench_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_bench_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_bench_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_bench_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_bench_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_bench_1_Aim", 0.02}; - }; - - class passenger_inside_1_Aim; - class passenger_inside_1_Aim_ace_deploy : passenger_inside_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_1_Aim", 0.02}; - }; - - class passenger_inside_2_Aim; - class passenger_inside_2_Aim_ace_deploy : passenger_inside_2_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_2Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_2_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_2_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_2_Aim", 0.02}; - }; - - class passenger_inside_3_Aim; - class passenger_inside_3_Aim_ace_deploy : passenger_inside_3_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_3Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_3_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_3_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_3_Aim", 0.02}; - }; - - class passenger_inside_4_Aim; - class passenger_inside_4_Aim_ace_deploy : passenger_inside_4_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_4Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_4_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_4_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_4_Aim", 0.02}; - }; - - class passenger_boat_1_Aim; - class passenger_boat_1_Aim_ace_deploy : passenger_boat_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_1_Aim", 0.02}; - }; - - class passenger_boat_2_Aim; - class passenger_boat_2_Aim_ace_deploy : passenger_boat_2_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_2Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_2_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_2_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_2_Aim", 0.02}; - }; - - class passenger_boat_3_Aim; - class passenger_boat_3_Aim_ace_deploy : passenger_boat_3_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_3Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_3_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_3_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_3_Aim", 0.02}; - }; - - class passenger_boat_4_Aim; - class passenger_boat_4_Aim_ace_deploy : passenger_boat_4_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_4Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_4_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_4_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_4_Aim", 0.02}; - }; - - class passenger_flatground_1_Aim; - class passenger_flatground_1_Aim_ace_deploy : passenger_flatground_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_1_Aim", 0.02}; - }; - - class passenger_flatground_2_Aim; - class passenger_flatground_2_Aim_ace_deploy : passenger_flatground_2_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_2Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_2_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_2_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_2_Aim", 0.02}; - }; - - class passenger_flatground_3_Aim; - class passenger_flatground_3_Aim_ace_deploy : passenger_flatground_3_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_3Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_3_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_3_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_3_Aim", 0.02}; - }; - - class passenger_flatground_4_Aim; - class passenger_flatground_4_Aim_ace_deploy : passenger_flatground_4_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_4Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_4_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_4_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_4_Aim", 0.02}; - }; - - ////////////////////////////////////////////////////////////////////// - - class passenger_bench_1_Aim_ace_rested : passenger_bench_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_bench_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_bench_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_bench_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_bench_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_bench_1_Aim", 0.02}; - }; - - class passenger_inside_1_Aim_ace_rested : passenger_inside_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_1_Aim", 0.02}; - }; - - class passenger_inside_2_Aim_ace_rested : passenger_inside_2_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_2Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_2_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_2_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_2_Aim", 0.02}; - }; - - class passenger_inside_3_Aim_ace_rested : passenger_inside_3_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_3Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_3_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_3_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_3_Aim", 0.02}; - }; - - class passenger_inside_4_Aim_ace_rested : passenger_inside_4_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_4Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_4_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_4_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_4_Aim", 0.02}; - }; - - class passenger_boat_1_Aim_ace_rested : passenger_boat_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_1_Aim", 0.02}; - }; - - class passenger_boat_2_Aim_ace_rested : passenger_boat_2_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_2Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_2_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_2_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_2_Aim", 0.02}; - }; - - class passenger_boat_3_Aim_ace_rested : passenger_boat_3_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_3Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_3_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_3_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_3_Aim", 0.02}; - }; - - class passenger_boat_4_Aim_ace_rested : passenger_boat_4_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_4Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_4_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_4_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_4_Aim", 0.02}; - }; - - class passenger_flatground_1_Aim_ace_rested : passenger_flatground_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_1_Aim", 0.02}; - }; - - class passenger_flatground_2_Aim_ace_rested : passenger_flatground_2_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_2Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_2_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_2_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_2_Aim", 0.02}; - }; - - class passenger_flatground_3_Aim_ace_rested : passenger_flatground_3_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_3Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_3_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_3_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_3_Aim", 0.02}; - }; - - class passenger_flatground_4_Aim_ace_rested : passenger_flatground_4_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_4Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_4_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_4_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_4_Aim", 0.02}; - }; - }; -}; diff --git a/addons/resting/CfgSounds.hpp b/addons/resting/CfgSounds.hpp deleted file mode 100644 index b55d4d9ae8..0000000000 --- a/addons/resting/CfgSounds.hpp +++ /dev/null @@ -1,14 +0,0 @@ -class CfgSounds { - class GVAR(rest) - { - name=QGVAR(rest); - sound[]={QUOTE(PATHTOF(sounds\weaponrest_rest.wav)),1,1}; - titles[]={}; - }; - class GVAR(unrest) - { - name=QGVAR(unrest); - sound[]={QUOTE(PATHTOF(sounds\weaponrest_unrest.wav)),1,1}; - titles[]={}; - }; -}; \ No newline at end of file diff --git a/addons/resting/CfgWeapons.hpp b/addons/resting/CfgWeapons.hpp deleted file mode 100644 index 56bef2c033..0000000000 --- a/addons/resting/CfgWeapons.hpp +++ /dev/null @@ -1,22 +0,0 @@ -class CfgWeapons { - class Rifle_Long_Base_F; - class arifle_MX_Base_F; - - class arifle_MX_SW_F : arifle_MX_Base_F { - ACE_Bipod = 1; - }; - - class LMG_Mk200_F : Rifle_Long_Base_F { - ACE_Bipod = 1; - }; - class LMG_Zafir_F: Rifle_Long_Base_F { - ACE_Bipod = 1; - }; - - class LRR_base_F : Rifle_Long_Base_F { - ACE_Bipod = 1; - }; - class GM6_base_F : Rifle_Long_Base_F { - ACE_Bipod = 1; - }; -}; diff --git a/addons/resting/README.md b/addons/resting/README.md deleted file mode 100644 index 477ced17b5..0000000000 --- a/addons/resting/README.md +++ /dev/null @@ -1,12 +0,0 @@ -ace_resting -=========== - -Introduces weapon resting and bipod deployment, allowing the player to increase the stability of his weapon. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/resting/XEH_postInit.sqf b/addons/resting/XEH_postInit.sqf deleted file mode 100644 index bd78ae0044..0000000000 --- a/addons/resting/XEH_postInit.sqf +++ /dev/null @@ -1,23 +0,0 @@ -// by esteldunedain -#include "script_component.hpp" - -if !(hasInterface) exitWith {}; - -// Add keybinds -["ACE3", QGVAR(RestWeapon), localize "STR_ACE_Resting_RestWeapon", -{ - // Conditions: canInteract - if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - // Conditions: specific - if !([ACE_player] call EFUNC(common,canUseWeapon) && - {inputAction 'reloadMagazine' == 0} && - {!weaponLowered ACE_player} && - {speed ACE_player < 1}) exitWith {false}; - - // Statement - [ACE_player, vehicle ACE_player, currentWeapon ACE_player] call FUNC(restWeapon); - // Return false so it doesn't block other actions - false -}, -{false}, -[15, [false, false, false]], false] call cba_fnc_addKeybind; diff --git a/addons/resting/XEH_preInit.sqf b/addons/resting/XEH_preInit.sqf deleted file mode 100644 index 6a2a2040b7..0000000000 --- a/addons/resting/XEH_preInit.sqf +++ /dev/null @@ -1,11 +0,0 @@ -#include "script_component.hpp" - -ADDON = false; - -PREP(getIntersection); -PREP(hasBipod); -PREP(pfhCheckRest); -PREP(restWeapon); -PREP(unRestWeapon); - -ADDON = true; diff --git a/addons/resting/config.cpp b/addons/resting/config.cpp deleted file mode 100644 index f1cc20c6e2..0000000000 --- a/addons/resting/config.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; - author[] = {"KoffeinFlummi", "TaoSensai", "esteldunedain"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" - -#include "CfgWeapons.hpp" - -#include "CfgMoves.hpp" - -#include "CfgSounds.hpp" \ No newline at end of file diff --git a/addons/resting/data/icons/icon_bipod.paa b/addons/resting/data/icons/icon_bipod.paa deleted file mode 100644 index c2b6a2fb3e..0000000000 Binary files a/addons/resting/data/icons/icon_bipod.paa and /dev/null differ diff --git a/addons/resting/functions/fnc_getIntersection.sqf b/addons/resting/functions/fnc_getIntersection.sqf deleted file mode 100644 index 0527a7c514..0000000000 --- a/addons/resting/functions/fnc_getIntersection.sqf +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * Prepares intersects - * - * Arguments: - * 0: unit - * 1: vehicle - * 2: weapon - * - * Return Values: - * [_intersectsMiddle, _intersectsLeft, _intersectsRight, _intersectsDown] - * - */ -#include "script_component.hpp" - -EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon); - -private ["_weaponPos", "_weaponDir", "_weaponPosDown"]; - -_weaponPos = ATLtoASL (_unit modelToWorldVisual (_unit selectionPosition "RightHand")); -_weaponDir = _unit weaponDirection _weapon; -_weaponPosDown = _weaponPos vectorAdd [0,0,-MAXHEIGHT]; - -private ["_checkPosMiddle", "_checkPosLeft", "_checkPosRight", "_checkPosDown"]; - -_checkPosMiddle = [ - (_weaponPos select 0) + MAXDISTANCE * (_weaponDir select 0), - (_weaponPos select 1) + MAXDISTANCE * (_weaponDir select 1), - (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2) -]; -_checkPosLeft = [ - (_weaponPos select 0) + MAXDISTANCE * sin (((_weaponDir select 0) atan2 (_weaponDir select 1)) + 360 - MAXANGLE), - (_weaponPos select 1) + MAXDISTANCE * cos (((_weaponDir select 0) atan2 (_weaponDir select 1)) + 360 - MAXANGLE), - (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2) -]; -_checkPosRight = [ - (_weaponPos select 0) + MAXDISTANCE * sin (((_weaponDir select 0) atan2 (_weaponDir select 1)) + MAXANGLE), - (_weaponPos select 1) + MAXDISTANCE * cos (((_weaponDir select 0) atan2 (_weaponDir select 1)) + MAXANGLE), - (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2) -]; -_checkPosDown = [ - (_weaponPos select 0) + MAXDISTANCE * (_weaponDir select 0), - (_weaponPos select 1) + MAXDISTANCE * (_weaponDir select 1), - (_weaponPos select 2) + MAXDISTANCE * (_weaponDir select 2) - MAXHEIGHT -]; - -/* UNCOMMENT THIS FOR DEBUGGING -weaponPos = ASLtoATL _weaponPos; -weaponPosDown = ASLtoATL _weaponPosDown; -checkPosMiddle = ASLtoATL _checkPosMiddle; -checkPosLeft = ASLtoATL _checkPosLeft; -checkPosRight = ASLtoATL _checkPosRight; -checkPosDown = ASLtoATL _checkPosDown; - -onEachFrame { - drawLine3D [weaponPos, checkPosMiddle, [1,0,0,1]]; - drawLine3D [weaponPos, checkPosLeft, [1,0,0,1]]; - drawLine3D [weaponPos, checkPosRight, [1,0,0,1]]; - drawLine3D [weaponPosDown, checkPosDown, [1,0,0,1]]; -};*/ - -private ["_intersectsMiddle", "_intersectsLeft", "_intersectsRight", "_intersectsDown"]; - -_intersectsMiddle = lineIntersects [_weaponPos, _checkPosMiddle]; -_intersectsLeft = lineIntersects [_weaponPos, _checkPosLeft]; -_intersectsRight = lineIntersects [_weaponPos, _checkPosRight]; -_intersectsDown = lineIntersects [_weaponPos, _checkPosDown] || {terrainIntersectASL [_weaponPosDown, _checkPosDown]}; - -[_intersectsMiddle, _intersectsLeft, _intersectsRight, _intersectsDown] diff --git a/addons/resting/functions/fnc_hasBipod.sqf b/addons/resting/functions/fnc_hasBipod.sqf deleted file mode 100644 index 2170710db1..0000000000 --- a/addons/resting/functions/fnc_hasBipod.sqf +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Author: Commy2 - * - * Check if the weapon has a bipod - * - * Arguments: - * 0: weapon - * - * Return Values: - * Boolean - * - */ -#include "script_component.hpp" - -EXPLODE_1_PVT(_this,_weapon); - -private ["_config"]; -_config = configFile >> "CfgWeapons" >> _weapon; - -getNumber (_config >> "ACE_Bipod") == 1 || -getNumber (_config >> "AGM_Bipod") == 1 || -{getNumber (_config >> "tmr_autorest_deployable") == 1} diff --git a/addons/resting/functions/fnc_pfhCheckRest.sqf b/addons/resting/functions/fnc_pfhCheckRest.sqf deleted file mode 100644 index 0f6fea300b..0000000000 --- a/addons/resting/functions/fnc_pfhCheckRest.sqf +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * PFH that check for player moving away, changing weapon, etc - * and unrests the weapon if necessary - * - * Arguments: - * 0: unit - * 1: vehicle - * 2: weapon - * 3: rested position - * - * Return Values: - * None - * - */ -#include "script_component.hpp" - -EXPLODE_2_PVT(_this,_params,_pfhId); -EXPLODE_4_PVT(_params,_unit,_vehicle,_weapon,_restedPosition); - -if !(_unit getVariable ["ACE_weaponRested", false]) exitWith { - [_pfhId] call cba_fnc_removePerFrameHandler; -}; - -private ["_intersects"]; -_intersects = _params call FUNC(getIntersection); - -if ( - _unit != ACE_player - || {_vehicle != vehicle _unit} - || {inputAction "reloadMagazine" != 0} - || {weaponLowered _unit} - || {speed _unit > 1} - || {currentWeapon _unit != _weapon} - || {getPosASL _unit distanceSqr _restedPosition > 1} - || {!(true in _intersects)} -) exitWith { - [_pfhId] call cba_fnc_removePerFrameHandler; - [_unit, _vehicle, _weapon] call FUNC(unRestWeapon); -}; diff --git a/addons/resting/functions/fnc_restWeapon.sqf b/addons/resting/functions/fnc_restWeapon.sqf deleted file mode 100644 index 75d16a62be..0000000000 --- a/addons/resting/functions/fnc_restWeapon.sqf +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * Rests the player's weapon if possible. - * - * Arguments: - * None - * - * Return Values: - * None - * - */ -#include "script_component.hpp" - -EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon); - -if (_weapon != primaryWeapon _unit) exitWith {}; - -if (_unit getVariable ["ACE_weaponRested", false]) exitWith {_this call FUNC(unRestWeapon)}; - -// exit if this is not an available animation -if (!isClass (configFile >> "CfgMovesMaleSdr" >> "States" >> format ["%1_ace_deploy", animationState _unit])) exitWith {}; - -// CHECK FOR APPROPRIATE SURFACE -private "_intersects"; -_intersects = _this call FUNC(getIntersection); - -if (true in _intersects) then { - _unit setVariable ["ACE_weaponRested", true]; - if (_unit == ACE_PLAYER) then { - [QGVAR(bipodDeployed), true, QUOTE(PATHTOF(data\icons\icon_bipod.paa)), [1,1,1,1], -1] call EFUNC(common,displayIcon); - }; - - private "_restedPosition"; - _restedPosition = getPosASL _unit; - - // REST THE WEAPON - addCamShake CAMSHAKE; - playSound QGVAR(rest); - - if ([_weapon] call FUNC(hasBipod) && {_intersects select 3}) then { - _unit setVariable ["ACE_bipodDeployed", true]; - - _unit setUnitRecoilCoefficient (BIPODRECOIL * unitRecoilCoefficient _unit); - //[_unit, format ["%1_ace_deploy", animationState _unit], 2] call EFUNC(common,doAnimation); - _unit switchMove format ["%1_ace_deploy", animationState _unit]; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_BipodDeployed", _picture] call EFUNC(common,displayTextPicture); - - } else { - _unit setVariable ["ACE_bipodDeployed", false]; - - _unit setUnitRecoilCoefficient (RESTEDRECOIL * unitRecoilCoefficient _unit); - //[_unit, format ["%1_ace_rested", animationState _unit], 2] call EFUNC(common,doAnimation); - _unit switchMove format ["%1_ace_rested", animationState _unit]; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_WeaponRested", _picture] call EFUNC(common,displayTextPicture); - }; - - // Launch a PFH to check for player moving away, changing weapon, etc - [FUNC(pfhCheckRest), 0.2, [_unit, _vehicle, _weapon, _restedPosition] ] call CBA_fnc_addPerFrameHandler; -}; diff --git a/addons/resting/functions/fnc_unRestWeapon.sqf b/addons/resting/functions/fnc_unRestWeapon.sqf deleted file mode 100644 index ef5a52b824..0000000000 --- a/addons/resting/functions/fnc_unRestWeapon.sqf +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * Un Rests the player's weapon - * - * Arguments: - * 0: unit - * 1: vehicle - * 2: weapon - * - * Return Values: - * None - * - */ -#include "script_component.hpp" - -EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon); - -addCamShake CAMSHAKE; - -private "_animation"; -_animation = animationState _unit; - -if (_unit getVariable ["ACE_bipodDeployed", false]) then { - _unit setUnitRecoilCoefficient (unitRecoilCoefficient _unit / BIPODRECOIL); - if (_animation find "_ace_deploy" != -1) then { - //[_unit, [_animation, "_ace_deploy", ""] call CBA_fnc_replace, 2] call EFUNC(common,doAnimation); - _unit switchMove ([_animation, "_ace_deploy", ""] call CBA_fnc_replace); - }; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_BipodUndeployed", _picture] call EFUNC(common,displayTextPicture); - -} else { - _unit setUnitRecoilCoefficient (unitRecoilCoefficient _unit / RESTEDRECOIL); - if (_animation find "_ace_rested" != -1) then { - //[_unit, [_animation, "_ace_rested", ""] call CBA_fnc_replace, 2] call EFUNC(common,doAnimation); - _unit switchMove ([_animation, "_ace_rested", ""] call CBA_fnc_replace); - }; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_WeaponLifted", _picture] call EFUNC(common,displayTextPicture); -}; -playSound QGVAR(unrest); - -_unit setVariable ["ACE_weaponRested", false]; -_unit setVariable ["ACE_bipodDeployed", false]; - -if (_unit == ACE_PLAYER) then { - [QGVAR(bipodDeployed), false, "", [1,1,1,1], -1] call EFUNC(common,displayIcon); -}; \ No newline at end of file diff --git a/addons/resting/functions/script_component.hpp b/addons/resting/functions/script_component.hpp deleted file mode 100644 index 9a1f2912f9..0000000000 --- a/addons/resting/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\z\ace\addons\resting\script_component.hpp" \ No newline at end of file diff --git a/addons/resting/script_component.hpp b/addons/resting/script_component.hpp deleted file mode 100644 index 8446cb9415..0000000000 --- a/addons/resting/script_component.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#define COMPONENT resting -#include "\z\ace\Addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_RESTING - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_RESTING - #define DEBUG_SETTINGS DEBUG_SETTINGS_RESTING -#endif - -#include "\z\ace\Addons\main\script_macros.hpp" - -#define RESTEDRECOIL 0.6 -#define BIPODRECOIL 0.3 -#define MAXDISTANCE 1 -#define MAXANGLE 15 -#define MAXHEIGHT 0.45 -#define CAMSHAKE [1,0.5,5] diff --git a/addons/resting/sounds/weaponrest_rest.wav b/addons/resting/sounds/weaponrest_rest.wav deleted file mode 100644 index fce6386425..0000000000 Binary files a/addons/resting/sounds/weaponrest_rest.wav and /dev/null differ diff --git a/addons/resting/sounds/weaponrest_unrest.wav b/addons/resting/sounds/weaponrest_unrest.wav deleted file mode 100644 index 72518ddbbf..0000000000 Binary files a/addons/resting/sounds/weaponrest_unrest.wav and /dev/null differ diff --git a/addons/resting/stringtable.xml b/addons/resting/stringtable.xml deleted file mode 100644 index e74892f6eb..0000000000 --- a/addons/resting/stringtable.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - Rest Weapon - Waffe auflegen - Apoyar el arma - Oprzyj broń - Zapřít zbraň - Appuyer l'arme - Зафиксировать оружие - Fegyver kitámasztása - Apoiar Arma - Appoggia l'arma - - - - Bipod deployed - Zweibein ausgeklappt - Bípode desplegado - Dwójnóg rozstawiony - Dvojnožka rozložena - Bipied déployé - Сошки установлены - Állványon - Bipé apoiado - Bipiede appoggiato - - - Weapon rested - Waffe aufgelegt - Arma apoyada - Broń oparta - Zbraň zapřena - Arme appuyée - Оружие зафиксировано - Fegyver kitámasztva - Arma apoiada - Arma appoggiata - - - - Bipod undeployed - Zweibein eingeklappt - Bípode plegado - Dwójnóg złożony - Dvojnožka rozložena - Bipied replié - Сошки убраны - Állvány csukva - Bipé recolhido - Bipiede richiuso - - - Weapon lifted - Waffe gehoben - Arma levantada - Broń podniesiona - Zbraň zdvihnuta - Arme relevée - Оружие не зафиксировано - Fegyver nincs támasztva - Arma levantada - Arma sollevata - - - - diff --git a/extensions/fcs/ace_fcs.cpp b/extensions/fcs/ace_fcs.cpp index 6338dd8571..a1a3b64ba7 100644 --- a/extensions/fcs/ace_fcs.cpp +++ b/extensions/fcs/ace_fcs.cpp @@ -21,7 +21,7 @@ #include #define MAXELEVATION 20 -#define MAXITERATIONS 120 +#define MAXITERATIONS 600 #define PRECISION 0.1 #define RADIANS(X) (X / (180 / M_PI))