From 695008afd80ffa580ade5c7e17efaf0bc9d25517 Mon Sep 17 00:00:00 2001 From: Jeena Date: Mon, 24 Feb 2014 17:41:01 +0100 Subject: [PATCH] implemented clientReady and changed loading of assets, fixed unique ragdoll id --- app/Game/Client/GameController.js | 39 +++--- app/Game/Client/GameObjects/Doll.js | 9 +- app/Game/Client/Loader/Level.js | 67 +++++++++- app/Game/Client/Loader/TiledLevel.js | 47 ++++++- app/Game/Client/Networker.js | 33 ++--- app/Game/Client/Player.js | 5 - app/Game/Client/View/Views/AbstractView.js | 6 + app/Game/Client/View/Views/PixiView.js | 38 ++++++ app/Game/Core/GameController.js | 12 +- app/Game/Core/GameObjects/Doll.js | 1 + app/Game/Core/GameObjects/Item.js | 2 +- app/Game/Core/Loader/TiledLevel.js | 14 +- app/Game/Core/Player.js | 11 +- app/Game/Server/Channel.js | 4 - app/Game/Server/GameController.js | 60 +++++++-- app/Game/Server/Player.js | 7 +- app/Game/Server/User.js | 3 + app/Lib/Utilities/Extensions.js | 15 +++ app/Lobby/User.js | 1 + channel.js | 4 - client.js | 58 ++------ server.js | 12 -- static/html/index.html | 19 +-- .../WithArms/ChuckAnimations0001.png | Bin .../WithArms/ChuckAnimations0002.png | Bin .../WithArms/ChuckAnimations0003.png | Bin .../WithArms/ChuckAnimations0004.png | Bin .../WithArms/ChuckAnimations0005.png | Bin .../WithArms/ChuckAnimations0006.png | Bin .../WithArms/ChuckAnimations0007.png | Bin .../WithArms/ChuckAnimations0008.png | Bin .../WithArms/ChuckAnimations0009.png | Bin .../WithArms/ChuckAnimations0010.png | Bin .../WithArms/ChuckAnimations0011.png | Bin .../WithArms/ChuckAnimations0012.png | Bin .../WithArms/ChuckAnimations0013.png | Bin .../WithArms/ChuckAnimations0014.png | Bin .../WithArms/ChuckAnimations0015.png | Bin .../WithArms/ChuckAnimations0016.png | Bin .../WithArms/ChuckAnimations0017.png | Bin .../WithArms/ChuckAnimations0018.png | Bin .../WithArms/ChuckAnimations0019.png | Bin .../WithArms/ChuckAnimations0020.png | Bin .../WithArms/ChuckAnimations0021.png | Bin .../WithArms/ChuckAnimations0022.png | Bin .../WithArms/ChuckAnimations0023.png | Bin .../WithArms/ChuckAnimations0024.png | Bin .../WithArms/ChuckAnimations0025.png | Bin .../WithArms/ChuckAnimations0026.png | Bin .../WithArms/ChuckAnimations0027.png | Bin .../WithArms/ChuckAnimations0028.png | Bin .../WithArms/ChuckAnimations0029.png | Bin .../WithArms/ChuckAnimations0030.png | Bin .../WithArms/ChuckAnimations0031.png | Bin .../WithArms/ChuckAnimations0032.png | Bin .../WithArms/ChuckAnimations0033.png | Bin .../WithArms/ChuckAnimations0034.png | Bin .../WithArms/ChuckAnimations0035.png | Bin .../WithArms/ChuckAnimations0036.png | Bin .../WithArms/ChuckAnimations0037.png | Bin .../WithArms/ChuckAnimations0038.png | Bin .../WithArms/ChuckAnimations0039.png | Bin .../WithArms/ChuckAnimations0040.png | Bin .../WithArms/ChuckAnimations0041.png | Bin .../WithArms/ChuckAnimations0042.png | Bin .../WithArms/ChuckAnimations0043.png | Bin .../WithArms/ChuckAnimations0044.png | Bin .../WithArms/ChuckAnimations0045.png | Bin .../WithArms/ChuckAnimations0046.png | Bin .../WithArms/ChuckAnimations0047.png | Bin .../WithArms/ChuckAnimations0048.png | Bin .../WithArms/ChuckAnimations0049.png | Bin .../WithArms/ChuckAnimations0050.png | Bin .../WithArms/ChuckAnimations0051.png | Bin .../WithArms/ChuckAnimations0052.png | Bin .../WithArms/ChuckAnimations0053.png | Bin .../WithArms/ChuckAnimations0054.png | Bin .../WithArms/ChuckAnimations0055.png | Bin .../WithArms/ChuckAnimations0056.png | Bin .../WithArms/ChuckAnimations0057.png | Bin .../WithArms/ChuckAnimations0058.png | Bin .../WithArms/ChuckAnimations0059.png | Bin .../WithArms/ChuckAnimations0060.png | Bin .../WithArms/ChuckAnimations0061.png | Bin .../WithArms/ChuckAnimations0062.png | Bin .../WithArms/ChuckAnimations0063.png | Bin .../WithArms/ChuckAnimations0064.png | Bin .../WithArms/ChuckAnimations0065.png | Bin .../WithArms/ChuckAnimations0066.png | Bin .../WithArms/ChuckAnimations0067.png | Bin .../WithArms/ChuckAnimations0068.png | Bin .../WithArms/ChuckAnimations0069.png | Bin .../WithArms/ChuckAnimations0070.png | Bin .../WithArms/ChuckAnimations0071.png | Bin .../WithArms/ChuckAnimations0072.png | Bin .../WithArms/ChuckAnimations0073.png | Bin .../WithArms/ChuckAnimations0074.png | Bin .../WithArms/ChuckAnimations0075.png | Bin .../WithArms/ChuckAnimations0076.png | Bin .../WithArms/ChuckAnimations0077.png | Bin .../WithArms/ChuckAnimations0078.png | Bin .../WithArms/ChuckAnimations0079.png | Bin .../WithArms/ChuckAnimations0080.png | Bin .../WithArms/ChuckAnimations0081.png | Bin .../WithArms/ChuckAnimations0082.png | Bin .../WithArms/ChuckAnimations0083.png | Bin .../WithArms/ChuckAnimations0084.png | Bin .../WithArms/ChuckAnimations0085.png | Bin .../WithArms/ChuckAnimations0086.png | Bin .../WithArms/ChuckAnimations0087.png | Bin .../WithArms/ChuckAnimations0088.png | Bin .../WithArms/ChuckAnimations0089.png | Bin .../WithArms/ChuckAnimations0090.png | Bin .../WithArms/ChuckAnimations0091.png | Bin .../WithArms/ChuckAnimations0092.png | Bin .../WithArms/ChuckAnimations0093.png | Bin .../WithArms/ChuckAnimations0094.png | Bin .../WithArms/ChuckAnimations0095.png | Bin .../WithArms/ChuckAnimations0096.png | Bin .../WithArms/ChuckAnimations0097.png | Bin .../WithArms/ChuckAnimations0098.png | Bin .../WithArms/ChuckAnimations0099.png | Bin .../WithArms/ChuckAnimations0100.png | Bin .../WithArms/ChuckAnimations0101.png | Bin .../WithArms/ChuckAnimations0102.png | Bin .../WithArms/ChuckAnimations0103.png | Bin .../WithArms/ChuckAnimations0104.png | Bin .../WithArms/ChuckAnimations0105.png | Bin .../WithArms/ChuckAnimations0106.png | Bin .../WithArms/ChuckAnimations0107.png | Bin .../WithArms/ChuckAnimations0108.png | Bin .../WithArms/ChuckAnimations0109.png | Bin .../WithArms/ChuckAnimations0110.png | Bin .../WithArms/ChuckAnimations0111.png | Bin .../WithArms/ChuckAnimations0112.png | Bin .../WithArms/ChuckAnimations0113.png | Bin .../WithArms/ChuckAnimations0114.png | Bin .../WithArms/ChuckAnimations0115.png | Bin .../WithArms/ChuckAnimations0116.png | Bin .../WithArms/ChuckAnimations0117.png | Bin .../WithArms/ChuckAnimations0118.png | Bin .../WithArms/ChuckAnimations0119.png | Bin .../WithArms/ChuckAnimations0120.png | Bin .../WithArms/ChuckAnimations0121.png | Bin .../WithArms/ChuckAnimations0122.png | Bin .../WithArms/ChuckAnimations0123.png | Bin .../WithArms/ChuckAnimations0124.png | Bin .../WithArms/ChuckAnimations0125.png | Bin .../WithArms/ChuckAnimations0126.png | Bin .../ChuckAnimationsWithoutArms0001.png | Bin .../ChuckAnimationsWithoutArms0002.png | Bin .../ChuckAnimationsWithoutArms0003.png | Bin .../ChuckAnimationsWithoutArms0004.png | Bin .../ChuckAnimationsWithoutArms0005.png | Bin .../ChuckAnimationsWithoutArms0006.png | Bin .../ChuckAnimationsWithoutArms0007.png | Bin .../ChuckAnimationsWithoutArms0008.png | Bin .../ChuckAnimationsWithoutArms0009.png | Bin .../ChuckAnimationsWithoutArms0010.png | Bin .../ChuckAnimationsWithoutArms0011.png | Bin .../ChuckAnimationsWithoutArms0012.png | Bin .../ChuckAnimationsWithoutArms0013.png | Bin .../ChuckAnimationsWithoutArms0014.png | Bin .../ChuckAnimationsWithoutArms0015.png | Bin .../ChuckAnimationsWithoutArms0016.png | Bin .../ChuckAnimationsWithoutArms0017.png | Bin .../ChuckAnimationsWithoutArms0018.png | Bin .../ChuckAnimationsWithoutArms0019.png | Bin .../ChuckAnimationsWithoutArms0020.png | Bin .../ChuckAnimationsWithoutArms0021.png | Bin .../ChuckAnimationsWithoutArms0022.png | Bin .../ChuckAnimationsWithoutArms0023.png | Bin .../ChuckAnimationsWithoutArms0024.png | Bin .../ChuckAnimationsWithoutArms0025.png | Bin .../ChuckAnimationsWithoutArms0026.png | Bin .../ChuckAnimationsWithoutArms0027.png | Bin .../ChuckAnimationsWithoutArms0028.png | Bin .../ChuckAnimationsWithoutArms0029.png | Bin .../ChuckAnimationsWithoutArms0030.png | Bin .../ChuckAnimationsWithoutArms0031.png | Bin .../ChuckAnimationsWithoutArms0032.png | Bin .../ChuckAnimationsWithoutArms0033.png | Bin .../ChuckAnimationsWithoutArms0034.png | Bin .../ChuckAnimationsWithoutArms0035.png | Bin .../ChuckAnimationsWithoutArms0036.png | Bin .../ChuckAnimationsWithoutArms0037.png | Bin .../ChuckAnimationsWithoutArms0038.png | Bin .../ChuckAnimationsWithoutArms0039.png | Bin .../ChuckAnimationsWithoutArms0040.png | Bin .../ChuckAnimationsWithoutArms0041.png | Bin .../ChuckAnimationsWithoutArms0042.png | Bin .../ChuckAnimationsWithoutArms0043.png | Bin .../ChuckAnimationsWithoutArms0044.png | Bin .../ChuckAnimationsWithoutArms0045.png | Bin .../ChuckAnimationsWithoutArms0046.png | Bin .../ChuckAnimationsWithoutArms0047.png | Bin .../ChuckAnimationsWithoutArms0048.png | Bin .../ChuckAnimationsWithoutArms0049.png | Bin .../ChuckAnimationsWithoutArms0050.png | Bin .../ChuckAnimationsWithoutArms0051.png | Bin .../ChuckAnimationsWithoutArms0052.png | Bin .../ChuckAnimationsWithoutArms0053.png | Bin .../ChuckAnimationsWithoutArms0054.png | Bin .../ChuckAnimationsWithoutArms0055.png | Bin .../ChuckAnimationsWithoutArms0056.png | Bin .../ChuckAnimationsWithoutArms0057.png | Bin .../ChuckAnimationsWithoutArms0058.png | Bin .../ChuckAnimationsWithoutArms0059.png | Bin .../ChuckAnimationsWithoutArms0060.png | Bin .../ChuckAnimationsWithoutArms0061.png | Bin .../ChuckAnimationsWithoutArms0062.png | Bin .../ChuckAnimationsWithoutArms0063.png | Bin .../ChuckAnimationsWithoutArms0064.png | Bin .../ChuckAnimationsWithoutArms0065.png | Bin .../ChuckAnimationsWithoutArms0066.png | Bin .../ChuckAnimationsWithoutArms0067.png | Bin .../ChuckAnimationsWithoutArms0068.png | Bin .../ChuckAnimationsWithoutArms0069.png | Bin .../ChuckAnimationsWithoutArms0070.png | Bin .../ChuckAnimationsWithoutArms0071.png | Bin .../ChuckAnimationsWithoutArms0072.png | Bin .../ChuckAnimationsWithoutArms0073.png | Bin .../ChuckAnimationsWithoutArms0074.png | Bin .../ChuckAnimationsWithoutArms0075.png | Bin .../ChuckAnimationsWithoutArms0076.png | Bin .../ChuckAnimationsWithoutArms0077.png | Bin .../ChuckAnimationsWithoutArms0078.png | Bin .../ChuckAnimationsWithoutArms0079.png | Bin .../ChuckAnimationsWithoutArms0080.png | Bin .../ChuckAnimationsWithoutArms0081.png | Bin .../ChuckAnimationsWithoutArms0082.png | Bin .../ChuckAnimationsWithoutArms0083.png | Bin .../ChuckAnimationsWithoutArms0084.png | Bin .../ChuckAnimationsWithoutArms0085.png | Bin .../ChuckAnimationsWithoutArms0086.png | Bin .../ChuckAnimationsWithoutArms0087.png | Bin .../ChuckAnimationsWithoutArms0088.png | Bin .../ChuckAnimationsWithoutArms0089.png | Bin .../ChuckAnimationsWithoutArms0090.png | Bin .../ChuckAnimationsWithoutArms0091.png | Bin .../ChuckAnimationsWithoutArms0092.png | Bin .../ChuckAnimationsWithoutArms0093.png | Bin .../ChuckAnimationsWithoutArms0094.png | Bin .../ChuckAnimationsWithoutArms0095.png | Bin .../ChuckAnimationsWithoutArms0096.png | Bin .../ChuckAnimationsWithoutArms0097.png | Bin .../ChuckAnimationsWithoutArms0098.png | Bin .../ChuckAnimationsWithoutArms0099.png | Bin .../ChuckAnimationsWithoutArms0100.png | Bin .../ChuckAnimationsWithoutArms0101.png | Bin .../ChuckAnimationsWithoutArms0102.png | Bin .../ChuckAnimationsWithoutArms0103.png | Bin .../ChuckAnimationsWithoutArms0104.png | Bin .../ChuckAnimationsWithoutArms0105.png | Bin .../ChuckAnimationsWithoutArms0106.png | Bin .../ChuckAnimationsWithoutArms0107.png | Bin .../ChuckAnimationsWithoutArms0108.png | Bin .../ChuckAnimationsWithoutArms0109.png | Bin .../ChuckAnimationsWithoutArms0110.png | Bin .../ChuckAnimationsWithoutArms0111.png | Bin .../ChuckAnimationsWithoutArms0112.png | Bin .../ChuckAnimationsWithoutArms0113.png | Bin .../ChuckAnimationsWithoutArms0114.png | Bin .../ChuckAnimationsWithoutArms0115.png | Bin .../ChuckAnimationsWithoutArms0116.png | Bin .../ChuckAnimationsWithoutArms0117.png | Bin .../ChuckAnimationsWithoutArms0118.png | Bin .../ChuckAnimationsWithoutArms0119.png | Bin .../ChuckAnimationsWithoutArms0120.png | Bin .../ChuckAnimationsWithoutArms0121.png | Bin .../ChuckAnimationsWithoutArms0122.png | Bin .../ChuckAnimationsWithoutArms0123.png | Bin .../ChuckAnimationsWithoutArms0124.png | Bin .../ChuckAnimationsWithoutArms0125.png | Bin .../ChuckAnimationsWithoutArms0126.png | Bin .../Chuck}/Animation/chuckwitharmssprite.png | Bin .../Animation/chuckwithoutarmssprite.png | Bin static/img/paths.txt | 126 ------------------ 278 files changed, 306 insertions(+), 287 deletions(-) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0001.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0002.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0003.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0004.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0005.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0006.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0007.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0008.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0009.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0010.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0011.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0012.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0013.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0014.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0015.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0016.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0017.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0018.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0019.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0020.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0021.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0022.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0023.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0024.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0025.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0026.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0027.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0028.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0029.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0030.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0031.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0032.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0033.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0034.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0035.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0036.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0037.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0038.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0039.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0040.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0041.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0042.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0043.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0044.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0045.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0046.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0047.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0048.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0049.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0050.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0051.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0052.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0053.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0054.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0055.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0056.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0057.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0058.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0059.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0060.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0061.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0062.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0063.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0064.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0065.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0066.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0067.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0068.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0069.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0070.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0071.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0072.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0073.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0074.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0075.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0076.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0077.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0078.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0079.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0080.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0081.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0082.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0083.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0084.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0085.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0086.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0087.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0088.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0089.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0090.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0091.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0092.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0093.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0094.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0095.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0096.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0097.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0098.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0099.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0100.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0101.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0102.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0103.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0104.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0105.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0106.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0107.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0108.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0109.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0110.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0111.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0112.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0113.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0114.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0115.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0116.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0117.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0118.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0119.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0120.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0121.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0122.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0123.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0124.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0125.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithArms/ChuckAnimations0126.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0001.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0002.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0003.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0004.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0005.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0006.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0007.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0008.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0009.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0010.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0011.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0012.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0013.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0014.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0015.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0016.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0017.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0018.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0019.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0020.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0021.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0022.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0023.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0024.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0025.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0026.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0027.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0028.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0029.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0030.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0031.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0032.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0033.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0034.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0035.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0036.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0037.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0038.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0039.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0040.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0041.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0042.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0043.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0044.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0045.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0046.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0047.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0048.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0049.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0050.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0051.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0052.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0053.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0054.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0055.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0056.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0057.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0058.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0059.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0060.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0061.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0062.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0063.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0064.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0065.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0066.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0067.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0068.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0069.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0070.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0071.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0072.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0073.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0074.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0075.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0076.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0077.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0078.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0079.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0080.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0081.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0082.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0083.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0084.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0085.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0086.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0087.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0088.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0089.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0090.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0091.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0092.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0093.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0094.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0095.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0096.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0097.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0098.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0099.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0100.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0101.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0102.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0103.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0104.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0105.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0106.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0107.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0108.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0109.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0110.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0111.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0112.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0113.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0114.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0115.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0116.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0117.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0118.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0119.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0120.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0121.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0122.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0123.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0124.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0125.png (100%) rename static/img/{ => Characters/Chuck}/Animation/WithoutArms/ChuckAnimationsWithoutArms0126.png (100%) rename static/img/{ => Characters/Chuck}/Animation/chuckwitharmssprite.png (100%) rename static/img/{ => Characters/Chuck}/Animation/chuckwithoutarmssprite.png (100%) delete mode 100755 static/img/paths.txt diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js index 812ce21..a993544 100755 --- a/app/Game/Client/GameController.js +++ b/app/Game/Client/GameController.js @@ -56,6 +56,21 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Notificat DomController.statsEnd(); } + GameController.prototype.onClientReadyResponse = function(options) { + + if (options.spawnedPlayers) { + for(var i = 0; i < options.spawnedPlayers.length; i++) { + this.onSpawnPlayer(options.spawnedPlayers[i]); + } + } + + if (options.worldUpdate) { + this.onWorldUpdate(options.worldUpdate); + } + + this.createMe(options.userId); + }; + GameController.prototype.onWorldUpdate = function (updateData) { var body = this.physicsEngine.world.GetBodyList(); @@ -66,7 +81,7 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Notificat if(updateData[gameObject.uid]) { var update = updateData[gameObject.uid]; body.SetAwake(true); - body.SetPosition(this.centerBetween(update.p, body.GetPosition())); + body.SetPosition(update.p); body.SetAngle(update.a); body.SetLinearVelocity(update.lv); body.SetAngularVelocity(update.av); @@ -82,25 +97,7 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Notificat } - GameController.prototype.centerBetween = function(n, o) { - var x, y; - - if(n.x > o.x) { - x = o.x + (n.x - o.x) / 2; - } else { - x = o.x - (o.x - n.x) / 2; - } - - if(n.y > o.y) { - y = o.y + (n.y - o.y) / 2; - } else { - y = o.y - (o.y - n.y) / 2; - } - - return {x:x, y:y}; - }; - - GameController.prototype.onJoinMe = function (playerId) { + GameController.prototype.createMe = function (playerId) { this.me = this.players[playerId]; this.me.setPlayerController(new PlayerController(this.me)); this.view.setMe(this.me); @@ -161,7 +158,7 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Notificat GameController.prototype.onPlayerKill = function(options) { var player = this.players[options.playerId]; var killedByPlayer = this.players[options.killedByPlayerId]; - player.kill(killedByPlayer); + player.kill(killedByPlayer, options.ragDollId); }; GameController.prototype.onRemoveGameObject = function(options) { diff --git a/app/Game/Client/GameObjects/Doll.js b/app/Game/Client/GameObjects/Doll.js index b8a0138..fbf286c 100755 --- a/app/Game/Client/GameObjects/Doll.js +++ b/app/Game/Client/GameObjects/Doll.js @@ -61,7 +61,14 @@ function (Parent, Settings, NotificationCenter, Exception) { var texturePaths = []; for (var i = start; i <= end; i++) { - texturePaths.push(Settings.GRAPHICS_PATH + "Animation/WithArms/ChuckAnimations0" + padF(i) + ".png"); + texturePaths.push( + Settings.GRAPHICS_PATH + + Settings.GRAPHICS_SUBPATH_CHARACTERS + + this.characterName + + "/Animation/WithArms/ChuckAnimations0" + + padF(i) + + ".png" + ); } var callback = function(mesh) { diff --git a/app/Game/Client/Loader/Level.js b/app/Game/Client/Loader/Level.js index ce01e12..6a80692 100755 --- a/app/Game/Client/Loader/Level.js +++ b/app/Game/Client/Loader/Level.js @@ -1,9 +1,11 @@ define([ "Game/Core/Loader/Level", - "Game/Config/Settings" + "Game/Config/Settings", + "Lib/Utilities/NotificationCenter", + "Lib/Vendor/Pixi" ], -function (Parent, Settings) { +function (Parent, Settings, NotificationCenter, PIXI) { function Level (uid, engine, gameObjects) { Parent.call(this, uid, engine, gameObjects); @@ -12,12 +14,12 @@ function (Parent, Settings) { Level.prototype = Object.create(Parent.prototype); Level.prototype.loadLevelDataFromPath = function (path, callback) { - + var self = this; var xhr = new XMLHttpRequest(); xhr.onreadystatechange = function() { if(xhr.readyState == 4) { if(xhr.status == 200) { - callback(JSON.parse(xhr.responseText)) + self.loadAssets(JSON.parse(xhr.responseText), callback); } else { console.error("Ajax error: " + xhr.status + " " + xhr.statusText) } @@ -27,5 +29,62 @@ function (Parent, Settings) { xhr.send(null); } + Level.prototype.loadAssets = function(levelData, callback) { + + var paths = this.getAssetPaths(levelData); + + var count = 0; + var numPaths = paths.length; + var loader = new PIXI.AssetLoader(paths); + loader.onComplete = function() { callback(levelData); }; + loader.onProgress = function() { + var progress = parseInt(100 / numPaths * ++count, 10) + 1; + NotificationCenter.trigger("view/updateLoader", progress); + } + loader.load(); + }; + + Level.prototype.getAssetPaths = function(levelData) { + + var paths = []; + + // Get chuck + var padF = function(n) { + if(n<10) return "00" + n; + if(n<100) return "0" + n; + return n; + } + + var characterNames = ["Chuck"]; + var animationSets = ["WithArms"]; // FIXME add WithoutArms + for (var i = 0; i < characterNames.length; i++) { + var characterName = characterNames[i]; + for (var j = 1; j <= 126; j++) { + for (var k = 0; k < animationSets.length; k++) { + var animationSet = animationSets[k]; + paths.push( + Settings.GRAPHICS_PATH + + Settings.GRAPHICS_SUBPATH_CHARACTERS + + characterName + + "/Animation/" + + animationSet + + "/ChuckAnimations0" + + padF(j) + + ".png" + ); + }; + }; + }; + + paths.push( + Settings.GRAPHICS_PATH + + Settings.GRAPHICS_SUBPATH_CHARACTERS + + characterName + + "/head.png" + ); + + return paths; + }; + return Level; }); \ No newline at end of file diff --git a/app/Game/Client/Loader/TiledLevel.js b/app/Game/Client/Loader/TiledLevel.js index e23fbd3..cd5fb98 100644 --- a/app/Game/Client/Loader/TiledLevel.js +++ b/app/Game/Client/Loader/TiledLevel.js @@ -1,9 +1,50 @@ define([ - "Game/Core/Loader/TiledLevel" + "Game/Core/Loader/TiledLevel", + "Game/Config/Settings" ], -function (Parent) { +function (Parent, Settings) { + + function TiledLevel(uid, engine, gameObjects) { + Parent.call(this, uid, engine, gameObjects); + } - return Parent; + TiledLevel.prototype = Object.create(Parent.prototype); + + TiledLevel.prototype.getAssetPaths = function(levelData) { + var paths = Parent.prototype.getAssetPaths.call(this, levelData); + + // Get tiles images + for (var i = 0; i < levelData.tilesets.length; i++) { + var tileset = levelData.tilesets[i]; + for (var key in tileset.tiles) { + var imagePpath = tileset.tiles[key].image; + if(imagePpath) { + paths.push(Settings.MAPS_PATH + imagePpath); + } + } + }; + + // Get items images + var objects = this.getLayer(levelData, "items").objects; + for (var i = 0; i < objects.length; i++) { + var object = objects[i]; + var options = object.properties; + + var texturePath = Settings.GRAPHICS_PATH + + Settings.GRAPHICS_SUBPATH_ITEMS + + options.category + '/' + + options.image; + + paths.push(texturePath); + }; + + // FIXME: Get background image + + return paths; + + } + + return TiledLevel; }); \ No newline at end of file diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js index bd02287..5ee400d 100755 --- a/app/Game/Client/Networker.js +++ b/app/Game/Client/Networker.js @@ -13,6 +13,7 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do this.socketLink = socketLink; this.gameController = null; this.users = {}; + this.userId = null; this.socketLink.on('connect', this.onConnect.bind(this)); this.socketLink.on('disconnect', this.onDisconnect.bind(this)); @@ -26,6 +27,7 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do }); NotificationCenter.on("sendGameCommand", this.sendGameCommand, this); + NotificationCenter.on("game/level/loaded", this.onLevelLoaded, this); } // Socket callbacks @@ -43,15 +45,12 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do } Networker.prototype.onJoinSuccess = function (options) { - NotificationCenter.on("game/level/loaded", function() { - this.onLevelLoaded(options); - }, this); + this.userId = options.userId; this.gameController = new GameController(); this.gameController.loadLevel(options.levelUid); this.onUserJoined(options.userId); - this.gameController.onJoinMe(options.userId); if (options.joinedUsers) { for(var i = 0; i < options.joinedUsers.length; i++) { @@ -62,20 +61,15 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do this.initPing(); } - Networker.prototype.onLevelLoaded = function(options) { - if (options.spawnedPlayers) { - for(var i = 0; i < options.spawnedPlayers.length; i++) { - this.gameController.onSpawnPlayer(options.spawnedPlayers[i]); - } + Networker.prototype.onLevelLoaded = function() { + for (var userId in this.users) { + this.gameController.createPlayer(this.users[userId]); } - if (options.worldUpdate) { - this.gameController.onWorldUpdate(options.worldUpdate); - } + this.sendGameCommand("clientReady"); }; Networker.prototype.initPing = function() { - this.ping(); }; @@ -85,7 +79,8 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do // Sending commands - + + // Remember: control commands are coordinator relevant commands Networker.prototype.sendCommand = function (command, options) { var message = ProtocolHelper.encodeCommand(command, options); this.socketLink.send(message); @@ -105,12 +100,18 @@ function (ProtocolHelper, GameController, User, NotificationCenter, Settings, Do Networker.prototype.onUserJoined = function (userId) { var user = new User(userId); this.users[userId] = user; - this.gameController.userJoined(user); + + if (this.gameController + && this.gameController.level + && this.gameController.level.isLoaded) { + + this.gameController.createPlayer(user); + }; } Networker.prototype.onUserLeft = function (userId) { var user = this.users[userId]; - this.gameController.userLeft(user); + this.gameController.onUserLeft(user); delete this.users[userId]; } diff --git a/app/Game/Client/Player.js b/app/Game/Client/Player.js index af6d21b..81b524e 100755 --- a/app/Game/Client/Player.js +++ b/app/Game/Client/Player.js @@ -50,11 +50,6 @@ function (Parent, NotificationCenter, Settings) { } }; - - Player.prototype.kill = function(killedByPlayer) { - Parent.prototype.kill.call(this, killedByPlayer); - }; - Player.prototype.spawn = function(x, y) { Parent.prototype.spawn.call(this, x, y); this.setPlayerInfoVisible(false); diff --git a/app/Game/Client/View/Views/AbstractView.js b/app/Game/Client/View/Views/AbstractView.js index f274cb7..4c9fa91 100755 --- a/app/Game/Client/View/Views/AbstractView.js +++ b/app/Game/Client/View/Views/AbstractView.js @@ -26,6 +26,8 @@ function (DomController, Settings, Exception, NotificationCenter) { NotificationCenter.on("view/createAndAddPlayerInfo", this.onCreateAndAddPlayerInfo, this); NotificationCenter.on("view/updatePlayerInfo", this.onUpdatePlayerInfo, this); NotificationCenter.on("view/removePlayerInfo", this.onRemovePlayerInfo, this); + + NotificationCenter.on("view/updateLoader", this.onUpdateLoader, this); } AbstractView.prototype.isWebGlEnabled = function () { @@ -147,5 +149,9 @@ function (DomController, Settings, Exception, NotificationCenter) { throw new Exception('Abstract Function onRemovePlayerInfo not overwritten'); }; + AbstractView.prototype.onUpdateLoader = function(progress) { + throw new Exception('Abstract Function onUpdateLoader not overwritten'); + }; + return AbstractView; }); \ No newline at end of file diff --git a/app/Game/Client/View/Views/PixiView.js b/app/Game/Client/View/Views/PixiView.js index 087a03b..3a362cf 100755 --- a/app/Game/Client/View/Views/PixiView.js +++ b/app/Game/Client/View/Views/PixiView.js @@ -19,6 +19,7 @@ function (Parent, DomController, PIXI, Settings, NotificationCenter) { this.infoContainer = null; this.infoFilters = []; this.infoBox = null; + this.loader = null; this.init(); this.pixi = PIXI; } @@ -39,6 +40,7 @@ function (Parent, DomController, PIXI, Settings, NotificationCenter) { this.initCamera(); this.initInfo(); + this.initLoader(); this.setCanvas(this.renderer.view); } @@ -247,5 +249,41 @@ function (Parent, DomController, PIXI, Settings, NotificationCenter) { this.container.removeChild(playerInfo); }; + PixiView.prototype.initLoader = function() { + this.loader = new PIXI.Graphics(); + this.stage.addChild(this.loader); + this.onUpdateLoader(0); + }; + + PixiView.prototype.onUpdateLoader = function(progress) { + var width = 200, + height = 5, + borderWidth = 1; + + if(progress < 100) { + this.loader.clear(); + + this.loader.beginFill(0x000000); + this.loader.lineStyle(borderWidth, 0x000000); + this.loader.drawRect(0, 0, width, height); + this.loader.endFill(); + + if(progress > 0) { + var color = 0xFF0FA3; + this.loader.beginFill(color); + this.loader.lineStyle(0, 0x000000); + this.loader.drawRect(borderWidth, borderWidth, width * progress / 100, height); + this.loader.endFill(); + } + + this.loader.position = new PIXI.Point( + Settings.STAGE_WIDTH / 2 - width / 2 - borderWidth, + Settings.STAGE_HEIGHT / 2 - height / 2 - borderWidth + ); + } + + this.loader.visible = progress < 100; + }; + return PixiView; }); diff --git a/app/Game/Core/GameController.js b/app/Game/Core/GameController.js index 631b2cb..e7fae16 100755 --- a/app/Game/Core/GameController.js +++ b/app/Game/Core/GameController.js @@ -20,6 +20,8 @@ function (PhysicsEngine, TiledLevel, Player, NotificationCenter) { NotificationCenter.on("game/object/add", this.onGameObjectAdd, this); NotificationCenter.on("game/object/remove", this.onGameObjectRemove, this); + + this.update(); } GameController.prototype.update = function() { @@ -61,7 +63,7 @@ function (PhysicsEngine, TiledLevel, Player, NotificationCenter) { }; GameController.prototype.onLevelLoaded = function() { - this.update(); + }; @@ -71,11 +73,13 @@ function (PhysicsEngine, TiledLevel, Player, NotificationCenter) { } } + /* GameController.prototype.userJoined = function (user) { this.players[user.id] = this.createPlayer(user); } + */ - GameController.prototype.userLeft = function (user) { + GameController.prototype.onUserLeft = function (user) { var player = this.players[user.id]; var i = this.gameObjects.animated.indexOf(player); @@ -86,7 +90,9 @@ function (PhysicsEngine, TiledLevel, Player, NotificationCenter) { } GameController.prototype.createPlayer = function(user) { - return new Player(user.id, this.physicsEngine); + var player = new Player(user.id, this.physicsEngine); + this.players[user.id] = player; + return player; }; return GameController; diff --git a/app/Game/Core/GameObjects/Doll.js b/app/Game/Core/GameObjects/Doll.js index 8f59d24..21e6051 100755 --- a/app/Game/Core/GameObjects/Doll.js +++ b/app/Game/Core/GameObjects/Doll.js @@ -10,6 +10,7 @@ function (Parent, Box2D, Settings, CollisionDetector, Item) { function Doll (physicsEngine, uid, player) { + this.characterName = "Chuck"; this.player = player; this.height = 43; this.width = 9; diff --git a/app/Game/Core/GameObjects/Item.js b/app/Game/Core/GameObjects/Item.js index 1e53f12..29d7d4e 100644 --- a/app/Game/Core/GameObjects/Item.js +++ b/app/Game/Core/GameObjects/Item.js @@ -122,7 +122,7 @@ function (Parent, Box2D, Options, Settings) { var vector = new Box2D.Common.Math.b2Vec2( x * Settings.MAX_THROW_FORCE / this.options.weight, - -y * Settings.MAX_THROW_FORCE * 1.5 / this.options.weight // 1.5 is to throw higher then far + -y * Settings.MAX_THROW_FORCE / this.options.weight ); this.body.SetLinearVelocity(vector); diff --git a/app/Game/Core/Loader/TiledLevel.js b/app/Game/Core/Loader/TiledLevel.js index 016b33e..4303faa 100755 --- a/app/Game/Core/Loader/TiledLevel.js +++ b/app/Game/Core/Loader/TiledLevel.js @@ -22,7 +22,7 @@ define([ throw "Level: Can't create level, nothing found"; } - var collisionLayer = this.getLayer("collision"); + var collisionLayer = this.getLayer(this.levelData, "collision"); if(collisionLayer) { @@ -56,7 +56,7 @@ define([ } TiledLevel.prototype.createItems = function() { - var objects = this.getLayer("items").objects; + var objects = this.getLayer(this.levelData, "items").objects; for (var i = 0; i < objects.length; i++) { var object = objects[i]; var options = object.properties; @@ -84,7 +84,7 @@ define([ return Parent.prototype.getRandomSpawnPoint.call(this); } else { - var spawnLayer = this.getLayer("spawnpoints"); + var spawnLayer = this.getLayer(this.levelData, "spawnpoints"); var size = spawnLayer.objects.length; var object = spawnLayer.objects[parseInt(Math.random() * (size -1), 10)]; @@ -97,10 +97,10 @@ define([ } }; - TiledLevel.prototype.getLayer = function(name) { - for (var i = 0; i < this.levelData.layers.length; i++) { - if(this.levelData.layers[i].name === name) { - return this.levelData.layers[i]; + TiledLevel.prototype.getLayer = function(levelData, name) { + for (var i = 0; i < levelData.layers.length; i++) { + if(levelData.layers[i].name === name) { + return levelData.layers[i]; } } diff --git a/app/Game/Core/Player.js b/app/Game/Core/Player.js index eb945b3..957d847 100755 --- a/app/Game/Core/Player.js +++ b/app/Game/Core/Player.js @@ -26,11 +26,6 @@ function (Doll, Settings, NotificationCenter, Exception, SpectatorDoll, RagDoll) this.spectatorDoll = new SpectatorDoll(this.physicsEngine, "spectatorDoll-" + this.id, this); } - Player.prototype.getDoll = function() { - throw new Exception('-- PLEASE REMOVE getDoll Calls --'); - return this.doll; - }; - Player.prototype.getActiveDoll = function() { if(this.isSpawned) { return this.doll; @@ -96,7 +91,7 @@ function (Doll, Settings, NotificationCenter, Exception, SpectatorDoll, RagDoll) this.holdingItem = null; }; - Player.prototype.kill = function(killedByPlayer) { + Player.prototype.kill = function(killedByPlayer, ragDollId) { if(!this.isSpawned) return false; // FIXME: do something better then just respawn in GameController @@ -119,9 +114,9 @@ function (Doll, Settings, NotificationCenter, Exception, SpectatorDoll, RagDoll) height: 12 }; - var ragDoll = new RagDoll(this.physicsEngine, "ragDoll-" + this.id, options); + var ragDoll = new RagDoll(this.physicsEngine, "ragDoll-" + this.id + "-" + ragDollId, options); ragDoll.setVelocities(this.doll.getVelocities()); - + console.log(ragDoll.uid) this.isSpawned = false; diff --git a/app/Game/Server/Channel.js b/app/Game/Server/Channel.js index 943bb93..76d8dc6 100755 --- a/app/Game/Server/Channel.js +++ b/app/Game/Server/Channel.js @@ -60,8 +60,6 @@ Channel.prototype.sendJoinSuccess = function(userId) { var user = new User(userId, this); var joinedUsers = Object.keys(this.users); - var spawnedPlayers = this.gameController.getSpawnedPlayersAndTheirPositions(); - var worldUpdate = this.gameController.getWorldUpdateObject(true); var levelUid = null; if(this.gameController.level) { @@ -74,8 +72,6 @@ userId: user.id, channelName: this.name, joinedUsers: joinedUsers, - spawnedPlayers: spawnedPlayers, - worldUpdate: worldUpdate, levelUid: levelUid }; diff --git a/app/Game/Server/GameController.js b/app/Game/Server/GameController.js index 3bf402a..47f9d3e 100755 --- a/app/Game/Server/GameController.js +++ b/app/Game/Server/GameController.js @@ -19,10 +19,11 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N Parent.call(this); - NotificationCenter.on('user/joined', this.userJoined, this); - NotificationCenter.on('user/left', this.userLeft, this); // FIXME: refactor this.userLeft -> this.onUserLeft, even in core and client + NotificationCenter.on('user/joined', this.onUserJoined, this); + NotificationCenter.on('user/left', this.onUserLeft, this); // FIXME: refactor this.userLeft -> this.onUserLeft, even in core and client NotificationCenter.on('user/resetLevel', this.onResetLevel, this); - NotificationCenter.on('player/killed', this.spawnPlayer, this); + NotificationCenter.on('user/clientReady', this.onClientReady, this); + NotificationCenter.on('player/killed', this.onPlayerKilled, this); console.checkpoint('starting game controller for channel ' + channel.name); @@ -49,13 +50,20 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N this.updateWorld(); }; - GameController.prototype.userJoined = function (user) { - Parent.prototype.userJoined.call(this, user); - var player = this.players[user.id]; - user.setPlayer(player); - this.spawnPlayer(player, 0); + GameController.prototype.onUserJoined = function (user) { + this.createPlayer(user); } + GameController.prototype.createPlayer = function(user) { + var player = Parent.prototype.createPlayer.call(this, user); + player.setPlayerController(new PlayerController(player)) + user.setPlayer(player); + }; + + GameController.prototype.onPlayerKilled = function(player, respawnTime) { + this.spawnPlayer(player, respawnTime); + }; + GameController.prototype.spawnPlayer = function(player, respawnTime) { var self = this; var spawnPoint = this.level.getRandomSpawnPoint(); @@ -81,12 +89,14 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N }, respawnTime * 1000); }; + /* GameController.prototype.createPlayer = function(user) { var player = new Player(user.id, this.physicsEngine); player.setPlayerController(new PlayerController(player)) return player; }; + */ GameController.prototype.updateWorld = function () { @@ -154,6 +164,40 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N return spawnedPlayers; }; + GameController.prototype.getAdditionalObjects = function() { + var objects = [] + + for (var i = 0; i < this.gameObjects.animated.length; i++) { + if(this.gameObjects.animated[i] instanceof RagDoll) { + var object = this.gameObjects.animated[i]; + objects.push({ + uid: objects.uid, + options: object.options, + x: object.getPosition().x, + y: object.getPosition().y + }); + } + }; + var object = { + // FIXME: finish it! + } + + return objects; + }; + + GameController.prototype.onClientReady = function(userId) { + var player = this.players[userId]; + this.spawnPlayer(player, 0); + + var options = { + spawnedPlayers: this.getSpawnedPlayersAndTheirPositions(), + worldUpdate: this.getWorldUpdateObject(true), + userId: userId + } + + NotificationCenter.trigger('user/' + userId + "/gameCommand", "clientReadyResponse", options); + }; + GameController.prototype.onResetLevel = function(userId) { Parent.prototype.onResetLevel.call(this); NotificationCenter.trigger("broadcastControlCommand", "gameCommand", {resetLevel:true}); diff --git a/app/Game/Server/Player.js b/app/Game/Server/Player.js index 3dc1739..4c41018 100755 --- a/app/Game/Server/Player.js +++ b/app/Game/Server/Player.js @@ -80,12 +80,15 @@ function (Parent, NotificationCenter) { }; Player.prototype.kill = function(killedByPlayer) { - Parent.prototype.kill.call(this, killedByPlayer); this.stats.deaths++; + var ragDollId = this.stats.deaths; + Parent.prototype.kill.call(this, killedByPlayer, ragDollId); + this.broadcastStats(); NotificationCenter.trigger("broadcastGameCommand", "playerKill", { playerId: this.id, - killedByPlayerId: killedByPlayer.id + killedByPlayerId: killedByPlayer.id, + ragDollId: ragDollId }); if(this.ragDoll) { diff --git a/app/Game/Server/User.js b/app/Game/Server/User.js index 86b93e2..d02c373 100755 --- a/app/Game/Server/User.js +++ b/app/Game/Server/User.js @@ -50,9 +50,12 @@ function(Parent, NotificationCenter, ProtocolHelper, ProtocolParser) { if(command.hasOwnProperty("resetLevel")) { NotificationCenter.trigger("user/resetLevel", this.id); + } else if(command.hasOwnProperty("clientReady")) { + NotificationCenter.trigger("user/clientReady", this.id); } else { this.player.playerController.applyCommand(command); } + }; diff --git a/app/Lib/Utilities/Extensions.js b/app/Lib/Utilities/Extensions.js index edc97f7..6af99e1 100755 --- a/app/Lib/Utilities/Extensions.js +++ b/app/Lib/Utilities/Extensions.js @@ -8,4 +8,19 @@ function() { return f + this.substr(1); } + if(GLOBALS.context == "Server") { + + console.checkpoint = function (s) { + console.log(' \033[32mbeep - \033[0m' + s); + } + + console.warn = function (s) { + console.log(' \033[33mwarn - \033[0m' + s); + } + + console.error = function (s) { + console.log(' \033[31merror - \033[0m' + s); + } + } + }); \ No newline at end of file diff --git a/app/Lobby/User.js b/app/Lobby/User.js index a6c312d..8a15316 100755 --- a/app/Lobby/User.js +++ b/app/Lobby/User.js @@ -38,6 +38,7 @@ function (Parent, ProtocolHelper, NotificationCenter) { // User command callbacks + // Remember: control commands are coordinator relevant commands User.prototype.onJoin = function(options) { this.coordinator.assignUserToChannel(this, options); diff --git a/channel.js b/channel.js index 9c92c0e..6d397d8 100755 --- a/channel.js +++ b/channel.js @@ -9,10 +9,6 @@ requirejs.config({ var inspector = {}; -console.checkpoint = function (s) { - console.log(' \033[34mbeep - \033[0m' + s); -} - requirejs([ "Game/Server/PipeToLobby" ], diff --git a/client.js b/client.js index 9aa6ff4..bf6cc0d 100755 --- a/client.js +++ b/client.js @@ -18,48 +18,18 @@ requirejs([ function (Networker, SocketIO, Settings, Exception, PIXI) { - function loadAssets(callback) { - var url = "static/img/paths.txt"; - var loaded = document.getElementById("loaded"); - var loading = document.getElementById("loading"); - var count = 0; - - var xhr = new XMLHttpRequest(); - xhr.onreadystatechange = function() { - if(xhr.readyState == 4) { - if(xhr.status == 200) { - var paths = xhr.responseText.split("\n"); - var max = paths.length; - loader = new PIXI.AssetLoader(paths); - loader.onComplete = function() { loading.style.display = "none"; callback(); }; - loader.onProgress = function() { loaded.style.width = (100 / max * ++count) + "%"; } - loader.load(); - } else { - throw new Exception("Assets preloader error: " + xhr.status + " " + xhr.statusText) - } - } - } - xhr.open("GET", url, true); - xhr.send(null); - //callback(); - } - - loadAssets(function() { - var options = { - "reconnect": false, - "reconnection delay": 500, - "max reconnection attempts": 10, - - "transports": [ - "websocket", - "flashsocket" - ], - }; - var socket = SocketIO.connect(location.href, options); - var networker = new Networker(socket); - inspector.networker = networker; - inspector.settings = Settings; - inspector.resetLevel = function() { networker.sendGameCommand("resetLevel"); } - }); - + var options = { + "reconnect": false, + "reconnection delay": 500, + "max reconnection attempts": 10, + "transports": [ + "websocket", + "flashsocket" + ] + }; + var socket = SocketIO.connect(location.href, options); + var networker = new Networker(socket); + inspector.networker = networker; + inspector.settings = Settings; + inspector.resetLevel = function() { networker.sendGameCommand("resetLevel"); } }); \ No newline at end of file diff --git a/server.js b/server.js index 899c13a..28c88d4 100755 --- a/server.js +++ b/server.js @@ -20,18 +20,6 @@ var options = { logLevel: process.argv[3] || 0 }; -console.checkpoint = function (s) { - console.log(' \033[32mbeep - \033[0m' + s); -} - -console.warn = function (s) { - console.log(' \033[33mwarn - \033[0m' + s); -} - -console.error = function (s) { - console.log(' \033[31merror - \033[0m' + s); -} - requirejs([ "Bootstrap/HttpServer", "Bootstrap/Socket", diff --git a/static/html/index.html b/static/html/index.html index 19e8c6f..e043031 100755 --- a/static/html/index.html +++ b/static/html/index.html @@ -14,21 +14,6 @@ color: white; font-family: monospace; } - - #loading { - border: 1px solid white; - display: table-cell; - vertical-align: middle; - height: 100%; - } - - #loaded { - height: 10px; - margin: 0; - padding: 0; - border: 1px solid black; - background: white; - } #canvasContainer { /* @@ -70,9 +55,7 @@ -

-
-
+
diff --git a/static/img/Animation/WithArms/ChuckAnimations0001.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0001.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0001.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0001.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0002.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0002.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0002.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0002.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0003.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0003.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0003.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0003.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0004.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0004.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0004.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0004.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0005.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0005.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0005.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0005.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0006.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0006.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0006.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0006.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0007.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0007.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0007.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0007.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0008.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0008.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0008.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0008.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0009.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0009.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0009.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0009.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0010.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0010.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0010.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0010.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0011.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0011.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0011.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0011.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0012.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0012.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0012.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0012.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0013.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0013.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0013.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0013.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0014.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0014.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0014.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0014.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0015.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0015.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0015.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0015.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0016.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0016.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0016.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0016.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0017.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0017.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0017.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0017.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0018.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0018.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0018.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0018.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0019.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0019.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0019.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0019.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0020.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0020.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0020.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0020.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0021.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0021.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0021.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0021.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0022.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0022.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0022.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0022.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0023.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0023.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0023.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0023.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0024.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0024.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0024.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0024.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0025.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0025.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0025.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0025.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0026.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0026.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0026.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0026.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0027.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0027.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0027.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0027.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0028.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0028.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0028.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0028.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0029.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0029.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0029.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0029.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0030.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0030.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0030.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0030.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0031.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0031.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0031.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0031.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0032.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0032.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0032.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0032.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0033.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0033.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0033.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0033.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0034.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0034.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0034.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0034.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0035.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0035.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0035.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0035.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0036.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0036.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0036.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0036.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0037.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0037.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0037.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0037.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0038.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0038.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0038.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0038.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0039.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0039.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0039.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0039.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0040.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0040.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0040.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0040.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0041.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0041.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0041.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0041.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0042.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0042.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0042.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0042.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0043.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0043.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0043.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0043.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0044.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0044.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0044.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0044.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0045.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0045.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0045.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0045.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0046.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0046.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0046.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0046.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0047.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0047.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0047.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0047.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0048.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0048.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0048.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0048.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0049.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0049.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0049.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0049.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0050.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0050.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0050.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0050.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0051.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0051.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0051.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0051.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0052.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0052.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0052.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0052.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0053.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0053.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0053.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0053.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0054.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0054.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0054.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0054.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0055.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0055.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0055.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0055.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0056.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0056.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0056.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0056.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0057.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0057.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0057.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0057.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0058.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0058.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0058.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0058.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0059.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0059.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0059.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0059.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0060.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0060.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0060.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0060.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0061.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0061.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0061.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0061.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0062.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0062.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0062.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0062.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0063.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0063.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0063.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0063.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0064.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0064.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0064.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0064.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0065.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0065.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0065.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0065.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0066.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0066.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0066.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0066.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0067.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0067.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0067.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0067.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0068.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0068.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0068.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0068.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0069.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0069.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0069.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0069.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0070.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0070.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0070.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0070.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0071.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0071.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0071.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0071.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0072.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0072.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0072.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0072.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0073.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0073.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0073.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0073.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0074.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0074.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0074.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0074.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0075.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0075.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0075.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0075.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0076.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0076.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0076.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0076.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0077.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0077.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0077.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0077.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0078.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0078.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0078.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0078.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0079.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0079.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0079.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0079.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0080.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0080.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0080.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0080.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0081.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0081.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0081.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0081.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0082.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0082.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0082.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0082.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0083.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0083.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0083.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0083.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0084.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0084.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0084.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0084.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0085.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0085.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0085.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0085.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0086.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0086.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0086.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0086.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0087.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0087.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0087.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0087.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0088.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0088.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0088.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0088.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0089.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0089.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0089.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0089.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0090.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0090.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0090.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0090.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0091.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0091.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0091.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0091.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0092.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0092.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0092.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0092.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0093.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0093.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0093.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0093.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0094.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0094.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0094.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0094.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0095.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0095.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0095.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0095.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0096.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0096.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0096.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0096.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0097.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0097.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0097.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0097.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0098.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0098.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0098.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0098.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0099.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0099.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0099.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0099.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0100.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0100.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0100.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0100.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0101.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0101.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0101.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0101.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0102.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0102.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0102.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0102.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0103.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0103.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0103.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0103.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0104.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0104.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0104.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0104.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0105.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0105.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0105.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0105.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0106.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0106.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0106.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0106.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0107.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0107.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0107.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0107.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0108.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0108.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0108.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0108.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0109.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0109.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0109.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0109.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0110.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0110.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0110.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0110.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0111.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0111.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0111.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0111.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0112.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0112.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0112.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0112.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0113.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0113.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0113.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0113.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0114.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0114.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0114.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0114.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0115.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0115.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0115.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0115.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0116.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0116.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0116.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0116.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0117.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0117.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0117.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0117.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0118.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0118.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0118.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0118.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0119.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0119.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0119.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0119.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0120.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0120.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0120.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0120.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0121.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0121.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0121.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0121.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0122.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0122.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0122.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0122.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0123.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0123.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0123.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0123.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0124.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0124.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0124.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0124.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0125.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0125.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0125.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0125.png diff --git a/static/img/Animation/WithArms/ChuckAnimations0126.png b/static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0126.png similarity index 100% rename from static/img/Animation/WithArms/ChuckAnimations0126.png rename to static/img/Characters/Chuck/Animation/WithArms/ChuckAnimations0126.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0001.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0001.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0001.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0001.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0002.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0002.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0002.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0002.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0003.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0003.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0003.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0003.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0004.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0004.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0004.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0004.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0005.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0005.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0005.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0005.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0006.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0006.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0006.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0006.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0007.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0007.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0007.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0007.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0008.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0008.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0008.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0008.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0009.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0009.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0009.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0009.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0010.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0010.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0010.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0010.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0011.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0011.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0011.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0011.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0012.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0012.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0012.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0012.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0013.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0013.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0013.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0013.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0014.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0014.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0014.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0014.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0015.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0015.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0015.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0015.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0016.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0016.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0016.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0016.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0017.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0017.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0017.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0017.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0018.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0018.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0018.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0018.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0019.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0019.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0019.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0019.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0020.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0020.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0020.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0020.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0021.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0021.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0021.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0021.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0022.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0022.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0022.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0022.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0023.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0023.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0023.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0023.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0024.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0024.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0024.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0024.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0025.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0025.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0025.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0025.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0026.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0026.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0026.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0026.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0027.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0027.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0027.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0027.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0028.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0028.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0028.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0028.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0029.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0029.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0029.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0029.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0030.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0030.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0030.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0030.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0031.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0031.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0031.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0031.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0032.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0032.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0032.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0032.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0033.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0033.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0033.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0033.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0034.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0034.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0034.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0034.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0035.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0035.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0035.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0035.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0036.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0036.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0036.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0036.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0037.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0037.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0037.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0037.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0038.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0038.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0038.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0038.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0039.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0039.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0039.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0039.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0040.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0040.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0040.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0040.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0041.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0041.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0041.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0041.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0042.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0042.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0042.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0042.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0043.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0043.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0043.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0043.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0044.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0044.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0044.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0044.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0045.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0045.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0045.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0045.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0046.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0046.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0046.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0046.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0047.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0047.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0047.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0047.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0048.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0048.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0048.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0048.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0049.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0049.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0049.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0049.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0050.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0050.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0050.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0050.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0051.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0051.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0051.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0051.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0052.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0052.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0052.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0052.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0053.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0053.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0053.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0053.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0054.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0054.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0054.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0054.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0055.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0055.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0055.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0055.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0056.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0056.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0056.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0056.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0057.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0057.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0057.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0057.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0058.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0058.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0058.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0058.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0059.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0059.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0059.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0059.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0060.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0060.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0060.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0060.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0061.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0061.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0061.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0061.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0062.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0062.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0062.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0062.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0063.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0063.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0063.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0063.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0064.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0064.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0064.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0064.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0065.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0065.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0065.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0065.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0066.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0066.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0066.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0066.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0067.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0067.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0067.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0067.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0068.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0068.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0068.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0068.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0069.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0069.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0069.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0069.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0070.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0070.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0070.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0070.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0071.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0071.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0071.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0071.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0072.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0072.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0072.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0072.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0073.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0073.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0073.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0073.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0074.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0074.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0074.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0074.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0075.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0075.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0075.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0075.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0076.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0076.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0076.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0076.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0077.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0077.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0077.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0077.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0078.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0078.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0078.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0078.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0079.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0079.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0079.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0079.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0080.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0080.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0080.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0080.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0081.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0081.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0081.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0081.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0082.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0082.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0082.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0082.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0083.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0083.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0083.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0083.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0084.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0084.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0084.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0084.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0085.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0085.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0085.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0085.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0086.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0086.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0086.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0086.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0087.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0087.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0087.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0087.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0088.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0088.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0088.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0088.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0089.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0089.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0089.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0089.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0090.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0090.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0090.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0090.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0091.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0091.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0091.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0091.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0092.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0092.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0092.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0092.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0093.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0093.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0093.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0093.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0094.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0094.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0094.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0094.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0095.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0095.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0095.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0095.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0096.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0096.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0096.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0096.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0097.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0097.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0097.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0097.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0098.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0098.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0098.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0098.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0099.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0099.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0099.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0099.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0100.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0100.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0100.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0100.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0101.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0101.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0101.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0101.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0102.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0102.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0102.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0102.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0103.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0103.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0103.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0103.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0104.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0104.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0104.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0104.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0105.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0105.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0105.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0105.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0106.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0106.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0106.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0106.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0107.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0107.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0107.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0107.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0108.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0108.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0108.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0108.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0109.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0109.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0109.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0109.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0110.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0110.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0110.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0110.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0111.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0111.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0111.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0111.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0112.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0112.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0112.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0112.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0113.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0113.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0113.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0113.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0114.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0114.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0114.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0114.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0115.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0115.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0115.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0115.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0116.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0116.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0116.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0116.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0117.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0117.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0117.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0117.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0118.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0118.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0118.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0118.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0119.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0119.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0119.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0119.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0120.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0120.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0120.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0120.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0121.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0121.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0121.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0121.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0122.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0122.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0122.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0122.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0123.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0123.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0123.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0123.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0124.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0124.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0124.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0124.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0125.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0125.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0125.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0125.png diff --git a/static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0126.png b/static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0126.png similarity index 100% rename from static/img/Animation/WithoutArms/ChuckAnimationsWithoutArms0126.png rename to static/img/Characters/Chuck/Animation/WithoutArms/ChuckAnimationsWithoutArms0126.png diff --git a/static/img/Animation/chuckwitharmssprite.png b/static/img/Characters/Chuck/Animation/chuckwitharmssprite.png similarity index 100% rename from static/img/Animation/chuckwitharmssprite.png rename to static/img/Characters/Chuck/Animation/chuckwitharmssprite.png diff --git a/static/img/Animation/chuckwithoutarmssprite.png b/static/img/Characters/Chuck/Animation/chuckwithoutarmssprite.png similarity index 100% rename from static/img/Animation/chuckwithoutarmssprite.png rename to static/img/Characters/Chuck/Animation/chuckwithoutarmssprite.png diff --git a/static/img/paths.txt b/static/img/paths.txt deleted file mode 100755 index 4fc21c2..0000000 --- a/static/img/paths.txt +++ /dev/null @@ -1,126 +0,0 @@ -static/img/Animation/WithArms/ChuckAnimations0071.png -static/img/Animation/WithArms/ChuckAnimations0060.png -static/img/Animation/WithArms/ChuckAnimations0062.png -static/img/Animation/WithArms/ChuckAnimations0030.png -static/img/Animation/WithArms/ChuckAnimations0059.png -static/img/Animation/WithArms/ChuckAnimations0056.png -static/img/Animation/WithArms/ChuckAnimations0036.png -static/img/Animation/WithArms/ChuckAnimations0089.png -static/img/Animation/WithArms/ChuckAnimations0101.png -static/img/Animation/WithArms/ChuckAnimations0074.png -static/img/Animation/WithArms/ChuckAnimations0112.png -static/img/Animation/WithArms/ChuckAnimations0007.png -static/img/Animation/WithArms/ChuckAnimations0113.png -static/img/Animation/WithArms/ChuckAnimations0046.png -static/img/Animation/WithArms/ChuckAnimations0111.png -static/img/Animation/WithArms/ChuckAnimations0061.png -static/img/Animation/WithArms/ChuckAnimations0097.png -static/img/Animation/WithArms/ChuckAnimations0052.png -static/img/Animation/WithArms/ChuckAnimations0053.png -static/img/Animation/WithArms/ChuckAnimations0093.png -static/img/Animation/WithArms/ChuckAnimations0068.png -static/img/Animation/WithArms/ChuckAnimations0119.png -static/img/Animation/WithArms/ChuckAnimations0031.png -static/img/Animation/WithArms/ChuckAnimations0109.png -static/img/Animation/WithArms/ChuckAnimations0013.png -static/img/Animation/WithArms/ChuckAnimations0009.png -static/img/Animation/WithArms/ChuckAnimations0114.png -static/img/Animation/WithArms/ChuckAnimations0096.png -static/img/Animation/WithArms/ChuckAnimations0044.png -static/img/Animation/WithArms/ChuckAnimations0077.png -static/img/Animation/WithArms/ChuckAnimations0025.png -static/img/Animation/WithArms/ChuckAnimations0085.png -static/img/Animation/WithArms/ChuckAnimations0048.png -static/img/Animation/WithArms/ChuckAnimations0037.png -static/img/Animation/WithArms/ChuckAnimations0014.png -static/img/Animation/WithArms/ChuckAnimations0020.png -static/img/Animation/WithArms/ChuckAnimations0035.png -static/img/Animation/WithArms/ChuckAnimations0110.png -static/img/Animation/WithArms/ChuckAnimations0032.png -static/img/Animation/WithArms/ChuckAnimations0051.png -static/img/Animation/WithArms/ChuckAnimations0017.png -static/img/Animation/WithArms/ChuckAnimations0012.png -static/img/Animation/WithArms/ChuckAnimations0034.png -static/img/Animation/WithArms/ChuckAnimations0065.png -static/img/Animation/WithArms/ChuckAnimations0055.png -static/img/Animation/WithArms/ChuckAnimations0103.png -static/img/Animation/WithArms/ChuckAnimations0075.png -static/img/Animation/WithArms/ChuckAnimations0018.png -static/img/Animation/WithArms/ChuckAnimations0090.png -static/img/Animation/WithArms/ChuckAnimations0117.png -static/img/Animation/WithArms/ChuckAnimations0121.png -static/img/Animation/WithArms/ChuckAnimations0084.png -static/img/Animation/WithArms/ChuckAnimations0064.png -static/img/Animation/WithArms/ChuckAnimations0063.png -static/img/Animation/WithArms/ChuckAnimations0054.png -static/img/Animation/WithArms/ChuckAnimations0125.png -static/img/Animation/WithArms/ChuckAnimations0086.png -static/img/Animation/WithArms/ChuckAnimations0006.png -static/img/Animation/WithArms/ChuckAnimations0079.png -static/img/Animation/WithArms/ChuckAnimations0016.png -static/img/Animation/WithArms/ChuckAnimations0047.png -static/img/Animation/WithArms/ChuckAnimations0073.png -static/img/Animation/WithArms/ChuckAnimations0027.png -static/img/Animation/WithArms/ChuckAnimations0092.png -static/img/Animation/WithArms/ChuckAnimations0042.png -static/img/Animation/WithArms/ChuckAnimations0041.png -static/img/Animation/WithArms/ChuckAnimations0124.png -static/img/Animation/WithArms/ChuckAnimations0104.png -static/img/Animation/WithArms/ChuckAnimations0001.png -static/img/Animation/WithArms/ChuckAnimations0099.png -static/img/Animation/WithArms/ChuckAnimations0072.png -static/img/Animation/WithArms/ChuckAnimations0122.png -static/img/Animation/WithArms/ChuckAnimations0040.png -static/img/Animation/WithArms/ChuckAnimations0118.png -static/img/Animation/WithArms/ChuckAnimations0023.png -static/img/Animation/WithArms/ChuckAnimations0083.png -static/img/Animation/WithArms/ChuckAnimations0021.png -static/img/Animation/WithArms/ChuckAnimations0024.png -static/img/Animation/WithArms/ChuckAnimations0080.png -static/img/Animation/WithArms/ChuckAnimations0010.png -static/img/Animation/WithArms/ChuckAnimations0105.png -static/img/Animation/WithArms/ChuckAnimations0002.png -static/img/Animation/WithArms/ChuckAnimations0115.png -static/img/Animation/WithArms/ChuckAnimations0088.png -static/img/Animation/WithArms/ChuckAnimations0108.png -static/img/Animation/WithArms/ChuckAnimations0106.png -static/img/Animation/WithArms/ChuckAnimations0033.png -static/img/Animation/WithArms/ChuckAnimations0038.png -static/img/Animation/WithArms/ChuckAnimations0087.png -static/img/Animation/WithArms/ChuckAnimations0067.png -static/img/Animation/WithArms/ChuckAnimations0039.png -static/img/Animation/WithArms/ChuckAnimations0082.png -static/img/Animation/WithArms/ChuckAnimations0095.png -static/img/Animation/WithArms/ChuckAnimations0008.png -static/img/Animation/WithArms/ChuckAnimations0057.png -static/img/Animation/WithArms/ChuckAnimations0107.png -static/img/Animation/WithArms/ChuckAnimations0070.png -static/img/Animation/WithArms/ChuckAnimations0026.png -static/img/Animation/WithArms/ChuckAnimations0043.png -static/img/Animation/WithArms/ChuckAnimations0066.png -static/img/Animation/WithArms/ChuckAnimations0100.png -static/img/Animation/WithArms/ChuckAnimations0028.png -static/img/Animation/WithArms/ChuckAnimations0123.png -static/img/Animation/WithArms/ChuckAnimations0005.png -static/img/Animation/WithArms/ChuckAnimations0004.png -static/img/Animation/WithArms/ChuckAnimations0045.png -static/img/Animation/WithArms/ChuckAnimations0091.png -static/img/Animation/WithArms/ChuckAnimations0011.png -static/img/Animation/WithArms/ChuckAnimations0102.png -static/img/Animation/WithArms/ChuckAnimations0003.png -static/img/Animation/WithArms/ChuckAnimations0022.png -static/img/Animation/WithArms/ChuckAnimations0116.png -static/img/Animation/WithArms/ChuckAnimations0126.png -static/img/Animation/WithArms/ChuckAnimations0120.png -static/img/Animation/WithArms/ChuckAnimations0015.png -static/img/Animation/WithArms/ChuckAnimations0050.png -static/img/Animation/WithArms/ChuckAnimations0019.png -static/img/Animation/WithArms/ChuckAnimations0081.png -static/img/Animation/WithArms/ChuckAnimations0069.png -static/img/Animation/WithArms/ChuckAnimations0076.png -static/img/Animation/WithArms/ChuckAnimations0049.png -static/img/Animation/WithArms/ChuckAnimations0078.png -static/img/Animation/WithArms/ChuckAnimations0029.png -static/img/Animation/WithArms/ChuckAnimations0098.png -static/img/Animation/WithArms/ChuckAnimations0094.png -static/img/Animation/WithArms/ChuckAnimations0058.png \ No newline at end of file