[Orxonox-commit 6630] r11269 - in code/branches/StoryModeMap_HS16: data/gui/scripts data/levels data/levels/templates data/overlays src/orxonox/gametypes
jhuwyler at orxonox.net
jhuwyler at orxonox.net
Mon Nov 7 15:56:14 CET 2016
Author: jhuwyler
Date: 2016-11-07 15:56:14 +0100 (Mon, 07 Nov 2016)
New Revision: 11269
Added:
code/branches/StoryModeMap_HS16/data/levels/templates/StoryMode.oxt
Modified:
code/branches/StoryModeMap_HS16/data/gui/scripts/CampaignMenu.lua
code/branches/StoryModeMap_HS16/data/gui/scripts/SingleplayerMenu.lua
code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw
code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo
code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc
code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h
Log:
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.
Modified: code/branches/StoryModeMap_HS16/data/gui/scripts/CampaignMenu.lua
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/scripts/CampaignMenu.lua 2016-11-07 14:56:03 UTC (rev 11268)
+++ code/branches/StoryModeMap_HS16/data/gui/scripts/CampaignMenu.lua 2016-11-07 14:56:14 UTC (rev 11269)
@@ -96,7 +96,7 @@
end
function P.loadLevel(level)
- orxonox.execute("startGame " .. level:getXMLFilename())
+ orxonox.execute("changeGame " .. level:getXMLFilename())
hideAllMenuSheets()
end
@@ -117,7 +117,8 @@
end
function P.CampaignMenuBackButton_clicked(e)
- hideMenuSheet(P.name)
+ orxonox.execute("startMainMenu")
+ hideMenuSheet("CampaignMenu")
end
return P
\ No newline at end of file
Modified: code/branches/StoryModeMap_HS16/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/StoryModeMap_HS16/data/gui/scripts/SingleplayerMenu.lua 2016-11-07 14:56:03 UTC (rev 11268)
+++ code/branches/StoryModeMap_HS16/data/gui/scripts/SingleplayerMenu.lua 2016-11-07 14:56:14 UTC (rev 11269)
@@ -171,7 +171,9 @@
end
function P.CampaignButton_clicked(e)
- showMenuSheet("CampaignMenu", true)
+ -- showMenuSheet("CampaignMenu", true)
+ hideAllMenuSheets()
+ orxonox.execute("startGame StoryModeMap.oxw")
end
return P
Modified: code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw 2016-11-07 14:56:03 UTC (rev 11268)
+++ code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw 2016-11-07 14:56:14 UTC (rev 11269)
@@ -11,8 +11,7 @@
include("stats.oxo")
include("StoryModeHUD.oxo")
include("templates/lodInformation.oxt")
- include("templates/spaceshipAssff.oxt")
- include("templates/spaceshipEscort.oxt")
+ include("templates/StoryMode.oxt")
include("templates/lodInformation.oxt")
?>
@@ -112,15 +111,15 @@
>
</ControllableEntity>
+
+
</Template>
<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>
</Level>
Added: code/branches/StoryModeMap_HS16/data/levels/templates/StoryMode.oxt
===================================================================
--- code/branches/StoryModeMap_HS16/data/levels/templates/StoryMode.oxt (rev 0)
+++ code/branches/StoryModeMap_HS16/data/levels/templates/StoryMode.oxt 2016-11-07 14:56:14 UTC (rev 11269)
@@ -0,0 +1,21 @@
+<Template name=StoryMode>
+ <SpaceShip
+ hudtemplate = StoryModeMap
+ camerapositiontemplate = spaceshipghostcameras
+
+ >
+
+
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipghostcameras defaults=0>
+ <SpaceShip>
+ <camerapositions>
+ <CameraPosition position="0,20,80" drag=true mouselook=true />
+ <CameraPosition position="0,40,160" drag=true mouselook=true />
+ <CameraPosition position="0,50,200" drag=true mouselook=true />
+ </camerapositions>
+ </SpaceShip>
+</Template>
+
Modified: code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo
===================================================================
--- code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo 2016-11-07 14:56:03 UTC (rev 11268)
+++ code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo 2016-11-07 14:56:14 UTC (rev 11269)
@@ -1,46 +1,9 @@
-<!--
-<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
name = "CampaignMenu"
guiname = "CampaignMenu"
Modified: code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc
===================================================================
--- code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc 2016-11-07 14:56:03 UTC (rev 11268)
+++ code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc 2016-11-07 14:56:14 UTC (rev 11269)
@@ -41,6 +41,7 @@
namespace orxonox
{
+ SetConsoleCommand("StoryMode", "exit", &StoryMode::exit);
RegisterUnloadableClass(StoryMode);
StoryMode::StoryMode(Context* context) : Gametype(context)
@@ -60,21 +61,17 @@
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
for (Pawn* pawn : ObjectList<Pawn>())
Modified: code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h
===================================================================
--- code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h 2016-11-07 14:56:03 UTC (rev 11268)
+++ code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h 2016-11-07 14:56:14 UTC (rev 11269)
@@ -39,6 +39,7 @@
public:
StoryMode(Context* context);
virtual ~StoryMode() {}
+ static void exit();
};
More information about the Orxonox-commit
mailing list