From: RĂ©mi Verschelde Date: Sun, 4 Dec 2016 00:28:26 +0000 (+0100) Subject: Data files use title case consistently X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=71a5b4590a18bf663b97b8a52078754899dcf345;p=lugaru.git Data files use title case consistently The data lookup is now case sensitive, so we make it so that all files use a title case (e.g. ShirtFemale.png). Caveat: Paths to clothes are hardcoded in every binary level file as :Data:Textures:shirtfemale.png or similar, they need to be fixed somehow. --- diff --git a/CONTENT-LICENSE.txt b/CONTENT-LICENSE.txt index f2de889..75d1405 100644 --- a/CONTENT-LICENSE.txt +++ b/CONTENT-LICENSE.txt @@ -20,9 +20,9 @@ Data/Campaign/temple.txt Data/Maps/sven* -Data/Textures/Desertcl.png +Data/Textures/DesertCl.png Data/Textures/GiTop.png Data/Textures/GiTeared.png Data/Textures/GiBottom.png -Data/Textures/mask.png +Data/Textures/Mask.png Data/Textures/temple/World.png diff --git a/Data/Animations/BackFlip b/Data/Animations/BackFlip new file mode 100644 index 0000000..408e59a Binary files /dev/null and b/Data/Animations/BackFlip differ diff --git a/Data/Animations/BackHandspring b/Data/Animations/BackHandspring new file mode 100644 index 0000000..0e287ee Binary files /dev/null and b/Data/Animations/BackHandspring differ diff --git a/Data/Animations/Backflip b/Data/Animations/Backflip deleted file mode 100644 index 408e59a..0000000 Binary files a/Data/Animations/Backflip and /dev/null differ diff --git a/Data/Animations/Backhandspring b/Data/Animations/Backhandspring deleted file mode 100644 index 0e287ee..0000000 Binary files a/Data/Animations/Backhandspring and /dev/null differ diff --git a/Data/Animations/BlockHighLeft b/Data/Animations/BlockHighLeft new file mode 100644 index 0000000..c05a21a Binary files /dev/null and b/Data/Animations/BlockHighLeft differ diff --git a/Data/Animations/BlockHighLeftStrike b/Data/Animations/BlockHighLeftStrike new file mode 100644 index 0000000..23128e3 Binary files /dev/null and b/Data/Animations/BlockHighLeftStrike differ diff --git a/Data/Animations/Blockhighleft b/Data/Animations/Blockhighleft deleted file mode 100644 index c05a21a..0000000 Binary files a/Data/Animations/Blockhighleft and /dev/null differ diff --git a/Data/Animations/Blockhighleftstrike b/Data/Animations/Blockhighleftstrike deleted file mode 100644 index 23128e3..0000000 Binary files a/Data/Animations/Blockhighleftstrike and /dev/null differ diff --git a/Data/Animations/CrouchDrawRight b/Data/Animations/CrouchDrawRight new file mode 100644 index 0000000..1b92c67 Binary files /dev/null and b/Data/Animations/CrouchDrawRight differ diff --git a/Data/Animations/CrouchRemoveKnife b/Data/Animations/CrouchRemoveKnife new file mode 100644 index 0000000..e7906aa Binary files /dev/null and b/Data/Animations/CrouchRemoveKnife differ diff --git a/Data/Animations/CrouchStab b/Data/Animations/CrouchStab new file mode 100644 index 0000000..9611293 Binary files /dev/null and b/Data/Animations/CrouchStab differ diff --git a/Data/Animations/Crouchdrawright b/Data/Animations/Crouchdrawright deleted file mode 100644 index 1b92c67..0000000 Binary files a/Data/Animations/Crouchdrawright and /dev/null differ diff --git a/Data/Animations/Crouchremoveknife b/Data/Animations/Crouchremoveknife deleted file mode 100644 index e7906aa..0000000 Binary files a/Data/Animations/Crouchremoveknife and /dev/null differ diff --git a/Data/Animations/Crouchstab b/Data/Animations/Crouchstab deleted file mode 100644 index 9611293..0000000 Binary files a/Data/Animations/Crouchstab and /dev/null differ diff --git a/Data/Animations/DodgeBack b/Data/Animations/DodgeBack new file mode 100644 index 0000000..c57eb6e Binary files /dev/null and b/Data/Animations/DodgeBack differ diff --git a/Data/Animations/Dodgeback b/Data/Animations/Dodgeback deleted file mode 100644 index c57eb6e..0000000 Binary files a/Data/Animations/Dodgeback and /dev/null differ diff --git a/Data/Animations/DrawLeft b/Data/Animations/DrawLeft new file mode 100644 index 0000000..b530596 Binary files /dev/null and b/Data/Animations/DrawLeft differ diff --git a/Data/Animations/DrawRight b/Data/Animations/DrawRight new file mode 100644 index 0000000..95cb9d8 Binary files /dev/null and b/Data/Animations/DrawRight differ diff --git a/Data/Animations/Drawleft b/Data/Animations/Drawleft deleted file mode 100644 index b530596..0000000 Binary files a/Data/Animations/Drawleft and /dev/null differ diff --git a/Data/Animations/Drawright b/Data/Animations/Drawright deleted file mode 100644 index 95cb9d8..0000000 Binary files a/Data/Animations/Drawright and /dev/null differ diff --git a/Data/Animations/DropKick b/Data/Animations/DropKick new file mode 100644 index 0000000..8b5e94a Binary files /dev/null and b/Data/Animations/DropKick differ diff --git a/Data/Animations/Dropkick b/Data/Animations/Dropkick deleted file mode 100644 index 8b5e94a..0000000 Binary files a/Data/Animations/Dropkick and /dev/null differ diff --git a/Data/Animations/Dropkickold b/Data/Animations/Dropkickold deleted file mode 100644 index 0a4ff61..0000000 Binary files a/Data/Animations/Dropkickold and /dev/null differ diff --git a/Data/Animations/FightIdle b/Data/Animations/FightIdle new file mode 100644 index 0000000..50e9074 Binary files /dev/null and b/Data/Animations/FightIdle differ diff --git a/Data/Animations/FightSideStep b/Data/Animations/FightSideStep new file mode 100644 index 0000000..25ba189 Binary files /dev/null and b/Data/Animations/FightSideStep differ diff --git a/Data/Animations/Fightidle b/Data/Animations/Fightidle deleted file mode 100644 index 50e9074..0000000 Binary files a/Data/Animations/Fightidle and /dev/null differ diff --git a/Data/Animations/Fightsidestep b/Data/Animations/Fightsidestep deleted file mode 100644 index 25ba189..0000000 Binary files a/Data/Animations/Fightsidestep and /dev/null differ diff --git a/Data/Animations/GetUpFromBack b/Data/Animations/GetUpFromBack new file mode 100644 index 0000000..955a439 Binary files /dev/null and b/Data/Animations/GetUpFromBack differ diff --git a/Data/Animations/GetUpFromFront b/Data/Animations/GetUpFromFront new file mode 100644 index 0000000..e3c5919 Binary files /dev/null and b/Data/Animations/GetUpFromFront differ diff --git a/Data/Animations/Getupfromback b/Data/Animations/Getupfromback deleted file mode 100644 index 955a439..0000000 Binary files a/Data/Animations/Getupfromback and /dev/null differ diff --git a/Data/Animations/Getupfromfront b/Data/Animations/Getupfromfront deleted file mode 100644 index e3c5919..0000000 Binary files a/Data/Animations/Getupfromfront and /dev/null differ diff --git a/Data/Animations/HangOn b/Data/Animations/HangOn new file mode 100644 index 0000000..39d2f18 Binary files /dev/null and b/Data/Animations/HangOn differ diff --git a/Data/Animations/Hangon b/Data/Animations/Hangon deleted file mode 100644 index 39d2f18..0000000 Binary files a/Data/Animations/Hangon and /dev/null differ diff --git a/Data/Animations/HurtIdle b/Data/Animations/HurtIdle new file mode 100644 index 0000000..77ec5e7 Binary files /dev/null and b/Data/Animations/HurtIdle differ diff --git a/Data/Animations/Hurtidle b/Data/Animations/Hurtidle deleted file mode 100644 index 77ec5e7..0000000 Binary files a/Data/Animations/Hurtidle and /dev/null differ diff --git a/Data/Animations/JumpCatch b/Data/Animations/JumpCatch new file mode 100644 index 0000000..815b1f9 Binary files /dev/null and b/Data/Animations/JumpCatch differ diff --git a/Data/Animations/JumpCaught b/Data/Animations/JumpCaught new file mode 100644 index 0000000..5475935 Binary files /dev/null and b/Data/Animations/JumpCaught differ diff --git a/Data/Animations/Jumpcatch b/Data/Animations/Jumpcatch deleted file mode 100644 index 815b1f9..0000000 Binary files a/Data/Animations/Jumpcatch and /dev/null differ diff --git a/Data/Animations/Jumpcaught b/Data/Animations/Jumpcaught deleted file mode 100644 index 5475935..0000000 Binary files a/Data/Animations/Jumpcaught and /dev/null differ diff --git a/Data/Animations/KnifeFightIdle b/Data/Animations/KnifeFightIdle new file mode 100644 index 0000000..2f609c0 Binary files /dev/null and b/Data/Animations/KnifeFightIdle differ diff --git a/Data/Animations/KnifeSlashCatch b/Data/Animations/KnifeSlashCatch new file mode 100644 index 0000000..c620b0e Binary files /dev/null and b/Data/Animations/KnifeSlashCatch differ diff --git a/Data/Animations/KnifeSlashCaught b/Data/Animations/KnifeSlashCaught new file mode 100644 index 0000000..358666f Binary files /dev/null and b/Data/Animations/KnifeSlashCaught differ diff --git a/Data/Animations/KnifeSneakAttack b/Data/Animations/KnifeSneakAttack new file mode 100644 index 0000000..c7e6fb0 Binary files /dev/null and b/Data/Animations/KnifeSneakAttack differ diff --git a/Data/Animations/KnifeSneakAttacked b/Data/Animations/KnifeSneakAttacked new file mode 100644 index 0000000..df8305d Binary files /dev/null and b/Data/Animations/KnifeSneakAttacked differ diff --git a/Data/Animations/KnifeThrow b/Data/Animations/KnifeThrow new file mode 100644 index 0000000..c8d952f Binary files /dev/null and b/Data/Animations/KnifeThrow differ diff --git a/Data/Animations/Knifefightidle b/Data/Animations/Knifefightidle deleted file mode 100644 index 2f609c0..0000000 Binary files a/Data/Animations/Knifefightidle and /dev/null differ diff --git a/Data/Animations/Knifeslashcatch b/Data/Animations/Knifeslashcatch deleted file mode 100644 index c620b0e..0000000 Binary files a/Data/Animations/Knifeslashcatch and /dev/null differ diff --git a/Data/Animations/Knifeslashcaught b/Data/Animations/Knifeslashcaught deleted file mode 100644 index 358666f..0000000 Binary files a/Data/Animations/Knifeslashcaught and /dev/null differ diff --git a/Data/Animations/Knifesneakattack b/Data/Animations/Knifesneakattack deleted file mode 100644 index c7e6fb0..0000000 Binary files a/Data/Animations/Knifesneakattack and /dev/null differ diff --git a/Data/Animations/Knifesneakattacked b/Data/Animations/Knifesneakattacked deleted file mode 100644 index df8305d..0000000 Binary files a/Data/Animations/Knifesneakattacked and /dev/null differ diff --git a/Data/Animations/Knifethrow b/Data/Animations/Knifethrow deleted file mode 100644 index c8d952f..0000000 Binary files a/Data/Animations/Knifethrow and /dev/null differ diff --git a/Data/Animations/LandHard b/Data/Animations/LandHard new file mode 100644 index 0000000..1d82862 Binary files /dev/null and b/Data/Animations/LandHard differ diff --git a/Data/Animations/Landhard b/Data/Animations/Landhard deleted file mode 100644 index 1d82862..0000000 Binary files a/Data/Animations/Landhard and /dev/null differ diff --git a/Data/Animations/LeftFlip b/Data/Animations/LeftFlip new file mode 100644 index 0000000..6373ea2 Binary files /dev/null and b/Data/Animations/LeftFlip differ diff --git a/Data/Animations/Leftflip b/Data/Animations/Leftflip deleted file mode 100644 index 6373ea2..0000000 Binary files a/Data/Animations/Leftflip and /dev/null differ diff --git a/Data/Animations/LowKick b/Data/Animations/LowKick new file mode 100644 index 0000000..073cef8 Binary files /dev/null and b/Data/Animations/LowKick differ diff --git a/Data/Animations/Lowkick b/Data/Animations/Lowkick deleted file mode 100644 index 073cef8..0000000 Binary files a/Data/Animations/Lowkick and /dev/null differ diff --git a/Data/Animations/RabbitKick b/Data/Animations/RabbitKick new file mode 100644 index 0000000..627816c Binary files /dev/null and b/Data/Animations/RabbitKick differ diff --git a/Data/Animations/RabbitKickCatch b/Data/Animations/RabbitKickCatch new file mode 100644 index 0000000..6203b69 Binary files /dev/null and b/Data/Animations/RabbitKickCatch differ diff --git a/Data/Animations/RabbitKickCaught b/Data/Animations/RabbitKickCaught new file mode 100644 index 0000000..593af45 Binary files /dev/null and b/Data/Animations/RabbitKickCaught differ diff --git a/Data/Animations/RabbitRunning b/Data/Animations/RabbitRunning new file mode 100644 index 0000000..290d76f Binary files /dev/null and b/Data/Animations/RabbitRunning differ diff --git a/Data/Animations/RabbitTackle b/Data/Animations/RabbitTackle new file mode 100644 index 0000000..d1ef126 Binary files /dev/null and b/Data/Animations/RabbitTackle differ diff --git a/Data/Animations/RabbitTackledBack b/Data/Animations/RabbitTackledBack new file mode 100644 index 0000000..c997944 Binary files /dev/null and b/Data/Animations/RabbitTackledBack differ diff --git a/Data/Animations/RabbitTackledFront b/Data/Animations/RabbitTackledFront new file mode 100644 index 0000000..ade389f Binary files /dev/null and b/Data/Animations/RabbitTackledFront differ diff --git a/Data/Animations/RabbitTackling b/Data/Animations/RabbitTackling new file mode 100644 index 0000000..a17ac99 Binary files /dev/null and b/Data/Animations/RabbitTackling differ diff --git a/Data/Animations/Rabbitkick b/Data/Animations/Rabbitkick deleted file mode 100644 index 627816c..0000000 Binary files a/Data/Animations/Rabbitkick and /dev/null differ diff --git a/Data/Animations/Rabbitkickcatch b/Data/Animations/Rabbitkickcatch deleted file mode 100644 index 6203b69..0000000 Binary files a/Data/Animations/Rabbitkickcatch and /dev/null differ diff --git a/Data/Animations/Rabbitkickcaught b/Data/Animations/Rabbitkickcaught deleted file mode 100644 index 593af45..0000000 Binary files a/Data/Animations/Rabbitkickcaught and /dev/null differ diff --git a/Data/Animations/Rabbitrunning b/Data/Animations/Rabbitrunning deleted file mode 100644 index 290d76f..0000000 Binary files a/Data/Animations/Rabbitrunning and /dev/null differ diff --git a/Data/Animations/Rabbittackle b/Data/Animations/Rabbittackle deleted file mode 100644 index d1ef126..0000000 Binary files a/Data/Animations/Rabbittackle and /dev/null differ diff --git a/Data/Animations/Rabbittackledback b/Data/Animations/Rabbittackledback deleted file mode 100644 index c997944..0000000 Binary files a/Data/Animations/Rabbittackledback and /dev/null differ diff --git a/Data/Animations/Rabbittackledfront b/Data/Animations/Rabbittackledfront deleted file mode 100644 index ade389f..0000000 Binary files a/Data/Animations/Rabbittackledfront and /dev/null differ diff --git a/Data/Animations/Rabbittackling b/Data/Animations/Rabbittackling deleted file mode 100644 index a17ac99..0000000 Binary files a/Data/Animations/Rabbittackling and /dev/null differ diff --git a/Data/Animations/RemoveKnife b/Data/Animations/RemoveKnife new file mode 100644 index 0000000..e76c168 Binary files /dev/null and b/Data/Animations/RemoveKnife differ diff --git a/Data/Animations/Removeknife b/Data/Animations/Removeknife deleted file mode 100644 index e76c168..0000000 Binary files a/Data/Animations/Removeknife and /dev/null differ diff --git a/Data/Animations/RightFlip b/Data/Animations/RightFlip new file mode 100644 index 0000000..56f729b Binary files /dev/null and b/Data/Animations/RightFlip differ diff --git a/Data/Animations/Rightflip b/Data/Animations/Rightflip deleted file mode 100644 index 56f729b..0000000 Binary files a/Data/Animations/Rightflip and /dev/null differ diff --git a/Data/Animations/SlashFollow b/Data/Animations/SlashFollow new file mode 100644 index 0000000..d695523 Binary files /dev/null and b/Data/Animations/SlashFollow differ diff --git a/Data/Animations/SlashFollowed b/Data/Animations/SlashFollowed new file mode 100644 index 0000000..4a60e60 Binary files /dev/null and b/Data/Animations/SlashFollowed differ diff --git a/Data/Animations/SlashStart b/Data/Animations/SlashStart new file mode 100644 index 0000000..1104bbd Binary files /dev/null and b/Data/Animations/SlashStart differ diff --git a/Data/Animations/Slashfollow b/Data/Animations/Slashfollow deleted file mode 100644 index d695523..0000000 Binary files a/Data/Animations/Slashfollow and /dev/null differ diff --git a/Data/Animations/Slashfollowed b/Data/Animations/Slashfollowed deleted file mode 100644 index 4a60e60..0000000 Binary files a/Data/Animations/Slashfollowed and /dev/null differ diff --git a/Data/Animations/Slashstart b/Data/Animations/Slashstart deleted file mode 100644 index 1104bbd..0000000 Binary files a/Data/Animations/Slashstart and /dev/null differ diff --git a/Data/Animations/SneakAttack b/Data/Animations/SneakAttack new file mode 100644 index 0000000..3772b89 Binary files /dev/null and b/Data/Animations/SneakAttack differ diff --git a/Data/Animations/SneakAttacked b/Data/Animations/SneakAttacked new file mode 100644 index 0000000..a5a35ae Binary files /dev/null and b/Data/Animations/SneakAttacked differ diff --git a/Data/Animations/Sneakattack b/Data/Animations/Sneakattack deleted file mode 100644 index 3772b89..0000000 Binary files a/Data/Animations/Sneakattack and /dev/null differ diff --git a/Data/Animations/Sneakattacked b/Data/Animations/Sneakattacked deleted file mode 100644 index a5a35ae..0000000 Binary files a/Data/Animations/Sneakattacked and /dev/null differ diff --git a/Data/Animations/SpinKick b/Data/Animations/SpinKick new file mode 100644 index 0000000..8ae4ac6 Binary files /dev/null and b/Data/Animations/SpinKick differ diff --git a/Data/Animations/SpinKickCatch b/Data/Animations/SpinKickCatch new file mode 100644 index 0000000..6a68202 Binary files /dev/null and b/Data/Animations/SpinKickCatch differ diff --git a/Data/Animations/SpinKickCaught b/Data/Animations/SpinKickCaught new file mode 100644 index 0000000..0ad5a3d Binary files /dev/null and b/Data/Animations/SpinKickCaught differ diff --git a/Data/Animations/SpinWhack b/Data/Animations/SpinWhack new file mode 100644 index 0000000..3247455 Binary files /dev/null and b/Data/Animations/SpinWhack differ diff --git a/Data/Animations/SpinWhackCatch b/Data/Animations/SpinWhackCatch new file mode 100644 index 0000000..77f319e Binary files /dev/null and b/Data/Animations/SpinWhackCatch differ diff --git a/Data/Animations/SpinWhackCaught b/Data/Animations/SpinWhackCaught new file mode 100644 index 0000000..85a19b5 Binary files /dev/null and b/Data/Animations/SpinWhackCaught differ diff --git a/Data/Animations/Spinkick b/Data/Animations/Spinkick deleted file mode 100644 index 8ae4ac6..0000000 Binary files a/Data/Animations/Spinkick and /dev/null differ diff --git a/Data/Animations/Spinkickcatch b/Data/Animations/Spinkickcatch deleted file mode 100644 index 6a68202..0000000 Binary files a/Data/Animations/Spinkickcatch and /dev/null differ diff --git a/Data/Animations/Spinkickcaught b/Data/Animations/Spinkickcaught deleted file mode 100644 index 0ad5a3d..0000000 Binary files a/Data/Animations/Spinkickcaught and /dev/null differ diff --git a/Data/Animations/Spinwhack b/Data/Animations/Spinwhack deleted file mode 100644 index 3247455..0000000 Binary files a/Data/Animations/Spinwhack and /dev/null differ diff --git a/Data/Animations/Spinwhackcatch b/Data/Animations/Spinwhackcatch deleted file mode 100644 index 77f319e..0000000 Binary files a/Data/Animations/Spinwhackcatch and /dev/null differ diff --git a/Data/Animations/Spinwhackcaught b/Data/Animations/Spinwhackcaught deleted file mode 100644 index 85a19b5..0000000 Binary files a/Data/Animations/Spinwhackcaught and /dev/null differ diff --git a/Data/Animations/StaffHitCatch b/Data/Animations/StaffHitCatch new file mode 100644 index 0000000..950ea25 Binary files /dev/null and b/Data/Animations/StaffHitCatch differ diff --git a/Data/Animations/StaffHitCaught b/Data/Animations/StaffHitCaught new file mode 100644 index 0000000..e3a226b Binary files /dev/null and b/Data/Animations/StaffHitCaught differ diff --git a/Data/Animations/Staffhitcatch b/Data/Animations/Staffhitcatch deleted file mode 100644 index 950ea25..0000000 Binary files a/Data/Animations/Staffhitcatch and /dev/null differ diff --git a/Data/Animations/Staffhitcaught b/Data/Animations/Staffhitcaught deleted file mode 100644 index e3a226b..0000000 Binary files a/Data/Animations/Staffhitcaught and /dev/null differ diff --git a/Data/Animations/StaggerBackHard b/Data/Animations/StaggerBackHard new file mode 100644 index 0000000..5481841 Binary files /dev/null and b/Data/Animations/StaggerBackHard differ diff --git a/Data/Animations/StaggerBackHigh b/Data/Animations/StaggerBackHigh new file mode 100644 index 0000000..407a141 Binary files /dev/null and b/Data/Animations/StaggerBackHigh differ diff --git a/Data/Animations/Staggerbackhard b/Data/Animations/Staggerbackhard deleted file mode 100644 index 5481841..0000000 Binary files a/Data/Animations/Staggerbackhard and /dev/null differ diff --git a/Data/Animations/Staggerbackhigh b/Data/Animations/Staggerbackhigh deleted file mode 100644 index 407a141..0000000 Binary files a/Data/Animations/Staggerbackhigh and /dev/null differ diff --git a/Data/Animations/SweepCatch b/Data/Animations/SweepCatch new file mode 100644 index 0000000..e40c83a Binary files /dev/null and b/Data/Animations/SweepCatch differ diff --git a/Data/Animations/SweepCaught b/Data/Animations/SweepCaught new file mode 100644 index 0000000..c1a675f Binary files /dev/null and b/Data/Animations/SweepCaught differ diff --git a/Data/Animations/Sweepcatch b/Data/Animations/Sweepcatch deleted file mode 100644 index e40c83a..0000000 Binary files a/Data/Animations/Sweepcatch and /dev/null differ diff --git a/Data/Animations/Sweepcaught b/Data/Animations/Sweepcaught deleted file mode 100644 index c1a675f..0000000 Binary files a/Data/Animations/Sweepcaught and /dev/null differ diff --git a/Data/Animations/SwordFightIdle b/Data/Animations/SwordFightIdle new file mode 100644 index 0000000..783516e Binary files /dev/null and b/Data/Animations/SwordFightIdle differ diff --git a/Data/Animations/SwordFightIdleBoth b/Data/Animations/SwordFightIdleBoth new file mode 100644 index 0000000..9db4a9f Binary files /dev/null and b/Data/Animations/SwordFightIdleBoth differ diff --git a/Data/Animations/SwordGroundStab b/Data/Animations/SwordGroundStab new file mode 100644 index 0000000..2e6c87d Binary files /dev/null and b/Data/Animations/SwordGroundStab differ diff --git a/Data/Animations/SwordSlash b/Data/Animations/SwordSlash new file mode 100644 index 0000000..df18618 Binary files /dev/null and b/Data/Animations/SwordSlash differ diff --git a/Data/Animations/SwordSlashCatch b/Data/Animations/SwordSlashCatch new file mode 100644 index 0000000..5812443 Binary files /dev/null and b/Data/Animations/SwordSlashCatch differ diff --git a/Data/Animations/SwordSlashCaught b/Data/Animations/SwordSlashCaught new file mode 100644 index 0000000..9cf31e2 Binary files /dev/null and b/Data/Animations/SwordSlashCaught differ diff --git a/Data/Animations/SwordSlashParried b/Data/Animations/SwordSlashParried new file mode 100644 index 0000000..fe33f9e Binary files /dev/null and b/Data/Animations/SwordSlashParried differ diff --git a/Data/Animations/SwordSneakAttack b/Data/Animations/SwordSneakAttack new file mode 100644 index 0000000..1bc2954 Binary files /dev/null and b/Data/Animations/SwordSneakAttack differ diff --git a/Data/Animations/SwordSneakAttacked b/Data/Animations/SwordSneakAttacked new file mode 100644 index 0000000..df8305d Binary files /dev/null and b/Data/Animations/SwordSneakAttacked differ diff --git a/Data/Animations/SwordUprightParry b/Data/Animations/SwordUprightParry new file mode 100644 index 0000000..aa15955 Binary files /dev/null and b/Data/Animations/SwordUprightParry differ diff --git a/Data/Animations/Swordfightidle b/Data/Animations/Swordfightidle deleted file mode 100644 index 783516e..0000000 Binary files a/Data/Animations/Swordfightidle and /dev/null differ diff --git a/Data/Animations/Swordfightidleboth b/Data/Animations/Swordfightidleboth deleted file mode 100644 index 9db4a9f..0000000 Binary files a/Data/Animations/Swordfightidleboth and /dev/null differ diff --git a/Data/Animations/Swordgroundstab b/Data/Animations/Swordgroundstab deleted file mode 100644 index 2e6c87d..0000000 Binary files a/Data/Animations/Swordgroundstab and /dev/null differ diff --git a/Data/Animations/Swordslash b/Data/Animations/Swordslash deleted file mode 100644 index df18618..0000000 Binary files a/Data/Animations/Swordslash and /dev/null differ diff --git a/Data/Animations/Swordslashcatch b/Data/Animations/Swordslashcatch deleted file mode 100644 index 5812443..0000000 Binary files a/Data/Animations/Swordslashcatch and /dev/null differ diff --git a/Data/Animations/Swordslashcaught b/Data/Animations/Swordslashcaught deleted file mode 100644 index 9cf31e2..0000000 Binary files a/Data/Animations/Swordslashcaught and /dev/null differ diff --git a/Data/Animations/Swordslashparried b/Data/Animations/Swordslashparried deleted file mode 100644 index fe33f9e..0000000 Binary files a/Data/Animations/Swordslashparried and /dev/null differ diff --git a/Data/Animations/Swordsneakattack b/Data/Animations/Swordsneakattack deleted file mode 100644 index 1bc2954..0000000 Binary files a/Data/Animations/Swordsneakattack and /dev/null differ diff --git a/Data/Animations/Swordsneakattacked b/Data/Animations/Swordsneakattacked deleted file mode 100644 index df8305d..0000000 Binary files a/Data/Animations/Swordsneakattacked and /dev/null differ diff --git a/Data/Animations/Sworduprightparry b/Data/Animations/Sworduprightparry deleted file mode 100644 index aa15955..0000000 Binary files a/Data/Animations/Sworduprightparry and /dev/null differ diff --git a/Data/Animations/Upunch b/Data/Animations/Upunch new file mode 100644 index 0000000..830e8d2 Binary files /dev/null and b/Data/Animations/Upunch differ diff --git a/Data/Animations/UpunchCatch b/Data/Animations/UpunchCatch new file mode 100644 index 0000000..859cea4 Binary files /dev/null and b/Data/Animations/UpunchCatch differ diff --git a/Data/Animations/UpunchCaught b/Data/Animations/UpunchCaught new file mode 100644 index 0000000..9dbfc35 Binary files /dev/null and b/Data/Animations/UpunchCaught differ diff --git a/Data/Animations/WallJumpBack b/Data/Animations/WallJumpBack new file mode 100644 index 0000000..72a9670 Binary files /dev/null and b/Data/Animations/WallJumpBack differ diff --git a/Data/Animations/WallJumpFront b/Data/Animations/WallJumpFront new file mode 100644 index 0000000..da66a61 Binary files /dev/null and b/Data/Animations/WallJumpFront differ diff --git a/Data/Animations/WallJumpLeft b/Data/Animations/WallJumpLeft new file mode 100644 index 0000000..cfe324e Binary files /dev/null and b/Data/Animations/WallJumpLeft differ diff --git a/Data/Animations/WallJumpLeftKick b/Data/Animations/WallJumpLeftKick new file mode 100644 index 0000000..bc162d3 Binary files /dev/null and b/Data/Animations/WallJumpLeftKick differ diff --git a/Data/Animations/WallJumpRight b/Data/Animations/WallJumpRight new file mode 100644 index 0000000..b1a9180 Binary files /dev/null and b/Data/Animations/WallJumpRight differ diff --git a/Data/Animations/WallJumpRightKick b/Data/Animations/WallJumpRightKick new file mode 100644 index 0000000..168b001 Binary files /dev/null and b/Data/Animations/WallJumpRightKick differ diff --git a/Data/Animations/Walljumpback b/Data/Animations/Walljumpback deleted file mode 100644 index 72a9670..0000000 Binary files a/Data/Animations/Walljumpback and /dev/null differ diff --git a/Data/Animations/Walljumpfront b/Data/Animations/Walljumpfront deleted file mode 100644 index da66a61..0000000 Binary files a/Data/Animations/Walljumpfront and /dev/null differ diff --git a/Data/Animations/Walljumpleft b/Data/Animations/Walljumpleft deleted file mode 100644 index cfe324e..0000000 Binary files a/Data/Animations/Walljumpleft and /dev/null differ diff --git a/Data/Animations/Walljumpleftkick b/Data/Animations/Walljumpleftkick deleted file mode 100644 index bc162d3..0000000 Binary files a/Data/Animations/Walljumpleftkick and /dev/null differ diff --git a/Data/Animations/Walljumpright b/Data/Animations/Walljumpright deleted file mode 100644 index b1a9180..0000000 Binary files a/Data/Animations/Walljumpright and /dev/null differ diff --git a/Data/Animations/Walljumprightkick b/Data/Animations/Walljumprightkick deleted file mode 100644 index 168b001..0000000 Binary files a/Data/Animations/Walljumprightkick and /dev/null differ diff --git a/Data/Animations/WindUpPunch b/Data/Animations/WindUpPunch new file mode 100644 index 0000000..57f84ab Binary files /dev/null and b/Data/Animations/WindUpPunch differ diff --git a/Data/Animations/WindUpPunchBlocked b/Data/Animations/WindUpPunchBlocked new file mode 100644 index 0000000..2b2cb60 Binary files /dev/null and b/Data/Animations/WindUpPunchBlocked differ diff --git a/Data/Animations/Winduppunch b/Data/Animations/Winduppunch deleted file mode 100644 index 57f84ab..0000000 Binary files a/Data/Animations/Winduppunch and /dev/null differ diff --git a/Data/Animations/Winduppunchblocked b/Data/Animations/Winduppunchblocked deleted file mode 100644 index 2b2cb60..0000000 Binary files a/Data/Animations/Winduppunchblocked and /dev/null differ diff --git a/Data/Animations/WolfCrouch b/Data/Animations/WolfCrouch new file mode 100644 index 0000000..aab67f6 Binary files /dev/null and b/Data/Animations/WolfCrouch differ diff --git a/Data/Animations/WolfIdle b/Data/Animations/WolfIdle new file mode 100644 index 0000000..fe01729 Binary files /dev/null and b/Data/Animations/WolfIdle differ diff --git a/Data/Animations/WolfLandHard b/Data/Animations/WolfLandHard new file mode 100644 index 0000000..45e97dd Binary files /dev/null and b/Data/Animations/WolfLandHard differ diff --git a/Data/Animations/WolfLanding b/Data/Animations/WolfLanding new file mode 100644 index 0000000..cd6a921 Binary files /dev/null and b/Data/Animations/WolfLanding differ diff --git a/Data/Animations/WolfRun b/Data/Animations/WolfRun new file mode 100644 index 0000000..713f3ee Binary files /dev/null and b/Data/Animations/WolfRun differ diff --git a/Data/Animations/WolfRunning b/Data/Animations/WolfRunning new file mode 100644 index 0000000..fb78fa1 Binary files /dev/null and b/Data/Animations/WolfRunning differ diff --git a/Data/Animations/WolfSlap b/Data/Animations/WolfSlap new file mode 100644 index 0000000..4602bf0 Binary files /dev/null and b/Data/Animations/WolfSlap differ diff --git a/Data/Animations/WolfStop b/Data/Animations/WolfStop new file mode 100644 index 0000000..9710bc0 Binary files /dev/null and b/Data/Animations/WolfStop differ diff --git a/Data/Animations/Wolfcrouch b/Data/Animations/Wolfcrouch deleted file mode 100644 index aab67f6..0000000 Binary files a/Data/Animations/Wolfcrouch and /dev/null differ diff --git a/Data/Animations/Wolfidle b/Data/Animations/Wolfidle deleted file mode 100644 index fe01729..0000000 Binary files a/Data/Animations/Wolfidle and /dev/null differ diff --git a/Data/Animations/Wolflandhard b/Data/Animations/Wolflandhard deleted file mode 100644 index 45e97dd..0000000 Binary files a/Data/Animations/Wolflandhard and /dev/null differ diff --git a/Data/Animations/Wolflanding b/Data/Animations/Wolflanding deleted file mode 100644 index cd6a921..0000000 Binary files a/Data/Animations/Wolflanding and /dev/null differ diff --git a/Data/Animations/Wolfrun b/Data/Animations/Wolfrun deleted file mode 100644 index 713f3ee..0000000 Binary files a/Data/Animations/Wolfrun and /dev/null differ diff --git a/Data/Animations/Wolfrunning b/Data/Animations/Wolfrunning deleted file mode 100644 index fb78fa1..0000000 Binary files a/Data/Animations/Wolfrunning and /dev/null differ diff --git a/Data/Animations/Wolfslap b/Data/Animations/Wolfslap deleted file mode 100644 index 4602bf0..0000000 Binary files a/Data/Animations/Wolfslap and /dev/null differ diff --git a/Data/Animations/Wolfstop b/Data/Animations/Wolfstop deleted file mode 100644 index 9710bc0..0000000 Binary files a/Data/Animations/Wolfstop and /dev/null differ diff --git a/Data/Animations/upunch b/Data/Animations/upunch deleted file mode 100644 index 830e8d2..0000000 Binary files a/Data/Animations/upunch and /dev/null differ diff --git a/Data/Animations/upunchcatch b/Data/Animations/upunchcatch deleted file mode 100644 index 859cea4..0000000 Binary files a/Data/Animations/upunchcatch and /dev/null differ diff --git a/Data/Animations/upunchcaught b/Data/Animations/upunchcaught deleted file mode 100644 index 9dbfc35..0000000 Binary files a/Data/Animations/upunchcaught and /dev/null differ diff --git a/Data/Models/BodyLow.solid b/Data/Models/BodyLow.solid new file mode 100644 index 0000000..ddad77a Binary files /dev/null and b/Data/Models/BodyLow.solid differ diff --git a/Data/Models/Bodylow.solid b/Data/Models/Bodylow.solid deleted file mode 100644 index ddad77a..0000000 Binary files a/Data/Models/Bodylow.solid and /dev/null differ diff --git a/Data/Models/Staff.solid b/Data/Models/Staff.solid new file mode 100644 index 0000000..eb576e0 Binary files /dev/null and b/Data/Models/Staff.solid differ diff --git a/Data/Models/ThrowingKnife.solid b/Data/Models/ThrowingKnife.solid new file mode 100644 index 0000000..eb30006 Binary files /dev/null and b/Data/Models/ThrowingKnife.solid differ diff --git a/Data/Models/Throwingknife.solid b/Data/Models/Throwingknife.solid deleted file mode 100644 index eb30006..0000000 Binary files a/Data/Models/Throwingknife.solid and /dev/null differ diff --git a/Data/Models/TreeTrunk.solid b/Data/Models/TreeTrunk.solid new file mode 100644 index 0000000..22aab4c Binary files /dev/null and b/Data/Models/TreeTrunk.solid differ diff --git a/Data/Models/Treetrunk.solid b/Data/Models/Treetrunk.solid deleted file mode 100644 index 22aab4c..0000000 Binary files a/Data/Models/Treetrunk.solid and /dev/null differ diff --git a/Data/Models/WolfLow.solid b/Data/Models/WolfLow.solid new file mode 100644 index 0000000..649829b Binary files /dev/null and b/Data/Models/WolfLow.solid differ diff --git a/Data/Models/Wolflow.solid b/Data/Models/Wolflow.solid deleted file mode 100644 index 649829b..0000000 Binary files a/Data/Models/Wolflow.solid and /dev/null differ diff --git a/Data/Models/staff.solid b/Data/Models/staff.solid deleted file mode 100644 index eb576e0..0000000 Binary files a/Data/Models/staff.solid and /dev/null differ diff --git a/Data/Skeleton/Basic Figure b/Data/Skeleton/Basic Figure deleted file mode 100644 index 0e446e8..0000000 Binary files a/Data/Skeleton/Basic Figure and /dev/null differ diff --git a/Data/Skeleton/Basic Figure wolf b/Data/Skeleton/Basic Figure wolf deleted file mode 100644 index a8a8e61..0000000 Binary files a/Data/Skeleton/Basic Figure wolf and /dev/null differ diff --git a/Data/Skeleton/Basic Figure wolf low b/Data/Skeleton/Basic Figure wolf low deleted file mode 100644 index 3e57771..0000000 Binary files a/Data/Skeleton/Basic Figure wolf low and /dev/null differ diff --git a/Data/Skeleton/Basic Figurelow b/Data/Skeleton/Basic Figurelow deleted file mode 100644 index bfa4f58..0000000 Binary files a/Data/Skeleton/Basic Figurelow and /dev/null differ diff --git a/Data/Skeleton/BasicFigure b/Data/Skeleton/BasicFigure new file mode 100644 index 0000000..0e446e8 Binary files /dev/null and b/Data/Skeleton/BasicFigure differ diff --git a/Data/Skeleton/BasicFigureLow b/Data/Skeleton/BasicFigureLow new file mode 100644 index 0000000..bfa4f58 Binary files /dev/null and b/Data/Skeleton/BasicFigureLow differ diff --git a/Data/Skeleton/BasicFigureWolf b/Data/Skeleton/BasicFigureWolf new file mode 100644 index 0000000..a8a8e61 Binary files /dev/null and b/Data/Skeleton/BasicFigureWolf differ diff --git a/Data/Skeleton/BasicFigureWolfLow b/Data/Skeleton/BasicFigureWolfLow new file mode 100644 index 0000000..3e57771 Binary files /dev/null and b/Data/Skeleton/BasicFigureWolfLow differ diff --git a/Data/Skeleton/RabbitBelt b/Data/Skeleton/RabbitBelt new file mode 100644 index 0000000..067b2e3 Binary files /dev/null and b/Data/Skeleton/RabbitBelt differ diff --git a/Data/Skeleton/Rabbitbelt b/Data/Skeleton/Rabbitbelt deleted file mode 100644 index 067b2e3..0000000 Binary files a/Data/Skeleton/Rabbitbelt and /dev/null differ diff --git a/Data/Sounds/Alarm.ogg b/Data/Sounds/Alarm.ogg new file mode 100644 index 0000000..69ae12b Binary files /dev/null and b/Data/Sounds/Alarm.ogg differ diff --git a/Data/Sounds/BarkGrowl.ogg b/Data/Sounds/BarkGrowl.ogg new file mode 100644 index 0000000..6f34208 Binary files /dev/null and b/Data/Sounds/BarkGrowl.ogg differ diff --git a/Data/Sounds/Barkgrowl.ogg b/Data/Sounds/Barkgrowl.ogg deleted file mode 100644 index 6f34208..0000000 Binary files a/Data/Sounds/Barkgrowl.ogg and /dev/null differ diff --git a/Data/Sounds/Break.ogg b/Data/Sounds/Break.ogg new file mode 100644 index 0000000..37e823c Binary files /dev/null and b/Data/Sounds/Break.ogg differ diff --git a/Data/Sounds/Broken.ogg b/Data/Sounds/Broken.ogg new file mode 100644 index 0000000..496ec3f Binary files /dev/null and b/Data/Sounds/Broken.ogg differ diff --git a/Data/Sounds/BushRustle.ogg b/Data/Sounds/BushRustle.ogg new file mode 100644 index 0000000..7903e98 Binary files /dev/null and b/Data/Sounds/BushRustle.ogg differ diff --git a/Data/Sounds/Clank1.ogg b/Data/Sounds/Clank1.ogg new file mode 100644 index 0000000..35d1caf Binary files /dev/null and b/Data/Sounds/Clank1.ogg differ diff --git a/Data/Sounds/Clank2.ogg b/Data/Sounds/Clank2.ogg new file mode 100644 index 0000000..8f56524 Binary files /dev/null and b/Data/Sounds/Clank2.ogg differ diff --git a/Data/Sounds/Clank3.ogg b/Data/Sounds/Clank3.ogg new file mode 100644 index 0000000..daedaf0 Binary files /dev/null and b/Data/Sounds/Clank3.ogg differ diff --git a/Data/Sounds/Clank4.ogg b/Data/Sounds/Clank4.ogg new file mode 100644 index 0000000..37e0889 Binary files /dev/null and b/Data/Sounds/Clank4.ogg differ diff --git a/Data/Sounds/ClawSlice.ogg b/Data/Sounds/ClawSlice.ogg new file mode 100644 index 0000000..b0d2e03 Binary files /dev/null and b/Data/Sounds/ClawSlice.ogg differ diff --git a/Data/Sounds/ConsoleFail.ogg b/Data/Sounds/ConsoleFail.ogg new file mode 100644 index 0000000..75ed4ae Binary files /dev/null and b/Data/Sounds/ConsoleFail.ogg differ diff --git a/Data/Sounds/ConsoleSuccess.ogg b/Data/Sounds/ConsoleSuccess.ogg new file mode 100644 index 0000000..5b6636b Binary files /dev/null and b/Data/Sounds/ConsoleSuccess.ogg differ diff --git a/Data/Sounds/DesertAmbient.ogg b/Data/Sounds/DesertAmbient.ogg new file mode 100644 index 0000000..c298c79 Binary files /dev/null and b/Data/Sounds/DesertAmbient.ogg differ diff --git a/Data/Sounds/Fire.ogg b/Data/Sounds/Fire.ogg new file mode 100644 index 0000000..f408f53 Binary files /dev/null and b/Data/Sounds/Fire.ogg differ diff --git a/Data/Sounds/FireEnd.ogg b/Data/Sounds/FireEnd.ogg new file mode 100644 index 0000000..9b851ed Binary files /dev/null and b/Data/Sounds/FireEnd.ogg differ diff --git a/Data/Sounds/FireStart.ogg b/Data/Sounds/FireStart.ogg new file mode 100644 index 0000000..d4de596 Binary files /dev/null and b/Data/Sounds/FireStart.ogg differ diff --git a/Data/Sounds/FleshStab.ogg b/Data/Sounds/FleshStab.ogg new file mode 100644 index 0000000..8bc32d4 Binary files /dev/null and b/Data/Sounds/FleshStab.ogg differ diff --git a/Data/Sounds/FleshStabRemove.ogg b/Data/Sounds/FleshStabRemove.ogg new file mode 100644 index 0000000..841d616 Binary files /dev/null and b/Data/Sounds/FleshStabRemove.ogg differ diff --git a/Data/Sounds/Fleshstab.ogg b/Data/Sounds/Fleshstab.ogg deleted file mode 100644 index 8bc32d4..0000000 Binary files a/Data/Sounds/Fleshstab.ogg and /dev/null differ diff --git a/Data/Sounds/Fleshstabremove.ogg b/Data/Sounds/Fleshstabremove.ogg deleted file mode 100644 index 841d616..0000000 Binary files a/Data/Sounds/Fleshstabremove.ogg and /dev/null differ diff --git a/Data/Sounds/FootStepGrass1.ogg b/Data/Sounds/FootStepGrass1.ogg new file mode 100644 index 0000000..fe94732 Binary files /dev/null and b/Data/Sounds/FootStepGrass1.ogg differ diff --git a/Data/Sounds/FootStepGrass2.ogg b/Data/Sounds/FootStepGrass2.ogg new file mode 100644 index 0000000..a02076b Binary files /dev/null and b/Data/Sounds/FootStepGrass2.ogg differ diff --git a/Data/Sounds/FootStepSnow1.ogg b/Data/Sounds/FootStepSnow1.ogg new file mode 100644 index 0000000..61175f2 Binary files /dev/null and b/Data/Sounds/FootStepSnow1.ogg differ diff --git a/Data/Sounds/FootStepSnow2.ogg b/Data/Sounds/FootStepSnow2.ogg new file mode 100644 index 0000000..dbbb31f Binary files /dev/null and b/Data/Sounds/FootStepSnow2.ogg differ diff --git a/Data/Sounds/FootStepStone1.ogg b/Data/Sounds/FootStepStone1.ogg new file mode 100644 index 0000000..869b38f Binary files /dev/null and b/Data/Sounds/FootStepStone1.ogg differ diff --git a/Data/Sounds/FootStepStone2.ogg b/Data/Sounds/FootStepStone2.ogg new file mode 100644 index 0000000..98ca621 Binary files /dev/null and b/Data/Sounds/FootStepStone2.ogg differ diff --git a/Data/Sounds/Hawk.ogg b/Data/Sounds/Hawk.ogg new file mode 100644 index 0000000..beb6a66 Binary files /dev/null and b/Data/Sounds/Hawk.ogg differ diff --git a/Data/Sounds/HeavyImpact.ogg b/Data/Sounds/HeavyImpact.ogg new file mode 100644 index 0000000..362be38 Binary files /dev/null and b/Data/Sounds/HeavyImpact.ogg differ diff --git a/Data/Sounds/HighWhoosh.ogg b/Data/Sounds/HighWhoosh.ogg new file mode 100644 index 0000000..3c99ee6 Binary files /dev/null and b/Data/Sounds/HighWhoosh.ogg differ diff --git a/Data/Sounds/Highwhoosh.ogg b/Data/Sounds/Highwhoosh.ogg deleted file mode 100644 index 3c99ee6..0000000 Binary files a/Data/Sounds/Highwhoosh.ogg and /dev/null differ diff --git a/Data/Sounds/Jump.ogg b/Data/Sounds/Jump.ogg new file mode 100644 index 0000000..0a1d76d Binary files /dev/null and b/Data/Sounds/Jump.ogg differ diff --git a/Data/Sounds/KnifeDraw.ogg b/Data/Sounds/KnifeDraw.ogg new file mode 100644 index 0000000..1f5942d Binary files /dev/null and b/Data/Sounds/KnifeDraw.ogg differ diff --git a/Data/Sounds/KnifeSheathe.ogg b/Data/Sounds/KnifeSheathe.ogg new file mode 100644 index 0000000..e71a2c2 Binary files /dev/null and b/Data/Sounds/KnifeSheathe.ogg differ diff --git a/Data/Sounds/KnifeSlice.ogg b/Data/Sounds/KnifeSlice.ogg new file mode 100644 index 0000000..a878b89 Binary files /dev/null and b/Data/Sounds/KnifeSlice.ogg differ diff --git a/Data/Sounds/KnifeSwish.ogg b/Data/Sounds/KnifeSwish.ogg new file mode 100644 index 0000000..39eb9b8 Binary files /dev/null and b/Data/Sounds/KnifeSwish.ogg differ diff --git a/Data/Sounds/Land.ogg b/Data/Sounds/Land.ogg new file mode 100644 index 0000000..9ff9338 Binary files /dev/null and b/Data/Sounds/Land.ogg differ diff --git a/Data/Sounds/Land1.ogg b/Data/Sounds/Land1.ogg new file mode 100644 index 0000000..6fcc922 Binary files /dev/null and b/Data/Sounds/Land1.ogg differ diff --git a/Data/Sounds/Land2.ogg b/Data/Sounds/Land2.ogg new file mode 100644 index 0000000..d5cfed7 Binary files /dev/null and b/Data/Sounds/Land2.ogg differ diff --git a/Data/Sounds/LowWhoosh.ogg b/Data/Sounds/LowWhoosh.ogg new file mode 100644 index 0000000..80a1aa2 Binary files /dev/null and b/Data/Sounds/LowWhoosh.ogg differ diff --git a/Data/Sounds/Lowwhoosh.ogg b/Data/Sounds/Lowwhoosh.ogg deleted file mode 100644 index 80a1aa2..0000000 Binary files a/Data/Sounds/Lowwhoosh.ogg and /dev/null differ diff --git a/Data/Sounds/MidWhoosh.ogg b/Data/Sounds/MidWhoosh.ogg new file mode 100644 index 0000000..2a059bc Binary files /dev/null and b/Data/Sounds/MidWhoosh.ogg differ diff --git a/Data/Sounds/Midwhoosh.ogg b/Data/Sounds/Midwhoosh.ogg deleted file mode 100644 index 2a059bc..0000000 Binary files a/Data/Sounds/Midwhoosh.ogg and /dev/null differ diff --git a/Data/Sounds/MoveWhoosh.ogg b/Data/Sounds/MoveWhoosh.ogg new file mode 100644 index 0000000..c1f989f Binary files /dev/null and b/Data/Sounds/MoveWhoosh.ogg differ diff --git a/Data/Sounds/Movewhoosh.ogg b/Data/Sounds/Movewhoosh.ogg deleted file mode 100644 index c1f989f..0000000 Binary files a/Data/Sounds/Movewhoosh.ogg and /dev/null differ diff --git a/Data/Sounds/Music1Desert.ogg b/Data/Sounds/Music1Desert.ogg new file mode 100644 index 0000000..29a7869 Binary files /dev/null and b/Data/Sounds/Music1Desert.ogg differ diff --git a/Data/Sounds/Music1Grass.ogg b/Data/Sounds/Music1Grass.ogg new file mode 100644 index 0000000..07ef911 Binary files /dev/null and b/Data/Sounds/Music1Grass.ogg differ diff --git a/Data/Sounds/Music1Snow.ogg b/Data/Sounds/Music1Snow.ogg new file mode 100644 index 0000000..a1a9735 Binary files /dev/null and b/Data/Sounds/Music1Snow.ogg differ diff --git a/Data/Sounds/Music2.ogg b/Data/Sounds/Music2.ogg new file mode 100644 index 0000000..19a8c8e Binary files /dev/null and b/Data/Sounds/Music2.ogg differ diff --git a/Data/Sounds/Music3.ogg b/Data/Sounds/Music3.ogg new file mode 100644 index 0000000..2eff1fb Binary files /dev/null and b/Data/Sounds/Music3.ogg differ diff --git a/Data/Sounds/RabbitAttack.ogg b/Data/Sounds/RabbitAttack.ogg new file mode 100644 index 0000000..6549548 Binary files /dev/null and b/Data/Sounds/RabbitAttack.ogg differ diff --git a/Data/Sounds/RabbitAttack2.ogg b/Data/Sounds/RabbitAttack2.ogg new file mode 100644 index 0000000..e0139a1 Binary files /dev/null and b/Data/Sounds/RabbitAttack2.ogg differ diff --git a/Data/Sounds/RabbitAttack3.ogg b/Data/Sounds/RabbitAttack3.ogg new file mode 100644 index 0000000..4482541 Binary files /dev/null and b/Data/Sounds/RabbitAttack3.ogg differ diff --git a/Data/Sounds/RabbitAttack4.ogg b/Data/Sounds/RabbitAttack4.ogg new file mode 100644 index 0000000..6fb51b9 Binary files /dev/null and b/Data/Sounds/RabbitAttack4.ogg differ diff --git a/Data/Sounds/RabbitChitter.ogg b/Data/Sounds/RabbitChitter.ogg new file mode 100644 index 0000000..23d09ce Binary files /dev/null and b/Data/Sounds/RabbitChitter.ogg differ diff --git a/Data/Sounds/RabbitChitter2.ogg b/Data/Sounds/RabbitChitter2.ogg new file mode 100644 index 0000000..23d09ce Binary files /dev/null and b/Data/Sounds/RabbitChitter2.ogg differ diff --git a/Data/Sounds/RabbitPain.ogg b/Data/Sounds/RabbitPain.ogg new file mode 100644 index 0000000..e6fadce Binary files /dev/null and b/Data/Sounds/RabbitPain.ogg differ diff --git a/Data/Sounds/RabbitPain2.ogg b/Data/Sounds/RabbitPain2.ogg new file mode 100644 index 0000000..dd86aac Binary files /dev/null and b/Data/Sounds/RabbitPain2.ogg differ diff --git a/Data/Sounds/Rabbitattack.ogg b/Data/Sounds/Rabbitattack.ogg deleted file mode 100644 index 6549548..0000000 Binary files a/Data/Sounds/Rabbitattack.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitattack2.ogg b/Data/Sounds/Rabbitattack2.ogg deleted file mode 100644 index e0139a1..0000000 Binary files a/Data/Sounds/Rabbitattack2.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitattack3.ogg b/Data/Sounds/Rabbitattack3.ogg deleted file mode 100644 index 4482541..0000000 Binary files a/Data/Sounds/Rabbitattack3.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitattack4.ogg b/Data/Sounds/Rabbitattack4.ogg deleted file mode 100644 index 6fb51b9..0000000 Binary files a/Data/Sounds/Rabbitattack4.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitchitter.ogg b/Data/Sounds/Rabbitchitter.ogg deleted file mode 100644 index 23d09ce..0000000 Binary files a/Data/Sounds/Rabbitchitter.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitchitter2.ogg b/Data/Sounds/Rabbitchitter2.ogg deleted file mode 100644 index 23d09ce..0000000 Binary files a/Data/Sounds/Rabbitchitter2.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitpain.ogg b/Data/Sounds/Rabbitpain.ogg deleted file mode 100644 index e6fadce..0000000 Binary files a/Data/Sounds/Rabbitpain.ogg and /dev/null differ diff --git a/Data/Sounds/Rabbitpain2.ogg b/Data/Sounds/Rabbitpain2.ogg deleted file mode 100644 index dd86aac..0000000 Binary files a/Data/Sounds/Rabbitpain2.ogg and /dev/null differ diff --git a/Data/Sounds/Skid.ogg b/Data/Sounds/Skid.ogg new file mode 100644 index 0000000..eb1500e Binary files /dev/null and b/Data/Sounds/Skid.ogg differ diff --git a/Data/Sounds/SnowSkid.ogg b/Data/Sounds/SnowSkid.ogg new file mode 100644 index 0000000..0984d49 Binary files /dev/null and b/Data/Sounds/SnowSkid.ogg differ diff --git a/Data/Sounds/Splatter.ogg b/Data/Sounds/Splatter.ogg new file mode 100644 index 0000000..237a333 Binary files /dev/null and b/Data/Sounds/Splatter.ogg differ diff --git a/Data/Sounds/StaffBody.ogg b/Data/Sounds/StaffBody.ogg new file mode 100644 index 0000000..111f403 Binary files /dev/null and b/Data/Sounds/StaffBody.ogg differ diff --git a/Data/Sounds/StaffBreak.ogg b/Data/Sounds/StaffBreak.ogg new file mode 100644 index 0000000..1697603 Binary files /dev/null and b/Data/Sounds/StaffBreak.ogg differ diff --git a/Data/Sounds/StaffHead.ogg b/Data/Sounds/StaffHead.ogg new file mode 100644 index 0000000..27ebe99 Binary files /dev/null and b/Data/Sounds/StaffHead.ogg differ diff --git a/Data/Sounds/SwordSlice.ogg b/Data/Sounds/SwordSlice.ogg new file mode 100644 index 0000000..2020e90 Binary files /dev/null and b/Data/Sounds/SwordSlice.ogg differ diff --git a/Data/Sounds/SwordStaff.ogg b/Data/Sounds/SwordStaff.ogg new file mode 100644 index 0000000..24c85c8 Binary files /dev/null and b/Data/Sounds/SwordStaff.ogg differ diff --git a/Data/Sounds/Swordstaff.ogg b/Data/Sounds/Swordstaff.ogg deleted file mode 100644 index 24c85c8..0000000 Binary files a/Data/Sounds/Swordstaff.ogg and /dev/null differ diff --git a/Data/Sounds/Whoosh.ogg b/Data/Sounds/Whoosh.ogg new file mode 100644 index 0000000..505fc89 Binary files /dev/null and b/Data/Sounds/Whoosh.ogg differ diff --git a/Data/Sounds/WhooshHit.ogg b/Data/Sounds/WhooshHit.ogg new file mode 100644 index 0000000..16b02a9 Binary files /dev/null and b/Data/Sounds/WhooshHit.ogg differ diff --git a/Data/Sounds/Whooshhit.ogg b/Data/Sounds/Whooshhit.ogg deleted file mode 100644 index 16b02a9..0000000 Binary files a/Data/Sounds/Whooshhit.ogg and /dev/null differ diff --git a/Data/Sounds/Wind.ogg b/Data/Sounds/Wind.ogg new file mode 100644 index 0000000..34ac15a Binary files /dev/null and b/Data/Sounds/Wind.ogg differ diff --git a/Data/Sounds/alarm.ogg b/Data/Sounds/alarm.ogg deleted file mode 100644 index 69ae12b..0000000 Binary files a/Data/Sounds/alarm.ogg and /dev/null differ diff --git a/Data/Sounds/break.ogg b/Data/Sounds/break.ogg deleted file mode 100644 index 37e823c..0000000 Binary files a/Data/Sounds/break.ogg and /dev/null differ diff --git a/Data/Sounds/broken.ogg b/Data/Sounds/broken.ogg deleted file mode 100644 index 496ec3f..0000000 Binary files a/Data/Sounds/broken.ogg and /dev/null differ diff --git a/Data/Sounds/bushrustle.ogg b/Data/Sounds/bushrustle.ogg deleted file mode 100644 index 7903e98..0000000 Binary files a/Data/Sounds/bushrustle.ogg and /dev/null differ diff --git a/Data/Sounds/clank1.ogg b/Data/Sounds/clank1.ogg deleted file mode 100644 index 35d1caf..0000000 Binary files a/Data/Sounds/clank1.ogg and /dev/null differ diff --git a/Data/Sounds/clank2.ogg b/Data/Sounds/clank2.ogg deleted file mode 100644 index 8f56524..0000000 Binary files a/Data/Sounds/clank2.ogg and /dev/null differ diff --git a/Data/Sounds/clank3.ogg b/Data/Sounds/clank3.ogg deleted file mode 100644 index daedaf0..0000000 Binary files a/Data/Sounds/clank3.ogg and /dev/null differ diff --git a/Data/Sounds/clank4.ogg b/Data/Sounds/clank4.ogg deleted file mode 100644 index 37e0889..0000000 Binary files a/Data/Sounds/clank4.ogg and /dev/null differ diff --git a/Data/Sounds/clawslice.ogg b/Data/Sounds/clawslice.ogg deleted file mode 100644 index b0d2e03..0000000 Binary files a/Data/Sounds/clawslice.ogg and /dev/null differ diff --git a/Data/Sounds/consolefail.ogg b/Data/Sounds/consolefail.ogg deleted file mode 100644 index 75ed4ae..0000000 Binary files a/Data/Sounds/consolefail.ogg and /dev/null differ diff --git a/Data/Sounds/consolesuccess.ogg b/Data/Sounds/consolesuccess.ogg deleted file mode 100644 index 5b6636b..0000000 Binary files a/Data/Sounds/consolesuccess.ogg and /dev/null differ diff --git a/Data/Sounds/desertambient.ogg b/Data/Sounds/desertambient.ogg deleted file mode 100644 index c298c79..0000000 Binary files a/Data/Sounds/desertambient.ogg and /dev/null differ diff --git a/Data/Sounds/fire.ogg b/Data/Sounds/fire.ogg deleted file mode 100644 index f408f53..0000000 Binary files a/Data/Sounds/fire.ogg and /dev/null differ diff --git a/Data/Sounds/fireend.ogg b/Data/Sounds/fireend.ogg deleted file mode 100644 index 9b851ed..0000000 Binary files a/Data/Sounds/fireend.ogg and /dev/null differ diff --git a/Data/Sounds/firestart.ogg b/Data/Sounds/firestart.ogg deleted file mode 100644 index d4de596..0000000 Binary files a/Data/Sounds/firestart.ogg and /dev/null differ diff --git a/Data/Sounds/footstepgrass1.ogg b/Data/Sounds/footstepgrass1.ogg deleted file mode 100644 index fe94732..0000000 Binary files a/Data/Sounds/footstepgrass1.ogg and /dev/null differ diff --git a/Data/Sounds/footstepgrass2.ogg b/Data/Sounds/footstepgrass2.ogg deleted file mode 100644 index a02076b..0000000 Binary files a/Data/Sounds/footstepgrass2.ogg and /dev/null differ diff --git a/Data/Sounds/footstepsnow1.ogg b/Data/Sounds/footstepsnow1.ogg deleted file mode 100644 index 61175f2..0000000 Binary files a/Data/Sounds/footstepsnow1.ogg and /dev/null differ diff --git a/Data/Sounds/footstepsnow2.ogg b/Data/Sounds/footstepsnow2.ogg deleted file mode 100644 index dbbb31f..0000000 Binary files a/Data/Sounds/footstepsnow2.ogg and /dev/null differ diff --git a/Data/Sounds/footstepstone1.ogg b/Data/Sounds/footstepstone1.ogg deleted file mode 100644 index 869b38f..0000000 Binary files a/Data/Sounds/footstepstone1.ogg and /dev/null differ diff --git a/Data/Sounds/footstepstone2.ogg b/Data/Sounds/footstepstone2.ogg deleted file mode 100644 index 98ca621..0000000 Binary files a/Data/Sounds/footstepstone2.ogg and /dev/null differ diff --git a/Data/Sounds/hawk.ogg b/Data/Sounds/hawk.ogg deleted file mode 100644 index beb6a66..0000000 Binary files a/Data/Sounds/hawk.ogg and /dev/null differ diff --git a/Data/Sounds/heavyimpact.ogg b/Data/Sounds/heavyimpact.ogg deleted file mode 100644 index 362be38..0000000 Binary files a/Data/Sounds/heavyimpact.ogg and /dev/null differ diff --git a/Data/Sounds/jump.ogg b/Data/Sounds/jump.ogg deleted file mode 100644 index 0a1d76d..0000000 Binary files a/Data/Sounds/jump.ogg and /dev/null differ diff --git a/Data/Sounds/knifedraw.ogg b/Data/Sounds/knifedraw.ogg deleted file mode 100644 index 1f5942d..0000000 Binary files a/Data/Sounds/knifedraw.ogg and /dev/null differ diff --git a/Data/Sounds/knifesheathe.ogg b/Data/Sounds/knifesheathe.ogg deleted file mode 100644 index e71a2c2..0000000 Binary files a/Data/Sounds/knifesheathe.ogg and /dev/null differ diff --git a/Data/Sounds/knifeslice.ogg b/Data/Sounds/knifeslice.ogg deleted file mode 100644 index a878b89..0000000 Binary files a/Data/Sounds/knifeslice.ogg and /dev/null differ diff --git a/Data/Sounds/knifeswish.ogg b/Data/Sounds/knifeswish.ogg deleted file mode 100644 index 39eb9b8..0000000 Binary files a/Data/Sounds/knifeswish.ogg and /dev/null differ diff --git a/Data/Sounds/land.ogg b/Data/Sounds/land.ogg deleted file mode 100644 index 9ff9338..0000000 Binary files a/Data/Sounds/land.ogg and /dev/null differ diff --git a/Data/Sounds/land1.ogg b/Data/Sounds/land1.ogg deleted file mode 100644 index 6fcc922..0000000 Binary files a/Data/Sounds/land1.ogg and /dev/null differ diff --git a/Data/Sounds/land2.ogg b/Data/Sounds/land2.ogg deleted file mode 100644 index d5cfed7..0000000 Binary files a/Data/Sounds/land2.ogg and /dev/null differ diff --git a/Data/Sounds/music1desert.ogg b/Data/Sounds/music1desert.ogg deleted file mode 100644 index 29a7869..0000000 Binary files a/Data/Sounds/music1desert.ogg and /dev/null differ diff --git a/Data/Sounds/music1grass.ogg b/Data/Sounds/music1grass.ogg deleted file mode 100644 index 07ef911..0000000 Binary files a/Data/Sounds/music1grass.ogg and /dev/null differ diff --git a/Data/Sounds/music1snow.ogg b/Data/Sounds/music1snow.ogg deleted file mode 100644 index a1a9735..0000000 Binary files a/Data/Sounds/music1snow.ogg and /dev/null differ diff --git a/Data/Sounds/music2.ogg b/Data/Sounds/music2.ogg deleted file mode 100644 index 19a8c8e..0000000 Binary files a/Data/Sounds/music2.ogg and /dev/null differ diff --git a/Data/Sounds/music2old.ogg b/Data/Sounds/music2old.ogg deleted file mode 100644 index 40d19a2..0000000 Binary files a/Data/Sounds/music2old.ogg and /dev/null differ diff --git a/Data/Sounds/music3.ogg b/Data/Sounds/music3.ogg deleted file mode 100644 index 2eff1fb..0000000 Binary files a/Data/Sounds/music3.ogg and /dev/null differ diff --git a/Data/Sounds/skid.ogg b/Data/Sounds/skid.ogg deleted file mode 100644 index eb1500e..0000000 Binary files a/Data/Sounds/skid.ogg and /dev/null differ diff --git a/Data/Sounds/snowskid.ogg b/Data/Sounds/snowskid.ogg deleted file mode 100644 index 0984d49..0000000 Binary files a/Data/Sounds/snowskid.ogg and /dev/null differ diff --git a/Data/Sounds/splatter.ogg b/Data/Sounds/splatter.ogg deleted file mode 100644 index 237a333..0000000 Binary files a/Data/Sounds/splatter.ogg and /dev/null differ diff --git a/Data/Sounds/staffbody.ogg b/Data/Sounds/staffbody.ogg deleted file mode 100644 index 111f403..0000000 Binary files a/Data/Sounds/staffbody.ogg and /dev/null differ diff --git a/Data/Sounds/staffbreak.ogg b/Data/Sounds/staffbreak.ogg deleted file mode 100644 index 1697603..0000000 Binary files a/Data/Sounds/staffbreak.ogg and /dev/null differ diff --git a/Data/Sounds/staffhead.ogg b/Data/Sounds/staffhead.ogg deleted file mode 100644 index 27ebe99..0000000 Binary files a/Data/Sounds/staffhead.ogg and /dev/null differ diff --git a/Data/Sounds/swordslice.ogg b/Data/Sounds/swordslice.ogg deleted file mode 100644 index 2020e90..0000000 Binary files a/Data/Sounds/swordslice.ogg and /dev/null differ diff --git a/Data/Sounds/whoosh.ogg b/Data/Sounds/whoosh.ogg deleted file mode 100644 index 505fc89..0000000 Binary files a/Data/Sounds/whoosh.ogg and /dev/null differ diff --git a/Data/Sounds/wind.ogg b/Data/Sounds/wind.ogg deleted file mode 100644 index 34ac15a..0000000 Binary files a/Data/Sounds/wind.ogg and /dev/null differ diff --git a/Data/Textures/Blood.png b/Data/Textures/Blood.png new file mode 100644 index 0000000..4dab8e8 Binary files /dev/null and b/Data/Textures/Blood.png differ diff --git a/Data/Textures/BloodFur.png b/Data/Textures/BloodFur.png new file mode 100644 index 0000000..9c05063 Binary files /dev/null and b/Data/Textures/BloodFur.png differ diff --git a/Data/Textures/BloodKnifeLight.png b/Data/Textures/BloodKnifeLight.png new file mode 100644 index 0000000..0a23791 Binary files /dev/null and b/Data/Textures/BloodKnifeLight.png differ diff --git a/Data/Textures/BloodParticle.png b/Data/Textures/BloodParticle.png new file mode 100644 index 0000000..afdbc0f Binary files /dev/null and b/Data/Textures/BloodParticle.png differ diff --git a/Data/Textures/BloodParticleInverse.png b/Data/Textures/BloodParticleInverse.png new file mode 100644 index 0000000..7b39f8f Binary files /dev/null and b/Data/Textures/BloodParticleInverse.png differ diff --git a/Data/Textures/Bodyprint.png b/Data/Textures/Bodyprint.png new file mode 100644 index 0000000..ecdc0cd Binary files /dev/null and b/Data/Textures/Bodyprint.png differ diff --git a/Data/Textures/BoulderDesert.jpg b/Data/Textures/BoulderDesert.jpg new file mode 100644 index 0000000..93fb791 Binary files /dev/null and b/Data/Textures/BoulderDesert.jpg differ diff --git a/Data/Textures/BoulderSnow.jpg b/Data/Textures/BoulderSnow.jpg new file mode 100644 index 0000000..3011bd8 Binary files /dev/null and b/Data/Textures/BoulderSnow.jpg differ diff --git a/Data/Textures/Boulderdesert.jpg b/Data/Textures/Boulderdesert.jpg deleted file mode 100644 index 93fb791..0000000 Binary files a/Data/Textures/Boulderdesert.jpg and /dev/null differ diff --git a/Data/Textures/Bouldersnow.jpg b/Data/Textures/Bouldersnow.jpg deleted file mode 100644 index 3011bd8..0000000 Binary files a/Data/Textures/Bouldersnow.jpg and /dev/null differ diff --git a/Data/Textures/Break.png b/Data/Textures/Break.png new file mode 100644 index 0000000..24daba9 Binary files /dev/null and b/Data/Textures/Break.png differ diff --git a/Data/Textures/Bush.png b/Data/Textures/Bush.png new file mode 100644 index 0000000..e48f5e3 Binary files /dev/null and b/Data/Textures/Bush.png differ diff --git a/Data/Textures/BushDesert.png b/Data/Textures/BushDesert.png new file mode 100644 index 0000000..ce09091 Binary files /dev/null and b/Data/Textures/BushDesert.png differ diff --git a/Data/Textures/BushSnow.png b/Data/Textures/BushSnow.png new file mode 100644 index 0000000..a6671aa Binary files /dev/null and b/Data/Textures/BushSnow.png differ diff --git a/Data/Textures/Cloud.png b/Data/Textures/Cloud.png new file mode 100644 index 0000000..33b0fdd Binary files /dev/null and b/Data/Textures/Cloud.png differ diff --git a/Data/Textures/CloudImpact.png b/Data/Textures/CloudImpact.png new file mode 100644 index 0000000..ae36647 Binary files /dev/null and b/Data/Textures/CloudImpact.png differ diff --git a/Data/Textures/DarkWolf.jpg b/Data/Textures/DarkWolf.jpg new file mode 100644 index 0000000..92fa5ea Binary files /dev/null and b/Data/Textures/DarkWolf.jpg differ diff --git a/Data/Textures/Darkwolf.jpg b/Data/Textures/Darkwolf.jpg deleted file mode 100644 index 92fa5ea..0000000 Binary files a/Data/Textures/Darkwolf.jpg and /dev/null differ diff --git a/Data/Textures/DesertCl.png b/Data/Textures/DesertCl.png new file mode 100644 index 0000000..9d645be Binary files /dev/null and b/Data/Textures/DesertCl.png differ diff --git a/Data/Textures/DesertTree.png b/Data/Textures/DesertTree.png new file mode 100644 index 0000000..66d3915 Binary files /dev/null and b/Data/Textures/DesertTree.png differ diff --git a/Data/Textures/Desertcl.png b/Data/Textures/Desertcl.png deleted file mode 100644 index 9d645be..0000000 Binary files a/Data/Textures/Desertcl.png and /dev/null differ diff --git a/Data/Textures/EarWrap.png b/Data/Textures/EarWrap.png new file mode 100644 index 0000000..bb60d54 Binary files /dev/null and b/Data/Textures/EarWrap.png differ diff --git a/Data/Textures/EndGame.png b/Data/Textures/EndGame.png new file mode 100644 index 0000000..5492972 Binary files /dev/null and b/Data/Textures/EndGame.png differ diff --git a/Data/Textures/Endgame.png b/Data/Textures/Endgame.png deleted file mode 100644 index 5492972..0000000 Binary files a/Data/Textures/Endgame.png and /dev/null differ diff --git a/Data/Textures/FancyPants.png b/Data/Textures/FancyPants.png new file mode 100644 index 0000000..950cfcc Binary files /dev/null and b/Data/Textures/FancyPants.png differ diff --git a/Data/Textures/FancyPantsCamo.png b/Data/Textures/FancyPantsCamo.png new file mode 100644 index 0000000..07f98a7 Binary files /dev/null and b/Data/Textures/FancyPantsCamo.png differ diff --git a/Data/Textures/FancyPantsCamoArctic.png b/Data/Textures/FancyPantsCamoArctic.png new file mode 100644 index 0000000..b81063d Binary files /dev/null and b/Data/Textures/FancyPantsCamoArctic.png differ diff --git a/Data/Textures/FancyPantsCamoDesert.png b/Data/Textures/FancyPantsCamoDesert.png new file mode 100644 index 0000000..ca8c4e7 Binary files /dev/null and b/Data/Textures/FancyPantsCamoDesert.png differ diff --git a/Data/Textures/FootWrap.png b/Data/Textures/FootWrap.png new file mode 100644 index 0000000..f26106f Binary files /dev/null and b/Data/Textures/FootWrap.png differ diff --git a/Data/Textures/Footprint.png b/Data/Textures/Footprint.png new file mode 100644 index 0000000..e26ff7e Binary files /dev/null and b/Data/Textures/Footprint.png differ diff --git a/Data/Textures/FootprintSand.png b/Data/Textures/FootprintSand.png new file mode 100644 index 0000000..69ad09e Binary files /dev/null and b/Data/Textures/FootprintSand.png differ diff --git a/Data/Textures/Fur.jpg b/Data/Textures/Fur.jpg new file mode 100644 index 0000000..25a6d3d Binary files /dev/null and b/Data/Textures/Fur.jpg differ diff --git a/Data/Textures/Fur2.jpg b/Data/Textures/Fur2.jpg new file mode 100644 index 0000000..b3178db Binary files /dev/null and b/Data/Textures/Fur2.jpg differ diff --git a/Data/Textures/Fur3.jpg b/Data/Textures/Fur3.jpg new file mode 100644 index 0000000..1240324 Binary files /dev/null and b/Data/Textures/Fur3.jpg differ diff --git a/Data/Textures/FurDarko.jpg b/Data/Textures/FurDarko.jpg new file mode 100644 index 0000000..8ae01fe Binary files /dev/null and b/Data/Textures/FurDarko.jpg differ diff --git a/Data/Textures/GrassDirt.jpg b/Data/Textures/GrassDirt.jpg new file mode 100644 index 0000000..0cee237 Binary files /dev/null and b/Data/Textures/GrassDirt.jpg differ diff --git a/Data/Textures/GrassDirt2.jpg b/Data/Textures/GrassDirt2.jpg new file mode 100644 index 0000000..19a8ca5 Binary files /dev/null and b/Data/Textures/GrassDirt2.jpg differ diff --git a/Data/Textures/Hawk.png b/Data/Textures/Hawk.png new file mode 100644 index 0000000..5ef2abc Binary files /dev/null and b/Data/Textures/Hawk.png differ diff --git a/Data/Textures/HeadBand.png b/Data/Textures/HeadBand.png new file mode 100644 index 0000000..927c300 Binary files /dev/null and b/Data/Textures/HeadBand.png differ diff --git a/Data/Textures/HeightMap.png b/Data/Textures/HeightMap.png new file mode 100644 index 0000000..0632f69 Binary files /dev/null and b/Data/Textures/HeightMap.png differ diff --git a/Data/Textures/Leaf.png b/Data/Textures/Leaf.png new file mode 100644 index 0000000..65e11b9 Binary files /dev/null and b/Data/Textures/Leaf.png differ diff --git a/Data/Textures/LeatherArmor.png b/Data/Textures/LeatherArmor.png new file mode 100644 index 0000000..52f0747 Binary files /dev/null and b/Data/Textures/LeatherArmor.png differ diff --git a/Data/Textures/LeatherPants.png b/Data/Textures/LeatherPants.png new file mode 100644 index 0000000..7fb96c2 Binary files /dev/null and b/Data/Textures/LeatherPants.png differ diff --git a/Data/Textures/LeatherWristLeft.png b/Data/Textures/LeatherWristLeft.png new file mode 100644 index 0000000..6a785a6 Binary files /dev/null and b/Data/Textures/LeatherWristLeft.png differ diff --git a/Data/Textures/LeatherWristRight.png b/Data/Textures/LeatherWristRight.png new file mode 100644 index 0000000..4f6e963 Binary files /dev/null and b/Data/Textures/LeatherWristRight.png differ diff --git a/Data/Textures/Leatherwristleft.png b/Data/Textures/Leatherwristleft.png deleted file mode 100644 index 6a785a6..0000000 Binary files a/Data/Textures/Leatherwristleft.png and /dev/null differ diff --git a/Data/Textures/Leatherwristright.png b/Data/Textures/Leatherwristright.png deleted file mode 100644 index 4f6e963..0000000 Binary files a/Data/Textures/Leatherwristright.png and /dev/null differ diff --git a/Data/Textures/Lightbloodknife.png b/Data/Textures/Lightbloodknife.png deleted file mode 100644 index 0a23791..0000000 Binary files a/Data/Textures/Lightbloodknife.png and /dev/null differ diff --git a/Data/Textures/Logo.png b/Data/Textures/Logo.png new file mode 100644 index 0000000..1a51cc3 Binary files /dev/null and b/Data/Textures/Logo.png differ diff --git a/Data/Textures/LongSleeve.png b/Data/Textures/LongSleeve.png new file mode 100644 index 0000000..7482485 Binary files /dev/null and b/Data/Textures/LongSleeve.png differ diff --git a/Data/Textures/Mask.png b/Data/Textures/Mask.png new file mode 100644 index 0000000..325f0c1 Binary files /dev/null and b/Data/Textures/Mask.png differ diff --git a/Data/Textures/MossRock.jpg b/Data/Textures/MossRock.jpg new file mode 100644 index 0000000..d166202 Binary files /dev/null and b/Data/Textures/MossRock.jpg differ diff --git a/Data/Textures/NewGame.png b/Data/Textures/NewGame.png new file mode 100644 index 0000000..fc50067 Binary files /dev/null and b/Data/Textures/NewGame.png differ diff --git a/Data/Textures/Newgame.png b/Data/Textures/Newgame.png deleted file mode 100644 index fc50067..0000000 Binary files a/Data/Textures/Newgame.png and /dev/null differ diff --git a/Data/Textures/Pants.png b/Data/Textures/Pants.png new file mode 100644 index 0000000..5582670 Binary files /dev/null and b/Data/Textures/Pants.png differ diff --git a/Data/Textures/Rock.jpg b/Data/Textures/Rock.jpg new file mode 100644 index 0000000..3011bd8 Binary files /dev/null and b/Data/Textures/Rock.jpg differ diff --git a/Data/Textures/Rock2.jpg b/Data/Textures/Rock2.jpg new file mode 100644 index 0000000..d3b5fb9 Binary files /dev/null and b/Data/Textures/Rock2.jpg differ diff --git a/Data/Textures/Sand.jpg b/Data/Textures/Sand.jpg new file mode 100644 index 0000000..aaa34f8 Binary files /dev/null and b/Data/Textures/Sand.jpg differ diff --git a/Data/Textures/SandSlope.jpg b/Data/Textures/SandSlope.jpg new file mode 100644 index 0000000..e4e195a Binary files /dev/null and b/Data/Textures/SandSlope.jpg differ diff --git a/Data/Textures/Scar.png b/Data/Textures/Scar.png new file mode 100644 index 0000000..456297f Binary files /dev/null and b/Data/Textures/Scar.png differ diff --git a/Data/Textures/Shadow.png b/Data/Textures/Shadow.png new file mode 100644 index 0000000..1c3bb8c Binary files /dev/null and b/Data/Textures/Shadow.png differ diff --git a/Data/Textures/Shirt.png b/Data/Textures/Shirt.png new file mode 100644 index 0000000..25d9c55 Binary files /dev/null and b/Data/Textures/Shirt.png differ diff --git a/Data/Textures/ShirtFemale.png b/Data/Textures/ShirtFemale.png new file mode 100644 index 0000000..d45cdc6 Binary files /dev/null and b/Data/Textures/ShirtFemale.png differ diff --git a/Data/Textures/Snow.jpg b/Data/Textures/Snow.jpg new file mode 100644 index 0000000..3d3e05f Binary files /dev/null and b/Data/Textures/Snow.jpg differ diff --git a/Data/Textures/Snow.png b/Data/Textures/Snow.png new file mode 100644 index 0000000..4c0f980 Binary files /dev/null and b/Data/Textures/Snow.png differ diff --git a/Data/Textures/SnowFlake.png b/Data/Textures/SnowFlake.png new file mode 100644 index 0000000..b9b18d3 Binary files /dev/null and b/Data/Textures/SnowFlake.png differ diff --git a/Data/Textures/SnowTree.png b/Data/Textures/SnowTree.png new file mode 100644 index 0000000..229df6e Binary files /dev/null and b/Data/Textures/SnowTree.png differ diff --git a/Data/Textures/Splinter.png b/Data/Textures/Splinter.png new file mode 100644 index 0000000..645acbd Binary files /dev/null and b/Data/Textures/Splinter.png differ diff --git a/Data/Textures/SwordBlood.jpg b/Data/Textures/SwordBlood.jpg new file mode 100644 index 0000000..a56bd99 Binary files /dev/null and b/Data/Textures/SwordBlood.jpg differ diff --git a/Data/Textures/SwordBloodLight.jpg b/Data/Textures/SwordBloodLight.jpg new file mode 100644 index 0000000..ed04383 Binary files /dev/null and b/Data/Textures/SwordBloodLight.jpg differ diff --git a/Data/Textures/Swordblood.jpg b/Data/Textures/Swordblood.jpg deleted file mode 100644 index a56bd99..0000000 Binary files a/Data/Textures/Swordblood.jpg and /dev/null differ diff --git a/Data/Textures/Swordbloodlight.jpg b/Data/Textures/Swordbloodlight.jpg deleted file mode 100644 index ed04383..0000000 Binary files a/Data/Textures/Swordbloodlight.jpg and /dev/null differ diff --git a/Data/Textures/Tooth.png b/Data/Textures/Tooth.png new file mode 100644 index 0000000..21ad87a Binary files /dev/null and b/Data/Textures/Tooth.png differ diff --git a/Data/Textures/Tree.png b/Data/Textures/Tree.png new file mode 100644 index 0000000..bf3725d Binary files /dev/null and b/Data/Textures/Tree.png differ diff --git a/Data/Textures/WolfBloodFur.png b/Data/Textures/WolfBloodFur.png new file mode 100644 index 0000000..02ddd85 Binary files /dev/null and b/Data/Textures/WolfBloodFur.png differ diff --git a/Data/Textures/Wolfbloodfur.png b/Data/Textures/Wolfbloodfur.png deleted file mode 100644 index 02ddd85..0000000 Binary files a/Data/Textures/Wolfbloodfur.png and /dev/null differ diff --git a/Data/Textures/blood.png b/Data/Textures/blood.png deleted file mode 100644 index 4dab8e8..0000000 Binary files a/Data/Textures/blood.png and /dev/null differ diff --git a/Data/Textures/bloodfur.png b/Data/Textures/bloodfur.png deleted file mode 100644 index 9c05063..0000000 Binary files a/Data/Textures/bloodfur.png and /dev/null differ diff --git a/Data/Textures/bloodparticle.png b/Data/Textures/bloodparticle.png deleted file mode 100644 index afdbc0f..0000000 Binary files a/Data/Textures/bloodparticle.png and /dev/null differ diff --git a/Data/Textures/bloodparticleinverse.png b/Data/Textures/bloodparticleinverse.png deleted file mode 100644 index 7b39f8f..0000000 Binary files a/Data/Textures/bloodparticleinverse.png and /dev/null differ diff --git a/Data/Textures/bodyprint.png b/Data/Textures/bodyprint.png deleted file mode 100644 index ecdc0cd..0000000 Binary files a/Data/Textures/bodyprint.png and /dev/null differ diff --git a/Data/Textures/break.png b/Data/Textures/break.png deleted file mode 100644 index 24daba9..0000000 Binary files a/Data/Textures/break.png and /dev/null differ diff --git a/Data/Textures/bush.png b/Data/Textures/bush.png deleted file mode 100644 index e48f5e3..0000000 Binary files a/Data/Textures/bush.png and /dev/null differ diff --git a/Data/Textures/bushdesert.png b/Data/Textures/bushdesert.png deleted file mode 100644 index ce09091..0000000 Binary files a/Data/Textures/bushdesert.png and /dev/null differ diff --git a/Data/Textures/bushsnow.png b/Data/Textures/bushsnow.png deleted file mode 100644 index a6671aa..0000000 Binary files a/Data/Textures/bushsnow.png and /dev/null differ diff --git a/Data/Textures/cloud.png b/Data/Textures/cloud.png deleted file mode 100644 index 33b0fdd..0000000 Binary files a/Data/Textures/cloud.png and /dev/null differ diff --git a/Data/Textures/cloudimpact.png b/Data/Textures/cloudimpact.png deleted file mode 100644 index ae36647..0000000 Binary files a/Data/Textures/cloudimpact.png and /dev/null differ diff --git a/Data/Textures/deserttree.png b/Data/Textures/deserttree.png deleted file mode 100644 index 66d3915..0000000 Binary files a/Data/Textures/deserttree.png and /dev/null differ diff --git a/Data/Textures/earwrap.png b/Data/Textures/earwrap.png deleted file mode 100644 index bb60d54..0000000 Binary files a/Data/Textures/earwrap.png and /dev/null differ diff --git a/Data/Textures/fancypants.png b/Data/Textures/fancypants.png deleted file mode 100644 index 950cfcc..0000000 Binary files a/Data/Textures/fancypants.png and /dev/null differ diff --git a/Data/Textures/fancypantscamo.png b/Data/Textures/fancypantscamo.png deleted file mode 100644 index 07f98a7..0000000 Binary files a/Data/Textures/fancypantscamo.png and /dev/null differ diff --git a/Data/Textures/fancypantscamoarctic.png b/Data/Textures/fancypantscamoarctic.png deleted file mode 100644 index b81063d..0000000 Binary files a/Data/Textures/fancypantscamoarctic.png and /dev/null differ diff --git a/Data/Textures/fancypantscamodesert.png b/Data/Textures/fancypantscamodesert.png deleted file mode 100644 index ca8c4e7..0000000 Binary files a/Data/Textures/fancypantscamodesert.png and /dev/null differ diff --git a/Data/Textures/footprint.png b/Data/Textures/footprint.png deleted file mode 100644 index e26ff7e..0000000 Binary files a/Data/Textures/footprint.png and /dev/null differ diff --git a/Data/Textures/footprintsand.png b/Data/Textures/footprintsand.png deleted file mode 100644 index 69ad09e..0000000 Binary files a/Data/Textures/footprintsand.png and /dev/null differ diff --git a/Data/Textures/footwrap.png b/Data/Textures/footwrap.png deleted file mode 100644 index f26106f..0000000 Binary files a/Data/Textures/footwrap.png and /dev/null differ diff --git a/Data/Textures/fur.jpg b/Data/Textures/fur.jpg deleted file mode 100644 index 25a6d3d..0000000 Binary files a/Data/Textures/fur.jpg and /dev/null differ diff --git a/Data/Textures/fur2.jpg b/Data/Textures/fur2.jpg deleted file mode 100644 index b3178db..0000000 Binary files a/Data/Textures/fur2.jpg and /dev/null differ diff --git a/Data/Textures/fur3.jpg b/Data/Textures/fur3.jpg deleted file mode 100644 index 1240324..0000000 Binary files a/Data/Textures/fur3.jpg and /dev/null differ diff --git a/Data/Textures/furdarko.jpg b/Data/Textures/furdarko.jpg deleted file mode 100644 index 8ae01fe..0000000 Binary files a/Data/Textures/furdarko.jpg and /dev/null differ diff --git a/Data/Textures/grassdirt 2.jpg b/Data/Textures/grassdirt 2.jpg deleted file mode 100644 index 19a8ca5..0000000 Binary files a/Data/Textures/grassdirt 2.jpg and /dev/null differ diff --git a/Data/Textures/grassdirt.jpg b/Data/Textures/grassdirt.jpg deleted file mode 100644 index 0cee237..0000000 Binary files a/Data/Textures/grassdirt.jpg and /dev/null differ diff --git a/Data/Textures/hawk.png b/Data/Textures/hawk.png deleted file mode 100644 index 5ef2abc..0000000 Binary files a/Data/Textures/hawk.png and /dev/null differ diff --git a/Data/Textures/headband.png b/Data/Textures/headband.png deleted file mode 100644 index 927c300..0000000 Binary files a/Data/Textures/headband.png and /dev/null differ diff --git a/Data/Textures/heightmap.png b/Data/Textures/heightmap.png deleted file mode 100644 index 0632f69..0000000 Binary files a/Data/Textures/heightmap.png and /dev/null differ diff --git a/Data/Textures/leaf.png b/Data/Textures/leaf.png deleted file mode 100644 index 65e11b9..0000000 Binary files a/Data/Textures/leaf.png and /dev/null differ diff --git a/Data/Textures/leatherarmor.png b/Data/Textures/leatherarmor.png deleted file mode 100644 index 52f0747..0000000 Binary files a/Data/Textures/leatherarmor.png and /dev/null differ diff --git a/Data/Textures/leatherpants.png b/Data/Textures/leatherpants.png deleted file mode 100644 index 7fb96c2..0000000 Binary files a/Data/Textures/leatherpants.png and /dev/null differ diff --git a/Data/Textures/logo.png b/Data/Textures/logo.png deleted file mode 100644 index 1a51cc3..0000000 Binary files a/Data/Textures/logo.png and /dev/null differ diff --git a/Data/Textures/longsleeve.png b/Data/Textures/longsleeve.png deleted file mode 100644 index 7482485..0000000 Binary files a/Data/Textures/longsleeve.png and /dev/null differ diff --git a/Data/Textures/mask.png b/Data/Textures/mask.png deleted file mode 100644 index 325f0c1..0000000 Binary files a/Data/Textures/mask.png and /dev/null differ diff --git a/Data/Textures/mossrock.jpg b/Data/Textures/mossrock.jpg deleted file mode 100644 index d166202..0000000 Binary files a/Data/Textures/mossrock.jpg and /dev/null differ diff --git a/Data/Textures/pants.png b/Data/Textures/pants.png deleted file mode 100644 index 5582670..0000000 Binary files a/Data/Textures/pants.png and /dev/null differ diff --git a/Data/Textures/rock.jpg b/Data/Textures/rock.jpg deleted file mode 100644 index 3011bd8..0000000 Binary files a/Data/Textures/rock.jpg and /dev/null differ diff --git a/Data/Textures/rock2.jpg b/Data/Textures/rock2.jpg deleted file mode 100644 index d3b5fb9..0000000 Binary files a/Data/Textures/rock2.jpg and /dev/null differ diff --git a/Data/Textures/sand.jpg b/Data/Textures/sand.jpg deleted file mode 100644 index aaa34f8..0000000 Binary files a/Data/Textures/sand.jpg and /dev/null differ diff --git a/Data/Textures/sandslope.jpg b/Data/Textures/sandslope.jpg deleted file mode 100644 index e4e195a..0000000 Binary files a/Data/Textures/sandslope.jpg and /dev/null differ diff --git a/Data/Textures/scar.png b/Data/Textures/scar.png deleted file mode 100644 index 456297f..0000000 Binary files a/Data/Textures/scar.png and /dev/null differ diff --git a/Data/Textures/shadow.png b/Data/Textures/shadow.png deleted file mode 100644 index 1c3bb8c..0000000 Binary files a/Data/Textures/shadow.png and /dev/null differ diff --git a/Data/Textures/shirt.png b/Data/Textures/shirt.png deleted file mode 100644 index 25d9c55..0000000 Binary files a/Data/Textures/shirt.png and /dev/null differ diff --git a/Data/Textures/shirtfemale.png b/Data/Textures/shirtfemale.png deleted file mode 100644 index d45cdc6..0000000 Binary files a/Data/Textures/shirtfemale.png and /dev/null differ diff --git a/Data/Textures/snow.jpg b/Data/Textures/snow.jpg deleted file mode 100644 index 3d3e05f..0000000 Binary files a/Data/Textures/snow.jpg and /dev/null differ diff --git a/Data/Textures/snow.png b/Data/Textures/snow.png deleted file mode 100644 index 4c0f980..0000000 Binary files a/Data/Textures/snow.png and /dev/null differ diff --git a/Data/Textures/snowflake.png b/Data/Textures/snowflake.png deleted file mode 100644 index b9b18d3..0000000 Binary files a/Data/Textures/snowflake.png and /dev/null differ diff --git a/Data/Textures/snowtree.png b/Data/Textures/snowtree.png deleted file mode 100644 index 229df6e..0000000 Binary files a/Data/Textures/snowtree.png and /dev/null differ diff --git a/Data/Textures/splinter.png b/Data/Textures/splinter.png deleted file mode 100644 index 645acbd..0000000 Binary files a/Data/Textures/splinter.png and /dev/null differ diff --git a/Data/Textures/tooth.png b/Data/Textures/tooth.png deleted file mode 100644 index 21ad87a..0000000 Binary files a/Data/Textures/tooth.png and /dev/null differ diff --git a/Data/Textures/tree.png b/Data/Textures/tree.png deleted file mode 100644 index bf3725d..0000000 Binary files a/Data/Textures/tree.png and /dev/null differ diff --git a/Source/Animation.def b/Source/Animation.def index 1eb85d0..de695f7 100644 --- a/Source/Animation.def +++ b/Source/Animation.def @@ -37,9 +37,9 @@ 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, ab_land) -DECLARE_ANIM(landhardanim, "Landhard", lowheight, neutral, ab_landhard) +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) @@ -50,84 +50,84 @@ 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, 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(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) diff --git a/Source/ConsoleCmds.cpp b/Source/ConsoleCmds.cpp index 8fc1da8..028e579 100644 --- a/Source/ConsoleCmds.cpp +++ b/Source/ConsoleCmds.cpp @@ -443,13 +443,13 @@ void ch_cellophane(const char *args) void ch_funnybunny(const char *args) { Person::players[0]->skeleton.id = 0; - Person::players[0]->skeleton.Load("Skeleton/Basic Figure", "Skeleton/Basic Figurelow", - "Skeleton/Rabbitbelt", "Models/Body.solid", + Person::players[0]->skeleton.Load("Skeleton/BasicFigure", "Skeleton/BasicFigureLow", + "Skeleton/RabbitBelt", "Models/Body.solid", "Models/Body2.solid", "Models/Body3.solid", "Models/Body4.solid", "Models/Body5.solid", "Models/Body6.solid", "Models/Body7.solid", - "Models/Bodylow.solid", "Models/Belt.solid", 1); - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + "Models/BodyLow.solid", "Models/Belt.solid", 1); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); Person::players[0]->creature = rabbittype; Person::players[0]->scale = .2; Person::players[0]->headless = 0; @@ -460,12 +460,12 @@ void ch_funnybunny(const char *args) void ch_wolfie(const char *args) { Person::players[0]->skeleton.id = 0; - Person::players[0]->skeleton.Load("Skeleton/Basic Figure Wolf", "Skeleton/Basic Figure Wolf Low", - "Skeleton/Rabbitbelt", "Models/Wolf.solid", + Person::players[0]->skeleton.Load("Skeleton/BasicFigureWolf", "Skeleton/BasicFigureWolfLow", + "Skeleton/RabbitBelt", "Models/Wolf.solid", "Models/Wolf2.solid", "Models/Wolf3.solid", "Models/Wolf4.solid", "Models/Wolf5.solid", "Models/Wolf6.solid", "Models/Wolf7.solid", - "Models/Wolflow.solid", "Models/Belt.solid", 0); + "Models/WolfLow.solid", "Models/Belt.solid", 0); Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); Person::players[0]->creature = wolftype; Person::players[0]->damagetolerance = 300; @@ -494,22 +494,22 @@ void ch_darkwolf(const char *args) void ch_lizardwolf(const char *args) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Lizardwolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/LizardWolf.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_white(const char *args) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/fur.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_brown(const char *args) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_black(const char *args) { - Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/fur2.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); + Person::players[0]->skeleton.drawmodel.textureptr.load("Textures/Fur2.jpg", 1, &Person::players[0]->skeleton.skinText[0], &Person::players[0]->skeleton.skinsize); } void ch_sizemin(const char *args) diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index 754faf6..4a700b3 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -602,12 +602,12 @@ void Game::InitGame() if (texdetail > 2) texdetail = 2; Mainmenuitems[0].load("Textures/Lugaru.png", 0); - Mainmenuitems[1].load("Textures/Newgame.png", 0); + Mainmenuitems[1].load("Textures/NewGame.png", 0); Mainmenuitems[2].load("Textures/Options.png", 0); Mainmenuitems[3].load("Textures/Quit.png", 0); Mainmenuitems[4].load("Textures/Eyelid.png", 0); Mainmenuitems[5].load("Textures/Resume.png", 0); - Mainmenuitems[6].load("Textures/Endgame.png", 0); + Mainmenuitems[6].load("Textures/EndGame.png", 0); texdetail = temptexdetail; @@ -665,7 +665,7 @@ void Game::LoadStuff() i = abs(Random() % 4); visibleloading = 0; //don't use loadscreentexture yet - loadscreentexture.load("Textures/fire.jpg", 1); + loadscreentexture.load("Textures/Fire.jpg", 1); visibleloading = 1; temptexdetail = texdetail; @@ -691,22 +691,22 @@ void Game::LoadStuff() LOG("Loading weapon data..."); - Weapon::knifetextureptr.load("Textures/knife.png", 0); - Weapon::bloodknifetextureptr.load("Textures/bloodknife.png", 0); - Weapon::lightbloodknifetextureptr.load("Textures/lightbloodknife.png", 0); - Weapon::swordtextureptr.load("Textures/sword.jpg", 1); - Weapon::bloodswordtextureptr.load("Textures/Swordblood.jpg", 1); - Weapon::lightbloodswordtextureptr.load("Textures/Swordbloodlight.jpg", 1); + Weapon::knifetextureptr.load("Textures/Knife.png", 0); + Weapon::bloodknifetextureptr.load("Textures/BloodKnife.png", 0); + Weapon::lightbloodknifetextureptr.load("Textures/BloodKnifeLight.png", 0); + Weapon::swordtextureptr.load("Textures/Sword.jpg", 1); + Weapon::bloodswordtextureptr.load("Textures/SwordBlood.jpg", 1); + Weapon::lightbloodswordtextureptr.load("Textures/SwordBloodLight.jpg", 1); Weapon::stafftextureptr.load("Textures/Staff.jpg", 1); - Weapon::throwingknifemodel.load((char *)"Models/throwingknife.solid", 1); + Weapon::throwingknifemodel.load((char *)"Models/ThrowingKnife.solid", 1); Weapon::throwingknifemodel.Scale(.001, .001, .001); Weapon::throwingknifemodel.Rotate(90, 0, 0); Weapon::throwingknifemodel.Rotate(0, 90, 0); Weapon::throwingknifemodel.flat = 0; Weapon::throwingknifemodel.CalculateNormals(1); - Weapon::swordmodel.load((char *)"Models/sword.solid", 1); + Weapon::swordmodel.load((char *)"Models/Sword.solid", 1); Weapon::swordmodel.Scale(.001, .001, .001); Weapon::swordmodel.Rotate(90, 0, 0); Weapon::swordmodel.Rotate(0, 90, 0); @@ -714,7 +714,7 @@ void Game::LoadStuff() Weapon::swordmodel.flat = 1; Weapon::swordmodel.CalculateNormals(1); - Weapon::staffmodel.load((char *)"Models/staff.solid", 1); + Weapon::staffmodel.load((char *)"Models/Staff.solid", 1); Weapon::staffmodel.Scale(.005, .005, .005); Weapon::staffmodel.Rotate(90, 0, 0); Weapon::staffmodel.Rotate(0, 90, 0); @@ -722,28 +722,28 @@ void Game::LoadStuff() Weapon::staffmodel.flat = 1; Weapon::staffmodel.CalculateNormals(1); - terrain.shadowtexture.load("Textures/shadow.png", 0); - terrain.bloodtexture.load("Textures/blood.png", 0); - terrain.breaktexture.load("Textures/break.png", 0); - terrain.bloodtexture2.load("Textures/blood.png", 0); + terrain.shadowtexture.load("Textures/Shadow.png", 0); + terrain.bloodtexture.load("Textures/Blood.png", 0); + terrain.breaktexture.load("Textures/Break.png", 0); + terrain.bloodtexture2.load("Textures/Blood.png", 0); - terrain.footprinttexture.load("Textures/footprint.png", 0); - terrain.bodyprinttexture.load("Textures/bodyprint.png", 0); - hawktexture.load("Textures/hawk.png", 0); + terrain.footprinttexture.load("Textures/Footprint.png", 0); + terrain.bodyprinttexture.load("Textures/Bodyprint.png", 0); + hawktexture.load("Textures/Hawk.png", 0); - Sprite::cloudtexture.load("Textures/cloud.png", 1); - Sprite::cloudimpacttexture.load("Textures/cloudimpact.png", 1); - Sprite::bloodtexture.load("Textures/bloodparticle.png", 1); - Sprite::snowflaketexture.load("Textures/snowflake.png", 1); - Sprite::flametexture.load("Textures/flame.png", 1); - Sprite::bloodflametexture.load("Textures/bloodflame.png", 1); - Sprite::smoketexture.load("Textures/smoke.png", 1); - Sprite::shinetexture.load("Textures/shine.png", 1); - Sprite::splintertexture.load("Textures/splinter.png", 1); - Sprite::leaftexture.load("Textures/leaf.png", 1); - Sprite::toothtexture.load("Textures/tooth.png", 1); + Sprite::cloudtexture.load("Textures/Cloud.png", 1); + Sprite::cloudimpacttexture.load("Textures/CloudImpact.png", 1); + Sprite::bloodtexture.load("Textures/BloodParticle.png", 1); + Sprite::snowflaketexture.load("Textures/SnowFlake.png", 1); + Sprite::flametexture.load("Textures/Flame.png", 1); + Sprite::bloodflametexture.load("Textures/BloodFlame.png", 1); + Sprite::smoketexture.load("Textures/Smoke.png", 1); + Sprite::shinetexture.load("Textures/Shine.png", 1); + Sprite::splintertexture.load("Textures/Splinter.png", 1); + Sprite::leaftexture.load("Textures/Leaf.png", 1); + Sprite::toothtexture.load("Textures/Tooth.png", 1); yaw = 0; pitch = 0; @@ -785,7 +785,7 @@ void Game::LoadStuff() viewer.x = terrain.size / 2 * terrain.scale; viewer.z = terrain.size / 2 * terrain.scale; - hawk.load((char *)"Models/hawk.solid", 1); + hawk.load((char *)"Models/Hawk.solid", 1); hawk.Scale(.03, .03, .03); hawk.Rotate(90, 1, 1); hawk.CalculateNormals(0); @@ -794,20 +794,20 @@ void Game::LoadStuff() hawkcoords.z = terrain.size / 2 * terrain.scale - 5 - 7; hawkcoords.y = terrain.getHeight(hawkcoords.x, hawkcoords.z) + 25; - eye.load((char *)"Models/eye.solid", 1); + eye.load((char *)"Models/Eye.solid", 1); eye.Scale(.03, .03, .03); eye.CalculateNormals(0); - cornea.load((char *)"Models/cornea.solid", 1); + cornea.load((char *)"Models/Cornea.solid", 1); cornea.Scale(.03, .03, .03); cornea.CalculateNormals(0); - iris.load((char *)"Models/iris.solid", 1); + iris.load((char *)"Models/Iris.solid", 1); iris.Scale(.03, .03, .03); iris.CalculateNormals(0); - LoadSave("Textures/Bloodfur.png", 0, 1, &bloodText[0], 0); - LoadSave("Textures/Wolfbloodfur.png", 0, 1, &wolfbloodText[0], 0); + LoadSave("Textures/BloodFur.png", 0, 1, &bloodText[0], 0); + LoadSave("Textures/WolfBloodFur.png", 0, 1, &wolfbloodText[0], 0); oldenvironment = -4; diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index e7f6c50..45b7119 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -254,8 +254,8 @@ const char *rabbitskin[] = { const char *wolfskin[] = { "Textures/Wolf.jpg", - "Textures/Darkwolf.jpg", - "Textures/Snowwolf.jpg" + "Textures/DarkWolf.jpg", + "Textures/SnowWolf.jpg" }; const char **creatureskin[] = {rabbitskin, wolfskin}; @@ -602,29 +602,29 @@ void Setenvironment(int which) if (ambientsound) emit_stream_np(stream_wind); - objects.treetextureptr.load("Textures/snowtree.png", 0); - objects.bushtextureptr.load("Textures/bushsnow.png", 0); - objects.rocktextureptr.load("Textures/bouldersnow.jpg", 1); - objects.boxtextureptr.load("Textures/snowbox.jpg", 1); + objects.treetextureptr.load("Textures/SnowTree.png", 0); + objects.bushtextureptr.load("Textures/BushSnow.png", 0); + objects.rocktextureptr.load("Textures/BoulderSnow.jpg", 1); + objects.boxtextureptr.load("Textures/SnowBox.jpg", 1); footstepsound = footstepsn1; footstepsound2 = footstepsn2; footstepsound3 = footstepst1; footstepsound4 = footstepst2; - terraintexture.load("Textures/snow.jpg", 1); - terraintexture2.load("Textures/rock.jpg", 1); + terraintexture.load("Textures/Snow.jpg", 1); + terraintexture2.load("Textures/Rock.jpg", 1); temptexdetail = texdetail; if (texdetail > 1) texdetail = 4; - skybox->load( "Textures/Skybox(snow):Front.jpg", - "Textures/Skybox(snow):Left.jpg", - "Textures/Skybox(snow):Back.jpg", - "Textures/Skybox(snow):Right.jpg", - "Textures/Skybox(snow):Up.jpg", - "Textures/Skybox(snow):Down.jpg"); + skybox->load( "Textures/Skybox(snow)/Front.jpg", + "Textures/Skybox(snow)/Left.jpg", + "Textures/Skybox(snow)/Back.jpg", + "Textures/Skybox(snow)/Right.jpg", + "Textures/Skybox(snow)/Up.jpg", + "Textures/Skybox(snow)/Down.jpg"); @@ -633,10 +633,10 @@ void Setenvironment(int which) } else if (environment == desertenvironment) { windvector = 0; windvector.z = 2; - objects.treetextureptr.load("Textures/deserttree.png", 0); - objects.bushtextureptr.load("Textures/bushdesert.png", 0); - objects.rocktextureptr.load("Textures/boulderdesert.jpg", 1); - objects.boxtextureptr.load("Textures/desertbox.jpg", 1); + objects.treetextureptr.load("Textures/DesertTree.png", 0); + objects.bushtextureptr.load("Textures/BushDesert.png", 0); + objects.rocktextureptr.load("Textures/BoulderDesert.jpg", 1); + objects.boxtextureptr.load("Textures/DesertBox.jpg", 1); if (ambientsound) @@ -647,19 +647,19 @@ void Setenvironment(int which) footstepsound3 = footstepsn1; footstepsound4 = footstepsn2; - terraintexture.load("Textures/sand.jpg", 1); - terraintexture2.load("Textures/sandslope.jpg", 1); + terraintexture.load("Textures/Sand.jpg", 1); + terraintexture2.load("Textures/SandSlope.jpg", 1); temptexdetail = texdetail; if (texdetail > 1) texdetail = 4; - skybox->load( "Textures/Skybox(sand):Front.jpg", - "Textures/Skybox(sand):Left.jpg", - "Textures/Skybox(sand):Back.jpg", - "Textures/Skybox(sand):Right.jpg", - "Textures/Skybox(sand):Up.jpg", - "Textures/Skybox(sand):Down.jpg"); + skybox->load( "Textures/Skybox(sand)/Front.jpg", + "Textures/Skybox(sand)/Left.jpg", + "Textures/Skybox(sand)/Back.jpg", + "Textures/Skybox(sand)/Right.jpg", + "Textures/Skybox(sand)/Up.jpg", + "Textures/Skybox(sand)/Down.jpg"); @@ -668,10 +668,10 @@ void Setenvironment(int which) } else if (environment == grassyenvironment) { windvector = 0; windvector.z = 2; - objects.treetextureptr.load("Textures/tree.png", 0); - objects.bushtextureptr.load("Textures/bush.png", 0); - objects.rocktextureptr.load("Textures/boulder.jpg", 1); - objects.boxtextureptr.load("Textures/grassbox.jpg", 1); + objects.treetextureptr.load("Textures/Tree.png", 0); + objects.bushtextureptr.load("Textures/Bush.png", 0); + objects.rocktextureptr.load("Textures/Boulder.jpg", 1); + objects.boxtextureptr.load("Textures/GrassBox.jpg", 1); if (ambientsound) emit_stream_np(stream_wind, 100.); @@ -681,19 +681,19 @@ void Setenvironment(int which) footstepsound3 = footstepst1; footstepsound4 = footstepst2; - terraintexture.load("Textures/grassdirt.jpg", 1); - terraintexture2.load("Textures/mossrock.jpg", 1); + terraintexture.load("Textures/GrassDirt.jpg", 1); + terraintexture2.load("Textures/MossRock.jpg", 1); temptexdetail = texdetail; if (texdetail > 1) texdetail = 4; - skybox->load( "Textures/Skybox(grass):Front.jpg", - "Textures/Skybox(grass):Left.jpg", - "Textures/Skybox(grass):Back.jpg", - "Textures/Skybox(grass):Right.jpg", - "Textures/Skybox(grass):Up.jpg", - "Textures/Skybox(grass):Down.jpg"); + skybox->load( "Textures/Skybox(grass)/Front.jpg", + "Textures/Skybox(grass)/Left.jpg", + "Textures/Skybox(grass)/Back.jpg", + "Textures/Skybox(grass)/Right.jpg", + "Textures/Skybox(grass)/Up.jpg", + "Textures/Skybox(grass)/Down.jpg"); @@ -701,7 +701,7 @@ void Setenvironment(int which) } temptexdetail = texdetail; texdetail = 1; - terrain.load("Textures/heightmap.png"); + terrain.load("Textures/HeightMap.png"); texdetail = temptexdetail; } @@ -731,9 +731,9 @@ void LoadCampaign() } ipstream.close(); - ifstream test(Folders::getResourcePath("Textures/" + accountactive->getCurrentCampaign() + ":World.png")); + ifstream test(Folders::getResourcePath("Textures/" + accountactive->getCurrentCampaign() + "/World.png")); if (test.good()) { - Mainmenuitems[7].load("Textures/" + accountactive->getCurrentCampaign() + ":World.png", 0); + Mainmenuitems[7].load("Textures/" + accountactive->getCurrentCampaign() + "/World.png", 0); } else { Mainmenuitems[7].load("Textures/World.png", 0); } @@ -1104,9 +1104,9 @@ void Game::Loadlevel(const std::string& name) Person::players[i]->creature = rabbittype; if (Person::players[i]->creature != wolftype) { Person::players[i]->skeleton.Load( - (char *)"Skeleton/Basic Figure", - (char *)"Skeleton/Basic Figurelow", - (char *)"Skeleton/Rabbitbelt", + (char *)"Skeleton/BasicFigure", + (char *)"Skeleton/BasicFigureLow", + (char *)"Skeleton/RabbitBelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", @@ -1114,14 +1114,14 @@ void Game::Loadlevel(const std::string& name) (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", - (char *)"Models/Bodylow.solid", + (char *)"Models/BodyLow.solid", (char *)"Models/Belt.solid", 0); } else { if (Person::players[i]->creature != wolftype) { Person::players[i]->skeleton.Load( - (char *)"Skeleton/Basic Figure", - (char *)"Skeleton/Basic Figurelow", - (char *)"Skeleton/Rabbitbelt", + (char *)"Skeleton/BasicFigure", + (char *)"Skeleton/BasicFigureLow", + (char *)"Skeleton/RabbitBelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", @@ -1129,15 +1129,15 @@ void Game::Loadlevel(const std::string& name) (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", - (char *)"Models/Bodylow.solid", + (char *)"Models/BodyLow.solid", (char *)"Models/Belt.solid", 1); Person::players[i]->skeleton.drawmodelclothes.textureptr.load("Textures/Belt.png", 1); } if (Person::players[i]->creature == wolftype) { Person::players[i]->skeleton.Load( - (char *)"Skeleton/Basic Figure Wolf", - (char *)"Skeleton/Basic Figure Wolf Low", - (char *)"Skeleton/Rabbitbelt", + (char *)"Skeleton/BasicFigureWolf", + (char *)"Skeleton/BasicFigureWolfLow", + (char *)"Skeleton/RabbitBelt", (char *)"Models/Wolf.solid", (char *)"Models/Wolf2.solid", (char *)"Models/Wolf3.solid", @@ -1145,7 +1145,7 @@ void Game::Loadlevel(const std::string& name) (char *)"Models/Wolf5.solid", (char *)"Models/Wolf6.solid", (char *)"Models/Wolf7.solid", - (char *)"Models/Wolflow.solid", + (char *)"Models/WolfLow.solid", (char *)"Models/Belt.solid", 0); } } @@ -1921,7 +1921,7 @@ void doDebugKeys() if (Person::players[closest]->creature == rabbittype) { Person::players[closest]->skeleton.id = closest; - Person::players[closest]->skeleton.Load((char *)"Skeleton/Basic Figure Wolf", (char *)"Skeleton/Basic Figure Wolf Low", (char *)"Skeleton/Rabbitbelt", (char *)"Models/Wolf.solid", (char *)"Models/Wolf2.solid", (char *)"Models/Wolf3.solid", (char *)"Models/Wolf4.solid", (char *)"Models/Wolf5.solid", (char *)"Models/Wolf6.solid", (char *)"Models/Wolf7.solid", (char *)"Models/Wolflow.solid", (char *)"Models/Belt.solid", 0); + Person::players[closest]->skeleton.Load((char *)"Skeleton/BasicFigureWolf", (char *)"Skeleton/BasicFigureWolfLow", (char *)"Skeleton/RabbitBelt", (char *)"Models/Wolf.solid", (char *)"Models/Wolf2.solid", (char *)"Models/Wolf3.solid", (char *)"Models/Wolf4.solid", (char *)"Models/Wolf5.solid", (char *)"Models/Wolf6.solid", (char *)"Models/Wolf7.solid", (char *)"Models/WolfLow.solid", (char *)"Models/Belt.solid", 0); Person::players[closest]->skeleton.drawmodel.textureptr.load("Textures/Wolf.jpg", 1, &Person::players[closest]->skeleton.skinText[0], &Person::players[closest]->skeleton.skinsize); Person::players[closest]->whichskin = 0; Person::players[closest]->creature = wolftype; @@ -1936,7 +1936,7 @@ void doDebugKeys() Person::players[closest]->damagetolerance = 300; } else { Person::players[closest]->skeleton.id = closest; - Person::players[closest]->skeleton.Load((char *)"Skeleton/Basic Figure", (char *)"Skeleton/Basic Figurelow", (char *)"Skeleton/Rabbitbelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/Bodylow.solid", (char *)"Models/Belt.solid", 1); + Person::players[closest]->skeleton.Load((char *)"Skeleton/BasicFigure", (char *)"Skeleton/BasicFigureLow", (char *)"Skeleton/RabbitBelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/BodyLow.solid", (char *)"Models/Belt.solid", 1); Person::players[closest]->skeleton.drawmodel.textureptr.load("Textures/Fur3.jpg", 1, &Person::players[closest]->skeleton.skinText[0], &Person::players[closest]->skeleton.skinsize); Person::players[closest]->whichskin = 0; Person::players[closest]->creature = rabbittype; @@ -2229,7 +2229,7 @@ void doDebugKeys() Person::players.back()->creature = rabbittype; Person::players.back()->howactive = editoractive; Person::players.back()->skeleton.id = Person::players.size()-1; - Person::players.back()->skeleton.Load((char *)"Skeleton/Basic Figure", (char *)"Skeleton/Basic Figurelow", (char *)"Skeleton/Rabbitbelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/Bodylow.solid", (char *)"Models/Belt.solid", 1); + Person::players.back()->skeleton.Load((char *)"Skeleton/BasicFigure", (char *)"Skeleton/BasicFigureLow", (char *)"Skeleton/RabbitBelt", (char *)"Models/Body.solid", (char *)"Models/Body2.solid", (char *)"Models/Body3.solid", (char *)"Models/Body4.solid", (char *)"Models/Body5.solid", (char *)"Models/Body6.solid", (char *)"Models/Body7.solid", (char *)"Models/BodyLow.solid", (char *)"Models/Belt.solid", 1); int k = abs(Random() % 2) + 1; if (k == 0) { diff --git a/Source/Objects.cpp b/Source/Objects.cpp index 3ae0afb..efb2c00 100644 --- a/Source/Objects.cpp +++ b/Source/Objects.cpp @@ -554,7 +554,7 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float ascale) if (atype == spiketype) model[numobjects].load((char *)"Models/Spike.solid", 0); if (atype == weirdtype) model[numobjects].loaddecal((char *)"Models/Weird.solid", 0); if (atype == rocktype) model[numobjects].loaddecal((char *)"Models/Rock.solid", 0); - if (atype == treetrunktype) model[numobjects].load((char *)"Models/Treetrunk.solid", 0); + if (atype == treetrunktype) model[numobjects].load((char *)"Models/TreeTrunk.solid", 0); if (atype == treeleavestype) model[numobjects].load((char *)"Models/Leaves.solid", 0); if (atype == bushtype) model[numobjects].load((char *)"Models/Bush.solid", 0); @@ -644,7 +644,7 @@ void Objects::MakeObject(int atype, XYZ where, float ayaw, float apitch, float a if (atype == spiketype) model[numobjects].load((char *)"Models/Spike.solid", 0); if (atype == weirdtype) model[numobjects].loaddecal((char *)"Models/Weird.solid", 0); if (atype == rocktype) model[numobjects].loaddecal((char *)"Models/Rock.solid", 0); - if (atype == treetrunktype) model[numobjects].load((char *)"Models/Treetrunk.solid", 0); + if (atype == treetrunktype) model[numobjects].load((char *)"Models/TreeTrunk.solid", 0); if (atype == treeleavestype) model[numobjects].load((char *)"Models/Leaves.solid", 0); if (atype == bushtype) model[numobjects].load((char *)"Models/Bush.solid", 0); diff --git a/Source/Sounds.def b/Source/Sounds.def index ca6e712..6fde586 100644 --- a/Source/Sounds.def +++ b/Source/Sounds.def @@ -17,74 +17,74 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -DECLARE_SOUND(footstepsn1, "footstepsnow1.ogg") -DECLARE_SOUND(footstepsn2, "footstepsnow2.ogg") -DECLARE_SOUND(footstepst1, "footstepstone1.ogg") -DECLARE_SOUND(footstepst2, "footstepstone2.ogg") -DECLARE_SOUND(footstepgr1, "footstepgrass1.ogg") -DECLARE_SOUND(footstepgr2, "footstepgrass2.ogg") -DECLARE_SOUND(landsound, "land.ogg") -DECLARE_SOUND(jumpsound, "jump.ogg") -DECLARE_SOUND(hawksound, "hawk.ogg") -DECLARE_SOUND(whooshsound, "whoosh.ogg") -DECLARE_SOUND(landsound1, "land1.ogg") -DECLARE_SOUND(landsound2, "land2.ogg") -DECLARE_SOUND(breaksound, "broken.ogg") -DECLARE_SOUND(lowwhooshsound, "lowwhoosh.ogg") -DECLARE_SOUND(midwhooshsound, "midwhoosh.ogg") -DECLARE_SOUND(highwhooshsound, "highwhoosh.ogg") -DECLARE_SOUND(movewhooshsound, "movewhoosh.ogg") -DECLARE_SOUND(heavyimpactsound, "heavyimpact.ogg") -DECLARE_SOUND(whooshhitsound, "whooshhit.ogg") -DECLARE_SOUND(thudsound, "thud.ogg") -DECLARE_SOUND(alarmsound, "alarm.ogg") -DECLARE_SOUND(breaksound2, "break.ogg") -DECLARE_SOUND(knifedrawsound, "knifedraw.ogg") -DECLARE_SOUND(knifesheathesound, "knifesheathe.ogg") -DECLARE_SOUND(fleshstabsound, "fleshstab.ogg") -DECLARE_SOUND(fleshstabremovesound, "fleshstabremove.ogg") -DECLARE_SOUND(knifeswishsound, "knifeswish.ogg") -DECLARE_SOUND(knifeslicesound, "knifeslice.ogg") -DECLARE_SOUND(swordslicesound, "swordslice.ogg") -DECLARE_SOUND(skidsound, "skid.ogg") -DECLARE_SOUND(snowskidsound, "snowskid.ogg") -DECLARE_SOUND(bushrustle, "bushrustle.ogg") -DECLARE_SOUND(clank1sound, "clank1.ogg") -DECLARE_SOUND(clank2sound, "clank2.ogg") -DECLARE_SOUND(clank3sound, "clank3.ogg") -DECLARE_SOUND(clank4sound, "clank4.ogg") -DECLARE_SOUND(consolesuccesssound, "consolesuccess.ogg") -DECLARE_SOUND(consolefailsound, "consolefail.ogg") -DECLARE_SOUND(metalhitsound, "metalhit.ogg") -DECLARE_SOUND(clawslicesound, "clawslice.ogg") -DECLARE_SOUND(splattersound, "splatter.ogg") -DECLARE_SOUND(growlsound, "growl.ogg") -DECLARE_SOUND(growl2sound, "growl2.ogg") -DECLARE_SOUND(barksound, "bark.ogg") -DECLARE_SOUND(bark2sound, "bark2.ogg") -DECLARE_SOUND(bark3sound, "bark3.ogg") -DECLARE_SOUND(snarlsound, "snarl.ogg") -DECLARE_SOUND(snarl2sound, "snarl2.ogg") -DECLARE_SOUND(barkgrowlsound, "barkgrowl.ogg") -DECLARE_SOUND(rabbitattacksound, "rabbitattack.ogg") -DECLARE_SOUND(rabbitattack2sound, "rabbitattack2.ogg") -DECLARE_SOUND(rabbitattack3sound, "rabbitattack3.ogg") -DECLARE_SOUND(rabbitattack4sound, "rabbitattack4.ogg") -DECLARE_SOUND(rabbitpainsound, "rabbitpain.ogg") -DECLARE_SOUND(rabbitpain1sound, "rabbitpain2.ogg") -DECLARE_SOUND(rabbitchitter, "rabbitchitter.ogg") -DECLARE_SOUND(rabbitchitter2, "rabbitchitter2.ogg") -DECLARE_SOUND(swordstaffsound, "swordstaff.ogg") -DECLARE_SOUND(staffbodysound, "staffbody.ogg") -DECLARE_SOUND(staffheadsound, "staffhead.ogg") -DECLARE_SOUND(staffbreaksound, "staffbreak.ogg") -DECLARE_SOUND(firestartsound, "firestart.ogg") -DECLARE_SOUND(fireendsound, "fireend.ogg") -DECLARE_SOUND(stream_firesound, "fire.ogg") -DECLARE_SOUND(stream_grasstheme, "music1grass.ogg") -DECLARE_SOUND(stream_snowtheme, "music1snow.ogg") -DECLARE_SOUND(stream_deserttheme, "music1desert.ogg") -DECLARE_SOUND(stream_wind, "wind.ogg") -DECLARE_SOUND(stream_desertambient, "desertambient.ogg") -DECLARE_SOUND(stream_fighttheme, "music2.ogg") -DECLARE_SOUND(stream_menutheme, "music3.ogg") +DECLARE_SOUND(footstepsn1, "FootStepSnow1.ogg") +DECLARE_SOUND(footstepsn2, "FootStepSnow2.ogg") +DECLARE_SOUND(footstepst1, "FootStepStone1.ogg") +DECLARE_SOUND(footstepst2, "FootStepStone2.ogg") +DECLARE_SOUND(footstepgr1, "FootStepGrass1.ogg") +DECLARE_SOUND(footstepgr2, "FootStepGrass2.ogg") +DECLARE_SOUND(landsound, "Land.ogg") +DECLARE_SOUND(jumpsound, "Jump.ogg") +DECLARE_SOUND(hawksound, "Hawk.ogg") +DECLARE_SOUND(whooshsound, "Whoosh.ogg") +DECLARE_SOUND(landsound1, "Land1.ogg") +DECLARE_SOUND(landsound2, "Land2.ogg") +DECLARE_SOUND(breaksound, "Broken.ogg") +DECLARE_SOUND(lowwhooshsound, "LowWhoosh.ogg") +DECLARE_SOUND(midwhooshsound, "MidWhoosh.ogg") +DECLARE_SOUND(highwhooshsound, "HighWhoosh.ogg") +DECLARE_SOUND(movewhooshsound, "MoveWhoosh.ogg") +DECLARE_SOUND(heavyimpactsound, "HeavyImpact.ogg") +DECLARE_SOUND(whooshhitsound, "WhooshHit.ogg") +DECLARE_SOUND(thudsound, "Thud.ogg") +DECLARE_SOUND(alarmsound, "Alarm.ogg") +DECLARE_SOUND(breaksound2, "Break.ogg") +DECLARE_SOUND(knifedrawsound, "KnifeDraw.ogg") +DECLARE_SOUND(knifesheathesound, "KnifeSheathe.ogg") +DECLARE_SOUND(fleshstabsound, "FleshStab.ogg") +DECLARE_SOUND(fleshstabremovesound, "FleshStabRemove.ogg") +DECLARE_SOUND(knifeswishsound, "KnifeSwish.ogg") +DECLARE_SOUND(knifeslicesound, "KnifeSlice.ogg") +DECLARE_SOUND(swordslicesound, "SwordSlice.ogg") +DECLARE_SOUND(skidsound, "Skid.ogg") +DECLARE_SOUND(snowskidsound, "SnowSkid.ogg") +DECLARE_SOUND(bushrustle, "BushRustle.ogg") +DECLARE_SOUND(clank1sound, "Clank1.ogg") +DECLARE_SOUND(clank2sound, "Clank2.ogg") +DECLARE_SOUND(clank3sound, "Clank3.ogg") +DECLARE_SOUND(clank4sound, "Clank4.ogg") +DECLARE_SOUND(consolesuccesssound, "ConsoleSuccess.ogg") +DECLARE_SOUND(consolefailsound, "ConsoleFail.ogg") +DECLARE_SOUND(metalhitsound, "MetalHit.ogg") +DECLARE_SOUND(clawslicesound, "ClawSlice.ogg") +DECLARE_SOUND(splattersound, "Splatter.ogg") +DECLARE_SOUND(growlsound, "Growl.ogg") +DECLARE_SOUND(growl2sound, "Growl2.ogg") +DECLARE_SOUND(barksound, "Bark.ogg") +DECLARE_SOUND(bark2sound, "Bark2.ogg") +DECLARE_SOUND(bark3sound, "Bark3.ogg") +DECLARE_SOUND(snarlsound, "Snarl.ogg") +DECLARE_SOUND(snarl2sound, "Snarl2.ogg") +DECLARE_SOUND(barkgrowlsound, "BarkGrowl.ogg") +DECLARE_SOUND(rabbitattacksound, "RabbitAttack.ogg") +DECLARE_SOUND(rabbitattack2sound, "RabbitAttack2.ogg") +DECLARE_SOUND(rabbitattack3sound, "RabbitAttack3.ogg") +DECLARE_SOUND(rabbitattack4sound, "RabbitAttack4.ogg") +DECLARE_SOUND(rabbitpainsound, "RabbitPain.ogg") +DECLARE_SOUND(rabbitpain1sound, "RabbitPain2.ogg") +DECLARE_SOUND(rabbitchitter, "RabbitChitter.ogg") +DECLARE_SOUND(rabbitchitter2, "RabbitChitter2.ogg") +DECLARE_SOUND(swordstaffsound, "SwordStaff.ogg") +DECLARE_SOUND(staffbodysound, "StaffBody.ogg") +DECLARE_SOUND(staffheadsound, "StaffHead.ogg") +DECLARE_SOUND(staffbreaksound, "StaffBreak.ogg") +DECLARE_SOUND(firestartsound, "FireStart.ogg") +DECLARE_SOUND(fireendsound, "FireEnd.ogg") +DECLARE_SOUND(stream_firesound, "Fire.ogg") +DECLARE_SOUND(stream_grasstheme, "Music1Grass.ogg") +DECLARE_SOUND(stream_snowtheme, "Music1Snow.ogg") +DECLARE_SOUND(stream_deserttheme, "Music1Desert.ogg") +DECLARE_SOUND(stream_wind, "Wind.ogg") +DECLARE_SOUND(stream_desertambient, "DesertAmbient.ogg") +DECLARE_SOUND(stream_fighttheme, "Music2.ogg") +DECLARE_SOUND(stream_menutheme, "Music3.ogg")