Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11675


Ignore:
Timestamp:
Dec 15, 2017, 12:07:58 PM (7 years ago)
Author:
fanconic
Message:

renamed storymodeplanet to NameableStaticEntity

Location:
code/branches/CampaignMap_HS17
Files:
2 added
4 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/CampaignMap_HS17/data/levels/NC_StoryModeLevel.oxw

    r11663 r11675  
    3030  <SpawnPoint position="000.000, 000.000, 000.000" spawnclass=StoryModePawn orientation="0, 0, 0, 1" pawndesign=StoryModeEscort />
    3131
    32  <StoryModePlanet levelName="Level 1" position="0,0,-500" direction="1,0,0">
     32 <NameableStaticEntity levelName="Level 1" position="0,0,-500" direction="1,0,0">
    3333  <attached>
    3434    <Model position="0,0,0" mesh="ETH.mesh" scale=80 />
    3535  </attached>
    36  </StoryModePlanet>
     36 </NameableStaticEntity>
    3737
    38 <StoryModePlanet levelName="Level 2" position="500,0,-1000" direction="0,0,0">
     38<NameableStaticEntity levelName="Level 2" position="500,0,-1000" direction="0,0,0">
    3939  <attached>
    4040    <Model position="0,0,0" mesh="planets/moon.mesh" scale=50 />
    4141  </attached>
    42  </StoryModePlanet>
     42 </NameableStaticEntity>
    4343   
    44 <StoryModePlanet levelName="Level 3" position="-500,0,-1000" direction="0,1,0">
     44<NameableStaticEntity levelName="Level 3" position="-500,0,-1000" direction="0,1,0">
    4545  <attached>
    4646    <Model position="0,0,0" mesh="can.mesh" scale=50 />
    4747  </attached>
    48 </StoryModePlanet>
     48</NameableStaticEntity>
    4949
    50 <StoryModePlanet levelName="Level 4" position="1000,0,-1500" direction="0,0,0">
     50<NameableStaticEntity levelName="Level 4" position="1000,0,-1500" direction="0,0,0">
    5151  <attached>
    5252    <Model position="0,0,0" mesh="cube.mesh" scale=50 />
    5353  </attached>
    54  </StoryModePlanet>
     54 </NameableStaticEntity>
    5555
    56  <StoryModePlanet levelName="Level 5" position="-1000,0,-1500" direction="0,0,0">
     56 <NameableStaticEntity levelName="Level 5" position="-1000,0,-1500" direction="0,0,0">
    5757  <attached>
    5858    <Model position="0,0,0" mesh="Pilz.mesh" scale=50 />
    5959  </attached>
    60  </StoryModePlanet>
     60 </NameableStaticEntity>
    6161
    6262 

  • code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw

    r11584 r11675  
    1010  include("HUDTemplates3.oxo")
    1111  include("templates/lodInformation.oxt")
    12   include("StoryModeHUD2")
    13   include("StoryMode.oxt")
     12  include("templates/HeavyCruiser.oxt")
    1413?>
    1514
    … …  
    1918?>
    2019
    21 <Level gametype = StoryMode>
     20<Level>
    2221  <templates>
    2322    <Template link=lodtemplate_default />
    … …  
    3029  >
    3130
    32   <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"/>
    33   <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     31    <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"/>
     32    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     33
     34    <ModularSpaceShip velocity= "20,0,0" position="0,0,200" lookat= "0,0,0" health="1000" maxhealth="1000" initialhealth="1000">
     35      <templates>
     36        <Template link=endurance />
     37      </templates>
     38    </ModularSpaceShip>
     39   
    3440  </Scene>
    3541</Level>

  • code/branches/CampaignMap_HS17/src/modules/overlays/hud/StoryModeHUD.cc

    r11663 r11675  
    5656#include "controllers/NewHumanController.h"
    5757
    58 #include "worldentities/StoryModePlanet.h"
     58#include "worldentities/NameableStaticEntity.h"
    5959
    6060namespace orxonox
    … …  
    9696
    9797        int i = 0;
    98         for(StoryModePlanet* planet : ObjectList<StoryModePlanet>()){
     98        for(NameableStaticEntity* planet : ObjectList<NameableStaticEntity>()){
    9999
    100100
    … …  
    174174
    175175        int i = 0;
    176         for(StoryModePlanet* planet : ObjectList<StoryModePlanet>()){
     176        for(NameableStaticEntity* planet : ObjectList<NameableStaticEntity>()){
    177177
    178178            // Transform to screen coordinates

  • code/branches/CampaignMap_HS17/src/orxonox/worldentities/CMakeLists.txt

    r11545 r11675  
    1313  ExplosionPart.cc
    1414  Actionpoint.cc
    15   StoryModePlanet.cc
     15  NameableStaticEntity.cc
    1616)
    1717
Note: See TracChangeset for help on using the changeset viewer.