Changeset 11269 for code/branches

Timestamp:

Nov 7, 2016, 3:56:14 PM (8 years ago)

Author:

jhuwyler

Message:

GSLevel hat den durchbruch gebracht. Die Level werden nun geladen und auch der back-Button funktioniert. Das naechste Mal muessen die Map arrangiert und die Buttons unsichtbar gemacht werden.

Location:

code/branches/StoryModeMap_HS16

Files:

• data/gui/scripts/CampaignMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• data/levels/StoryModeMap.oxw (modified) (3 diffs)
• data/levels/templates/StoryMode.oxt (added)
• data/overlays/StoryModeHUD.oxo (modified) (1 diff)
• src/orxonox/gametypes/StoryMode.cc (modified) (2 diffs)
• src/orxonox/gametypes/StoryMode.h (modified) (1 diff)

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

@@ -97 +97 @@
 
 function P.loadLevel(level)
-    orxonox.execute("startGame " .. level:getXMLFilename())
+    orxonox.execute("changeGame " .. level:getXMLFilename())
     hideAllMenuSheets()
 end
@@ -118 +118 @@
 
 function P.CampaignMenuBackButton_clicked(e)
-    hideMenuSheet(P.name)
+    orxonox.execute("startMainMenu")
+    hideMenuSheet("CampaignMenu")
 end
 

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

@@ -172 +172 @@
 
 function P.CampaignButton_clicked(e)
-    showMenuSheet("CampaignMenu", true)
+    -- showMenuSheet("CampaignMenu", true)
+    hideAllMenuSheets()
+    orxonox.execute("startGame StoryModeMap.oxw")
 end
 

code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw

@@ -12 +12 @@
   include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipEscort.oxt")
+  include("templates/StoryMode.oxt")
 
   include("templates/lodInformation.oxt")
@@ -113 +112 @@
 
   </ControllableEntity>
+
+
 </Template>
 
@@ -118 +119 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    
-    <!--<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />/-->
 
-    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=spaceshipassff />
+    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
     
   </Scene>

code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo

@@ -1 @@
-<!--
-<Template name="defaultHUD">
-  <OverlayGroup name = "defaultHUD" scale = "1, 1">
-    <ChatOverlay
-     name     = "chat"
-     position = "0.03, 0.5"
-     font     = "VeraMono"
-     caption  = ""
-     textsize = 0.025
-    />
 
-    <GametypeStatus
-     name     = "state"
-     position = "0.5, 0.85"
-     font     = "VeraMono"
-     textsize = 0.05
-     colour   = "1.0, 1.0, 0.0, 0.8"
-     align    = "center"
-    />
-  </OverlayGroup>
-</Template>
--->
-
-<Template name="spectatorhud">
-  <OverlayGroup name = "spectatorhud" scale = "1, 1">
-  </OverlayGroup>
-</Template>
-
-
-
-<Template name="spaceshiphud">
+<Template name="StoryModeMap">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
     <Map />
 
-
-    
-
-    <GUIOverlay
-      name = "QuestGUI"
-      guiname = "QuestGUI"
-      visible = "false"
-    />
 
      <GUIOverlay

code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc

@@ -42 +42 @@
 {
 
+    SetConsoleCommand("StoryMode", "exit", &StoryMode::exit);
     RegisterUnloadableClass(StoryMode);
     
@@ -61 +62 @@
         this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
     }
-
-   void StoryMode::end()
+*/
+    void StoryMode::exit()
     {
-        if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
-        {
-            this->gtinfo_->sendAnnounceMessage("StoryMode accomplished!");
-
-            LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
+        orxout() << "s funktioniert"<< endl;
+        for (StoryMode* mission : ObjectList<StoryMode>())
+        { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
+            mission->end();
         }
-        else if (!this->gtinfo_->hasEnded())
-            this->gtinfo_->sendAnnounceMessage("StoryMode failed!");
-
-        Gametype::end();
+        //Gametype::end();
     }
-
+/*
     void Mission::setTeams()
     { //Set pawn-colours

code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h

@@ -40 +40 @@
             StoryMode(Context* context);
             virtual ~StoryMode() {}
+            static void exit();