Changeset 7903

Timestamp:

Feb 16, 2011, 11:17:30 AM (14 years ago)

Author:

scheusso

Message:

Merge branch 'jo-test' into lms3

Location:

code/branches/lastmanstanding3

Files:

• data/levels/lastManStanding.oxw (modified) (3 diffs)
• data/levels/lastTeamStanding.oxw (copied) (copied from code/branches/lastmanstanding3/data/levels/lastManStanding.oxw) (5 diffs)
• data/overlays/lastManStandingHUD.oxo (modified) (2 diffs)
• data/overlays/lastTeamStandingHUD.oxo (added)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/GametypeStatus.cc (modified) (5 diffs)
• src/modules/overlays/hud/GametypeStatus.h (modified) (1 diff)
• src/modules/overlays/hud/LastTeamStandingInfos.cc (added)
• src/modules/overlays/hud/LastTeamStandingInfos.h (copied) (copied from code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)
• src/orxonox/gametypes/LastTeamStanding.cc (added)
• src/orxonox/gametypes/LastTeamStanding.h (added)

code/branches/lastmanstanding3/data/levels/lastManStanding.oxw

@@ +1 @@
+<LevelInfo
+ name = "Last Man Standing"
+ description = "Be the sole survivor."
+ tags = ""
+/>
+
 <?lua
   include("stats.oxo")
@@ -38 +44 @@
 
 <!-- ------------ middle asteroid -------------- -->
-    <StaticEntity position="0,20,0" collisionType=static>
-       <attached>
-           <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
-           <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
-       </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="145" />
-      </collisionShapes>
+    <StaticEntity position="0,0,0" collisionType=static>    
+        <attached>
+            <MovableEntity position="0,20,0" rotationrate="-4.5" rotationaxis="0,1,0" >
+                <attached>
+                    <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
+                    <Model position="-160,40,28.4" scale=1 mesh="sphere.mesh" /><!--EasterEgg indicator-->
+                    <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg-->
+                        <pickup>
+                            <InvisiblePickup template=hugeinvisiblepickup />
+                        </pickup>
+                    </PickupSpawner>
+                </attached>
+            </MovableEntity>
+        </attached>
+        <collisionShapes>
+            <SphereCollisionShape radius="145" />
+        </collisionShapes>
     </StaticEntity>
 
-    <PickupSpawner position="-160,65,10" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=mediuminvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <PickupSpawner position="-160,60,17" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=hugeinvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-      </attached>
-    </StaticEntity>
 
 <!-- ---------------asteroid dome----------------- -->
@@ -138 +138 @@
 
 
-<?lua end ?>
+<?lua end ?><!-- ---------------asteroid dome END------------------->
 
   </Scene>

code/branches/lastmanstanding3/data/levels/lastTeamStanding.oxw

@@ +1 @@
+<LevelInfo
+ name = "Last Team Standing"
+ description = "Survive as a team."
+ tags = "singleplayer"
+/>
 <?lua
   include("stats.oxo")
   include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
-  include("lastManStandingHUD.oxo")
+  include("lastTeamStandingHUD.oxo")
   include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
@@ -10 +15 @@
 
 <Level
- name         = "Last Man Standing"
- description  = "testmap for gametype last man standing"
- gametype     =  "LastManStanding"
+ name         = "Last Team Standing"
+ description  = "testmap for gametype last team standing"
+ gametype     =  "LastTeamStanding"
 >
   <templates>
@@ -20 +25 @@
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skyBoxMoreNebula"
+    skybox       = "Orxonox/skypanoramagen1"
   >
 
@@ -27 +32 @@
     ?>
 
-<!----- Spawnpoints 
-    <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="-1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="-700,0,700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="700,0,-700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="0,0,-1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="0,0,1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /> ----->
 <Bot />
 
@@ -74 +71 @@
     ?>
 
-    <SpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=<?lua print( math.mod(i,4)) ?> position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
     <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >

code/branches/lastmanstanding3/data/overlays/lastManStandingHUD.oxo

@@ -65 +65 @@
     />
 
-    <OverlayText
+    <!--OverlayText
      position  = "0.02, 0.07"
      pickpoint = "0.0, 0.0"
@@ -93 +93 @@
      align     = "left"
      caption   = "|"
