It took me a week or two. The one thing I learned from this project is, that wrong initial decisions regarding code architecture will get more and more on your nerves when adding new features. I didn't want to rewrite my game (I'm lazy), so it got worse and worse. Looks like a gigantic hack in end, but it works ^^