initial commit

174 files changed, 10952 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..94b8e6e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+**~
+**.o
+old releases
+save/**
+Game
+.depend
diff --git a/GUI.cpp b/GUI.cpp
new file mode 100644
index 0000000..7dabac9
--- /dev/null
+++ b/GUI.cpp
@@ -0,0 +1,1316 @@
+#include "GUI.h"
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+        Uint32 rmask = 0xff000000;
+        Uint32 gmask = 0x00ff0000;
+        Uint32 bmask = 0x0000ff00;
+        Uint32 amask = 0x000000ff;
+#else
+        Uint32 rmask = 0x000000ff;
+        Uint32 gmask = 0x0000ff00;
+        Uint32 bmask = 0x00ff0000;
+        Uint32 amask = 0xff000000;
+#endif
+
+
+Label::Label()
+{
+        pos.x = 0;
+        pos.y = 0;
+        pos.w = 0;
+        pos.h = 14;
+        caption = "";
+        textColor.r = 255;
+        textColor.g = 255;
+        textColor.b = 255;
+        render();
+}
+
+Label::Label(string ncaption, SDL_Rect& npos)
+{
+        pos = npos;
+        textColor.r = 255;
+        textColor.g = 255;
+        textColor.b = 255;
+        caption = ncaption;
+        npos.w = render();
+}
+
+int Label::setTextSize(int ntextSize)
+{
+        pos.h = ntextSize;
+        SDL_FreeSurface(image);
+        return render();
+}
+
+void Label::setTextColor(SDL_Color ntextColor)
+{
+        textColor = ntextColor;
+        SDL_FreeSurface(image);
+        render();
+}
+
+int Label::setCaption(string ncaption)
+{
+        if(caption == ncaption)
+                return pos.w;
+        caption = ncaption;
+        SDL_FreeSurface(image);
+        return render();
+}
+
+int Label::render()
+{
+        TTF_Font *font = TTF_OpenFont("data/fonts/OpenSans-Semibold.ttf",pos.h);
+        image = NULL;
+        image = TTF_RenderText_Solid(font, caption.c_str(),textColor);
+        if(caption.size() == 0)
+                cout << "empty caption!!!" << endl;
+        if(image == NULL)
+        {
+                cout << "Error rendering Label with caption " << caption << endl;
+                return 0;
+        }
+        TTF_CloseFont(font);
+        pos.w = image->w;
+        return image->w;
+}
+
+
+void Label::draw(SDL_Surface* screen)
+{
+        SDL_Rect temp = pos;
+        SDL_BlitSurface(image, NULL, screen, &temp);
+}
+
+Label::~Label()
+{
+        SDL_FreeSurface(image);
+}
+
+vector<Label*> textField(string s, SDL_Rect& r, int textSize)
+{
+        vector<Label*> result;
+        vector<vector<string> > splitted = splitString(s);
+        bool done = false;
+        int currentLine = 0;
+        int currentWord = 0;
+        int currentPos = 0;
+        while(!done)
+        {
+                bool done2 = false;
+                int splitAt = splitted[currentLine].size();
+                while(!done2)
+                {
+                        string temp;
+                        for(int i = currentWord; i < splitAt; ++i)
+                        {
+                                temp += splitted[currentLine][i];
+                                if(i != (int) splitAt-1)
+                                        temp += " ";
+                        }
+                        SDL_Rect npos = r;
+                        npos.y += currentPos;
+                        npos.h = textSize;
+                        if(temp != "")
+                        {
+                                Label* l = new Label(temp, npos);
+                                if(npos.w < r.w)
+                                {
+                                        done2 = true;
+                                        result.push_back(l);
+                                        currentWord = splitAt;
+                                        currentPos += textSize*1.1;
+                                
+                                }
+                                else
+                                {
+                                        delete l;
+                                        splitAt--;
+                                        if(splitAt == currentWord)
+                                        {
+                                                cout << "failed rendering Textbox. Word too long?" << endl;
+                                                return result;
+                                        }
+                                }
+                        }
+                        else
+                        {
+                                done2 = true;
+                                currentWord = splitAt;
+                                currentPos += textSize*1.1;
+                        }
+                }
+                while(currentWord == (int)splitted[currentLine].size())
+                {
+                        currentWord = 0;
+                        currentLine++;
+                        if((int) splitted.size() == currentLine)
+                        {
+                                done = true;
+                                break;
+                        }
+                }
+        }
+        r.h = currentPos + textSize;
+        return result;
+}
+
+SlidingBackground::SlidingBackground(SDL_Surface *nbackground, double nxSpeed, double nySpeed)
+{
+        randm = true;
+        background = nbackground;
+        xSpeed = nxSpeed;
+        ySpeed = nySpeed;
+        if(background->w > 0)
+        {
+                x1 = rand()%background->w;
+                x2 = rand()%background->w;
+        }
+        if(background->h > 0)
+                y = rand()%background->h;
+}
+
+SlidingBackground::~SlidingBackground()
+{
+        SDL_FreeSurface(background);
+}
+
+        
+void SlidingBackground::draw(SDL_Surface *screen)
+{
+        SDL_Rect pos;
+        pos.x = x1;
+        pos.y = y;
+        SDL_BlitSurface(background,NULL,screen,&pos);
+        pos.x = x1-background->w;
+        pos.y = y;
+        SDL_BlitSurface(background,NULL,screen,&pos);
+        pos.x = x2;
+        pos.y = y - background->h;
+        SDL_BlitSurface(background,NULL,screen,&pos);
+        pos.x = x2 - background->w;
+        pos.y = y - background->h;
+        SDL_BlitSurface(background,NULL,screen,&pos);
+}
+void SlidingBackground::frame(double time)
+{
+        y += ySpeed*time;
+        if(y >= background->h)
+        {
+                y -= background->h;
+                x1 = x2;
+                x2 = 0;
+                if(randm)
+                        x2 = rand()%background->w;
+        }
+        if(y < 0)
+        {
+                y += background->h;
+                x2 = x1;
+                x1 = 0;
+                if(randm)
+                        x1 = rand()%background->w;      
+        }
+        x1 += xSpeed*time;
+        if(x1 < 0)
+                x1 += background->w;
+        if(x1 >= background->w)
+                x1 -= background->w;
+        x2 += xSpeed*time;
+        if(x2 < 0)
+                x2 += background->w;
+        if(x2 >= background->w)
+                x2 -= background->h;
+}
+
+void SlidingBackground::setRandom(bool r)
+{
+        randm = r;
+        if(r)
+        {
+                x1 = rand()%background->w;
+                x2 = rand()%background->w;
+        }
+        else
+        {
+                x1 = 0;
+                x2 = 0;
+        }
+}
+
+        
+TextBox::TextBox(vector<Label*> nlabels)
+{
+        labels = nlabels;
+}
+
+TextBox::~TextBox()
+{
+        for(int i = 0; i < (int) labels.size(); ++i)
+                delete labels[i];
+}
+        
+void TextBox::draw(SDL_Surface *screen)
+{
+        for(int i = 0; i < (int) labels.size(); ++i)
+                labels[i]->draw(screen);
+}
+int TextBox::handleEvents(SDL_Event event){return 0;}
+void TextBox::frame(double time){}
+void TextBox::refresh(){}
+
+Button::Button(SDL_Rect npos, SDL_Surface *nnormal, SDL_Surface *nmouseOver, SDL_Surface *npressed, SDL_Surface *ninactive)
+{
+        clicked = false;
+        over = false;
+        deactivated = false;
+        selected = false;
+        isDblClckButton = false;
+        timer = 0;
+        pos = npos;
+        normal = nnormal;
+        mouseOver = nmouseOver;
+        pressed = npressed;
+        inactive = ninactive;
+        cout << "This constructor is never called!" << endl;
+}
+
+Button::Button(SDL_Rect npos, string message, int& shouldbeTextSize)
+{
+        int textSize;
+        if(shouldbeTextSize == 0)
+                textSize = (npos.h*2)/3;
+        else
+                textSize = shouldbeTextSize;
+        
+        clicked = false;
+        over = false;
+        deactivated = false;
+        selected = false;
+        isDblClckButton = false;
+        timer = 0;
+        pos = npos;
+        SDL_Color textColor;
+        textColor.r = 255;
+        textColor.g = 255;
+        textColor.b = 255;
+        
+        bool done = false;
+        while(!done && textSize)
+        {
+                TTF_Font *font = TTF_OpenFont("data/fonts/OpenSans-Semibold.ttf",textSize);
+                normal = NULL;
+                normal = TTF_RenderText_Solid(font, message.c_str(),textColor);
+                if(normal == NULL)
+                {
+                        cout << "Error rendering button with message " << message << endl;
+                        return;
+                }
+                done = normal->w <= pos.w;
+                if(!done)
+                {
+                        SDL_FreeSurface(normal);
+                        textSize--;
+                }
+                TTF_CloseFont(font);
+        }
+        if(textSize == 0)
+        {
+                cout << "textSize error. failbutton is fail!" << endl;
+                return ;
+        }
+        done = false;
+        while(!done && textSize)
+        {
+                TTF_Font *font = TTF_OpenFont("data/fonts/OpenSans-Bold.ttf",textSize);
+                mouseOver = NULL;
+                mouseOver = TTF_RenderText_Solid(font, message.c_str(),textColor);
+                if(mouseOver == NULL)
+                {
+                        cout << "Error rendering button with message " << message << endl;
+                        return;
+                }
+                TTF_CloseFont(font);
+                done = mouseOver->w <= pos.w;
+                if(!done)
+                {
+                        SDL_FreeSurface(mouseOver);
+                        textSize--;
+                }
+        }
+        if(textSize == 0)
+        {
+                cout << "textSize error. failbutton is fail!" << endl;
+                return ;
+        }
+        
+        textColor.b = 17;
+        textColor.g = 200;
+        textColor.r = 250;
+        TTF_Font *font = TTF_OpenFont("data/fonts/OpenSans-Semibold.ttf",textSize);
+        pressed = NULL;
+        pressed = TTF_RenderText_Solid(font, message.c_str(),textColor);
+        if(pressed == NULL)
+        {
+                cout << "Error rendering button with message " << message << endl;
+                return;
+        }
+        
+        textColor.b = 155;
+        textColor.g = 155;
+        textColor.r = 155;
+        inactive = NULL;
+        inactive = TTF_RenderText_Solid(font, message.c_str(),textColor);
+        if(inactive == NULL)
+        {
+                cout << "Error rendering button with message " << message << endl;
+                return;
+        }
+        TTF_CloseFont(font);
+        shouldbeTextSize = textSize;
+}
+
+void Button::draw(SDL_Surface *screen)
+{
+        SDL_Rect drawPos;
+        if(deactivated)
+        {
+                drawPos.x = pos.x + (pos.w - inactive->w)/2;
+                drawPos.y = pos.y + (pos.h - inactive->h)/2;
+                SDL_BlitSurface(inactive,NULL,screen,&drawPos);
+                return;
+        }
+        if(clicked && !isDblClckButton)
+        {
+                drawPos.x = pos.x + (pos.w-pressed->w)/2;
+                drawPos.y = pos.y + (pos.h-pressed->h)/2;
+                SDL_BlitSurface(pressed,NULL,screen,&drawPos);
+                return;
+        }
+        if((over && !isDblClckButton) || selected)
+        {
+                drawPos.x = pos.x + (pos.w-mouseOver->w)/2;
+                drawPos.y = pos.y + (pos.h-mouseOver->h)/2;
+                SDL_BlitSurface(mouseOver,NULL,screen,&drawPos);
+                return;
+        }
+        drawPos.x = pos.x + (pos.w-normal->w)/2;
+        drawPos.y = pos.y + (pos.h-normal->h)/2;
+        SDL_BlitSurface(normal,NULL,screen,&drawPos);
+}
+
+int Button::handleEvents(const SDL_Event& event)
+{
+        int x,y;
+        SDL_Surface *current;
+        if(deactivated)
+                current = inactive;
+        else if(clicked)
+                current = pressed;
+        else if(over)
+                current = mouseOver;
+        else
+                current = normal;
+        int xmin = pos.x + (pos.w-current->w)/2;
+        int xmax = pos.x + (current->w + pos.w)/2;
+        int ymin = pos.y + (pos.h-current->h)/2;
+        int ymax = pos.y + (current->h + pos.h)/2;
+        if(event.type == SDL_MOUSEMOTION)
+        {
+                x = event.motion.x;
+                y = event.motion.y;
+                if(x < xmin || y < ymin || x >= xmax || y >= ymax)
+                        over = false;
+                else
+                        over = true;
+        }
+        if(event.type == SDL_MOUSEBUTTONDOWN)
+        {
+                if(event.button.button == SDL_BUTTON_LEFT)
+                {
+                        x = event.button.x;
+                        y = event.button.y;
+                        if(x < xmin || y < ymin || x >= xmax || y >= ymax)
+                                over = false;
+                        else
+                        {
+                                if(isDblClckButton)
+                                {
+                                        if(clicked && selected)
+                                        {
+                                                clicked = false;
+                                                selected = true;
+                                                return BUTTON_CLICKED;
+                                        }
+                                        else
+                                        {
+                                                timer = 0.2;
+                                                over = true;
+                                                clicked = true;
+                                                selected = true;
+                                                return BUTTON_SELECTED;
+                                        }
+                                }
+                                over = true;
+                                clicked = true;
+                        }
+                }
+        }
+        if(event.type == SDL_MOUSEBUTTONUP)
+        {
+                if(event.button.button == SDL_BUTTON_LEFT)
+                {
+                        x = event.button.x;
+                        y = event.button.y;
+                        if(x < xmin || y < ymin || x >= xmax || y >= ymax)
+                                over = false;
+                        else
+                        {
+                                over = true;
+                                if(clicked && !isDblClckButton)
+                                {
+                                        clicked = false;
+                                        if(deactivated)
+                                                return BUTTON_NORMAL;
+                                        if(!isDblClckButton)
+                                                return BUTTON_CLICKED;
+                                }
+                        }
+                        if(!isDblClckButton)
+                                clicked = false;
+                }
+        }
+        if(over)
+        {
+                if(pressed)
+                        return BUTTON_PRESSEDOVER;
+                return BUTTON_PRESSEDOUT;
+        }
+        return BUTTON_NORMAL;
+}
+
+void Button::frame(double time)
+{
+        timer -= time;
+        if(timer < 0 && isDblClckButton)
+                clicked = false;
+}
+
+void Button::refresh()
+{
+        clicked = false;
+        over = false;
+}
+
+Button::~Button()
+{
+        SDL_FreeSurface(pressed);
+        SDL_FreeSurface(mouseOver);
+        SDL_FreeSurface(normal);
+        //sometimes crashes the game on exit
+        SDL_FreeSurface(inactive);
+}
+
+//fancy Button
+Button::Button(SDL_Rect npos, SDL_Surface* content, bool fancy)
+{
+        if(content->h < 21)
+        {
+                SDL_Surface* temp = content;
+                content = rotozoomSurface(content,0,2,0);
+                SDL_FreeSurface(temp);
+        }
+        if(content->h > 42)
+        {
+                SDL_Surface* temp = content;
+                content = rotozoomSurface(content,0,0.5,0);
+                SDL_FreeSurface(temp);
+        }
+        deactivated = false;
+        over = false;
+        clicked = false;
+        selected = false;
+        isDblClckButton = false;
+        timer = 0;
+        pos = npos;
+        int size = 48;
+        
+        SDL_Surface* norm = NULL;
+        norm = IMG_Load("data/images/fancy_button.bmp");
+        if(norm == NULL)
+        {
+                cout << "Error loading bmp while creating fancy button!" << endl;
+        }
+        SDL_Surface* inac = NULL;
+        inac = IMG_Load("data/images/fancy_button_unavailable.bmp");
+        if(inac == NULL)
+        {
+                cout << "Error loading bmp while creating fancy button!" << endl;
+        }
+        SDL_Surface* pres = NULL;
+        pres = IMG_Load("data/images/fancy_button_clicked.bmp");
+        if(pres == NULL)
+        {
+                cout << "Error loading bmp while creating fancy button!" << endl;
+        }
+        SDL_Surface* mous = NULL;
+        mous = IMG_Load("data/images/fancy_button_selected.bmp");
+        if(mous == NULL)
+        {
+                cout << "Error loading bmp while creating fancy button!" << endl;
+        }
+        
+        pressed = IMG_Load("data/images/fancy_button_clicked.bmp");
+        inactive = IMG_Load("data/images/fancy_button_unavailable.bmp");
+        mouseOver = IMG_Load("data/images/fancy_button_selected.bmp");
+        normal = IMG_Load("data/images/fancy_button.bmp");
+        SDL_Rect dest;
+        dest.x = size/2 - content->w/2;
+        dest.y = size/2 - content->h/2;
+        SDL_Rect temp = dest;
+        SDL_BlitSurface(content,NULL,normal,&temp);
+        temp = dest;
+        if(fancy)
+        {
+                SDL_BlitSurface(content,NULL,pressed,&temp);
+                temp = dest;
+        }
+        SDL_BlitSurface(content,NULL,inactive,&temp);
+        temp = dest;
+        SDL_BlitSurface(content,NULL,mouseOver,&temp);
+        SDL_FreeSurface(content);
+        SDL_BlitSurface(norm,NULL,normal,NULL);
+        SDL_FreeSurface(norm);
+        SDL_BlitSurface(pres,NULL,pressed,NULL);
+        SDL_FreeSurface(pres);
+        SDL_BlitSurface(mous,NULL,mouseOver,NULL);
+        SDL_FreeSurface(mous);
+        SDL_BlitSurface(inac,NULL,inactive,NULL);
+        SDL_FreeSurface(inac);
+}
+
+//makes direction according to h/w of the Rect
+Scrollbar::Scrollbar(SDL_Rect npos)
+{
+        state = 0;
+        stateGoal = state;
+        sensitivity = 0.005;
+        clicked = false;
+        pos = npos;
+        if(pos.w > pos.h)
+                horizontal = true;
+        else
+                horizontal = false;
+        dot = NULL;
+        dot = IMG_Load("data/images/glowing_dot.png");
+        if(!dot)
+        {
+                cout << "Error loading dot for scrollbar!" << endl;
+                return;
+        }
+        bar = NULL;
+        bar = SDL_CreateRGBSurface(0,pos.w,pos.h,32,rmask,gmask,bmask,amask);
+        SDL_FillRect(bar,NULL,0xFF000102);
+        SDL_SetAlpha(bar,0,255);
+        SDL_SetColorKey(bar,SDL_SRCCOLORKEY, 0xFF000102);
+        if(!bar)
+        {
+                cout << "Error loading creating scrollbarsurface" << endl;
+                return;
+        }
+        SDL_Surface* barEnd1 = NULL;
+        SDL_Surface* barEnd2 = NULL;
+        if(horizontal)
+        {
+                barEnd1 = IMG_Load("data/images/scrollbar_end_h1.png");
+                barEnd2 = IMG_Load("data/images/scrollbar_end_h2.png");
+        }
+        else
+        {
+                barEnd1 = IMG_Load("data/images/scrollbar_end_v1.png");
+                barEnd2 = IMG_Load("data/images/scrollbar_end_v2.png");
+        }
+        if(!barEnd1 || !barEnd2)
+        {
+                cout << "Error loading end of scrollbar" << endl;
+                return;
+        }
+        if(horizontal)
+        {
+                SDL_BlitSurface(barEnd1,NULL,bar,NULL);
+                SDL_Rect r;
+                r.x = pos.w - barEnd1->w;
+                r.y = 0;
+                SDL_BlitSurface(barEnd2,NULL,bar,&r);
+        }
+        else
+        {
+                SDL_BlitSurface(barEnd1,NULL,bar,NULL);
+                SDL_Rect r;
+                r.x = 0;
+                r.y = pos.h - barEnd1->h;
+                SDL_BlitSurface(barEnd2,NULL,bar,&r);
+        }
+        SDL_Surface* barMiddle = NULL;
+        if(horizontal)
+                barMiddle = IMG_Load("data/images/scrollbar_h.png");
+        else
+                barMiddle = IMG_Load("data/images/scrollbar_v.png");
+        if(!barMiddle)
+        {
+                cout << "Error in middle of bar!" << endl;
+                return;
+        }
+        int current = barEnd1->h;
+        int maxcurrent = max(pos.w,pos.h) - barEnd1->h - barMiddle->w;
+        while(true)
+        {
+                if(horizontal)
+                {
+                        SDL_Rect r2;
+                        r2.x = current;
+                        r2.y = 0;
+                        if(current >= maxcurrent)
+                        {
+                                SDL_Rect r1;
+                                r1.x = 0;
+                                r1.y = 0;
+                                r1.h = barMiddle->h;
+                                r1.w = barMiddle->h - current + maxcurrent;
+                                SDL_BlitSurface(barMiddle,&r1,bar,&r2);
+                                break;
+                        }
+                        else
+                                SDL_BlitSurface(barMiddle, NULL, bar, &r2);
+                        current += barMiddle->w;
+                }
+                else
+                {
+                        SDL_Rect r2;
+                        r2.x = 0;
+                        r2.y = current;
+                        if(current >= maxcurrent)
+                        {
+                                SDL_Rect r1;
+                                r1.x = 0;
+                                r1.y = 0;
+                                r1.h = barMiddle->h - current + maxcurrent;
+                                r1.w = barMiddle->h;
+                                SDL_BlitSurface(barMiddle,&r1,bar,&r2);
+                                break;
+                        }
+                        else
+                                SDL_BlitSurface(barMiddle, NULL, bar, &r2);
+                        current += barMiddle->h;
+                }
+        }
+        
+        SDL_FreeSurface(barMiddle);
+        SDL_FreeSurface(barEnd1);
+        SDL_FreeSurface(barEnd2);
+}
+
+Scrollbar::~Scrollbar()
+{
+        SDL_FreeSurface(bar);
+        SDL_FreeSurface(dot);
+}
+
+void Scrollbar::draw(SDL_Surface *screen)
+{
+        SDL_Rect r = pos;
+        SDL_BlitSurface(bar,NULL,screen,&r);
+        if(horizontal)
+        {
+                r.x = pos.x + state * (pos.w-dot->w);
+                r.y = pos.y;
+        }
+        else
+        {
+                r.x = pos.x;
+                r.y = pos.y + state * (pos.h-dot->h);
+        }
+        SDL_BlitSurface(dot,NULL,screen,&r);
+}
+
+double Scrollbar::handleEvents(const SDL_Event& event)
+{
+        double x,y;
+        if(event.type == SDL_MOUSEMOTION && clicked)
+        {
+                x = event.motion.x;
+                y = event.motion.y;
+                if(x > 50000)
+                        x = -10;
+                if(y > 50000)
+                        y = -10;
+                if(horizontal)
+                {
+                        //state = (x - dot->w/2 - pos.x)/(pos.w-dot->w/2);
+                        stateGoal = (x - dot->w/2 - pos.x)/(pos.w-dot->w);
+                }
+                else
+                {
+                        //state = (y - dot->h/2 - pos.y)/(pos.h-dot->h/2);
+                        stateGoal = (y - dot->h/2 - pos.y)/(pos.h-dot->h);
+                }
+                if(stateGoal < 0)
+                        stateGoal = 0;
+                if(stateGoal > 1)
+                        stateGoal = 1;
+//              stateGoal = state;
+        }
+        if(event.type == SDL_MOUSEBUTTONDOWN)
+        {
+                if(event.button.button == SDL_BUTTON_LEFT)
+                {
+                        x = event.button.x;
+                        y = event.button.y;
+                        if(x >= pos.x && y >= pos.y && x < pos.x + pos.w && y < pos.y + pos.h)
+                        {
+                                clicked = true;
+                                if(horizontal)
+                                {
+                                        stateGoal = (x - dot->w/2 - pos.x)/(pos.w-dot->w);
+                                }
+                                else
+                                {
+                                        stateGoal = (y - dot->h/2 - pos.y)/(pos.h-dot->h);
+                                }
+                                if(stateGoal < 0)
+                                        stateGoal = 0;
+                                if(stateGoal > 1)
+                                        stateGoal = 1;
+//                              stateGoal = state;
+                        }
+                }
+                if(event.button.button == SDL_BUTTON_WHEELDOWN)
+                {
+                        stateGoal += max(sensitivity,sqrt(fabs(stateGoal-state))*sqrt(sensitivity)*3);
+                        if(stateGoal > 1)
+                                stateGoal = 1;
+                }
+                if(event.button.button == SDL_BUTTON_WHEELUP)
+                {
+                        stateGoal -= max(sensitivity,sqrt(fabs(stateGoal-state))*sqrt(sensitivity)*3);
+                        if(stateGoal < 0)
+                                stateGoal = 0;
+                }
+        }
+        if(event.type == SDL_MOUSEBUTTONUP)
+        {
+                if(event.button.button == SDL_BUTTON_LEFT)
+                        clicked = false;
+        }
+        return state;
+}
+
+double Scrollbar::frame(double time)
+{
+        state = stateGoal - (stateGoal - state) * pow(M_E,-15*time);
+        if(fabs(state - stateGoal) < 0.5 / max(pos.w,pos.h))
+                state = stateGoal;
+        return state;
+}
+
+void Scrollbar::refresh()
+{
+}
+
+Scrollable::Scrollable(SDL_Rect npos, AbstractInteractive* nsubInteractive, SDL_Rect subRect, bool nhorizontal, bool nscrollbarSide)
+{
+        wholeMenu = npos;
+        currentSubPos = 0;
+        pos = npos;
+        subInteractive = nsubInteractive;
+        horizontal = nhorizontal;
+        fakeScreen = SDL_CreateRGBSurface(0,subRect.w,subRect.h,32,rmask,gmask,bmask,0);
+        Uint32 colorkey = SDL_MapRGB(fakeScreen->format, 0, 1, 2);
+        SDL_FillRect(fakeScreen,NULL,colorkey);
+        SDL_SetColorKey(fakeScreen, SDL_SRCCOLORKEY, colorkey);
+        SDL_Rect barRect;
+        if(horizontal)
+        {
+                barRect.x = pos.x;
+                barRect.w = pos.w;
+                barRect.y = pos.y + nscrollbarSide*(pos.h-10);
+                barRect.h = 10;
+                pos.h -= 10;
+                pos.y += !nscrollbarSide * 10;
+        }
+        else
+        {
+                barRect.x = pos.x + nscrollbarSide*(pos.w - 10);
+                barRect.w = 10;
+                barRect.y = pos.y;
+                barRect.h = pos.h;
+                pos.w -= 10;
+                pos.x += !nscrollbarSide * 10;
+        }
+        bar = new Scrollbar(barRect);
+}
+
+Scrollable::~Scrollable()
+{
+        delete subInteractive;
+        SDL_FreeSurface(fakeScreen);
+}
+        
+void Scrollable::draw(SDL_Surface* screen)
+{
+        Uint32 colorkey = SDL_MapRGB(fakeScreen->format, 0, 1, 2);
+        SDL_FillRect(fakeScreen,NULL,colorkey);
+        subInteractive->draw(fakeScreen);
+        SDL_Rect src;
+        SDL_Rect dst;
+        if(horizontal)
+        {
+                src.x = currentSubPos;
+                src.y = 0;
+                src.w = pos.w;
+                src.h = fakeScreen->h;
+                dst.x = pos.x;
+                dst.y = pos.y + (pos.h - fakeScreen->h)/2;
+        }
+        else
+        {
+                src.x = 0;
+                src.y = currentSubPos;
+                src.w = fakeScreen->w;
+                src.h = pos.h;
+                dst.x = pos.x + (pos.w - fakeScreen->w)/2;
+                dst.y = pos.y;
+        }
+        SDL_BlitSurface(fakeScreen,&src,screen,&dst);
+        bool b = true;
+        if(horizontal && fakeScreen->w < pos.w)
+                b = false;
+        if(!horizontal && fakeScreen->h < pos.h)
+                b = false;
+        if(b)   
+                bar->draw(screen);
+}
+
+int Scrollable::handleEvents(SDL_Event nevent)
+{
+        bool b = true;
+        if(horizontal && fakeScreen->w < pos.w)
+                b = false;
+        if(!horizontal && fakeScreen->h < pos.h)
+                b = false;
+        int result = 0;
+        SDL_Rect r;
+        if(horizontal)
+        {
+                r.x = pos.x - currentSubPos;
+                r.y = pos.y + (pos.h - fakeScreen->h)/2;
+        }
+        else
+        {
+                r.y = pos.y - currentSubPos;
+                r.x = pos.x + (pos.w - fakeScreen->w)/2;
+        }
+        SDL_Event event = relativate(nevent,r);
+        if(event.type == SDL_MOUSEMOTION)
+        {
+                if(b)
+                        bar->handleEvents(nevent);
+                MousePos.x = nevent.motion.x;
+                MousePos.y = nevent.motion.y;
+                //if(inRect(pos, nevent.motion.x, nevent.motion.y))
+                        result = subInteractive->handleEvents(event);
+        }
+        if(event.type == SDL_MOUSEBUTTONDOWN)
+        {
+//              cout << "got an event at " << nevent.button.x << " " << nevent.button.y << endl;
+//              cout << "send an event at " << event.button.x << " " << event.button.y << endl;
+                if(b && inRect(wholeMenu, nevent.button.x, nevent.button.y))
+                        bar->handleEvents(nevent);
+                //if(inRect(pos, nevent.button.x, nevent.button.y))
+                        result = subInteractive->handleEvents(event);
+        }
+        if(event.type == SDL_MOUSEBUTTONUP)
+        {
+                if(b && event.button.button == SDL_BUTTON_LEFT)
+                        bar->handleEvents(nevent);
+                //if(inRect(pos, nevent.button.x, nevent.button.y))
+                        result = subInteractive->handleEvents(event);
+        }
+        return result;
+}
+
+void Scrollable::frame(double time)
+{
+        subInteractive->frame(time);
+        setSubPosition(bar->frame(time));
+}
+
+void Scrollable::setSubPosition(double d)
+{
+        int last = currentSubPos;
+        if(horizontal)
+                currentSubPos = d * (fakeScreen->w - pos.w);
+        else
+                currentSubPos = d * (fakeScreen->h - pos.h);
+        if(last != currentSubPos && inRect(pos,MousePos.x,MousePos.y))
+        {
+                SDL_Event event;
+                event.type = SDL_MOUSEMOTION;
+                event.motion.x = MousePos.x;
+                event.motion.y = MousePos.y;
+                event.motion.x -= pos.x;
+                event.motion.y -= pos.y;
+                if(horizontal)
+                {
+                        event.motion.x += currentSubPos;
+                        event.motion.y -= (pos.h - fakeScreen->h)/2;
+                }
+                else
+                {
+                        event.motion.y += currentSubPos;
+                        event.motion.x -= (pos.w - fakeScreen->w)/2;
+                }
+                subInteractive->handleEvents(event);
+        }
+}
+
+void Scrollable::refresh()
+{
+        subInteractive->refresh();
+}
+
+Menu::Menu(vector<Button*> nbuttons, vector<int> neffects, SDL_Surface *background, bool rBG)
+{
+        isSelectMenu = false;
+        onMouseDown = false;
+        buttons = nbuttons;
+        effects = neffects;
+        BG = new SlidingBackground(background, 0, 100);
+        BG->setRandom(rBG);
+}
+
+Menu::Menu(vector<string> choices, vector<int> neffects, SDL_Surface *background, bool rBG, SDL_Surface *screen)
+{
+        isSelectMenu = false;
+        onMouseDown = false;
+        effects = neffects;
+        BG = new SlidingBackground(background, 0, 100);
+        BG->setRandom(rBG);
+        int minTextSize;
+        bool done = true;
+        for(int i = 0; i < (int) choices.size(); ++i)
+        {
+                int curTextSize = 0;
+                SDL_Rect r;
+                r.y = screen->h*0.2 + i / ((double) choices.size()) * screen->h * 0.6;
+                r.x = screen->w/5.0;
+                r.w = screen->w*3.0/5.0;
+                r.h = screen->h*0.6/((double) choices.size());
+                Button *b = new Button(r, choices[i], curTextSize);
+                if(effects[i] == 0)
+                {
+                        b->deactivated = true;
+                }
+                buttons.push_back(b);
+                if(i == 0)
+                        minTextSize = curTextSize;
+                if(minTextSize != curTextSize)
+                {
+                        minTextSize = min(curTextSize, minTextSize);
+                        done = false;
+                }
+        }
+        if(done == true)
+                return;
+        for(int i = 0; i < (int) choices.size(); ++i)
+                delete buttons[i];
+        for(int i = 0; i < (int) choices.size(); ++i)
+        {
+                SDL_Rect r;
+                r.y = screen->h*0.2 + i / ((double) choices.size()) * screen->h * 0.6;
+                r.x = screen->w/5.0;
+                r.w = screen->w*3.0/5.0;
+                r.h = screen->h*0.6/((double) choices.size());
+                Button *b = new Button(r, choices[i], minTextSize);
+                if(effects[i] == 0)
+                        b->deactivated = true;
+                buttons[i] = b;
+        }
+}
+
+Menu::~Menu()
+{
+        delete BG;
+        for(int i = 0; i < (int) buttons.size(); ++i)
+                delete buttons[i];
+}
+
+void Menu::draw(SDL_Surface *screen)
+{
+        BG->draw(screen);
+        for(int i = 0; i < (int) buttons.size(); ++i)
+                buttons[i]->draw(screen);
+}
+
+int Menu::handleEvents(SDL_Event event)
+{
+        for(int i = 0; i < (int) buttons.size(); ++i)
+        {
+                int temp = buttons[i]->handleEvents(event);
+                if(((temp == BUTTON_PRESSEDOVER) || (false)) && onMouseDown)
+                        return effects[i];
+                if(temp == BUTTON_CLICKED && !isSelectMenu)
+                        return effects[i];
+                if(temp == BUTTON_CLICKED && isSelectMenu)
+                {
+                        //cout << "Click on " << i << endl;
+                        return effects[i] | MENU_CLICK;
+                }
+                if(temp == BUTTON_SELECTED && isSelectMenu)
+                {
+                        for(int j = 0; j < (int) buttons.size(); ++j)
+                                if(j != i)
+                                        buttons[j]->selected = false;
+                        return effects[i] | MENU_SELECT;
+                }
+        }
+        return 0;
+}
+
+void Menu::frame(double time)
+{
+        BG->frame(time);
+        for(int i = 0; i < (int) buttons.size(); ++i)
+                buttons[i]->frame(time);
+}
+
+void Menu::refresh()
+{
+        for(int i = 0; i < (int) buttons.size(); ++i)
+                buttons[i]->refresh();
+}
+
+//matrixMenu
+Menu::Menu(vector<SDL_Surface*> pics, int width, int& height, bool nisSelectMenu, bool nonMouseDown)
+{
+        isSelectMenu = nisSelectMenu;
+        onMouseDown = nonMouseDown;
+        SDL_Rect r;
+        r.x = 0;
+        r.y = 0;
+        r.w = 48;
+        r.h = 48;
+        for(int i = 0; i < (int) pics.size(); ++i)
+        {
+                if(isSelectMenu)
+                        effects.push_back(i);
+                else
+                        effects.push_back(i | MENU_SELECT);
+                Button *b = new Button(r, pics[i], !onMouseDown);
+                if(isSelectMenu)
+                        b->isDblClckButton = true;
+                buttons.push_back(b);
+                r.x += 48;
+                if(r.x +48 > width)
+                {
+                        r.x = 0;
+                        r.y += 48;
+                }
+        }
+        if(isSelectMenu)
+                buttons[0]->selected = true;
+        height = r.y;
+        SDL_Surface* back = SDL_CreateRGBSurface(0,width,height,32,0,0,0,0);
+        SDL_SetColorKey(back,SDL_SRCCOLORKEY,0x000102);
+        SDL_FillRect(back,NULL,0x000102);
+        BG = new SlidingBackground(back, 0, 0);
+        BG->setRandom(0);
+}
+
+CompositMenu::CompositMenu(vector<AbstractInteractive*> nsubmenues, SDL_Surface* nBG, SDL_Rect nsubPos, vector<Button*> ntabs)
+{
+        submenues = nsubmenues;
+        subPos = nsubPos;
+        tabs = ntabs;
+        BG = new SlidingBackground(nBG, 0, 100);
+        fakeScreen = SDL_CreateRGBSurface(0,subPos.w,subPos.h,32,0,0,0,0);
+        SDL_SetColorKey(fakeScreen,SDL_SRCCOLORKEY,0x000102);
+        state = 0;
+        tabs[0]->selected = true;
+}
+
+CompositMenu::~CompositMenu()
+{
+        for(int i = 0; i < (int) submenues.size(); ++i)
+                delete submenues[i];
+        for(int i = 0; i < (int) tabs.size(); ++i)
+                delete tabs[i];
+        delete BG;
+        SDL_FreeSurface(fakeScreen);
+}
+
+void CompositMenu::draw(SDL_Surface *screen)
+{
+        BG->draw(screen);
+        SDL_FillRect(fakeScreen,NULL,0x000102);
+        submenues[state]->draw(fakeScreen);
+        SDL_BlitSurface(fakeScreen,NULL,screen,&subPos);
+        for(int i = 0; i < (int) tabs.size(); ++i)
+                tabs[i]->draw(screen);
+}
+
+int CompositMenu::handleEvents(SDL_Event event)
+{
+        
+        for(int i = 0; i < (int) tabs.size(); ++i)
+        {
+                int temp = tabs[i]->handleEvents(event);
+                if(temp == BUTTON_SELECTED)
+                {
+                        state = i;
+                        for(int j = 0; j < (int) tabs.size(); ++j)
+                                if(i != j)
+                                        tabs[j]->selected = false;
+                        submenues[state]->refresh();
+                }
+        }
+        SDL_Event nevent = relativate(event, subPos);
+//      if(nevent.type == SDL_MOUSEBUTTONDOWN)
+//      {
+//              cout << "CMenu got an event at " << event.button.x << " " << event.button.y << endl;
+//              cout << "CMenu sent an event at " << nevent.button.x << " " << nevent.button.y << ". state is " << state << endl;               
+//      }
+        return submenues[state]->handleEvents(nevent);
+}
+
+void CompositMenu::frame(double time)
+{
+        BG->frame(time);
+        submenues[state]->frame(time);
+        for(int i = 0; i < (int) tabs.size(); ++i)
+                tabs[i]->frame(time);
+}
+
+void CompositMenu::refresh()
+{
+        for(int i = 0; i < (int) submenues.size(); ++i)
+                submenues[i]->refresh();
+        for(int i = 0; i < (int) tabs.size(); ++i)
+                tabs[i]->refresh();
+}
+
+int CompositMenu::getState()
+{
+        return state;
+}
+
+GetStringMenu::GetStringMenu(string headline, int niBack, int niOK, SDL_Surface* nBG, SDL_Surface* screen)
+{
+        screenw = screen->w;
+        maxLength = 22;
+        SDL_EnableUNICODE( SDL_ENABLE ); 
+        iBack = niBack;
+        iOK = niOK;
+        SDL_Rect tRect;
+        tRect.x = 0;
+        tRect.y = screen->h/3;
+        tRect.w = screen->w;
+        tRect.h = 30;
+        title = new Label(headline, tRect);
+        tRect.x = (screen->w - title->pos.w)/2;
+        title->pos = tRect;
+        BG = new SlidingBackground(nBG, 0, 100);
+        tRect.y += 40;
+        tRect.h = 30;
+        input = new Label("nicht leer", tRect);
+        tRect.x = (screen->w - input->pos.w)/2;
+        input->pos = tRect;
+        int textSize = 0;
+        SDL_Rect backPos = tRect;
+        backPos.y += 40;
+        backPos.x = screen->w/6;
+        backPos.w = (2*screen->w)/6;
+        backPos.h = 50;
+        back = new Button(backPos,"back",textSize);
+        backPos.x = screen->w/2;
+        oK = new Button(backPos,"OK",textSize);
+}
+
+GetStringMenu::~GetStringMenu()
+{
+        SDL_EnableUNICODE( SDL_DISABLE ); 
+        delete title;
+        delete input;
+        delete back;
+        delete oK;
+}
+
+void GetStringMenu::draw(SDL_Surface* screen)
+{
+        BG->draw(screen);
+        title->draw(screen);
+        if(s != "")
+                input->draw(screen);
+        back->draw(screen);
+        oK->draw(screen);
+}
+
+int GetStringMenu::handleEvents(SDL_Event event)
+{
+        if(back->handleEvents(event) == BUTTON_CLICKED)
+                return iBack;
+        if(oK->handleEvents(event) == BUTTON_CLICKED)
+                return iOK;
+        
+        //If a key was pressed 
+        if( event.type == SDL_KEYDOWN ) 
+        {
+                //If the string less than maximum size 
+                if((int) s.length() <= maxLength ) 
+                {
+                        if(event.key.keysym.unicode == (Uint16) ' ') 
+                        { 
+                                s += (char)event.key.keysym.unicode; 
+                        }
+                        else if((event.key.keysym.unicode >= (Uint16) '0' ) && ( event.key.keysym.unicode <= (Uint16) '9')) 
+                        {
+                                s += (char)event.key.keysym.unicode; 
+                        }
+                        else if((event.key.keysym.unicode >= (Uint16) 'A') && (event.key.keysym.unicode <= (Uint16) 'Z')) 
+                        { 
+                                s += (char)event.key.keysym.unicode;
+                        }
+                        else if((event.key.keysym.unicode >= (Uint16) 'a') && (event.key.keysym.unicode <= (Uint16) 'z')) 
+                        {
+                                s += (char)event.key.keysym.unicode;
+                        }
+                }
+        }
+        //If backspace was pressed and the string isn't blank 
+        if((event.key.keysym.sym == SDLK_BACKSPACE) && (s.length() != 0)) 
+        {
+                //Remove a character from the end 
+                s.erase(s.length() - 1); 
+        }
+        if((event.key.keysym.sym == SDLK_RETURN) && oK->deactivated == false) 
+        {
+                return iOK;
+        }
+        if(s != "")
+                input->setCaption(s);
+        input->pos.x = (screenw - input->pos.w)/2;
+        return 0;
+}
+
+void GetStringMenu::frame(double time)
+{
+        BG->frame(time);
+}
+
+void GetStringMenu::refresh()
+{
+        s = "";
+}
+
+
diff --git a/GUI.h b/GUI.h
new file mode 100644
index 0000000..c60e524
--- /dev/null
+++ b/GUI.h
@@ -0,0 +1,225 @@
+#ifndef GUI_H
+#define GUI_H
+
+#include <SDL/SDL_rotozoom.h>
+#include "util.h"
+
+#define BUTTON_CLICKED 0
+#define BUTTON_NORMAL 1
+#define BUTTON_HOVER 2
+#define BUTTON_PRESSEDOVER 3
+#define BUTTON_PRESSEDOUT 4
+#define BUTTON_SELECTED 5
+#define MENU_SELECT 1<<27
+#define MENU_CLICK 1<<26
+
+
+using namespace std;
+
+
+class Label
+{
+protected:
+        string caption;
+        SDL_Surface* image;
+//      int textSize;
+        SDL_Color textColor;
+        int render();
+public:
+        SDL_Rect pos;
+        Label();
+        Label(string ncaption, SDL_Rect& npos);
+        ~Label();
+        void draw(SDL_Surface* screen); 
+        int setTextSize(int ntextSize);
+        void setTextColor(SDL_Color textColor);
+        int setCaption(string ncaption);
+};
+
+vector<Label*> textField(string s, SDL_Rect& r, int textSize);
+
+
+class SlidingBackground
+{
+protected:
+        SDL_Surface *background;
+        double x1;
+        double x2;
+        double y;
+public:
+        double xSpeed;
+        double ySpeed;
+        bool randm;
+        
+        SlidingBackground(SDL_Surface *nbackground, double nxSpeed, double nySpeed);
+        ~SlidingBackground();
+        
+        void setRandom(bool r);
+        void draw(SDL_Surface *screen);
+        void frame(double time);
+};
+
+class AbstractInteractive
+{
+public:
+        virtual ~AbstractInteractive(){}
+        virtual void draw(SDL_Surface *screen) {}
+        virtual int handleEvents(SDL_Event event){return 0;}
+        virtual void frame(double time){}
+        virtual void refresh(){}
+};
+
+class TextBox: public AbstractInteractive
+{
+protected:
+        vector<Label*> labels;
+public:
+        TextBox(vector<Label*> nlabels);
+        ~TextBox();
+        
+        virtual void draw(SDL_Surface *screen);
+        virtual int handleEvents(SDL_Event event);
+        virtual void frame(double time);
+        virtual void refresh();
+};
+
+class Button: AbstractInteractive
+{
+protected:
+        SDL_Surface *normal;
+        SDL_Surface *mouseOver;
+        SDL_Surface *pressed;
+        SDL_Surface *inactive;
+        bool clicked;
+        bool over;
+public:
+        bool deactivated;
+        bool isDblClckButton;
+        double timer;
+        bool selected;
+        SDL_Rect pos;
+        
+        Button(SDL_Rect nPos, SDL_Surface *nnormal, SDL_Surface *nmouseOver, SDL_Surface *npressed, SDL_Surface *ninactive);
+        Button(SDL_Rect npos, string message, int& shouldbeTextSize);
+        //fancybutton & draggable button
+        Button(SDL_Rect npos, SDL_Surface* content, bool fancy);
+        ~Button();
+        void draw(SDL_Surface *screen);
+        int handleEvents(const SDL_Event& event);
+        void frame(double time);
+        void refresh();
+};
+
+class Scrollbar
+{
+protected:
+        SDL_Surface *bar;
+        SDL_Surface *dot;
+        bool horizontal;
+        bool clicked;
+        double stateGoal;
+public:
+        double state;
+        double sensitivity;
+        SDL_Rect pos;
+        
+        //makes direction according to h/w of the Rect
+        Scrollbar(SDL_Rect npos);
+        ~Scrollbar();
+
+        void draw(SDL_Surface *screen);
+        double handleEvents(const SDL_Event& event);
+        double frame(double time);
+        void refresh();
+};
+
+class Scrollable : public AbstractInteractive
+{
+protected:
+        int currentSubPos;
+        SDL_Surface* fakeScreen;
+        AbstractInteractive* subInteractive;
+        SDL_Rect pos;
+        SDL_Rect wholeMenu;
+        Scrollbar* bar;
+        bool horizontal;
+        void setSubPosition(double d);
+        SDL_Rect MousePos;
+public:
+        Scrollable(SDL_Rect npos, AbstractInteractive* nsubInteractive, SDL_Rect subRect, bool nhorizontal, bool nscrollbarSide);
+        ~Scrollable();
+        void draw(SDL_Surface* screen);
+        int handleEvents(SDL_Event event);
+        void frame(double time);
+        void refresh();
+};
+
+class Menu : public AbstractInteractive
+{
+public:
+        vector<Button*> buttons;
+        vector<int> effects;
+        SlidingBackground *BG;
+        bool isSelectMenu;
+        //wether to send signal on Mouse up or down
+        bool onMouseDown;
+        
+        Menu(){
+        }
+        Menu(vector<Button*> nbuttons, vector<int> neffects, SDL_Surface *background, bool rBG);
+        Menu(vector<string> choices, vector<int> neffects, SDL_Surface *background, bool rBG, SDL_Surface *screen);
+        Menu(vector<SDL_Surface*> pics, int width, int& height, bool nisSelectMenu, bool nonMouseDown);
+        virtual ~Menu();
+        
+        virtual void draw(SDL_Surface *screen);
+        virtual int handleEvents(SDL_Event event);
+        virtual void frame(double time);
+        virtual void refresh();
+};
+
+
+
+class CompositMenu: public AbstractInteractive
+{
+protected:
+        vector<Button*> tabs;
+        int state;
+        SDL_Surface* fakeScreen;
+        SDL_Rect subPos;
+public:
+        vector<AbstractInteractive*> submenues;
+        SlidingBackground* BG;
+        CompositMenu(vector<AbstractInteractive*> nsubmenues, SDL_Surface* nBG, SDL_Rect nsubPos, vector<Button*> ntabs);
+        ~CompositMenu();
+        
+        virtual void draw(SDL_Surface *screen);
+        virtual int handleEvents(SDL_Event event);
+        virtual void frame(double time);
+        virtual void refresh();
+        int getState();
+};
+
+class GetStringMenu: public AbstractInteractive
+{
+protected:
+        Label* title;
+        Label* input;
+        Button* back;
+        Button* oK;
+        int iBack;
+        int iOK;
+        int screenw;
+public:
+        SlidingBackground* BG;
+        string s;
+        int maxLength;
+        GetStringMenu(string headline, int back, int ok, SDL_Surface* nBG, SDL_Surface* screen);
+        ~GetStringMenu();
+        
+        virtual void draw(SDL_Surface* screen);
+        virtual int handleEvents(SDL_Event event);
+        virtual void frame(double time);
+        virtual void refresh();
+};
+
+#endif
diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 0000000..20dd820
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,33 @@
+v0.02 release notes
+bugfixes:
+ - fixed a bug where menus would have options still highlighted if reloaded
+structure:
+ - cleaned up code (especially main)
+ - added a menus with
+  - interactive buttons that all have the same textsize
+  - starbackground
+ - added a few new attributes to weapon and ships
+ - added a shop with upgrades available for purchase
+content added:
+ - 1 weapon
+ - 3 enemies
+ - 2 levels
+ - mainmenu, levelmenu and startmenu
+
+v0.01b release notes
+stucture:
+ - arcade game engine featuring 
+  - collision detection
+  - sounds
+  - ship with difficult handling
+ - load from file levels, enemies weapons and ships
+ - level generator
+  - requires only minimal information
+  - enemies will come in one of 5 beautiful wavetypes
+ - HUD with Energy-bar, HP-bar, gold-, exp- and highscoredisplay
+content:
+ - 5 weapons
+ - 3 enemies
+ - 1 Usership
+ - 1 HUD artworks
+ - 1 level
diff --git a/data/EnemyShip_template.txt~ b/data/EnemyShip_template.txt~
new file mode 100644
index 0000000..2fdb348
--- /dev/null
+++ b/data/EnemyShip_template.txt~
@@ -0,0 +1,12 @@
+Tork Spacerocket                                        #name
+data/images/tork_spacerocket.bmp        #path of imagefile
+7                                                                       #maxhp
+5                                                                       #armor
+50                                                                      #moveSpeed
+4                                                                       #collisionSize
+3                                                                       #Gold
+3                                                                       #exp
+3                                                                       #score
+1                                                                       #number of weapons
+0 -1                                                            #relative Position of weapon
+data/fireball.txt                                       #path of weapon
diff --git a/data/Level_template.txt~ b/data/Level_template.txt~
new file mode 100644
index 0000000..5f56909
--- /dev/null
+++ b/data/Level_template.txt~
@@ -0,0 +1,14 @@
+IntroLevel                                      #name
+data/images/bg_stars.bmp        #path of background
+30                                                      #speed of background
+1                                                       #wether to randomize background position
+60                                                      #duration [s]
+12346543                                        #seed
+2                                                       #number of Shiptypes
+data/tork_capsule.txt           #path of Ship
+50                                                      #how many of them should spawn
+data/tork_spacerocket.txt       #path of Ship
+12                                                      #how many
+1                                                       #how many events shall happen
+0.5                                                     #percentage of completion the event happens
+****event*****                          #an event
diff --git a/data/UserShip_template.txt~ b/data/UserShip_template.txt~
new file mode 100644
index 0000000..e526124
--- /dev/null
+++ b/data/UserShip_template.txt~
@@ -0,0 +1,15 @@
+small Fighter                                   #name
+data/images/small_fighter.bmp   #path of imagefile
+7                                                               #maxhp
+50                                                              #armor
+200                                                             #moveSpeed
+100                                                             #handling
+10                                                              #maxEnergy
+2                                                               #energyProduction
+7                                                               #collisionSize
+2                                                               #number of weapons
+4 4                                                             #relative Position of weapon
+data/fireball.txt                               #path of weapon
+4 4                                                             #relative Position of weapon
+data/fireball.txt                               #path of weapon
+
diff --git a/data/beam.txt~ b/data/beam.txt~
new file mode 100644
index 0000000..99001f3
--- /dev/null
+++ b/data/beam.txt~
@@ -0,0 +1,5 @@
+data/images/spit.bmp
+data/sounds/piu
+0.4
+10
+1
diff --git a/data/beamer1.txt~ b/data/beamer1.txt~
new file mode 100644
index 0000000..31ffd79
--- /dev/null
+++ b/data/beamer1.txt~
@@ -0,0 +1,9 @@
+Beamer 1
+data/images/beamer1.bmp
+3
+1
+0.1
+0
+data/beam.txt
+0
+1000
diff --git a/data/bigspit.txt~ b/data/bigspit.txt~
new file mode 100644
index 0000000..00d3e4e
--- /dev/null
+++ b/data/bigspit.txt~
@@ -0,0 +1,4 @@
+data/images/bigspit.bmp
+8
+0
+4
diff --git a/data/creator.cpp~ b/data/creator.cpp~
new file mode 100644
index 0000000..9abcdcf
--- /dev/null
+++ b/data/creator.cpp~
@@ -0,0 +1,32 @@
+#include <iostream>
+#include <fstream>
+#include <math.h>
+
+using namespace std;
+
+int main()
+{
+        ofstream o;
+        o.open("nnova1.txt");
+        o << "Nova 1\n";
+        o << "data/images/empty.bmp\n";
+        o << 2 << '\n';
+        int shots = 300;
+        double T = 10;
+        double duration = 0.6;
+        double start = 3;
+        double speed = 320;
+        int Ncircles = 4;
+        o << shots << endl;
+        for(int i = 0; i < shots; ++i)
+        {
+                o << T << '\n';
+                o << T - start - ((double) i)/((double) shots)*duration-0.0001 << '\n';
+                o << "data/psi.txt\n";
+                o << cos(Ncircles*2*M_PI*i/((double) shots))*speed << '\n';
+                o << sin(Ncircles*2*M_PI*i/((double) shots))*speed;
+                if(i != shots-1)
+                        o << endl;
+        }
+        o.close();
+}
diff --git a/data/fire1.txt~ b/data/fire1.txt~
new file mode 100644
index 0000000..031e2c3
--- /dev/null
+++ b/data/fire1.txt~
@@ -0,0 +1,4 @@
+data/images/fire1.bmp
+2
+10
+3.5
diff --git a/data/fireball1.txt~ b/data/fireball1.txt~
new file mode 100644
index 0000000..1400896
--- /dev/null
+++ b/data/fireball1.txt~
@@ -0,0 +1,9 @@
+Fireball 1
+data/images/fire1.bmp
+1.5
+1
+3
+2
+data/fire1.txt
+0
+150
diff --git a/data/fonts/Apache License Version 2.txt b/data/fonts/Apache License Version 2.txt
new file mode 100644
index 0000000..4df74b8
--- /dev/null
+++ b/data/fonts/Apache License Version 2.txt
@@ -0,0 +1,53 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
\ No newline at end of file
diff --git a/data/fonts/OpenSans-Bold.ttf b/data/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000..fd79d43
--- /dev/null
+++ b/data/fonts/OpenSans-Bold.ttf
diff --git a/data/fonts/OpenSans-BoldItalic.ttf b/data/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000..9bc8009
--- /dev/null
+++ b/data/fonts/OpenSans-BoldItalic.ttf
diff --git a/data/fonts/OpenSans-ExtraBold.ttf b/data/fonts/OpenSans-ExtraBold.ttf
new file mode 100644
index 0000000..21f6f84
--- /dev/null
+++ b/data/fonts/OpenSans-ExtraBold.ttf
diff --git a/data/fonts/OpenSans-ExtraBoldItalic.ttf b/data/fonts/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..31cb688
--- /dev/null
+++ b/data/fonts/OpenSans-ExtraBoldItalic.ttf
diff --git a/data/fonts/OpenSans-Italic.ttf b/data/fonts/OpenSans-Italic.ttf
new file mode 100644
index 0000000..c90da48
--- /dev/null
+++ b/data/fonts/OpenSans-Italic.ttf
diff --git a/data/fonts/OpenSans-Light.ttf b/data/fonts/OpenSans-Light.ttf
new file mode 100644
index 0000000..0d38189
--- /dev/null
+++ b/data/fonts/OpenSans-Light.ttf
diff --git a/data/fonts/OpenSans-LightItalic.ttf b/data/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 0000000..68299c4
--- /dev/null
+++ b/data/fonts/OpenSans-LightItalic.ttf
diff --git a/data/fonts/OpenSans-Regular.ttf b/data/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..db43334
--- /dev/null
+++ b/data/fonts/OpenSans-Regular.ttf
diff --git a/data/fonts/OpenSans-Semibold.ttf b/data/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 0000000..1a7679e
--- /dev/null
+++ b/data/fonts/OpenSans-Semibold.ttf
diff --git a/data/fonts/OpenSans-SemiboldItalic.ttf b/data/fonts/OpenSans-SemiboldItalic.ttf
new file mode 100644
index 0000000..59b6d16
--- /dev/null
+++ b/data/fonts/OpenSans-SemiboldItalic.ttf
diff --git a/data/images/background.bmp b/data/images/background.bmp
new file mode 100644
index 0000000..0f481c6
--- /dev/null
+++ b/data/images/background.bmp
diff --git a/data/images/beamer1.bmp b/data/images/beamer1.bmp
new file mode 100644
index 0000000..5eabbc4
--- /dev/null
+++ b/data/images/beamer1.bmp
diff --git a/data/images/bg_stars.bmp b/data/images/bg_stars.bmp
new file mode 100644
index 0000000..0f481c6
--- /dev/null
+++ b/data/images/bg_stars.bmp
diff --git a/data/images/bigspit.bmp b/data/images/bigspit.bmp
new file mode 100644
index 0000000..950b08c
--- /dev/null
+++ b/data/images/bigspit.bmp
diff --git a/data/images/empty.bmp b/data/images/empty.bmp
new file mode 100644
index 0000000..4af26a7
--- /dev/null
+++ b/data/images/empty.bmp
diff --git a/data/images/energy_bubbles.bmp b/data/images/energy_bubbles.bmp
new file mode 100644
index 0000000..4a32973
--- /dev/null
+++ b/data/images/energy_bubbles.bmp
diff --git a/data/images/energy_bubbles2.bmp b/data/images/energy_bubbles2.bmp
new file mode 100644
index 0000000..8fc0d05
--- /dev/null
+++ b/data/images/energy_bubbles2.bmp
diff --git a/data/images/energy_bubbles3.bmp b/data/images/energy_bubbles3.bmp
new file mode 100644
index 0000000..7b7922c
--- /dev/null
+++ b/data/images/energy_bubbles3.bmp
diff --git a/data/images/energy_masc.bmp b/data/images/energy_masc.bmp
new file mode 100644
index 0000000..7d746d9
--- /dev/null
+++ b/data/images/energy_masc.bmp
diff --git a/data/images/energy_masc2.bmp b/data/images/energy_masc2.bmp
new file mode 100644
index 0000000..2414caa
--- /dev/null
+++ b/data/images/energy_masc2.bmp
diff --git a/data/images/energy_raw.bmp b/data/images/energy_raw.bmp
new file mode 100644
index 0000000..de4d8ae
--- /dev/null
+++ b/data/images/energy_raw.bmp
diff --git a/data/images/energy_raw2.bmp b/data/images/energy_raw2.bmp
new file mode 100644
index 0000000..5b9a7cb
--- /dev/null
+++ b/data/images/energy_raw2.bmp
diff --git a/data/images/fancy_button.bmp b/data/images/fancy_button.bmp
new file mode 100644
index 0000000..8f9f7d9
--- /dev/null
+++ b/data/images/fancy_button.bmp
diff --git a/data/images/fancy_button_clicked.bmp b/data/images/fancy_button_clicked.bmp
new file mode 100644
index 0000000..d990a8f
--- /dev/null
+++ b/data/images/fancy_button_clicked.bmp
diff --git a/data/images/fancy_button_selected.bmp b/data/images/fancy_button_selected.bmp
new file mode 100644
index 0000000..225162e
--- /dev/null
+++ b/data/images/fancy_button_selected.bmp
diff --git a/data/images/fancy_button_unavailable.bmp b/data/images/fancy_button_unavailable.bmp
new file mode 100644
index 0000000..eeb4695
--- /dev/null
+++ b/data/images/fancy_button_unavailable.bmp
diff --git a/data/images/fire1.bmp b/data/images/fire1.bmp
new file mode 100644
index 0000000..1c93d5a
--- /dev/null
+++ b/data/images/fire1.bmp
diff --git a/data/images/game_screen.bmp b/data/images/game_screen.bmp
new file mode 100644
index 0000000..28fa1e4
--- /dev/null
+++ b/data/images/game_screen.bmp
diff --git a/data/images/glowing_dot.png b/data/images/glowing_dot.png
new file mode 100644
index 0000000..8823b2a
--- /dev/null
+++ b/data/images/glowing_dot.png
diff --git a/data/images/hornet.bmp b/data/images/hornet.bmp
new file mode 100644
index 0000000..d9f64d5
--- /dev/null
+++ b/data/images/hornet.bmp
diff --git a/data/images/hp_masc.bmp b/data/images/hp_masc.bmp
new file mode 100644
index 0000000..e657ba2
--- /dev/null
+++ b/data/images/hp_masc.bmp
diff --git a/data/images/hp_masc2.bmp b/data/images/hp_masc2.bmp
new file mode 100644
index 0000000..3ec95b9
--- /dev/null
+++ b/data/images/hp_masc2.bmp
diff --git a/data/images/hp_raw.bmp b/data/images/hp_raw.bmp
new file mode 100644
index 0000000..22b00bf
--- /dev/null
+++ b/data/images/hp_raw.bmp
diff --git a/data/images/hud_background.bmp b/data/images/hud_background.bmp
new file mode 100644
index 0000000..64ec3b3
--- /dev/null
+++ b/data/images/hud_background.bmp
diff --git a/data/images/psi.bmp b/data/images/psi.bmp
new file mode 100644
index 0000000..862bdcd
--- /dev/null
+++ b/data/images/psi.bmp
diff --git a/data/images/scrollbar_end_h1.png b/data/images/scrollbar_end_h1.png
new file mode 100644
index 0000000..80fe890
--- /dev/null
+++ b/data/images/scrollbar_end_h1.png
diff --git a/data/images/scrollbar_end_h2.png b/data/images/scrollbar_end_h2.png
new file mode 100644
index 0000000..587038c
--- /dev/null
+++ b/data/images/scrollbar_end_h2.png
diff --git a/data/images/scrollbar_end_v1.png b/data/images/scrollbar_end_v1.png
new file mode 100644
index 0000000..a29e114
--- /dev/null
+++ b/data/images/scrollbar_end_v1.png
diff --git a/data/images/scrollbar_end_v2.png b/data/images/scrollbar_end_v2.png
new file mode 100644
index 0000000..561c1f1
--- /dev/null
+++ b/data/images/scrollbar_end_v2.png
diff --git a/data/images/scrollbar_h.png b/data/images/scrollbar_h.png
new file mode 100644
index 0000000..548ee40
--- /dev/null
+++ b/data/images/scrollbar_h.png
diff --git a/data/images/scrollbar_v.png b/data/images/scrollbar_v.png
new file mode 100644
index 0000000..362911b
--- /dev/null
+++ b/data/images/scrollbar_v.png
diff --git a/data/images/ship1.bmp b/data/images/ship1.bmp
new file mode 100644
index 0000000..8abfd92
--- /dev/null
+++ b/data/images/ship1.bmp
diff --git a/data/images/ship2.bmp b/data/images/ship2.bmp
new file mode 100644
index 0000000..765c8b3
--- /dev/null
+++ b/data/images/ship2.bmp
diff --git a/data/images/small_fighter.bmp b/data/images/small_fighter.bmp
new file mode 100644
index 0000000..7f506db
--- /dev/null
+++ b/data/images/small_fighter.bmp
diff --git a/data/images/spit.bmp b/data/images/spit.bmp
new file mode 100644
index 0000000..c37b452
--- /dev/null
+++ b/data/images/spit.bmp
diff --git a/data/images/spitter1.bmp b/data/images/spitter1.bmp
new file mode 100644
index 0000000..fe93bcd
--- /dev/null
+++ b/data/images/spitter1.bmp
diff --git a/data/images/spitter3.bmp b/data/images/spitter3.bmp
new file mode 100644
index 0000000..d7dfe3e
--- /dev/null
+++ b/data/images/spitter3.bmp
diff --git a/data/images/tork_cruiser.bmp b/data/images/tork_cruiser.bmp
new file mode 100644
index 0000000..4a67d0c
--- /dev/null
+++ b/data/images/tork_cruiser.bmp
diff --git a/data/images/tork_interceptor.bmp b/data/images/tork_interceptor.bmp
new file mode 100644
index 0000000..b4b080d
--- /dev/null
+++ b/data/images/tork_interceptor.bmp
diff --git a/data/images/tork_sting.bmp b/data/images/tork_sting.bmp
new file mode 100644
index 0000000..f4fdce4
--- /dev/null
+++ b/data/images/tork_sting.bmp
diff --git a/data/images/tork_tanker.bmp b/data/images/tork_tanker.bmp
new file mode 100644
index 0000000..3b4e056
--- /dev/null
+++ b/data/images/tork_tanker.bmp
diff --git a/data/introlevel.txt~ b/data/introlevel.txt~
new file mode 100644
index 0000000..9f40e40
--- /dev/null
+++ b/data/introlevel.txt~
@@ -0,0 +1,14 @@
+Introlevel
+data/images/bg_stars.bmp
+60
+1
+90
+1246435
+3
+data/tork_capsule.txt
+25
+data/tork_spacerocket.txt
+5
+data/tork_interceptor.txt
+2
+0
diff --git a/data/levels/Level_template.txt b/data/levels/Level_template.txt
new file mode 100644
index 0000000..fe3ce3d
--- /dev/null
+++ b/data/levels/Level_template.txt
@@ -0,0 +1,14 @@
+IntroLevel                                      #name
+data/images/bg_stars.bmp        #path of background
+30                                                      #speed of background
+1                                                       #wether to randomize background position
+60                                                      #duration [s]
+12346543                                        #seed
+2                                                       #number of Shiptypes
+data/tork_capsule.txt           #path of Ship
+40                                                      #how many of them should spawn
+data/tork_spacerocket.txt       #path of Ship
+8                                                       #how many
+1                                                       #how many events shall happen
+0.5                                                     #percentage of completion the event happens
+****event*****                          #an event
diff --git a/data/levels/Levels.txt~ b/data/levels/Levels.txt~
new file mode 100644
index 0000000..561a6d1
--- /dev/null
+++ b/data/levels/Levels.txt~
@@ -0,0 +1 @@
+intro_level.txt
diff --git a/data/levels/insanelevel.txt b/data/levels/insanelevel.txt
new file mode 100644
index 0000000..6fa5f2e
--- /dev/null
+++ b/data/levels/insanelevel.txt
@@ -0,0 +1,20 @@
+Insane Level
+data/images/bg_stars.bmp
+60
+1
+40
+11374431
+6
+data/ships/tork/capsule.txt
+20
+data/ships/tork/spacerocket.txt
+25
+data/ships/tork/interceptor.txt
+6
+data/ships/tork/cruiser.txt
+10
+data/ships/tork/tanker.txt
+16
+data/ships/tork/sting.txt
+45
+0
diff --git a/data/levels/insanelevel.txt~ b/data/levels/insanelevel.txt~
new file mode 100644
index 0000000..eec3ac6
--- /dev/null
+++ b/data/levels/insanelevel.txt~
@@ -0,0 +1,20 @@
+Insane Level
+data/images/bg_stars.bmp
+60
+1
+40
+11374431
+6
+data/ships/tork/capsule.txt
+20
+data/ships/tork/spacerocket.txt
+25
+data/ships/tork/interceptor.txt
+6
+data/ships/tork/cruiser.txt
+10
+data/ships/tork/tanker.txt
+8
+data/ships/tork/sting.txt
+45
+0
diff --git a/data/levels/introlevel.txt b/data/levels/introlevel.txt
new file mode 100644
index 0000000..94d26df
--- /dev/null
+++ b/data/levels/introlevel.txt
@@ -0,0 +1,14 @@
+Introlevel
+data/images/bg_stars.bmp
+60
+1
+50
+1246436
+3
+data/ships/tork/capsule.txt
+140
+data/ships/tork/spacerocket.txt
+10
+data/ships/tork/interceptor.txt
+4
+0
diff --git a/data/levels/introlevel.txt~ b/data/levels/introlevel.txt~
new file mode 100644
index 0000000..a4731c7
--- /dev/null
+++ b/data/levels/introlevel.txt~
@@ -0,0 +1,14 @@
+Introlevel
+data/images/bg_stars.bmp
+60
+1
+50
+1246436
+3
+data/ships/tork/capsule.txt
+35
+data/ships/tork/spacerocket.txt
+5
+data/ships/tork/interceptor.txt
+2
+0
diff --git a/data/levels/level2.txt b/data/levels/level2.txt
new file mode 100644
index 0000000..1a31fcb
--- /dev/null
+++ b/data/levels/level2.txt
@@ -0,0 +1,16 @@
+Level 2
+data/images/bg_stars.bmp
+60
+1
+105
+11654436
+4
+data/ships/tork/capsule.txt
+160
+data/ships/tork/spacerocket.txt
+20
+data/ships/tork/interceptor.txt
+12
+data/ships/tork/cruiser.txt
+4
+0
diff --git a/data/levels/level2.txt~ b/data/levels/level2.txt~
new file mode 100644
index 0000000..e50a515
--- /dev/null
+++ b/data/levels/level2.txt~
@@ -0,0 +1,16 @@
+Level 2
+data/images/bg_stars.bmp
+60
+1
+105
+11654436
+4
+data/ships/tork/capsule.txt
+40
+data/ships/tork/spacerocket.txt
+10
+data/ships/tork/interceptor.txt
+6
+data/ships/tork/cruiser.txt
+2
+0
diff --git a/data/levels/level3.txt b/data/levels/level3.txt
new file mode 100644
index 0000000..212a241
--- /dev/null
+++ b/data/levels/level3.txt
@@ -0,0 +1,20 @@
+Level 3
+data/images/bg_stars.bmp
+60
+1
+65
+11374331
+6
+data/ships/tork/capsule.txt
+120
+data/ships/tork/spacerocket.txt
+20
+data/ships/tork/interceptor.txt
+8
+data/ships/tork/cruiser.txt
+8
+data/ships/tork/tanker.txt
+80
+data/ships/tork/sting.txt
+80
+0
diff --git a/data/levels/level3.txt~ b/data/levels/level3.txt~
new file mode 100644
index 0000000..8c103eb
--- /dev/null
+++ b/data/levels/level3.txt~
@@ -0,0 +1,20 @@
+Level 3
+data/images/bg_stars.bmp
+60
+1
+65
+11374331
+6
+data/ships/tork/capsule.txt
+120
+data/ships/tork/spacerocket.txt
+20
+data/ships/tork/interceptor.txt
+8
+data/ships/tork/cruiser.txt
+8
+data/ships/tork/tanker.txt
+40
+data/ships/tork/sting.txt
+80
+0
diff --git a/data/levels/level4.txt b/data/levels/level4.txt
new file mode 100644
index 0000000..7652e9d
--- /dev/null
+++ b/data/levels/level4.txt
@@ -0,0 +1,14 @@
+Level 4
+data/images/bg_stars.bmp
+60
+1
+50
+1246436
+3
+data/ships/tork/sting.txt
+140
+data/ships/tork/interceptor.txt
+10
+data/ships/tork/cruiser.txt
+4
+0
diff --git a/data/levels/level4.txt~ b/data/levels/level4.txt~
new file mode 100644
index 0000000..aba3a6f
--- /dev/null
+++ b/data/levels/level4.txt~
@@ -0,0 +1,14 @@
+Level 4
+data/images/bg_stars.bmp
+60
+1
+50
+1246436
+3
+data/ships/tork/sting.txt
+35
+data/ships/tork/interceptor.txt
+5
+data/ships/tork/cruiser.txt
+2
+0
diff --git a/data/levels/levels.txt b/data/levels/levels.txt
new file mode 100644
index 0000000..788f050
--- /dev/null
+++ b/data/levels/levels.txt
@@ -0,0 +1,5 @@
+introlevel.txt
+level2.txt
+level3.txt
+level4.txt
+insanelevel.txt
diff --git a/data/levels/levels.txt~ b/data/levels/levels.txt~
new file mode 100644
index 0000000..acc839a
--- /dev/null
+++ b/data/levels/levels.txt~
@@ -0,0 +1,4 @@
+introlevel.txt
+level2.txt
+level3.txt
+insanelevel.txt
diff --git a/data/nnova.txt~ b/data/nnova.txt~
new file mode 100644
index 0000000..b15b226
--- /dev/null
+++ b/data/nnova.txt~
@@ -0,0 +1,254 @@
+Nova 1
+data/images/empty.bmp
+20
+50
+10
+3
+data/psi.txt
+350
+0
+10
+3.5
+data/psi.txt
+347.24
+43.8666
+10
+4
+data/psi.txt
+339.004
+87.0415
+10
+4.5
+data/psi.txt
+325.422
+128.844
+10
+5
+data/psi.txt
+306.707
+168.614
+10
+5.5
+data/psi.txt
+283.156
+205.725
+10
+6
+data/psi.txt
+255.139
+239.591
+10
+6.5
+data/psi.txt
+223.098
+269.68
+10
+7
+data/psi.txt
+187.539
+295.515
+10
+7.5
+data/psi.txt
+149.023
+316.689
+10
+8
+data/psi.txt
+108.156
+332.87
+10
+8.5
+data/psi.txt
+65.5835
+343.801
+10
+9
+data/psi.txt
+21.9767
+349.309
+10
+9.5
+data/psi.txt
+-21.9767
+349.309
+10
+10
+data/psi.txt
+-65.5835
+343.801
+10
+10.5
+data/psi.txt
+-108.156
+332.87
+10
+11
+data/psi.txt
+-149.023
+316.689
+10
+11.5
+data/psi.txt
+-187.539
+295.515
+10
+12
+data/psi.txt
+-223.098
+269.68
+10
+12.5
+data/psi.txt
+-255.139
+239.591
+10
+13
+data/psi.txt
+-283.156
+205.725
+10
+13.5
+data/psi.txt
+-306.707
+168.614
+10
+14
+data/psi.txt
+-325.422
+128.844
+10
+14.5
+data/psi.txt
+-339.004
+87.0415
+10
+15
+data/psi.txt
+-347.24
+43.8666
+10
+15.5
+data/psi.txt
+-350
+4.28626e-14
+10
+16
+data/psi.txt
+-347.24
+-43.8666
+10
+16.5
+data/psi.txt
+-339.004
+-87.0415
+10
+17
+data/psi.txt
+-325.422
+-128.844
+10
+17.5
+data/psi.txt
+-306.707
+-168.614
+10
+18
+data/psi.txt
+-283.156
+-205.725
+10
+18.5
+data/psi.txt
+-255.139
+-239.591
+10
+19
+data/psi.txt
+-223.098
+-269.68
+10
+19.5
+data/psi.txt
+-187.539
+-295.515
+10
+20
+data/psi.txt
+-149.023
+-316.689
+10
+20.5
+data/psi.txt
+-108.156
+-332.87
+10
+21
+data/psi.txt
+-65.5835
+-343.801
+10
+21.5
+data/psi.txt
+-21.9767
+-349.309
+10
+22
+data/psi.txt
+21.9767
+-349.309
+10
+22.5
+data/psi.txt
+65.5835
+-343.801
+10
+23
+data/psi.txt
+108.156
+-332.87
+10
+23.5
+data/psi.txt
+149.023
+-316.689
+10
+24
+data/psi.txt
+187.539
+-295.515
+10
+24.5
+data/psi.txt
+223.098
+-269.68
+10
+25
+data/psi.txt
+255.139
+-239.591
+10
+25.5
+data/psi.txt
+283.156
+-205.725
+10
+26
+data/psi.txt
+306.707
+-168.614
+10
+26.5
+data/psi.txt
+325.422
+-128.844
+10
+27
+data/psi.txt
+339.004
+-87.0415
+10
+27.5
+data/psi.txt
+347.24
+-43.8666
diff --git a/data/nova1.txt~ b/data/nova1.txt~
new file mode 100644
index 0000000..2fe20c5
--- /dev/null
+++ b/data/nova1.txt~
@@ -0,0 +1,1504 @@
+Nova 1
+data/images/empty.bmp
+2
+300
+10
+6.9999
+data/psi.txt
+320
+0
+10
+6.9979
+data/psi.txt
+318.878
+26.7769
+10
+6.9959
+data/psi.txt
+315.519
+53.366
+10
+6.9939
+data/psi.txt
+309.947
+79.5808
+10
+6.9919
+data/psi.txt
+302.2
+105.237
+10
+6.9899
+data/psi.txt
+292.335
+130.156
+10
+6.9879
+data/psi.txt
+280.418
+154.161
+10
+6.9859
+data/psi.txt
+266.535
+177.085
+10
+6.9839
+data/psi.txt
+250.782
+198.767
+10
+6.9819
+data/psi.txt
+233.27
+219.055
+10
+6.9799
+data/psi.txt
+214.122
+237.806
+10
+6.9779
+data/psi.txt
+193.472
+254.89
+10
+6.9759
+data/psi.txt
+171.465
+270.185
+10
+6.9739
+data/psi.txt
+148.255
+283.585
+10
+6.9719
+data/psi.txt
+124.005
+294.996
+10
+6.9699
+data/psi.txt
+98.8854
+304.338
+10
+6.9679
+data/psi.txt
+73.0723
+311.545
+10
+6.9659
+data/psi.txt
+46.7466
+316.567
+10
+6.9639
+data/psi.txt
+20.093
+319.369
+10
+6.9619
+data/psi.txt
+-6.70157
+319.93
+10
+6.9599
+data/psi.txt
+-33.4491
+318.247
+10
+6.9579
+data/psi.txt
+-59.962
+314.332
+10
+6.9559
+data/psi.txt
+-86.0543
+308.212
+10
+6.9539
+data/psi.txt
+-111.543
+299.93
+10
+6.9519
+data/psi.txt
+-136.249
+289.545
+10
+6.9499
+data/psi.txt
+-160
+277.128
+10
+6.9479
+data/psi.txt
+-182.628
+262.768
+10
+6.9459
+data/psi.txt
+-203.976
+246.564
+10
+6.9439
+data/psi.txt
+-223.892
+228.631
+10
+6.9419
+data/psi.txt
+-242.238
+209.095
+10
+6.9399
+data/psi.txt
+-258.885
+188.091
+10
+6.9379
+data/psi.txt
+-273.717
+165.769
+10
+6.9359
+data/psi.txt
+-286.628
+142.283
+10
+6.9339
+data/psi.txt
+-297.528
+117.8
+10
+6.9319
+data/psi.txt
+-306.342
+92.4902
+10
+6.9299
+data/psi.txt
+-313.007
+66.5317
+10
+6.9279
+data/psi.txt
+-317.477
+40.1066
+10
+6.9259
+data/psi.txt
+-319.719
+13.4002
+10
+6.9239
+data/psi.txt
+-319.719
+-13.4002
+10
+6.9219
+data/psi.txt
+-317.477
+-40.1066
+10
+6.9199
+data/psi.txt
+-313.007
+-66.5317
+10
+6.9179
+data/psi.txt
+-306.342
+-92.4902
+10
+6.9159
+data/psi.txt
+-297.528
+-117.8
+10
+6.9139
+data/psi.txt
+-286.628
+-142.283
+10
+6.9119
+data/psi.txt
+-273.717
+-165.769
+10
+6.9099
+data/psi.txt
+-258.885
+-188.091
+10
+6.9079
+data/psi.txt
+-242.238
+-209.095
+10
+6.9059
+data/psi.txt
+-223.892
+-228.631
+10
+6.9039
+data/psi.txt
+-203.976
+-246.564
+10
+6.9019
+data/psi.txt
+-182.628
+-262.768
+10
+6.8999
+data/psi.txt
+-160
+-277.128
+10
+6.8979
+data/psi.txt
+-136.249
+-289.545
+10
+6.8959
+data/psi.txt
+-111.543
+-299.93
+10
+6.8939
+data/psi.txt
+-86.0543
+-308.212
+10
+6.8919
+data/psi.txt
+-59.962
+-314.332
+10
+6.8899
+data/psi.txt
+-33.4491
+-318.247
+10
+6.8879
+data/psi.txt
+-6.70157
+-319.93
+10
+6.8859
+data/psi.txt
+20.093
+-319.369
+10
+6.8839
+data/psi.txt
+46.7466
+-316.567
+10
+6.8819
+data/psi.txt
+73.0723
+-311.545
+10
+6.8799
+data/psi.txt
+98.8854
+-304.338
+10
+6.8779
+data/psi.txt
+124.005
+-294.996
+10
+6.8759
+data/psi.txt
+148.255
+-283.585
+10
+6.8739
+data/psi.txt
+171.465
+-270.185
+10
+6.8719
+data/psi.txt
+193.472
+-254.89
+10
+6.8699
+data/psi.txt
+214.122
+-237.806
+10
+6.8679
+data/psi.txt
+233.27
+-219.055
+10
+6.8659
+data/psi.txt
+250.782
+-198.767
+10
+6.8639
+data/psi.txt
+266.535
+-177.085
+10
+6.8619
+data/psi.txt
+280.418
+-154.161
+10
+6.8599
+data/psi.txt
+292.335
+-130.156
+10
+6.8579
+data/psi.txt
+302.2
+-105.237
+10
+6.8559
+data/psi.txt
+309.947
+-79.5808
+10
+6.8539
+data/psi.txt
+315.519
+-53.366
+10
+6.8519
+data/psi.txt
+318.878
+-26.7769
+10
+6.8499
+data/psi.txt
+320
+-7.83774e-14
+10
+6.8479
+data/psi.txt
+318.878
+26.7769
+10
+6.8459
+data/psi.txt
+315.519
+53.366
+10
+6.8439
+data/psi.txt
+309.947
+79.5808
+10
+6.8419
+data/psi.txt
+302.2
+105.237
+10
+6.8399
+data/psi.txt
+292.335
+130.156
+10
+6.8379
+data/psi.txt
+280.418
+154.161
+10
+6.8359
+data/psi.txt
+266.535
+177.085
+10
+6.8339
+data/psi.txt
+250.782
+198.767
+10
+6.8319
+data/psi.txt
+233.27
+219.055
+10
+6.8299
+data/psi.txt
+214.122
+237.806
+10
+6.8279
+data/psi.txt
+193.472
+254.89
+10
+6.8259
+data/psi.txt
+171.465
+270.185
+10
+6.8239
+data/psi.txt
+148.255
+283.585
+10
+6.8219
+data/psi.txt
+124.005
+294.996
+10
+6.8199
+data/psi.txt
+98.8854
+304.338
+10
+6.8179
+data/psi.txt
+73.0723
+311.545
+10
+6.8159
+data/psi.txt
+46.7466
+316.567
+10
+6.8139
+data/psi.txt
+20.093
+319.369
+10
+6.8119
+data/psi.txt
+-6.70157
+319.93
+10
+6.8099
+data/psi.txt
+-33.4491
+318.247
+10
+6.8079
+data/psi.txt
+-59.962
+314.332
+10
+6.8059
+data/psi.txt
+-86.0543
+308.212
+10
+6.8039
+data/psi.txt
+-111.543
+299.93
+10
+6.8019
+data/psi.txt
+-136.249
+289.545
+10
+6.7999
+data/psi.txt
+-160
+277.128
+10
+6.7979
+data/psi.txt
+-182.628
+262.768
+10
+6.7959
+data/psi.txt
+-203.976
+246.564
+10
+6.7939
+data/psi.txt
+-223.892
+228.631
+10
+6.7919
+data/psi.txt
+-242.238
+209.095
+10
+6.7899
+data/psi.txt
+-258.885
+188.091
+10
+6.7879
+data/psi.txt
+-273.717
+165.769
+10
+6.7859
+data/psi.txt
+-286.628
+142.283
+10
+6.7839
+data/psi.txt
+-297.528
+117.8
+10
+6.7819
+data/psi.txt
+-306.342
+92.4902
+10
+6.7799
+data/psi.txt
+-313.007
+66.5317
+10
+6.7779
+data/psi.txt
+-317.477
+40.1066
+10
+6.7759
+data/psi.txt
+-319.719
+13.4002
+10
+6.7739
+data/psi.txt
+-319.719
+-13.4002
+10
+6.7719
+data/psi.txt
+-317.477
+-40.1066
+10
+6.7699
+data/psi.txt
+-313.007
+-66.5317
+10
+6.7679
+data/psi.txt
+-306.342
+-92.4902
+10
+6.7659
+data/psi.txt
+-297.528
+-117.8
+10
+6.7639
+data/psi.txt
+-286.628
+-142.283
+10
+6.7619
+data/psi.txt
+-273.717
+-165.769
+10
+6.7599
+data/psi.txt
+-258.885
+-188.091
+10
+6.7579
+data/psi.txt
+-242.238
+-209.095
+10
+6.7559
+data/psi.txt
+-223.892
+-228.631
+10
+6.7539
+data/psi.txt
+-203.976
+-246.564
+10
+6.7519
+data/psi.txt
+-182.628
+-262.768
+10
+6.7499
+data/psi.txt
+-160
+-277.128
+10
+6.7479
+data/psi.txt
+-136.249
+-289.545
+10
+6.7459
+data/psi.txt
+-111.543
+-299.93
+10
+6.7439
+data/psi.txt
+-86.0543
+-308.212
+10
+6.7419
+data/psi.txt
+-59.962
+-314.332
+10
+6.7399
+data/psi.txt
+-33.4491
+-318.247
+10
+6.7379
+data/psi.txt
+-6.70157
+-319.93
+10
+6.7359
+data/psi.txt
+20.093
+-319.369
+10
+6.7339
+data/psi.txt
+46.7466
+-316.567
+10
+6.7319
+data/psi.txt
+73.0723
+-311.545
+10
+6.7299
+data/psi.txt
+98.8854
+-304.338
+10
+6.7279
+data/psi.txt
+124.005
+-294.996
+10
+6.7259
+data/psi.txt
+148.255
+-283.585
+10
+6.7239
+data/psi.txt
+171.465
+-270.185
+10
+6.7219
+data/psi.txt
+193.472
+-254.89
+10
+6.7199
+data/psi.txt
+214.122
+-237.806
+10
+6.7179
+data/psi.txt
+233.27
+-219.055
+10
+6.7159
+data/psi.txt
+250.782
+-198.767
+10
+6.7139
+data/psi.txt
+266.535
+-177.085
+10
+6.7119
+data/psi.txt
+280.418
+-154.161
+10
+6.7099
+data/psi.txt
+292.335
+-130.156
+10
+6.7079
+data/psi.txt
+302.2
+-105.237
+10
+6.7059
+data/psi.txt
+309.947
+-79.5808
+10
+6.7039
+data/psi.txt
+315.519
+-53.366
+10
+6.7019
+data/psi.txt
+318.878
+-26.7769
+10
+6.6999
+data/psi.txt
+320
+-1.56755e-13
+10
+6.6979
+data/psi.txt
+318.878
+26.7769
+10
+6.6959
+data/psi.txt
+315.519
+53.366
+10
+6.6939
+data/psi.txt
+309.947
+79.5808
+10
+6.6919
+data/psi.txt
+302.2
+105.237
+10
+6.6899
+data/psi.txt
+292.335
+130.156
+10
+6.6879
+data/psi.txt
+280.418
+154.161
+10
+6.6859
+data/psi.txt
+266.535
+177.085
+10
+6.6839
+data/psi.txt
+250.782
+198.767
+10
+6.6819
+data/psi.txt
+233.27
+219.055
+10
+6.6799
+data/psi.txt
+214.122
+237.806
+10
+6.6779
+data/psi.txt
+193.472
+254.89
+10
+6.6759
+data/psi.txt
+171.465
+270.185
+10
+6.6739
+data/psi.txt
+148.255
+283.585
+10
+6.6719
+data/psi.txt
+124.005
+294.996
+10
+6.6699
+data/psi.txt
+98.8854
+304.338
+10
+6.6679
+data/psi.txt
+73.0723
+311.545
+10
+6.6659
+data/psi.txt
+46.7466
+316.567
+10
+6.6639
+data/psi.txt
+20.093
+319.369
+10
+6.6619
+data/psi.txt
+-6.70157
+319.93
+10
+6.6599
+data/psi.txt
+-33.4491
+318.247
+10
+6.6579
+data/psi.txt
+-59.962
+314.332
+10
+6.6559
+data/psi.txt
+-86.0543
+308.212
+10
+6.6539
+data/psi.txt
+-111.543
+299.93
+10
+6.6519
+data/psi.txt
+-136.249
+289.545
+10
+6.6499
+data/psi.txt
+-160
+277.128
+10
+6.6479
+data/psi.txt
+-182.628
+262.768
+10
+6.6459
+data/psi.txt
+-203.976
+246.564
+10
+6.6439
+data/psi.txt
+-223.892
+228.631
+10
+6.6419
+data/psi.txt
+-242.238
+209.095
+10
+6.6399
+data/psi.txt
+-258.885
+188.091
+10
+6.6379
+data/psi.txt
+-273.717
+165.769
+10
+6.6359
+data/psi.txt
+-286.628
+142.283
+10
+6.6339
+data/psi.txt
+-297.528
+117.8
+10
+6.6319
+data/psi.txt
+-306.342
+92.4902
+10
+6.6299
+data/psi.txt
+-313.007
+66.5317
+10
+6.6279
+data/psi.txt
+-317.477
+40.1066
+10
+6.6259
+data/psi.txt
+-319.719
+13.4002
+10
+6.6239
+data/psi.txt
+-319.719
+-13.4002
+10
+6.6219
+data/psi.txt
+-317.477
+-40.1066
+10
+6.6199
+data/psi.txt
+-313.007
+-66.5317
+10
+6.6179
+data/psi.txt
+-306.342
+-92.4902
+10
+6.6159
+data/psi.txt
+-297.528
+-117.8
+10
+6.6139
+data/psi.txt
+-286.628
+-142.283
+10
+6.6119
+data/psi.txt
+-273.717
+-165.769
+10
+6.6099
+data/psi.txt
+-258.885
+-188.091
+10
+6.6079
+data/psi.txt
+-242.238
+-209.095
+10
+6.6059
+data/psi.txt
+-223.892
+-228.631
+10
+6.6039
+data/psi.txt
+-203.976
+-246.564
+10
+6.6019
+data/psi.txt
+-182.628
+-262.768
+10
+6.5999
+data/psi.txt
+-160
+-277.128
+10
+6.5979
+data/psi.txt
+-136.249
+-289.545
+10
+6.5959
+data/psi.txt
+-111.543
+-299.93
+10
+6.5939
+data/psi.txt
+-86.0543
+-308.212
+10
+6.5919
+data/psi.txt
+-59.962
+-314.332
+10
+6.5899
+data/psi.txt
+-33.4491
+-318.247
+10
+6.5879
+data/psi.txt
+-6.70157
+-319.93
+10
+6.5859
+data/psi.txt
+20.093
+-319.369
+10
+6.5839
+data/psi.txt
+46.7466
+-316.567
+10
+6.5819
+data/psi.txt
+73.0723
+-311.545
+10
+6.5799
+data/psi.txt
+98.8854
+-304.338
+10
+6.5779
+data/psi.txt
+124.005
+-294.996
+10
+6.5759
+data/psi.txt
+148.255
+-283.585
+10
+6.5739
+data/psi.txt
+171.465
+-270.185
+10
+6.5719
+data/psi.txt
+193.472
+-254.89
+10
+6.5699
+data/psi.txt
+214.122
+-237.806
+10
+6.5679
+data/psi.txt
+233.27
+-219.055
+10
+6.5659
+data/psi.txt
+250.782
+-198.767
+10
+6.5639
+data/psi.txt
+266.535
+-177.085
+10
+6.5619
+data/psi.txt
+280.418
+-154.161
+10
+6.5599
+data/psi.txt
+292.335
+-130.156
+10
+6.5579
+data/psi.txt
+302.2
+-105.237
+10
+6.5559
+data/psi.txt
+309.947
+-79.5808
+10
+6.5539
+data/psi.txt
+315.519
+-53.366
+10
+6.5519
+data/psi.txt
+318.878
+-26.7769
+10
+6.5499
+data/psi.txt
+320
+-2.35132e-13
+10
+6.5479
+data/psi.txt
+318.878
+26.7769
+10
+6.5459
+data/psi.txt
+315.519
+53.366
+10
+6.5439
+data/psi.txt
+309.947
+79.5808
+10
+6.5419
+data/psi.txt
+302.2
+105.237
+10
+6.5399
+data/psi.txt
+292.335
+130.156
+10
+6.5379
+data/psi.txt
+280.418
+154.161
+10
+6.5359
+data/psi.txt
+266.535
+177.085
+10
+6.5339
+data/psi.txt
+250.782
+198.767
+10
+6.5319
+data/psi.txt
+233.27
+219.055
+10
+6.5299
+data/psi.txt
+214.122
+237.806
+10
+6.5279
+data/psi.txt
+193.472
+254.89
+10
+6.5259
+data/psi.txt
+171.465
+270.185
+10
+6.5239
+data/psi.txt
+148.255
+283.585
+10
+6.5219
+data/psi.txt
+124.005
+294.996
+10
+6.5199
+data/psi.txt
+98.8854
+304.338
+10
+6.5179
+data/psi.txt
+73.0723
+311.545
+10
+6.5159
+data/psi.txt
+46.7466
+316.567
+10
+6.5139
+data/psi.txt
+20.093
+319.369
+10
+6.5119
+data/psi.txt
+-6.70157
+319.93
+10
+6.5099
+data/psi.txt
+-33.4491
+318.247
+10
+6.5079
+data/psi.txt
+-59.962
+314.332
+10
+6.5059
+data/psi.txt
+-86.0543
+308.212
+10
+6.5039
+data/psi.txt
+-111.543
+299.93
+10
+6.5019
+data/psi.txt
+-136.249
+289.545
+10
+6.4999
+data/psi.txt
+-160
+277.128
+10
+6.4979
+data/psi.txt
+-182.628
+262.768
+10
+6.4959
+data/psi.txt
+-203.976
+246.564
+10
+6.4939
+data/psi.txt
+-223.892
+228.631
+10
+6.4919
+data/psi.txt
+-242.238
+209.095
+10
+6.4899
+data/psi.txt
+-258.885
+188.091
+10
+6.4879
+data/psi.txt
+-273.717
+165.769
+10
+6.4859
+data/psi.txt
+-286.628
+142.283
+10
+6.4839
+data/psi.txt
+-297.528
+117.8
+10
+6.4819
+data/psi.txt
+-306.342
+92.4902
+10
+6.4799
+data/psi.txt
+-313.007
+66.5317
+10
+6.4779
+data/psi.txt
+-317.477
+40.1066
+10
+6.4759
+data/psi.txt
+-319.719
+13.4002
+10
+6.4739
+data/psi.txt
+-319.719
+-13.4002
+10
+6.4719
+data/psi.txt
+-317.477
+-40.1066
+10
+6.4699
+data/psi.txt
+-313.007
+-66.5317
+10
+6.4679
+data/psi.txt
+-306.342
+-92.4902
+10
+6.4659
+data/psi.txt
+-297.528
+-117.8
+10
+6.4639
+data/psi.txt
+-286.628
+-142.283
+10
+6.4619
+data/psi.txt
+-273.717
+-165.769
+10
+6.4599
+data/psi.txt
+-258.885
+-188.091
+10
+6.4579
+data/psi.txt
+-242.238
+-209.095
+10
+6.4559
+data/psi.txt
+-223.892
+-228.631
+10
+6.4539
+data/psi.txt
+-203.976
+-246.564
+10
+6.4519
+data/psi.txt
+-182.628
+-262.768
+10
+6.4499
+data/psi.txt
+-160
+-277.128
+10
+6.4479
+data/psi.txt
+-136.249
+-289.545
+10
+6.4459
+data/psi.txt
+-111.543
+-299.93
+10
+6.4439
+data/psi.txt
+-86.0543
+-308.212
+10
+6.4419
+data/psi.txt
+-59.962
+-314.332
+10
+6.4399
+data/psi.txt
+-33.4491
+-318.247
+10
+6.4379
+data/psi.txt
+-6.70157
+-319.93
+10
+6.4359
+data/psi.txt
+20.093
+-319.369
+10
+6.4339
+data/psi.txt
+46.7466
+-316.567
+10
+6.4319
+data/psi.txt
+73.0723
+-311.545
+10
+6.4299
+data/psi.txt
+98.8854
+-304.338
+10
+6.4279
+data/psi.txt
+124.005
+-294.996
+10
+6.4259
+data/psi.txt
+148.255
+-283.585
+10
+6.4239
+data/psi.txt
+171.465
+-270.185
+10
+6.4219
+data/psi.txt
+193.472
+-254.89
+10
+6.4199
+data/psi.txt
+214.122
+-237.806
+10
+6.4179
+data/psi.txt
+233.27
+-219.055
+10
+6.4159
+data/psi.txt
+250.782
+-198.767
+10
+6.4139
+data/psi.txt
+266.535
+-177.085
+10
+6.4119
+data/psi.txt
+280.418
+-154.161
+10
+6.4099
+data/psi.txt
+292.335
+-130.156
+10
+6.4079
+data/psi.txt
+302.2
+-105.237
+10
+6.4059
+data/psi.txt
+309.947
+-79.5808
+10
+6.4039
+data/psi.txt
+315.519
+-53.366
+10
+6.4019
+data/psi.txt
+318.878
+-26.7769
\ No newline at end of file
diff --git a/data/projectile_template.txt~ b/data/projectile_template.txt~
new file mode 100644
index 0000000..e660251
--- /dev/null
+++ b/data/projectile_template.txt~
@@ -0,0 +1,4 @@
+data/images/psi.bmp
+1.5
+10000
+2.2
diff --git a/data/projectiles/beam.txt b/data/projectiles/beam.txt
new file mode 100644
index 0000000..35b6c18
--- /dev/null
+++ b/data/projectiles/beam.txt
@@ -0,0 +1,5 @@
+data/images/spit.bmp
+data/sounds/piu
+0.3
+10
+1
diff --git a/data/projectiles/bigspit.txt b/data/projectiles/bigspit.txt
new file mode 100644
index 0000000..3da95e6
--- /dev/null
+++ b/data/projectiles/bigspit.txt
@@ -0,0 +1,5 @@
+data/images/bigspit.bmp
+data/sounds/bigspit
+8
+0
+4
diff --git a/data/projectiles/fire1.txt b/data/projectiles/fire1.txt
new file mode 100644
index 0000000..316f367
--- /dev/null
+++ b/data/projectiles/fire1.txt
@@ -0,0 +1,5 @@
+data/images/fire1.bmp
+data/sounds/fire
+2
+10
+3.5
diff --git a/data/projectiles/projectile_template.txt b/data/projectiles/projectile_template.txt
new file mode 100644
index 0000000..66bd2de
--- /dev/null
+++ b/data/projectiles/projectile_template.txt
@@ -0,0 +1,5 @@
+data/projectile2.bmp    #path of the imagefile
+data/sounds/spit                #path of the soundfile without n.wav for int n
+10                                              #damage
+2                                               #armorPiercing
+1.4142                                  #collisionSize
diff --git a/data/projectiles/projectile_template.txt~ b/data/projectiles/projectile_template.txt~
new file mode 100644
index 0000000..9ae6fa9
--- /dev/null
+++ b/data/projectiles/projectile_template.txt~
@@ -0,0 +1,4 @@
+data/projectile2.bmp    #path of the imagefile
+10                                              #damage
+2                                               #armorPiercing
+1.4142                                  #collisionSize
diff --git a/data/projectiles/psi.txt b/data/projectiles/psi.txt
new file mode 100644
index 0000000..ed05829
--- /dev/null
+++ b/data/projectiles/psi.txt
@@ -0,0 +1,5 @@
+data/images/psi.bmp
+data/sounds/piu
+1.5
+10000
+2.2
diff --git a/data/projectiles/psi.txt~ b/data/projectiles/psi.txt~
new file mode 100644
index 0000000..ed05829
--- /dev/null
+++ b/data/projectiles/psi.txt~
@@ -0,0 +1,5 @@
+data/images/psi.bmp
+data/sounds/piu
+1.5
+10000
+2.2
diff --git a/data/projectiles/spit.txt b/data/projectiles/spit.txt
new file mode 100644
index 0000000..90d0147
--- /dev/null
+++ b/data/projectiles/spit.txt
@@ -0,0 +1,5 @@
+data/images/spit.bmp
+data/sounds/spit
+1
+0
+1.4142
diff --git a/data/psi.txt~ b/data/psi.txt~
new file mode 100644
index 0000000..d2a5be5
--- /dev/null
+++ b/data/psi.txt~
@@ -0,0 +1,4 @@
+data/images/psi.bmp
+1
+10000
+2.2
diff --git a/data/ships/EnemyShip_template.txt b/data/ships/EnemyShip_template.txt
new file mode 100644
index 0000000..2fdb348
--- /dev/null
+++ b/data/ships/EnemyShip_template.txt
@@ -0,0 +1,12 @@
+Tork Spacerocket                                        #name
+data/images/tork_spacerocket.bmp        #path of imagefile
+7                                                                       #maxhp
+5                                                                       #armor
+50                                                                      #moveSpeed
+4                                                                       #collisionSize
+3                                                                       #Gold
+3                                                                       #exp
+3                                                                       #score
+1                                                                       #number of weapons
+0 -1                                                            #relative Position of weapon
+data/fireball.txt                                       #path of weapon
diff --git a/data/ships/tork/capsule.txt b/data/ships/tork/capsule.txt
new file mode 100644
index 0000000..ae60c7f
--- /dev/null
+++ b/data/ships/tork/capsule.txt
@@ -0,0 +1,10 @@
+Tork Capsule
+data/images/ship1.bmp
+0.6
+10
+140
+5.5
+0
+0
+0
+0
diff --git a/data/ships/tork/capsule.txt~ b/data/ships/tork/capsule.txt~
new file mode 100644
index 0000000..eeb2813
--- /dev/null
+++ b/data/ships/tork/capsule.txt~
@@ -0,0 +1,10 @@
+Tork Capsule
+data/images/ship1.bmp
+0.6
+10
+140
+5.5
+1
+1
+1
+0
diff --git a/data/ships/tork/cruiser.txt b/data/ships/tork/cruiser.txt
new file mode 100644
index 0000000..11772da
--- /dev/null
+++ b/data/ships/tork/cruiser.txt
@@ -0,0 +1,14 @@
+Tork Cruiser
+data/images/tork_cruiser.bmp
+9
+25
+30
+11.5
+0
+0
+0
+2
+0 3
+data/weapons/spitter1.txt
+0 0
+data/weapons/novaspitter1.txt
diff --git a/data/ships/tork/cruiser.txt~ b/data/ships/tork/cruiser.txt~
new file mode 100644
index 0000000..15e8459
--- /dev/null
+++ b/data/ships/tork/cruiser.txt~
@@ -0,0 +1,14 @@
+Tork Cruiser
+data/images/tork_cruiser.bmp
+9
+25
+30
+11.5
+9
+20
+14
+2
+0 3
+data/weapons/spitter1.txt
+0 0
+data/weapons/novaspitter1.txt
diff --git a/data/ships/tork/interceptor.txt b/data/ships/tork/interceptor.txt
new file mode 100644
index 0000000..40e3651
--- /dev/null
+++ b/data/ships/tork/interceptor.txt
@@ -0,0 +1,16 @@
+Tork Interceptor
+data/images/tork_interceptor.bmp
+8
+15
+55
+9
+0
+0
+0
+3
+5 6
+data/weapons/fireball1.txt
+-5 6
+data/weapons/fireball1.txt
+0 2
+data/weapons/spitter2.txt
diff --git a/data/ships/tork/interceptor.txt~ b/data/ships/tork/interceptor.txt~
new file mode 100644
index 0000000..b28ea59
--- /dev/null
+++ b/data/ships/tork/interceptor.txt~
@@ -0,0 +1,16 @@
+Tork Interceptor
+data/images/tork_interceptor.bmp
+8
+15
+55
+9
+7
+15
+8
+3
+5 6
+data/weapons/fireball1.txt
+-5 6
+data/weapons/fireball1.txt
+0 2
+data/weapons/spitter2.txt
diff --git a/data/ships/tork/spacerocket.txt b/data/ships/tork/spacerocket.txt
new file mode 100644
index 0000000..6d0a929
--- /dev/null
+++ b/data/ships/tork/spacerocket.txt
@@ -0,0 +1,14 @@
+Tork Spacerocket
+data/images/ship2.bmp
+3
+10
+30
+8
+0
+0
+0
+2
+4 4
+data/weapons/fireball1.txt
+-4 4
+data/weapons/fireball1.txt
diff --git a/data/ships/tork/spacerocket.txt~ b/data/ships/tork/spacerocket.txt~
new file mode 100644
index 0000000..ba1d457
--- /dev/null
+++ b/data/ships/tork/spacerocket.txt~
@@ -0,0 +1,14 @@
+Tork Spacerocket
+data/images/ship2.bmp
+3
+10
+30
+8
+3
+4
+3
+2
+4 4
+data/weapons/fireball1.txt
+-4 4
+data/weapons/fireball1.txt
diff --git a/data/ships/tork/sting.txt b/data/ships/tork/sting.txt
new file mode 100644
index 0000000..4cd73b1
--- /dev/null
+++ b/data/ships/tork/sting.txt
@@ -0,0 +1,12 @@
+Tork Sting
+data/images/tork_sting.bmp
+4
+8
+65
+9
+0
+0
+0
+1
+0 0
+data/weapons/fireball1.txt
diff --git a/data/ships/tork/sting.txt~ b/data/ships/tork/sting.txt~
new file mode 100644
index 0000000..b17b4a6
--- /dev/null
+++ b/data/ships/tork/sting.txt~
@@ -0,0 +1,12 @@
+Tork Sting
+data/images/tork_sting.bmp
+4
+8
+65
+9
+4
+4
+5
+1
+0 0
+data/weapons/fireball1.txt
diff --git a/data/ships/tork/stinger.txt~ b/data/ships/tork/stinger.txt~
new file mode 100644
index 0000000..ee04032
--- /dev/null
+++ b/data/ships/tork/stinger.txt~
@@ -0,0 +1,12 @@
+Tork Stinger
+data/images/tork_stinger.bmp
+4
+8
+65
+9
+4
+4
+4
+1
+0 0
+data/weapons/fireball1.txt
diff --git a/data/ships/tork/tanker.txt b/data/ships/tork/tanker.txt
new file mode 100644
index 0000000..04fd19a
--- /dev/null
+++ b/data/ships/tork/tanker.txt
@@ -0,0 +1,10 @@
+Tork Tanker
+data/images/tork_tanker.bmp
+10
+40
+15
+11
+0
+0
+0
+0
diff --git a/data/ships/tork/tanker.txt~ b/data/ships/tork/tanker.txt~
new file mode 100644
index 0000000..e7d8cba
--- /dev/null
+++ b/data/ships/tork/tanker.txt~
@@ -0,0 +1,10 @@
+Tork Tanker
+data/images/tork_tanker.bmp
+10
+40
+15
+11
+30
+6
+15
+0
diff --git a/data/ships/tork/tork_interceptor.txt~ b/data/ships/tork/tork_interceptor.txt~
new file mode 100644
index 0000000..129b903
--- /dev/null
+++ b/data/ships/tork/tork_interceptor.txt~
@@ -0,0 +1,16 @@
+Tork Interceptor
+data/images/tork_interceptor.bmp
+8
+15
+55
+7
+12
+6
+6
+3
+5 6
+data/fireball1.txt
+-5 6
+data/fireball1.txt
+0 2
+data/spitter2.txt
diff --git a/data/ships/tork/tork_spacerocket.txt~ b/data/ships/tork/tork_spacerocket.txt~
new file mode 100644
index 0000000..22bcada
--- /dev/null
+++ b/data/ships/tork/tork_spacerocket.txt~
@@ -0,0 +1,14 @@
+Tork Spacerocket
+data/images/ship2.bmp
+3
+10
+30
+8
+5
+2
+3
+2
+4 4
+data/fireball1.txt
+-4 4
+data/fireball1.txt
diff --git a/data/ships/user/UserShip_template.txt b/data/ships/user/UserShip_template.txt
new file mode 100644
index 0000000..ed29661
--- /dev/null
+++ b/data/ships/user/UserShip_template.txt
@@ -0,0 +1,17 @@
+small Fighter                                   #name
+data/images/small_fighter.bmp   #path of imagefile
+300                                                             #cost
+10                                                              #maxhp
+50                                                              #armor
+200                                                             #moveSpeed
+200                                                             #handling
+10                                                              #maxEnergy
+2                                                               #energyProduction
+5                                                               #collisionSize
+2                                                               #number of weapons
+4 4                                                             #relative Position of weapon
+3                                                               #maxSize of attached weapon
+data/fireball.txt                               #path of weapon
+4 4                                                             #relative Position of weapon
+3                                                               #maxSize of attached weapon
+data/fireball.txt                               #path of weapon
diff --git a/data/ships/user/UserShip_template.txt~ b/data/ships/user/UserShip_template.txt~
new file mode 100644
index 0000000..8512129
--- /dev/null
+++ b/data/ships/user/UserShip_template.txt~
@@ -0,0 +1,16 @@
+small Fighter                                   #name
+data/images/small_fighter.bmp   #path of imagefile
+10                                                              #maxhp
+50                                                              #armor
+200                                                             #moveSpeed
+200                                                             #handling
+10                                                              #maxEnergy
+2                                                               #energyProduction
+5                                                               #collisionSize
+2                                                               #number of weapons
+4 4                                                             #relative Position of weapon
+3                                                               #maxSize of attached weapon
+data/fireball.txt                               #path of weapon
+4 4                                                             #relative Position of weapon
+3                                                               #maxSize of attached weapon
+data/fireball.txt                               #path of weapon
diff --git a/data/ships/user/hornet.txt b/data/ships/user/hornet.txt
new file mode 100644
index 0000000..d33c78c
--- /dev/null
+++ b/data/ships/user/hornet.txt
@@ -0,0 +1,20 @@
+Hornet
+data/images/hornet.bmp
+750
+23
+25
+270
+250
+40
+4.5
+6
+3
+6 -6
+3
+data/weapons/empty.txt
+-6 -6
+3
+data/weapons/empty.txt
+0 -3
+3
+data/weapons/empty.txt
diff --git a/data/ships/user/hornet.txt~ b/data/ships/user/hornet.txt~
new file mode 100644
index 0000000..c427bb2
--- /dev/null
+++ b/data/ships/user/hornet.txt~
@@ -0,0 +1,20 @@
+Hornet
+data/images/hornet.bmp
+0
+23
+25
+270
+250
+40
+4.5
+6
+3
+6 -6
+3
+data/weapons/empty.txt
+-6 -6
+3
+data/weapons/empty.txt
+0 -3
+3
+data/weapons/empty.txt
diff --git a/data/ships/user/small_fighter.txt b/data/ships/user/small_fighter.txt
new file mode 100644
index 0000000..0501c22
--- /dev/null
+++ b/data/ships/user/small_fighter.txt
@@ -0,0 +1,17 @@
+Small Fighter
+data/images/small_fighter.bmp
+0
+15
+10
+190
+300
+10
+3
+5
+2
+4 -2
+3
+data/weapons/beamer2.txt
+-4 -2
+3
+data/weapons/empty.txt
diff --git a/data/ships/user/small_fighter.txt~ b/data/ships/user/small_fighter.txt~
new file mode 100644
index 0000000..0501c22
--- /dev/null
+++ b/data/ships/user/small_fighter.txt~
@@ -0,0 +1,17 @@
+Small Fighter
+data/images/small_fighter.bmp
+0
+15
+10
+190
+300
+10
+3
+5
+2
+4 -2
+3
+data/weapons/beamer2.txt
+-4 -2
+3
+data/weapons/empty.txt
diff --git a/data/ships/user/userships.txt b/data/ships/user/userships.txt
new file mode 100644
index 0000000..d3e1633
--- /dev/null
+++ b/data/ships/user/userships.txt
@@ -0,0 +1,2 @@
+small_fighter.txt
+hornet.txt
diff --git a/data/ships/user/userships.txt~ b/data/ships/user/userships.txt~
new file mode 100644
index 0000000..d44c218
--- /dev/null
+++ b/data/ships/user/userships.txt~
@@ -0,0 +1 @@
+small_fighter.txt
diff --git a/data/small_fighter.txt~ b/data/small_fighter.txt~
new file mode 100644
index 0000000..f464e1a
--- /dev/null
+++ b/data/small_fighter.txt~
@@ -0,0 +1,14 @@
+Small Fighter
+data/images/small_fighter.bmp
+10
+50
+200
+200
+10
+2
+5
+2
+4 -2
+data/spitter1.txt
+-4 -2
+data/spitter1.txt
diff --git a/data/sounds/bigspit1.wav b/data/sounds/bigspit1.wav
new file mode 100644
index 0000000..907004e
--- /dev/null
+++ b/data/sounds/bigspit1.wav
diff --git a/data/sounds/fire1.wav b/data/sounds/fire1.wav
new file mode 100644
index 0000000..c3df1c9
--- /dev/null
+++ b/data/sounds/fire1.wav
diff --git a/data/sounds/piu1.wav b/data/sounds/piu1.wav
new file mode 100644
index 0000000..2414058
--- /dev/null
+++ b/data/sounds/piu1.wav
diff --git a/data/sounds/piu2.wav b/data/sounds/piu2.wav
new file mode 100644
index 0000000..f225096
--- /dev/null
+++ b/data/sounds/piu2.wav
diff --git a/data/sounds/piu3.wav b/data/sounds/piu3.wav
new file mode 100644
index 0000000..6608e6a
--- /dev/null
+++ b/data/sounds/piu3.wav
diff --git a/data/sounds/piu4.wav b/data/sounds/piu4.wav
new file mode 100644
index 0000000..f4649bc
--- /dev/null
+++ b/data/sounds/piu4.wav
diff --git a/data/sounds/spit1.wav b/data/sounds/spit1.wav
new file mode 100644
index 0000000..242fca6
--- /dev/null
+++ b/data/sounds/spit1.wav
diff --git a/data/sounds/spit2.wav b/data/sounds/spit2.wav
new file mode 100644
index 0000000..8efc70a
--- /dev/null
+++ b/data/sounds/spit2.wav
diff --git a/data/sounds/spit3.wav b/data/sounds/spit3.wav
new file mode 100644
index 0000000..a7f3733
--- /dev/null
+++ b/data/sounds/spit3.wav
diff --git a/data/sounds/spit4.wav b/data/sounds/spit4.wav
new file mode 100644
index 0000000..d9df0f0
--- /dev/null
+++ b/data/sounds/spit4.wav
diff --git a/data/spit.txt~ b/data/spit.txt~
new file mode 100644
index 0000000..cf073dc
--- /dev/null
+++ b/data/spit.txt~
@@ -0,0 +1,4 @@
+data/images/spit.bmp
+1
+0
+1.4142
diff --git a/data/spitter1.txt~ b/data/spitter1.txt~
new file mode 100644
index 0000000..9715239
--- /dev/null
+++ b/data/spitter1.txt~
@@ -0,0 +1,9 @@
+Spitter 1
+data/images/spitter1.bmp
+2
+1
+0.6
+0.5
+data/spit.txt
+0
+250
diff --git a/data/spitter2.txt~ b/data/spitter2.txt~
new file mode 100644
index 0000000..777b944
--- /dev/null
+++ b/data/spitter2.txt~
@@ -0,0 +1,19 @@
+Spitter 2
+data/images/spitter2.bmp
+7
+3
+0.6
+0
+data/spit.txt
+0
+250
+0.6
+0.2
+data/spit.txt
+40
+240
+0.6
+0.4
+data/spit.txt
+-40
+240
diff --git a/data/spitter3.txt~ b/data/spitter3.txt~
new file mode 100644
index 0000000..06a1d35
--- /dev/null
+++ b/data/spitter3.txt~
@@ -0,0 +1,39 @@
+Spitter 3
+data/images/spitter3.bmp
+15
+7
+2
+0
+data/bigspit.txt
+0
+250
+0.8
+0
+data/spit.txt
+10
+247
+0.8
+0
+data/spit.txt
+-10
+247
+0.8
+0.16
+data/spit.txt
+176.78
+176.78
+0.8
+0.32
+data/spit.txt
+-176.78
+176.78
+0.8
+0.48
+data/spit.txt
+176.78
+-176.78
+0.8
+0.64
+data/spit.txt
+-176.78
+-176.78
diff --git a/data/tork_capsule.txt~ b/data/tork_capsule.txt~
new file mode 100644
index 0000000..467320d
--- /dev/null
+++ b/data/tork_capsule.txt~
@@ -0,0 +1,10 @@
+Tork Capsule
+data/images/ship1.bmp
+2
+5
+40
+6
+1
+1
+1
+0
diff --git a/data/tork_interceptor.txt~ b/data/tork_interceptor.txt~
new file mode 100644
index 0000000..129b903
--- /dev/null
+++ b/data/tork_interceptor.txt~
@@ -0,0 +1,16 @@
+Tork Interceptor
+data/images/tork_interceptor.bmp
+8
+15
+55
+7
+12
+6
+6
+3
+5 6
+data/fireball1.txt
+-5 6
+data/fireball1.txt
+0 2
+data/spitter2.txt
diff --git a/data/tork_spacerocket.txt~ b/data/tork_spacerocket.txt~
new file mode 100644
index 0000000..c4840ce
--- /dev/null
+++ b/data/tork_spacerocket.txt~
@@ -0,0 +1,14 @@
+Tork Spacerocket
+data/images/ship2.bmp
+5
+10
+30
+8
+5
+2
+3
+2
+4 4
+data/fireball1.txt
+-4 4
+data/fireball1.txt
diff --git a/data/weapon_template.txt~ b/data/weapon_template.txt~
new file mode 100644
index 0000000..cf073dc
--- /dev/null
+++ b/data/weapon_template.txt~
@@ -0,0 +1,4 @@
+data/images/spit.bmp
+1
+0
+1.4142
diff --git a/data/weapons.txt~ b/data/weapons.txt~
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/weapons.txt~
diff --git a/data/weapons/beamer1.txt b/data/weapons/beamer1.txt
new file mode 100644
index 0000000..0538fbc
--- /dev/null
+++ b/data/weapons/beamer1.txt
@@ -0,0 +1,11 @@
+Beamer 1
+data/images/beamer1.bmp
+4
+1
+0
+1
+0.08
+0
+data/projectiles/beam.txt
+0
+1000
diff --git a/data/weapons/beamer1.txt~ b/data/weapons/beamer1.txt~
new file mode 100644
index 0000000..1f031fd
--- /dev/null
+++ b/data/weapons/beamer1.txt~
@@ -0,0 +1,11 @@
+Beamer 1
+data/images/beamer1.bmp
+4
+1
+12
+1
+0.08
+0
+data/projectiles/beam.txt
+0
+1000
diff --git a/data/weapons/beamer2.txt b/data/weapons/beamer2.txt
new file mode 100644
index 0000000..a28d8d6
--- /dev/null
+++ b/data/weapons/beamer2.txt
@@ -0,0 +1,21 @@
+Beamer 2
+data/images/beamer1.bmp
+6
+1
+0
+3
+0.15
+0
+data/projectiles/beam.txt
+0
+1000
+0.2
+0.02
+data/projectiles/beam.txt
+-50
+990
+0.2
+0.04
+data/projectiles/beam.txt
+50
+990
diff --git a/data/weapons/beamer2.txt~ b/data/weapons/beamer2.txt~
new file mode 100644
index 0000000..1b5ae42
--- /dev/null
+++ b/data/weapons/beamer2.txt~
@@ -0,0 +1,21 @@
+Beamer 2
+data/images/beamer1.bmp
+6
+1
+35
+3
+0.15
+0
+data/projectiles/beam.txt
+0
+1000
+0.2
+0.02
+data/projectiles/beam.txt
+-50
+990
+0.2
+0.04
+data/projectiles/beam.txt
+50
+990
diff --git a/data/weapons/creat b/data/weapons/creat
new file mode 100644
index 0000000..558da6c
--- /dev/null
+++ b/data/weapons/creat
diff --git a/data/weapons/creator.cpp b/data/weapons/creator.cpp
new file mode 100644
index 0000000..c5393eb
--- /dev/null
+++ b/data/weapons/creator.cpp
@@ -0,0 +1,34 @@
+#include <iostream>
+#include <fstream>
+#include <math.h>
+
+using namespace std;
+
+int main()
+{
+        ofstream o;
+        o.open("novaspitter1.txt");
+        o << "Novaspitter 1\n";
+        o << "data/images/empty.bmp\n";
+        o << 8 << '\n';
+        o << 1 << '\n';
+        o << 30 << '\n';
+        int shots = 6;
+        double T = 0.8;
+        double duration = 0.0;
+        double start = 0.7;
+        double speed = 250;
+        int Ncircles = 1;
+        o << shots << endl;
+        for(int i = 0; i < shots; ++i)
+        {
+                o << T << '\n';
+                o << T - start - ((double) i)/((double) shots)*duration-0.0001 << '\n';
+                o << "data/projectiles/spit.txt\n";
+                o << cos(Ncircles*2*M_PI*i/((double) shots))*speed << '\n';
+                o << sin(Ncircles*2*M_PI*i/((double) shots))*speed;
+                if(i != shots-1)
+                        o << endl;
+        }
+        o.close();
+}
diff --git a/data/weapons/creator.cpp~ b/data/weapons/creator.cpp~
new file mode 100644
index 0000000..796d095
--- /dev/null
+++ b/data/weapons/creator.cpp~
@@ -0,0 +1,34 @@
+#include <iostream>
+#include <fstream>
+#include <math.h>
+
+using namespace std;
+
+int main()
+{
+        ofstream o;
+        o.open("novaspitter1.txt");
+        o << "Novaspitter 1\n";
+        o << "data/images/empty.bmp\n";
+        o << 8 << '\n';
+        o << 1 << '\n';
+        o << 30 << '\n';
+        int shots = 6;
+        double T = 0.8;
+        double duration = 0.0;
+        double start = 0.7;
+        double speed = 250;
+        int Ncircles = 1;
+        o << shots << endl;
+        for(int i = 0; i < shots; ++i)
+        {
+                o << T << '\n';
+                o << T - start - ((double) i)/((double) shots)*duration-0.0001 << '\n';
+                o << "data/projectiles/psi.txt\n";
+                o << cos(Ncircles*2*M_PI*i/((double) shots))*speed << '\n';
+                o << sin(Ncircles*2*M_PI*i/((double) shots))*speed;
+                if(i != shots-1)
+                        o << endl;
+        }
+        o.close();
+}
diff --git a/data/weapons/empty.txt b/data/weapons/empty.txt
new file mode 100644
index 0000000..6536e97
--- /dev/null
+++ b/data/weapons/empty.txt
@@ -0,0 +1,6 @@
+empty Slot
+data/images/empty.bmp
+0
+0
+0
+0
diff --git a/data/weapons/empty.txt~ b/data/weapons/empty.txt~
new file mode 100644
index 0000000..7b5e1a8
--- /dev/null
+++ b/data/weapons/empty.txt~
@@ -0,0 +1,11 @@
+empty Slot
+data/images/empty.bmp
+2
+1
+5
+1
+0.6
+0.55
+data/projectiles/spit.txt
+0
+250
diff --git a/data/weapons/fireball1.txt b/data/weapons/fireball1.txt
new file mode 100644
index 0000000..78d6f41
--- /dev/null
+++ b/data/weapons/fireball1.txt
@@ -0,0 +1,11 @@
+Fireball 1
+data/images/fire1.bmp
+1
+1
+0
+1
+1.4
+0.6
+data/projectiles/fire1.txt
+0
+135
diff --git a/data/weapons/fireball1.txt~ b/data/weapons/fireball1.txt~
new file mode 100644
index 0000000..56eb516
--- /dev/null
+++ b/data/weapons/fireball1.txt~
@@ -0,0 +1,11 @@
+Fireball 1
+data/images/fire1.bmp
+1
+1
+5
+1
+1.4
+0.6
+data/projectiles/fire1.txt
+0
+135
diff --git a/data/weapons/inawaffe.txt b/data/weapons/inawaffe.txt
new file mode 100644
index 0000000..46c65ab
--- /dev/null
+++ b/data/weapons/inawaffe.txt
@@ -0,0 +1,31 @@
+Ina's OP-Waffe
+data/images/beamer1.bmp
+1.25
+1
+0
+5
+0.3
+0
+data/projectiles/beam.txt
+0
+700
+0.3
+0.06
+data/projectiles/beam.txt
+200
+600
+0.3
+0.12
+data/projectiles/beam.txt
+-200
+600
+0.3
+0.18
+data/projectiles/beam.txt
+50
+675
+0.3
+0.24
+data/projectiles/beam.txt
+-50
+675
diff --git a/data/weapons/inawaffe.txt~ b/data/weapons/inawaffe.txt~
new file mode 100644
index 0000000..ae3eef7
--- /dev/null
+++ b/data/weapons/inawaffe.txt~
@@ -0,0 +1,31 @@
+Ina's OP-Waffe
+data/images/beamer1.bmp
+1.25
+1
+100
+5
+0.3
+0
+data/projectiles/beam.txt
+0
+700
+0.3
+0.06
+data/projectiles/beam.txt
+200
+600
+0.3
+0.12
+data/projectiles/beam.txt
+-200
+600
+0.3
+0.18
+data/projectiles/beam.txt
+50
+675
+0.3
+0.24
+data/projectiles/beam.txt
+-50
+675
diff --git a/data/weapons/nova1.txt b/data/weapons/nova1.txt
new file mode 100644
index 0000000..4dc8898
--- /dev/null
+++ b/data/weapons/nova1.txt
@@ -0,0 +1,1506 @@
+Nova 1
+data/images/empty.bmp
+25
+1
+0
+300
+10
+6.9999
+data/projectiles/psi.txt
+320
+0
+10
+6.9979
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.9959
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.9939
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.9919
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.9899
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.9879
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.9859
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.9839
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.9819
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.9799
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.9779
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.9759
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.9739
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.9719
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.9699
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.9679
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.9659
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.9639
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.9619
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.9599
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.9579
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.9559
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.9539
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.9519
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.9499
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.9479
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.9459
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.9439
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.9419
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.9399
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.9379
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.9359
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.9339
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.9319
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.9299
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.9279
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.9259
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.9239
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.9219
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.9199
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.9179
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.9159
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.9139
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.9119
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.9099
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.9079
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.9059
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.9039
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.9019
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.8999
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.8979
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.8959
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.8939
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.8919
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.8899
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.8879
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.8859
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.8839
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.8819
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.8799
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.8779
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.8759
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.8739
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.8719
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.8699
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.8679
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.8659
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.8639
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.8619
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.8599
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.8579
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.8559
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.8539
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.8519
+data/projectiles/psi.txt
+318.878
+-26.7769
+10
+6.8499
+data/projectiles/psi.txt
+320
+-7.83774e-14
+10
+6.8479
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.8459
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.8439
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.8419
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.8399
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.8379
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.8359
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.8339
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.8319
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.8299
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.8279
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.8259
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.8239
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.8219
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.8199
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.8179
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.8159
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.8139
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.8119
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.8099
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.8079
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.8059
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.8039
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.8019
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.7999
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.7979
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.7959
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.7939
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.7919
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.7899
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.7879
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.7859
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.7839
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.7819
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.7799
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.7779
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.7759
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.7739
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.7719
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.7699
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.7679
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.7659
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.7639
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.7619
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.7599
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.7579
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.7559
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.7539
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.7519
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.7499
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.7479
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.7459
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.7439
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.7419
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.7399
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.7379
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.7359
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.7339
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.7319
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.7299
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.7279
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.7259
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.7239
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.7219
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.7199
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.7179
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.7159
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.7139
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.7119
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.7099
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.7079
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.7059
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.7039
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.7019
+data/projectiles/psi.txt
+318.878
+-26.7769
+10
+6.6999
+data/projectiles/psi.txt
+320
+-1.56755e-13
+10
+6.6979
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.6959
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.6939
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.6919
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.6899
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.6879
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.6859
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.6839
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.6819
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.6799
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.6779
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.6759
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.6739
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.6719
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.6699
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.6679
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.6659
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.6639
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.6619
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.6599
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.6579
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.6559
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.6539
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.6519
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.6499
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.6479
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.6459
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.6439
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.6419
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.6399
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.6379
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.6359
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.6339
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.6319
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.6299
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.6279
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.6259
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.6239
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.6219
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.6199
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.6179
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.6159
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.6139
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.6119
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.6099
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.6079
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.6059
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.6039
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.6019
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.5999
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.5979
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.5959
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.5939
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.5919
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.5899
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.5879
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.5859
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.5839
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.5819
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.5799
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.5779
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.5759
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.5739
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.5719
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.5699
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.5679
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.5659
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.5639
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.5619
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.5599
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.5579
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.5559
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.5539
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.5519
+data/projectiles/psi.txt
+318.878
+-26.7769
+10
+6.5499
+data/projectiles/psi.txt
+320
+-2.35132e-13
+10
+6.5479
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.5459
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.5439
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.5419
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.5399
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.5379
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.5359
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.5339
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.5319
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.5299
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.5279
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.5259
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.5239
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.5219
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.5199
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.5179
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.5159
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.5139
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.5119
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.5099
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.5079
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.5059
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.5039
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.5019
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.4999
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.4979
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.4959
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.4939
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.4919
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.4899
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.4879
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.4859
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.4839
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.4819
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.4799
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.4779
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.4759
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.4739
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.4719
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.4699
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.4679
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.4659
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.4639
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.4619
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.4599
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.4579
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.4559
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.4539
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.4519
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.4499
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.4479
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.4459
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.4439
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.4419
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.4399
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.4379
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.4359
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.4339
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.4319
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.4299
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.4279
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.4259
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.4239
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.4219
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.4199
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.4179
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.4159
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.4139
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.4119
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.4099
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.4079
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.4059
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.4039
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.4019
+data/projectiles/psi.txt
+318.878
+-26.7769
diff --git a/data/weapons/nova1.txt~ b/data/weapons/nova1.txt~
new file mode 100644
index 0000000..66fe28d
--- /dev/null
+++ b/data/weapons/nova1.txt~
@@ -0,0 +1,1506 @@
+Nova 1
+data/images/empty.bmp
+25
+0
+5000
+300
+10
+6.9999
+data/projectiles/psi.txt
+320
+0
+10
+6.9979
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.9959
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.9939
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.9919
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.9899
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.9879
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.9859
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.9839
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.9819
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.9799
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.9779
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.9759
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.9739
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.9719
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.9699
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.9679
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.9659
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.9639
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.9619
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.9599
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.9579
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.9559
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.9539
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.9519
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.9499
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.9479
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.9459
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.9439
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.9419
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.9399
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.9379
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.9359
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.9339
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.9319
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.9299
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.9279
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.9259
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.9239
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.9219
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.9199
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.9179
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.9159
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.9139
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.9119
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.9099
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.9079
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.9059
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.9039
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.9019
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.8999
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.8979
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.8959
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.8939
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.8919
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.8899
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.8879
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.8859
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.8839
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.8819
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.8799
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.8779
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.8759
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.8739
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.8719
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.8699
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.8679
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.8659
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.8639
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.8619
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.8599
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.8579
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.8559
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.8539
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.8519
+data/projectiles/psi.txt
+318.878
+-26.7769
+10
+6.8499
+data/projectiles/psi.txt
+320
+-7.83774e-14
+10
+6.8479
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.8459
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.8439
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.8419
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.8399
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.8379
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.8359
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.8339
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.8319
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.8299
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.8279
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.8259
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.8239
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.8219
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.8199
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.8179
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.8159
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.8139
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.8119
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.8099
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.8079
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.8059
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.8039
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.8019
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.7999
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.7979
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.7959
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.7939
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.7919
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.7899
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.7879
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.7859
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.7839
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.7819
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.7799
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.7779
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.7759
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.7739
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.7719
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.7699
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.7679
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.7659
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.7639
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.7619
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.7599
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.7579
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.7559
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.7539
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.7519
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.7499
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.7479
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.7459
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.7439
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.7419
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.7399
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.7379
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.7359
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.7339
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.7319
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.7299
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.7279
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.7259
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.7239
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.7219
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.7199
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.7179
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.7159
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.7139
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.7119
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.7099
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.7079
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.7059
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.7039
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.7019
+data/projectiles/psi.txt
+318.878
+-26.7769
+10
+6.6999
+data/projectiles/psi.txt
+320
+-1.56755e-13
+10
+6.6979
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.6959
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.6939
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.6919
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.6899
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.6879
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.6859
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.6839
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.6819
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.6799
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.6779
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.6759
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.6739
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.6719
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.6699
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.6679
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.6659
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.6639
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.6619
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.6599
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.6579
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.6559
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.6539
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.6519
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.6499
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.6479
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.6459
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.6439
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.6419
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.6399
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.6379
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.6359
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.6339
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.6319
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.6299
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.6279
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.6259
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.6239
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.6219
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.6199
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.6179
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.6159
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.6139
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.6119
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.6099
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.6079
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.6059
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.6039
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.6019
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.5999
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.5979
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.5959
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.5939
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.5919
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.5899
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.5879
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.5859
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.5839
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.5819
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.5799
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.5779
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.5759
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.5739
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.5719
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.5699
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.5679
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.5659
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.5639
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.5619
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.5599
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.5579
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.5559
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.5539
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.5519
+data/projectiles/psi.txt
+318.878
+-26.7769
+10
+6.5499
+data/projectiles/psi.txt
+320
+-2.35132e-13
+10
+6.5479
+data/projectiles/psi.txt
+318.878
+26.7769
+10
+6.5459
+data/projectiles/psi.txt
+315.519
+53.366
+10
+6.5439
+data/projectiles/psi.txt
+309.947
+79.5808
+10
+6.5419
+data/projectiles/psi.txt
+302.2
+105.237
+10
+6.5399
+data/projectiles/psi.txt
+292.335
+130.156
+10
+6.5379
+data/projectiles/psi.txt
+280.418
+154.161
+10
+6.5359
+data/projectiles/psi.txt
+266.535
+177.085
+10
+6.5339
+data/projectiles/psi.txt
+250.782
+198.767
+10
+6.5319
+data/projectiles/psi.txt
+233.27
+219.055
+10
+6.5299
+data/projectiles/psi.txt
+214.122
+237.806
+10
+6.5279
+data/projectiles/psi.txt
+193.472
+254.89
+10
+6.5259
+data/projectiles/psi.txt
+171.465
+270.185
+10
+6.5239
+data/projectiles/psi.txt
+148.255
+283.585
+10
+6.5219
+data/projectiles/psi.txt
+124.005
+294.996
+10
+6.5199
+data/projectiles/psi.txt
+98.8854
+304.338
+10
+6.5179
+data/projectiles/psi.txt
+73.0723
+311.545
+10
+6.5159
+data/projectiles/psi.txt
+46.7466
+316.567
+10
+6.5139
+data/projectiles/psi.txt
+20.093
+319.369
+10
+6.5119
+data/projectiles/psi.txt
+-6.70157
+319.93
+10
+6.5099
+data/projectiles/psi.txt
+-33.4491
+318.247
+10
+6.5079
+data/projectiles/psi.txt
+-59.962
+314.332
+10
+6.5059
+data/projectiles/psi.txt
+-86.0543
+308.212
+10
+6.5039
+data/projectiles/psi.txt
+-111.543
+299.93
+10
+6.5019
+data/projectiles/psi.txt
+-136.249
+289.545
+10
+6.4999
+data/projectiles/psi.txt
+-160
+277.128
+10
+6.4979
+data/projectiles/psi.txt
+-182.628
+262.768
+10
+6.4959
+data/projectiles/psi.txt
+-203.976
+246.564
+10
+6.4939
+data/projectiles/psi.txt
+-223.892
+228.631
+10
+6.4919
+data/projectiles/psi.txt
+-242.238
+209.095
+10
+6.4899
+data/projectiles/psi.txt
+-258.885
+188.091
+10
+6.4879
+data/projectiles/psi.txt
+-273.717
+165.769
+10
+6.4859
+data/projectiles/psi.txt
+-286.628
+142.283
+10
+6.4839
+data/projectiles/psi.txt
+-297.528
+117.8
+10
+6.4819
+data/projectiles/psi.txt
+-306.342
+92.4902
+10
+6.4799
+data/projectiles/psi.txt
+-313.007
+66.5317
+10
+6.4779
+data/projectiles/psi.txt
+-317.477
+40.1066
+10
+6.4759
+data/projectiles/psi.txt
+-319.719
+13.4002
+10
+6.4739
+data/projectiles/psi.txt
+-319.719
+-13.4002
+10
+6.4719
+data/projectiles/psi.txt
+-317.477
+-40.1066
+10
+6.4699
+data/projectiles/psi.txt
+-313.007
+-66.5317
+10
+6.4679
+data/projectiles/psi.txt
+-306.342
+-92.4902
+10
+6.4659
+data/projectiles/psi.txt
+-297.528
+-117.8
+10
+6.4639
+data/projectiles/psi.txt
+-286.628
+-142.283
+10
+6.4619
+data/projectiles/psi.txt
+-273.717
+-165.769
+10
+6.4599
+data/projectiles/psi.txt
+-258.885
+-188.091
+10
+6.4579
+data/projectiles/psi.txt
+-242.238
+-209.095
+10
+6.4559
+data/projectiles/psi.txt
+-223.892
+-228.631
+10
+6.4539
+data/projectiles/psi.txt
+-203.976
+-246.564
+10
+6.4519
+data/projectiles/psi.txt
+-182.628
+-262.768
+10
+6.4499
+data/projectiles/psi.txt
+-160
+-277.128
+10
+6.4479
+data/projectiles/psi.txt
+-136.249
+-289.545
+10
+6.4459
+data/projectiles/psi.txt
+-111.543
+-299.93
+10
+6.4439
+data/projectiles/psi.txt
+-86.0543
+-308.212
+10
+6.4419
+data/projectiles/psi.txt
+-59.962
+-314.332
+10
+6.4399
+data/projectiles/psi.txt
+-33.4491
+-318.247
+10
+6.4379
+data/projectiles/psi.txt
+-6.70157
+-319.93
+10
+6.4359
+data/projectiles/psi.txt
+20.093
+-319.369
+10
+6.4339
+data/projectiles/psi.txt
+46.7466
+-316.567
+10
+6.4319
+data/projectiles/psi.txt
+73.0723
+-311.545
+10
+6.4299
+data/projectiles/psi.txt
+98.8854
+-304.338
+10
+6.4279
+data/projectiles/psi.txt
+124.005
+-294.996
+10
+6.4259
+data/projectiles/psi.txt
+148.255
+-283.585
+10
+6.4239
+data/projectiles/psi.txt
+171.465
+-270.185
+10
+6.4219
+data/projectiles/psi.txt
+193.472
+-254.89
+10
+6.4199
+data/projectiles/psi.txt
+214.122
+-237.806
+10
+6.4179
+data/projectiles/psi.txt
+233.27
+-219.055
+10
+6.4159
+data/projectiles/psi.txt
+250.782
+-198.767
+10
+6.4139
+data/projectiles/psi.txt
+266.535
+-177.085
+10
+6.4119
+data/projectiles/psi.txt
+280.418
+-154.161
+10
+6.4099
+data/projectiles/psi.txt
+292.335
+-130.156
+10
+6.4079
+data/projectiles/psi.txt
+302.2
+-105.237
+10
+6.4059
+data/projectiles/psi.txt
+309.947
+-79.5808
+10
+6.4039
+data/projectiles/psi.txt
+315.519
+-53.366
+10
+6.4019
+data/projectiles/psi.txt
+318.878
+-26.7769
\ No newline at end of file
diff --git a/data/weapons/novaspitter1.txt b/data/weapons/novaspitter1.txt
new file mode 100644
index 0000000..a9adbfa
--- /dev/null
+++ b/data/weapons/novaspitter1.txt
@@ -0,0 +1,36 @@
+Novaspitter 1
+data/images/empty.bmp
+8
+1
+0
+6
+0.8
+0.0999
+data/projectiles/spit.txt
+250
+0
+0.8
+0.0999
+data/projectiles/spit.txt
+125
+216.506
+0.8
+0.0999
+data/projectiles/spit.txt
+-125
+216.506
+0.8
+0.0999
+data/projectiles/spit.txt
+-250
+3.06162e-14
+0.8
+0.0999
+data/projectiles/spit.txt
+-125
+-216.506
+0.8
+0.0999
+data/projectiles/spit.txt
+125
+-216.506
diff --git a/data/weapons/novaspitter1.txt~ b/data/weapons/novaspitter1.txt~
new file mode 100644
index 0000000..99c3869
--- /dev/null
+++ b/data/weapons/novaspitter1.txt~
@@ -0,0 +1,36 @@
+Novaspitter 1
+data/images/empty.bmp
+8
+1
+30
+6
+0.8
+0.0999
+data/projectiles/spit.txt
+250
+0
+0.8
+0.0999
+data/projectiles/spit.txt
+125
+216.506
+0.8
+0.0999
+data/projectiles/spit.txt
+-125
+216.506
+0.8
+0.0999
+data/projectiles/spit.txt
+-250
+3.06162e-14
+0.8
+0.0999
+data/projectiles/spit.txt
+-125
+-216.506
+0.8
+0.0999
+data/projectiles/spit.txt
+125
+-216.506
\ No newline at end of file
diff --git a/data/weapons/spitter1.txt b/data/weapons/spitter1.txt
new file mode 100644
index 0000000..8866663
--- /dev/null
+++ b/data/weapons/spitter1.txt
@@ -0,0 +1,11 @@
+Spitter 1
+data/images/spitter1.bmp
+2
+1
+0
+1
+0.6
+0.55
+data/projectiles/spit.txt
+0
+250
diff --git a/data/weapons/spitter1.txt~ b/data/weapons/spitter1.txt~
new file mode 100644
index 0000000..4089011
--- /dev/null
+++ b/data/weapons/spitter1.txt~
@@ -0,0 +1,11 @@
+Spitter 1
+data/images/spitter1.bmp
+2
+1
+5
+1
+0.6
+0.55
+data/projectiles/spit.txt
+0
+250
diff --git a/data/weapons/spitter2.txt b/data/weapons/spitter2.txt
new file mode 100644
index 0000000..be15295
--- /dev/null
+++ b/data/weapons/spitter2.txt
@@ -0,0 +1,21 @@
+Spitter 2
+data/images/spitter1.bmp
+7
+1
+0
+3
+0.6
+0
+data/projectiles/spit.txt
+0
+250
+0.6
+0.2
+data/projectiles/spit.txt
+40
+240
+0.6
+0.4
+data/projectiles/spit.txt
+-40
+240
diff --git a/data/weapons/spitter2.txt~ b/data/weapons/spitter2.txt~
new file mode 100644
index 0000000..ab3cf1a
--- /dev/null
+++ b/data/weapons/spitter2.txt~
@@ -0,0 +1,21 @@
+Spitter 2
+data/images/spitter1.bmp
+7
+1
+25
+3
+0.6
+0
+data/projectiles/spit.txt
+0
+250
+0.6
+0.2
+data/projectiles/spit.txt
+40
+240
+0.6
+0.4
+data/projectiles/spit.txt
+-40
+240
diff --git a/data/weapons/spitter3.txt b/data/weapons/spitter3.txt
new file mode 100644
index 0000000..cf7ee3c
--- /dev/null
+++ b/data/weapons/spitter3.txt
@@ -0,0 +1,41 @@
+Spitter 3
+data/images/spitter3.bmp
+15
+1
+0
+7
+2
+0
+data/projectiles/bigspit.txt
+0
+250
+0.8
+0
+data/projectiles/spit.txt
+10
+247
+0.8
+0
+data/projectiles/spit.txt
+-10
+247
+0.8
+0.16
+data/projectiles/spit.txt
+176.78
+176.78
+0.8
+0.32
+data/projectiles/spit.txt
+-176.78
+176.78
+0.8
+0.48
+data/projectiles/spit.txt
+176.78
+-176.78
+0.8
+0.64
+data/projectiles/spit.txt
+-176.78
+-176.78
diff --git a/data/weapons/spitter3.txt~ b/data/weapons/spitter3.txt~
new file mode 100644
index 0000000..ae9ad73
--- /dev/null
+++ b/data/weapons/spitter3.txt~
@@ -0,0 +1,41 @@
+Spitter 3
+data/images/spitter3.bmp
+15
+1
+75
+7
+2
+0
+data/projectiles/bigspit.txt
+0
+250
+0.8
+0
+data/projectiles/spit.txt
+10
+247
+0.8
+0
+data/projectiles/spit.txt
+-10
+247
+0.8
+0.16
+data/projectiles/spit.txt
+176.78
+176.78
+0.8
+0.32
+data/projectiles/spit.txt
+-176.78
+176.78
+0.8
+0.48
+data/projectiles/spit.txt
+176.78
+-176.78
+0.8
+0.64
+data/projectiles/spit.txt
+-176.78
+-176.78
diff --git a/data/weapons/weapon_template.txt b/data/weapons/weapon_template.txt
new file mode 100644
index 0000000..b900b0c
--- /dev/null
+++ b/data/weapons/weapon_template.txt
@@ -0,0 +1,16 @@
+epic imbaweapon of massdestruction      #name
+data/weapon89.bmp                                       #filename of image of weapon
+0.5                                                                     #energyusage
+1                                                                       #sellable
+10000                                                           #cost (0 for auto (recommended))
+2                                                                       #number of distinguished Projectiles
+1                                                                       #cooldown
+0.5                                                                     #startTimer
+data/projectile11.txt                           #path
+0                                                                       #xSpeed
+700                                                                     #-ySpeed
+5                                                                       #cooldown
+0                                                                       #startTimer
+data/projectile14.txt                           #path
+0                                                                       #xSpeed
+500                                                                     #-ySpeed
diff --git a/data/weapons/weapon_template.txt~ b/data/weapons/weapon_template.txt~
new file mode 100644
index 0000000..4c8a787
--- /dev/null
+++ b/data/weapons/weapon_template.txt~
@@ -0,0 +1,16 @@
+epic imbaweapon of massdestruction      #name
+data/weapon89.bmp                                       #filename of image of weapon
+0.5                                                                     #energyusage
+1                                                                       #sellable
+10000                                                           #value (0 for auto (recommended))
+2                                                                       #number of distinguished Projectiles
+1                                                                       #cooldown
+0.5                                                                     #startTimer
+data/projectile11.txt                           #path
+0                                                                       #xSpeed
+700                                                                     #-ySpeed
+5                                                                       #cooldown
+0                                                                       #startTimer
+data/projectile14.txt                           #path
+0                                                                       #xSpeed
+500                                                                     #-ySpeed
diff --git a/data/weapons/weapons.txt b/data/weapons/weapons.txt
new file mode 100644
index 0000000..5c08b65
--- /dev/null
+++ b/data/weapons/weapons.txt
@@ -0,0 +1,10 @@
+empty.txt
+spitter1.txt
+spitter2.txt
+spitter3.txt
+novaspitter1.txt
+beamer1.txt
+beamer2.txt
+fireball1.txt
+inawaffe.txt
+nova1.txt
diff --git a/data/weapons/weapons.txt~ b/data/weapons/weapons.txt~
new file mode 100644
index 0000000..5c08b65
--- /dev/null
+++ b/data/weapons/weapons.txt~
@@ -0,0 +1,10 @@
+empty.txt
+spitter1.txt
+spitter2.txt
+spitter3.txt
+novaspitter1.txt
+beamer1.txt
+beamer2.txt
+fireball1.txt
+inawaffe.txt
+nova1.txt
diff --git a/engine.cpp b/engine.cpp
new file mode 100644
index 0000000..50b39ee
--- /dev/null
+++ b/engine.cpp
@@ -0,0 +1,929 @@
+#include "engine.h"
+
+UserShip* getShipWithName(string shipname)
+{
+        string path = "data/ships/user/";
+        ifstream ships;
+        ships.open((path + "userships.txt").c_str());
+        char workaround;
+        ships >> workaround;
+        while(ships.good())
+        {
+                string shipPath;
+                getline(ships, shipPath);
+                ifstream ins;
+                ins.open((path + workaround + shipPath).c_str());
+//              cout << path + workaround + shipPath << endl;
+                char workaround2;
+                ins >> workaround2;
+                string thisShipname;
+                getline(ins, thisShipname);
+                thisShipname = workaround2 + thisShipname;
+                ins.close();
+                if(thisShipname == shipname)
+                {
+                        ships.close();
+                        return new UserShip(path + workaround + shipPath);
+                }
+                ships >> workaround;
+        }
+        ships.close();
+        cout << "Save File corrupted: unable to find Ship with name " << shipname << endl;
+        return NULL;
+}
+
+Weapon* getWeaponWithName(string weaponname)
+{
+        string path = "data/weapons/";
+        ifstream weapons;
+        weapons.open((path + "weapons.txt").c_str());
+        char workaround;
+        weapons >> workaround;
+        while(weapons.good())
+        {
+                string weaponPath;
+                getline(weapons, weaponPath);
+                ifstream ins;
+                ins.open((path + workaround + weaponPath).c_str());
+                char workaround2;
+                ins >> workaround2;
+                string thisWeaponname;
+                getline(ins, thisWeaponname);
+                thisWeaponname = workaround2 + thisWeaponname;
+                ins.close();
+                if(thisWeaponname == weaponname)
+                {
+                        weapons.close();
+                        return new Weapon(path + workaround + weaponPath);
+                }
+                weapons >> workaround;
+        }
+        weapons.close();
+        cout << "Save File corrupted: unable to find Weapon with name " << weaponname << endl;
+        return NULL;
+}
+
+Account::Account()
+{
+        gold = 0;
+        highscore = 0;
+        ifstream ins;
+        string path = "data/ships/user/";
+        ins.open((path + "userships.txt").c_str());
+        current = 0;
+        string shippath;
+        getline(ins, shippath);
+        UserShip *startShip = new UserShip(path + shippath);
+        ships.push_back(startShip);
+}
+
+Account::~Account()
+{
+        for(int i = 0; i < (int) ships.size(); i++)
+                delete ships[i];
+        for(int i = 0; i < (int) weapons.size(); i++)
+                delete weapons[i];
+}
+
+void Account::resetShips()
+{
+        for(int i = 0; i < (int) ships.size(); ++i)
+        {
+                ships[i]->reset();
+//              ships[i]->hp = ships[i]->maxhp;
+//              ships[i]->energy = ships[i]->maxEnergy;
+//              ships[i]->xSpeed = 0;
+//              ships[i]->ySpeed = 0;
+        }
+}
+
+
+
+Account::Account(string filename)
+{
+        ifstream ins;
+        ins.open((filename).c_str());
+        getline(ins, name);     
+        ins >> gold;
+        ins >> highscore;
+        int Nships;
+        ins >> Nships;
+        for(int i = 0; i < (int) Nships; ++i)
+        {
+                string shipname;
+                char workaround;
+                ins >> workaround;
+                getline(ins, shipname);
+                shipname = workaround + shipname;
+                UserShip* s = getShipWithName(shipname);
+                vector<Upgradeable*> tu = s->getUpgradeables();
+                for(int j = 0; j < (int) tu.size(); ++j)
+                        tu[j]->load(ins);
+                int Nweapons;
+                ins >> Nweapons;
+                for(int j = 0; j < Nweapons; ++j)
+                {
+                        ins >> workaround;
+                        string weaponname;
+                        getline(ins, weaponname);
+                        weaponname = workaround + weaponname;
+                        delete s->weapons[j];
+                        s->weapons[j] = getWeaponWithName(weaponname);
+                }
+                ships.push_back(s);
+        }
+        ins >> current;
+        int Nlevels;
+        ins >> Nlevels;
+        for(int i = 0; i < Nlevels; ++i)
+        {
+                int level;
+                ins >> level;
+                levels.push_back(level);
+        }
+        double nexp;
+        ins >> nexp;
+        addExp(nexp);
+        ins.close();
+}
+
+void Account::save()
+{
+        spaceto_(name);
+        bool was_saved = false;
+        ifstream ins;
+        ins.open("save/saves.txt");
+        string line;
+        getline(ins, line);
+        if(line == name)
+                was_saved = true;
+        string allSaves = line;
+        while(ins.good())
+        {
+                string line;
+                getline(ins, line);
+                if(line == name)
+                        was_saved = true;
+                allSaves += "\n" + line;
+        }
+        ins.close();
+        if(!was_saved)
+        {
+                ofstream makeEntry;
+                makeEntry.open("save/saves.txt");
+                makeEntry << allSaves << '\n' << name;
+        }
+        ofstream ofs;
+        ofs.open(("save/" + name + ".txt").c_str());
+        _tospace(name);
+        ofs << name << endl;
+        ofs << gold << endl;
+        ofs << highscore << endl;
+        ofs << ships.size() << endl;
+        for(int i = 0; i < (int) ships.size(); ++i)
+        {
+                ofs << ships[i]->name << endl;
+                vector<Upgradeable*> tu = ships[i]->getUpgradeables();
+                for(int j = 0; j < (int) tu.size(); ++j)
+                        tu[j]->save(ofs);
+                ofs << ships[i]->weapons.size() << endl;
+                for(int j = 0; j < (int) ships[i]->weapons.size(); ++j)
+                        ofs << ships[i]->weapons[j]->name << endl;
+        }
+        ofs << current << endl;
+        ofs << levels.size() << endl;
+        for(int i = 0; i < (int) levels.size(); ++i)
+                ofs << levels[i] << endl;
+        
+        ofs << exp;
+        ofs.close();
+}
+
+ObjectHandler::ObjectHandler(Account* newuser, SDL_Surface* newscreen, SDL_Surface* background)
+{
+        user = newuser;
+        screen = newscreen;
+        BG = new SlidingBackground(background,0,50);
+        highscore = 0;
+        gold = 0;
+}
+
+void ObjectHandler::spawnEnemy(EnemyShip* enemy,double nx, double ny)
+{
+        enemy->x = nx;
+        enemy->y = ny;
+        enemies.push_back(enemy);
+}
+
+ObjectHandler::~ObjectHandler()
+{
+        for(list<Projectile*>::iterator i =  friendlyProjectiles.begin(); i!= friendlyProjectiles.end();++i)
+                delete *i;
+        for(list<Projectile*>::iterator i =  enemyProjectiles.begin(); i!= enemyProjectiles.end();++i)
+                delete *i;
+        for(list<EnemyShip*>::iterator i =  enemies.begin(); i!= enemies.end();++i)
+                delete *i;
+        delete BG;
+}
+
+void ObjectHandler::frameEnemy(EnemyShip* s, double time)
+{
+        vector<Projectile*> moreProjectiles = s->frame(time);
+        for(int i = 0; i < (int) moreProjectiles.size(); ++i)
+                enemyProjectiles.push_back(moreProjectiles[i]);
+}
+
+int ObjectHandler::frame(double time)
+{
+        UserShip *s = user->ships[user->current];
+        //applies controles
+        Uint8 *keyState = SDL_GetKeyState(NULL);
+        s->down = -keyState[SDLK_UP]+keyState[SDLK_DOWN];
+        s->right = -keyState[SDLK_LEFT]+keyState[SDLK_RIGHT];
+        s->shooting = keyState[SDLK_SPACE];
+        //frames the content
+        list<Projectile*>::iterator l1;
+        list<EnemyShip*>::iterator l2;
+        l1 = friendlyProjectiles.begin();
+        while(l1 != friendlyProjectiles.end())
+        {
+                //looking for collisions with enemies
+                double startx,starty;
+                startx = (*l1)->x;
+                starty = (*l1)->y;
+                (*l1)->frame(time);
+                bool hit = false;
+                for(l2 = enemies.begin(); l2!= enemies.end(); ++l2)
+                {
+                        if((*l2)->hp > 0 && intersects((*l1)->collisionSize + (*l2)->collisionSize, startx-(*l2)->x, starty-(*l2)->y, (*l1)->x-(*l2)->x, (*l1)->y-(*l2)->y))
+                        {
+                                (*l2)->hit(**l1);
+//                              cout << (*l2)-> hp << endl;
+                                hit = true;
+                                break;
+                        }
+                }
+                if(ooB(*l1,screen) || hit)
+                {
+                        delete *l1;
+                        l1 = friendlyProjectiles.erase(l1);
+                }
+                else
+                        l1++;
+        }
+        l1 = enemyProjectiles.begin();
+        while(l1 != enemyProjectiles.end())
+        {
+                double startx = (*l1)->x;
+                double starty = (*l1)->y;
+                (*l1)->frame(time);
+                bool hit = false;
+                if(intersects((*l1)->collisionSize + s->collisionSize, startx-s->x, starty-s->y, (*l1)->x-s->x, (*l1)->y-s->y))
+                {
+                        s->hit(**l1);
+                        hit = true;
+                }
+                if(ooB(*l1,screen) || hit)
+                {
+                        delete *l1;
+                        l1 = enemyProjectiles.erase(l1);
+                        //return 1;
+                }
+                else
+                        l1++;
+        }
+        //cout << enemyProjectiles.size() << endl;
+        l2 = enemies.begin();
+        while(l2 != enemies.end())
+        {
+                frameEnemy(*l2,time);
+                if((*l2)->hp <= 0)
+                {
+                        highscore += (*l2)->score;
+                        gold += (*l2)->gold;
+                        if(user->addExp((*l2)->exp))
+                        {
+                                cout << "Level Up!" << endl;
+                                user->gold += user->getLevel() * 15;
+                                cout << "Got " << user->getLevel() * 15 << "gold to compromise for the missing Skillsystem!" << endl;
+                        }
+                        delete *l2;
+                        l2 = enemies.erase(l2);
+                }
+                else if(ooB(*l2,screen) && (*l2)->current == (*l2)->path.size()-1 && (*l2)->path[(*l2)->current] == make_pair((*l2)->x,(*l2)->y))
+                {
+                        delete *l2;
+                        l2 = enemies.erase(l2);
+                }
+                else
+                        l2++;
+        }
+//      cout << s->energy << endl;
+        if(s->hp <= 0)
+                return LEVEL_FAILED;
+        vector<Projectile*> moreProjectiles = s->frame(time,screen);
+        for(int i = 0; i < (int) moreProjectiles.size(); ++i)
+                friendlyProjectiles.push_back(moreProjectiles[i]);
+        
+        //apply background
+        BG->frame(1/60.0);
+        BG->draw(screen);
+        
+        //draws all Objects
+        for(list<EnemyShip*>::iterator i =  enemies.begin(); i!= enemies.end();++i)
+        {
+                (*i)->draw(screen);
+        }
+        for(list<Projectile*>::iterator i =  friendlyProjectiles.begin(); i!= friendlyProjectiles.end();++i)
+        {
+                (*i)->draw(screen);
+        }
+        for(list<Projectile*>::iterator i =  enemyProjectiles.begin(); i!= enemyProjectiles.end();++i)
+        {
+                (*i)->draw(screen);
+        }
+        s->draw(screen);
+        return 0;
+}
+
+
+
+HUD::HUD(long long *nhighscore, double *nhp, double nhpmax, double *nenergy, double nmaxEnergy, double* ngold, double* nexp)
+{
+        font = NULL;
+        textColor.r = 255;
+        textColor.g = 255;
+        textColor.b = 255;
+        highscore = nhighscore;
+        hp = nhp;
+        hpmax = nhpmax;
+        energy = nenergy;
+        maxEnergy = nmaxEnergy;
+        gold = ngold;
+        exp = nexp;
+        energyRaw = loadBMP("data/images/energy_raw2.bmp");
+        SDL_Surface *bubbles = loadBMP("data/images/energy_bubbles3.bmp");
+        energyBubbles = new SlidingBackground(bubbles,0,-200);
+        energyMasc = loadBMP("data/images/energy_masc2.bmp");
+        hpRaw = loadBMP("data/images/hp_raw.bmp");
+        hpMasc = loadBMP("data/images/hp_masc2.bmp");
+        background = loadBMP("data/images/hud_background.bmp");
+        font = TTF_OpenFont("data/fonts/OpenSans-Semibold.ttf",12);
+        if(font == NULL)
+        {
+                cout << "Error loading font in HUD" << endl;
+        }
+        Uint32 colorkey = SDL_MapRGB(energyMasc->format,255 , 255, 255);
+        SDL_SetColorKey(energyMasc, 0, colorkey);
+        SDL_SetColorKey(energyMasc, SDL_SRCCOLORKEY, colorkey);
+        SDL_SetColorKey(hpMasc, 0, colorkey);
+        SDL_SetColorKey(hpMasc, SDL_SRCCOLORKEY, colorkey);
+}
+
+HUD::~HUD()
+{
+        SDL_FreeSurface(energyRaw);
+        delete energyBubbles;
+        SDL_FreeSurface(energyMasc);
+        SDL_FreeSurface(hpRaw);
+        SDL_FreeSurface(hpMasc);
+        TTF_CloseFont(font);
+}
+
+void HUD::draw(SDL_Surface* screen)
+{
+        
+        //applying HUD-background
+        SDL_Rect dest,src;
+        dest.x = 300;
+        dest.y = 0;
+        SDL_BlitSurface(background,NULL,screen,&dest);
+        //making a SDL_Surface to hold the bar as it is being painted
+        SDL_Surface *energyBar = copyImage(energyRaw);
+        dest.x = 0;
+        dest.y = 0;
+        dest.w = energyBar->w;
+        dest.h = energyBar->h;
+        SDL_FillRect(energyBar,&dest,0);
+        //drawing Raw energy
+        int energyPixel = (energyRaw->h * *energy / maxEnergy);
+        dest.x = 0;
+        dest.y = energyBar->h - energyPixel;
+        src.w = energyRaw->w;
+        src.h = energyPixel;
+        src.x = 0;
+        src.y = energyRaw->h - src.h;
+        SDL_BlitSurface(energyRaw,&src,energyBar,&dest);
+        
+        //apply bubbles
+        energyBubbles->ySpeed = -60* (3.0-1.5 * *energy/ maxEnergy);
+        energyBubbles->frame(1/60.0);
+        SDL_Surface *bubbles = copyImage(energyRaw);
+        dest.x = 0;
+        dest.y = 0;
+        dest.w = energyBar->w;
+        dest.h = energyBar->h;
+        SDL_FillRect(bubbles,&dest,0x00000102);
+        energyBubbles->draw(bubbles);
+        //amount by wich the bubbles extend further than the raw energy
+        int surplus = 6 - 5* *energy/ maxEnergy;
+        src.w = energyBar->w;
+        src.h = min(energyPixel+surplus,energyBar->h);
+        src.x = 0;
+        src.y = energyRaw->h - src.h;
+        dest.x = 0;
+        dest.y = energyBar->h - min(energyPixel+surplus,energyBar->h);
+        SDL_BlitSurface(bubbles,&src,energyBar,&dest);
+        SDL_FreeSurface(bubbles);
+        //lay masc over everything
+        dest.y = energyBar->h - energyMasc->h;
+        src.w = energyMasc->w;
+        src.h = energyMasc->h;
+        src.x = 0;
+        src.y = 0;
+        SDL_BlitSurface(energyMasc,&src,energyBar,&dest);
+        dest.x = 320;
+        dest.y = 480 - energyBar->h;
+        SDL_BlitSurface(energyBar,NULL,screen,&dest);
+        SDL_FreeSurface(energyBar);
+        
+        //drawing Raw hp
+        SDL_Surface *hpBar = copyImage(hpRaw);
+        dest.x = 0;
+        dest.y = 0;
+        dest.w = hpRaw->w;
+        dest.h = hpRaw->h;
+        SDL_FillRect(hpBar,&dest,0);
+        int hpPixel = (hpRaw->h * *hp / hpmax);
+        dest.x = 0;
+        dest.y = hpBar->h - hpPixel;
+        src.w = hpBar->w;
+        src.h = hpPixel;
+        src.x = 0;
+        src.y = hpRaw->h - src.h;
+        SDL_BlitSurface(hpRaw,&src,hpBar,&dest);
+        
+        //lay masc over everything
+        dest.x = 0;
+        dest.y = hpBar->h - hpMasc->h;
+        src.w = hpMasc->w;
+        src.h = hpMasc->h;
+        src.x = 0;
+        src.y = 0;
+        SDL_BlitSurface(hpMasc,&src,hpBar,&dest);
+        dest.x = 360;
+        dest.y = 480-hpBar->h;
+        SDL_BlitSurface(hpBar,NULL,screen,&dest);
+        SDL_FreeSurface(hpBar);
+        
+        string mtemp;
+        SDL_Surface *message = NULL;
+        //display highscore
+        mtemp = "highscore: " + lltostr(*highscore);
+        message = TTF_RenderText_Solid(font, mtemp.c_str(),textColor);
+        if(message == NULL)
+        {
+                cout << "error rendering text in HUD" << endl;
+        }
+        dest.x = 316;
+        dest.y = 14;
+        SDL_BlitSurface(message,NULL,screen,&dest);
+        SDL_FreeSurface(message);
+        //display gold
+        mtemp = "gold: " + lltostr(*gold);
+        message = TTF_RenderText_Solid(font, mtemp.c_str(),textColor);
+        if(message == NULL)
+        {
+                cout << "error rendering text in HUD" << endl;
+        }
+        dest.x = 316;
+        dest.y = 30;
+        SDL_BlitSurface(message,NULL,screen,&dest);
+        SDL_FreeSurface(message);
+        //display exp
+        mtemp = "exp: " + lltostr(*exp);
+        message = TTF_RenderText_Solid(font, mtemp.c_str(),textColor);
+        if(message == NULL)
+        {
+                cout << "error rendering text in HUD" << endl;
+        }
+        dest.x = 316;
+        dest.y = 46;
+        SDL_BlitSurface(message,NULL,screen,&dest);
+        SDL_FreeSurface(message);       
+}
+
+
+LevelEvent* createEvent(ifstream& ins)
+{
+        cout << "this Event is not yet implemented!" << endl;
+        return NULL;
+}
+
+
+
+//generates a Wave of enemies
+//[t-t0,path]
+vector<pair<double,vector<pair<double,double> > > > generateWave(int number, int Nweapons,SDL_Surface* screen)
+{
+        double margin = 20;
+        double spawnLength = screen->w - 80;
+        vector<pair<double,vector<pair<double,double> > > > result;
+        bool symmetric = true;
+        if(number % 2 || rand()%2)
+                symmetric = false;
+        if(symmetric)
+                number /= 2;
+        bool done = false;
+        int mirror = rand()%2;
+        int attemps = 0;
+        while(!done && attemps < 1000)
+        {
+                attemps++;
+                int type = rand()%5;
+                switch(type)
+                {
+                        case 0:{
+                                //diagonal line
+                                if(number > 2)
+                                {
+                                        done = true;
+                                        double dur = (rand()%500)/50.0;
+                                        for(int i = 0; i < number; ++i)
+                                        {
+                                                vector<pair<double, double> > path;
+                                                double spawnx;
+                                                spawnx = margin + spawnLength*i/((double) number);
+                                                if(mirror)
+                                                        spawnx = screen->w - spawnx;
+                                                path.push_back(make_pair(spawnx,screen->h+margin));
+                                                path.push_back(make_pair(spawnx,-margin));
+                                                result.push_back(make_pair(dur - dur/number*i,path));
+                                        }
+                                }
+                                break;
+                        }
+                        case 1:{
+                                //chaotic
+                                if(!symmetric && number > 7)
+                                {
+                                        done = true;
+                                        double dur = sqrt(number) * (rand()%1000)/500.0;
+                                        for(int i = 0; i < number; ++i)
+                                        {
+                                                vector<pair<double, double> > path;
+                                                double spawnx = margin + rand()%10000/10000.0*spawnLength;
+                                                path.push_back(make_pair(spawnx,screen->h+margin));
+                                                path.push_back(make_pair(spawnx,-margin));
+                                                result.push_back(make_pair(dur*((rand()%1000)/1000.0),path));
+                                        }
+                                }
+                                break;
+                        }
+                        case 2:{
+                                if(number > 2)
+                                {
+                                        //down diagonalup down
+                                        done = true;
+                                        double dur = (rand()%500)/50.0;
+                                        for(int i = 0; i < number; ++i)
+                                        {
+                                                vector<pair<double, double> > path;
+                                                double spawnx;
+                                                spawnx = margin + spawnLength*i/((double) number);
+                                                if(mirror)
+                                                        spawnx = screen->w - spawnx;
+                                                path.push_back(make_pair(spawnx,screen->h-3*margin));
+                                                path.push_back(make_pair(screen->w-spawnx,2*margin));
+                                                path.push_back(make_pair(screen->w-spawnx,screen->h+margin));
+                                                path.push_back(make_pair(spawnx,-margin));
+                                                result.push_back(make_pair(dur/((double) number)*i,path));
+                                                
+                                        }
+                                }
+                                break;
+                        }
+                        case 3:{
+                                //back and forth at top
+                                if(number < 5 && Nweapons > 0)
+                                {
+                                        done = true;
+                                        int baf = min(rand()%6+1,rand()%6+1);
+                                        int right = rand()%2;
+                                        double spawnx;
+                                        if(right)
+                                                spawnx = screen->w - margin;
+                                        else
+                                                spawnx = margin;
+                                        for(int j = 0; j < number; ++j)
+                                        {
+                                                vector<pair<double, double> > path;
+                                                for(int i = 0; i < baf; ++i)
+                                                {
+                                                        if(right)
+                                                                path.push_back(make_pair(screen->w-spawnx,2*margin));
+                                                        else
+                                                                path.push_back(make_pair(margin,2*margin));
+                                                        right = !right;
+                                                }
+                                                if(right)
+                                                        path.push_back(make_pair(margin,screen->h+margin));
+                                                else
+                                                        path.push_back(make_pair(screen->w-spawnx,screen->h + margin));
+                                                path.push_back(make_pair(spawnx,-margin));
+                                                result.push_back(make_pair(j/(rand()%3+2),path));
+                                        }
+                                }
+                                break;
+                        }
+                        case 4:{
+                                //circles
+                                done = true;
+                                int rounds = min(rand()%2+1,rand()%2+1);
+                                double spawnx =  margin;
+                                if(mirror)
+                                        spawnx = screen->w - margin;
+                                for(int j = 0; j < number; ++j)
+                                {
+                                        vector<pair<double, double> > path;
+                                        for(int i = 0; i < rounds*20; ++i)
+                                        {
+                                                if(mirror)
+                                                        path.push_back(make_pair(screen->w*0.2*cos(2*M_PI*i/20.0)+screen->w/2.0,screen->w*0.2*sin(2*M_PI*i/20.0)+screen->h/2.0));
+                                                else
+                                                        path.push_back(make_pair(screen->w*0.2*cos(2*M_PI*i/20.0)+screen->w/2.0,-screen->w*0.2*sin(2*M_PI*i/20.0)+screen->h/2.0));
+                                        }
+                                        if(right)
+                                                path.push_back(make_pair(margin,screen->h+margin));
+                                        else
+                                                path.push_back(make_pair(screen->w-spawnx,screen->h + margin));
+                                        path.push_back(make_pair(spawnx,-margin));
+                                        result.push_back(make_pair(j/sqrt(number)*1.5,path));
+                                }
+                                break;
+                        }
+                        default:{}
+                }
+        }
+        int oldsize = result.size();
+        if(symmetric)
+                for(int i = 0; i < oldsize; ++i)
+        {
+                vector<pair<double, double> > path;
+                for(int j = 0; j < (int) result[i].second.size(); ++j)
+                {
+                        path.push_back(make_pair(screen->w-result[i].second[j].first,result[i].second[j].second));
+                }
+                result.push_back(make_pair(result[i].first,path));
+        }
+        if(attemps == 1000)
+                cout << "failed to generate wave with " << number << " units!" << endl;
+        return result;
+}
+
+/*structure of a LevelFile
+IntroLevel                                      #name
+data/images/bg_stars.bmp        #path of background
+30                                                      #speed of background
+1                                                       #wether to randomize background position
+60                                                      #duration [s]
+12346543                                        #seed
+2                                                       #number of Shiptypes
+data/tork_capsule.txt           #path of Ship
+50                                                      #how many of them should spawn
+data/tork_spacerocket.txt       #path of Ship
+12                                                      #how many
+1                                                       #how many events shall happen
+0.5                                                     #percentage of completion the event happens
+****event*****                          #an event as specified in createEvent
+*/
+LevelGenerator::LevelGenerator(string filename, Account* user, SDL_Surface* nscreen)
+{
+        vector<int> shouldSpawn;
+        screen = nscreen;
+        SDL_Surface* fakeScreen = loadBMP("data/images/game_screen.bmp");
+        current = 0;
+        completed = 0;
+        event = false;
+        
+        ifstream ins;
+        ins.open(filename.c_str());
+        if(!ins.is_open())
+        {
+                cout << "Error: Could not open Level file " << filename << endl;
+                return;
+        }
+        getline(ins, name);
+        string backgroundPath;
+        getline(ins, backgroundPath);
+        SDL_Surface* background = loadBMP(backgroundPath);
+        OH = new ObjectHandler(user, fakeScreen,background);
+        UserShip *s = user->ships[user->current];
+        hud = new HUD(&OH->highscore, &s->hp, s->maxhp, &s->energy, s->maxEnergy, &OH->gold, user->getExpPointer());
+        ins >> OH->BG->ySpeed;
+        bool rdbg;
+        ins >> rdbg;
+        OH->BG->setRandom(rdbg);
+        ins >> duration;
+        ins >> seed;
+        int NShipTypes;
+        ins >> NShipTypes;
+        for(;NShipTypes;NShipTypes--)
+        {
+                char workaround;
+                //discards \n
+                ins >> workaround;
+                string shipFilename;
+                getline(ins, shipFilename);
+                EnemyShip* enemy = new EnemyShip(workaround + shipFilename);
+                prototypes.push_back(enemy);
+                for(int l = 0; l < (int) enemy->weapons.size(); ++l)
+                        for(int i = 0; i < (int) enemy->weapons[l]->sounds.size(); ++i)
+                                for(int j = 0; j < (int) enemy->weapons[l]->sounds[i].size(); ++j)
+                                        toDelete.push_back(enemy->weapons[l]->sounds[i][j]);
+                int number;
+                ins >> number;
+                shouldSpawn.push_back(number);
+        }
+        int NEvents;
+        ins >> NEvents;
+        for(;NEvents;NEvents--)
+        {
+                double eventtime = 0;
+                ins >> eventtime;
+                events.push_back(make_pair(eventtime,createEvent(ins)));
+        }
+        s->x = OH->screen->w/2;
+        s->y = OH->screen->h - 30;
+        srand(seed);
+        //Fill up the Queue
+        double spawnTotal = 0;
+        int spawnMax = 0;
+        for(int i = 0; i < (int) shouldSpawn.size(); ++i)
+        {
+                spawnTotal += shouldSpawn[i];
+                spawnMax = max(spawnMax,shouldSpawn[i]);
+        }
+        for(int i = 0; i < (int) prototypes.size(); ++i)
+        {
+                int rest = shouldSpawn[i];
+                int Nwaves = shouldSpawn[i]*duration/spawnTotal/(rand()%8+2.5);
+                if(Nwaves == 0)
+                        Nwaves = 1;
+                vector<int> willSpawn;
+                for(int j = 0; j < Nwaves; ++j)
+                {
+                        willSpawn.push_back(rest/(Nwaves-j));
+                        rest -= willSpawn[j];
+                }
+                //random the evenly distributed wavesizes a bit
+                if(Nwaves > 1)
+                        for(int j = 0; j < Nwaves; ++j)
+                {
+                        int temp = 1;
+                        if(shouldSpawn[i]/Nwaves >= 2)
+                        {
+                                temp = rand()%((int) shouldSpawn[i]/Nwaves);
+                                temp = min(temp,rand()%((int) shouldSpawn[i]/Nwaves));
+                                temp = min(temp,rand()%((int) shouldSpawn[i]/Nwaves));
+                                temp = min(temp,rand()%((int) shouldSpawn[i]/Nwaves));
+                        }
+                        if(temp == 0)
+                                temp = 1;
+                        int index = rand()%Nwaves;
+                        if(willSpawn[j] < temp)
+                                temp = willSpawn[j];
+                        if(willSpawn[j] - temp < sqrt(shouldSpawn[i])/3)
+                                temp = willSpawn[j];
+                                
+                        willSpawn[j] -= temp;
+                        willSpawn[index] += temp;
+                }
+//              cout << "Waves randomed a bit!" << endl;
+//              cout << "Generated for " << i << endl;
+//              cout << Nwaves << " waves" << endl;
+//              for(int l = 0; l < Nwaves; ++l)
+//              {
+//                      cout << willSpawn[l] << " ";
+//              }
+//              cout << endl;
+                double currentTime = 1;
+                //generate the waves
+                for(int j = 0; j < (int) willSpawn.size(); ++j)
+                {
+                        if(willSpawn[j] > 0)
+                        {
+                                //determine the time of the wave
+                                if((j != 0 || shouldSpawn[i] != spawnMax) && ((int) (duration - currentTime)/(Nwaves-j)*2) > 1)
+                                {
+                                        currentTime += min(duration- currentTime - 15, (double) (rand()%((int) (duration - currentTime)/(Nwaves-j)*2)));
+                                }
+                                vector<pair<double, vector<pair<double,double> > > > temp = generateWave(willSpawn[j],prototypes[i]->weapons.size(),OH->screen);
+                                int realSpawn = 0;
+                                for(int k = 0; k < (int) temp.size(); ++k)
+                                {
+                                        spawnQueue.push_back(make_pair((temp[k].first+currentTime)/duration,make_pair(i,temp[k].second)));
+                                        realSpawn++;
+                                }
+                        }
+                }
+                
+//              int attemps = 0;
+//              while(rest && attemps < 1000)
+//              {
+//                      double waveTime = rand()%10000/10000.0*(duration-15)/duration;
+//                      if(!(rand()%3))
+//                              waveTime = max(waveTime,rand()%1000/1000.0-15/duration);
+//                      int NperWave = 0;
+//                      if(rest < 3)
+//                              NperWave = rand()%2 + 1;
+//                      else
+//                      {
+//                              NperWave = rand()%((int) (shouldSpawn[i]/1.8 - shouldSpawn[i]/10.0))+1;
+//                              NperWave = min(NperWave, (int) rand()%((int) (shouldSpawn[i]/1.8 - shouldSpawn[i]/10.0)))+1;
+//                              NperWave = min(NperWave, (int) rand()%((int) (shouldSpawn[i]/1.8 - shouldSpawn[i]/10.0)))+1;
+//                      }
+////                    cout << waveTime << " " << rest << " " << NperWave << endl;
+//                      if(NperWave > rest)
+//                              NperWave = rest;
+//                      vector<pair<double, vector<pair<double,double> > > > temp = generateWave(NperWave,OH->screen);
+//                      for(int j = 0; j < (int) temp.size(); ++j)
+//                      {
+//                              spawnQueue.push_back(make_pair(temp[j].first/duration+waveTime,make_pair(i,temp[j].second)));
+//                      }
+//                      rest-= NperWave;
+//                      attemps++;
+//              }
+//              if(attemps == 1000)
+//                      cout << "failed to generate level at unit " << i << endl;
+        }
+        sort(spawnQueue.begin(),spawnQueue.end());
+//      for(int i = 0; i < spawnQueue.size(); ++i)
+//      {
+//              cout << spawnQueue[i].first
+//      }
+        srand(time(0));
+        
+}
+
+LevelGenerator::~LevelGenerator()
+{
+        SDL_FreeSurface(OH->screen);
+        delete OH;
+        for(int i = 0; i < (int) prototypes.size(); ++i)
+                delete prototypes[i];
+        for(int i = 0; i < (int) events.size(); ++i)
+                delete events[i].second;
+        delete hud;
+        for(int i = 0; i < (int) toDelete.size(); ++i)
+                delete toDelete[i];
+}
+
+int LevelGenerator::frame(double time)
+{
+//      double oldcompleted = completed;
+        completed += time / duration;
+        if(!event)
+        {
+                //cout << current << " " << completed << endl;
+                //spawn enemies
+                while(current != (int) spawnQueue.size() && spawnQueue[current].first < completed)
+                {
+                        EnemyShip* enemy = new EnemyShip(*prototypes[spawnQueue[current].second.first]);
+                        enemy->x = spawnQueue[current].second.second[spawnQueue[current].second.second.size()-1].first;
+                        enemy->y = spawnQueue[current].second.second[spawnQueue[current].second.second.size()-1].second;
+                        spawnQueue[current].second.second.pop_back();
+                        enemy->path = spawnQueue[current].second.second;
+                        OH->spawnEnemy(enemy, enemy->x,enemy->y);
+                        OH->frameEnemy(enemy, (completed - spawnQueue[current].first) * duration);
+                        current++;
+                }
+                if(completed > 1)
+                {
+                        return LEVEL_COMPLETED;
+                }
+        }
+        
+        
+        int result = OH->frame(time);
+        SDL_Rect r;
+        r.w = screen->w;
+        r.h = screen->h;
+        r.x = 0;
+        r.y = 0;
+        SDL_FillRect(screen,&r,0);
+        r.w = OH->screen->w;
+        r.h = OH->screen->h;
+        r.x = 0;
+        r.y = 0;
+        r.w+=2;
+        r.h+=2;
+        SDL_FillRect(screen,&r,0xFFFFFFFF);
+        r.x = 1;
+        r.y = 1;
+        r.w--;
+        r.h--;
+        SDL_BlitSurface(OH->screen,NULL,screen,&r);
+        hud->draw(screen);      
+        return result;
+}
diff --git a/engine.h b/engine.h
new file mode 100644
index 0000000..fad0642
--- /dev/null
+++ b/engine.h
@@ -0,0 +1,119 @@
+#ifndef ENGINE_H
+#define ENGINE_H
+
+#include "enginecore.h"
+#include "GUI.h"
+
+#define LEVEL_COMPLETED 2
+#define LEVEL_FAILED 1
+
+using namespace std;
+
+
+class Account: public Levelable
+{
+public:
+        string name;
+        double gold;
+        long long highscore;
+        //owned ships
+        vector<UserShip*> ships;
+        //the ship currently used
+        int current;
+        //owned weapons that are not in ships
+        vector<Weapon*> weapons;
+        //list of succesfully played levels
+        vector<int> levels;
+        
+        Account();
+        Account(string filename);
+        ~Account();
+        void save();
+        
+        void resetShips();
+};
+
+//game engine. deletes everything it gets besides account and screen
+class ObjectHandler
+{
+protected:
+        list<Projectile*> friendlyProjectiles;
+        list<Projectile*> enemyProjectiles;
+        list<EnemyShip*> enemies;
+public:
+        SlidingBackground* BG;
+        long long highscore;
+        double gold;
+        Account* user;
+        SDL_Surface* screen;
+        ObjectHandler(Account* newuser,SDL_Surface* newscreen, SDL_Surface *background);
+        ~ObjectHandler();
+        int frame(double time);
+        void frameEnemy(EnemyShip* s, double time);
+        void spawnEnemy(EnemyShip* enemy,double nx, double ny);
+};
+
+class HUD
+{
+        SDL_Surface* energyRaw;
+        SlidingBackground* energyBubbles;
+        SDL_Surface* energyMasc;
+        double Bubblesypos;
+        SDL_Surface* hpRaw;
+        SDL_Surface* hpMasc;
+        SDL_Surface *background;
+        TTF_Font *font;
+public:
+        long long* highscore;
+        double* hp;
+        double hpmax;
+        double* energy;
+        double maxEnergy;
+        double *gold;
+        double *exp;
+        SDL_Color textColor;
+        HUD(long long *nhighscore, double *nhp, double nhpmax, double *nenergy, double nmaxEnergy, double* ngold, double* nexp);
+        ~HUD();
+        void draw(SDL_Surface *screen);
+};
+
+class LevelEvent
+{
+};
+
+LevelEvent* createEvent(ifstream& ins);
+
+class LevelGenerator
+{
+        Uint32 seed;
+        HUD *hud;
+        //collects the soundfiles that have been loaded and cleans them
+        vector<Mix_Chunk*> toDelete;
+public:
+        //what ships will come in the Level -bosses
+        vector<EnemyShip*> prototypes;
+        vector<pair<double,LevelEvent*> > events;
+        //duration of the level -bosses
+        double duration;
+        //[(spawn%,(enemytype,path))] of each enemy
+        vector<pair<double,pair<int,vector<pair<double,double> > > > > spawnQueue;
+        int current;
+        //if there is currently an event happening
+        bool event;
+        //% of level completed
+        double completed;
+        ObjectHandler* OH;
+        string name;
+        SDL_Surface* screen;
+        
+        LevelGenerator(string filename, Account* user, SDL_Surface* screen);
+        ~LevelGenerator();
+        int frame(double time);
+};
+
+vector<pair<double,vector<pair<double,double> > > > generateWave(int number, int Nweapons,SDL_Surface* screen);
+
+
+
+
+#endif
diff --git a/enginecore.cpp b/enginecore.cpp
new file mode 100644
index 0000000..047511e
--- /dev/null
+++ b/enginecore.cpp
@@ -0,0 +1,835 @@
+#include "enginecore.h"
+
+DObject::DObject(){};
+
+DObject::DObject(string filename, double newx, double newy)
+{
+        image = NULL;
+        image = loadBMP(filename);
+        if(!image)
+                cout << "Problem loading file!" << endl; 
+        x = newx;
+        y = newy;
+}
+
+DObject::DObject(SDL_Surface* newImage, double newx, double newy)
+{
+        image = NULL;
+        image = copyImage(newImage);
+        if(!image)
+                cout << "Problem loading file!" << endl; 
+        x = newx;
+        y = newy;
+}
+
+DObject::DObject(const DObject &o)
+{
+        image = NULL;
+        image = copyImage(o.image);
+        if(!image)
+                cout << "Problem copying file!" << endl; 
+        x = o.x;
+        y = o.y;
+}
+
+DObject::~DObject()
+{
+        SDL_FreeSurface(image);
+}
+
+void DObject::draw(SDL_Surface* screen)
+{
+        SDL_Rect position;
+        position.x = x - image->w / 2.0;
+        position.y = y - image->h / 2.0;
+        SDL_BlitSurface(image,NULL,screen,&position);
+}
+
+//checks if DObject is out of Bounds
+bool ooB(const DObject* o, SDL_Surface* screen)
+{
+        if(o->x < 0)
+                return true;
+        if(o->y < 0)
+                return true;
+        if(o->x > screen->w)
+                return true;
+        if(o->y > screen->h)
+                return true;
+        return false;
+}
+
+double armorF(double damage, double armor)
+{
+        if(armor > 0)
+                armor *= armor/(armor+damage);
+        damage *= pow(0.5,armor/50);
+        return damage;
+}
+
+
+Levelable::Levelable()
+{
+        exp = 0;
+        level = 1;
+        lin = 30;
+        quad = 10;
+        cube = 2;
+        next = lin;
+}
+
+int Levelable::addExp(double moreExp)
+{
+        int levelups = 0;
+        exp += moreExp;
+        while(exp > next)
+        {
+                levelups++;
+                level++;
+                next += lin;
+                lin += quad;
+                quad += cube;
+        }
+        return levelups;
+}
+
+int Levelable::getLevel()
+{
+        return level;
+}
+
+double Levelable::getExp()
+{
+        return exp;
+}
+
+double* Levelable::getExpPointer()
+{
+        return &exp;
+}
+
+
+Projectile::Projectile(SDL_Surface* newimage, double newx, double newy, double newdamage, double newcollisionSize, double newxSpeed, double newySpeed) : DObject(newimage, newx, newy)
+{
+        damage = newdamage;
+        collisionSize = newcollisionSize;
+        xSpeed = newxSpeed;
+        ySpeed = newySpeed;
+        armorPiercing = 0;
+}
+
+Projectile::Projectile(const Projectile& P) : DObject((DObject) P)
+{
+        damage = P.damage;
+        armorPiercing = P.armorPiercing;
+        collisionSize = P.collisionSize;
+        xSpeed = P.xSpeed;
+        ySpeed = P.ySpeed;
+}
+
+/*structure of a ProjectileFile
+data/projectile2.bmp    #path of the imagefile
+data/sounds/spit                #path of the soundfile without n.wav for int n
+10                                              #damage
+2                                               #armorPiercing
+1.4142                                  #collisionSize
+*/
+Projectile::Projectile(string filename, vector<Mix_Chunk*>& sounds)
+{
+        ifstream ins;
+        ins.open(filename.c_str());
+        if(!ins.is_open())
+        {
+                cout << "Error: Could not load from file " << filename << endl;
+        }
+        string imageFilename;
+        getline(ins, imageFilename);
+        image = loadBMP(imageFilename);
+        string soundPath;
+        getline(ins, soundPath);
+        bool good = true;
+        long long files = 1;
+        while(good)
+        {
+                string actualPath = soundPath + lltostr(files) + ".wav";
+                Mix_Chunk* temp = NULL;
+                temp = Mix_LoadWAV(actualPath.c_str());
+                if(temp == NULL)
+                        good = false;
+                else
+                        sounds.push_back(temp);
+                ++files;
+        }
+        ins >> damage;
+        ins >> armorPiercing;
+        ins >> collisionSize;
+}
+
+void Projectile::frame(double time)
+{
+        x += xSpeed*time;
+        y += ySpeed*time;
+}
+
+void Projectile::rotateAccordingly()
+{
+        double norm = sqrt(xSpeed*xSpeed + ySpeed*ySpeed);
+        if(norm != 0)
+        {
+                double angle = asin(xSpeed / norm);
+                if(ySpeed < 0)
+                {
+                        angle = M_PI-angle;
+                }
+                SDL_Surface* temp = image;
+                image = rotozoomSurface(image,angle/M_PI*180,1,0);
+                SDL_FreeSurface(temp);
+        }
+}
+
+
+
+Item::Item(const Item& item):DObject((DObject) item)
+{
+        cost = item.cost;
+        sellable = item.sellable;
+}
+
+Item::Item(const DObject& dObject):DObject(dObject)
+{
+}
+
+SDL_Surface* Item::getImage()
+{
+        return image;
+}
+
+Weapon::Weapon(const Weapon& w):Item((Item) w)
+{
+        playSound = true;
+        for(int i = 0; i < (int) w.prototypes.size(); ++i)
+        {
+                prototypes.push_back(new Projectile(*w.prototypes[i]));
+        }
+        for(int i = 0; i < (int) w.sounds.size(); ++i)
+        {
+                vector<Mix_Chunk*> temp;
+                for(int j = 0; j < (int) w.sounds[i].size(); ++j)
+                {
+                        temp.push_back(w.sounds[i][j]);
+                }
+                sounds.push_back(temp);
+        }
+        sellable = w.sellable;
+        cost = w.cost;
+        active = true;
+        energyUsage = w.energyUsage;
+        name = w.name;
+        cooldown = w.cooldown;
+        startTimer = w.startTimer;
+        currentTimer = startTimer;
+}
+
+/* structure of a Weaponfile:
+epic imbaweapon of massdestruction      #name
+data/weapon89.bmp                                       #filename of image of weapon
+0.5                                                                     #energyusage
+0                                                                       #sellable
+10000000                                                        #cost
+2                                                                       #number of distinguished Projectiles
+1                                                                       #cooldown
+0.5                                                                     #startTimer
+data/projectile11.txt                           #path
+0                                                                       #xSpeed
+700                                                                     #-ySpeed
+5                                                                       #cooldown
+0                                                                       #startTimer
+data/projectile14.txt                           #path
+0                                                                       #xSpeed
+500                                                                     #-ySpeed
+*/
+Weapon::Weapon(string filename)
+{
+        playSound = true;
+        ifstream ins;
+        ins.open(filename.c_str());
+        if(!ins.is_open())
+        {
+                cout << "Error: Could not open file " << filename << endl;
+        }
+        getline(ins,name);
+        string imageFilename;
+        getline(ins, imageFilename);
+//      cout << imageFilename << endl;
+        image = loadBMP(imageFilename);
+        active = true;
+        ins >> energyUsage;
+        ins >> sellable;
+        ins >> cost;
+        int Nprojectiles;
+        ins >> Nprojectiles;
+        for(;Nprojectiles;Nprojectiles--)
+        {
+                double temp;
+                ins >> temp;
+                cooldown.push_back(temp);
+                ins >> temp;
+                startTimer.push_back(temp);
+                string projectileFilename;
+                //this workaround discards all \n
+                char workaround;
+                ins >> workaround;
+                getline(ins,projectileFilename);
+                vector<Mix_Chunk*> projectileSounds;
+                prototypes.push_back(new Projectile(workaround + projectileFilename, projectileSounds));
+                ins >> prototypes[prototypes.size()-1]->xSpeed;
+                ins >> prototypes[prototypes.size()-1]->ySpeed;
+                prototypes[prototypes.size()-1]->ySpeed *= -1;
+                sounds.push_back(projectileSounds);
+        }
+        currentTimer = startTimer;
+        ins.close();
+        if(cost == 0)
+                cost = round_beautiful(estimateValue(*this));
+}
+
+Weapon::~Weapon()
+{
+        for(int i = 0; i < (int) prototypes.size(); ++i)
+                delete prototypes[i];
+}
+
+vector<Projectile*> Weapon::frame(double time)
+{
+        vector<Projectile*> result;
+        for(int i = 0; i < (int) prototypes.size(); ++i)
+        {
+                currentTimer[i] += time;
+                while(currentTimer[i] > cooldown[i])
+                {
+                        Projectile* tempP = new Projectile(*prototypes[i]);
+                        if(sounds[i].size() && playSound)
+                        {
+                                int temp = Mix_PlayChannel(-1,sounds[i][rand()%sounds[i].size()],0);
+                                if(temp == -1)
+                                {
+                                        cout << "there was an error playing sound of projectile" << " from weapon " << name << endl;
+                                }
+                        }
+                        tempP->x = x;
+                        tempP->y = y;
+                        tempP->rotateAccordingly();
+                        currentTimer[i] -= cooldown[i];
+                        tempP->frame(currentTimer[i]);
+                        result.push_back(tempP);
+                }
+        }
+        return result;
+}
+
+void Weapon::mirror()
+{
+        for(int i = 0; i < (int) prototypes.size(); ++i)
+                prototypes[i]->ySpeed *= -1;
+}
+
+double Weapon::getDPS() const
+{
+        double result = 0;
+        for(int i = 0; i < (int) prototypes.size(); ++i)
+                result += prototypes[i]->damage/cooldown[i];
+        return result;
+}
+
+double Weapon::getDPE() const
+{
+        if(energyUsage == 0)
+                return 0;
+        return getDPS()/energyUsage; 
+}
+
+double estimateValue(const Weapon& w)
+{
+        double result = w.getDPS()*w.getDPS()*5;
+        if(w.getDPE() != 0)
+                result /= 0.3 + 1 / w.getDPE();
+        else
+                result /= 0.3;
+        return result;
+}
+
+void Upgradeable::setValue(double nvalue)
+{
+        value = nvalue;
+}
+
+double Upgradeable::getValue() const
+{
+        return value;
+}
+
+Upgradeable::Upgradeable()
+{
+        level = 1;
+        cost = 0;
+        maxLevel = 0;
+}
+
+Upgradeable::operator double() const
+{
+        return value;
+}
+
+Upgradeable& Upgradeable::operator=(const double& d)
+{
+        value = d;
+        return *this;
+}
+
+Upgradeable::Upgradeable(double nvalue)
+{
+        level = 1;
+        cost = 0;
+        maxLevel = 0;
+        value = nvalue;
+}
+
+void Upgradeable::upgrade()
+{
+        if(level == maxLevel)
+        {
+                cout << "Can't Upgrade! Already at max Level." << endl;
+        }
+        level++;
+        cost += cost * (3+level)/10.0;
+        value += 0.3*value;
+}
+
+
+void Upgradeable::save(ofstream& o)
+{
+        o << name << endl;
+        o << value << endl;
+        o << cost << endl;
+        o << level << endl;
+        o << maxLevel << endl;
+}
+
+void Upgradeable::load(ifstream& i)
+{
+        char workaround;
+        i >> workaround;
+        getline(i,name);
+        name = workaround + name;
+        i >> value;
+        i >> cost;
+        i >> level;
+        i >> maxLevel;
+}
+
+ifstream& operator>>(ifstream& ins, Upgradeable& u)
+{
+        double d;
+        ins >> d;
+        u = d;
+        return ins;
+}
+
+Ship::Ship(string filename,int x, int y):DObject(filename,x,y)
+{
+        collisionSize = image->w;
+}
+
+Ship::~Ship()
+{
+        for(int i = 0; i < (int) weapons.size();++i)
+                delete weapons[i];      
+}
+
+vector<Projectile*> Ship::frame(double time)
+{
+        vector<Projectile*> result;
+        return result;
+}
+
+int Ship::hit(const Projectile& P)
+{
+        double tempArmor = 0;
+        if(armor > 0)
+                tempArmor = max(tempArmor,armor-P.armorPiercing);
+        hp -= armorF(P.damage,tempArmor);
+        if(hp < 0)
+                return 1;
+        return 0;
+}
+
+Ship::Ship(const Ship& s):DObject((DObject) s)
+{
+        name = s.name;
+        maxhp = s.maxhp;
+        hp = maxhp;
+        moveSpeed = s.moveSpeed;
+        collisionSize = s.collisionSize;
+        armor = s.armor;
+        for(int i = 0; i < (int) s.weapons.size(); ++i)
+        {
+                weapons.push_back(new Weapon(*s.weapons[i]));
+                slotPositions.push_back(s.slotPositions[i]);
+        }
+}
+
+
+EnemyShip::EnemyShip(const EnemyShip& s): Ship((Ship) s)
+{
+        path = s.path;
+        gold = s.gold;
+        exp = s.exp;
+        score = s.score;
+        current = 0;
+        if(!path.size())
+        {
+                path.push_back(make_pair(s.x,s.y));
+        }
+        x = path[0].first;
+        y = path[0].second;
+        
+}
+
+/*structure of an EnemShipfile
+Tork Spacerocket                                        #name
+data/images/tork_spacerocket.bmp        #path of imagefile
+7                                                                       #maxhp
+5                                                                       #armor
+50                                                                      #moveSpeed
+4                                                                       #collisionSize
+3                                                                       #Gold
+3                                                                       #exp
+3                                                                       #score
+1                                                                       #number of weapons
+0 -1                                                            #relative Position of weapon
+data/fireball.txt                                       #path of weapon
+*/
+EnemyShip::EnemyShip(string filename)
+{
+        current = 0;
+        path.push_back(make_pair(0,0));
+        ifstream ins;
+        ins.open(filename.c_str());
+        if(!ins.is_open())
+                cout << "Error: Could not open enemyfile " << filename << endl;
+        getline(ins, name);
+        string imagePath;
+        getline(ins, imagePath);
+        image = loadBMP(imagePath);
+        ins >> maxhp;
+        hp = maxhp;
+        ins >> armor;
+        ins >> moveSpeed;
+        ins >> collisionSize;
+        ins >> gold;
+        ins >> exp;
+        ins >> score;
+        int Nweapons = 0;
+        ins >> Nweapons;
+        for(;Nweapons;Nweapons--)
+        {
+                double temp1, temp2;
+                ins >> temp1;
+                ins >> temp2;
+                slotPositions.push_back(make_pair(temp1,temp2));
+                //A workaround that helps discarting \n
+                char workaround;
+                ins >> workaround;
+                string weaponpath;
+                getline(ins, weaponpath);
+                weapons.push_back(new Weapon(workaround + weaponpath));
+                weapons[weapons.size()-1]->mirror();
+        }
+        if(!(exp || gold || score))
+                assignValue();
+}
+
+vector<Projectile*> EnemyShip::frame(double time)
+{
+        //adjusting position
+        while(current != path.size()-1 && path[current] == make_pair(x,y))
+                current++;
+        if(path[current] != make_pair(x,y))
+        {
+                double dirx = path[current].first - x;
+                double diry = path[current].second - y;
+                double norm = sqrt(dirx*dirx + diry*diry);
+                dirx /= norm;
+                diry /= norm;
+                if(norm < moveSpeed*time)
+                {
+                        x = path[current].first;
+                        y = path[current].second;
+                }
+                else
+                {
+                        x += dirx * moveSpeed * time;
+                        y += diry * moveSpeed * time;
+                }
+        }
+        for(int i = 0; i < (int) weapons.size(); ++i)
+        {
+                weapons[i]->x = x + slotPositions[i].first;
+                weapons[i]->y = y + slotPositions[i].second;
+//              cout << weapons[i]->x << " " << weapons[i]->y << " weapon " << i << endl;
+        }
+        
+        
+        vector<Projectile*> result;
+        for(int i = 0; i < (int) weapons.size(); ++i)
+        {
+                vector<Projectile*> temp;
+                temp = weapons[i]->frame(time);
+                for(int j = 0; j < (int) temp.size(); ++j)
+                        result.push_back(temp[j]);
+        }
+        return result;
+}
+
+void EnemyShip::assignValue()
+{
+        exp = 0;
+        for(int i = 0; i < (int) weapons.size(); ++i)
+                exp += weapons[i]->getDPS();
+//      exp *= 4;
+        gold = maxhp * pow(2,armor/(50.0+maxhp/10))*2.5;
+        score = gold * moveSpeed / 140;
+        double sum = (gold + score + exp)/9;
+        exp = (int)(sqrt(exp+sum)+0.5);
+        gold = (int)(sqrt(gold+sum) +0.5);
+        score = (int)(sqrt(score+sum)+0.5);
+//      cout << s.name << '\n';
+//      cout << "gold: " << s.gold << " -> " << gold << '\n';
+//      cout << "high: " << s.score << " -> " << high << '\n';
+//      cout << "exp: " << s.exp << " -> " << exp << '\n';
+//      cout << "sum: " << sum << '\n';
+}
+
+
+vector<Upgradeable*> UserShip::getUpgradeables()
+{
+        vector<Upgradeable*> result;
+        result.push_back(&maxhp);
+        result.push_back(&armor);
+        result.push_back(&maxEnergy);
+        result.push_back(&energyProduction);
+        result.push_back(&handling);
+        result.push_back(&moveSpeed);
+        return result;
+}
+
+vector<Projectile*> UserShip::frame(double time, SDL_Surface* screen)
+{
+        vector<Projectile*> result;
+        //adjust energy
+        energy += energyProduction*time;
+        if(energy > maxEnergy)
+                energy = maxEnergy;
+        if(shooting)
+        {
+                double energyNeed = 0;
+                for(int i = 0; i < (int) weapons.size(); ++i)
+                        energyNeed += weapons[i]->energyUsage*time;
+                if(energyNeed < energy)
+                {
+                        energy -= energyNeed;
+                        for(int i = 0; i < (int) weapons.size(); ++i)
+                        {
+                                vector<Projectile*> temp;
+                                temp = weapons[i]->frame(time);
+                                for(int j = 0; j < (int) temp.size(); ++j)
+                                        result.push_back(temp[j]);
+                        }
+                }
+        }
+        
+        //adjust speed and position of the ship
+        double norm1 = sqrt(right*right + down*down);
+        double norm2 = sqrt(xSpeed*xSpeed + ySpeed*ySpeed);
+        double handconst = time*handling;
+        double speedconst = norm2/moveSpeed;
+        if(handconst * speedconst > norm2 || norm2 == 0)
+        {
+                xSpeed = 0;
+                ySpeed = 0;
+        }
+        else
+        {
+                xSpeed *= 1 - speedconst * handconst / norm2;
+                ySpeed *= 1 - speedconst * handconst / norm2 ;
+        }
+        norm2 = sqrt(xSpeed*xSpeed + ySpeed*ySpeed);
+        if(norm1 != 0)
+        {
+                xSpeed += handconst*right / norm1;
+                ySpeed += handconst*down / norm1;
+        }
+        else
+        {
+                if(handconst > norm2)
+                {
+                        xSpeed = 0;
+                        ySpeed = 0;
+                }
+                else
+                {
+                        xSpeed -= handconst * xSpeed / norm2;
+                        ySpeed -= handconst * ySpeed / norm2;
+                }
+        }
+//              cout << xSpeed << " " << ySpeed << endl;
+        x += xSpeed*time;
+        y += ySpeed*time;
+        if(x - image->w/2.0 < 0)
+        {
+                x = image->w/2.0;
+                xSpeed = 0;
+        }
+        if(y - image->h/2.0 < 0)
+        {
+                y = image->h/2.0;
+                ySpeed = 0;
+        }
+        if(x + image->w/2.0 > screen->w)
+        {
+                x = screen->w - image->w/2.0;
+                xSpeed = 0;
+        }
+        if(y + image->h/2.0 > screen->h)
+        {
+                y = screen->h - image->h/2.0;
+                ySpeed = 0;
+        }
+        for(int i = 0; i < (int) weapons.size(); ++i)
+        {
+                weapons[i]->x = slotPositions[i].first + x;
+                weapons[i]->y = slotPositions[i].second + y;
+        }
+        return result;
+}
+
+/*structure of an UserShipfile
+small Fighter                                   #name
+data/images/small_fighter.bmp   #path of imagefile
+200                                                             #cost
+7                                                               #maxhp
+50                                                              #armor
+200                                                             #moveSpeed
+100                                                             #handling
+10                                                              #maxEnergy
+2                                                               #energyProduction
+7                                                               #collisionSize
+2                                                               #number of weapons
+4 4                                                             #relative Position of weapon
+3                                                               #maxSize of attached weapon
+data/fireball.txt                               #path of weapon
+4 4                                                             #relative Position of weapon
+3                                                               #maxSize of attached weapon
+data/fireball.txt                               #path of weapon
+*/
+UserShip::UserShip(string filename)
+{
+        xSpeed = 0;
+        ySpeed = 0;
+        down = 0;
+        right = 0;
+        shooting = 0;
+        ifstream ins;
+        ins.open(filename.c_str());
+        if(!ins.is_open())
+                cout << "Error: Could not open userShip " << filename << endl;
+        getline(ins, name);
+        string imagePath;
+        getline(ins, imagePath);
+        image = loadBMP(imagePath);
+        ins >> cost;
+        ins >> maxhp;
+        maxhp.name = "Hitpoints";
+        maxhp.cost = cost/10;
+        hp = maxhp;
+        ins >> armor;
+        armor.name = "Armor";
+        armor.cost = cost/10;
+        ins >> moveSpeed;
+        moveSpeed.name = "Max Speed";
+        moveSpeed.cost = cost/10;
+        ins >> handling;
+        handling.name = "Acceleration";
+        handling.cost = cost/10;
+        ins >> maxEnergy;
+        maxEnergy.name = "Battery";
+        maxEnergy.cost = cost/10;
+        energy = maxEnergy;
+        ins >> energyProduction;
+        energyProduction.name = "Generator";
+        energyProduction.cost = cost/10;
+        ins >> collisionSize;
+        ins >> weaponSlots;
+        for(int i = 0; i < weaponSlots;i++)
+        {
+                double temp1, temp2;
+                ins >> temp1;
+                ins >> temp2;
+                slotPositions.push_back(make_pair(temp1,temp2));
+                ins >> temp1;
+                maxSize.push_back(temp1);
+                //A workaround that helps discarting \n
+                char workaround;
+                ins >> workaround;
+                string weaponpath;
+                getline(ins, weaponpath);
+                weapons.push_back(new Weapon(workaround + weaponpath));
+        }
+        if(cost == 0)
+                cost = round_beautiful(estimateValue(*this));
+        ins.close();
+}
+
+void UserShip::reset()
+{
+        hp = maxhp;
+        energy = maxEnergy;
+        xSpeed = 0;
+        ySpeed = 0;
+        for(int i = 0; i < (int) weapons.size(); ++i)
+        {
+                weapons[i]->playSound = false;
+                vector<Projectile*> dump = weapons[i]->frame((rand()%2000)/1000.0);
+                weapons[i]->playSound = true;
+                for(int j = 0; j < (int) dump.size(); ++j)
+                        delete dump[j];
+        }
+}
+
+void UserShip::draw(SDL_Surface* screen)
+{
+        DObject::draw(screen);  
+        for(int i = 0; i < (int) weapons.size(); ++i)
+                weapons[i]->draw(screen);
+}
+
+SDL_Surface* UserShip::getImage()
+{
+        return image;
+}
+
+double estimateValue(const UserShip& s)
+{
+        double result;
+        result = s.maxhp * pow(2,s.armor/(50.0+s.maxhp/10));
+        result *= result;
+        result += s.maxEnergy*s.maxEnergy + s.energyProduction * s.energyProduction * 50;
+        result *= s.weapons.size();
+        result *= s.moveSpeed / 300 * s.handling / 300;
+        
+        return result/11;
+}
+
+
+
+
diff --git a/enginecore.h b/enginecore.h
new file mode 100644
index 0000000..5ea49ae
--- /dev/null
+++ b/enginecore.h
@@ -0,0 +1,190 @@
+#ifndef ENGINECORE_H
+#define ENGINECORE_H
+
+#include "util.h"
+#include <SDL/SDL_rotozoom.h>
+#include <SDL/SDL_mixer.h>
+#include <fstream>
+#include <list>
+#include <algorithm>
+
+using namespace std;
+
+//a drawable object featering an image and a position
+class DObject
+{
+protected:
+        SDL_Surface* image;
+public:
+        double x;
+        double y;       
+        
+        DObject();
+        DObject(string filename, double newx, double newy);
+        DObject(SDL_Surface* newImage, double newx, double newy);
+        DObject(const DObject &o);
+        virtual ~DObject();
+        virtual void draw(SDL_Surface* screen); 
+};
+
+bool ooB(const DObject* o, SDL_Surface* screen);
+
+double armorF(double damage, double armor);
+
+class Levelable
+{
+protected:
+        double exp;
+        int level;
+public:
+        double next;
+        double lin;
+        double quad;
+        double cube;
+        
+        Levelable();
+        
+        int addExp(double moreExp);
+        int getLevel();
+        double getExp();
+        double* getExpPointer();
+};
+
+class Projectile: public DObject
+{
+public:
+        Projectile(SDL_Surface* newimage, double newx, double newy, double newdamage, double newcollisionsize, double newxSpeed, double newySpeed);
+        Projectile(const Projectile& P);
+        Projectile(string filename,vector<Mix_Chunk*>& sounds);
+        virtual ~Projectile(){};
+        double damage;
+        double armorPiercing;
+        double collisionSize;
+        double xSpeed;
+        double ySpeed;
+        
+        void frame(double time);
+        void rotateAccordingly();
+};
+
+class Item: public DObject
+{
+public:
+        double cost;
+        bool sellable;
+        Item(const Item& item);
+        Item(const DObject& dObject);
+        Item(){};
+        SDL_Surface* getImage();
+};
+
+class Weapon: public Item
+{
+protected:
+        vector<double> startTimer;
+        vector<Projectile*> prototypes;
+public:
+        bool playSound;
+        vector<vector<Mix_Chunk*> > sounds;
+        bool active;
+        string name;
+        double energyUsage;
+        vector<double> cooldown;
+        vector<double> currentTimer;
+        Weapon(const Weapon& w);
+        Weapon(string filename);
+        ~Weapon();
+        vector<Projectile*> frame(double time);
+        void mirror();
+        double getDPS() const;
+        double getDPE() const;
+};
+
+
+class Upgradeable
+{
+protected:
+        double value;
+public:
+        string name;
+        double cost;
+        int level;
+        int maxLevel;
+        void setValue(double nvalue);
+        double getValue() const;
+        Upgradeable();
+        Upgradeable(double d);
+        operator double() const;
+        Upgradeable& operator=(const double& d);
+        void upgrade();
+        void save(ofstream& o);
+        void load(ifstream& i);
+};
+
+ifstream& operator>>(ifstream& ins, Upgradeable& u);
+
+class Ship: public DObject
+{
+public:
+        Ship(string filename,int x, int y);
+        Ship(){};
+        Ship(const Ship& s);
+        virtual ~Ship();
+        string name;
+        double hp;
+        Upgradeable maxhp;
+        Upgradeable armor;
+        Upgradeable moveSpeed;
+        double collisionSize;
+        vector<Weapon*> weapons;
+        vector<pair<int, int> > slotPositions;
+        int hit(const Projectile& P);
+//      void draw(SDL_Surface* screen);
+        virtual vector<Projectile*> frame(double time);
+};
+
+class EnemyShip: public Ship
+{
+public:
+        vector<pair<double, double> > path;
+        double gold;
+        double exp;
+        double score;
+        unsigned int current;
+        EnemyShip(const EnemyShip& s);
+        EnemyShip(string filename);
+        vector<Projectile*> frame(double time);
+        void assignValue();
+};
+
+class UserShip: public Ship
+{
+public:
+        SDL_Surface* getImage();
+        double cost;
+        double energy;
+        Upgradeable maxEnergy;
+        Upgradeable energyProduction;
+        Upgradeable handling;
+        double xSpeed;
+        double ySpeed;
+        int weaponSlots;
+        vector<double> maxSize;
+        int right;
+        int down;
+        int shooting;
+        
+        UserShip(string filename);
+        
+        void draw(SDL_Surface* screen);
+        vector<Upgradeable*> getUpgradeables();
+        void reset();
+        
+        vector<Projectile*> frame(double time, SDL_Surface* screen);
+};
+
+double estimateValue(const Weapon& w);
+double estimateValue(const UserShip& s);
+
+
+#endif
diff --git a/knownbugs.txt b/knownbugs.txt
new file mode 100644
index 0000000..84ebdc4
--- /dev/null
+++ b/knownbugs.txt
@@ -0,0 +1 @@
+randomly segfaults on exit (debuggeroutput was unreliable, probably mistake in makefile and thereby fixed)
diff --git a/main.cpp b/main.cpp
new file mode 100644
index 0000000..9cf73d4
--- /dev/null
+++ b/main.cpp
@@ -0,0 +1,817 @@
+#include "main.h"
+AbstractInteractive* getWeaponInfo(Weapon* w, SDL_Rect target, int textSize)
+{
+        SDL_Rect tRect = target;
+        tRect.w -= 10;
+        tRect.x = 0;
+        tRect.y = 0;
+        string info;
+        info += w->name + "\n";
+        info += "Cost: " + lltostr(w->cost) + "\n";
+        info += "DPS: " + dbltostr(w->getDPS(),1) + "\n";
+        info += "DPE: " + dbltostr(w->getDPE(),1) + "\n";
+        info += "Energyusage: " + dbltostr(w->energyUsage,1);
+        TextBox* tb = new TextBox(textField(info, tRect, textSize));
+        return new Scrollable(target, tb, tRect, 0, 0);
+}
+
+AbstractInteractive* getShipInfo(UserShip* s, SDL_Rect target, int textSize)
+{
+        SDL_Rect tRect = target;
+        tRect.w -= 10;
+        tRect.x = 0;
+        tRect.y = 0;
+        string info;
+        info += s->name + "\n";
+        info += "Cost: " + lltostr(s->cost) + "\n";
+        info += "HP: " + lltostr(s->hp) + "\n";
+        info += "Armor: " + lltostr(s->armor) + "\n";
+        info += "Energy Storage: " + lltostr(s->maxEnergy) + "\n";
+        info += "Energy Production: " + lltostr(s->energyProduction) + "\n";
+        info += "Acceleration: " + lltostr(s->handling) + "\n";
+        info += "Top Speed: " + lltostr(s->moveSpeed) + "\n";
+        info += "Slots: " + lltostr(s->weapons.size()) + "\n";
+        TextBox* tb = new TextBox(textField(info, tRect, textSize));
+        return new Scrollable(target, tb, tRect, 0, 0);
+}
+
+Shop::~Shop()
+{
+        for(int i = 0; i < (int) weapons.size(); ++i)
+                delete weapons[i];
+        for(int i = 0; i < (int) ships.size(); ++i)
+                delete ships[i];
+        delete menu;
+        delete back;
+        delete goldLabel;
+}
+
+Shop::Shop(Account** nuser, int ngameMenu)
+{
+        user = nuser;
+        SDL_Rect labelPos;
+        labelPos.x = 350;
+        labelPos.y = 18;
+        labelPos.h = 16;
+        goldLabel = new Label("gold: " + lltostr((*user)->gold),labelPos);
+        SDL_Rect subScreen;
+        subScreen.w = 400;
+        subScreen.h = 400;
+        subScreen.x = 50;
+        subScreen.y = 70;
+        gameMenu = ngameMenu;
+        currentWeapon = 0;
+        currentShip = 0;
+        SDL_Surface* BG = loadBMP("data/images/bg_stars.bmp");
+        SDL_Surface* mbg = SDL_CreateRGBSurface(0,400,400,32,0,0,0,0);
+        SDL_FillRect(mbg,NULL,0x000102);
+        SDL_SetColorKey(mbg,SDL_SRCCOLORKEY,0x000102);
+        vector<string> ts1;
+        vector<int>     ti1;
+        tu = (*user)->ships[(*user)->current]->getUpgradeables();
+        for(int i = 0; i < (int) tu.size(); ++i)
+        {
+                ts1.push_back("Upgrade " + tu[i]->name);
+//              if(tu[i]->cost <= user->gold)
+                        ti1.push_back(i+(1<<7));
+//              else
+//                      ti1.push_back(0);
+//              cout << tu[i]->cost << " " << user->gold << endl;
+        }
+        
+        vector<AbstractInteractive*> submenues;
+        Menu* upgradeMenu = new Menu(ts1, ti1, mbg, false, mbg);
+        for(int i = 0; i < (int) upgradeMenu->buttons.size(); ++i)
+                disabledUpgrades.push_back(&upgradeMenu->buttons[i]->deactivated);
+        submenues.push_back(upgradeMenu);
+        int height;
+        
+        //reading available weapons
+        ifstream ins;
+        string path = "data/weapons/";
+        ins.open((path+"weapons.txt").c_str());
+        char workaround;
+        ins >> workaround;
+        vector<SDL_Surface*> weaponPics;
+        SDL_Rect targetRect;
+        targetRect.x = 400 -58;
+        targetRect.y = 0;
+        targetRect.w = 58;
+        targetRect.h = 400;
+        SDL_Rect infoRect;
+        infoRect.x = 50;
+        infoRect.y = 75;
+        infoRect.w = 400 - 68;
+        infoRect.h = 390;
+        while(ins.good())
+        {
+                string filepath;
+                getline(ins,filepath);
+                Weapon* w = new Weapon(path+workaround+filepath);
+                if(w->sellable)
+                {
+                        weaponInfos.push_back(getWeaponInfo(w, infoRect, 15));
+                        weaponPics.push_back(copyImage(w->getImage()));
+                        weapons.push_back(w);
+                        //cout << w->name << ": " << estimateValue(*w) << endl;
+                }
+                else
+                        delete w;
+                ins >> workaround;
+        }
+        ins.close();
+        SDL_Rect subRect;
+        subRect.w = 48;
+        Menu* tempm = new Menu(weaponPics, subRect.w,height, true, false);
+        subRect.h = height;
+        Scrollable* temps = new Scrollable(targetRect, tempm, subRect, false, true);
+        submenues.push_back(temps);
+        path = "data/ships/user/";
+        ins.open((path+"userships.txt").c_str());
+        ins >> workaround;
+        vector<SDL_Surface*> shipPics;
+        Weapon empty = Weapon("data/weapons/empty.txt");
+        while(ins.good())
+        {
+                string filepath;
+                getline(ins,filepath);
+                UserShip* s = new UserShip(path+workaround+filepath);
+                for(int i = 0; i < (int) s->weapons.size(); ++i)
+                {
+                        delete s->weapons[i];
+                        s->weapons[i] = new Weapon(empty);
+                }
+                if(true)//s->sellable)
+                {
+                        shipPics.push_back(copyImage(s->getImage()));
+                        shipInfos.push_back(getShipInfo(s, infoRect, 16));
+//                      cout << s->name << " " << estimateValue(*s) << endl;
+                        ships.push_back(s);
+                }
+                else
+                        delete s;
+                ins >> workaround;
+        }
+        ins.close();
+        targetRect.x = 400 -58;
+        targetRect.y = 0;
+        targetRect.w = 58;
+        targetRect.h = 400;
+        subRect.w = 48;
+        tempm = new Menu(shipPics, subRect.w,height, true, false);
+        subRect.h = height;
+        temps = new Scrollable(targetRect, tempm, subRect, false, true);
+        submenues.push_back(temps);
+        SDL_Rect backPos;
+        backPos.x = 0;
+        backPos.y = subScreen.h + subScreen.y;
+        backPos.w = 500;
+        backPos.h = 500 - backPos.y;
+        int tsize = 0;
+        back = new Button(backPos, "back", tsize);
+        int NStates = 3;
+        int topmargin2 = 45;
+        backPos.x = 0;
+        backPos.y = topmargin2;
+        backPos.w = 500/NStates;
+        backPos.h = subScreen.y-topmargin2;
+        tsize = 0;
+        vector<Button*> choices;
+        choices.push_back(new Button(backPos, "Upgrades", tsize));
+        backPos.x = 500 / NStates;
+        backPos.y = topmargin2;
+        backPos.w = 500/NStates;
+        backPos.h = subScreen.y-topmargin2;
+        choices.push_back(new Button(backPos, "Weapons", tsize));
+        backPos.x = 2* 500 / NStates;
+        backPos.y = topmargin2;
+        backPos.w = 500/NStates;
+        backPos.h = subScreen.y - topmargin2;
+        choices.push_back(new Button(backPos, "Ships", tsize));
+        for(int i = 0; i < (int) choices.size(); ++i)
+                choices[i]->isDblClckButton = true;
+        menu = new CompositMenu(submenues, BG, subScreen, choices);
+}
+
+int Shop::handleEvents(SDL_Event event){
+        int result = 0;
+        if(back->handleEvents(event) == BUTTON_CLICKED)
+                result = gameMenu;
+        int bought = menu->handleEvents(event);
+        if(menu->getState() == 0 && (bought & 1<<7))
+        {
+                bought -= 1 << 7;
+//              cout << "tried to buy something!" << endl;
+                if(tu[bought]->cost <= (*user)->gold)
+                {
+                        (*user)->gold -= tu[bought]->cost;
+                        double oldvalue = *tu[bought];
+                        tu[bought]->upgrade();
+                        double newvalue = *tu[bought];
+                        cout << "Bought Upgrade from " << oldvalue << " to " << newvalue << endl;
+                        refresh();
+                        cout << "nextcost: " << tu[bought]->cost << endl;
+                }
+        }
+        if(menu->getState() == 1 && (bought & MENU_CLICK))
+        {
+                bought -= MENU_CLICK;
+                if(weapons[bought]->cost <= (*user)->gold)
+                {
+                        (*user)->gold -= weapons[bought]->cost;
+                        bool hasEmptySlot = false;
+                        int EmptySlot;
+                        for(int i = 0; i < (int) (*user)->ships[(*user)->current]->weapons.size(); ++i)
+                                if((*user)->ships[(*user)->current]->weapons[i]->name == "empty Slot")
+                        {
+                                hasEmptySlot = true;
+                                EmptySlot = i;
+                        }
+                        if(hasEmptySlot)
+                                (*user)->ships[(*user)->current]->weapons[EmptySlot] = new Weapon(*weapons[bought]);
+                        else
+                                (*user)->weapons.push_back(new Weapon(*weapons[bought]));
+                        cout << "Bought " << weapons[bought]->name << endl;
+                        refresh();
+                }
+        }
+        if(menu->getState() == 1 && (bought & MENU_SELECT))
+        {
+                bought -= MENU_SELECT;
+                currentWeapon = bought;
+        }
+        if(menu->getState() == 2 && (bought & MENU_CLICK))
+        {
+                bought -= MENU_CLICK;
+                if(ships[bought]->cost <= (*user)->gold)
+                {
+                        (*user)->gold -= ships[bought]->cost;
+                        (*user)->current = (*user)->ships.size();
+                        (*user)->ships.push_back(new UserShip(*ships[bought]));
+                        cout << "Bought " << ships[bought]->name << endl;
+                        refresh();
+                }               
+        }
+        if(menu->getState() == 2 && (bought & MENU_SELECT))
+        {
+                bought -= MENU_SELECT;
+                currentShip = bought;
+        }
+        return result;
+}
+void Shop::frame(double time)
+{
+        menu->frame(time);
+}
+void Shop::draw(SDL_Surface* screen)
+{
+        menu->draw(screen);
+        SDL_Color textColor;
+        textColor.r = 255;
+        textColor.g = 255;
+        textColor.b = 255;
+        TTF_Font *font = TTF_OpenFont("data/fonts/OpenSans-Semibold.ttf", 30);
+        SDL_Surface* headline = NULL;
+        headline = TTF_RenderText_Solid(font, "Shop",textColor);
+        if(headline == NULL)
+        {
+                cout << "Error rendering headline of shop" << endl;
+                return;
+        }
+        TTF_CloseFont(font);
+        SDL_Rect headpos;
+        headpos.x = screen->w/2 - headline->w/2;
+        headpos.y = 5;
+        SDL_BlitSurface(headline, NULL, screen, &headpos);
+        SDL_FreeSurface(headline);
+        back->draw(screen);
+        goldLabel->draw(screen);
+        if(menu->getState() == 1)
+                weaponInfos[currentWeapon]->draw(screen);
+        if(menu->getState() == 2)
+                shipInfos[currentShip]->draw(screen);
+}
+
+void Shop::refresh()
+{
+        goldLabel->setCaption("gold: " + lltostr((*user)->gold));
+        menu->refresh();
+        tu = (*user)->ships[(*user)->current]->getUpgradeables();
+        for(int i = 0; i < (int) tu.size(); ++i)
+                *disabledUpgrades[i] = (*user)->gold < tu[i]->cost;
+}
+
+        
+InventoryMenu::~InventoryMenu()
+{
+        delete BG;
+        delete back;
+        delete shipMenu;
+        delete weaponMenu;
+        for(int i = 0; i < slots.size(); ++i)
+                delete slots[i];
+        SDL_FreeSurface(ship);
+        delete title;
+}
+
+InventoryMenu::InventoryMenu(Account** nuser, int ngameMenu)
+{
+        MX = 0;
+        MY = 0;
+        user = nuser;
+        gameMenu = ngameMenu;
+        BG = new SlidingBackground(loadBMP("data/images/bg_stars.bmp"), 0, 100);
+        SDL_Rect backPos;
+        backPos.x = 0;
+        backPos.y = 460;
+        backPos.w = 500;
+        backPos.h = 500 - backPos.y;
+        int tsize = 0;
+        back = new Button(backPos, "back", tsize);
+        cursor = NULL;
+        sellDropzone.x = 100;
+        sellDropzone.h = 40;
+        sellDropzone.y = 460;
+        sellDropzone.w = 150;
+        sellLabel = new Label("SELL",sellDropzone);
+        SDL_Rect titlePos;
+        titlePos.x = 0;
+        titlePos.h = 50;
+        titlePos.y = 0;
+        titlePos.w = 500;
+        title = new Label("Inventory",titlePos);
+        vector<SDL_Surface*> tships;
+        for(int i = 0; i < (*user)->ships.size(); ++i)
+        {
+                ships.push_back(copyImage((*user)->ships[i]->getImage()));
+                tships.push_back(copyImage((*user)->ships[i]->getImage()));
+        }
+        int height = 0;
+        Menu* temp = new Menu(tships, 48, height, true, false);
+        SDL_Rect shipMenuPos;
+        shipMenuPos.x = 10;
+        shipMenuPos.y = 50;
+        shipMenuPos.h = 410;
+        shipMenuPos.w = 58;
+        SDL_Rect subRect;
+        subRect.h = height;
+        subRect.w = 48;
+        shipMenu = new Scrollable(shipMenuPos, temp, subRect, 0, 1);
+        vector<SDL_Surface*> tweapons;
+        for(int i = 0; i < (*user)->weapons.size(); ++i)
+        {
+                weapons.push_back(copyImage((*user)->weapons[i]->getImage()));
+                tweapons.push_back(copyImage((*user)->weapons[i]->getImage()));
+        }
+        height = 0;
+        temp = new Menu(tweapons, 48, height, false, true);
+        SDL_Rect weaponMenuPos;
+        weaponMenuPos.x = 500-68;
+        weaponMenuPos.y = 50;
+        weaponMenuPos.h = 410;
+        weaponMenuPos.w = 58;
+        subRect.h = height;
+        subRect.w = 48;
+        weaponMenu = new Scrollable(weaponMenuPos, temp, subRect, 0, 1);
+        ship = copyImage((*user)->ships[(*user)->current]->getImage());
+        int factor = 1;
+        while(ship->w < 190 && ship->h < 190)
+        {
+                SDL_Surface* temp = ship;
+                ship = rotozoomSurface(temp, 0, 2, 0);
+                SDL_FreeSurface(temp);
+                factor *= 2;
+        }
+        for(int i = 0; i < (*user)->ships[(*user)->current]->weapons.size(); ++i)
+        {
+                UserShip* s = (*user)->ships[(*user)->current];
+                SDL_Rect slotPos;
+                slotPos.x = 250 - 24 + factor * s->slotPositions[i].first;
+                slotPos.y = 250 - 24 + factor * s->slotPositions[i].second;
+                slotPos.w = 48;
+                slotPos.h = 48;
+                slots.push_back(new Button(slotPos, copyImage(s->weapons[i]->getImage()), 0));
+        }
+}
+
+void InventoryMenu::draw(SDL_Surface *screen)
+{
+        BG->draw(screen);
+        SDL_Rect shipPos;
+        shipPos.x = 250 - ship->w/2;
+        shipPos.y = 250 - ship->h/2;
+        SDL_BlitSurface(ship, NULL, screen, &shipPos);
+        title->draw(screen);
+        back->draw(screen);
+        sellLabel->draw(screen);
+        shipMenu->draw(screen);
+        weaponMenu->draw(screen);
+        for(int i = 0; i < slots.size(); ++i)
+                slots[i]->draw(screen);
+        if(cursor != NULL)
+        {
+                SDL_Rect cursorPos;
+                cursorPos.x = MX - cursor->w/2;
+                cursorPos.y = MY - cursor->h/2;
+                SDL_BlitSurface(ship,NULL,screen,&cursorPos);
+        }
+}
+
+/*SlidingBackground* BG;
+        Label* title;
+        Account** user;
+        int gameMenu;
+        Button* back;
+        Label* sellLabel;
+        SDL_Rect sellDropzone;
+        AbstractInteractive* shipMenu;
+        vector<SDL_Surface*> ships;
+        AbstractInteractive* weaponMenu;
+        vector<SDL_Surface*> weapons;
+        SDL_Rect weaponDropzone;
+        vector<Button*> slots;
+        SDL_Surface* ship;
+        SDL_Surface* cursor;*/
+int InventoryMenu::handleEvents(SDL_Event event)
+{
+        if(event.type == SDL_MOUSEMOTION)
+        {
+                MX = event.motion.x;
+                MY = event.motion.y;
+        }
+        int tempShip = shipMenu->handleEvents(event);
+        if(tempShip & MENU_SELECT)
+        {
+                tempShip -= MENU_SELECT;
+                cout << tempShip << endl;
+                (*user)->current = tempShip;
+                refresh();
+        }
+        int tempweapon = weaponMenu->handleEvents(event);
+        if(tempweapon & MENU_SELECT)
+        {
+                tempweapon -= MENU_SELECT;
+                cout << tempweapon << endl;
+                cursor = copyImage(weapons[tempweapon]);
+                dragged = tempweapon;
+        }
+        
+        if(event.type == SDL_MOUSEBUTTONUP)
+        {
+                if(event.button.button == SDL_BUTTON_LEFT)
+                {
+                        SDL_FreeSurface(cursor);
+                        cursor = NULL;
+                        int x = event.button.x;
+                        int y = event.button.y;
+                }
+        }
+        
+        
+        
+        
+        int backb = back->handleEvents(event);
+        if(backb == BUTTON_CLICKED)
+                return gameMenu; 
+        return 0;
+}
+
+void InventoryMenu::frame(double time)
+{
+        BG->frame(time);
+}
+
+void InventoryMenu::refresh()
+{
+        if(cursor != NULL)
+        {
+                SDL_FreeSurface(cursor);
+                cursor = NULL;
+        }
+}
+
+bool init(SDL_Surface*& screen)
+{
+        srand(time(0));
+        
+        if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) == -1)
+        {
+                cout << "Error: Could not initialize SDL" << endl;
+                return 0;
+        }
+        screen = SDL_SetVideoMode(SCREEN_WIDTH,SCREEN_HEIGHT,SCREEN_BPP,SDL_SWSURFACE);
+        if(!screen)
+        {
+                cout << "could not initialize screen" << endl;
+                return 0;
+        }
+        if(TTF_Init() == -1)
+        {
+                cout << "could not initialize True Fonts" << endl;
+                return 0;
+        }
+        if(Mix_OpenAudio(22050, MIX_DEFAULT_FORMAT, 2, 4096) == -1)
+        {
+                return 0;
+        }
+        
+        SDL_WM_SetCaption("RCade - v0.03", NULL);
+        
+        
+        return 1;
+}
+
+Menu* makeLoadGameMenu(SDL_Surface *screen)
+{
+        string bfile = "data/images/bg_stars.bmp";
+        SDL_Surface *bg = loadBMP(bfile);
+        vector<string> ts;
+        vector<int> ti;
+        ifstream ins;
+        ins.open("save/saves.txt");
+        char workaround;
+        ins >> workaround;
+        int counter = 0;
+        while(ins.good())
+        {
+                string account;
+                getline(ins, account);
+                account = workaround + account;
+                _tospace(account);
+                ts.push_back(account);
+                ti.push_back(counter | LOAD);
+                counter++;
+                ins >> workaround;
+        }
+        ins.close();
+        ts.push_back("back");
+        ti.push_back(MENU | 0);
+        return new Menu(ts,ti,bg,true,screen);
+}
+
+Menu* makeMainMenu(SDL_Surface *screen)
+{
+        string bfile = "data/images/bg_stars.bmp";
+        SDL_Surface *bg = loadBMP(bfile);
+        vector<string> ts;
+        ts.push_back("New Game");
+        ts.push_back("Load Game");
+        ts.push_back("Settings");
+        ts.push_back("Quit");
+        vector<int> ti;
+        ti.push_back(MENU | 5);
+        ti.push_back(MENU | 4);
+        ti.push_back(0);
+        ti.push_back(GAME_QUIT);
+        return new Menu(ts,ti,bg,true,screen);
+}
+
+Menu* makeGameMenu(SDL_Surface *screen)
+{
+        string bfile = "data/images/bg_stars.bmp";
+        SDL_Surface *bg = loadBMP(bfile);
+        vector<string> ts;
+        ts.push_back("Missions");
+        ts.push_back("Shop");
+        ts.push_back("Inventory");
+        ts.push_back("Skills");
+        ts.push_back("Settings");
+        ts.push_back("Save Game");
+        ts.push_back("Main Menu");
+        vector<int> ti;
+        ti.push_back(MENU | 2);
+        ti.push_back(MENU | 3);
+        ti.push_back(MENU | 6);
+        ti.push_back(0);
+        ti.push_back(0);
+        ti.push_back(SAVE);
+        ti.push_back(MENU | 0);
+        return new Menu(ts,ti,bg,true,screen);
+}
+
+Menu* makeLevelMenu(vector<string> levels, SDL_Surface *screen)
+{
+        string bfile = "data/images/bg_stars.bmp";
+        SDL_Surface *bg = loadBMP(bfile);
+        vector<string> ts;
+        vector<int> ti;
+        ifstream ins;
+        for(int i = 0; i < (int) levels.size(); ++i)
+        {
+                ins.open(levels[i].c_str());
+                string levelname;
+                getline(ins,levelname);
+                ins.close();
+                ts.push_back(levelname);
+                ti.push_back(LEVEL | i);
+        }
+        ts.push_back("back");
+        ti.push_back(MENU | 1);
+        return new Menu(ts,ti,bg,true,screen);
+}
+
+
+GameHandler::GameHandler()
+{
+        isGood = true;
+        screen = NULL;
+        if(!init(screen))
+                isGood = false;
+        //reading available levels
+        ifstream ins;
+        string path = "data/levels/";
+        ins.open((path+"levels.txt").c_str());
+        char workaround;
+        ins >> workaround;
+        while(ins.good())
+        {
+                string filepath;
+                getline(ins,filepath);
+                levelpaths.push_back(path+workaround+filepath);
+                ins >> workaround;
+        }
+        ins.close();
+        state = MENU | 0;
+        user = new Account();
+        menus.push_back(makeMainMenu(screen));
+        menus.push_back(makeGameMenu(screen));
+        menus.push_back(makeLevelMenu(levelpaths,screen));
+        menus.push_back(new Shop(&user, MENU | 1));
+        menus.push_back(makeLoadGameMenu(screen));
+        SDL_Surface* bg = loadBMP("data/images/bg_stars.bmp");
+        GetStringMenu* mt = new GetStringMenu("Enter your Nickname:", MENU | 0, LEVEL | 0, bg, screen);
+        acname = &mt->s;
+        menus.push_back(mt);
+        user->resetShips();
+        menus.push_back(new InventoryMenu(&user, MENU | 1));
+}
+
+GameHandler::~GameHandler()
+{
+        delete user;
+        if(state &LEVEL)
+                delete LG;
+        for(int i = 0; i < (int) menus.size(); ++i)
+                delete menus[i];
+        
+        
+        Mix_CloseAudio();
+        TTF_Quit();
+        SDL_Quit();
+        IMG_Quit();
+}
+
+int GameHandler::game()
+{       
+//      SDL_Rect nPos;
+//      nPos.x = 10;
+//      nPos.y = 10;
+//      nPos.w = 200;
+//      nPos.h = 400;
+//      TextBox* blub = new TextBox(textField("Dies ist ein doofer Tesptsatzg.\nBBBBBBBBesser nicht allzu sehr beachten, denn der Inhalt ist unwichtig!",nPos,24));
+//      cout << nPos.h << endl;
+
+        SDL_Event event;
+        if(!isGood)
+                return 1;
+        while(state != GAME_QUIT)
+        {
+                Uint32 start = SDL_GetTicks();
+                while(SDL_PollEvent(&event))
+                {
+                        if(state & MENU)
+                        {
+//                              blub->handleEvents(event);
+                                int newstate = menus[state - MENU]->handleEvents(event);
+                                if(newstate)
+                                {
+                                        state = newstate;
+                                        if(state & LEVEL)
+                                        {
+                                                if(*acname != "")
+                                                {
+                                                        delete user;
+                                                        user = new Account("save/default account.txt");
+                                                        user->name = *acname;
+                                                        menus[5]->refresh();
+                                                        menus[3]->refresh();
+                                                        user->resetShips();
+                                                }
+                                                if(state - LEVEL < 0 || state - LEVEL > (int) levelpaths.size())
+                                                {
+                                                        cout << "levellinking failed!" << endl;
+                                                        return 1;
+                                                }
+                                                user->resetShips();
+                                                LG = new LevelGenerator(levelpaths[state - LEVEL], user, screen);
+                                        }
+                                        if(state & MENU)
+                                                menus[state - MENU]->refresh();
+                                        if(state & LOAD)
+                                        {
+                                                ifstream ins;
+                                                ins.open("save/saves.txt");
+                                                char workaround;
+                                                ins >> workaround;
+                                                int counter = 0;
+                                                while(ins.good())
+                                                {
+                                                        string account;
+                                                        getline(ins, account);
+                                                        if(counter == state - LOAD)
+                                                        {
+                                                                account = workaround + account;
+                                                                delete user;
+                                                                user = new Account("save/" + account + ".txt");
+                                                                menus[3]->refresh();
+                                                                menus[6]->refresh();
+                                                                user->resetShips();
+                                                                state = MENU | 1;
+                                                        }
+                                                        counter++;
+                                                        ins >> workaround;
+                                                }
+                                                ins.close();
+                                        }
+                                        if(state & SAVE)
+                                        {
+                                                user->save();
+                                                delete menus[4];
+                                                menus[4] = makeLoadGameMenu(screen);
+                                                state = MENU | 1;
+                                                cout << "Saved!" << endl;
+                                        }
+                                }
+                        }
+                        if(event.type == SDL_QUIT)
+                                state = GAME_QUIT;
+                        else if(event.type == SDL_MOUSEBUTTONDOWN)
+                        {
+//                              if(event.button.button == SDL_BUTTON_WHEELUP)
+//                                      cout << "Wheel up!" << endl;
+//                              else
+//                                      cout << "wheel down..." << endl;
+                        }
+                }
+                Uint32 time = SDL_GetTicks()-start;
+                if(1000/60.0 - time > 0)
+                        SDL_Delay(1000/60.0 - time);
+                else
+                        cout << "Warning: Frame missed" << endl;
+                if(state & LEVEL)
+                {
+                        int status = LG->frame(1/60.0);
+                        if(status == LEVEL_FAILED)
+                        {
+                                state = 1 | MENU;
+                                cout << "You lost the game!\n";
+                                cout << "highscore: " << LG->OH->highscore << endl;
+                                cout << "Level: " << user->getLevel() << endl;
+                                user->highscore += LG->OH->highscore;
+                                delete LG;
+                                user->resetShips();
+                        }
+                        else if(status == LEVEL_COMPLETED)
+                        {
+                                state = 1 | MENU;
+                                cout << "You have completed the level!\n";
+                                cout << "highscore: " << LG->OH->highscore << endl;
+                                cout << "gold: " << LG->OH->gold << endl;
+                                cout << "exp: " << user->getExp() << endl;
+                                cout << "Level: " << user->getLevel() << endl;
+                                user->highscore += LG->OH->highscore;
+                                user->gold += LG->OH->gold;
+                                delete LG;
+                                user->resetShips();
+                        }
+                }
+                if(state & MENU)
+                {
+                        menus[state - MENU]->frame(1/60.0);
+                        menus[state - MENU]->draw(screen);
+//                      blub->frame(1/60.0);
+//                      blub->draw(screen);
+                }
+                SDL_Flip(screen);
+        }
+        
+//      delete blub;
+        
+        return 0;
+}
+
+int main(int argc, char* args[])
+{
+        GameHandler* GH = new GameHandler();
+        
+//      Account a = Account();
+//      a.name = "Start-Account";
+//      a.save();
+//      Account b = Account("save/Start-Account.txt");
+//      b.save();
+//      return 0;
+        if(GH->game())
+                return 1;
+        delete GH;
+        return 0;
+}
diff --git a/main.h b/main.h
new file mode 100644
index 0000000..17c0e3c
--- /dev/null
+++ b/main.h
@@ -0,0 +1,114 @@
+/*
+THIS PROJECT IS USING OPEN SANS TRUE TYPE FONTS
+see: www.google.com/fonts/specimen/Open+Sans
+You find a copy ofthe license under /data/fonts/
+*/
+
+#include "engine.h"
+
+using namespace std;
+
+#define LEVEL (1 << 30)
+#define MENU (1 << 29)
+#define LOAD (1 << 27)
+#define SAVE (1 << 26)
+#define GAME_QUIT (1 << 28)
+
+
+const int SCREEN_WIDTH = 500;
+const int SCREEN_HEIGHT = 500;
+const int SCREEN_BPP = 32;
+
+//class UpgradesMenu: public Menu
+//{
+//public:
+//      vector<string> labels;
+//      
+//};
+
+class Shop: public AbstractInteractive
+{
+protected:
+        Account** user;
+        vector<Upgradeable*> tu;
+        vector<Weapon*> weapons;
+        vector<AbstractInteractive*> weaponInfos;
+        int currentWeapon;
+        vector<UserShip*> ships;
+        vector<AbstractInteractive*> shipInfos;
+        int currentShip;
+        vector<bool*> disabledUpgrades;
+        int gameMenu;
+        Button* back;
+        CompositMenu* menu;
+        Label* goldLabel;
+public:
+        Shop(){}
+        ~Shop();
+        Shop(Account** user, int GameMenu);
+        void draw(SDL_Surface *screen);
+        int handleEvents(SDL_Event event);
+        void frame(double time);
+        void updateUpgradeMenu();
+        virtual void refresh();
+};
+
+class InventoryMenu: public AbstractInteractive
+{
+public:
+        Label* title;
+        SlidingBackground* BG;
+        Account** user;
+        int gameMenu;
+        Button* back;
+        Label* sellLabel;
+        SDL_Rect sellDropzone;
+        AbstractInteractive* shipMenu;
+        vector<SDL_Surface*> ships;
+        AbstractInteractive* weaponMenu;
+        vector<SDL_Surface*> weapons;
+        SDL_Rect weaponDropzone;
+        vector<Button*> slots;
+        //always NULL if nothing is dragged
+        SDL_Surface* cursor;
+        //wich item is currently dragged
+        int dragged;
+        int MX;
+        int MY;
+        SDL_Surface* ship;
+        
+        
+        ~InventoryMenu();
+        InventoryMenu(Account** user, int ngamMenu);
+        void draw(SDL_Surface *screen);
+        int handleEvents(SDL_Event event);
+        void frame(double time);
+        void refresh();
+};
+
+bool init(SDL_Surface*& screen);
+
+Menu* makeMainMenu(SDL_Surface *screen);
+Menu* makeGameMenu(SDL_Surface *screen);
+Menu* makeLevelMenu(vector<string> levels, SDL_Surface *screen);
+
+class GameHandler
+{
+private:
+        Account *user;
+        SDL_Surface *screen;
+        LevelGenerator *LG;
+        vector<AbstractInteractive*> menus;
+        vector<string> levelpaths;
+        bool isGood;
+        int state;
+        string* acname;
+public:
+        GameHandler();
+        ~GameHandler();
+//      returns 0 if succesfully quits, 1 otherwise
+        int game();
+};
+
+int main(int argc, char* args[]);
+
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..b5fdb2a
--- /dev/null
+++ b/makefile
@@ -0,0 +1,27 @@
+RM = rm -f
+SRCS = main.cpp GUI.cpp util.cpp engine.cpp enginecore.cpp
+OBJS = $(subst .cpp,.o,$(SRCS))
+HEADS = $(subst .cpp,.h,$(SRCS))
+CFLAGS = -Wall -ggdb -O2 -c -Wno-sign-compare
+LFLAGS = -Wall -ggdb -O2 -lSDL -lSDL_gfx -lSDL_image -lSDL_ttf -lSDL_mixer -Wno-sign-compare
+
+Game: $(OBJS)
+        g++ $(OBJS) $(LFLAGS) -o Game
+
+main.o: main.cpp $(HEADS)
+        g++ main.cpp $(CFLAGS) -o main.o
+
+GUI.o: GUI.cpp GUI.h util.h
+        g++ GUI.cpp $(CFLAGS) -o GUI.o
+
+util.o: util.cpp util.h
+        g++ util.cpp $(CFLAGS) -o util.o
+
+engine.o: engine.cpp GUI.h util.h engine.h enginecore.h
+        g++ engine.cpp $(CFLAGS) -o engine.o
+
+enginecore.o: enginecore.cpp util.h enginecore.h
+        g++ enginecore.cpp $(CFLAGS) -o enginecore.o
+
+clean:
+        $(RM) $(OBJS)
diff --git a/save/.keep b/save/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/save/.keep
diff --git a/util.cpp b/util.cpp
new file mode 100644
index 0000000..a1cf8e9
--- /dev/null
+++ b/util.cpp
@@ -0,0 +1,173 @@
+#include "util.h"
+
+
+vector<vector<string> > splitString(string s)
+{
+        vector<vector<string> > result;
+        vector<string> line;
+        string word;
+        for(int i = 0; i < (int) s.size(); ++i)
+        {
+                if(s[i] == ' ')
+                {
+                        line.push_back(word);
+                        word = "";
+                }
+                else if(s[i] == '\n')
+                {
+                        line.push_back(word);
+                        word = "";
+                        result.push_back(line);
+                        line = vector<string>();
+                }
+                else
+                        word += s[i];
+        }
+        line.push_back(word);
+        result.push_back(line);
+        return result;
+}
+
+void _tospace(string &s)
+{
+        for(int i = 0; i < (int) s.size(); ++i)
+                if(s[i] == '_')
+                        s[i] = ' ';
+}
+
+void spaceto_(string &s)
+{
+        for(int i = 0; i < (int) s.size(); ++i)
+                if(s[i] == ' ')
+                        s[i] = '_';
+}
+
+double round_beautiful(double d)
+{
+        if(d == 0)
+                return d;
+        double ten = 1;
+        while(d >= 10)
+        {
+                d/= 10;
+                ten *= 10;
+        }
+        while(d < 1)
+        {
+                d*= 10;
+                ten /= 10;
+        }
+        vector<double> candidates;
+        candidates.push_back((int)d);
+        candidates.push_back(((int)d) + 0.5);
+        if(ten > 1)
+        {
+                candidates.push_back(((int)d)/9.0*10);
+        }
+        int closest = 0;
+        double mindist = 10;
+        for(int i = 0; i < (int)candidates.size(); ++i)
+        {
+                if(mindist > fabs(candidates[i]-d))
+                {
+                        mindist = fabs(candidates[i]-d);
+                        closest = i;
+                }
+        }
+        double result = candidates[closest] * ten;
+        if(closest == 2)
+                result = (int) result;
+        return result;
+}
+
+SDL_Event relativate(const SDL_Event &e, SDL_Rect p)
+{
+        SDL_Event result = e;
+        if(e.type == SDL_MOUSEMOTION)
+        {
+                result.motion.x -= p.x;
+                result.motion.y -= p.y;
+        }
+        if(e.type == SDL_MOUSEBUTTONDOWN || e.type == SDL_MOUSEBUTTONUP)
+        {
+                result.button.x -= p.x;
+                result.button.y -= p.y;
+        }
+        return result;
+}
+
+bool inRect(SDL_Rect r, double x, double y)
+{
+        if(x < r.x || x >= r.x + r.w || y < r.y || y >= r.y + r.h)
+                return false;
+        return true;
+}
+
+SDL_Surface* copyImage(SDL_Surface* s)
+{
+        return SDL_ConvertSurface(s,s->format,SDL_SWSURFACE);
+}
+
+
+//loads a bitmap from file and converts it to screen properties
+SDL_Surface* loadBMP(std::string filename)
+{
+        SDL_Surface* loadedImage = NULL;
+        
+        SDL_Surface* convertedImage = NULL;
+        
+        loadedImage = IMG_Load(filename.c_str());
+        if(loadedImage != NULL)
+        {
+                convertedImage = SDL_DisplayFormat(loadedImage);
+                if(convertedImage)
+                {
+                        Uint32 colorkey = SDL_MapRGB(convertedImage->format, 0, 1, 2);
+                        SDL_SetColorKey(convertedImage, SDL_SRCCOLORKEY, colorkey);
+                        SDL_FreeSurface(loadedImage);
+                        return convertedImage;
+                }
+                cout << "Error: Could not convert Image" << filename << '.' << endl;
+        }
+        cout << "Error: Could not load bitmap from file " << filename << endl;
+        return NULL;
+}
+
+
+string lltostr(const long long& l)
+{
+        stringstream str;
+        str << l;
+        return str.str();
+}
+
+string dbltostr(const double& d, int dec)
+{
+        stringstream str;
+        long long bla = pow(10,dec);
+        str << ((long long) (bla*d))/((double) bla);
+        return str.str();
+}
+
+//returns true if the line intersects with the circle (or lies in it)
+bool intersects(double radius, double startx, double starty, double endx, double endy)
+{
+        double xdir = endx - startx;
+        double ydir = endy - starty;
+        //|dir*lambda+start|<radius
+        //(xdir^2+ydir^2)*lamda^2 + (xdir*startx + ydir*starty)*lamda + startx^2 + starty^2 - radius^2 = 0;
+        double a = xdir*xdir + ydir*ydir;
+        double b = xdir*startx + ydir*starty;
+        double c = startx*startx + starty*starty - radius*radius;
+        double dis = b*b - 4 * a * c;
+        if(dis < 0)
+                return false;
+        double sol1 = (-b + sqrt(dis))/(2*a);
+        if(sol1 < 0)
+                return false;
+        double sol2 = (-b - sqrt(dis))/(2*a);
+        if(sol2 > 1)
+                return false;
+        return true;
+        
+}
diff --git a/util.h b/util.h
new file mode 100644
index 0000000..acabdcb
--- /dev/null
+++ b/util.h
@@ -0,0 +1,39 @@
+#ifndef UTIL_H
+#define UTIL_H
+
+#include <vector>
+#include <iostream>
+#include <math.h>
+#include <sstream>
+#include <SDL/SDL.h>
+#include <SDL/SDL_ttf.h>
+#include <SDL/SDL_image.h>
+
+using namespace std;
+
+//splits at '\n' and ' '
+vector<vector<string> > splitString(string s);
+
+//rounds too a beatiful number
+double round_beautiful(double d);
+
+void _tospace(string& s);
+void spaceto_(string& s);
+
+SDL_Event relativate(const SDL_Event &e, SDL_Rect p);
+
+SDL_Surface* copyImage(SDL_Surface* s);
+
+
+//loads a bitmap from file and converts it to screen properties
+SDL_Surface* loadBMP(std::string filename);
+
+bool inRect(SDL_Rect r, double x, double y);
+
+string lltostr(const long long& l);
+string dbltostr(const double& d, int dec);
+
+//returns true if the line intersects with the circle (or lies in it)
+bool intersects(double radius, double startx, double starty, double endx, double endy);
+
+#endif