Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds More Animations #485

Merged
merged 9 commits into from
Sep 18, 2019
Merged

Adds More Animations #485

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a729ce
Update fn_animation.sqf
Ryan180602 May 5, 2019
eceac47
Update fn_ambientAnimGetParams.sqf
Ryan180602 May 5, 2019
5f02d58
Added new anims to Sit, stand, and other new
May 11, 2019
3ba4db3
Removed unused identifier "KNEEL", added one anim to "STAND_NO_WEAP_5"
May 11, 2019
83431c4
Delete bash.exe.stackdump
CreepPork May 11, 2019
45a230c
Update @AresModAchillesExpansion/addons/functions_f_achilles/function…
Ryan180602 May 11, 2019
ae34947
Update fn_animation.sqf
Ryan180602 May 11, 2019
4f309d2
Merge branch 'master' into addMoreAnims
Ryan180602 May 11, 2019
18fb9f9
Merge branch 'master' into addMoreAnims
neilzar Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions ...illesExpansion/addons/functions_f_achilles/functions/features/fn_ambientAnimGetParams.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"], 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", "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] };
Expand All @@ -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] };
Expand All @@ -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] };
Expand All @@ -57,6 +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 "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;
_return;
100 changes: 67 additions & 33 deletions @AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_animation.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,46 @@ 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"
]
"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"]]
]
Expand All @@ -65,7 +75,10 @@ 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:
{
Expand All @@ -77,7 +90,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"};
Expand Down Expand Up @@ -111,8 +124,29 @@ _anim = switch (_dialogResult select 0) do
case 26: {"REPAIR_VEH_PRONE"};
case 27: {"REPAIR_VEH_KNEEL"};
case 28: {"REPAIR_VEH_STAND"};
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"];
};
};

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't want to be pedantic, but you could have left one newline in. As the original source.

if (isNull (_units select 0)) then
{
_units = [localize "STR_AMAE_UNITS"] call Achilles_fnc_SelectUnits;
Expand Down