Changeset 12278

Timestamp:

Apr 4, 2019, 4:17:26 PM (5 years ago)

Author:

ahuwyler

Message:

Class Wall is created

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/orxoblox.oxw (modified) (1 diff)
• src/modules/OrxoBlox/CMakeLists.txt (modified) (1 diff)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (1 diff)
• src/modules/OrxoBlox/OrxoBloxBall.cc (modified) (3 diffs)
• src/modules/OrxoBlox/OrxoBloxWall.cc (added)
• src/modules/OrxoBlox/OrxoBloxWall.h (added)

code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

@@ -65 +65 @@
 
   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true"/>
-  <OrxoBloxBot />
+  
 
   <Scene

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

@@ -6 +6 @@
   BallGun/BallProjectile.cc
   OrxoBlox.cc
-  
+  OrxoBloxWall.cc
   OrxoBloxBall.cc
   OrxoBloxBat.cc

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -278 +278 @@
     }
 
+    /*void OrxoBlox::createStonewall(void){
+        this->futureWall_ = new OrxoBolxWall(this->center_->getContext());
+
+
+
+    }*/
+
     /**
     @brief

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc

@@ -170 +170 @@
                     // Calculate the distance (in z-direction) between the ball and the center of the bat, weighted by half of the effective length of the bat (with additional 10%)
                     distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10f) / 2);
+                    
+
                     if (fabs(distance) <= 1) // If the bat is there to parry.
                     {
@@ -183 +185 @@
                         this->fireEvent();
                     }
+
                     // If the left player scores.
                     else if (GameMode::isMaster() && position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
+                        ChatManager::message("You suck!!");
                         defScoreSound_->play();//play score sound
                         if (this->getGametype() && this->bat_[0])
                         {
+                            ChatManager::message("You suck!!");
+
+
                             this->getGametype()->playerScored(this->bat_[0]->getPlayer());
                             return;
                         }
                     }
+
+
+
+
+
                 }
                 // If the left boundary has been crossed.
@@ -218 +230 @@
                         if (this->getGametype() && this->bat_[1])
                         {
+                            ChatManager::message("You suck!!");
+
                             this->getGametype()->playerScored(this->bat_[1]->getPlayer());
                             return;