Index: code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc	(revision 12368)
+++ code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc	(revision 12371)
@@ -34,4 +34,5 @@
 #include "BallProjectile.h"
 #include "../OrxoBlox/OrxoBlox.h"
+#include "../OrxoBlox/OrxoBloxStones.h"
 #include "gametypes/Gametype.h"
 
@@ -57,4 +58,6 @@
         this->maxTextureIndex_ = 8;
         this->setDestroyAfterCollision(false); //I want the ball to bounce, not to be destroyed
+        this->fieldWidth_ = 46;
+        this->fieldHeight_ =  49;
         //this->orxoblox_ = this->getOrxoBlox();
 
@@ -64,6 +67,4 @@
     void BallProjectile::registerVariables()
     {
-        registerVariable( this->fieldWidth_ );
-        registerVariable( this->fieldHeight_ );
         registerVariable(this->materialBase_);
         registerVariable( this->speed_ );
@@ -145,5 +146,9 @@
         orxout() << "wanna bounce..." << endl;
         bool result = BasicProjectile::processCollision(otherObject, contactPoint, cs);
-        Bounce(otherObject, contactPoint, cs);
+        if (result == true) {
+            if (otherObject->isA(Class(OrxoBloxStones))) {
+                Bounce(otherObject, contactPoint, cs);
+            }
+        }
         orxout() << "BOUNCED!" << endl;
 
@@ -175,13 +180,16 @@
         Vector3 acceleration = this->getAcceleration();
 
+        velocity.y = 0;
+        position.y = 0;
+
         // If the ball has gone over the top or bottom boundary of the playing field (i.e. the ball has hit the top or bottom delimiters).
-        if (position.z > this->fieldHeight_ / 2 || position.z < -this->fieldHeight_ / 2)
+        if (position.z > this->fieldHeight_ || position.z < -this->fieldHeight_)
         {
 
             velocity.z = -velocity.z;
             // And its position is set as to not overstep the boundary it has just crossed. Remember z axis is reverted!!!
-            if (position.z > this->fieldHeight_ / 2){
+            if (position.z > this->fieldHeight_){
                 // Set the ball to be exactly at the boundary.
-                position.z = this-> fieldHeight_ / 2;
+                position.z = this-> fieldHeight_;
                 
                 //orxoblox_->LevelUp();
@@ -218,6 +226,6 @@
 
             }
-            if (position.z < -this->fieldHeight_ / 2){
-                position.z = -this->fieldHeight_ / 2 ;
+            if (position.z < -this->fieldHeight_){
+                position.z = -this->fieldHeight_;
                 
             }
@@ -228,11 +236,11 @@
         //Ball hits the right or left wall and should bounce back.
         // If the ball has crossed the left or right boundary of the playing field.
-        if (position.x > this->fieldWidth_ / 2 || position.x < -this->fieldWidth_ / 2)
+        if (position.x > this->fieldWidth_ || position.x < -this->fieldWidth_)
         {
             //Ball hits the right Wall
-            if (position.x > this->fieldWidth_ / 2)
+            if (position.x > this->fieldWidth_)
                 {
                     // Set the ball to be exactly at the boundary.
-                    position.x = this->fieldWidth_ / 2;
+                    position.x = this->fieldWidth_;
                     // Invert its velocity in x-direction (i.e. it bounces off).
                     velocity.x = -velocity.x;
@@ -241,8 +249,8 @@
 
             //Ball hits the left wall
-            else if (position.x < -this->fieldWidth_ / 2)
+            else if (position.x < -this->fieldWidth_)
                 {
                         // Set the ball to be exactly at the boundary.
-                        position.x = -this->fieldWidth_ / 2;
+                        position.x = -this->fieldWidth_;
                         // Invert its velocity in x-direction (i.e. it bounces off).
                         velocity.x = -velocity.x;
Index: code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc	(revision 12368)
+++ code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc	(revision 12371)
@@ -34,4 +34,5 @@
 #include "BallGun.h"
 
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -59,6 +60,6 @@
         this->reloadTime_ = 0.25f;
         this->damage_ = 0.0f; //default 15
-        this->speed_ = 750.0f;
-        this->delay_ = 0.0f;
+        this->speed_ = 50;
+        this->delay_ = 100;
         this->setMunitionName("BallMunition");
         this->mesh_ = "laserbeam.mesh";
