Changeset 10175 for code/branches

Timestamp:

Dec 11, 2014, 3:55:25 PM (10 years ago)

Author:

maxima

Message:

storymodeHS14 merged. You have to change the link to campaign.txt in Mission.cc

Location:

code/branches/presentationHS14

Files:

• . (modified) (1 prop)
• data/gui/layouts/CampaignMenu.layout (copied) (copied from code/branches/storymodeHS14/data/gui/layouts/CampaignMenu.layout)
• data/gui/layouts/SingleplayerMenu.layout (modified) (1 diff)
• data/gui/scripts/CampaignMenu.lua (copied) (copied from code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua)
• data/gui/scripts/SingleplayerMenu.lua (modified) (4 diffs)
• data/gui/scripts/campaign.txt (copied) (copied from code/branches/storymodeHS14/data/gui/scripts/campaign.txt)
• src/orxonox/gametypes/Mission.cc (modified) (4 diffs)

code/branches/presentationHS14/data/gui/layouts/SingleplayerMenu.layout

@@ -53 +53 @@
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
-            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
+            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/> 
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/CampaignButton" >
+            <Property Name="Text" Value="Campaign" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.8,0},{0.6,0},{0.85,0}}" />
+            <Event Name="Clicked" Function="SingleplayerMenu.CampaignButton_clicked"/>
         </Window>
     </Window>

code/branches/presentationHS14/data/gui/scripts/SingleplayerMenu.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("SingleplayerMenu")
-P.loadAlong = {"ShipSelectionMenu"}
+P.loadAlong = {"ShipSelectionMenu","CampaignMenu"}
 P.levelList = {}
 P.activeTabIndexes = {}
@@ -19 +19 @@
     P.createFilterTab("Tests", "test")
     P.createFilterTab("Show All", nil)
+   
 
     -- update description and screenshot boxes
     P.SingleplayerSelectionChanged()
 
-    --buttons are arranged in a 1x3 matrix
+    --buttons are arranged in a 1x4 matrix
     P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"),
@@ -37 +38 @@
             ["button"] = winMgr:getWindow("orxonox/SingleplayerBackButton"),
             ["callback"]  = P.SingleplayerBackButton_clicked
+    })
+    P:setButton(1, 4,{
+                ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
+                ["callback"] = P.CampaignButton_clicked
     })
 end
@@ -166 +171 @@
 end
 
+function P.CampaignButton_clicked(e)
+        showMenuSheet("CampaignMenu", true)
+end
+
 return P

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

@@ -36 +36 @@
 #include "network/Host.h"
 #include "worldentities/pawns/Pawn.h"
-
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <ios>
 
 namespace orxonox
@@ -78 +81 @@
     void Mission::start()
     {
+        std::fstream myfile;
+                myfile.open("/home/pmao/pmao-extra-0/orxonox/storymodeHS14/data/gui/scripts/campaign.txt");
+                std::string line;
+                std::string mission=this->getFilename();
+                int k=58-mission.length();
+                std::string helperstring = "";
+                if(myfile.is_open()){
+                        while (k>1) {
+                                helperstring=helperstring+" ";
+                                k=k-1;
+                        }
+                        helperstring=helperstring+".";
+                       while(getline (myfile,line)){
+                          if(line==mission+" 0"+helperstring){
+                                  long pos = myfile.tellp();
+                                  myfile.seekp (pos-61);
+                                  myfile << mission+" 1"+helperstring;
+                          }
+                        }}
+                else{
+                        this->end();
+                }
+                        myfile.flush();
+                        myfile.clear();
+                        myfile.close();
         Gametype::start();
         this->setTeams();
@@ -84 +112 @@
     }
 
+    std::string GenerateHelperString(int number){
+        std::string helperstring = "";
+        while (number>1) {
+                helperstring=helperstring+" ";
+                number=number-1;
+        }
+        helperstring=helperstring+".";
+        return helperstring;
+    }
+
     void Mission::end()
     {
-        if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
+
+        if (this->missionAccomplished_ && !this->gtinfo_->hasEnded()){
             this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
+            std::fstream myfile;
+                                myfile.open("/home/pmao/pmao-extra-0/orxonox/storymodeHS14/data/gui/scripts/campaign.txt");
+                                std::string line;
+                                std::string mission=this->getFilename();
+                                int k=58-mission.length();
+                                std::string helperstring = "";
+                                if(myfile.is_open()){
+                                        while (k>1) {
+                                                helperstring=helperstring+" ";
+                                                k=k-1;
+                                        }
+                                        helperstring=helperstring+".";
+                                       while(getline (myfile,line)){
+                                          if(line==mission+" 0"+helperstring){
+                                                  long pos = myfile.tellp();
+                                                  myfile.seekp (pos-61);
+                                                  myfile << mission+" 1"+helperstring;
+                                          }
+                                        }}
+                                        myfile.flush();
+                                        myfile.clear();
+                                        myfile.close();
+                  }
+
         else if (!this->gtinfo_->hasEnded())
             this->gtinfo_->sendAnnounceMessage("Mission failed!");
@@ -106 +169 @@
         for (ObjectList<Mission>::iterator it = ObjectList<Mission>::begin(); it != ObjectList<Mission>::end(); ++it)
         {//TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
-            it->setMissionAccomplished(accomplished);
+            if(accomplished){
+                std::fstream myfile;
+                        myfile.open("/home/maxima/maxima-extra-0/orxonox/presentationHS14/data/gui/scripts/campaign.txt");
+                        std::string line;
+                        std::string mission=it->getFilename();
+                        int k=58-mission.length();
+                    std::string helperstring = "";
+                    if(myfile.is_open()){
+                        while (k>1) {
+                                helperstring=helperstring+" ";
+                            k=k-1;
+                                    }
+                    helperstring=helperstring+".";
+                        while(getline (myfile,line)){
+                                if(line==mission+" 0"+helperstring){
+                                long pos = myfile.tellp();
+                            myfile.seekp (pos-61);
+                            myfile << mission+" 1"+helperstring;
+                                          }
+                        }
+                    }
+                    myfile.flush();
+                    myfile.clear();
+                    myfile.close();
+            }
+                it->setMissionAccomplished(accomplished);
             it->end();
-        }
-    }
-    
+
+        }
+    }
+
     void Mission::setLivesWrapper(unsigned int amount)
     {