From 877ebc19f6a0185f4128bf613dbdcc9d8529aa0e Mon Sep 17 00:00:00 2001 From: Blixibon Date: Wed, 17 Nov 2021 00:27:17 -0600 Subject: [PATCH] Replaced female_shared's "male to female" conversion method with the "$lockbonelengths" command --- modelsrc/FemaleCitizenConversions.qci | 90 --------------------------- modelsrc/female_shared.qc | 7 +-- 2 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 modelsrc/FemaleCitizenConversions.qci diff --git a/modelsrc/FemaleCitizenConversions.qci b/modelsrc/FemaleCitizenConversions.qci deleted file mode 100644 index 45f7a0d..0000000 --- a/modelsrc/FemaleCitizenConversions.qci +++ /dev/null @@ -1,90 +0,0 @@ -// ================================================================ -// -// This file adds a crude "male to female" layer to a bunch of sequences originally designed with male proprortions. -// -// ================================================================ - -$definemacro AddMtoFLayer SeqName \\ -$append $SeqName$ { blendlayer "male_to_female_layer" 0 0 0 0 local } - -$definemacro AddMtoFGestureLayer SeqName \\ -$append $SeqName$spine { blendlayer "male_to_female_layer" 0 0 0 0 local } \\ -$append $SeqName$arms { blendlayer "male_to_female_layer" 0 0 0 0 local } \\ -$append $SeqName$ { blendlayer "male_to_female_layer" 0 0 0 0 local } - -// ---------------------------------------------------------------- -// CitizenActivityFixes.qci -// ---------------------------------------------------------------- -//$AddMtoFLayer "Idle_Crossbow_Aim" -//$AddMtoFLayer "shoot_crossbow" -$AddMtoFLayer "reload_crossbow" - -// ---------------------------------------------------------------- -// AntlionRecvDI.qci -// ---------------------------------------------------------------- -$AddMtoFLayer "antlion_soldier_DI_01" -$AddMtoFLayer "antlion_soldier_DI_02" - -// ---------------------------------------------------------------- -// HunterRecvDI.qci -// ---------------------------------------------------------------- -$AddMtoFLayer "hunter_cit_throw_ground" -$AddMtoFLayer "hunter_cit_tackle_di" -$AddMtoFLayer "hunter_cit_stomp" -$AddMtoFLayer "hunter_cit_tackle" -$AddMtoFLayer "hunter_cit_tackle_postI" - -// ---------------------------------------------------------------- -// PoliceHarassGestures.qci -// ---------------------------------------------------------------- -$AddMtoFLayer "harassfront1_layer" -$AddMtoFLayer "harassfront2_layer" - -// ---------------------------------------------------------------- -// ArrestAnims.qci -// ---------------------------------------------------------------- -$AddMtoFLayer "arrest_act_floor" -$AddMtoFLayer "arrest_act_standing_gesture" -$AddMtoFLayer "arrest_act_floor_enter" -$AddMtoFLayer "arrest_act_floor_enter_panicked" -$AddMtoFLayer "arrest_act_floor_exit" - -// ---------------------------------------------------------------- -// CitizenWallCover.qci -// -// Note that most of these animations already existed on female citizens, but they were previously proportioned -// to the male skeleton. -// ---------------------------------------------------------------- -$AddMtoFLayer "Cover_R" -$AddMtoFLayer "Cover_L" -$AddMtoFLayer "CoverLow_R" -$AddMtoFLayer "CoverLow_L" - -$AddMtoFLayer "Cover_R_pistol" -$AddMtoFLayer "Cover_L_pistol" -$AddMtoFLayer "CoverLow_R_pistol" -$AddMtoFLayer "CoverLow_L_pistol" - -// ---------------------------------------------------------------- -// NewPistolAnimations_357_FemaleCitizen.qci / NewPistolAnimations_357_FemaleCitizen.qci -// ---------------------------------------------------------------- -$AddMtoFLayer "reload_357" -$AddMtoFLayer "gesture_reload_357" - -// ---------------------------------------------------------------- -// L4D1_LadderClimb_Female.qci -// ---------------------------------------------------------------- -$AddMtoFLayer "Ladder_Ascend" -$AddMtoFLayer "Ladder_Descend" -$AddMtoFLayer "Ladder_updown" -$AddMtoFLayer "Ladder_idle" -$AddMtoFLayer "Ladder_Mount_Top" -$AddMtoFLayer "Ladder_Dismount_Top" - -// ---------------------------------------------------------------- -// NPCDoorAnims.qci -// ---------------------------------------------------------------- -$AddMtoFGestureLayer "g_open_door_lever_back" -$AddMtoFGestureLayer "g_open_door_lever_front" -$AddMtoFGestureLayer "g_open_door_pushbar_back" -$AddMtoFGestureLayer "g_open_door_pushbar_front" diff --git a/modelsrc/female_shared.qc b/modelsrc/female_shared.qc index ce101e8..479e514 100644 --- a/modelsrc/female_shared.qc +++ b/modelsrc/female_shared.qc @@ -4,6 +4,9 @@ $modelname "Humans\female_shared.mdl" //$includemodel "player/female_anims.mdl" +// Automatically tries to convert any non-female animations to the female skeleton +$lockbonelengths + // Must be included $include "BaseModel.qci" $include "hl2mp_ported_anims/commonbones_female.qci" @@ -193,10 +196,6 @@ $include "l4d1_ported_anims\L4D1_LadderClimb_Female.qci" $include "NPCDoorAnims.qci" -// Converts certain sequences from the above files to the female skeleton -// (Keep this at the bottom!) -$include "FemaleCitizenConversions.qci" - $KeyValues { dynamic_interactions