Changeset 11601 for code/branches/SOBv2_HS17

Timestamp:

Nov 27, 2017, 3:32:34 PM (7 years ago)

Author:

zarron

Message:

with Highscores

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOB.cc (modified) (4 diffs)
• SOB.h (modified) (1 diff)
• SOBFigure.cc (modified) (4 diffs)
• SOBFireball.cc (modified) (2 diffs)

code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.cc

@@ -44 +44 @@
 #include "SOBFigure.h"
 #include "graphics/Camera.h"
+#include "Highscore.h"
 
 
@@ -49 +50 @@
 namespace orxonox
 {
-
+    bool newHighscore=0;
     RegisterUnloadableClass(SOB);
 
@@ -124 +125 @@
         GSLevel::startMainMenu();
         Deathmatch::end();
-    }
+}
 
     void SOB::restart() {
@@ -167 +168 @@
         if (this->figure_ != nullptr && figure_->lvlEnded_) {
             std::stringstream a;
-            a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            if(newHighscore){
+                a << "Nice! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            }
+            else{
+                a << "Congrats, new Highscore! " << getPoints() << " Points in " << (400-getTimeLeft())/2 <<"s.\n\nPress <Space> to restart";
+            }
             info_ =a.str();
 

code/branches/SOBv2_HS17/src/modules/superorxobros/SOB.h

@@ -103 +103 @@
 
             WeakPtr<SOBCenterpoint> center_;
+            bool newHighscore;
 
         protected:

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc

@@ -50 +50 @@
 #include "SOBCastlestone.h"
 #include "SOBFireball.h"
+#include "Highscore.h"
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
@@ -208 +209 @@
             bool direction = ((this->getWorldOrientation().getRoll().valueRadians())>-1.6&&(this->getWorldOrientation().getRoll().valueRadians()<1.6));
             ball->setDirection(direction);
-            orxout() << "Rotation: " << this->getWorldOrientation().getRoll() << " direction: "<< direction <<endl;
             if(direction)
             {
@@ -229 +229 @@
 
     bool inputAllowed = true;
+    //SOB* SOBGame = orxonox_cast<SOB*>(getGametype());
 
     //the particle spawner that generates the fire from the backpack when pressed
@@ -365 +366 @@
             velocity.x = 0;
             velocity.y = 20;
+            setOrientation(Vector3::UNIT_Z, Degree(90));
         }
         if (reachedLvlEndState_ == 4) {
+            //Highscore
+            if (Highscore::exists()){
+                    int score = SOBGame->getPoints();
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Super Orxo Bros.")) 
+                        Highscore::getInstance().storeHighscore("Super Orxo Bros.",score);
+                        SOBGame->newHighscore=1;
+
+            }
             lvlEnded_ = true;
             dead_ = true;

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc

@@ -140 +140 @@
         hitCounter_++;
         
+        collDisZ_=0;
+        collDisX_=0;
+
         return true;
     }
@@ -170 +173 @@
             changedOn_+= dt;
             // After a collision, we don't listen for collisions for 200ms - that's because one wall can cause several collisions!
-            if (changedOn_> 0.100) {
+            if (changedOn_> 0.2) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;