X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation.def;h=de695f792d524898aee97583ece6984b9b288dfc;hb=71a5b4590a18bf663b97b8a52078754899dcf345;hp=36913f549dc9bd70feb13ce20074b6e97051e115;hpb=797dc38c1623b98280500df2ab37edba4effabea;p=lugaru.git diff --git a/Source/Animation.def b/Source/Animation.def index 36913f5..de695f7 100644 --- a/Source/Animation.def +++ b/Source/Animation.def @@ -1,22 +1,20 @@ /* -Copyright (C) 2010 - Lugaru authors +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. -Lugaru is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. +Lugaru is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. -This program is distributed in the hope that it will be useful, +Lugaru is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with Lugaru. If not, see . */ #ifdef DECLARE_ANIM_BIT @@ -35,101 +33,101 @@ DECLARE_ANIM_BIT(ab_walljump) #ifdef DECLARE_ANIM DECLARE_ANIM(runanim, "Run", middleheight, neutral, ab_run) DECLARE_ANIM(bounceidleanim, "Idle", middleheight, neutral, ab_idle) -DECLARE_ANIM(stopanim, "Stop", middleheight, neutral, 0) +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(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, 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) -DECLARE_ANIM(sweepanim, "sweep", lowheight, normalattack, 0) +DECLARE_ANIM(lowkickanim, "LowKick", middleheight, normalattack, 0) +DECLARE_ANIM(sweepanim, "Sweep", lowheight, normalattack, 0) DECLARE_ANIM(sweepreversedanim, "SweepCaught", lowheight, reversed, 0) DECLARE_ANIM(sweepreversalanim, "SweepCatch", middleheight, reversal, 0) DECLARE_ANIM(rabbitkickanim, "RabbitKick", middleheight, normalattack, 0) DECLARE_ANIM(rabbitkickreversedanim, "RabbitKickCaught", middleheight, reversed, 0) DECLARE_ANIM(rabbitkickreversalanim, "RabbitKickCatch", lowheight, reversal, 0) DECLARE_ANIM(upunchanim, "Upunch", middleheight, normalattack, 0) -DECLARE_ANIM(staggerbackhighanim, "Staggerbackhigh", middleheight, neutral, 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, ab_idle) -DECLARE_ANIM(backhandspringanim, "Backhandspring", middleheight, neutral, 0) -DECLARE_ANIM(fightidleanim, "Fightidle", middleheight, neutral, ab_idle) +DECLARE_ANIM(hurtidleanim, "HurtIdle", middleheight, neutral, ab_idle) +DECLARE_ANIM(backhandspringanim, "BackHandspring", middleheight, neutral, 0) +DECLARE_ANIM(fightidleanim, "FightIdle", middleheight, neutral, ab_idle) DECLARE_ANIM(walkanim, "Walk", middleheight, neutral, 0) -DECLARE_ANIM(fightsidestep, "Fightsidestep", middleheight, neutral, ab_idle) +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) -DECLARE_ANIM(drawrightanim, "drawright", middleheight, neutral, 0) -DECLARE_ANIM(knifeslashstartanim, "slashstart", middleheight, normalattack, 0) -DECLARE_ANIM(crouchdrawrightanim, "crouchdrawright", lowheight, neutral, 0) -DECLARE_ANIM(crouchstabanim, "crouchstab", lowheight, normalattack, 0) -DECLARE_ANIM(knifefollowanim, "slashfollow", middleheight, reversal, 0) -DECLARE_ANIM(knifefollowedanim, "slashfollowed", middleheight, reversed, 0) -DECLARE_ANIM(knifethrowanim, "knifethrow", middleheight, normalattack, 0) -DECLARE_ANIM(removeknifeanim, "removeknife", middleheight, neutral, 0) -DECLARE_ANIM(crouchremoveknifeanim, "crouchremoveknife", lowheight, neutral, 0) +DECLARE_ANIM(sneakattackanim, "SneakAttack", middleheight, reversal, 0) +DECLARE_ANIM(sneakattackedanim, "SneakAttacked", middleheight, reversed, 0) +DECLARE_ANIM(drawrightanim, "DrawRight", middleheight, neutral, 0) +DECLARE_ANIM(knifeslashstartanim, "SlashStart", middleheight, normalattack, 0) +DECLARE_ANIM(crouchdrawrightanim, "CrouchDrawRight", lowheight, neutral, 0) +DECLARE_ANIM(crouchstabanim, "CrouchStab", lowheight, normalattack, 0) +DECLARE_ANIM(knifefollowanim, "SlashFollow", middleheight, reversal, 0) +DECLARE_ANIM(knifefollowedanim, "SlashFollowed", middleheight, reversed, 0) +DECLARE_ANIM(knifethrowanim, "KnifeThrow", middleheight, normalattack, 0) +DECLARE_ANIM(removeknifeanim, "RemoveKnife", middleheight, neutral, 0) +DECLARE_ANIM(crouchremoveknifeanim, "CrouchRemoveKnife", lowheight, neutral, 0) DECLARE_ANIM(jumpreversedanim, "JumpCaught", middleheight, reversed, 0) DECLARE_ANIM(jumpreversalanim, "JumpCatch", middleheight, reversal, 0) -DECLARE_ANIM(staggerbackhardanim, "Staggerbackhard", middleheight, neutral, 0) -DECLARE_ANIM(dropkickanim, "Dropkick", middleheight, normalattack, 0) -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, ab_idle) -DECLARE_ANIM(knifesneakattackanim, "Knifesneakattack", middleheight, reversal, 0) -DECLARE_ANIM(knifesneakattackedanim, "Knifesneakattacked", middleheight, reversed, 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) -DECLARE_ANIM(dodgebackanim, "dodgeback", middleheight, neutral, 0) -DECLARE_ANIM(swordsneakattackanim, "Swordsneakattack", middleheight, reversal, 0) -DECLARE_ANIM(swordsneakattackedanim, "Swordsneakattacked", middleheight, reversed, 0) -DECLARE_ANIM(swordslashreversedanim, "swordslashCaught", middleheight, reversed, 0) -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, ab_idle) -DECLARE_ANIM(swordslashparryanim, "sworduprightparry", middleheight, normalattack, 0) -DECLARE_ANIM(swordslashparriedanim, "swordslashparried", middleheight, normalattack, 0) -DECLARE_ANIM(wolfidle, "Wolfidle", middleheight, neutral, ab_idle) -DECLARE_ANIM(wolfcrouchanim, "Wolfcrouch", lowheight, neutral, ab_crouch) -DECLARE_ANIM(wolflandanim, "Wolflanding", lowheight, neutral, 0) -DECLARE_ANIM(wolflandhardanim, "Wolflandhard", lowheight, neutral, 0) -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, 0) -DECLARE_ANIM(rabbittackleanim, "Rabbittackle", middleheight, neutral, 0) -DECLARE_ANIM(rabbittacklinganim, "Rabbittackling", middleheight, reversal, 0) -DECLARE_ANIM(rabbittackledbackanim, "Rabbittackledback", middleheight, reversed, 0) -DECLARE_ANIM(rabbittackledfrontanim, "Rabbittackledfront", middleheight, reversed, 0) -DECLARE_ANIM(wolfslapanim, "Wolfslap", middleheight, normalattack, 0) +DECLARE_ANIM(staggerbackhardanim, "StaggerBackHard", middleheight, neutral, 0) +DECLARE_ANIM(dropkickanim, "DropKick", middleheight, normalattack, 0) +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, 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, ab_idle) +DECLARE_ANIM(drawleftanim, "DrawLeft", middleheight, neutral, 0) +DECLARE_ANIM(swordslashanim, "SwordSlash", middleheight, normalattack, 0) +DECLARE_ANIM(swordgroundstabanim, "SwordGroundStab", lowheight, normalattack, 0) +DECLARE_ANIM(dodgebackanim, "DodgeBack", middleheight, neutral, 0) +DECLARE_ANIM(swordsneakattackanim, "SwordSneakAttack", middleheight, reversal, 0) +DECLARE_ANIM(swordsneakattackedanim, "SwordSneakAttacked", middleheight, reversed, 0) +DECLARE_ANIM(swordslashreversedanim, "SwordSlashCaught", middleheight, reversed, 0) +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, ab_idle) +DECLARE_ANIM(swordslashparryanim, "SwordUprightParry", middleheight, normalattack, 0) +DECLARE_ANIM(swordslashparriedanim, "SwordSlashParried", middleheight, normalattack, 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) +DECLARE_ANIM(rabbittackledfrontanim, "RabbitTackledFront", middleheight, reversed, 0) +DECLARE_ANIM(wolfslapanim, "WolfSlap", middleheight, normalattack, 0) DECLARE_ANIM(staffhitanim, "StaffHit", middleheight, normalattack, 0) DECLARE_ANIM(staffgroundsmashanim, "StaffGroundSmash", lowheight, normalattack, 0) -DECLARE_ANIM(staffspinhitanim, "Spinwhack", middleheight, normalattack, 0) +DECLARE_ANIM(staffspinhitanim, "SpinWhack", middleheight, normalattack, 0) DECLARE_ANIM(staffhitreversedanim, "StaffHitCaught", middleheight, reversed, 0) DECLARE_ANIM(staffhitreversalanim, "StaffHitCatch", middleheight, reversal, 0) DECLARE_ANIM(staffspinhitreversedanim, "SpinWhackCaught", middleheight, reversed, 0)