From 28f299fc4573d8dbd15c3a8331a13ecf871cda03 Mon Sep 17 00:00:00 2001 From: "ALLEN-PC\\acj30" Date: Sat, 23 Dec 2023 13:17:29 -0600 Subject: [PATCH] Fix move animation blend macros not being applied to certain soldier QCIs --- modelsrc/CitizenPackage_Soldier.qci | 32 ++----------------- modelsrc/CitizenSuitcase_Soldier.qci | 32 ++----------------- modelsrc/PoliceMelee_Soldier.qci | 32 ++----------------- .../combine_soldier_anims_DeclareSequence.qci | 32 ++----------------- 4 files changed, 8 insertions(+), 120 deletions(-) diff --git a/modelsrc/CitizenPackage_Soldier.qci b/modelsrc/CitizenPackage_Soldier.qci index 9254521..92a60fb 100644 --- a/modelsrc/CitizenPackage_Soldier.qci +++ b/modelsrc/CitizenPackage_Soldier.qci @@ -27,22 +27,8 @@ $sequence "layer_walk_holding_package" { } $sequence "walk_holding_package_all" { - "a_SoldierWalkEasyS" - "a_SoldierWalkEasySE" - "a_SoldierWalkEasyE" - "a_SoldierWalkEasyNE" - "a_SoldierWalkEasyN" // a_WalkN_package - "a_SoldierWalkEasyNW" - "a_SoldierWalkEasyW" - "a_SoldierWalkEasySW" - "a_SoldierWalkEasyS" + $a_WalkEasyBlends activity "ACT_WALK_PACKAGE" 1 - blend "move_yaw" -180 180 - blendwidth 9 - fadein 0.2 - fadeout 0.2 - { event 6004 9 "NPC_CombineS" } - { event 6005 25 "NPC_CombineS" } keyvalues { @@ -68,22 +54,8 @@ $sequence "idlepackage" { $include "CitizenPackageRun.qci" $sequence "run_holding_package_all" { - "a_SoldierRunS" - "a_SoldierRunSE" - "a_SoldierRunE" - "a_SoldierRunNE" - "a_SoldierRunN" // a_WalkN_package - "a_SoldierRunNW" - "a_SoldierRunW" - "a_SoldierRunSW" - "a_SoldierRunS" + $a_RunBlends activity "ACT_RUN_PACKAGE" 1 - blend "move_yaw" -180 180 - blendwidth 9 - fadein 0.2 - fadeout 0.2 - { event 6004 7 "NPC_CombineS" } - { event 6005 16 "NPC_CombineS" } keyvalues { diff --git a/modelsrc/CitizenSuitcase_Soldier.qci b/modelsrc/CitizenSuitcase_Soldier.qci index 9a32d48..fcd0686 100644 --- a/modelsrc/CitizenSuitcase_Soldier.qci +++ b/modelsrc/CitizenSuitcase_Soldier.qci @@ -87,22 +87,8 @@ $sequence "layer_luggage_larm" { } $sequence "luggage_walk_all" { - "a_SoldierWalkEasyS" - "a_SoldierWalkEasySE" - "a_SoldierWalkEasyE" - "a_SoldierWalkEasyNE" - "a_SoldierWalkEasyN" // a_luggage_walk - "a_SoldierWalkEasyNW" - "a_SoldierWalkEasyW" - "a_SoldierWalkEasySW" - "a_SoldierWalkEasyS" + $a_WalkEasyBlends activity "ACT_WALK_SUITCASE" 1 - blend "move_yaw" -180 180 - blendwidth 9 - { event 6004 9 "NPC_CombineS" } - { event 6005 25 "NPC_CombineS" } - fadein 0.2 - fadeout 0.2 blendlayer "layer_luggage_walk" 0 0 0 0 local blendlayer "layer_luggage_larm" 0 0 0 0 local node "walking" @@ -118,22 +104,8 @@ $sequence "layer_luggage_run_larm" { } $sequence "luggage_run_all" { - "a_SoldierRunS" - "a_SoldierRunSE" - "a_SoldierRunE" - "a_SoldierRunNE" - "a_SoldierRunN" // a_luggage_walk - "a_SoldierRunNW" - "a_SoldierRunW" - "a_SoldierRunSW" - "a_SoldierRunS" + $a_RunBlends activity "ACT_RUN_SUITCASE" 1 - blend "move_yaw" -180 180 - blendwidth 9 - { event 6004 7 "NPC_CombineS" } - { event 6005 16 "NPC_CombineS" } - fadein 0.2 - fadeout 0.2 blendlayer "layer_luggage_run" 0 0 0 0 local blendlayer "layer_luggage_run_larm" 0 0 0 0 local node "running" diff --git a/modelsrc/PoliceMelee_Soldier.qci b/modelsrc/PoliceMelee_Soldier.qci index ba8a1a0..24dbd5a 100644 --- a/modelsrc/PoliceMelee_Soldier.qci +++ b/modelsrc/PoliceMelee_Soldier.qci @@ -17,41 +17,13 @@ $sequence "batonidle1" { } $sequence "walk_hold_baton_angry" { - "a_SoldierWalkEasyS" - "a_SoldierWalkEasySE" - "a_SoldierWalkEasyE" - "a_SoldierWalkEasyNE" - "a_SoldierWalkEasyN" - "a_SoldierWalkEasyNW" - "a_SoldierWalkEasyW" - "a_SoldierWalkEasySW" - "a_SoldierWalkEasyS" + $a_WalkEasyBlends activity "ACT_WALK_MELEE" 1 // ACT_WALK_ANGRY - blend "move_yaw" -180 180 - blendwidth 9 - { event 6004 9 "NPC_CombineS" } - { event 6005 25 "NPC_CombineS" } - fadein 0.2 - fadeout 0.2 blendlayer "layer_walk_hold_baton_angry" 0 0 0 0 local } $sequence "run_hold_baton_angry" { - "a_SoldierRunS" - "a_SoldierRunSE" - "a_SoldierRunE" - "a_SoldierRunNE" - "a_SoldierRunN" - "a_SoldierRunNW" - "a_SoldierRunW" - "a_SoldierRunSW" - "a_SoldierRunS" + $a_RunBlends activity "ACT_RUN_MELEE" 1 // ACT_WALK_ANGRY - blend "move_yaw" -180 180 - blendwidth 9 - { event 6004 7 "NPC_CombineS" } - { event 6005 16 "NPC_CombineS" } - fadein 0.2 - fadeout 0.2 blendlayer "layer_run_hold_baton_angry" 0 0 0 0 local } diff --git a/modelsrc/combine_soldier_anims_DeclareSequence.qci b/modelsrc/combine_soldier_anims_DeclareSequence.qci index 3cdff3f..dfdb388 100644 --- a/modelsrc/combine_soldier_anims_DeclareSequence.qci +++ b/modelsrc/combine_soldier_anims_DeclareSequence.qci @@ -97,42 +97,14 @@ $sequence "Run_turretCarry_Upperbody_idle" { } $sequence "Run_turretCarry_ALL" { - "a_SoldierRunS" - "a_SoldierRunSE" - "a_SoldierRunE" - "a_SoldierRunNE" - "a_SoldierRunN" - "a_SoldierRunNW" - "a_SoldierRunW" - "a_SoldierRunSW" - "a_SoldierRunS" + $a_RunBlends activity "ACT_TURRET_CARRY_RUN" 1 - blend "move_yaw" -180 180 - blendwidth 9 - { event 6004 7 "NPC_CombineS" } - { event 6005 16 "NPC_CombineS" } - fadein 0.2 - fadeout 0.2 addlayer "Run_turretCarry_Upperbody" } $sequence "Walk_turretCarry_all" { - "a_SoldierWalkS" - "a_SoldierWalkSE" - "a_SoldierWalkE" - "a_SoldierWalkNE" - "a_SoldierWalkN" - "a_SoldierWalkNW" - "a_SoldierWalkW" - "a_SoldierWalkSW" - "a_SoldierWalkS" + $a_WalkBlends activity "ACT_TURRET_CARRY_WALK" 1 - blend "move_yaw" -180 180 - blendwidth 9 - { event 6004 9 "NPC_CombineS" } - { event 6005 25 "NPC_CombineS" } - fadein 0.2 - fadeout 0.2 blendlayer "Run_turretCarry_Upperbody" 0 0 0 0 local }