diff --git a/engine/src/scenes/node2d.h b/engine/src/scenes/node2d.h index 604b681..9dcd309 100644 --- a/engine/src/scenes/node2d.h +++ b/engine/src/scenes/node2d.h @@ -35,21 +35,23 @@ namespace enginend::nodes::twod { int framecounter; unsigned int nextframeoffset; int prevframe; - + const char*path; animated() : frames(0), currentframe(0), framedelay(6), framecounter(0), nextframeoffset(0) { animimage.data = nullptr; } animated(const char* gifpath, Vector2 position, Vector2 size, int delay = 6) : textured(nullptr, position.x, position.y, size.x, size.y), - framedelay(delay), currentframe(0), framecounter(0), frames(0), nextframeoffset(0) + framedelay(delay), currentframe(0), framecounter(0), frames(0), nextframeoffset(0),path(gifpath) { - animimage = LoadImageAnim(gifpath, &frames); + animimage = LoadImageAnim(path, &frames); if (frames > 0) { texture = new Texture2D(LoadTextureFromImage(animimage)); } } - + void boot() override { + + } void tick() override { textured::tick(); if (frames <= 1) return; @@ -162,11 +164,25 @@ namespace enginend::nodes::twod { } void boot()override{this->tinted::boot();} void tick()override{ + this->tinted::tick(); } void draw()override { - - this->tinted::tick(); + Vector2 mouse=GetMousePosition(); + float wstretch=(float)GetScreenWidth()/(float)GetRenderWidth(); + float hstretch=(float)GetScreenHeight()/(float)GetRenderHeight(); + mouse.x/=wstretch;mouse.y/=hstretch; + tiny::echo( + "render:\nwidth:%i height:%i\n\nscreen:\nwidth:%i height:%i\n\n\n", + GetRenderWidth(),GetRenderHeight(), + GetScreenWidth(),GetScreenHeight() + ); + + tiny::echo( + "stretch:\nwidth:%f height:%f\n\nmouse:\nwidth:%f height:%f", + wstretch,hstretch, + mouse.x,mouse.y + ); if(CheckCollisionPointRec(mouse,{pos.x,pos.y,size.x,size.y})){hover=true; if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ pressed=true; @@ -200,7 +216,6 @@ namespace enginend::nodes::twod { }; struct labeledbutton :virtual public button { std::string label; - Font font; int fs; Color txc; labeledbutton(std::string name,Texture2D* texture,enginend::theme* theme, @@ -229,12 +244,12 @@ namespace enginend::nodes::twod { this->theme->booleantext[3]:this->theme->booleantext[0]: this->theme->buttontext[0]; } - Vector2 tsize=MeasureTextEx(font,label.c_str(),fs,1); + Vector2 tsize=MeasureTextEx(theme->font,label.c_str(),fs,1); Vector2 tpos={ pos.x+(size.x-tsize.x)/2, pos.y+(size.y-tsize.y)/2 }; - DrawTextEx(font,label.c_str(),tpos,fs,1,txc); + DrawTextEx(theme->font,label.c_str(),tpos,fs,1,txc); } void exit()override{this->button::exit();} }; diff --git a/engine/src/scenes/node2drelative.h b/engine/src/scenes/node2drelative.h index 06cc329..338378a 100644 --- a/engine/src/scenes/node2drelative.h +++ b/engine/src/scenes/node2drelative.h @@ -24,8 +24,8 @@ namespace enginend::nodes::twod::relative { void tick() override{} void draw()override{ if(texture==nullptr)return; - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float aw=w*sw; @@ -95,8 +95,8 @@ namespace enginend::nodes::twod::relative { void boot()override{} void tick()override{} void draw()override{ - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float aw=w*sw; @@ -120,8 +120,8 @@ namespace enginend::nodes::twod::relative { colored::draw(); return; } - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float aw=w*sw; @@ -164,8 +164,8 @@ namespace enginend::nodes::twod::relative { } } void draw()override { - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; @@ -206,8 +206,11 @@ namespace enginend::nodes::twod::relative { void draw()override { Vector2 mouse=GetMousePosition(); - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float wstretch=(float)GetScreenWidth()/(float)GetRenderWidth(); + float hstretch=(float)GetScreenHeight()/(float)GetRenderHeight(); + mouse.x/=wstretch;mouse.y/=hstretch; + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)}; if(CheckCollisionPointRec(mouse,r)){hover=true; if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ @@ -259,8 +262,8 @@ namespace enginend::nodes::twod::relative { } void draw()override{ button::draw(); - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float aw=w*sw; @@ -307,8 +310,8 @@ namespace enginend::nodes::twod::relative { void boot()override{} void tick()override{ Vector2 mouse=GetMousePosition(); - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)}; if(CheckCollisionPointRec(mouse,r)&&IsMouseButtonDown(MOUSE_LEFT_BUTTON)){ float t=(mouse.x-(x*sw))/(w*sw); @@ -318,8 +321,8 @@ namespace enginend::nodes::twod::relative { } } void draw()override{ - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float aw=w*sw; @@ -341,8 +344,8 @@ namespace enginend::nodes::twod::relative { text::tick(); } void draw()override{ - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float aw=w*sw; @@ -369,8 +372,8 @@ namespace enginend::nodes::twod::relative { void tick()override{ text::tick(); Vector2 mouse=GetMousePosition(); - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)}; if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ active=CheckCollisionPointRec(mouse,r); @@ -393,8 +396,8 @@ namespace enginend::nodes::twod::relative { void draw()override{ text::draw(); if(active){ - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; DrawRectangle(ax+MeasureTextEx(this->theme->font,content.c_str(),fs,1).x,ay,2,fs,{0,0,0,127}); @@ -414,8 +417,8 @@ namespace enginend::nodes::twod::relative { void tick()override{ textfield::tick(); Vector2 mouse=GetMousePosition(); - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); Rectangle r={float(x*sw),float(y*sh),float(w*sw),float(h*sh)}; if(IsMouseButtonPressed(MOUSE_LEFT_BUTTON)){ active=CheckCollisionPointRec(mouse,r); @@ -442,8 +445,8 @@ namespace enginend::nodes::twod::relative { void draw()override{ textfield::draw(); if(active){ - float sw=GetScreenWidth(); - float sh=GetScreenHeight(); + float sw=GetRenderWidth(); + float sh=GetRenderHeight(); float ax=x*sw; float ay=y*sh; float lh=fs+2; diff --git a/engine/src/scenes/node3d.h b/engine/src/scenes/node3d.h index cfab994..0f2da3b 100644 --- a/engine/src/scenes/node3d.h +++ b/engine/src/scenes/node3d.h @@ -45,10 +45,21 @@ namespace enginend::nodes::trid { }; struct object3d:public physicsagent { Model* model; + const char *path; + object3d(const char* path):path(path) { + } + void boot() override { + (*model)=LoadModel(path); + } + void tick() override { + + } void draw() override { DrawModel(*model,pos,1.,tint); } void exit() override { + UnloadModel(*model); + delete model; } }; diff --git a/games/animatronical/q1/a1/CMakeLists.txt b/games/animatronical/q1/a1/CMakeLists.txt index 7d6164b..e960d79 100644 --- a/games/animatronical/q1/a1/CMakeLists.txt +++ b/games/animatronical/q1/a1/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) -set(CMAKE_CXX_FLAGS "-std=c++26 -Wno-error -Oz -w -g -mavx2") +set(CMAKE_CXX_FLAGS "-std=c++26 -Wno-error -O0 -w -g -mavx2") file(GLOB_RECURSE ANIMSOURCES CONFIGURE_DEPENDS "src/*.cpp") add_executable(animatronical-1 ${ANIMSOURCES}) if(NOT DEFINED ${ARCH}) diff --git a/games/animatronical/q1/a1/res/font/eagle.ttf b/games/animatronical/q1/a1/res/font/eagle.ttf new file mode 100755 index 0000000..ad67d13 Binary files /dev/null and b/games/animatronical/q1/a1/res/font/eagle.ttf differ diff --git a/games/animatronical/q1/a1/res/font/eagle2.ttf b/games/animatronical/q1/a1/res/font/eagle2.ttf new file mode 100755 index 0000000..bff0f5a Binary files /dev/null and b/games/animatronical/q1/a1/res/font/eagle2.ttf differ diff --git a/games/animatronical/q1/a1/res/font/mga.ttf b/games/animatronical/q1/a1/res/font/mga.ttf new file mode 100755 index 0000000..ff183da Binary files /dev/null and b/games/animatronical/q1/a1/res/font/mga.ttf differ diff --git a/games/animatronical/q1/a1/res/gui/buttonf.png b/games/animatronical/q1/a1/res/gui/buttonf.png new file mode 100755 index 0000000..fbceda1 Binary files /dev/null and b/games/animatronical/q1/a1/res/gui/buttonf.png differ diff --git a/games/animatronical/q1/a1/res/gui/buttonn.png b/games/animatronical/q1/a1/res/gui/buttonn.png new file mode 100755 index 0000000..580c5d1 Binary files /dev/null and b/games/animatronical/q1/a1/res/gui/buttonn.png differ diff --git a/games/animatronical/q1/a1/res/gui/skailevisor.png b/games/animatronical/q1/a1/res/gui/skailevisor.png new file mode 100755 index 0000000..d3a1854 Binary files /dev/null and b/games/animatronical/q1/a1/res/gui/skailevisor.png differ diff --git a/games/animatronical/q1/a1/res/icon.png b/games/animatronical/q1/a1/res/icon.png new file mode 100755 index 0000000..7648d33 Binary files /dev/null and b/games/animatronical/q1/a1/res/icon.png differ diff --git a/games/animatronical/q1/a1/res/loading/out2.gif b/games/animatronical/q1/a1/res/loading/out2.gif new file mode 100644 index 0000000..3a027c7 Binary files /dev/null and b/games/animatronical/q1/a1/res/loading/out2.gif differ diff --git a/games/animatronical/q1/a1/res/map/off/l/0.jpg b/games/animatronical/q1/a1/res/map/off/l/0.jpg deleted file mode 100644 index b290a26..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/1.jpg b/games/animatronical/q1/a1/res/map/off/l/1.jpg deleted file mode 100644 index b547ae9..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/10.jpg b/games/animatronical/q1/a1/res/map/off/l/10.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/11.jpg b/games/animatronical/q1/a1/res/map/off/l/11.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/12.jpg b/games/animatronical/q1/a1/res/map/off/l/12.jpg deleted file mode 100644 index 4a56002..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/13.jpg b/games/animatronical/q1/a1/res/map/off/l/13.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/14.jpg b/games/animatronical/q1/a1/res/map/off/l/14.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/15.jpg b/games/animatronical/q1/a1/res/map/off/l/15.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/16.jpg b/games/animatronical/q1/a1/res/map/off/l/16.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/2.jpg b/games/animatronical/q1/a1/res/map/off/l/2.jpg deleted file mode 100644 index fd7e2e0..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/3.jpg b/games/animatronical/q1/a1/res/map/off/l/3.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/4.jpg b/games/animatronical/q1/a1/res/map/off/l/4.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/5.jpg b/games/animatronical/q1/a1/res/map/off/l/5.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/6.jpg b/games/animatronical/q1/a1/res/map/off/l/6.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/7.jpg b/games/animatronical/q1/a1/res/map/off/l/7.jpg deleted file mode 100644 index eac1856..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/8.jpg b/games/animatronical/q1/a1/res/map/off/l/8.jpg deleted file mode 100644 index 1c6022d..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/l/9.jpg b/games/animatronical/q1/a1/res/map/off/l/9.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/l/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/0.jpg b/games/animatronical/q1/a1/res/map/off/n/0.jpg deleted file mode 100644 index 723ca3d..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/1.jpg b/games/animatronical/q1/a1/res/map/off/n/1.jpg deleted file mode 100644 index d136d25..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/10.jpg b/games/animatronical/q1/a1/res/map/off/n/10.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/11.jpg b/games/animatronical/q1/a1/res/map/off/n/11.jpg deleted file mode 100644 index 2561233..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/12.jpg b/games/animatronical/q1/a1/res/map/off/n/12.jpg deleted file mode 100644 index 548904d..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/13.jpg b/games/animatronical/q1/a1/res/map/off/n/13.jpg deleted file mode 100644 index c096477..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/14.jpg b/games/animatronical/q1/a1/res/map/off/n/14.jpg deleted file mode 100644 index 111af9d..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/15.jpg b/games/animatronical/q1/a1/res/map/off/n/15.jpg deleted file mode 100644 index efbd1c4..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/16.jpg b/games/animatronical/q1/a1/res/map/off/n/16.jpg deleted file mode 100644 index e541dd4..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/2.jpg b/games/animatronical/q1/a1/res/map/off/n/2.jpg deleted file mode 100644 index 43afa71..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/3.jpg b/games/animatronical/q1/a1/res/map/off/n/3.jpg deleted file mode 100644 index 99b9285..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/4.jpg b/games/animatronical/q1/a1/res/map/off/n/4.jpg deleted file mode 100644 index 3580968..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/5.jpg b/games/animatronical/q1/a1/res/map/off/n/5.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/6.jpg b/games/animatronical/q1/a1/res/map/off/n/6.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/7.jpg b/games/animatronical/q1/a1/res/map/off/n/7.jpg deleted file mode 100644 index edc304d..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/8.jpg b/games/animatronical/q1/a1/res/map/off/n/8.jpg deleted file mode 100644 index bdfe146..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/n/9.jpg b/games/animatronical/q1/a1/res/map/off/n/9.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/n/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/0.jpg b/games/animatronical/q1/a1/res/map/off/r/0.jpg deleted file mode 100644 index 4d492b7..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/1.jpg b/games/animatronical/q1/a1/res/map/off/r/1.jpg deleted file mode 100644 index 8636116..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/10.jpg b/games/animatronical/q1/a1/res/map/off/r/10.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/11.jpg b/games/animatronical/q1/a1/res/map/off/r/11.jpg deleted file mode 100644 index fd3a85a..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/12.jpg b/games/animatronical/q1/a1/res/map/off/r/12.jpg deleted file mode 100644 index 77ba627..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/13.jpg b/games/animatronical/q1/a1/res/map/off/r/13.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/14.jpg b/games/animatronical/q1/a1/res/map/off/r/14.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/15.jpg b/games/animatronical/q1/a1/res/map/off/r/15.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/16.jpg b/games/animatronical/q1/a1/res/map/off/r/16.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/2.jpg b/games/animatronical/q1/a1/res/map/off/r/2.jpg deleted file mode 100644 index 170d5c8..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/3.jpg b/games/animatronical/q1/a1/res/map/off/r/3.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/4.jpg b/games/animatronical/q1/a1/res/map/off/r/4.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/5.jpg b/games/animatronical/q1/a1/res/map/off/r/5.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/6.jpg b/games/animatronical/q1/a1/res/map/off/r/6.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/7.jpg b/games/animatronical/q1/a1/res/map/off/r/7.jpg deleted file mode 100644 index 15294e9..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/8.jpg b/games/animatronical/q1/a1/res/map/off/r/8.jpg deleted file mode 100644 index ffed13a..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/r/9.jpg b/games/animatronical/q1/a1/res/map/off/r/9.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/r/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/0.jpg b/games/animatronical/q1/a1/res/map/off/s/0.jpg deleted file mode 100644 index 601c661..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/1.jpg b/games/animatronical/q1/a1/res/map/off/s/1.jpg deleted file mode 100644 index c651849..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/10.jpg b/games/animatronical/q1/a1/res/map/off/s/10.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/11.jpg b/games/animatronical/q1/a1/res/map/off/s/11.jpg deleted file mode 100644 index c134191..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/12.jpg b/games/animatronical/q1/a1/res/map/off/s/12.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/13.jpg b/games/animatronical/q1/a1/res/map/off/s/13.jpg deleted file mode 100644 index be989e7..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/14.jpg b/games/animatronical/q1/a1/res/map/off/s/14.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/15.jpg b/games/animatronical/q1/a1/res/map/off/s/15.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/16.jpg b/games/animatronical/q1/a1/res/map/off/s/16.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/2.jpg b/games/animatronical/q1/a1/res/map/off/s/2.jpg deleted file mode 100644 index 73eda8e..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/3.jpg b/games/animatronical/q1/a1/res/map/off/s/3.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/4.jpg b/games/animatronical/q1/a1/res/map/off/s/4.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/5.jpg b/games/animatronical/q1/a1/res/map/off/s/5.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/6.jpg b/games/animatronical/q1/a1/res/map/off/s/6.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/7.jpg b/games/animatronical/q1/a1/res/map/off/s/7.jpg deleted file mode 100644 index 9067a61..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/8.jpg b/games/animatronical/q1/a1/res/map/off/s/8.jpg deleted file mode 100644 index daa672e..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/off/s/9.jpg b/games/animatronical/q1/a1/res/map/off/s/9.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/off/s/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/0.jpg b/games/animatronical/q1/a1/res/map/on/l/0.jpg deleted file mode 100644 index 6793d8f..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/1.jpg b/games/animatronical/q1/a1/res/map/on/l/1.jpg deleted file mode 100644 index cebc3fa..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/10.jpg b/games/animatronical/q1/a1/res/map/on/l/10.jpg deleted file mode 100644 index b91a5bb..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/11.jpg b/games/animatronical/q1/a1/res/map/on/l/11.jpg deleted file mode 100644 index 5487ba2..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/12.jpg b/games/animatronical/q1/a1/res/map/on/l/12.jpg deleted file mode 100644 index c88d068..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/13.jpg b/games/animatronical/q1/a1/res/map/on/l/13.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/14.jpg b/games/animatronical/q1/a1/res/map/on/l/14.jpg deleted file mode 100644 index 10c6b6b..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/15.jpg b/games/animatronical/q1/a1/res/map/on/l/15.jpg deleted file mode 100644 index 8aae7ac..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/16.jpg b/games/animatronical/q1/a1/res/map/on/l/16.jpg deleted file mode 100644 index 4900fa0..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/2.jpg b/games/animatronical/q1/a1/res/map/on/l/2.jpg deleted file mode 100644 index 5fd4b3b..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/3.jpg b/games/animatronical/q1/a1/res/map/on/l/3.jpg deleted file mode 100644 index c433a3b..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/4.jpg b/games/animatronical/q1/a1/res/map/on/l/4.jpg deleted file mode 100644 index 76e5376..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/5.jpg b/games/animatronical/q1/a1/res/map/on/l/5.jpg deleted file mode 100644 index bdbfda7..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/6.jpg b/games/animatronical/q1/a1/res/map/on/l/6.jpg deleted file mode 100644 index 5048698..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/7.jpg b/games/animatronical/q1/a1/res/map/on/l/7.jpg deleted file mode 100644 index a716b88..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/8.jpg b/games/animatronical/q1/a1/res/map/on/l/8.jpg deleted file mode 100644 index 6a2eef3..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/l/9.jpg b/games/animatronical/q1/a1/res/map/on/l/9.jpg deleted file mode 100644 index 5fd9b07..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/l/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/0.jpg b/games/animatronical/q1/a1/res/map/on/n/0.jpg deleted file mode 100644 index d2cbf9c..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/1.jpg b/games/animatronical/q1/a1/res/map/on/n/1.jpg deleted file mode 100644 index d7e80b8..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/10.jpg b/games/animatronical/q1/a1/res/map/on/n/10.jpg deleted file mode 100644 index ae776d9..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/11.jpg b/games/animatronical/q1/a1/res/map/on/n/11.jpg deleted file mode 100644 index 3234668..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/12.jpg b/games/animatronical/q1/a1/res/map/on/n/12.jpg deleted file mode 100644 index a2868b7..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/13.jpg b/games/animatronical/q1/a1/res/map/on/n/13.jpg deleted file mode 100644 index 41630d2..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/14.jpg b/games/animatronical/q1/a1/res/map/on/n/14.jpg deleted file mode 100644 index 304aa59..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/15.jpg b/games/animatronical/q1/a1/res/map/on/n/15.jpg deleted file mode 100644 index f198903..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/16.jpg b/games/animatronical/q1/a1/res/map/on/n/16.jpg deleted file mode 100644 index 79508f1..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/2.jpg b/games/animatronical/q1/a1/res/map/on/n/2.jpg deleted file mode 100644 index 17c56d6..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/3.jpg b/games/animatronical/q1/a1/res/map/on/n/3.jpg deleted file mode 100644 index a412935..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/4.jpg b/games/animatronical/q1/a1/res/map/on/n/4.jpg deleted file mode 100644 index a2cabec..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/5.jpg b/games/animatronical/q1/a1/res/map/on/n/5.jpg deleted file mode 100644 index 4d367fa..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/6.jpg b/games/animatronical/q1/a1/res/map/on/n/6.jpg deleted file mode 100644 index 65ddf12..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/7.jpg b/games/animatronical/q1/a1/res/map/on/n/7.jpg deleted file mode 100644 index 6de5867..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/8.jpg b/games/animatronical/q1/a1/res/map/on/n/8.jpg deleted file mode 100644 index 41fe646..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/n/9.jpg b/games/animatronical/q1/a1/res/map/on/n/9.jpg deleted file mode 100644 index 8477ed5..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/n/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/0.jpg b/games/animatronical/q1/a1/res/map/on/r/0.jpg deleted file mode 100644 index a80e9b7..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/1.jpg b/games/animatronical/q1/a1/res/map/on/r/1.jpg deleted file mode 100644 index cd0dc54..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/10.jpg b/games/animatronical/q1/a1/res/map/on/r/10.jpg deleted file mode 100644 index 8ea535e..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/11.jpg b/games/animatronical/q1/a1/res/map/on/r/11.jpg deleted file mode 100644 index f90dc0a..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/12.jpg b/games/animatronical/q1/a1/res/map/on/r/12.jpg deleted file mode 100644 index 4d103c5..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/13.jpg b/games/animatronical/q1/a1/res/map/on/r/13.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/14.jpg b/games/animatronical/q1/a1/res/map/on/r/14.jpg deleted file mode 100644 index 7c2d3f4..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/15.jpg b/games/animatronical/q1/a1/res/map/on/r/15.jpg deleted file mode 100644 index 789dc8f..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/16.jpg b/games/animatronical/q1/a1/res/map/on/r/16.jpg deleted file mode 100644 index e55a999..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/2.jpg b/games/animatronical/q1/a1/res/map/on/r/2.jpg deleted file mode 100644 index 41991c9..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/3.jpg b/games/animatronical/q1/a1/res/map/on/r/3.jpg deleted file mode 100644 index a998e0e..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/4.jpg b/games/animatronical/q1/a1/res/map/on/r/4.jpg deleted file mode 100644 index dbc1916..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/5.jpg b/games/animatronical/q1/a1/res/map/on/r/5.jpg deleted file mode 100644 index c2ee52e..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/6.jpg b/games/animatronical/q1/a1/res/map/on/r/6.jpg deleted file mode 100644 index 494f708..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/7.jpg b/games/animatronical/q1/a1/res/map/on/r/7.jpg deleted file mode 100644 index 1e5cf93..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/8.jpg b/games/animatronical/q1/a1/res/map/on/r/8.jpg deleted file mode 100644 index 1f11127..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/r/9.jpg b/games/animatronical/q1/a1/res/map/on/r/9.jpg deleted file mode 100644 index f612ff1..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/r/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/0.jpg b/games/animatronical/q1/a1/res/map/on/s/0.jpg deleted file mode 100644 index 17f1d52..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/1.jpg b/games/animatronical/q1/a1/res/map/on/s/1.jpg deleted file mode 100644 index 7f8caa7..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/10.jpg b/games/animatronical/q1/a1/res/map/on/s/10.jpg deleted file mode 100644 index f75dfd9..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/11.jpg b/games/animatronical/q1/a1/res/map/on/s/11.jpg deleted file mode 100644 index 64776b3..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/12.jpg b/games/animatronical/q1/a1/res/map/on/s/12.jpg deleted file mode 100644 index 205cf62..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/13.jpg b/games/animatronical/q1/a1/res/map/on/s/13.jpg deleted file mode 100644 index e023985..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/14.jpg b/games/animatronical/q1/a1/res/map/on/s/14.jpg deleted file mode 100644 index 774689c..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/15.jpg b/games/animatronical/q1/a1/res/map/on/s/15.jpg deleted file mode 100644 index 0785719..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/16.jpg b/games/animatronical/q1/a1/res/map/on/s/16.jpg deleted file mode 100644 index bb7fcae..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/2.jpg b/games/animatronical/q1/a1/res/map/on/s/2.jpg deleted file mode 100644 index 953291f..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/3.jpg b/games/animatronical/q1/a1/res/map/on/s/3.jpg deleted file mode 100644 index f6ab35d..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/4.jpg b/games/animatronical/q1/a1/res/map/on/s/4.jpg deleted file mode 100644 index 55a13ad..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/5.jpg b/games/animatronical/q1/a1/res/map/on/s/5.jpg deleted file mode 100644 index d3eeab9..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/6.jpg b/games/animatronical/q1/a1/res/map/on/s/6.jpg deleted file mode 100644 index 650b432..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/7.jpg b/games/animatronical/q1/a1/res/map/on/s/7.jpg deleted file mode 100644 index 4f48a30..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/8.jpg b/games/animatronical/q1/a1/res/map/on/s/8.jpg deleted file mode 100644 index 444aae0..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/on/s/9.jpg b/games/animatronical/q1/a1/res/map/on/s/9.jpg deleted file mode 100644 index 592b5ee..0000000 Binary files a/games/animatronical/q1/a1/res/map/on/s/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/0.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/0.jpg deleted file mode 100644 index b5a9974..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/1.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/1.jpg deleted file mode 100644 index 3e3ee3b..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/10.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/10.jpg deleted file mode 100644 index e0878de..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/11.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/11.jpg deleted file mode 100644 index b6332cb..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/12.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/12.jpg deleted file mode 100644 index a3168c1..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/13.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/13.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/14.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/14.jpg deleted file mode 100644 index dbb4958..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/15.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/15.jpg deleted file mode 100644 index 7fcd5b9..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/16.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/16.jpg deleted file mode 100644 index f6906cc..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/2.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/2.jpg deleted file mode 100644 index 3c2e11b..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/3.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/3.jpg deleted file mode 100644 index 4fc66e4..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/4.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/4.jpg deleted file mode 100644 index 42d549a..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/5.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/5.jpg deleted file mode 100644 index fc8abbf..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/6.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/6.jpg deleted file mode 100644 index 80d79ae..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/7.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/7.jpg deleted file mode 100644 index fafab60..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/8.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/8.jpg deleted file mode 100644 index b7f27b3..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/l/9.jpg b/games/animatronical/q1/a1/res/map/urcooked/l/9.jpg deleted file mode 100644 index 88368b7..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/l/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/0.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/0.jpg deleted file mode 100644 index 6bda8fc..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/1.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/1.jpg deleted file mode 100644 index f44f568..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/10.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/10.jpg deleted file mode 100644 index f20430c..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/11.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/11.jpg deleted file mode 100644 index 0c8dedd..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/12.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/12.jpg deleted file mode 100644 index 9ea9b64..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/13.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/13.jpg deleted file mode 100644 index 50d4405..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/14.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/14.jpg deleted file mode 100644 index b04e5d3..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/15.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/15.jpg deleted file mode 100644 index 3d2a74e..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/16.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/16.jpg deleted file mode 100644 index 9623a3f..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/2.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/2.jpg deleted file mode 100644 index 246540a..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/3.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/3.jpg deleted file mode 100644 index 4b33d88..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/4.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/4.jpg deleted file mode 100644 index 615e90a..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/5.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/5.jpg deleted file mode 100644 index 51de2bb..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/6.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/6.jpg deleted file mode 100644 index 507b270..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/7.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/7.jpg deleted file mode 100644 index 1663126..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/8.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/8.jpg deleted file mode 100644 index 05a0312..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/n/9.jpg b/games/animatronical/q1/a1/res/map/urcooked/n/9.jpg deleted file mode 100644 index ea171d6..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/n/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/0.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/0.jpg deleted file mode 100644 index d1c7d69..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/1.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/1.jpg deleted file mode 100644 index 94fbd38..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/10.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/10.jpg deleted file mode 100644 index d71e45f..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/11.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/11.jpg deleted file mode 100644 index fd7f640..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/12.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/12.jpg deleted file mode 100644 index cfa2b84..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/13.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/13.jpg deleted file mode 100644 index 1c672df..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/14.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/14.jpg deleted file mode 100644 index df6239e..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/15.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/15.jpg deleted file mode 100644 index 665daea..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/16.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/16.jpg deleted file mode 100644 index 80e0891..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/2.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/2.jpg deleted file mode 100644 index cb19f23..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/3.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/3.jpg deleted file mode 100644 index 4d1a68c..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/4.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/4.jpg deleted file mode 100644 index c7b9cc6..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/5.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/5.jpg deleted file mode 100644 index da71c54..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/6.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/6.jpg deleted file mode 100644 index f60ecb5..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/7.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/7.jpg deleted file mode 100644 index 5d75f63..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/8.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/8.jpg deleted file mode 100644 index 117ded3..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/r/9.jpg b/games/animatronical/q1/a1/res/map/urcooked/r/9.jpg deleted file mode 100644 index fd29079..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/r/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/0.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/0.jpg deleted file mode 100644 index d65ad40..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/0.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/1.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/1.jpg deleted file mode 100644 index fd6b9da..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/1.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/10.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/10.jpg deleted file mode 100644 index 03e2aa7..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/10.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/11.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/11.jpg deleted file mode 100644 index bc7e30b..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/11.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/12.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/12.jpg deleted file mode 100644 index 7973aa3..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/12.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/13.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/13.jpg deleted file mode 100644 index 3a23747..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/13.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/14.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/14.jpg deleted file mode 100644 index e376969..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/14.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/15.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/15.jpg deleted file mode 100644 index c5654ce..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/15.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/16.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/16.jpg deleted file mode 100644 index 979c7e9..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/16.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/2.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/2.jpg deleted file mode 100644 index b49d871..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/2.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/3.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/3.jpg deleted file mode 100644 index 3c0a2b0..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/3.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/4.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/4.jpg deleted file mode 100644 index 6ab7345..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/4.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/5.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/5.jpg deleted file mode 100644 index c55ac2f..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/5.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/6.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/6.jpg deleted file mode 100644 index 711ca3e..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/6.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/7.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/7.jpg deleted file mode 100644 index a9eb4ae..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/7.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/8.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/8.jpg deleted file mode 100644 index 6631343..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/8.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/map/urcooked/s/9.jpg b/games/animatronical/q1/a1/res/map/urcooked/s/9.jpg deleted file mode 100644 index 785a549..0000000 Binary files a/games/animatronical/q1/a1/res/map/urcooked/s/9.jpg and /dev/null differ diff --git a/games/animatronical/q1/a1/res/sprites/skaile/rest.png b/games/animatronical/q1/a1/res/sprites/skaile/rest.png new file mode 100755 index 0000000..60b9bd6 Binary files /dev/null and b/games/animatronical/q1/a1/res/sprites/skaile/rest.png differ diff --git a/games/animatronical/q1/a1/ressrc/house.blend b/games/animatronical/q1/a1/ressrc/house.blend index 8cd9249..9179fcc 100644 Binary files a/games/animatronical/q1/a1/ressrc/house.blend and b/games/animatronical/q1/a1/ressrc/house.blend differ diff --git a/games/animatronical/q1/a1/ressrc/house.blend1 b/games/animatronical/q1/a1/ressrc/house.blend1 index 9f466f2..8cd9249 100644 Binary files a/games/animatronical/q1/a1/ressrc/house.blend1 and b/games/animatronical/q1/a1/ressrc/house.blend1 differ diff --git a/games/animatronical/q1/a1/ressrc/out2.png b/games/animatronical/q1/a1/ressrc/out2.png new file mode 100755 index 0000000..d833fe6 Binary files /dev/null and b/games/animatronical/q1/a1/ressrc/out2.png differ diff --git a/games/animatronical/q1/a1/ressrc/poster.png b/games/animatronical/q1/a1/ressrc/poster.png new file mode 100755 index 0000000..b757821 Binary files /dev/null and b/games/animatronical/q1/a1/ressrc/poster.png differ diff --git a/games/animatronical/q1/a1/ressrc/render.py b/games/animatronical/q1/a1/ressrc/render.py index d10beab..a809c4b 100644 --- a/games/animatronical/q1/a1/ressrc/render.py +++ b/games/animatronical/q1/a1/ressrc/render.py @@ -1,7 +1,7 @@ import os import bpy modes=["on","off","urcooked"] -sides=['s','n','l','r'] +sides=['s','n','r','l'] quality=99 frame=0 cmd=os.path.dirname(os.path.abspath(__file__)) diff --git a/games/animatronical/q1/a1/src/cycletext.h b/games/animatronical/q1/a1/src/cycletext.h new file mode 100644 index 0000000..feccba2 --- /dev/null +++ b/games/animatronical/q1/a1/src/cycletext.h @@ -0,0 +1,40 @@ +#pragma once +#include +extern Color*LOADINGCOLOR[3]; +struct logi: public virtual enginend::nodes::twod::textfield { + logi(Texture2D* texture,enginend::theme* theme,float x,float y,float w,float h,float fs,std::string txt) { + this->pos=Vector2{x,y};this->size=Vector2{w,h};this->content=txt;this->theme=theme; + this->texture=texture; + this->fs=fs; + } + int delay=0; + int wait=0,amount=10; + void draw() override { + float spacing=fs/2.0f; + if(++delay>=10){ + Color*tmp=LOADINGCOLOR[2]; + LOADINGCOLOR[2]=LOADINGCOLOR[1]; + LOADINGCOLOR[1]=LOADINGCOLOR[0]; + LOADINGCOLOR[0]=tmp; + delay=0; + } + if(++wait>20){ + wait=0; + int max=(content.size()/2)*2; + if(++amount>=max)amount=0; + } + int vispos=amount>>1; + int len=content.size(); + Vector2 charPos=pos; + for(int i=0;itheme->font,str,charPos,(float)fs,spacing,fc); + charPos.x+=MeasureTextEx(this->theme->font,str,(float)fs,spacing).x; + } else break; + } + } +}; diff --git a/games/animatronical/q1/a1/src/main.cpp b/games/animatronical/q1/a1/src/main.cpp index 829d0bf..698fa09 100644 --- a/games/animatronical/q1/a1/src/main.cpp +++ b/games/animatronical/q1/a1/src/main.cpp @@ -1,32 +1,105 @@ #include "scenes/game.h" #include "scenes/mainmenu.h" +#include "cycletext.h" tiny::ErrorLevel tiny::level{9}; PLATFORM platform=LINUX; std::string androidpackage="kn.kinfuyuki.animatronical-q1a1"; +Font gamefont; +Font loadingfont; +char changeto=0; +Color*LOADINGCOLOR[3] { + new Color{255,255,0,255}, + new Color{255,0,255,255}, + new Color{0,255,255,255} +}; class anim: public enginend::program { public: + int loadscreensecs=0; + int loadingscreen=0; + RenderTexture2D buffer; + enginend::nodes::twod::animated* caramel; + logi* loadingtext; const char *CONF() override{return "SAVEFILE.TDF";} + + bool changing=false; + Image aniicon; void boot() override { + aniicon=LoadImage("res/icon.png"); this->currentscene=new mainmenu; SetConfigFlags(FLAG_VSYNC_HINT|FLAG_WINDOW_RESIZABLE); InitWindow(380,240,"ani1"); + + SetWindowIcon(aniicon); InitAudioDevice(); + gamefont=LoadFont(AT("res/font/mga.ttf")); + caramel=new enginend::nodes::twod::animated( + AT("res/loading/out2.gif"),{0,0},{320,240},6 + ); + loadingtext=new logi( + nullptr,enginend::DEFAULT,0,220,200,16,16,"LOADING..." + ); + buffer=LoadRenderTexture(320,240); + enginend::DEFAULT->font=gamefont; currentscene->boot(); } void tick() override { if (IsKeyDown(KEY_LEFT_ALT)&&IsKeyDown(KEY_F4))shouldclose=true; - currentscene->tick(); + if(changing) { + loadingscreen++; + caramel->tick(); + loadingtext->tick(); + if (loadingscreen>loadscreensecs) { + changing=false; + loadingscreen=0; + currentscene->exit(); + delete currentscene; + currentscene= new game; + currentscene->boot(); + currentscene->tick(); + } + } + else currentscene->tick(); } void draw() override { - currentscene->draw(); + BeginTextureMode(buffer); + ClearBackground(rl::BLACK); + int currscene=changeto; + if (!changing)currentscene->draw(); + else { + caramel->draw(); + loadingtext->draw(); + } + EndTextureMode(); + + if (currscene!=changeto) { + tiny::success("yay"); + switch (changeto) { + case 0: + currentscene->exit(); + delete currentscene; + currentscene= new mainmenu; + currentscene->boot(); + break; + case 1: + changing=true; + loadscreensecs=GetRandomValue(2*60,10*60); + break; + default: + tiny::fatal("wtf"); + } + } + + BeginDrawing(); + ClearBackground(rl::BLACK); + DrawTexturePro(buffer.texture,{0,0,320,-240},{0,0,(float)GetScreenWidth(),(float)GetScreenHeight()},{0,0},0,rl::WHITE); + EndDrawing(); } void exit() override { currentscene->exit(); } }; -char changeto=-1; int main() { anim dagame; dagame.boot(); diff --git a/games/animatronical/q1/a1/src/scenes/game.h b/games/animatronical/q1/a1/src/scenes/game.h index 5975af3..bb00206 100644 --- a/games/animatronical/q1/a1/src/scenes/game.h +++ b/games/animatronical/q1/a1/src/scenes/game.h @@ -38,19 +38,40 @@ struct game:public enginend::scene { entity skaile{10,3}; entity player{0,1}; Texture2D current; + Texture2D skailemenu[3]; + bool iskailepressed=false; + bool iskailemenu=false; + bool canseeuycatroz=false; bool canseeskaile=false; float crystallyprogress=1.; + void exit() override { + UnloadTexture(current); + for (Texture2D i: skailemenu) { + + UnloadTexture(i); + } + scene::exit(); + } void boot() final { mappath=AT("res/map"); - this->nodes={ - new enginend::nodes::twod::relative::textured() - }; std::string newpath=AT((mappath+"/"+lightlevel[lightmode]+"/"+sides[player.dir]+"/"+std::to_string(player.pos)+".jpg")); - + skailemenu[0]=LoadTexture(AT("res/gui/buttonf.png")); + skailemenu[1]=LoadTexture(AT("res/gui/buttonn.png")); + skailemenu[2]=LoadTexture(AT("res/gui/skailevisor.png")); current=LOADMAP } void tick() final { + if (iskailemenu) { + if (IsMouseButtonDown(MOUSE_BUTTON_LEFT)) { + iskailepressed=true; + }else { + iskailepressed=false; + } + } + + } + void draw() final { bool changed=false; bool updateview=false; if (stamina>=1.){ @@ -58,6 +79,14 @@ struct game:public enginend::scene { if (ifbackward()){player.pos=moveentity(player.pos,player.dir,true);changed=true;} if (ifleft()){player.dir=rotateentity(player.pos,player.dir,false);changed=true;} if (ifright()){player.dir=rotateentity(player.pos,player.dir,true);changed=true;} + if (ifflashlight()){lightmode=!lightmode;changed=true;} + if (ifinteract()) { + changed=true; + if (player.dir==0&&player.pos==0)changeto=0; + else if (moveentity(player.pos,player.dir,false)==skaile.pos) { + iskailemenu=!iskailemenu; + } + } if (changed) { UnloadTexture(current); std::string newpath=AT((mappath+"/"+lightlevel[lightmode]+"/"+sides[player.dir]+"/"+std::to_string(player.pos)+".jpg")); @@ -74,25 +103,28 @@ struct game:public enginend::scene { } }else stamina+=.01; + float screenw=320;float screenh=240; + + if(!iskailemenu) { + DrawTexturePro(current,{0,0,480,280},{0,0,screenw,screenh},{0,0},0,rl::WHITE); + if (canseeuycatroz)DrawRectangle( + screenw/10.,screenh/10.,screenw/12,screenh/1.5,rl::BLUE); + if (canseeskaile)DrawRectangle( + screenw/2.,screenh/10.,screenw/12,screenh/1.5,rl::RED); + }else { + if (iskailemenu) { + DrawTexture(skailemenu[2],0,0,rl::WHITE); + tiny::success("%i",iskailepressed); + DrawTexture(skailemenu[iskailepressed],261,120,rl::WHITE); + + } + } + DrawText(("pos: "+std::to_string(player.pos)+" dir:"+std::to_string(player.dir)).c_str(),0,0,16,rl::WHITE); + DrawText(("uypos: "+std::to_string(uycatroz.pos)+" uydir:"+std::to_string(uycatroz.dir)).c_str(),0,32,16,rl::SKYBLUE); + DrawText(("skpos: "+std::to_string(skaile.pos)+" skdir:"+std::to_string(skaile.dir)).c_str(),0,48,16,rl::RED); + DrawText(("crystally: "+std::to_string(crystallyprogress)).c_str(),0,64,16,rl::LIME); - } - void draw() final { - float screenw=(float)GetScreenWidth();float screenh=(float)GetScreenHeight(); - BeginDrawing(); - ClearBackground(rl::WHITE); - DrawTexturePro(current,{0,0,480,280},{0,0,screenw,screenh},{0,0},0,rl::WHITE); - if (canseeuycatroz)DrawRectangle( - screenw/10.,screenh/10.,screenw/12,screenh/1.5,rl::BLUE); - if (canseeskaile)DrawRectangle( - screenw/2.,screenh/10.,screenw/12,screenh/1.5,rl::RED); - DrawText(("pos: "+std::to_string(player.pos)+" dir:"+std::to_string(player.dir)).c_str(),0,0,64,rl::WHITE); - DrawText(("uypos: "+std::to_string(uycatroz.pos)+" uydir:"+std::to_string(uycatroz.dir)).c_str(),0,64,64,rl::SKYBLUE); - DrawText(("skpos: "+std::to_string(skaile.pos)+" skdir:"+std::to_string(skaile.dir)).c_str(),0,128,64,rl::RED); - DrawText(("crystally: "+std::to_string(crystallyprogress)).c_str(),0,196,64,rl::LIME); - - - EndDrawing(); } }; \ No newline at end of file diff --git a/games/animatronical/q1/a1/src/scenes/mainmenu.h b/games/animatronical/q1/a1/src/scenes/mainmenu.h index a156891..f577160 100644 --- a/games/animatronical/q1/a1/src/scenes/mainmenu.h +++ b/games/animatronical/q1/a1/src/scenes/mainmenu.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include "shared.h" @@ -13,6 +14,8 @@ public: mainmenu() { } + enginend::nodes::twod::labeledbutton* play; + enginend::nodes::twod::labeledbutton* version; void boot() override { std::string modifier=".png"; bg=LoadTexture(AT("res/menu/"+ @@ -38,25 +41,59 @@ public: "if(idx<0.7||idx>0.9){idx*=randf;}" "gl_FragColor=vec4(texel.rgb,texel.a*idx);}" ); + enginend::DEFAULT->tint={255,255,255,0}; + play=new enginend::nodes::twod::labeledbutton("PLAY", + nullptr,enginend::DEFAULT,0.65,0.75,0.5,0.05,std::function([]() { + changeto=1; + }),1 + ); + version=new enginend::nodes::twod::labeledbutton("0.1c", + nullptr,enginend::DEFAULT,0.65,0.75,0.5,0.05,std::function([]() { + changeto=2; + }),1 + ); } void tick() override { - + play->tick(); + version->tick(); } void draw() override { - float screenw=(float)GetScreenWidth();float screenh=(float)GetScreenHeight(); + float screenw=320;float screenh=240; UpdateMusicStream(bgm); - BeginDrawing(); - ClearBackground(rl::BLACK); DrawTexturePro(bg,{0,0,320,240},{0,0,screenw,screenh},{0,0},0,rl::WHITE); float t=GetTime()/200000; SetShaderValue(bzzzz,GetShaderLocation(bzzzz,"t"),&t,SHADER_UNIFORM_FLOAT); BeginShaderMode(bzzzz); DrawTexturePro(title,{0,0,1065,194},{0,0,screenw,(screenh/4)},{0,0},0,rl::WHITE); EndShaderMode(); - EndDrawing(); + play->fs=std::sqrt(screenh+screenw); + play->pos={0.65f*screenw,0.75f*screenh}; + play->size={0.3f*screenw,0.2f*screenh}; + unsigned char hovering=play->hover?play->pressed?128:64:0; + enginend::DEFAULT->tint={255,255,255,hovering}; + enginend::DEFAULT->buttontext[0]=enginend::DEFAULT->buttontext[1]=enginend::DEFAULT->buttontext[2]= + {255,0,255,255}; + play->draw(); + hovering=version->hover?version->pressed?128:64:0; + enginend::DEFAULT->tint={255,255,255,hovering}; + + version->fs=std::sqrt(screenh+screenw); + version->pos={0.05f*screenw,0.75f*screenh}; + version->size={0.3f*screenw,0.2f*screenh}; + + enginend::DEFAULT->buttontext[0]=enginend::DEFAULT->buttontext[1]=enginend::DEFAULT->buttontext[2]= + {0,255,255,255}; + + version->draw(); } void exit() override { - + play->exit(); + version->exit(); + StopMusicStream(bgm); + UnloadTexture(bg); + UnloadTexture(title); + UnloadMusicStream(bgm); + UnloadShader(bzzzz); } }; \ No newline at end of file diff --git a/games/animatronical/q1/a1/src/scenes/scenes.cpp b/games/animatronical/q1/a1/src/scenes/scenes.cpp index a3afee7..a51ccbe 100644 --- a/games/animatronical/q1/a1/src/scenes/scenes.cpp +++ b/games/animatronical/q1/a1/src/scenes/scenes.cpp @@ -6,7 +6,7 @@ // N S L R std::vectoropposites{1,0,3,2}; std::vector sides{ - 'n','s','l','r' + 'n','s','r','l' }; std::vector lightlevel{ "off","on","urcooked" @@ -106,12 +106,13 @@ bool ifright(){ bool ifinteract() { if (IsKeyPressed(KEY_RIGHT_CONTROL))return true; if (IsKeyPressed(KEY_KP_7))return true; + if (IsKeyPressed(KEY_E))return true; if (IsKeyPressed(KEY_SPACE))return true; return false; } bool ifflashlight() { - if (IsKeyPressed(KEY_E))return true; + if (IsKeyPressed(KEY_F))return true; if (IsKeyPressed(KEY_KP_9))return true; if (IsKeyPressed(KEY_RIGHT_SHIFT))return true; return false; diff --git a/games/animatronical/q1/a1/src/scenes/shared.h b/games/animatronical/q1/a1/src/scenes/shared.h index 0240abc..81f32c0 100644 --- a/games/animatronical/q1/a1/src/scenes/shared.h +++ b/games/animatronical/q1/a1/src/scenes/shared.h @@ -1,2 +1,4 @@ #pragma once -extern char changeto; \ No newline at end of file +#include +extern char changeto; +extern Font gamefont; \ No newline at end of file diff --git a/games/forespend/res/fonts/dos.fnt b/games/forespend/res/fonts/dos.fnt new file mode 100644 index 0000000..6aa2628 --- /dev/null +++ b/games/forespend/res/fonts/dos.fnt @@ -0,0 +1,102 @@ +info face="6x6 Font Monospaced Regular" size=32 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=-2,-2 +common lineHeight=38 base=32 scaleW=512 scaleH=512 pages=1 packed=0 +page id=0 file="dos.png" +chars count=97 +char id=0 x=474 y=200 width=32 height=40 xoffset=-1 yoffset=-1 xadvance=30 page=0 chnl=0 +char id=10 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=0 xadvance=37 page=0 chnl=0 +char id=33 x=390 y=160 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=34 x=351 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=35 x=433 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=36 x=237 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=37 x=315 y=240 width=40 height=40 xoffset=-1 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=38 x=472 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=39 x=0 y=200 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=40 x=200 y=200 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=41 x=239 y=200 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=42 x=84 y=280 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=43 x=355 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=44 x=80 y=200 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=45 x=276 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=46 x=40 y=200 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=47 x=79 y=240 width=40 height=40 xoffset=-1 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=48 x=39 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=49 x=0 y=160 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=50 x=39 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=51 x=78 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=52 x=117 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=53 x=156 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=54 x=195 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=55 x=234 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=56 x=273 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=57 x=312 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=58 x=160 y=200 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=59 x=120 y=200 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=60 x=434 y=200 width=40 height=40 xoffset=-1 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=61 x=394 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=62 x=0 y=240 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=63 x=469 y=160 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=64 x=119 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=65 x=0 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=66 x=39 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=67 x=78 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=68 x=117 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=69 x=156 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=70 x=195 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=71 x=234 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=72 x=273 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=73 x=312 y=0 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=74 x=351 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=75 x=390 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=76 x=429 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=77 x=468 y=0 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=78 x=0 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=79 x=39 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=80 x=78 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=81 x=117 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=82 x=156 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=83 x=195 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=84 x=234 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=85 x=273 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=86 x=312 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=87 x=351 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=88 x=390 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=89 x=429 y=40 width=40 height=40 xoffset=-1 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=90 x=469 y=40 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=91 x=278 y=200 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=92 x=158 y=240 width=40 height=40 xoffset=-1 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=93 x=317 y=200 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=94 x=198 y=240 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=95 x=0 y=280 width=45 height=40 xoffset=-6 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=96 x=430 y=160 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=97 x=0 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=98 x=39 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=99 x=78 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=100 x=117 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=101 x=156 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=102 x=195 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=103 x=234 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=104 x=273 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=105 x=312 y=80 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=106 x=351 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=107 x=390 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=108 x=429 y=80 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=109 x=468 y=80 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=110 x=0 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=111 x=39 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=112 x=78 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=113 x=117 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=114 x=156 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=115 x=195 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=116 x=234 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=117 x=273 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=118 x=312 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=119 x=351 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=120 x=390 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=121 x=429 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=122 x=468 y=120 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=123 x=356 y=200 width=39 height=40 xoffset=4 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=124 x=39 y=240 width=40 height=40 xoffset=10 yoffset=-1 xadvance=38 page=0 chnl=0 +char id=125 x=395 y=200 width=39 height=40 xoffset=10 yoffset=-1 xadvance=37 page=0 chnl=0 +char id=126 x=45 y=280 width=39 height=40 xoffset=-1 yoffset=-1 xadvance=37 page=0 chnl=0 +kernings count=0 diff --git a/games/forespend/res/fonts/dos.png b/games/forespend/res/fonts/dos.png index acc7db8..1f211eb 100644 Binary files a/games/forespend/res/fonts/dos.png and b/games/forespend/res/fonts/dos.png differ diff --git a/games/forespend/res/npcs/canidmonster.tdf b/games/forespend/res/npcs/canidmonster.tdf index d0173af..415115d 100644 --- a/games/forespend/res/npcs/canidmonster.tdf +++ b/games/forespend/res/npcs/canidmonster.tdf @@ -77,4 +77,4 @@ h ezra_0.0 ffffff } # end of range ffffff -} +} \ No newline at end of file diff --git a/games/forespend/res/shaders/screen.fs b/games/forespend/res/shaders/screen.fs index 2695147..f40697b 100644 --- a/games/forespend/res/shaders/screen.fs +++ b/games/forespend/res/shaders/screen.fs @@ -7,7 +7,7 @@ uniform vec4 colDiffuse; const float BITS=8.0; uniform bool DITHER=false; uniform bool DEPTH=true; -uniform bool BLOOM=true; +uniform bool BLOOM=false; uniform bool BLUR=false; uniform float redbits=4.; uniform float greenbits=4.; diff --git a/games/forespend/src/client/client.cpp b/games/forespend/src/client/client.cpp index 9619739..2ceb922 100644 --- a/games/forespend/src/client/client.cpp +++ b/games/forespend/src/client/client.cpp @@ -8,22 +8,36 @@ client::client() { void client::boot() { this->framerate=60; this->tickrate=20; -// SetConfigFlags(); + SetConfigFlags(FLAG_VSYNC_HINT|FLAG_WINDOW_RESIZABLE); InitWindow(380,240,"forespend - 0.03h"); initthemes(); this->currentscene=new mainmenu(); this->currentscene->boot(); target=LoadRenderTexture(380,240); + display=LoadShader( + AT("res/shaders/screen.vs"), + AT("res/shaders/screen.fs") + ); } void client::draw() { - BeginDrawing(); + BeginTextureMode(target); ClearBackground(rl::WHITE); this->currentscene->draw(); + EndTextureMode(); + BeginDrawing(); + BeginShaderMode(display); + DrawTexturePro( + target.texture,{0,0,380,-240},{0,0,(float)GetScreenWidth(),(float)GetScreenHeight()},{0,0},0,rl::WHITE + ); + EndShaderMode(); EndDrawing(); + } void client::exit() { this->currentscene->exit(); delete this->currentscene; + UnloadRenderTexture(target); + UnloadShader(display); } void client::tick() { this->currentscene->tick(); diff --git a/games/forespend/src/client/client.h b/games/forespend/src/client/client.h index dd28d8f..f0c59d6 100644 --- a/games/forespend/src/client/client.h +++ b/games/forespend/src/client/client.h @@ -6,6 +6,7 @@ class client :public enginend::program{ public: RenderTexture2D target; + Shader display; const char* CONF() final{return "client.tdf";} client(); void boot() override; diff --git a/games/forespend/src/client/scenes/mainmenu.h b/games/forespend/src/client/scenes/mainmenu.h index e61343a..1ecf4e2 100644 --- a/games/forespend/src/client/scenes/mainmenu.h +++ b/games/forespend/src/client/scenes/mainmenu.h @@ -6,6 +6,7 @@ using namespace enginend::nodes::twod::relative; class mainmenu :public virtual enginend::scene{ private: Texture2D bg= LoadTexture(AT("res/images/tilesheet.png")); + public: void boot() override { this->nodes=std::vector{ diff --git a/games/forespend/src/client/scenes/world/entity.cpp b/games/forespend/src/client/scenes/world/entity.cpp new file mode 100644 index 0000000..c21ca3f --- /dev/null +++ b/games/forespend/src/client/scenes/world/entity.cpp @@ -0,0 +1 @@ +#include "../../../common/world/entity.h" diff --git a/games/forespend/src/client/scenes/world/world.cpp b/games/forespend/src/client/scenes/world/world.cpp new file mode 100644 index 0000000..6fed017 --- /dev/null +++ b/games/forespend/src/client/scenes/world/world.cpp @@ -0,0 +1,26 @@ +#include "../../../common/world/world.h" +void world::boot() { + players->boot(); + entities->boot(); + buildings->boot(); + terrain=new enginend::nodes::trid::object3d(AT("res/models/world.obj")); + worldrender=LoadShader( + AT("res/shaders/tile.vs"), + AT("res/shaders/tile.fs") + ); + +} +void world::draw() { + BeginShaderMode(worldrender); + terrain->draw(); + EndShaderMode(); + players->draw(); + entities->draw(); + buildings->draw(); +} +void world::exit() { + players->exit(); + entities->exit(); + buildings->exit(); +} + diff --git a/games/forespend/src/common/world/entity.cpp b/games/forespend/src/common/world/entity.cpp deleted file mode 100644 index 297c98f..0000000 --- a/games/forespend/src/common/world/entity.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "entity.h" \ No newline at end of file diff --git a/games/forespend/src/common/world/world.h b/games/forespend/src/common/world/world.h index 054ef43..1280cdc 100644 --- a/games/forespend/src/common/world/world.h +++ b/games/forespend/src/common/world/world.h @@ -2,25 +2,23 @@ #include class world :public enginend::scene{ +public: enginend::group *players; enginend::group *entities; enginend::group *buildings; + bool singleplayer; // server side - world() { - players=new enginend::group({}); - entities=new enginend::group({}); - nodes.push_back(players); - - }; + world(); void tick() override; ~world(); - - Model terrain; - std::vector buildingmodels; - std::vector entitymodels; - std::vector models; + // client side void boot() override; void draw() override; void exit() override; + enginend::nodes::trid::object3d* terrain; + Shader worldrender; + unsigned char* tiles; + + }; \ No newline at end of file diff --git a/games/forespend/src/main.cpp b/games/forespend/src/main.cpp index 6702733..a02eaf7 100644 --- a/games/forespend/src/main.cpp +++ b/games/forespend/src/main.cpp @@ -10,6 +10,11 @@ std::string androidpackage="kn.kinfuyuki.forespend"; inline const char* COMMONCONFIG(){return "common.tdf";} tiny::ErrorLevel tiny::level{4}; int main(int argc, char** argv) { + { + system("echo $PWD"); + system("ls $PWD/res"); + system("ls $PWD/res/fonts"); + } enginend::program* game; tiny::startup("forespend","0.03g-rewrite.5"); diff --git a/games/forespend/src/server/server.cpp b/games/forespend/src/server/server.cpp index 5960fb2..214ffb6 100644 --- a/games/forespend/src/server/server.cpp +++ b/games/forespend/src/server/server.cpp @@ -1,8 +1,21 @@ #include "server.h" -server::server() {} +server::server() { + w=new world; +} -void server::boot() {} -void server::draw() {} -void server::exit() {} -void server::tick() {} \ No newline at end of file +void server::boot() { + +} +void server::exit() { + +} +void server::draw() { + +} +void server::tick() { + w->tick(); +} +server::~server() { + delete w; +} diff --git a/games/forespend/src/server/server.h b/games/forespend/src/server/server.h index 40060f7..2d1a96c 100644 --- a/games/forespend/src/server/server.h +++ b/games/forespend/src/server/server.h @@ -2,13 +2,16 @@ #include +#include "../common/world/world.h" + class server : public enginend::program{ public: + world* w; server(); const char* CONF() final{return "client.tdf";} - void boot() override; void tick() override; void draw() override; void exit() override; -}; \ No newline at end of file + ~server(); +}; diff --git a/games/forespend/src/server/world/world.cpp b/games/forespend/src/server/world/world.cpp new file mode 100644 index 0000000..c2f2ab8 --- /dev/null +++ b/games/forespend/src/server/world/world.cpp @@ -0,0 +1,19 @@ +#include "../../common/world/world.h" + +world::world() { + players=new enginend::group({}); + entities=new enginend::group({}); + buildings=new enginend::group({}); + nodes.push_back(players); +} +void world::tick() { + players->tick(); + entities->tick(); + buildings->tick(); +} + +world::~world() { + for (enginend::nodes::node* n: players->children){delete n;} + for (enginend::nodes::node* n: entities->children){delete n;} + for (enginend::nodes::node* n: buildings->children){delete n;} +}