From 67493ad4e43f02533dce7d15ae407884c6408428 Mon Sep 17 00:00:00 2001 From: Blixibon Date: Thu, 18 Nov 2021 23:27:27 -0600 Subject: [PATCH] Added $continues to generic macros in GenericAnimationMacros.qci --- modelsrc/GenericAnimationMacros.qci | 51 +++++++++++++++++++---------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/modelsrc/GenericAnimationMacros.qci b/modelsrc/GenericAnimationMacros.qci index a3e1cef..035f817 100644 --- a/modelsrc/GenericAnimationMacros.qci +++ b/modelsrc/GenericAnimationMacros.qci @@ -7,18 +7,21 @@ $definemacro GenericIdle IdleName IdleSeq IdleAct \\ $sequence $IdleName$ { $IdleSeq$ activity $IdleAct$ 1 loop \\ cmdlist lockfeetandlefthand \\ -} +} \\ +$continue $IdleName$ $definemacro GenericIdleWeight IdleName IdleSeq IdleAct ActWeight \\ $sequence $IdleName$ { $IdleSeq$ activity $IdleAct$ $ActWeight$ loop \\ cmdlist lockfeetandlefthand \\ -} +} \\ +$continue $IdleName$ $definemacro GenericIdleHands IdleName IdleSeq IdleAct HandsLayer \\ $sequence $IdleName$ { $IdleSeq$ activity $IdleAct$ 1 loop \\ cmdlist lockfeet \\ blendlayer $HandsLayer$ 0 0 0 0 local \\ -} +} \\ +$continue $IdleName$ $definemacro GenericCombatIdle IdleName IdleSeq IdleAct AimLayer \\ $sequence $IdleName$ { \\ @@ -27,7 +30,8 @@ $sequence $IdleName$ { \\ addlayer $AimLayer$ \\ loop \\ cmdlist lockfeetandlefthand \\ -} +} \\ +$continue $IdleName$ $definemacro GenericCombatIdle_NoHandIK IdleName IdleSeq IdleAct AimLayer \\ $sequence $IdleName$ { \\ @@ -36,7 +40,8 @@ $sequence $IdleName$ { \\ addlayer $AimLayer$ \\ loop \\ cmdlist lockfeet \\ -} +} \\ +$continue $IdleName$ $definemacro GenericShoot SeqName FileName ActName AimLayer \\ $sequence $SeqName$ { \\ @@ -45,7 +50,8 @@ $sequence $SeqName$ { \\ addlayer $AimLayer$ \\ activity $ActName$ 1 \\ cmdlist lockfeetandlefthand \\ -} +} \\ +$continue $SeqName$ $definemacro GenericReload SeqName FileName ActName AimLayer AimFadeOut AimFadeIn NumFrames EventFrame \\ $sequence $SeqName$ { \\ @@ -58,7 +64,8 @@ $sequence $SeqName$ { \\ cmdlist lockfeet \\ ikrule "rhand" release \\ ikrule "lhand" release \\ -} +} \\ +$continue $SeqName$ $definemacro GenericReloadSoundMatched SeqName FileName ActName AimLayer AimFadeOut AimFadeIn NumFrames EventFrame \\ $sequence $SeqName$ { \\ @@ -70,7 +77,8 @@ $sequence $SeqName$ { \\ cmdlist lockfeet \\ ikrule "rhand" release \\ ikrule "lhand" release \\ -} +} \\ +$continue $SeqName$ $definemacro GenericReloadNoAim SeqName FileName ActName EventFrame \\ $sequence $SeqName$ { \\ @@ -81,7 +89,8 @@ $sequence $SeqName$ { \\ cmdlist lockfeet \\ ikrule "rhand" release \\ ikrule "lhand" release \\ -} +} \\ +$continue $SeqName$ $definemacro GenericAimMoveLayer SeqName FileName HandsLayer AimLayer \\ $sequence $SeqName$ { $FileName$ hidden addlayer $AimLayer$ loop \\ @@ -89,7 +98,8 @@ $sequence $SeqName$ { $FileName$ hidden addlayer $AimLayer$ loop \\ ikrule "lhand" release \\ blendlayer $HandsLayer$ 0 0 0 0 local \\ weightlist "weights_layer_walk_ar2" \\ -} +} \\ +$continue $SeqName$ $definemacro GenericMoveLayer LayerName FileName WeightList \\ $sequence $LayerName$ { \\ @@ -99,7 +109,8 @@ $sequence $LayerName$ { \\ ikrule "lhand" touch "ValveBiped.Bip01_R_Hand" \\ ikrule "rhand" release \\ weightlist $WeightList$ \\ -} +} \\ +$continue $LayerName$ // ---------------------------------------------------------------- @@ -112,7 +123,8 @@ $sequence $SeqName$ { \\ interior $InteriorAct$ \\ } \\ addlayer $LayerName$ \\ // "blendlayer $LayerName$ 0 0 0 0 local" apparently doesn't keep IK -} +} \\ +$continue $SeqName$ $definemacro GenericRunLayered SeqName ActivityName LayerName InteriorAct \\ $sequence $SeqName$ { \\ @@ -123,7 +135,8 @@ $sequence $SeqName$ { \\ interior $InteriorAct$ \\ } \\ addlayer $LayerName$ \\ // "blendlayer $LayerName$ 0 0 0 0 local" apparently doesn't keep IK -} +} \\ +$continue $SeqName$ // ---------------------------------------------------------------- @@ -136,7 +149,8 @@ $sequence $SeqName$ { \\ addlayer $AimLayer$ \\ activity $ActName$ 1 \\ cmdlist lockfeetandlefthand \\ -} +} \\ +$continue $SeqName$ $definemacro GenericShootFromIdle_NoHandIK SeqName FileName ActName AimLayer GestureLayer NumFrames \\ $sequence $SeqName$ { \\ @@ -147,7 +161,8 @@ $sequence $SeqName$ { \\ addlayer $AimLayer$ \\ activity $ActName$ 1 \\ cmdlist lockfeet \\ -} +} \\ +$continue $SeqName$ $definemacro GenericReloadFromIdle SeqName FileName ActName AimLayer GestureLayer AimFadeOut AimFadeIn NumFrames EventFrame \\ $sequence $SeqName$legs $FileName$ weightlist "LegsAndPelvis" hidden \\ @@ -162,7 +177,8 @@ $sequence $SeqName$ { \\ cmdlist lockfeet \\ ikrule "rhand" release \\ ikrule "lhand" release \\ -} +} \\ +$continue $SeqName$ $definemacro GenericReloadFromIdle_NoAim SeqName FileName ActName GestureLayer NumFrames EventFrame \\ $sequence $SeqName$legs $FileName$ weightlist "LegsAndPelvis" hidden \\ @@ -175,7 +191,8 @@ $sequence $SeqName$ { \\ cmdlist lockfeet \\ ikrule "rhand" release \\ ikrule "lhand" release \\ -} +} \\ +$continue $SeqName$