-    />
+    /-->
 
   </OverlayGroup>

code/branches/lastmanstanding3/src/modules/overlays/hud/CMakeLists.txt

@@ -16 +16 @@
   GametypeFadingMessage.cc
   LastManStandingInfos.cc
+  LastTeamStandingInfos.cc
 )

code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.cc

@@ -36 +36 @@
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Spectator.h"
+//#include "gametypes/Gametype.h"
 
 namespace orxonox
@@ -50 +51 @@
         RegisterObject(GametypeStatus);
 
+        //this->game_ = 0;
         this->owner_ = 0;
         this->bNoCaption_ = false;
+        //this->bForcedSpawn_ = false;
 
         ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this);
@@ -67 +70 @@
         if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getControllableEntity())
         {
+            //if (this->game_)
+            //    this->bForcedSpawn_ = this->game_->getForceSpawn();
+            //else
+            //    this->bForcedSpawn_ = false;
+
             const GametypeInfo* gtinfo = this->owner_->getGametypeInfo();
             ControllableEntity* ce = this->owner_->getControllableEntity();
@@ -87 +95 @@
                 if (gtinfo->isStartCountdownRunning())
                     this->setCaption(multi_cast<std::string>(static_cast<int>(ceil(gtinfo->getStartCountdown()))));
-                else if (ce->isA(Class(Spectator)))
+                else if (ce->isA(Class(Spectator))/*&&(!bForcedSpawn_)*/)
                     this->setCaption("Press [Fire] to respawn");
                 else
@@ -101 +109 @@
     {
         SUPER(GametypeStatus, changedOwner);
-
+        //this->game_ = orxonox_cast<Gametype*>(this->getOwner());
         this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner());
     }

code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h

@@ -49 +49 @@
 
         private:
+            //Gametype* game_;
             PlayerInfo* owner_;
             bool bNoCaption_;
+            //bool bForcedSpawn_;
 
     };

code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Johannes Ritz
  *   Co-authors:
- *      ...
+ *      
  *
  */
 
-#ifndef _GametypeStatus_H__
-#define _GametypeStatus_H__
+#ifndef _LastTeamStandingInfos_H__
+#define _LastTeamStandingInfos_H__
 
 #include "overlays/OverlaysPrereqs.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OverlaysExport GametypeStatus : public OverlayText, public Tickable
+    class _OverlaysExport LastTeamStandingInfos : public OverlayText, public Tickable
     {
         public:
-            GametypeStatus(BaseObject* creator);
-            virtual ~GametypeStatus();
+            LastTeamStandingInfos(BaseObject* creator);
+            virtual ~LastTeamStandingInfos();
 
             virtual void tick(float dt);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void changedOwner();
 
-            void setDisplayCaption(bool bValue); //!< Toggles whether the gametype status is displayed.
+            inline void setShowLives(bool value)
+                { this->bShowLives_ = value; }
+            inline bool getShowLives() const
+                { return this->bShowLives_; }
+
+            inline void setShowTeams(bool value)
+                { this->bShowTeams_ = value; }
+            inline bool getShowTeams() const
+                { return this->bShowTeams_; }
 
         private:
-            PlayerInfo* owner_;
-            bool bNoCaption_;
-
+            LastTeamStanding* lts_;
+            PlayerInfo* player_;
+            bool bShowLives_;
+            bool bShowTeams_;
     };
 }
-#endif /* _GametypeStatus_H__ */
+#endif /* _LastTeamStandingInfos_H__ */

code/branches/lastmanstanding3/src/orxonox/OrxonoxPrereqs.h

@@ -96 +96 @@
     class Gametype;
     class LastManStanding;
+    class LastTeamStanding;
     class TeamBaseMatch;
     class TeamDeathmatch;

code/branches/lastmanstanding3/src/orxonox/gametypes/CMakeLists.txt

@@ -8 +8 @@
   Dynamicmatch.cc
   LastManStanding.cc
+  LastTeamStanding.cc
 )

code/branches/lastmanstanding3/src/orxonox/gametypes/Gametype.h

@@ -150 +150 @@
               { this->timeLimit_ = t; }
 
+            //inline bool getForceSpawn()
+            //  { return this->bForceSpawn_; }       
+
             virtual void resetTimer();
             virtual void resetTimer(float t);