Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11269


Ignore:
Timestamp:
Nov 7, 2016, 3:56:14 PM (3 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:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/StoryModeMap_HS16/data/gui/scripts/CampaignMenu.lua

    r11052 r11269  
    9797
    9898function P.loadLevel(level)
    99     orxonox.execute("startGame " .. level:getXMLFilename())
     99    orxonox.execute("changeGame " .. level:getXMLFilename())
    100100    hideAllMenuSheets()
    101101end
     
    118118
    119119function P.CampaignMenuBackButton_clicked(e)
    120     hideMenuSheet(P.name)
     120    orxonox.execute("startMainMenu")
     121    hideMenuSheet("CampaignMenu")
    121122end
    122123
  • code/branches/StoryModeMap_HS16/data/gui/scripts/SingleplayerMenu.lua

    r10258 r11269  
    172172
    173173function P.CampaignButton_clicked(e)
    174     showMenuSheet("CampaignMenu", true)
     174    -- showMenuSheet("CampaignMenu", true)
     175    hideAllMenuSheets()
     176    orxonox.execute("startGame StoryModeMap.oxw")
    175177end
    176178
  • code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw

    r11255 r11269  
    1212  include("StoryModeHUD.oxo")
    1313  include("templates/lodInformation.oxt")
    14   include("templates/spaceshipAssff.oxt")
    15   include("templates/spaceshipEscort.oxt")
     14  include("templates/StoryMode.oxt")
    1615
    1716  include("templates/lodInformation.oxt")
     
    113112
    114113  </ControllableEntity>
     114
     115
    115116</Template>
    116117
     
    118119
    119120    <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"/>
    120    
    121     <!--<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />/-->
    122121
    123     <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=spaceshipassff />
     122    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
    124123   
    125124  </Scene>
  • code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo

    r11255 r11269  
    1 <!--
    2 <Template name="defaultHUD">
    3   <OverlayGroup name = "defaultHUD" scale = "1, 1">
    4     <ChatOverlay
    5      name     = "chat"
    6      position = "0.03, 0.5"
    7      font     = "VeraMono"
    8      caption  = ""
    9      textsize = 0.025
    10     />
    111
    12     <GametypeStatus
    13      name     = "state"
    14      position = "0.5, 0.85"
    15      font     = "VeraMono"
    16      textsize = 0.05
    17      colour   = "1.0, 1.0, 0.0, 0.8"
    18      align    = "center"
    19     />
    20   </OverlayGroup>
    21 </Template>
    22 -->
    23 
    24 <Template name="spectatorhud">
    25   <OverlayGroup name = "spectatorhud" scale = "1, 1">
    26   </OverlayGroup>
    27 </Template>
    28 
    29 
    30 
    31 <Template name="spaceshiphud">
     2<Template name="StoryModeMap">
    323  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
    334    <Map />
    345
    35 
    36    
    37 
    38     <GUIOverlay
    39       name = "QuestGUI"
    40       guiname = "QuestGUI"
    41       visible = "false"
    42     />
    436
    447     <GUIOverlay
  • code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc

    r11255 r11269  
    4242{
    4343
     44    SetConsoleCommand("StoryMode", "exit", &StoryMode::exit);
    4445    RegisterUnloadableClass(StoryMode);
    4546   
     
    6162        this->gtinfo_->sendAnnounceMessage("Marvin isch Chef");
    6263    }
    63 
    64    void StoryMode::end()
     64*/
     65    void StoryMode::exit()
    6566    {
    66         if (this->missionAccomplished_ && !this->gtinfo_->hasEnded())
    67         {
    68             this->gtinfo_->sendAnnounceMessage("StoryMode accomplished!");
    69 
    70             LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
     67        orxout() << "s funktioniert"<< endl;
     68        for (StoryMode* mission : ObjectList<StoryMode>())
     69        { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
     70            mission->end();
    7171        }
    72         else if (!this->gtinfo_->hasEnded())
    73             this->gtinfo_->sendAnnounceMessage("StoryMode failed!");
    74 
    75         Gametype::end();
     72        //Gametype::end();
    7673    }
    77 
     74/*
    7875    void Mission::setTeams()
    7976    { //Set pawn-colours
  • code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.h

    r11242 r11269  
    4040            StoryMode(Context* context);
    4141            virtual ~StoryMode() {}
     42            static void exit();
    4243
    4344           
Note: See TracChangeset for help on using the changeset viewer.