didrikmunther · azinum · Nov 26, 2015 · Nov 26, 2015 · Nov 27, 2015 · Nov 30, 2015
diff --git a/Fifth/resources/sheet#2.png b/Fifth/resources/sheet#2.png
diff --git a/Fifth/CAnimation.cpp → Third/CAnimation.cpp b/Fifth/CAnimation.cpp → Third/CAnimation.cpp
diff --git a/Fifth/CAnimation.h → Third/CAnimation.h b/Fifth/CAnimation.h → Third/CAnimation.h
diff --git a/Fifth/CAssetManager.cpp → Third/CAssetManager.cpp b/Fifth/CAssetManager.cpp → Third/CAssetManager.cpp
diff --git a/Fifth/CAssetManager.h → Third/CAssetManager.h b/Fifth/CAssetManager.h → Third/CAssetManager.h
diff --git a/Fifth/CBackground.cpp → Third/CBackground.cpp b/Fifth/CBackground.cpp → Third/CBackground.cpp
diff --git a/Fifth/CBackground.h → Third/CBackground.h b/Fifth/CBackground.h → Third/CBackground.h
diff --git a/Fifth/CBody.cpp → Third/CBody.cpp b/Fifth/CBody.cpp → Third/CBody.cpp
diff --git a/Fifth/CBody.h → Third/CBody.h b/Fifth/CBody.h → Third/CBody.h
diff --git a/Fifth/CCamera.cpp → Third/CCamera.cpp b/Fifth/CCamera.cpp → Third/CCamera.cpp
diff --git a/Fifth/CCamera.h → Third/CCamera.h b/Fifth/CCamera.h → Third/CCamera.h
diff --git a/Fifth/CChatBubble.cpp → Third/CChatBubble.cpp b/Fifth/CChatBubble.cpp → Third/CChatBubble.cpp
diff --git a/Fifth/CChatBubble.h → Third/CChatBubble.h b/Fifth/CChatBubble.h → Third/CChatBubble.h
diff --git a/Fifth/CCombatText.cpp → Third/CCombatText.cpp b/Fifth/CCombatText.cpp → Third/CCombatText.cpp
diff --git a/Fifth/CCombatText.h → Third/CCombatText.h b/Fifth/CCombatText.h → Third/CCombatText.h
diff --git a/Fifth/CComponent.cpp → Third/CComponent.cpp b/Fifth/CComponent.cpp → Third/CComponent.cpp
diff --git a/Fifth/CComponent.h → Third/CComponent.h b/Fifth/CComponent.h → Third/CComponent.h
diff --git a/Fifth/CEntity.cpp → Third/CEntity.cpp b/Fifth/CEntity.cpp → Third/CEntity.cpp
diff --git a/Fifth/CEntity.h → Third/CEntity.h b/Fifth/CEntity.h → Third/CEntity.h
diff --git a/Fifth/CEntityManager.cpp → Third/CEntityManager.cpp b/Fifth/CEntityManager.cpp → Third/CEntityManager.cpp
diff --git a/Fifth/CEntityManager.h → Third/CEntityManager.h b/Fifth/CEntityManager.h → Third/CEntityManager.h
diff --git a/Fifth/CGame.cpp → Third/CGame.cpp b/Fifth/CGame.cpp → Third/CGame.cpp
diff --git a/Fifth/CGame.h → Third/CGame.h b/Fifth/CGame.h → Third/CGame.h
@@ -57,6 +57,9 @@ class CGame {
     int _frames;
     int _updates;
 
+    double _deltaTime = 0;
+    double _timeStart;
+
     // Misc variables
     std::stringstream _title;
     std::string _intro;

diff --git a/Third/CGame_onEvent.cpp b/Third/CGame_onEvent.cpp
@@ -0,0 +1,117 @@
+//
+//  CGame_onEvent.cpp
+//  Fifth
+//
+//  Created by Didrik Munther on 22/09/15.
+//  Copyright (c) 2015 Didrik Munther. All rights reserved.
+//
+
+#include "CGame.h"
+#include "CBackground.h"
+#include "CAssetManager.h"
+
+#include "NFile.h"
+#include "NMouse.h"
+
+#include "CEntity.h"
+
+
+void CGame::_handleKeyStates() {
+
+    if(!isFocused)
+        return;
+
+    const Uint8* keystate = SDL_GetKeyboardState(NULL);
+
+    if(instance.controller)
+        instance.controller->onKeyStates(&instance, keystate);
+    if(ignoreEvents) return;
+    if(instance.player)
+        instance.player->onKeyStates(&instance, keystate);
+}
+
+void CGame::_onEvent(SDL_Event* event) {
+
+    //if(event->key.repeat != 0) return;
+
+    switch(event->type) {
+        case SDL_QUIT:
+            _isRunning = false;
+            break;
+
+        case SDL_WINDOWEVENT:
+            switch(event->window.event) {
+                case SDL_WINDOWEVENT_FOCUS_GAINED:
+                    isFocused = true;
+                    break;
+
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    isFocused = false;
+                    break;
+            }
+            break;
+
+        case SDL_TEXTINPUT:
+            if(instance.controller)
+                instance.controller->onTextInput(&instance, (std::string)event->text.text);
+            if(ignoreEvents) break;
+            if(instance.player)
+                instance.player->onTextInput(&instance, (std::string)event->text.text);
+            break;
+
+        case SDL_KEYDOWN:
+            if(instance.controller)
+                instance.controller->onEvent(&instance, event->key.keysym.sym, true);
+            if(ignoreEvents) break;
+            if(instance.player)
+                instance.player->onEvent(&instance, event->key.keysym.sym, true);
+
+            switch(event->key.keysym.sym) {
+
+                case SDLK_ESCAPE:
+                    _isRunning = false;
+                    break;
+
+//                case SDLK_4:
+//                {
+//                    if(instance.window.newWindow(_intro, 640, 480)) {
+//                        NFile::log(LogType::ERROR, "Window.onInit failed: ", SDL_GetError());
+//                    }
+//                    instance.camera->onInit(&instance.window);
+//                    instance.loadAssets("resources/map/testMap1.assets");
+//                    restart();
+//                }
+//                    break;
+
+                default:
+                    break;
+
+            }
+            break;
+
+        case SDL_KEYUP:
+            if(instance.controller)
+                instance.controller->onEvent(&instance, event->key.keysym.sym, false);
+            if(ignoreEvents) break;
+            if(instance.player)
+                instance.player->onEvent(&instance, event->key.keysym.sym, false);
+            break;
+
+        default:
+            break;
+
+        case SDL_MOUSEBUTTONDOWN:
+        {
+            int x = NMouse::relativeMouseX(instance.camera);
+            int y = NMouse::relativeMouseY(instance.camera);
+            auto entities = instance.entityManager.getEntitiesAtCoordinate(x, y);
+
+            for(auto& i: entities) {
+                i->onClick(x, y, &instance);
+            }
+
+        }
+            break;
+    }
+
+}
diff --git a/Fifth/CGuiText.cpp → Third/CGuiText.cpp b/Fifth/CGuiText.cpp → Third/CGuiText.cpp
diff --git a/Fifth/CGuiText.h → Third/CGuiText.h b/Fifth/CGuiText.h → Third/CGuiText.h
diff --git a/Third/CInstance.cpp b/Third/CInstance.cpp
@@ -0,0 +1,89 @@
+//
+//  CInstance.cpp
+//  Fifth
+//
+//  Created by Didrik Munther on 06/05/15.
+//  Copyright (c) 2015 Didrik Munther. All rights reserved.
+//
+
+#include "CInstance.h"
+#include "NFile.h"
+#include "CAssetManager.h"
+
+
+CInstance::CInstance(CGame* game)
+    : game(game)
+    , L(luaL_newstate())
+    , camera(new CCamera())
+    , gravity(3.0f)
+    , isPaused(false)
+    , doLoadLevel(false)
+    , levelToLoad("")
+    , player(nullptr), controller(nullptr)
+    , loadedMap("")
+{
+
+}
+
+CInstance::~CInstance() {
+    delete camera;
+}
+
+void CInstance::onLoop() {
+    if(doLoadLevel) {
+        _loadLevel(levelToLoad);
+        levelToLoad = "";
+    }
+}
+
+void CInstance::loadAssets(std::string path) {
+    //CAssetManager::onCleanup(CLEAN_FLAGS::NOT_LUA_SCRIPTS);
+    NFile::loadAssets(path, this);
+}
+
+void CInstance::doLine(std::string line) {
+    luaL_dostring(L, line.c_str());
+}
+
+void CInstance::loadLevel(std::string fileName) {
+    levelToLoad = fileName;
+    doLoadLevel = true;
+}
+
+void CInstance::_loadLevel(std::string fileName) {
+    entityManager.onCleanup();
+    player = nullptr;
+    controller = nullptr;
+    camera->setTarget(nullptr);
+    doLoadLevel = false;
+    if(NFile::loadLevel(fileName, this) == -1) {
+        NFile::log(LogType::ALERT, "Reverting loaded map to: \"", loadedMap, "\".");
+        NFile::loadLevel(loadedMap, this);
+    } else {
+        loadedMap = fileName;
+    }
+}
+
+std::string CInstance::onSerialize() {
+    rapidjson::Document d;
+    d.Parse("{}");
+
+    rapidjson::Value values(rapidjson::kObjectType);
+    entityManager.onSerialize(&values, &d.GetAllocator(), this);
+
+    values.AddMember("player", rapidjson::Value(entityManager.getNameOfEntity(player).c_str(), d.GetAllocator()), d.GetAllocator());
+    values.AddMember("controller", rapidjson::Value(entityManager.getNameOfEntity(controller).c_str(), d.GetAllocator()), d.GetAllocator());
+
+    d.AddMember("this", values, d.GetAllocator());
+
+    rapidjson::StringBuffer sb;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(sb);
+    d.Accept(writer);
+
+    return sb.GetString();
+}
+
+void CInstance::closeInstance() {
+    entityManager.onCleanup();
+    lua_close(L);
+}
diff --git a/Fifth/CInstance.h → Third/CInstance.h b/Fifth/CInstance.h → Third/CInstance.h
diff --git a/Fifth/CLuaObject.cpp → Third/CLuaObject.cpp b/Fifth/CLuaObject.cpp → Third/CLuaObject.cpp
diff --git a/Fifth/CLuaObject.h → Third/CLuaObject.h b/Fifth/CLuaObject.h → Third/CLuaObject.h
diff --git a/Fifth/CLuaScript.cpp → Third/CLuaScript.cpp b/Fifth/CLuaScript.cpp → Third/CLuaScript.cpp
diff --git a/Fifth/CLuaScript.h → Third/CLuaScript.h b/Fifth/CLuaScript.h → Third/CLuaScript.h
diff --git a/Fifth/CNetwork.cpp → Third/CNetwork.cpp b/Fifth/CNetwork.cpp → Third/CNetwork.cpp
diff --git a/Fifth/CNetwork.h → Third/CNetwork.h b/Fifth/CNetwork.h → Third/CNetwork.h
diff --git a/Fifth/CSerializable.cpp → Third/CSerializable.cpp b/Fifth/CSerializable.cpp → Third/CSerializable.cpp
diff --git a/Fifth/CSerializable.h → Third/CSerializable.h b/Fifth/CSerializable.h → Third/CSerializable.h
diff --git a/Fifth/CSprite.cpp → Third/CSprite.cpp b/Fifth/CSprite.cpp → Third/CSprite.cpp
diff --git a/Fifth/CSprite.h → Third/CSprite.h b/Fifth/CSprite.h → Third/CSprite.h
diff --git a/Fifth/CSpriteSheet.cpp → Third/CSpriteSheet.cpp b/Fifth/CSpriteSheet.cpp → Third/CSpriteSheet.cpp
diff --git a/Fifth/CSpriteSheet.h → Third/CSpriteSheet.h b/Fifth/CSpriteSheet.h → Third/CSpriteSheet.h
diff --git a/Fifth/CText.cpp → Third/CText.cpp b/Fifth/CText.cpp → Third/CText.cpp
diff --git a/Fifth/CText.h → Third/CText.h b/Fifth/CText.h → Third/CText.h
diff --git a/Third/CTile.cpp b/Third/CTile.cpp
@@ -0,0 +1,66 @@
+//
+//  CTile.cpp
+//  Third
+//
+//  Created by Didrik Munther on 02/04/15.
+//  Copyright (c) 2015 Didrik Munther. All rights reserved.
+//
+
+#include "CTile.h"
+#include "CAssetManager.h"
+#include "CWindow.h"
+#include "CCamera.h"
+
+#include "NSurface.h"
+
+
+CTile::CTile(std::string tileset, int posX, int posY)
+    : CEntity(Box{posX * TILE_SIZE, posY * TILE_SIZE, TILE_SIZE, TILE_SIZE}, "")
+    , tileset(CAssetManager::getTileset(tileset))
+    , tilesetKey(tileset)
+    , posX(posX), posY(posY)
+    , tileIndex(0)
+{
+    addProperty(EntityProperty::STATIC);
+}
+
+void CTile::onRender(CWindow* window, CCamera* camera, RenderFlags renderFlags) {
+    if(!camera->collision(this))
+        return;
+
+    int x = posX * TILE_SIZE - camera->offsetX();
+    int y = posY * TILE_SIZE - camera->offsetY();
+
+    if(tileset)
+        NSurface::renderSprite(x, y, TILE_SIZE, TILE_SIZE, CAssetManager::getSprite((*tileset)[tileIndex]), window, SDL_RendererFlip::SDL_FLIP_NONE);
+    else
+        NSurface::renderRect(x, y, TILE_SIZE, TILE_SIZE, window, 255, 0, 255);
+}
+
+void CTile::onSerialize(rapidjson::Value* value, rapidjson::Document::AllocatorType* alloc, CInstance* instance) {
+    value->PushBack(rapidjson::Value(posX), *alloc);
+    value->PushBack(rapidjson::Value(posY), *alloc);
+}
+
+void CTile::updateIndex(std::map<int, std::map<int, CTile*>>* _tiles) {
+    tileIndex = 0;
+    if(tileExist(_tiles, posX, posY-1) && (*_tiles)[posX][posY-1]->tilesetKey == tilesetKey)
+        tileIndex += 1;
+    if(tileExist(_tiles, posX+1, posY) && (*_tiles)[posX+1][posY]->tilesetKey == tilesetKey)
+        tileIndex += 2;
+    if(tileExist(_tiles, posX, posY+1) && (*_tiles)[posX][posY+1]->tilesetKey == tilesetKey)
+        tileIndex += 4;
+    if(tileExist(_tiles, posX-1, posY) && (*_tiles)[posX-1][posY]->tilesetKey == tilesetKey)
+        tileIndex += 8;
+}
+
+void CTile::updateAdjecent(std::map<int, std::map<int, CTile*>>* _tiles) {
+    if(tileExist(_tiles, posX, posY-1))
+        (*_tiles)[posX][posY-1]->updateIndex(_tiles);
+    if(tileExist(_tiles, posX+1, posY))
+        (*_tiles)[posX+1][posY]->updateIndex(_tiles);
+    if(tileExist(_tiles, posX, posY+1))
+        (*_tiles)[posX][posY+1]->updateIndex(_tiles);
+    if(tileExist(_tiles, posX-1, posY))
+        (*_tiles)[posX-1][posY]->updateIndex(_tiles);
+}
diff --git a/Third/CTile.h b/Third/CTile.h
@@ -0,0 +1,59 @@
+//
+//  CTile.h
+//  Third
+//
+//  Created by Didrik Munther on 02/04/15.
+//  Copyright (c) 2015 Didrik Munther. All rights reserved.
+//
+
+#ifndef __Third__CTile__
+#define __Third__CTile__
+
+#include <stdio.h>
+#include <string>
+#include <map>
+
+#include "Define.h"
+#include "CEntity.h"
+
+
+class CWindow;
+class CCamera;
+
+struct Tileset {
+    std::string spriteKeys[16];
+
+    std::string operator[](int i) {
+        if(i <= 15 && i >= 0)
+            return spriteKeys[i];
+        else
+            return "";
+    }
+};
+
+class CTile : public CEntity {
+
+public:
+    CTile(std::string tileset, int posX, int posY);
+
+    void onRender(CWindow* window, CCamera* camera, RenderFlags renderFlags);
+    void onSerialize(rapidjson::Value* value, rapidjson::Document::AllocatorType* alloc, CInstance* instance);
+
+    void updateIndex(std::map<int, std::map<int, CTile*>>* _tiles);
+    void updateAdjecent(std::map<int, std::map<int, CTile*>>* _tiles);
+
+    int posX, posY;
+
+    static inline bool tileExist(std::map<int, std::map<int, CTile*>>* tiles, int posX, int posY) {
+        return tiles->find(posX) != tiles->end() && (*tiles)[posX].find(posY) != (*tiles)[posX].end();
+    }
+
+    std::string tilesetKey;
+
+private:
+    Tileset* tileset;
+    int tileIndex;
+
+};
+
+#endif /* defined(__Third__CTile__) */
diff --git a/Fifth/CWindow.cpp → Third/CWindow.cpp b/Fifth/CWindow.cpp → Third/CWindow.cpp
diff --git a/Fifth/CWindow.h → Third/CWindow.h b/Fifth/CWindow.h → Third/CWindow.h
diff --git a/Fifth/Define.h → Third/Define.h b/Fifth/Define.h → Third/Define.h
diff --git a/Fifth/LuaBridge/LuaBridge.h → Third/LuaBridge/LuaBridge.h b/Fifth/LuaBridge/LuaBridge.h → Third/LuaBridge/LuaBridge.h
diff --git a/Fifth/LuaBridge/RefCountedObject.h → Third/LuaBridge/RefCountedObject.h b/Fifth/LuaBridge/RefCountedObject.h → Third/LuaBridge/RefCountedObject.h
diff --git a/Fifth/LuaBridge/RefCountedPtr.h → Third/LuaBridge/RefCountedPtr.h b/Fifth/LuaBridge/RefCountedPtr.h → Third/LuaBridge/RefCountedPtr.h
diff --git a/Fifth/LuaBridge/detail/CFunctions.h → Third/LuaBridge/detail/CFunctions.h b/Fifth/LuaBridge/detail/CFunctions.h → Third/LuaBridge/detail/CFunctions.h
diff --git a/Fifth/LuaBridge/detail/ClassInfo.h → Third/LuaBridge/detail/ClassInfo.h b/Fifth/LuaBridge/detail/ClassInfo.h → Third/LuaBridge/detail/ClassInfo.h
diff --git a/Fifth/LuaBridge/detail/Constructor.h → Third/LuaBridge/detail/Constructor.h b/Fifth/LuaBridge/detail/Constructor.h → Third/LuaBridge/detail/Constructor.h
diff --git a/Fifth/LuaBridge/detail/FuncTraits.h → Third/LuaBridge/detail/FuncTraits.h b/Fifth/LuaBridge/detail/FuncTraits.h → Third/LuaBridge/detail/FuncTraits.h
diff --git a/Fifth/LuaBridge/detail/Iterator.h → Third/LuaBridge/detail/Iterator.h b/Fifth/LuaBridge/detail/Iterator.h → Third/LuaBridge/detail/Iterator.h
diff --git a/Fifth/LuaBridge/detail/LuaException.h → Third/LuaBridge/detail/LuaException.h b/Fifth/LuaBridge/detail/LuaException.h → Third/LuaBridge/detail/LuaException.h
diff --git a/Fifth/LuaBridge/detail/LuaHelpers.h → Third/LuaBridge/detail/LuaHelpers.h b/Fifth/LuaBridge/detail/LuaHelpers.h → Third/LuaBridge/detail/LuaHelpers.h
diff --git a/Fifth/LuaBridge/detail/LuaRef.h → Third/LuaBridge/detail/LuaRef.h b/Fifth/LuaBridge/detail/LuaRef.h → Third/LuaBridge/detail/LuaRef.h
diff --git a/Fifth/LuaBridge/detail/Namespace.h → Third/LuaBridge/detail/Namespace.h b/Fifth/LuaBridge/detail/Namespace.h → Third/LuaBridge/detail/Namespace.h
diff --git a/Fifth/LuaBridge/detail/Stack.h → Third/LuaBridge/detail/Stack.h b/Fifth/LuaBridge/detail/Stack.h → Third/LuaBridge/detail/Stack.h
diff --git a/Fifth/LuaBridge/detail/TypeList.h → Third/LuaBridge/detail/TypeList.h b/Fifth/LuaBridge/detail/TypeList.h → Third/LuaBridge/detail/TypeList.h
diff --git a/Fifth/LuaBridge/detail/TypeTraits.h → Third/LuaBridge/detail/TypeTraits.h b/Fifth/LuaBridge/detail/TypeTraits.h → Third/LuaBridge/detail/TypeTraits.h
diff --git a/Fifth/LuaBridge/detail/Userdata.h → Third/LuaBridge/detail/Userdata.h b/Fifth/LuaBridge/detail/Userdata.h → Third/LuaBridge/detail/Userdata.h
diff --git a/Fifth/LuaBridge/detail/dump.h → Third/LuaBridge/detail/dump.h b/Fifth/LuaBridge/detail/dump.h → Third/LuaBridge/detail/dump.h
diff --git a/Fifth/NFile.cpp → Third/NFile.cpp b/Fifth/NFile.cpp → Third/NFile.cpp
diff --git a/Fifth/NFile.h → Third/NFile.h b/Fifth/NFile.h → Third/NFile.h
diff --git a/Fifth/NMouse.cpp → Third/NMouse.cpp b/Fifth/NMouse.cpp → Third/NMouse.cpp
diff --git a/Fifth/NMouse.h → Third/NMouse.h b/Fifth/NMouse.h → Third/NMouse.h
diff --git a/Fifth/NSurface.cpp → Third/NSurface.cpp b/Fifth/NSurface.cpp → Third/NSurface.cpp
diff --git a/Fifth/NSurface.h → Third/NSurface.h b/Fifth/NSurface.h → Third/NSurface.h
diff --git a/Fifth/ResourcePath.hpp → Third/ResourcePath.hpp b/Fifth/ResourcePath.hpp → Third/ResourcePath.hpp
diff --git a/Fifth/ResourcePath.mm → Third/ResourcePath.mm b/Fifth/ResourcePath.mm → Third/ResourcePath.mm
diff --git a/Fifth/lua/Makefile → Third/lua/Makefile b/Fifth/lua/Makefile → Third/lua/Makefile
diff --git a/Fifth/lua/lapi.c → Third/lua/lapi.c b/Fifth/lua/lapi.c → Third/lua/lapi.c
diff --git a/Fifth/lua/lapi.h → Third/lua/lapi.h b/Fifth/lua/lapi.h → Third/lua/lapi.h
diff --git a/Fifth/lua/lapi.o → Third/lua/lapi.o b/Fifth/lua/lapi.o → Third/lua/lapi.o
diff --git a/Fifth/lua/lauxlib.c → Third/lua/lauxlib.c b/Fifth/lua/lauxlib.c → Third/lua/lauxlib.c
diff --git a/Fifth/lua/lauxlib.h → Third/lua/lauxlib.h b/Fifth/lua/lauxlib.h → Third/lua/lauxlib.h
diff --git a/Fifth/lua/lauxlib.o → Third/lua/lauxlib.o b/Fifth/lua/lauxlib.o → Third/lua/lauxlib.o
diff --git a/Fifth/lua/lbaselib.c → Third/lua/lbaselib.c b/Fifth/lua/lbaselib.c → Third/lua/lbaselib.c
diff --git a/Fifth/lua/lbaselib.o → Third/lua/lbaselib.o b/Fifth/lua/lbaselib.o → Third/lua/lbaselib.o
diff --git a/Fifth/lua/lcode.c → Third/lua/lcode.c b/Fifth/lua/lcode.c → Third/lua/lcode.c
diff --git a/Fifth/lua/lcode.h → Third/lua/lcode.h b/Fifth/lua/lcode.h → Third/lua/lcode.h
diff --git a/Fifth/lua/lcode.o → Third/lua/lcode.o b/Fifth/lua/lcode.o → Third/lua/lcode.o
diff --git a/Fifth/lua/ldblib.c → Third/lua/ldblib.c b/Fifth/lua/ldblib.c → Third/lua/ldblib.c
diff --git a/Fifth/lua/ldblib.o → Third/lua/ldblib.o b/Fifth/lua/ldblib.o → Third/lua/ldblib.o
diff --git a/Fifth/lua/ldebug.c → Third/lua/ldebug.c b/Fifth/lua/ldebug.c → Third/lua/ldebug.c
diff --git a/Fifth/lua/ldebug.h → Third/lua/ldebug.h b/Fifth/lua/ldebug.h → Third/lua/ldebug.h
diff --git a/Fifth/lua/ldebug.o → Third/lua/ldebug.o b/Fifth/lua/ldebug.o → Third/lua/ldebug.o
diff --git a/Fifth/lua/ldo.c → Third/lua/ldo.c b/Fifth/lua/ldo.c → Third/lua/ldo.c
diff --git a/Fifth/lua/ldo.h → Third/lua/ldo.h b/Fifth/lua/ldo.h → Third/lua/ldo.h
diff --git a/Fifth/lua/ldo.o → Third/lua/ldo.o b/Fifth/lua/ldo.o → Third/lua/ldo.o
diff --git a/Fifth/lua/ldump.c → Third/lua/ldump.c b/Fifth/lua/ldump.c → Third/lua/ldump.c
diff --git a/Fifth/lua/ldump.o → Third/lua/ldump.o b/Fifth/lua/ldump.o → Third/lua/ldump.o
diff --git a/Fifth/lua/lfunc.c → Third/lua/lfunc.c b/Fifth/lua/lfunc.c → Third/lua/lfunc.c
diff --git a/Fifth/lua/lfunc.h → Third/lua/lfunc.h b/Fifth/lua/lfunc.h → Third/lua/lfunc.h
diff --git a/Fifth/lua/lfunc.o → Third/lua/lfunc.o b/Fifth/lua/lfunc.o → Third/lua/lfunc.o
diff --git a/Fifth/lua/lgc.c → Third/lua/lgc.c b/Fifth/lua/lgc.c → Third/lua/lgc.c
diff --git a/Fifth/lua/lgc.h → Third/lua/lgc.h b/Fifth/lua/lgc.h → Third/lua/lgc.h
diff --git a/Fifth/lua/lgc.o → Third/lua/lgc.o b/Fifth/lua/lgc.o → Third/lua/lgc.o
diff --git a/Fifth/lua/liblua.a → Third/lua/liblua.a b/Fifth/lua/liblua.a → Third/lua/liblua.a
diff --git a/Fifth/lua/linit.c → Third/lua/linit.c b/Fifth/lua/linit.c → Third/lua/linit.c
diff --git a/Fifth/lua/linit.o → Third/lua/linit.o b/Fifth/lua/linit.o → Third/lua/linit.o
diff --git a/Fifth/lua/liolib.c → Third/lua/liolib.c b/Fifth/lua/liolib.c → Third/lua/liolib.c
diff --git a/Fifth/lua/liolib.o → Third/lua/liolib.o b/Fifth/lua/liolib.o → Third/lua/liolib.o
diff --git a/Fifth/lua/llex.c → Third/lua/llex.c b/Fifth/lua/llex.c → Third/lua/llex.c
diff --git a/Fifth/lua/llex.h → Third/lua/llex.h b/Fifth/lua/llex.h → Third/lua/llex.h
diff --git a/Fifth/lua/llex.o → Third/lua/llex.o b/Fifth/lua/llex.o → Third/lua/llex.o
diff --git a/Fifth/lua/llimits.h → Third/lua/llimits.h b/Fifth/lua/llimits.h → Third/lua/llimits.h
diff --git a/Fifth/lua/lmathlib.c → Third/lua/lmathlib.c b/Fifth/lua/lmathlib.c → Third/lua/lmathlib.c
diff --git a/Fifth/lua/lmathlib.o → Third/lua/lmathlib.o b/Fifth/lua/lmathlib.o → Third/lua/lmathlib.o
diff --git a/Fifth/lua/lmem.c → Third/lua/lmem.c b/Fifth/lua/lmem.c → Third/lua/lmem.c
diff --git a/Fifth/lua/lmem.h → Third/lua/lmem.h b/Fifth/lua/lmem.h → Third/lua/lmem.h
diff --git a/Fifth/lua/lmem.o → Third/lua/lmem.o b/Fifth/lua/lmem.o → Third/lua/lmem.o
diff --git a/Fifth/lua/loadlib.c → Third/lua/loadlib.c b/Fifth/lua/loadlib.c → Third/lua/loadlib.c
diff --git a/Fifth/lua/loadlib.o → Third/lua/loadlib.o b/Fifth/lua/loadlib.o → Third/lua/loadlib.o
diff --git a/Fifth/lua/lobject.c → Third/lua/lobject.c b/Fifth/lua/lobject.c → Third/lua/lobject.c
diff --git a/Fifth/lua/lobject.h → Third/lua/lobject.h b/Fifth/lua/lobject.h → Third/lua/lobject.h
diff --git a/Fifth/lua/lobject.o → Third/lua/lobject.o b/Fifth/lua/lobject.o → Third/lua/lobject.o
diff --git a/Fifth/lua/lopcodes.c → Third/lua/lopcodes.c b/Fifth/lua/lopcodes.c → Third/lua/lopcodes.c
diff --git a/Fifth/lua/lopcodes.h → Third/lua/lopcodes.h b/Fifth/lua/lopcodes.h → Third/lua/lopcodes.h
diff --git a/Fifth/lua/lopcodes.o → Third/lua/lopcodes.o b/Fifth/lua/lopcodes.o → Third/lua/lopcodes.o
diff --git a/Fifth/lua/loslib.c → Third/lua/loslib.c b/Fifth/lua/loslib.c → Third/lua/loslib.c
diff --git a/Fifth/lua/loslib.o → Third/lua/loslib.o b/Fifth/lua/loslib.o → Third/lua/loslib.o
diff --git a/Fifth/lua/lparser.c → Third/lua/lparser.c b/Fifth/lua/lparser.c → Third/lua/lparser.c
diff --git a/Fifth/lua/lparser.h → Third/lua/lparser.h b/Fifth/lua/lparser.h → Third/lua/lparser.h
diff --git a/Fifth/lua/lparser.o → Third/lua/lparser.o b/Fifth/lua/lparser.o → Third/lua/lparser.o
diff --git a/Fifth/lua/lstate.c → Third/lua/lstate.c b/Fifth/lua/lstate.c → Third/lua/lstate.c
diff --git a/Fifth/lua/lstate.h → Third/lua/lstate.h b/Fifth/lua/lstate.h → Third/lua/lstate.h
diff --git a/Fifth/lua/lstate.o → Third/lua/lstate.o b/Fifth/lua/lstate.o → Third/lua/lstate.o
diff --git a/Fifth/lua/lstring.c → Third/lua/lstring.c b/Fifth/lua/lstring.c → Third/lua/lstring.c
diff --git a/Fifth/lua/lstring.h → Third/lua/lstring.h b/Fifth/lua/lstring.h → Third/lua/lstring.h
diff --git a/Fifth/lua/lstring.o → Third/lua/lstring.o b/Fifth/lua/lstring.o → Third/lua/lstring.o
diff --git a/Fifth/lua/lstrlib.c → Third/lua/lstrlib.c b/Fifth/lua/lstrlib.c → Third/lua/lstrlib.c
diff --git a/Fifth/lua/lstrlib.o → Third/lua/lstrlib.o b/Fifth/lua/lstrlib.o → Third/lua/lstrlib.o
diff --git a/Fifth/lua/ltable.c → Third/lua/ltable.c b/Fifth/lua/ltable.c → Third/lua/ltable.c
diff --git a/Fifth/lua/ltable.h → Third/lua/ltable.h b/Fifth/lua/ltable.h → Third/lua/ltable.h
diff --git a/Fifth/lua/ltable.o → Third/lua/ltable.o b/Fifth/lua/ltable.o → Third/lua/ltable.o
diff --git a/Fifth/lua/ltablib.c → Third/lua/ltablib.c b/Fifth/lua/ltablib.c → Third/lua/ltablib.c
diff --git a/Fifth/lua/ltablib.o → Third/lua/ltablib.o b/Fifth/lua/ltablib.o → Third/lua/ltablib.o
diff --git a/Fifth/lua/ltm.c → Third/lua/ltm.c b/Fifth/lua/ltm.c → Third/lua/ltm.c
diff --git a/Fifth/lua/ltm.h → Third/lua/ltm.h b/Fifth/lua/ltm.h → Third/lua/ltm.h
diff --git a/Fifth/lua/ltm.o → Third/lua/ltm.o b/Fifth/lua/ltm.o → Third/lua/ltm.o
diff --git a/Fifth/lua/lua → Third/lua/lua b/Fifth/lua/lua → Third/lua/lua
diff --git a/Fifth/lua/lua.c → Third/lua/lua.c b/Fifth/lua/lua.c → Third/lua/lua.c
diff --git a/Fifth/lua/lua.h → Third/lua/lua.h b/Fifth/lua/lua.h → Third/lua/lua.h
diff --git a/Fifth/lua/lua.o → Third/lua/lua.o b/Fifth/lua/lua.o → Third/lua/lua.o
diff --git a/Fifth/lua/luac → Third/lua/luac b/Fifth/lua/luac → Third/lua/luac
diff --git a/Fifth/lua/luac.c → Third/lua/luac.c b/Fifth/lua/luac.c → Third/lua/luac.c
diff --git a/Fifth/lua/luac.o → Third/lua/luac.o b/Fifth/lua/luac.o → Third/lua/luac.o
diff --git a/Fifth/lua/luaconf.h → Third/lua/luaconf.h b/Fifth/lua/luaconf.h → Third/lua/luaconf.h
diff --git a/Fifth/lua/lualib.h → Third/lua/lualib.h b/Fifth/lua/lualib.h → Third/lua/lualib.h
diff --git a/Fifth/lua/lundump.c → Third/lua/lundump.c b/Fifth/lua/lundump.c → Third/lua/lundump.c
diff --git a/Fifth/lua/lundump.h → Third/lua/lundump.h b/Fifth/lua/lundump.h → Third/lua/lundump.h
diff --git a/Fifth/lua/lundump.o → Third/lua/lundump.o b/Fifth/lua/lundump.o → Third/lua/lundump.o
diff --git a/Fifth/lua/lvm.c → Third/lua/lvm.c b/Fifth/lua/lvm.c → Third/lua/lvm.c
diff --git a/Fifth/lua/lvm.h → Third/lua/lvm.h b/Fifth/lua/lvm.h → Third/lua/lvm.h
diff --git a/Fifth/lua/lvm.o → Third/lua/lvm.o b/Fifth/lua/lvm.o → Third/lua/lvm.o
diff --git a/Fifth/lua/lzio.c → Third/lua/lzio.c b/Fifth/lua/lzio.c → Third/lua/lzio.c
diff --git a/Fifth/lua/lzio.h → Third/lua/lzio.h b/Fifth/lua/lzio.h → Third/lua/lzio.h
diff --git a/Fifth/lua/lzio.o → Third/lua/lzio.o b/Fifth/lua/lzio.o → Third/lua/lzio.o
diff --git a/Fifth/lua/print.c → Third/lua/print.c b/Fifth/lua/print.c → Third/lua/print.c
diff --git a/Fifth/lua/print.o → Third/lua/print.o b/Fifth/lua/print.o → Third/lua/print.o
diff --git a/Fifth/main.cpp → Third/main.cpp b/Fifth/main.cpp → Third/main.cpp
diff --git a/Fifth/rapidjson/allocators.h → Third/rapidjson/allocators.h b/Fifth/rapidjson/allocators.h → Third/rapidjson/allocators.h
diff --git a/Fifth/rapidjson/document.h → Third/rapidjson/document.h b/Fifth/rapidjson/document.h → Third/rapidjson/document.h
diff --git a/Fifth/rapidjson/encodedstream.h → Third/rapidjson/encodedstream.h b/Fifth/rapidjson/encodedstream.h → Third/rapidjson/encodedstream.h
diff --git a/Fifth/rapidjson/encodings.h → Third/rapidjson/encodings.h b/Fifth/rapidjson/encodings.h → Third/rapidjson/encodings.h
diff --git a/Fifth/rapidjson/error/en.h → Third/rapidjson/error/en.h b/Fifth/rapidjson/error/en.h → Third/rapidjson/error/en.h
diff --git a/Fifth/rapidjson/error/error.h → Third/rapidjson/error/error.h b/Fifth/rapidjson/error/error.h → Third/rapidjson/error/error.h
diff --git a/Fifth/rapidjson/filereadstream.h → Third/rapidjson/filereadstream.h b/Fifth/rapidjson/filereadstream.h → Third/rapidjson/filereadstream.h
diff --git a/Fifth/rapidjson/filewritestream.h → Third/rapidjson/filewritestream.h b/Fifth/rapidjson/filewritestream.h → Third/rapidjson/filewritestream.h
diff --git a/Fifth/rapidjson/internal/biginteger.h → Third/rapidjson/internal/biginteger.h b/Fifth/rapidjson/internal/biginteger.h → Third/rapidjson/internal/biginteger.h
diff --git a/Fifth/rapidjson/internal/diyfp.h → Third/rapidjson/internal/diyfp.h b/Fifth/rapidjson/internal/diyfp.h → Third/rapidjson/internal/diyfp.h
diff --git a/Fifth/rapidjson/internal/dtoa.h → Third/rapidjson/internal/dtoa.h b/Fifth/rapidjson/internal/dtoa.h → Third/rapidjson/internal/dtoa.h
diff --git a/Fifth/rapidjson/internal/ieee754.h → Third/rapidjson/internal/ieee754.h b/Fifth/rapidjson/internal/ieee754.h → Third/rapidjson/internal/ieee754.h
diff --git a/Fifth/rapidjson/internal/itoa.h → Third/rapidjson/internal/itoa.h b/Fifth/rapidjson/internal/itoa.h → Third/rapidjson/internal/itoa.h
diff --git a/Fifth/rapidjson/internal/meta.h → Third/rapidjson/internal/meta.h b/Fifth/rapidjson/internal/meta.h → Third/rapidjson/internal/meta.h
diff --git a/Fifth/rapidjson/internal/pow10.h → Third/rapidjson/internal/pow10.h b/Fifth/rapidjson/internal/pow10.h → Third/rapidjson/internal/pow10.h
diff --git a/Fifth/rapidjson/internal/stack.h → Third/rapidjson/internal/stack.h b/Fifth/rapidjson/internal/stack.h → Third/rapidjson/internal/stack.h
diff --git a/Fifth/rapidjson/internal/strfunc.h → Third/rapidjson/internal/strfunc.h b/Fifth/rapidjson/internal/strfunc.h → Third/rapidjson/internal/strfunc.h
diff --git a/Fifth/rapidjson/internal/strtod.h → Third/rapidjson/internal/strtod.h b/Fifth/rapidjson/internal/strtod.h → Third/rapidjson/internal/strtod.h
diff --git a/Fifth/rapidjson/memorybuffer.h → Third/rapidjson/memorybuffer.h b/Fifth/rapidjson/memorybuffer.h → Third/rapidjson/memorybuffer.h
diff --git a/Fifth/rapidjson/memorystream.h → Third/rapidjson/memorystream.h b/Fifth/rapidjson/memorystream.h → Third/rapidjson/memorystream.h
diff --git a/Fifth/rapidjson/msinttypes/inttypes.h → Third/rapidjson/msinttypes/inttypes.h b/Fifth/rapidjson/msinttypes/inttypes.h → Third/rapidjson/msinttypes/inttypes.h
diff --git a/Fifth/rapidjson/msinttypes/stdint.h → Third/rapidjson/msinttypes/stdint.h b/Fifth/rapidjson/msinttypes/stdint.h → Third/rapidjson/msinttypes/stdint.h
diff --git a/Fifth/rapidjson/pointer.h → Third/rapidjson/pointer.h b/Fifth/rapidjson/pointer.h → Third/rapidjson/pointer.h
diff --git a/Fifth/rapidjson/prettywriter.h → Third/rapidjson/prettywriter.h b/Fifth/rapidjson/prettywriter.h → Third/rapidjson/prettywriter.h
diff --git a/Fifth/rapidjson/rapidjson.h → Third/rapidjson/rapidjson.h b/Fifth/rapidjson/rapidjson.h → Third/rapidjson/rapidjson.h
diff --git a/Fifth/rapidjson/reader.h → Third/rapidjson/reader.h b/Fifth/rapidjson/reader.h → Third/rapidjson/reader.h
diff --git a/Fifth/rapidjson/stringbuffer.h → Third/rapidjson/stringbuffer.h b/Fifth/rapidjson/stringbuffer.h → Third/rapidjson/stringbuffer.h
diff --git a/Fifth/rapidjson/writer.h → Third/rapidjson/writer.h b/Fifth/rapidjson/writer.h → Third/rapidjson/writer.h
diff --git a/Third/resources/config/binds.cfg b/Third/resources/config/binds.cfg
@@ -0,0 +1,27 @@
+{
+    "binds": [
+        {"_0": "self.component.instance.camera.cameraSway = self.component.instance.camera.cameraSway + 10"},
+        {"_9": "camera = self.component.instance.camera; if(camera.cameraSway <= 10) then camera.cameraSway = 1; else camera.cameraSway = camera.cameraSway - 10 end"},
+        {"_3": "self.parent.entityManager:toggleRenderFlag(RenderFlags.COLLISION_BORDERS)"},
+        {"_5": "self.component.instance.game:restart()"},
+        {"_6": "chars = \"abcdefghijklmnopqrstuvxyz                \"; toSay = \"\"; for i = 0, 20 do rand = math.random(string.len(chars)); toSay = toSay .. string.sub(chars, rand, rand) end; self.component.instance.player:say(toSay, \"TESTFONT\", ChatBubbleType.YELL)"},
+        {"_7": "self.component.instance.camera:addCameraShake(100)"},
+
+        {"_m": "self.parent.entityManager:toggleRenderFlag(RenderFlags.COLLISION_AREA)"},
+        {"_n": "self.parent.entityManager:toggleRenderFlag(RenderFlags.COLLISION_GRID)"},
+        {"_b": "self.parent.entityManager:toggleRenderFlag(RenderFlags.ENTITY_GRID)"},
+        {"_x": "self.parent.entityManager:toggleRenderFlag(RenderFlags.RENDER_COMBAT_TEXT)"},
+        {"_RIGHTBRACKET": "self.component.instance.gravity = 0.3"},
+        {"_LEFTBRACKET": "self.component.instance.gravity = 0"},
+
+        {"_j": "mX, mY = self.component:getRelativeMouse(); temp = self.parent.entityManager:createSpriteEntity(Box(mX, mY, 16 * 4, 32 * 4), 'test7'); self.parent.entityManager:addEntity(temp, '');temp:addComponent(self.component.instance, game.getScript('Standard/Living'));temp:addComponent(self.component.instance, game.getScript('Standard/Npc'));temp:addComponent(self.component.instance, game.getScript('Standard/Movable'));temp:getComponent('Standard/Npc').target = self.component.instance.player;temp:getComponent('Standard/Movable'):onDeserialize('{\"walking_movement_speed\":3.0, \"jumpPower\":17.0}')"},
+
+        {"_l": "mX, mY = self.component:getRelativeMouse();temp = self.parent.entityManager:createColoredEntity(Box(mX, mY, 40, 40), Color(0, 0, 255, 255));self.parent.entityManager:addEntity(temp, '');temp:addProperty(EntityProperty.STATIC)"}        
+    ],
+
+    "commands": [
+        {"_t": "tile dirt"},
+        {"_y": "tile stone"},
+        {"_u": "tilearea"}
+    ]
+}
diff --git a/...ources/gfx/Sprites/Art/paintings/base.png → ...ources/gfx/Sprites/Art/paintings/base.png b/...ources/gfx/Sprites/Art/paintings/base.png → ...ources/gfx/Sprites/Art/paintings/base.png
diff --git a/.../gfx/Sprites/Art/paintings/painting 1.png → .../gfx/Sprites/Art/paintings/painting 1.png b/.../gfx/Sprites/Art/paintings/painting 1.png → .../gfx/Sprites/Art/paintings/painting 1.png
diff --git a/.../gfx/Sprites/Art/paintings/painting 2.png → .../gfx/Sprites/Art/paintings/painting 2.png b/.../gfx/Sprites/Art/paintings/painting 2.png → .../gfx/Sprites/Art/paintings/painting 2.png
diff --git a/.../gfx/Sprites/Art/paintings/painting 3.png → .../gfx/Sprites/Art/paintings/painting 3.png b/.../gfx/Sprites/Art/paintings/painting 3.png → .../gfx/Sprites/Art/paintings/painting 3.png
diff --git a/...rces/gfx/Sprites/Evil cat/cat frame 0.png → ...rces/gfx/Sprites/Evil cat/cat frame 0.png b/...rces/gfx/Sprites/Evil cat/cat frame 0.png → ...rces/gfx/Sprites/Evil cat/cat frame 0.png
diff --git a/...rces/gfx/Sprites/Evil cat/cat frame 1.png → ...rces/gfx/Sprites/Evil cat/cat frame 1.png b/...rces/gfx/Sprites/Evil cat/cat frame 1.png → ...rces/gfx/Sprites/Evil cat/cat frame 1.png
diff --git a/...rces/gfx/Sprites/Evil cat/cat frame 2.png → ...rces/gfx/Sprites/Evil cat/cat frame 2.png b/...rces/gfx/Sprites/Evil cat/cat frame 2.png → ...rces/gfx/Sprites/Evil cat/cat frame 2.png
diff --git a/.../gfx/Sprites/backgrounds/background 1.png → .../gfx/Sprites/backgrounds/background 1.png b/.../gfx/Sprites/backgrounds/background 1.png → .../gfx/Sprites/backgrounds/background 1.png
diff --git a/.../gfx/Sprites/backgrounds/background 2.png → .../gfx/Sprites/backgrounds/background 2.png b/.../gfx/Sprites/backgrounds/background 2.png → .../gfx/Sprites/backgrounds/background 2.png
diff --git a/.../gfx/Sprites/backgrounds/background 3.png → .../gfx/Sprites/backgrounds/background 3.png b/.../gfx/Sprites/backgrounds/background 3.png → .../gfx/Sprites/backgrounds/background 3.png
diff --git a/.../gfx/Sprites/backgrounds/background 4.png → .../gfx/Sprites/backgrounds/background 4.png b/.../gfx/Sprites/backgrounds/background 4.png → .../gfx/Sprites/backgrounds/background 4.png
diff --git a/.../gfx/Sprites/backgrounds/background 5.png → .../gfx/Sprites/backgrounds/background 5.png b/.../gfx/Sprites/backgrounds/background 5.png → .../gfx/Sprites/backgrounds/background 5.png
diff --git a/.../gfx/Sprites/backgrounds/background 6.png → .../gfx/Sprites/backgrounds/background 6.png b/.../gfx/Sprites/backgrounds/background 6.png → .../gfx/Sprites/backgrounds/background 6.png
diff --git a/.../gfx/Sprites/backgrounds/background 7.png → .../gfx/Sprites/backgrounds/background 7.png b/.../gfx/Sprites/backgrounds/background 7.png → .../gfx/Sprites/backgrounds/background 7.png
diff --git a/.../gfx/Sprites/backgrounds/background 8.png → .../gfx/Sprites/backgrounds/background 8.png b/.../gfx/Sprites/backgrounds/background 8.png → .../gfx/Sprites/backgrounds/background 8.png
diff --git a/.../gfx/Sprites/backgrounds/background 9.png → .../gfx/Sprites/backgrounds/background 9.png b/.../gfx/Sprites/backgrounds/background 9.png → .../gfx/Sprites/backgrounds/background 9.png
diff --git a/...esources/gfx/Sprites/barrels/Barrel 1.png → ...esources/gfx/Sprites/barrels/Barrel 1.png b/...esources/gfx/Sprites/barrels/Barrel 1.png → ...esources/gfx/Sprites/barrels/Barrel 1.png
diff --git a/...esources/gfx/Sprites/barrels/Barrel 2.png → ...esources/gfx/Sprites/barrels/Barrel 2.png b/...esources/gfx/Sprites/barrels/Barrel 2.png → ...esources/gfx/Sprites/barrels/Barrel 2.png
diff --git a/...esources/gfx/Sprites/barrels/Barrel 3.png → ...esources/gfx/Sprites/barrels/Barrel 3.png b/...esources/gfx/Sprites/barrels/Barrel 3.png → ...esources/gfx/Sprites/barrels/Barrel 3.png
diff --git a/...ites/blocks (16 x 16)/block 1 [16x16].png → ...ites/blocks (16 x 16)/block 1 [16x16].png b/...ites/blocks (16 x 16)/block 1 [16x16].png → ...ites/blocks (16 x 16)/block 1 [16x16].png
diff --git a/...ites/blocks (16 x 16)/block 2 [16x16].png → ...ites/blocks (16 x 16)/block 2 [16x16].png b/...ites/blocks (16 x 16)/block 2 [16x16].png → ...ites/blocks (16 x 16)/block 2 [16x16].png
diff --git a/...ites/blocks (16 x 16)/block 3 [16x16].png → ...ites/blocks (16 x 16)/block 3 [16x16].png b/...ites/blocks (16 x 16)/block 3 [16x16].png → ...ites/blocks (16 x 16)/block 3 [16x16].png
diff --git a/...ites/blocks (16 x 16)/block 4 [16x16].png → ...ites/blocks (16 x 16)/block 4 [16x16].png b/...ites/blocks (16 x 16)/block 4 [16x16].png → ...ites/blocks (16 x 16)/block 4 [16x16].png
diff --git a/...tes/blocks (16 x 16)/block 5 [16x16] .png → ...tes/blocks (16 x 16)/block 5 [16x16] .png b/...tes/blocks (16 x 16)/block 5 [16x16] .png → ...tes/blocks (16 x 16)/block 5 [16x16] .png
diff --git a/.../gfx/Sprites/blocks (16 x 16)/block 6.png → .../gfx/Sprites/blocks (16 x 16)/block 6.png b/.../gfx/Sprites/blocks (16 x 16)/block 6.png → .../gfx/Sprites/blocks (16 x 16)/block 6.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 1.png → ...gfx/Sprites/blocks (16 x 16)/bricks 1.png b/...gfx/Sprites/blocks (16 x 16)/bricks 1.png → ...gfx/Sprites/blocks (16 x 16)/bricks 1.png
diff --git a/...fx/Sprites/blocks (16 x 16)/bricks 10.png → ...fx/Sprites/blocks (16 x 16)/bricks 10.png b/...fx/Sprites/blocks (16 x 16)/bricks 10.png → ...fx/Sprites/blocks (16 x 16)/bricks 10.png
diff --git a/...fx/Sprites/blocks (16 x 16)/bricks 11.png → ...fx/Sprites/blocks (16 x 16)/bricks 11.png b/...fx/Sprites/blocks (16 x 16)/bricks 11.png → ...fx/Sprites/blocks (16 x 16)/bricks 11.png
diff --git a/...fx/Sprites/blocks (16 x 16)/bricks 12.png → ...fx/Sprites/blocks (16 x 16)/bricks 12.png b/...fx/Sprites/blocks (16 x 16)/bricks 12.png → ...fx/Sprites/blocks (16 x 16)/bricks 12.png
diff --git a/...fx/Sprites/blocks (16 x 16)/bricks 13.png → ...fx/Sprites/blocks (16 x 16)/bricks 13.png b/...fx/Sprites/blocks (16 x 16)/bricks 13.png → ...fx/Sprites/blocks (16 x 16)/bricks 13.png
diff --git a/...fx/Sprites/blocks (16 x 16)/bricks 14.png → ...fx/Sprites/blocks (16 x 16)/bricks 14.png b/...fx/Sprites/blocks (16 x 16)/bricks 14.png → ...fx/Sprites/blocks (16 x 16)/bricks 14.png
diff --git a/...fx/Sprites/blocks (16 x 16)/bricks 15.png → ...fx/Sprites/blocks (16 x 16)/bricks 15.png b/...fx/Sprites/blocks (16 x 16)/bricks 15.png → ...fx/Sprites/blocks (16 x 16)/bricks 15.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 2.png → ...gfx/Sprites/blocks (16 x 16)/bricks 2.png b/...gfx/Sprites/blocks (16 x 16)/bricks 2.png → ...gfx/Sprites/blocks (16 x 16)/bricks 2.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 3.png → ...gfx/Sprites/blocks (16 x 16)/bricks 3.png b/...gfx/Sprites/blocks (16 x 16)/bricks 3.png → ...gfx/Sprites/blocks (16 x 16)/bricks 3.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 4.png → ...gfx/Sprites/blocks (16 x 16)/bricks 4.png b/...gfx/Sprites/blocks (16 x 16)/bricks 4.png → ...gfx/Sprites/blocks (16 x 16)/bricks 4.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 5.png → ...gfx/Sprites/blocks (16 x 16)/bricks 5.png b/...gfx/Sprites/blocks (16 x 16)/bricks 5.png → ...gfx/Sprites/blocks (16 x 16)/bricks 5.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 6.png → ...gfx/Sprites/blocks (16 x 16)/bricks 6.png b/...gfx/Sprites/blocks (16 x 16)/bricks 6.png → ...gfx/Sprites/blocks (16 x 16)/bricks 6.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 7.png → ...gfx/Sprites/blocks (16 x 16)/bricks 7.png b/...gfx/Sprites/blocks (16 x 16)/bricks 7.png → ...gfx/Sprites/blocks (16 x 16)/bricks 7.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 8.png → ...gfx/Sprites/blocks (16 x 16)/bricks 8.png b/...gfx/Sprites/blocks (16 x 16)/bricks 8.png → ...gfx/Sprites/blocks (16 x 16)/bricks 8.png
diff --git a/...gfx/Sprites/blocks (16 x 16)/bricks 9.png → ...gfx/Sprites/blocks (16 x 16)/bricks 9.png b/...gfx/Sprites/blocks (16 x 16)/bricks 9.png → ...gfx/Sprites/blocks (16 x 16)/bricks 9.png
diff --git a/...s/gfx/Sprites/blocks (16 x 16)/tile 1.png → ...s/gfx/Sprites/blocks (16 x 16)/tile 1.png b/...s/gfx/Sprites/blocks (16 x 16)/tile 1.png → ...s/gfx/Sprites/blocks (16 x 16)/tile 1.png
diff --git a/.../resources/gfx/Sprites/chests/chest 1.png → .../resources/gfx/Sprites/chests/chest 1.png b/.../resources/gfx/Sprites/chests/chest 1.png → .../resources/gfx/Sprites/chests/chest 1.png
diff --git a/.../resources/gfx/Sprites/chests/chest 2.png → .../resources/gfx/Sprites/chests/chest 2.png b/.../resources/gfx/Sprites/chests/chest 2.png → .../resources/gfx/Sprites/chests/chest 2.png
diff --git a/.../resources/gfx/Sprites/chests/chest 3.png → .../resources/gfx/Sprites/chests/chest 3.png b/.../resources/gfx/Sprites/chests/chest 3.png → .../resources/gfx/Sprites/chests/chest 3.png
diff --git a/.../resources/gfx/Sprites/chests/chest 4.png → .../resources/gfx/Sprites/chests/chest 4.png b/.../resources/gfx/Sprites/chests/chest 4.png → .../resources/gfx/Sprites/chests/chest 4.png
diff --git a/.../resources/gfx/Sprites/chests/chest 5.png → .../resources/gfx/Sprites/chests/chest 5.png b/.../resources/gfx/Sprites/chests/chest 5.png → .../resources/gfx/Sprites/chests/chest 5.png
diff --git a/.../resources/gfx/Sprites/clouds/cloud 1.png → .../resources/gfx/Sprites/clouds/cloud 1.png b/.../resources/gfx/Sprites/clouds/cloud 1.png → .../resources/gfx/Sprites/clouds/cloud 1.png
diff --git a/.../resources/gfx/Sprites/clouds/cloud 2.png → .../resources/gfx/Sprites/clouds/cloud 2.png b/.../resources/gfx/Sprites/clouds/cloud 2.png → .../resources/gfx/Sprites/clouds/cloud 2.png
diff --git a/.../resources/gfx/Sprites/clouds/cloud 3.png → .../resources/gfx/Sprites/clouds/cloud 3.png b/.../resources/gfx/Sprites/clouds/cloud 3.png → .../resources/gfx/Sprites/clouds/cloud 3.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 1.png → ...resources/gfx/Sprites/cracks/cracks 1.png b/...resources/gfx/Sprites/cracks/cracks 1.png → ...resources/gfx/Sprites/cracks/cracks 1.png
diff --git a/...esources/gfx/Sprites/cracks/cracks 10.png → ...esources/gfx/Sprites/cracks/cracks 10.png b/...esources/gfx/Sprites/cracks/cracks 10.png → ...esources/gfx/Sprites/cracks/cracks 10.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 2.png → ...resources/gfx/Sprites/cracks/cracks 2.png b/...resources/gfx/Sprites/cracks/cracks 2.png → ...resources/gfx/Sprites/cracks/cracks 2.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 3.png → ...resources/gfx/Sprites/cracks/cracks 3.png b/...resources/gfx/Sprites/cracks/cracks 3.png → ...resources/gfx/Sprites/cracks/cracks 3.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 4.png → ...resources/gfx/Sprites/cracks/cracks 4.png b/...resources/gfx/Sprites/cracks/cracks 4.png → ...resources/gfx/Sprites/cracks/cracks 4.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 5.png → ...resources/gfx/Sprites/cracks/cracks 5.png b/...resources/gfx/Sprites/cracks/cracks 5.png → ...resources/gfx/Sprites/cracks/cracks 5.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 6.png → ...resources/gfx/Sprites/cracks/cracks 6.png b/...resources/gfx/Sprites/cracks/cracks 6.png → ...resources/gfx/Sprites/cracks/cracks 6.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 7.png → ...resources/gfx/Sprites/cracks/cracks 7.png b/...resources/gfx/Sprites/cracks/cracks 7.png → ...resources/gfx/Sprites/cracks/cracks 7.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 8.png → ...resources/gfx/Sprites/cracks/cracks 8.png b/...resources/gfx/Sprites/cracks/cracks 8.png → ...resources/gfx/Sprites/cracks/cracks 8.png
diff --git a/...resources/gfx/Sprites/cracks/cracks 9.png → ...resources/gfx/Sprites/cracks/cracks 9.png b/...resources/gfx/Sprites/cracks/cracks 9.png → ...resources/gfx/Sprites/cracks/cracks 9.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 1.png → ...es/gfx/Sprites/crosshairs/hitmarker 1.png b/...es/gfx/Sprites/crosshairs/hitmarker 1.png → ...es/gfx/Sprites/crosshairs/hitmarker 1.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 2.png → ...es/gfx/Sprites/crosshairs/hitmarker 2.png b/...es/gfx/Sprites/crosshairs/hitmarker 2.png → ...es/gfx/Sprites/crosshairs/hitmarker 2.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 3.png → ...es/gfx/Sprites/crosshairs/hitmarker 3.png b/...es/gfx/Sprites/crosshairs/hitmarker 3.png → ...es/gfx/Sprites/crosshairs/hitmarker 3.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 4.png → ...es/gfx/Sprites/crosshairs/hitmarker 4.png b/...es/gfx/Sprites/crosshairs/hitmarker 4.png → ...es/gfx/Sprites/crosshairs/hitmarker 4.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 5.png → ...es/gfx/Sprites/crosshairs/hitmarker 5.png b/...es/gfx/Sprites/crosshairs/hitmarker 5.png → ...es/gfx/Sprites/crosshairs/hitmarker 5.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 6.png → ...es/gfx/Sprites/crosshairs/hitmarker 6.png b/...es/gfx/Sprites/crosshairs/hitmarker 6.png → ...es/gfx/Sprites/crosshairs/hitmarker 6.png
diff --git a/...es/gfx/Sprites/crosshairs/hitmarker 7.png → ...es/gfx/Sprites/crosshairs/hitmarker 7.png b/...es/gfx/Sprites/crosshairs/hitmarker 7.png → ...es/gfx/Sprites/crosshairs/hitmarker 7.png
diff --git a/Fifth/resources/gfx/Sprites/enemies/bee.png → Third/resources/gfx/Sprites/enemies/bee.png b/Fifth/resources/gfx/Sprites/enemies/bee.png → Third/resources/gfx/Sprites/enemies/bee.png
diff --git a/...s/gfx/Sprites/enemies/enemy 1 idle f1.png → ...s/gfx/Sprites/enemies/enemy 1 idle f1.png b/...s/gfx/Sprites/enemies/enemy 1 idle f1.png → ...s/gfx/Sprites/enemies/enemy 1 idle f1.png
diff --git a/...s/gfx/Sprites/enemies/enemy 1 idle f2.png → ...s/gfx/Sprites/enemies/enemy 1 idle f2.png b/...s/gfx/Sprites/enemies/enemy 1 idle f2.png → ...s/gfx/Sprites/enemies/enemy 1 idle f2.png
diff --git a/...fx/Sprites/enemies/enemy 1 running f1.png → ...fx/Sprites/enemies/enemy 1 running f1.png b/...fx/Sprites/enemies/enemy 1 running f1.png → ...fx/Sprites/enemies/enemy 1 running f1.png
diff --git a/...fx/Sprites/enemies/enemy 1 running f2.png → ...fx/Sprites/enemies/enemy 1 running f2.png b/...fx/Sprites/enemies/enemy 1 running f2.png → ...fx/Sprites/enemies/enemy 1 running f2.png
diff --git a/...sources/gfx/Sprites/enemies/fred [HD].png → ...sources/gfx/Sprites/enemies/fred [HD].png b/...sources/gfx/Sprites/enemies/fred [HD].png → ...sources/gfx/Sprites/enemies/fred [HD].png
diff --git a/...rces/gfx/Sprites/enemies/yrl/yrl AL 1.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 1.png b/...rces/gfx/Sprites/enemies/yrl/yrl AL 1.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 1.png
diff --git a/...rces/gfx/Sprites/enemies/yrl/yrl AL 2.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 2.png b/...rces/gfx/Sprites/enemies/yrl/yrl AL 2.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 2.png
diff --git a/...rces/gfx/Sprites/enemies/yrl/yrl AL 3.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 3.png b/...rces/gfx/Sprites/enemies/yrl/yrl AL 3.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 3.png
diff --git a/...rces/gfx/Sprites/enemies/yrl/yrl AL 4.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 4.png b/...rces/gfx/Sprites/enemies/yrl/yrl AL 4.png → ...rces/gfx/Sprites/enemies/yrl/yrl AL 4.png
diff --git a/...es/gfx/Sprites/enemies/yrl/yrl body 1.png → ...es/gfx/Sprites/enemies/yrl/yrl body 1.png b/...es/gfx/Sprites/enemies/yrl/yrl body 1.png → ...es/gfx/Sprites/enemies/yrl/yrl body 1.png
diff --git a/...es/gfx/Sprites/enemies/yrl/yrl face 1.png → ...es/gfx/Sprites/enemies/yrl/yrl face 1.png b/...es/gfx/Sprites/enemies/yrl/yrl face 1.png → ...es/gfx/Sprites/enemies/yrl/yrl face 1.png
diff --git a/...es/gfx/Sprites/enemies/yrl/yrl face 2.png → ...es/gfx/Sprites/enemies/yrl/yrl face 2.png b/...es/gfx/Sprites/enemies/yrl/yrl face 2.png → ...es/gfx/Sprites/enemies/yrl/yrl face 2.png
diff --git a/...es/gfx/Sprites/enemies/yrl/yrl face 3.png → ...es/gfx/Sprites/enemies/yrl/yrl face 3.png b/...es/gfx/Sprites/enemies/yrl/yrl face 3.png → ...es/gfx/Sprites/enemies/yrl/yrl face 3.png
diff --git a/.../resources/gfx/Sprites/houses/House 1.png → .../resources/gfx/Sprites/houses/House 1.png b/.../resources/gfx/Sprites/houses/House 1.png → .../resources/gfx/Sprites/houses/House 1.png
diff --git a/...urces/gfx/Sprites/houses/mini house 1.png → ...urces/gfx/Sprites/houses/mini house 1.png b/...urces/gfx/Sprites/houses/mini house 1.png → ...urces/gfx/Sprites/houses/mini house 1.png
diff --git a/...ources/gfx/Sprites/icons/icon [basic].png → ...ources/gfx/Sprites/icons/icon [basic].png b/...ources/gfx/Sprites/icons/icon [basic].png → ...ources/gfx/Sprites/icons/icon [basic].png
diff --git a/Fifth/resources/gfx/Sprites/icons/icon.png → Third/resources/gfx/Sprites/icons/icon.png b/Fifth/resources/gfx/Sprites/icons/icon.png → Third/resources/gfx/Sprites/icons/icon.png
diff --git a/Fifth/resources/gfx/Sprites/icons/icon_1.png → Third/resources/gfx/Sprites/icons/icon_1.png b/Fifth/resources/gfx/Sprites/icons/icon_1.png → Third/resources/gfx/Sprites/icons/icon_1.png
diff --git a/Fifth/resources/gfx/Sprites/icons/icon_2.png → Third/resources/gfx/Sprites/icons/icon_2.png b/Fifth/resources/gfx/Sprites/icons/icon_2.png → Third/resources/gfx/Sprites/icons/icon_2.png
diff --git a/...h/resources/gfx/Sprites/items/apple 1.png → ...d/resources/gfx/Sprites/items/apple 1.png b/...h/resources/gfx/Sprites/items/apple 1.png → ...d/resources/gfx/Sprites/items/apple 1.png
diff --git a/...h/resources/gfx/Sprites/items/apple 2.png → ...d/resources/gfx/Sprites/items/apple 2.png b/...h/resources/gfx/Sprites/items/apple 2.png → ...d/resources/gfx/Sprites/items/apple 2.png
diff --git a/...h/resources/gfx/Sprites/items/apple 3.png → ...d/resources/gfx/Sprites/items/apple 3.png b/...h/resources/gfx/Sprites/items/apple 3.png → ...d/resources/gfx/Sprites/items/apple 3.png
diff --git a/Fifth/resources/gfx/Sprites/items/bomb 1.png → Third/resources/gfx/Sprites/items/bomb 1.png b/Fifth/resources/gfx/Sprites/items/bomb 1.png → Third/resources/gfx/Sprites/items/bomb 1.png
diff --git a/Fifth/resources/gfx/Sprites/items/bomb 2.png → Third/resources/gfx/Sprites/items/bomb 2.png b/Fifth/resources/gfx/Sprites/items/bomb 2.png → Third/resources/gfx/Sprites/items/bomb 2.png
diff --git a/Fifth/resources/gfx/Sprites/items/bomb 3.png → Third/resources/gfx/Sprites/items/bomb 3.png b/Fifth/resources/gfx/Sprites/items/bomb 3.png → Third/resources/gfx/Sprites/items/bomb 3.png
diff --git a/Fifth/resources/gfx/Sprites/items/bomb 4.png → Third/resources/gfx/Sprites/items/bomb 4.png b/Fifth/resources/gfx/Sprites/items/bomb 4.png → Third/resources/gfx/Sprites/items/bomb 4.png
diff --git a/Fifth/resources/gfx/Sprites/items/bomb 5.png → Third/resources/gfx/Sprites/items/bomb 5.png b/Fifth/resources/gfx/Sprites/items/bomb 5.png → Third/resources/gfx/Sprites/items/bomb 5.png
diff --git a/Fifth/resources/gfx/Sprites/items/bomb 6.png → Third/resources/gfx/Sprites/items/bomb 6.png b/Fifth/resources/gfx/Sprites/items/bomb 6.png → Third/resources/gfx/Sprites/items/bomb 6.png
diff --git a/...h/resources/gfx/Sprites/nature/Tree 1.png → ...d/resources/gfx/Sprites/nature/Tree 1.png b/...h/resources/gfx/Sprites/nature/Tree 1.png → ...d/resources/gfx/Sprites/nature/Tree 1.png
diff --git a/...h/resources/gfx/Sprites/nature/Tree 2.png → ...d/resources/gfx/Sprites/nature/Tree 2.png b/...h/resources/gfx/Sprites/nature/Tree 2.png → ...d/resources/gfx/Sprites/nature/Tree 2.png
diff --git a/.../resources/gfx/Sprites/nature/birch 0.png → .../resources/gfx/Sprites/nature/birch 0.png b/.../resources/gfx/Sprites/nature/birch 0.png → .../resources/gfx/Sprites/nature/birch 0.png
diff --git a/.../resources/gfx/Sprites/nature/birch 1.png → .../resources/gfx/Sprites/nature/birch 1.png b/.../resources/gfx/Sprites/nature/birch 1.png → .../resources/gfx/Sprites/nature/birch 1.png
diff --git a/.../resources/gfx/Sprites/nature/birch 2.png → .../resources/gfx/Sprites/nature/birch 2.png b/.../resources/gfx/Sprites/nature/birch 2.png → .../resources/gfx/Sprites/nature/birch 2.png
diff --git a/.../resources/gfx/Sprites/nature/birch 3.png → .../resources/gfx/Sprites/nature/birch 3.png b/.../resources/gfx/Sprites/nature/birch 3.png → .../resources/gfx/Sprites/nature/birch 3.png
diff --git a/Fifth/resources/gfx/Sprites/nature/birch.png → Third/resources/gfx/Sprites/nature/birch.png b/Fifth/resources/gfx/Sprites/nature/birch.png → Third/resources/gfx/Sprites/nature/birch.png
diff --git a/...h/resources/gfx/Sprites/nature/bush 1.png → ...d/resources/gfx/Sprites/nature/bush 1.png b/...h/resources/gfx/Sprites/nature/bush 1.png → ...d/resources/gfx/Sprites/nature/bush 1.png
diff --git a/.../resources/gfx/Sprites/nature/bush 10.png → .../resources/gfx/Sprites/nature/bush 10.png b/.../resources/gfx/Sprites/nature/bush 10.png → .../resources/gfx/Sprites/nature/bush 10.png
diff --git a/.../resources/gfx/Sprites/nature/bush 11.png → .../resources/gfx/Sprites/nature/bush 11.png b/.../resources/gfx/Sprites/nature/bush 11.png → .../resources/gfx/Sprites/nature/bush 11.png
diff --git a/.../resources/gfx/Sprites/nature/bush 12.png → .../resources/gfx/Sprites/nature/bush 12.png b/.../resources/gfx/Sprites/nature/bush 12.png → .../resources/gfx/Sprites/nature/bush 12.png
diff --git a/.../resources/gfx/Sprites/nature/bush 13.png → .../resources/gfx/Sprites/nature/bush 13.png b/.../resources/gfx/Sprites/nature/bush 13.png → .../resources/gfx/Sprites/nature/bush 13.png