X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation.def;h=30f24509d583fbd9eee9af65c917b3770e05daa1;hb=1aef858f5ecb3dc8fd816e0155635371ed3632f2;hp=9726a80ed6e0c8b6aedbe26029ed9f8178235945;hpb=42bdd021a9276a99a9ae09722d02e36bd3da8e77;p=lugaru.git diff --git a/Source/Animation.def b/Source/Animation.def index 9726a80..30f2450 100644 --- a/Source/Animation.def +++ b/Source/Animation.def @@ -33,23 +33,23 @@ DECLARE_ANIM_BIT(ab_walljump) #endif #ifdef DECLARE_ANIM -DECLARE_ANIM(runanim, "Run", middleheight, neutral, 0) -DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, 0) -DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, 0) +DECLARE_ANIM(runanim, "Run", middleheight, neutral, ab_run) +DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, ab_idle) +DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, ab_stop) DECLARE_ANIM(jumpupanim, "JumpUp", highheight, neutral, 0) DECLARE_ANIM(jumpdownanim, "JumpDown", highheight, neutral, 0) -DECLARE_ANIM(landanim, "Landing", lowheight, neutral, 0) -DECLARE_ANIM(landhardanim, "Landhard", lowheight, neutral, 0) +DECLARE_ANIM(landanim, "Landing", lowheight, neutral, ab_land) +DECLARE_ANIM(landhardanim, "Landhard", lowheight, neutral, ab_landhard) DECLARE_ANIM(climbanim, "Climb", lowheight, neutral, 0) DECLARE_ANIM(hanganim, "Hangon", lowheight, neutral, 0) DECLARE_ANIM(spinkickanim, "SpinKick", middleheight, normalattack, 0) DECLARE_ANIM(getupfromfrontanim, "GetUpFromFront", lowheight, neutral, 0) DECLARE_ANIM(getupfrombackanim, "GetUpFromBack", lowheight, neutral, 0) -DECLARE_ANIM(crouchanim, "Crouch", lowheight, neutral, 0) +DECLARE_ANIM(crouchanim, "Crouch", lowheight, neutral, ab_crouch) DECLARE_ANIM(sneakanim, "Sneak", lowheight, neutral, 0) DECLARE_ANIM(rollanim, "Roll", lowheight, neutral, 0) -DECLARE_ANIM(flipanim, "Flip", highheight, neutral, 0) -DECLARE_ANIM(frontflipanim, "Flip", highheight, neutral, 0) +DECLARE_ANIM(flipanim, "Flip", highheight, neutral, ab_flip) +DECLARE_ANIM(frontflipanim, "Flip", highheight, neutral, ab_flip) DECLARE_ANIM(spinkickreversedanim, "SpinKickCaught", middleheight, reversed, 0) DECLARE_ANIM(spinkickreversalanim, "SpinKickCatch", middleheight, reversal, 0) DECLARE_ANIM(lowkickanim, "lowkick", middleheight, normalattack, 0) @@ -63,11 +63,11 @@ DECLARE_ANIM(upunchanim, "Upunch", middleheight, normalattack, 0) DECLARE_ANIM(staggerbackhighanim, "Staggerbackhigh", middleheight, neutral, 0) DECLARE_ANIM(upunchreversedanim, "UpunchCaught", middleheight, reversed, 0) DECLARE_ANIM(upunchreversalanim, "UpunchCatch", middleheight, reversal, 0) -DECLARE_ANIM(hurtidleanim, "Hurtidle", middleheight, neutral, 0) +DECLARE_ANIM(hurtidleanim, "Hurtidle", middleheight, neutral, ab_idle) DECLARE_ANIM(backhandspringanim, "Backhandspring", middleheight, neutral, 0) -DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral, 0) +DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral, ab_idle) DECLARE_ANIM(walkanim, "Walk", middleheight, neutral, 0) -DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral, 0) +DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral, ab_idle) DECLARE_ANIM(killanim, "Kill", middleheight, normalattack, 0) DECLARE_ANIM(sneakattackanim, "Sneakattack", middleheight, reversal, 0) DECLARE_ANIM(sneakattackedanim, "Sneakattacked", middleheight, reversed, 0) @@ -88,19 +88,19 @@ DECLARE_ANIM(winduppunchanim, "Winduppunch", middleheight, normalattack, 0) DECLARE_ANIM(winduppunchblockedanim, "Winduppunchblocked", middleheight, normalattack, 0) DECLARE_ANIM(blockhighleftanim, "Blockhighleft", middleheight, normalattack, 0) DECLARE_ANIM(blockhighleftstrikeanim, "Blockhighleftstrike", middleheight, normalattack, 0) -DECLARE_ANIM(backflipanim, "Backflip", highheight, neutral, 0) -DECLARE_ANIM(walljumpbackanim, "Walljumpback", highheight, neutral, 0) -DECLARE_ANIM(walljumpfrontanim, "Walljumpfront", highheight, neutral, 0) -DECLARE_ANIM(rightflipanim, "Rightflip", highheight, neutral, 0) -DECLARE_ANIM(walljumprightanim, "Walljumpright", highheight, neutral, 0) -DECLARE_ANIM(leftflipanim, "Leftflip", highheight, neutral, 0) -DECLARE_ANIM(walljumpleftanim, "Walljumpleft", highheight, neutral, 0) -DECLARE_ANIM(walljumprightkickanim, "Walljumprightkick", highheight, neutral, 0) -DECLARE_ANIM(walljumpleftkickanim, "Walljumpleftkick", highheight, neutral, 0) -DECLARE_ANIM(knifefightidleanim, "Knifefightidle", middleheight, neutral, 0) +DECLARE_ANIM(backflipanim, "Backflip", highheight, neutral, ab_flip) +DECLARE_ANIM(walljumpbackanim, "Walljumpback", highheight, neutral, ab_walljump) +DECLARE_ANIM(walljumpfrontanim, "Walljumpfront", highheight, neutral, ab_walljump) +DECLARE_ANIM(rightflipanim, "Rightflip", highheight, neutral, ab_flip) +DECLARE_ANIM(walljumprightanim, "Walljumpright", highheight, neutral, ab_walljump) +DECLARE_ANIM(leftflipanim, "Leftflip", highheight, neutral, ab_flip) +DECLARE_ANIM(walljumpleftanim, "Walljumpleft", highheight, neutral, ab_walljump) +DECLARE_ANIM(walljumprightkickanim, "Walljumprightkick", highheight, neutral, ab_flip) +DECLARE_ANIM(walljumpleftkickanim, "Walljumpleftkick", highheight, neutral, ab_flip) +DECLARE_ANIM(knifefightidleanim, "Knifefightidle", middleheight, neutral, ab_idle) DECLARE_ANIM(knifesneakattackanim, "Knifesneakattack", middleheight, reversal, 0) DECLARE_ANIM(knifesneakattackedanim, "Knifesneakattacked", middleheight, reversed, 0) -DECLARE_ANIM(swordfightidleanim, "swordfightidle", middleheight, neutral, 0) +DECLARE_ANIM(swordfightidleanim, "swordfightidle", middleheight, neutral, ab_idle) DECLARE_ANIM(drawleftanim, "drawleft", middleheight, neutral, 0) DECLARE_ANIM(swordslashanim, "swordslash", middleheight, normalattack, 0) DECLARE_ANIM(swordgroundstabanim, "swordgroundstab", lowheight, normalattack, 0) @@ -111,17 +111,17 @@ DECLARE_ANIM(swordslashreversedanim, "swordslashCaught", middleheight, reversed, DECLARE_ANIM(swordslashreversalanim, "swordslashCatch", middleheight, reversal, 0) DECLARE_ANIM(knifeslashreversedanim, "knifeslashCaught", middleheight, reversed, 0) DECLARE_ANIM(knifeslashreversalanim, "knifeslashCatch", middleheight, reversal, 0) -DECLARE_ANIM(swordfightidlebothanim, "swordfightidleboth", middleheight, neutral, 0) +DECLARE_ANIM(swordfightidlebothanim, "swordfightidleboth", middleheight, neutral, ab_idle) DECLARE_ANIM(swordslashparryanim, "sworduprightparry", middleheight, normalattack, 0) DECLARE_ANIM(swordslashparriedanim, "swordslashparried", middleheight, normalattack, 0) -DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral, 0) -DECLARE_ANIM(wolfcrouchanim, "Wolfcrouch", lowheight, neutral, 0) -DECLARE_ANIM(wolflandanim, "Wolflanding", lowheight, neutral, 0) -DECLARE_ANIM(wolflandhardanim, "Wolflandhard", lowheight, neutral, 0) -DECLARE_ANIM(wolfrunanim, "Wolfrun", middleheight, neutral, 0) -DECLARE_ANIM(wolfrunninganim, "Wolfrunning", middleheight, neutral, 0) -DECLARE_ANIM(rabbitrunninganim, "Rabbitrunning", middleheight, neutral, 0) -DECLARE_ANIM(wolfstopanim, "Wolfstop", middleheight, neutral, 0) +DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral, ab_idle) +DECLARE_ANIM(wolfcrouchanim, "Wolfcrouch", lowheight, neutral, ab_crouch) +DECLARE_ANIM(wolflandanim, "Wolflanding", lowheight, neutral, ab_land) +DECLARE_ANIM(wolflandhardanim, "Wolflandhard", lowheight, neutral, ab_landhard) +DECLARE_ANIM(wolfrunanim, "Wolfrun", middleheight, neutral, ab_run) +DECLARE_ANIM(wolfrunninganim, "Wolfrunning", middleheight, neutral, ab_run) +DECLARE_ANIM(rabbitrunninganim, "Rabbitrunning", middleheight, neutral, ab_run) +DECLARE_ANIM(wolfstopanim, "Wolfstop", middleheight, neutral, ab_stop) DECLARE_ANIM(rabbittackleanim, "Rabbittackle", middleheight, neutral, 0) DECLARE_ANIM(rabbittacklinganim, "Rabbittackling", middleheight, reversal, 0) DECLARE_ANIM(rabbittackledbackanim, "Rabbittackledback", middleheight, reversed, 0) @@ -134,14 +134,14 @@ DECLARE_ANIM(staffhitreversedanim, "StaffHitCaught", middleheight, reversed, 0) DECLARE_ANIM(staffhitreversalanim, "StaffHitCatch", middleheight, reversal, 0) DECLARE_ANIM(staffspinhitreversedanim, "SpinWhackCaught", middleheight, reversed, 0) DECLARE_ANIM(staffspinhitreversalanim, "SpinWhackCatch", middleheight, reversal, 0) -DECLARE_ANIM(sitanim, "Sit", lowheight, neutral, 0) -DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral, 0) -DECLARE_ANIM(talkidleanim, "TalkIdle", middleheight, neutral, 0) -DECLARE_ANIM(sitwallanim, "Dying", lowheight, neutral, 0) -DECLARE_ANIM(dead1anim, "Dead1", lowheight, neutral, 0) -DECLARE_ANIM(dead2anim, "Dead2", lowheight, neutral, 0) -DECLARE_ANIM(dead3anim, "Dead3", lowheight, neutral, 0) -DECLARE_ANIM(dead4anim, "Dead4", lowheight, neutral, 0) +DECLARE_ANIM(sitanim, "Sit", lowheight, neutral, ab_idle | ab_sit) +DECLARE_ANIM(sleepanim, "Sleep", lowheight, neutral, ab_idle | ab_sleep) +DECLARE_ANIM(talkidleanim, "TalkIdle", middleheight, neutral, ab_idle) +DECLARE_ANIM(sitwallanim, "Dying", lowheight, neutral, ab_sit) +DECLARE_ANIM(dead1anim, "Dead1", lowheight, neutral, ab_sleep) +DECLARE_ANIM(dead2anim, "Dead2", lowheight, neutral, ab_sleep) +DECLARE_ANIM(dead3anim, "Dead3", lowheight, neutral, ab_sleep) +DECLARE_ANIM(dead4anim, "Dead4", lowheight, neutral, ab_sleep) DECLARE_ANIM(loadable_anim_end, "", 0, 0, 0)