Merge branch 'master' of https://bitbucket.org/fsfahrttoolteam/registration-system

registration-system/view/signups/game1/js/game.js

@@ -146,6 +146,12 @@ Game.prototype.loadMap = function (map, spawn) {
                 y: (rawCoords[1] < 0) ? 0 : ((rawCoords[1] > Game.config.size[1]) ? Game.config.size[1] : rawCoords[1])
             };
 
+            var offsetA = $(document.getElementById("gameRoot")).offset();
+            var offsetB = $(document.getElementById("gameCanvas")).offset();
+
+            cleanCoords.x += offsetB.left - offsetA.left;
+            cleanCoords.y += offsetB.top - offsetA.top;
+
             return cleanCoords;
         } catch (e) {
             console.error(e);

registration-system/view/signups/game1/js/story.js

@@ -795,6 +795,10 @@ Story.actions = {
                         case 0:
                             Story.dialogueHelper([{
                                 message: 'George: Trinkt nicht zu viel ja?!'
+                            },{
+                                message: 'Jonas: BIIIIIIIIIER BAAAAAALLLLLLLLLLL!'
+                            },{
+                                message: 'George: ...'
                             }], null, nextAction);
                             break;
                         case 1: