Changeset 11186 for code/branches

Timestamp:

May 12, 2016, 4:07:25 PM (9 years ago)

Author:

binderm

Message:

LevelStatus and levelmanager in two files, LevelStatus saves and changes the actual campaign progress

Location:

code/branches/bindermFS16

Files:

• data/gui/layouts/CampaignMenu.layout (modified) (9 diffs)
• data/gui/scripts/CampaignMenu.lua (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/LevelManager.cc (modified) (4 diffs)
• src/orxonox/LevelManager.h (modified) (5 diffs)
• src/orxonox/LevelStatus.cc (added)
• src/orxonox/LevelStatus.h (added)
• src/orxonox/gametypes/Mission.cc (modified) (1 diff)

code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout

@@ -13 +13 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.01,0},{0.3,0},{0.06,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.34,0},{0.3,0},{0.39,0}}" />
             <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
         </Window>
@@ -21 +21 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.18,0},{0.65,0},{0.23,0}}" />
-            <Property Name="Disabled" Value="True" />
+            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.26,0},{0.4,0},{0.31,0}}" />
+            <Property Name="Disabled" Value="True"/>
             <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
         </Window>
@@ -30 +30 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.26,0},{0.65,0},{0.31,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.42,0},{0.4,0},{0.47,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
@@ -39 +39 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.34,0},{0.65,0},{0.39,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.41,0},{0.26,0},{0.71,0},{0.31,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
@@ -48 +48 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.42,0},{0.65,0},{0.47,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.41,0},{0.42,0},{0.71,0},{0.47,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
@@ -57 +57 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.50,0},{0.65,0},{0.55,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.10,0},{0.99,0},{0.15,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
@@ -66 +66 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.58,0},{0.65,0},{0.63,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.18,0},{0.99,0},{0.23,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
@@ -75 +75 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.66,0},{0.65,0},{0.71,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.50,0},{0.99,0},{0.55,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
@@ -84 +84 @@
             <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.74,0},{0.65,0},{0.79,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.72,0},{0.58,0},{0.99,0},{0.63,0}}" />
             <Property Name="Disabled" Value="True" />
             <Event Name="Clicked" Function="CampaignMenu.Mission9Button_clicked"/>

code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua

@@ -26 +26 @@
 
 function P.updateButton(index, button)
+    local lastMission = orxonox.LevelManager:getInstance():getLastWonMission()
+    if (lastMission == "") then
+    else
+        local lastwon =P.getIndexOfLastFinishedMission()
+        orxonox.LevelManager:getInstance():updatewon(lastwon)
+    end
+
     local test =orxonox.LevelManager:getInstance():missionactivate(index)
+
     if (test==1) then
         button:setProperty("Visible", "True")
@@ -48 +56 @@
 --end
 
---function P.getIndexOfLastFinishedMission()
---    local lastMission = orxonox.LevelManager:getInstance():getLastFinishedCampaignMission()
---    if (lastMission and lastMission ~= "") then
---        local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
---        local index = 0
---        while index < size do
---            local mission = orxonox.LevelManager:getInstance():getCampaignMission(index)
---            if (mission == lastMission) then 
---                return index
---            end
---            index = index + 1
---        end
---    end
---    return -1
---end
+function P.getIndexOfLastFinishedMission()
+    local lastMission = orxonox.LevelManager:getInstance():getLastWonMission()
+    if (lastMission and lastMission ~= "") then
+        local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
+        local index = 0
+        while index < size do
+            local mission = orxonox.LevelManager:getInstance():getCampaignMission(index)
+            if (mission == lastMission) then 
+                return index
+            end
+            index = index + 1
+        end
+    end
+    return -1
+end
 
 function P.Mission1Button_clicked(e)

code/branches/bindermFS16/src/orxonox/CMakeLists.txt

@@ -26 +26 @@
   Level.cc
   LevelInfo.cc
+  LevelStatus.cc
   LevelManager.cc
   Main.cc
