[Orxonox-commit 6696] r11326 - in code/branches/Highscore_HS16: data/gui/scripts src/modules/dodgerace src/modules/invader src/modules/jump src/modules/tetris src/modules/towerdefense

[kappenh at orxonox.net]

Author: kappenh
Date: 2016-12-09 13:37:46 +0100 (Fri, 09 Dec 2016)
New Revision: 11326

Modified:
   code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua
   code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc
   code/branches/Highscore_HS16/src/modules/invader/Invader.cc
   code/branches/Highscore_HS16/src/modules/jump/Jump.cc
   code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc
   code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc
Log:
Finished Project, Maybe switch enumeration of highscores in table

Modified: code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua
===================================================================
--- code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua	2016-12-08 17:34:27 UTC (rev 11325)
+++ code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua	2016-12-09 12:37:46 UTC (rev 11326)
@@ -44,9 +44,10 @@
 	
     for k,v in pairs(P.levelList) do
         -- only add level if it has desired tag
-        if tag == nil or v:hasTag(tag) then
+        if(v:getName() ~= "Hover level" and v:getName() ~= "Pong") then
             P.createFilterTab(v:getName(), v:getName())
         end
+        
         --local highscores = v:getHighscores()
         --orxonox.CommandExecutor:execute("log test:".. highscores)
 

Modified: code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc
===================================================================
--- code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc	2016-12-08 17:34:27 UTC (rev 11325)
+++ code/branches/Highscore_HS16/src/modules/dodgerace/DodgeRace.cc	2016-12-09 12:37:46 UTC (rev 11326)
@@ -35,6 +35,7 @@
 #include "DodgeRaceShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
 #include "DodgeRaceCube.h"
 #include "core/CoreIncludes.h"
+#include "Highscore.h"
 
 namespace orxonox
 {
@@ -223,6 +224,12 @@
         //      Deathmatch::end();
         // It will misteriously crash the game!
         // Instead startMainMenu, this won't crash.
+        if (Highscore::exists()){
+                    int score = this->getPoints();
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Dodge Race")) 
+                        Highscore::getInstance().storeHighscore("Player","Dodge Race",score);
+
+          }
         GSLevel::startMainMenu();
     }
 }

Modified: code/branches/Highscore_HS16/src/modules/invader/Invader.cc
===================================================================
--- code/branches/Highscore_HS16/src/modules/invader/Invader.cc	2016-12-08 17:34:27 UTC (rev 11325)
+++ code/branches/Highscore_HS16/src/modules/invader/Invader.cc	2016-12-09 12:37:46 UTC (rev 11326)
@@ -32,7 +32,7 @@
 */
 
 #include "Invader.h"
-
+#include "Highscore.h"
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/command/Executor.h"
@@ -188,6 +188,12 @@
         //      Deathmatch::end();
         // It will misteriously crash the game!
         // Instead startMainMenu, this won't crash.
+        if (Highscore::exists()){
+                    int score = this->getPoints();
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Orxonox Arcade")) 
+                        Highscore::getInstance().storeHighscore("Player","Orxonox Arcade",score);
+
+          }
         GSLevel::startMainMenu();
     }
 }

Modified: code/branches/Highscore_HS16/src/modules/jump/Jump.cc
===================================================================
--- code/branches/Highscore_HS16/src/modules/jump/Jump.cc	2016-12-08 17:34:27 UTC (rev 11325)
+++ code/branches/Highscore_HS16/src/modules/jump/Jump.cc	2016-12-09 12:37:46 UTC (rev 11326)
@@ -314,7 +314,7 @@
         if (Highscore::exists()){
                     int score = this->getScore(this->getPlayer());
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Jump")) 
-                        Highscore::getInstance().storeHighscore("player","Jump",score);
+                        Highscore::getInstance().storeHighscore("Player","Jump",score);
 
           }
         Deathmatch::end();

Modified: code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc	2016-12-08 17:34:27 UTC (rev 11325)
+++ code/branches/Highscore_HS16/src/modules/tetris/Tetris.cc	2016-12-09 12:37:46 UTC (rev 11326)
@@ -38,6 +38,7 @@
 */
 
 #include "Tetris.h"
+#include "Highscore.h"
 
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
@@ -326,7 +327,12 @@
         {
             this->player_->stopControl();
         }
+         if (Highscore::exists()){
+                    int score = this->getScore(this->getPlayer());
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Tetris")) 
+                        Highscore::getInstance().storeHighscore("Player","Tetris",score);
 
+          }
         this->cleanup();
 
         // Call end for the parent class.

Modified: code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc	2016-12-08 17:34:27 UTC (rev 11325)
+++ code/branches/Highscore_HS16/src/modules/towerdefense/TowerDefense.cc	2016-12-09 12:37:46 UTC (rev 11326)
@@ -80,6 +80,7 @@
 #include "infos/PlayerInfo.h"
 #include "chat/ChatManager.h"
 #include "core/CoreIncludes.h"
+#include "Highscore.h"
 
 namespace orxonox
 {
@@ -196,7 +197,12 @@
 
     void TowerDefense::end()
     {
+        if (Highscore::exists()){
+                    int score = this->getWaveNumber();
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Tower Defense")) 
+                        Highscore::getInstance().storeHighscore("Player","Tower Defense",score);
 
+          }
         TeamDeathmatch::end();
         ChatManager::message("Match is over! Gameover!");