From 7a729ce83f23a2582ba5ed1cc49e387230e7c7a0 Mon Sep 17 00:00:00 2001 From: SDTheCyanWyan <50071611+SDTheCyanWyan@users.noreply.github.com> Date: Sun, 5 May 2019 13:44:53 +0530 Subject: [PATCH 1/7] Update fn_animation.sqf --- .../functions/features/fn_animation.sqf | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf index 2b4a7e21..03e8e589 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf @@ -52,7 +52,15 @@ private _dialogResult = "sit captured", "repair vehicle prone", "repair vehicle kneel", - "repair vehicle stand" + "repair vehicle stand", + "sit on ground", + "sit on chair", + "sit high", + "dead sitting leaned", + "dead sitting erect", + "kneel weapon ready", + "prone weapon ready" + ] ], ["Combat Ready", [localize "STR_AMAE_TRUE",localize "STR_AMAE_FALSE"]] @@ -111,6 +119,14 @@ _anim = switch (_dialogResult select 0) do case 26: {"REPAIR_VEH_PRONE"}; case 27: {"REPAIR_VEH_KNEEL"}; case 28: {"REPAIR_VEH_STAND"}; + case 29: {"SIT_ON_FLOOR"}; + case 30: {"SIT_ON_CHAIR"}; + case 31: {"SIT_HIGH"}; + case 32: {"DEAD_LEAN"}; + case 33: {"DEAD_SIT"}; + case 34: {"KNEEL_WEAPON_UP"}; + case 35: {"PRONE_WEAPON_UP"}; + }; if (isNull (_units select 0)) then From eceac47c74f08fca21293aabdc86189c57bbd9b2 Mon Sep 17 00:00:00 2001 From: SDTheCyanWyan <50071611+SDTheCyanWyan@users.noreply.github.com> Date: Sun, 5 May 2019 13:44:59 +0530 Subject: [PATCH 2/7] Update fn_ambientAnimGetParams.sqf --- .../functions/features/fn_ambientAnimGetParams.sqf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf index 9c49f19c..bc4e7913 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf @@ -57,6 +57,13 @@ private _return = switch (_anim_set) do case "LISTEN_CIV": { [["Acts_CivilListening_1","Acts_CivilListening_2"], true] }; case "SHIELD_FROM_SUN": { [["Acts_ShieldFromSun_Loop"], false] }; case "SHOWING_THE_WAY": { [["Acts_ShowingTheRightWay_loop"], false] }; + case "SIT_ON_FLOOR": { [["commander_sdv", "passenger_flatground_crosslegs", "Acts_passenger_flatground_leanright"], false] }; + case "SIT_ON_CHAIR": { [["passenger_apc_generic03", "passenger_generic01_foldhands", "ChopperLight_CB_idle1stable_H"], true] }; + case "DEAD_LEAN": { [["KIA_Commander_MBT_04", "KIA_commander_sdv", "KIA_driver_MBT_04", "KIA_driver_ugv_01"], true] }; + case "DEAD_SIT": { [["KIA_passenger_flatground", "KIA_passenger_sdv"], true] }; + case "KNEEL_WEAPON_UP": { [["HubShootingRangeKneel_move1", "HubShootingRangeKneel_move2", "HubShootingRangeKneel_move3"], true] }; + case "PRONE_WEAPON_UP": { [["HubShootingRangeProne_move1", "HubShootingRangeProne_move2", "HubShootingRangeProne_move3"], true] }; + case "SIT_HIGH": { [["HubSittingHighA_idle1", "HubSittingHighA_idle2", "HubSittingHigB_idle1", "HubSittingHighB_idle2"], true] }; }; -_return; \ No newline at end of file +_return; From 5f02d58ca7c991012b27c8faf7f7506f1c83f535 Mon Sep 17 00:00:00 2001 From: RAJIB BISWAS Date: Sat, 11 May 2019 21:35:27 +0530 Subject: [PATCH 3/7] Added new anims to Sit, stand, and other new --- .../features/fn_ambientAnimGetParams.sqf | 40 ++++-- .../functions/features/fn_animation.sqf | 115 +++++++++++------- bash.exe.stackdump | 9 ++ 3 files changed, 108 insertions(+), 56 deletions(-) create mode 100644 bash.exe.stackdump diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf index bc4e7913..1ab07962 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf @@ -21,10 +21,12 @@ private _anim_set = _this; private _return = switch (_anim_set) do { // [anims, noWeapon] case "STAND_1": { [["HubStanding_idle1","HubStanding_idle2","HubStanding_idle3"], false] }; - case "STAND_2": { [["amovpercmstpslowwrfldnon","amovpercmstpslowwrfldnon","aidlpercmstpslowwrfldnon_g01","aidlpercmstpslowwrfldnon_g02","aidlpercmstpslowwrfldnon_g03","aidlpercmstpslowwrfldnon_g05"], false] }; + case "STAND_2": { [["amovpercmstpslowwrfldnon","amovpercmstpslowwrfldnon","aidlpercmstpslowwrfldnon_g01","aidlpercmstpslowwrfldnon_g02","aidlpercmstpslowwrfldnon_g03","aidlpercmstpslowwrfldnon_g05","Acts_AidlPercMstpSloWWrflDnon_warmup_3_loop","Acts_AidlPercMstpSloWWpstDnon_warmup_4_loop"], false] }; case "STAND_NO_WEAP_1": { [["HubStandingUA_idle1","HubStandingUA_idle2","HubStandingUA_idle3","HubStandingUA_move1","HubStandingUA_move2"], true] }; case "STAND_NO_WEAP_2": { [["HubStandingUB_idle1","HubStandingUB_idle2","HubStandingUB_idle3","HubStandingUB_move1"], true]; }; case "STAND_NO_WEAP_3": { [["HubStandingUC_idle1","HubStandingUC_idle2","HubStandingUC_idle3","HubStandingUC_move1","HubStandingUC_move2"], true] }; + case "STAND_NO_WEAP_4": { [["HubBriefing_think"], true]}; + case "STAND_NO_WEAP_5": { [["Acts_AidlPercMstpSnonWnonDnon_warmup_1_loop","Acts_AidlPercMstpSnonWnonDnon_warmup_2_loop"], false] }; case "WATCH_1": { [["inbasemoves_patrolling1"], false] }; case "WATCH_2": { [["inbasemoves_patrolling2"], false] }; case "GUARD": { [["inbasemoves_handsbehindback1","inbasemoves_handsbehindback2"], true] }; @@ -35,7 +37,7 @@ private _return = switch (_anim_set) do case "LISTEN_TO_RADIO": { [["Acts_listeningToRadio_Loop"], false] }; case "NAVIGATE": { [["Acts_NavigatingChopper_Loop"], false] }; case "LEAN":{ [["inbasemoves_lean1"], false] }; - case "KNEEL": { [["amovpknlmstpslowwrfldnon","aidlpknlmstpslowwrfldnon_ai","aidlpknlmstpslowwrfldnon_g01","aidlpknlmstpslowwrfldnon_g02","aidlpknlmstpslowwrfldnon_g03","aidlpknlmstpslowwrfldnon_g0s"], false] }; + case "KNEEL": { [["amovpknlmstpslowwrfldnon","aidlpknlmstpslowwrfldnon_ai","aidlpknlmstpslowwrfldnon_g01","aidlpknlmstpslowwrfldnon_g02","aidlpknlmstpslowwrfldnon_g03","aidlpknlmstpslowwrfldnon_g0s","Acts_AidlPercMstpSnonWnonDnon_warmup_6_loop"], false] }; case "REPAIR_VEH_PRONE": { [["hubfixingvehicleprone_idle1"], true] }; case "REPAIR_VEH_KNEEL": { [["inbasemoves_repairvehicleknl"], true] }; case "REPAIR_VEH_STAND": { [["inbasemoves_assemblingvehicleerc"], true] }; @@ -46,7 +48,12 @@ private _return = switch (_anim_set) do case "KNEEL_TREAT_2": { [["acts_treatingwounded01","acts_treatingwounded02","acts_treatingwounded03","acts_treatingwounded04","acts_treatingwounded05","acts_treatingwounded06"], true] }; case "CAPTURED_SIT": { [["Acts_AidlPsitMstpSsurWnonDnon03","Acts_AidlPsitMstpSsurWnonDnon04","Acts_AidlPsitMstpSsurWnonDnon05"], true] }; case "SURRENDER": { [["AmovPercMstpSsurWnonDnon"], false] }; - case "SIT_LOW": { [["amovpsitmstpslowwrfldnon","amovpsitmstpslowwrfldnon_weaponcheck1","amovpsitmstpslowwrfldnon_weaponcheck2"], false] }; + case "SIT_LOW_1": { [["amovpsitmstpslowwrfldnon","amovpsitmstpslowwrfldnon_weaponcheck1","amovpsitmstpslowwrfldnon_weaponcheck2"], false] }; + case "SIT_LOW_2": { [["passenger_flatground_crosslegs"], false] }; + case "SIT_LOW_3": { [["Acts_passenger_flatground_leanright"], false] }; + case "SIT_LOW_4": { [["commander_sdv"], false] }; + case "SIT_LOW_5": { [["passenger_flatground_2_Idle_Unarmed"], false] }; + case "SIT_LOW_6": { [["passenger_flatground_3_Idle_Unarmed"], false] }; case "INJURY_CHEST": { [["Acts_CivilinjuredChest_1"], false] }; case "INJURY_HEAD": { [["Acts_CivilInjuredHead_1"], false] }; case "INJURY_ARM": { [["Acts_CivilInjuredArms_1"], false] }; @@ -57,13 +64,26 @@ private _return = switch (_anim_set) do case "LISTEN_CIV": { [["Acts_CivilListening_1","Acts_CivilListening_2"], true] }; case "SHIELD_FROM_SUN": { [["Acts_ShieldFromSun_Loop"], false] }; case "SHOWING_THE_WAY": { [["Acts_ShowingTheRightWay_loop"], false] }; - case "SIT_ON_FLOOR": { [["commander_sdv", "passenger_flatground_crosslegs", "Acts_passenger_flatground_leanright"], false] }; - case "SIT_ON_CHAIR": { [["passenger_apc_generic03", "passenger_generic01_foldhands", "ChopperLight_CB_idle1stable_H"], true] }; - case "DEAD_LEAN": { [["KIA_Commander_MBT_04", "KIA_commander_sdv", "KIA_driver_MBT_04", "KIA_driver_ugv_01"], true] }; - case "DEAD_SIT": { [["KIA_passenger_flatground", "KIA_passenger_sdv"], true] }; - case "KNEEL_WEAPON_UP": { [["HubShootingRangeKneel_move1", "HubShootingRangeKneel_move2", "HubShootingRangeKneel_move3"], true] }; - case "PRONE_WEAPON_UP": { [["HubShootingRangeProne_move1", "HubShootingRangeProne_move2", "HubShootingRangeProne_move3"], true] }; - case "SIT_HIGH": { [["HubSittingHighA_idle1", "HubSittingHighA_idle2", "HubSittingHigB_idle1", "HubSittingHighB_idle2"], true] }; + case "DEAD_LEAN_1": { [["KIA_Commander_MBT_04"], true] }; + case "DEAD_LEAN_2": { [["KIA_driver_MBT_04"], true] }; + case "DEAD_SIT_1": { [["KIA_passenger_flatground"], true] }; + case "DEAD_SIT_2": { [["KIA_passenger_sdv"], true] }; + case "DEAD_SIT_3": { [["KIA_commander_sdv"], true] }; + case "KNEEL_WEAP_UP": { [["viper_crouchLoop", "viperSgt_crouchLoop"], false] }; + case "TABLE": { [["InBaseMoves_table1"], true] }; + case "BORED": { [["LHD_krajPaluby"], false] }; + case "BINOC": { [["passenger_flatground_1_Aim_binoc"], false] }; + case "SIT_WEAP_1": { [["passenger_flatground_1_Idle_Pistol_Idling"], false] }; + case "SIT_WEAP_2": { [["passenger_flatground_1_Idle_Pistol"], false] }; + case "SIT_WEAP_3": { [["passenger_flatground_1_Idle_Idling"], false] }; + case "SIT_WEAP_4": { [["passenger_flatground_3_Idle_Idling"], false] }; + case "SQUAT_WEAP": { [["Acts_AidlPercMstpSloWWrflDnon_warmup_6_loop"], false] }; + case "SQUAT": { [["Acts_AidlPercMstpSnonWnonDnon_warmup_4_loop"], false] }; + case "STAND_GUARD_P1": { [["Acts_AidlPercMstpSloWWpstDnon_warmup_1_loop"], false] }; + case "STAND_GUARD_P2": { [["Acts_AidlPercMstpSloWWpstDnon_warmup_2_loop"], false] }; + case "STAND_GUARD_P3": { [["Acts_AidlPercMstpSloWWpstDnon_warmup_3_loop"], false] }; + case "STAND_GUARD_P4": { [["Acts_AidlPercMstpSloWWpstDnon_warmup_6_loop"], false] }; + }; _return; diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf index 03e8e589..1dca552f 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf @@ -24,44 +24,47 @@ private _dialogResult = [ [localize "STR_AMAE_TYPE", [ - "stop animation", - "sit on floor", - "lean on wall", - "watch", - "stand idle", - "stand idle (no weapon)", - "at ease", - "listen briefing", - "briefing", - "briefing (interactive)", - "listening (civilian)", - "talking (civilian)", - "listen to radio", - "shield from sun", - "navigate aircraft", - "showing a vehicle the way", - "treat wounded", - "combat wounded", - "wounded (general)", - "wounded (head)", - "wounded (chest)", - "wounded (arm)", - "wounded (leg)", - "shocked civilian", - "hiding civilian", - "sit captured", - "repair vehicle prone", - "repair vehicle kneel", - "repair vehicle stand", - "sit on ground", - "sit on chair", - "sit high", - "dead sitting leaned", - "dead sitting erect", - "kneel weapon ready", - "prone weapon ready" + "Stop Animation", + "Sit On Floor", + "Lean On Wall", + "Watch", + "Stand Idle", + "Stand Idle (no weapon)", + "At Ease", + "Listen Briefing", + "Briefing", + "Briefing (Interactive)", + "Listening (Civilian)", + "Talking (Civilian)", + "Listen To Radio", + "Shield From Sun", + "Navigate Aircraft", + "Showing Vehicle The Way", + "Treat Wounded", + "Combat Wounded", + "Wounded (General)", + "Wounded (Head)", + "Wounded (Chest)", + "Wounded (Arm)", + "Wounded (Leg)", + "Shocked Civilian", + "Hiding Civilian", + "Sit Captured", + "Repair Vehicle (Prone)", + "Repair Vehicle (Kneel)", + "Repair Vehicle (Stand)", + "Dead (Leaned)", + "Dead (Erect)", + "Weapon Ready (Kneel)", + "Leaned On Table", + "Bored", + "Sit (Binoc)", + "Sit (Weapon)", + "Squat (Weapon)", + "Squat", + "Guard (Pistol)" - ] + ] ], ["Combat Ready", [localize "STR_AMAE_TRUE",localize "STR_AMAE_FALSE"]] ] @@ -73,7 +76,11 @@ private _persistent = _dialogResult select 1; _anim = switch (_dialogResult select 0) do { case 0: {"TERMINATE"}; - case 1: {"SIT_LOW"}; + case 1: + { + selectRandom ["SIT_LOW_1", "SIT_LOW_2", "SIT_LOW_3", "SIT_LOW_4", "SIT_LOW_5", "SIT_LOW_6"]; + + }; case 2: {"LEAN"}; case 3: { @@ -85,7 +92,7 @@ _anim = switch (_dialogResult select 0) do }; case 5: { - selectRandom ["STAND_NO_WEAP_1", "STAND_NO_WEAP_2", "STAND_NO_WEAP_3"]; + selectRandom ["STAND_NO_WEAP_1", "STAND_NO_WEAP_2", "STAND_NO_WEAP_3", "STAND_NO_WEAP_4", "STAND_NO_WEAP_5"]; }; case 6: {"GUARD"}; case 7: {"LISTEN_BRIEFING"}; @@ -119,13 +126,29 @@ _anim = switch (_dialogResult select 0) do case 26: {"REPAIR_VEH_PRONE"}; case 27: {"REPAIR_VEH_KNEEL"}; case 28: {"REPAIR_VEH_STAND"}; - case 29: {"SIT_ON_FLOOR"}; - case 30: {"SIT_ON_CHAIR"}; - case 31: {"SIT_HIGH"}; - case 32: {"DEAD_LEAN"}; - case 33: {"DEAD_SIT"}; - case 34: {"KNEEL_WEAPON_UP"}; - case 35: {"PRONE_WEAPON_UP"}; + case 29: + { + selectRandom ["DEAD_LEAN_1", "DEAD_LEAN_2"]; + }; + case 30: + { + selectRandom ["DEAD_SIT_1", "DEAD_SIT_2", "DEAD_SIT_3"]; + }; + case 31: {"KNEEL_WEAP_UP"}; + case 32: {"TABLE"}; + case 33: {"BORED"}; + case 34: {"BINOC"}; + case 35: + { + selectRandom ["SIT_WEAP_1", "SIT_WEAP_2", "SIT_WEAP_3", "SIT_WEAP_4"]; + }; + case 36: {"SQUAT_WEAP"}; + case 37: {"SQUAT"}; + case 38: + { + selectRandom ["STAND_GUARD_P1", "STAND_GUARD_P2", "STAND_GUARD_P3", "STAND_GUARD_P4"]; + }; + }; diff --git a/bash.exe.stackdump b/bash.exe.stackdump new file mode 100644 index 00000000..167823ac --- /dev/null +++ b/bash.exe.stackdump @@ -0,0 +1,9 @@ +Stack trace: +Frame Function Args +000FFFFA358 0018006021E (00180252DED, 001802340A6, 000FFFFA358, 000FFFF9250) +000FFFFA358 00180048859 (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFA358 00180048892 (00180252EA9, 000FFFFA208, 000FFFFA358, 00000000000) +000FFFFA358 001800AF0D8 (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFA358 001800AF25D (000FFFFA370, 00000000000, 00000000000, 00000000000) +000FFFFA5E0 001800B0673 (000FFFFA370, 00000000000, 00000000000, 00000000000) +End of stack trace From 3ba4db3beb3e11db778dff0d8f97acbfc6aa2adb Mon Sep 17 00:00:00 2001 From: RAJIB BISWAS Date: Sat, 11 May 2019 22:04:00 +0530 Subject: [PATCH 4/7] Removed unused identifier "KNEEL", added one anim to "STAND_NO_WEAP_5" --- .../functions/features/fn_ambientAnimGetParams.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf index 1ab07962..1ac5d8c0 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf @@ -21,12 +21,12 @@ private _anim_set = _this; private _return = switch (_anim_set) do { // [anims, noWeapon] case "STAND_1": { [["HubStanding_idle1","HubStanding_idle2","HubStanding_idle3"], false] }; - case "STAND_2": { [["amovpercmstpslowwrfldnon","amovpercmstpslowwrfldnon","aidlpercmstpslowwrfldnon_g01","aidlpercmstpslowwrfldnon_g02","aidlpercmstpslowwrfldnon_g03","aidlpercmstpslowwrfldnon_g05","Acts_AidlPercMstpSloWWrflDnon_warmup_3_loop","Acts_AidlPercMstpSloWWpstDnon_warmup_4_loop"], false] }; + case "STAND_2": { [["amovpercmstpslowwrfldnon","amovpercmstpslowwrfldnon","aidlpercmstpslowwrfldnon_g01","aidlpercmstpslowwrfldnon_g02","aidlpercmstpslowwrfldnon_g03","aidlpercmstpslowwrfldnon_g05","Acts_AidlPercMstpSloWWrflDnon_warmup_3_loop"], false] }; case "STAND_NO_WEAP_1": { [["HubStandingUA_idle1","HubStandingUA_idle2","HubStandingUA_idle3","HubStandingUA_move1","HubStandingUA_move2"], true] }; case "STAND_NO_WEAP_2": { [["HubStandingUB_idle1","HubStandingUB_idle2","HubStandingUB_idle3","HubStandingUB_move1"], true]; }; case "STAND_NO_WEAP_3": { [["HubStandingUC_idle1","HubStandingUC_idle2","HubStandingUC_idle3","HubStandingUC_move1","HubStandingUC_move2"], true] }; case "STAND_NO_WEAP_4": { [["HubBriefing_think"], true]}; - case "STAND_NO_WEAP_5": { [["Acts_AidlPercMstpSnonWnonDnon_warmup_1_loop","Acts_AidlPercMstpSnonWnonDnon_warmup_2_loop"], false] }; + case "STAND_NO_WEAP_5": { [["Acts_AidlPercMstpSnonWnonDnon_warmup_1_loop","Acts_AidlPercMstpSnonWnonDnon_warmup_2_loop", "Acts_AidlPercMstpSnonWnonDnon_warmup_8_loop"], false] }; case "WATCH_1": { [["inbasemoves_patrolling1"], false] }; case "WATCH_2": { [["inbasemoves_patrolling2"], false] }; case "GUARD": { [["inbasemoves_handsbehindback1","inbasemoves_handsbehindback2"], true] }; @@ -37,7 +37,7 @@ private _return = switch (_anim_set) do case "LISTEN_TO_RADIO": { [["Acts_listeningToRadio_Loop"], false] }; case "NAVIGATE": { [["Acts_NavigatingChopper_Loop"], false] }; case "LEAN":{ [["inbasemoves_lean1"], false] }; - case "KNEEL": { [["amovpknlmstpslowwrfldnon","aidlpknlmstpslowwrfldnon_ai","aidlpknlmstpslowwrfldnon_g01","aidlpknlmstpslowwrfldnon_g02","aidlpknlmstpslowwrfldnon_g03","aidlpknlmstpslowwrfldnon_g0s","Acts_AidlPercMstpSnonWnonDnon_warmup_6_loop"], false] }; + //case "KNEEL": { [["amovpknlmstpslowwrfldnon","aidlpknlmstpslowwrfldnon_ai","aidlpknlmstpslowwrfldnon_g01","aidlpknlmstpslowwrfldnon_g02","aidlpknlmstpslowwrfldnon_g03","aidlpknlmstpslowwrfldnon_g0s","Acts_AidlPercMstpSnonWnonDnon_warmup_6_loop"], false] }; case "REPAIR_VEH_PRONE": { [["hubfixingvehicleprone_idle1"], true] }; case "REPAIR_VEH_KNEEL": { [["inbasemoves_repairvehicleknl"], true] }; case "REPAIR_VEH_STAND": { [["inbasemoves_assemblingvehicleerc"], true] }; From 83431c44e005d35f8ff20308946a606e6a552d78 Mon Sep 17 00:00:00 2001 From: Ralfs Garkaklis Date: Sat, 11 May 2019 20:18:31 +0300 Subject: [PATCH 5/7] Delete bash.exe.stackdump --- bash.exe.stackdump | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 bash.exe.stackdump diff --git a/bash.exe.stackdump b/bash.exe.stackdump deleted file mode 100644 index 167823ac..00000000 --- a/bash.exe.stackdump +++ /dev/null @@ -1,9 +0,0 @@ -Stack trace: -Frame Function Args -000FFFFA358 0018006021E (00180252DED, 001802340A6, 000FFFFA358, 000FFFF9250) -000FFFFA358 00180048859 (00000000000, 00000000000, 00000000000, 00000000000) -000FFFFA358 00180048892 (00180252EA9, 000FFFFA208, 000FFFFA358, 00000000000) -000FFFFA358 001800AF0D8 (00000000000, 00000000000, 00000000000, 00000000000) -000FFFFA358 001800AF25D (000FFFFA370, 00000000000, 00000000000, 00000000000) -000FFFFA5E0 001800B0673 (000FFFFA370, 00000000000, 00000000000, 00000000000) -End of stack trace From 45a230c3adaf5f48098ee0770834826d75522355 Mon Sep 17 00:00:00 2001 From: SDTheCyanWyan <50071611+SDTheCyanWyan@users.noreply.github.com> Date: Sat, 11 May 2019 22:53:32 +0530 Subject: [PATCH 6/7] Update @AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf Co-Authored-By: Ralfs Garkaklis --- .../functions/features/fn_ambientAnimGetParams.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf index 1ac5d8c0..22c5414a 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf @@ -21,7 +21,7 @@ private _anim_set = _this; private _return = switch (_anim_set) do { // [anims, noWeapon] case "STAND_1": { [["HubStanding_idle1","HubStanding_idle2","HubStanding_idle3"], false] }; - case "STAND_2": { [["amovpercmstpslowwrfldnon","amovpercmstpslowwrfldnon","aidlpercmstpslowwrfldnon_g01","aidlpercmstpslowwrfldnon_g02","aidlpercmstpslowwrfldnon_g03","aidlpercmstpslowwrfldnon_g05","Acts_AidlPercMstpSloWWrflDnon_warmup_3_loop"], false] }; + case "STAND_2": { [["amovpercmstpslowwrfldnon","amovpercmstpslowwrfldnon","aidlpercmstpslowwrfldnon_g01","aidlpercmstpslowwrfldnon_g02","aidlpercmstpslowwrfldnon_g03","aidlpercmstpslowwrfldnon_g05","Acts_AidlPercMstpSloWWrflDnon_warmup_3_loop"], false] }; case "STAND_NO_WEAP_1": { [["HubStandingUA_idle1","HubStandingUA_idle2","HubStandingUA_idle3","HubStandingUA_move1","HubStandingUA_move2"], true] }; case "STAND_NO_WEAP_2": { [["HubStandingUB_idle1","HubStandingUB_idle2","HubStandingUB_idle3","HubStandingUB_move1"], true]; }; case "STAND_NO_WEAP_3": { [["HubStandingUC_idle1","HubStandingUC_idle2","HubStandingUC_idle3","HubStandingUC_move1","HubStandingUC_move2"], true] }; From ae34947a9c209c2f0398497023e98757bfb1413d Mon Sep 17 00:00:00 2001 From: SDTheCyanWyan <50071611+SDTheCyanWyan@users.noreply.github.com> Date: Sat, 11 May 2019 23:01:23 +0530 Subject: [PATCH 7/7] Update fn_animation.sqf --- .../functions_f_achilles/functions/features/fn_animation.sqf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf index 1dca552f..908844ef 100644 --- a/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf +++ b/@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf @@ -63,7 +63,6 @@ private _dialogResult = "Squat (Weapon)", "Squat", "Guard (Pistol)" - ] ], ["Combat Ready", [localize "STR_AMAE_TRUE",localize "STR_AMAE_FALSE"]] @@ -79,7 +78,6 @@ _anim = switch (_dialogResult select 0) do case 1: { selectRandom ["SIT_LOW_1", "SIT_LOW_2", "SIT_LOW_3", "SIT_LOW_4", "SIT_LOW_5", "SIT_LOW_6"]; - }; case 2: {"LEAN"}; case 3: @@ -148,10 +146,7 @@ _anim = switch (_dialogResult select 0) do { selectRandom ["STAND_GUARD_P1", "STAND_GUARD_P2", "STAND_GUARD_P3", "STAND_GUARD_P4"]; }; - - }; - if (isNull (_units select 0)) then { _units = [localize "STR_AMAE_UNITS"] call Achilles_fnc_SelectUnits;