@@ -61 +62 @@
     LevelInfo.h
     LevelManager.h
+    LevelStatus.h
     MoodManager.h
     controllers/HumanController.h

code/branches/bindermFS16/src/orxonox/LevelManager.cc

@@ -47 +47 @@
 #include "PlayerManager.h"
 
+
 namespace orxonox
 {
 
-    LevelStatus::LevelStatus()
-    {
-        this->won = false;
-        this->nextLevels.insert(this->nextLevels.begin(),1);
-    }
-
-    LevelStatus::~LevelStatus()
-    {}
-
-
+//Mission endmission true
     //check if index level is activated...
     int LevelManager::missionactivate(int index)
     {
-
-        if (allLevelStatus_[index].won)
-            return 1;
-
-        //check if level is activated
-        for(unsigned int i=0;i<allLevelStatus_.size();i++)
-        {
-            std::vector<int> nextLevels=allLevelStatus_[i].nextLevels;
-            bool won=allLevelStatus_[i].won;
-            if(nextLevels[index]==1&&won)
-                return 1;
-        };
-
-        //check if level visible but not activated
-        for(unsigned int i=0;i<allLevelStatus_.size();i++)
-        {
-            std::vector<int> nextLevels=allLevelStatus_[i].nextLevels;
-            bool won=allLevelStatus_[i].won;
-            if(nextLevels[index]==2&&won)
-                return 2;
-        };
-        return 0;
+        updateAllLevelStatus();
+        int activated = allLevelStatus_[index].activated;
+        return activated;
+    }
+
+    void LevelManager::updatewon(int lastwon)
+    {
+        allLevelStatus_[lastwon].won=true;
+
+    }
+
+    void LevelManager::updateAllLevelStatus()
+    {
+        for(unsigned int i =0;i<allLevelStatus_.size();i++)
+        {
+            if(allLevelStatus_[i].won)
+            {
+                allLevelStatus_[i].activated=1;
+                std::vector<int> nextLevels=allLevelStatus_[i].nextLevels;
+                for(unsigned int j=i+1;j<allLevelStatus_.size();j++)
+                {
+                    allLevelStatus_[j].activated=nextLevels[j];
+                }
+            }
+        }
     }
 
     //updates the won variable of the corresponding LevelStatus in allLevelStatus_
-    void LevelManager::setLevelStatus(const int completedLevel)
-    {
-        allLevelStatus_[completedLevel].won=true;   
-    }
+    void LevelManager::setLevelStatus(const std::string& LevelWon)
+    {
+        ModifyConfigValue(lastWonMission_, set, LevelWon);  
+    }
+
 
     //build up allLevelStatus
@@ -99 +95 @@
     {
         LevelStatus level;
-        allLevelStatus_.assign (10,level);
-        allLevelStatus_[0].won=true;
-
-        
-        allLevelStatus_[1].nextLevels.push_back(2);
+        allLevelStatus_.assign (campaignMissions_.size(),level);
+        allLevelStatus_[0].activated=1;
+        //allLevelStatus_[0].won=true;
+
+
+        allLevelStatus_[0].nextLevels.push_back(1);
+        allLevelStatus_[0].nextLevels.push_back(1);
+        allLevelStatus_[0].nextLevels.push_back(0);
+        allLevelStatus_[0].nextLevels.push_back(0);
+        allLevelStatus_[0].nextLevels.push_back(0);
+        allLevelStatus_[0].nextLevels.push_back(0);
+        allLevelStatus_[0].nextLevels.push_back(0);
+
+        allLevelStatus_[1].nextLevels.push_back(1);
         allLevelStatus_[1].nextLevels.push_back(2);
         allLevelStatus_[1].nextLevels.push_back(1);
-        allLevelStatus_[1].nextLevels.push_back(2);
+        allLevelStatus_[1].nextLevels.push_back(0);
+        allLevelStatus_[1].nextLevels.push_back(0);
+        allLevelStatus_[1].nextLevels.push_back(0);
+        allLevelStatus_[1].nextLevels.push_back(0);
+
+        allLevelStatus_[2].nextLevels.push_back(2);
+        allLevelStatus_[2].nextLevels.push_back(1);
+        allLevelStatus_[2].nextLevels.push_back(0);
+        allLevelStatus_[2].nextLevels.push_back(0);
+        allLevelStatus_[2].nextLevels.push_back(1);
+        allLevelStatus_[2].nextLevels.push_back(0);
+        allLevelStatus_[2].nextLevels.push_back(0);
+
 
 
@@ -159 +176 @@
         SetConfigValue(defaultLevelName_, "missionOne.oxw")
             .description("Sets the pre selection of the level in the main menu.");
-        SetConfigValue(lastFinishedCampaignMission_,  "")
+        SetConfigValue(lastWonMission_,  "")
             .description("The last finished mission of a campaign");
         SetConfigValue(campaignMissions_,  std::vector<std::string>())
             .description("The list of missions in the campaign");
+        SetConfigValue(test_,  std::vector<int>())
+            .description("The list of missions and their statuses");
+            
     }
 
@@ -168 +188 @@
      * @brief Stores the argument in the corresponding config value.
      */
-    void LevelManager::setLastFinishedCampaignMission(const std::string& lastFinishedCampaignMission)
-    {
-        ModifyConfigValue(lastFinishedCampaignMission_, set, lastFinishedCampaignMission);
-    }
-
+/*    void LevelManager::setLastFinishedCampaignMission(const std::string& lastFinishedCampaignMission)
+    {
+        ModifyConfigValue(lastWonMission_, set, lastFinishedCampaignMission);
+    }
+*/
 
 

code/branches/bindermFS16/src/orxonox/LevelManager.h

@@ -47 +47 @@
 #include "util/Singleton.h"
 #include "core/config/Configurable.h"
+#include "LevelStatus.h"
 
-
-namespace orxonox
-{
-
-    class LevelStatus
-    {
-    public:
-        LevelStatus();
-        virtual ~LevelStatus();
-        
-        bool won;
-        std::vector<int> nextLevels;
-
-    };
-}
 
 // tolua_begin
@@ -95 +81 @@
             virtual ~LevelManager();
 
-            void setLevelStatus(const int integer);
+            //void setLevelStatus(const int integer);
             void buildallLevelStatus();
+            void updateAllLevelStatus();
+            void setLevelStatus(const std::string& LevelWon);
 
 
@@ -107 +95 @@
 
             // tolua_begin
+            void updatewon(int lastwon);
             int missionactivate(int index);
             void setDefaultLevel(const std::string& levelName); //!< Set the default Level.
@@ -118 +107 @@
             LevelInfoItem* getAvailableLevelListItem(unsigned int index); //!< Get the LevelInfoItem at the given index in the list of available Levels.
 
-            void setLastFinishedCampaignMission(const std::string& lastFinishedCampaignMission);
-            inline const std::string& getLastFinishedCampaignMission() const
-                { return this->lastFinishedCampaignMission_; }
+            //void setLastFinishedCampaignMission(const std::string& lastFinishedCampaignMission);
+            inline const std::string& getLastWonMission() const
+                { return this->lastWonMission_; }
 
             inline unsigned int getNumberOfCampaignMissions()
@@ -156 +145 @@
             // config values
             std::string defaultLevelName_;
-            std::string lastFinishedCampaignMission_;
+            std::string lastWonMission_;
             std::vector<std::string> campaignMissions_;
-
+            std::vector<int> test_;
             std::vector<LevelStatus> allLevelStatus_;
 

code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc

@@ -91 +91 @@
             this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
 
-            LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
+            //LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
 
             //gibt index von bestandenem level weiter
-            LevelManager::getInstance().setLevelStatus(7);
+            LevelManager::getInstance().setLevelStatus(this->getFilename());
         }
         else if (!this->gtinfo_->hasEnded())