Changeset 11315 for code/branches

Timestamp:

Dec 1, 2016, 3:08:54 PM (8 years ago)

Author:

kappenh

Message:

updated Highscore interface and Jump save routine TODO Menu!

Location:

code/branches/Highscore_HS16

Files:

• data/defaultConfig/orxonox.ini (modified) (1 diff)
• data/gui/scripts/HighscoreMenu.lua (modified) (4 diffs)
• src/modules/jump/Jump.cc (modified) (1 diff)
• src/orxonox/Highscore.cc (modified) (1 diff)
• src/orxonox/Highscore.h (modified) (2 diffs)

code/branches/Highscore_HS16/data/defaultConfig/orxonox.ini

@@ -11 +11 @@
 
 [Highscore]
-tests_[0] = "name1"
-tests_[1] = "name2"
+highscores_[0] = "player./.Jump./.0"
 

code/branches/Highscore_HS16/data/gui/scripts/HighscoreMenu.lua

@@ -56 +56 @@
 
 function P.onShow()
-        P.nameList = {}
         
         P.scoreList = {}
@@ -62 +61 @@
 
         for i=0,orxonox.Highscore:getInstance():getNumberOfHighscores()-1 do
-                table.insert(P.nameList, orxonox.Highscore:getInstance():getHighscore(i))
-                table.insert(P.scoreList, i)
+                table.insert(P.scoreList, orxonox.Highscore:getInstance():getHighscore(i))
         
         end
@@ -112 +110 @@
     local offset = 2
     for k,v in pairs(P.scoreList) do
-        local line = P.createPickupEntry(tabName .. k,k,tag)
-        table.insert(P.linesList, line)
-        line:setYPosition(CEGUI.UDim(0,offset))
-        offset = offset + line:getHeight():asAbsolute(1)+2
-        pane:addChildWindow(line)
+        
+        local splitlist = P.Split(v,"./.")
+
+        if(splitlist[1] ~= name)then  --TODO!!!!!!!
+                local line = P.createPickupEntry(tabName .. k,k,tag)
+                table.insert(P.linesList, line)
+                line:setYPosition(CEGUI.UDim(0,offset))
+                offset = offset + line:getHeight():asAbsolute(1)+2
+                pane:addChildWindow(line)       
+        end
+        
     end
 
@@ -166 +170 @@
     end
 end
-
+function P.Split(str, delim, maxNb)
+    -- Eliminate bad cases...
+    if string.find(str, delim) == nil then
+        return { str }
+    end
+    if maxNb == nil or maxNb < 1 then
+        maxNb = 0    -- No limit
+    end
+    local result = {}
+    local pat = "(.-)" .. delim .. "()"
+    local nb = 0
+    local lastPos
+    for part, pos in string.gfind(str, pat) do
+        nb = nb + 1
+        result[nb] = part
+        lastPos = pos
+        if nb == maxNb then break end
+    end
+    -- Handle the last field
+    if nb ~= maxNb then
+        result[nb + 1] = string.sub(str, lastPos)
+    end
+    return result
+end
 function P.HighscoreSelectionChanged(e)
         --local pane = tolua.cast(winMgr:getWindow("orxonox/HighscoreMenuPane"), "CEGUI::ScrollablePane")

code/branches/Highscore_HS16/src/modules/jump/Jump.cc

@@ -312 +312 @@
         cleanup();
         GSLevel::startMainMenu();
-        orxout() << "Test Highscore" << endl;
         if (Highscore::exists()){
-                    orxout() << "exists" << endl;
-                   Highscore::getInstance().storeHighscore("player","jump",sectionNumber_ - 2);
+                    int score = this->getScore(this->getPlayer());
+                    if(score > Highscore::getInstance().getHighestScoreOfGame("Jump")) 
+                        Highscore::getInstance().storeHighscore("player","Jump",score);
+
           }
         Deathmatch::end();

code/branches/Highscore_HS16/src/orxonox/Highscore.cc

@@ -20 +20 @@
     void Highscore::setConfigValues()
     {
+        SetConfigValue(highscores_, std::vector<std::string>()).description("HighscoreVektor");
+    }
 
-                SetConfigValue(name_, "Test").description("The name of the game");
-        SetConfigValue(tests_, std::vector<std::string>()).description("Testvektor");
+    int Highscore::getHighestScoreOfGame(std::string game){
+        std::string delimiter = "./.";
+        int best = -1;
+        for (std::string score : this->highscores_)
+        {
+            
+            score.erase(0, score.find(delimiter) + delimiter.length());
+            if(game.compare(score.substr(0,score.find(delimiter))) == 0){
+                score.erase(0, score.find(delimiter) + delimiter.length());
+                int possibleBest = std::stoi(score);
+                if(possibleBest > best) best = possibleBest;
+            }
+
+
+        }
+        
+        return best;
+        
     }
+
     void Highscore::storeHighscore(std::string player, std::string level, int points){
-        ModifyConfigValue(tests_, add, player+"./."+level+"./."+std::to_string(points));
+        ModifyConfigValue(highscores_, add, player+"./."+level+"./."+std::to_string(points));
     }
     /* static std::string Highscore::getName(){

code/branches/Highscore_HS16/src/orxonox/Highscore.h

@@ -15 +15 @@
         void setConfigValues(); // Inherited function
         void storeHighscore(std::string player, std::string level, int points);
+
+        int getHighestScoreOfGame(std::string game);
         // tolua_begin
-                inline const std::string& getName() {
-                        return this->name_;
-                }
-        inline void test(){
-            this->storeHighscore("test","t",1);
-        }
         inline unsigned int getNumberOfHighscores()
-                { return this->tests_.size(); }
+                { return this->highscores_.size(); }
             inline const std::string& getHighscore(unsigned int index)
-                { return this->tests_[index]; }
+                { return this->highscores_[index]; }
 
         static Highscore& getInstance()
@@ -34 +30 @@
 
     private:
-        std::vector<std::string> tests_;
-        std::string name_;
+        std::vector<std::string> highscores_;
         float version_;
         static Highscore* singletonPtr_s;