mirror of
https://github.com/mapbase-source/mapbase-model-src.git
synced 2025-04-14 05:00:00 +03:00
Fix move animation blend macros not being applied to certain soldier QCIs
This commit is contained in:
parent
af10ba71c9
commit
28f299fc45
@ -27,22 +27,8 @@ $sequence "layer_walk_holding_package" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$sequence "walk_holding_package_all" {
|
$sequence "walk_holding_package_all" {
|
||||||
"a_SoldierWalkEasyS"
|
$a_WalkEasyBlends
|
||||||
"a_SoldierWalkEasySE"
|
|
||||||
"a_SoldierWalkEasyE"
|
|
||||||
"a_SoldierWalkEasyNE"
|
|
||||||
"a_SoldierWalkEasyN" // a_WalkN_package
|
|
||||||
"a_SoldierWalkEasyNW"
|
|
||||||
"a_SoldierWalkEasyW"
|
|
||||||
"a_SoldierWalkEasySW"
|
|
||||||
"a_SoldierWalkEasyS"
|
|
||||||
activity "ACT_WALK_PACKAGE" 1
|
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
|
keyvalues
|
||||||
{
|
{
|
||||||
@ -68,22 +54,8 @@ $sequence "idlepackage" {
|
|||||||
$include "CitizenPackageRun.qci"
|
$include "CitizenPackageRun.qci"
|
||||||
|
|
||||||
$sequence "run_holding_package_all" {
|
$sequence "run_holding_package_all" {
|
||||||
"a_SoldierRunS"
|
$a_RunBlends
|
||||||
"a_SoldierRunSE"
|
|
||||||
"a_SoldierRunE"
|
|
||||||
"a_SoldierRunNE"
|
|
||||||
"a_SoldierRunN" // a_WalkN_package
|
|
||||||
"a_SoldierRunNW"
|
|
||||||
"a_SoldierRunW"
|
|
||||||
"a_SoldierRunSW"
|
|
||||||
"a_SoldierRunS"
|
|
||||||
activity "ACT_RUN_PACKAGE" 1
|
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
|
keyvalues
|
||||||
{
|
{
|
||||||
|
@ -87,22 +87,8 @@ $sequence "layer_luggage_larm" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$sequence "luggage_walk_all" {
|
$sequence "luggage_walk_all" {
|
||||||
"a_SoldierWalkEasyS"
|
$a_WalkEasyBlends
|
||||||
"a_SoldierWalkEasySE"
|
|
||||||
"a_SoldierWalkEasyE"
|
|
||||||
"a_SoldierWalkEasyNE"
|
|
||||||
"a_SoldierWalkEasyN" // a_luggage_walk
|
|
||||||
"a_SoldierWalkEasyNW"
|
|
||||||
"a_SoldierWalkEasyW"
|
|
||||||
"a_SoldierWalkEasySW"
|
|
||||||
"a_SoldierWalkEasyS"
|
|
||||||
activity "ACT_WALK_SUITCASE" 1
|
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_walk" 0 0 0 0 local
|
||||||
blendlayer "layer_luggage_larm" 0 0 0 0 local
|
blendlayer "layer_luggage_larm" 0 0 0 0 local
|
||||||
node "walking"
|
node "walking"
|
||||||
@ -118,22 +104,8 @@ $sequence "layer_luggage_run_larm" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$sequence "luggage_run_all" {
|
$sequence "luggage_run_all" {
|
||||||
"a_SoldierRunS"
|
$a_RunBlends
|
||||||
"a_SoldierRunSE"
|
|
||||||
"a_SoldierRunE"
|
|
||||||
"a_SoldierRunNE"
|
|
||||||
"a_SoldierRunN" // a_luggage_walk
|
|
||||||
"a_SoldierRunNW"
|
|
||||||
"a_SoldierRunW"
|
|
||||||
"a_SoldierRunSW"
|
|
||||||
"a_SoldierRunS"
|
|
||||||
activity "ACT_RUN_SUITCASE" 1
|
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" 0 0 0 0 local
|
||||||
blendlayer "layer_luggage_run_larm" 0 0 0 0 local
|
blendlayer "layer_luggage_run_larm" 0 0 0 0 local
|
||||||
node "running"
|
node "running"
|
||||||
|
@ -17,41 +17,13 @@ $sequence "batonidle1" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$sequence "walk_hold_baton_angry" {
|
$sequence "walk_hold_baton_angry" {
|
||||||
"a_SoldierWalkEasyS"
|
$a_WalkEasyBlends
|
||||||
"a_SoldierWalkEasySE"
|
|
||||||
"a_SoldierWalkEasyE"
|
|
||||||
"a_SoldierWalkEasyNE"
|
|
||||||
"a_SoldierWalkEasyN"
|
|
||||||
"a_SoldierWalkEasyNW"
|
|
||||||
"a_SoldierWalkEasyW"
|
|
||||||
"a_SoldierWalkEasySW"
|
|
||||||
"a_SoldierWalkEasyS"
|
|
||||||
activity "ACT_WALK_MELEE" 1 // ACT_WALK_ANGRY
|
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
|
blendlayer "layer_walk_hold_baton_angry" 0 0 0 0 local
|
||||||
}
|
}
|
||||||
|
|
||||||
$sequence "run_hold_baton_angry" {
|
$sequence "run_hold_baton_angry" {
|
||||||
"a_SoldierRunS"
|
$a_RunBlends
|
||||||
"a_SoldierRunSE"
|
|
||||||
"a_SoldierRunE"
|
|
||||||
"a_SoldierRunNE"
|
|
||||||
"a_SoldierRunN"
|
|
||||||
"a_SoldierRunNW"
|
|
||||||
"a_SoldierRunW"
|
|
||||||
"a_SoldierRunSW"
|
|
||||||
"a_SoldierRunS"
|
|
||||||
activity "ACT_RUN_MELEE" 1 // ACT_WALK_ANGRY
|
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
|
blendlayer "layer_run_hold_baton_angry" 0 0 0 0 local
|
||||||
}
|
}
|
||||||
|
@ -97,42 +97,14 @@ $sequence "Run_turretCarry_Upperbody_idle" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$sequence "Run_turretCarry_ALL" {
|
$sequence "Run_turretCarry_ALL" {
|
||||||
"a_SoldierRunS"
|
$a_RunBlends
|
||||||
"a_SoldierRunSE"
|
|
||||||
"a_SoldierRunE"
|
|
||||||
"a_SoldierRunNE"
|
|
||||||
"a_SoldierRunN"
|
|
||||||
"a_SoldierRunNW"
|
|
||||||
"a_SoldierRunW"
|
|
||||||
"a_SoldierRunSW"
|
|
||||||
"a_SoldierRunS"
|
|
||||||
activity "ACT_TURRET_CARRY_RUN" 1
|
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"
|
addlayer "Run_turretCarry_Upperbody"
|
||||||
}
|
}
|
||||||
|
|
||||||
$sequence "Walk_turretCarry_all" {
|
$sequence "Walk_turretCarry_all" {
|
||||||
"a_SoldierWalkS"
|
$a_WalkBlends
|
||||||
"a_SoldierWalkSE"
|
|
||||||
"a_SoldierWalkE"
|
|
||||||
"a_SoldierWalkNE"
|
|
||||||
"a_SoldierWalkN"
|
|
||||||
"a_SoldierWalkNW"
|
|
||||||
"a_SoldierWalkW"
|
|
||||||
"a_SoldierWalkSW"
|
|
||||||
"a_SoldierWalkS"
|
|
||||||
activity "ACT_TURRET_CARRY_WALK" 1
|
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
|
blendlayer "Run_turretCarry_Upperbody" 0 0 0 0 local
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user