Changeset 3099 for code/trunk

Timestamp:

May 28, 2009, 1:58:22 AM (16 years ago)

Author:

landauf

Message:

Added Gameplay messages (Announces, Killmessages and Deathmessages)

Location:

code/trunk/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/CMakeLists.txt (modified) (1 diff)
• objects/GametypeMessageListener.cc (added)
• objects/GametypeMessageListener.h (added)
• objects/gametypes/Asteroids.cc (modified) (3 diffs)
• objects/gametypes/Gametype.cc (modified) (1 diff)
• objects/gametypes/Pong.cc (modified) (1 diff)
• objects/gametypes/TeamBaseMatch.cc (modified) (4 diffs)
• objects/gametypes/UnderAttack.cc (modified) (3 diffs)
• objects/infos/GametypeInfo.cc (modified) (2 diffs)
• objects/infos/GametypeInfo.h (modified) (1 diff)
• objects/worldentities/triggers/CheckPoint.cc (modified) (2 diffs)
• overlays/CMakeLists.txt (modified) (1 diff)
• overlays/FadeoutText.cc (added)
• overlays/FadeoutText.h (added)
• overlays/OverlayText.h (modified) (3 diffs)
• overlays/hud/AnnounceMessage.cc (added)
• overlays/hud/AnnounceMessage.h (added)
• overlays/hud/CMakeLists.txt (modified) (1 diff)
• overlays/hud/DeathMessage.cc (added)
• overlays/hud/DeathMessage.h (added)
• overlays/hud/KillMessage.cc (added)
• overlays/hud/KillMessage.h (added)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -268 +268 @@
     class OverlayGroup;
     class OverlayText;
+    class FadeoutText;
     class GametypeStatus;
+    class AnnounceMessage;
+    class KillMessage;
+    class DeathMessage;
     class CreateLines;
     class Scoreboard;

code/trunk/src/orxonox/objects/CMakeLists.txt

@@ -3 +3 @@
   EventDispatcher.cc
   EventTarget.cc
+  GametypeMessageListener.cc
   GlobalShader.cc
   Level.cc

code/trunk/src/orxonox/objects/gametypes/Asteroids.cc

@@ -57 +57 @@
         if (this->time_ < 0 && !this->hasEnded() && this->timerIsActive_)
         {
+            this->gtinfo_.sendAnnounceMessage("Time's up - you have lost the match!");
             this->end();
         }
@@ -65 +66 @@
         if (victim && victim->getPlayer())
         {
+            this->gtinfo_.sendAnnounceMessage("You're dead - you have lost the match!");
             this->end();
         }
@@ -73 +75 @@
         Gametype::start();
 
-        std::string message = "The match has started! Reach the first chekpoint within 60 seconds! But be aware, there may be pirates around...";
+        std::string message = "The match has started! Reach the first chekpoint within 15 seconds! But be aware, there may be pirates around...";
         COUT(0) << message << std::endl;
         Host::Broadcast(message);

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -236 +236 @@
 
                 // Reward killer
-                if (killer)
+                if (killer && killer->getPlayer())
                 {
                     std::map<PlayerInfo*, Player>::iterator it = this->players_.find(killer->getPlayer());
                     if (it != this->players_.end())
+                    {
                         it->second.frags_++;
+
+                        if (killer->getPlayer()->getClientID() != CLIENTID_UNKNOWN)
+                            this->gtinfo_.sendKillMessage("You killed " + victim->getPlayer()->getName(), killer->getPlayer()->getClientID());
+                        if (victim->getPlayer()->getClientID() != CLIENTID_UNKNOWN)
+                            this->gtinfo_.sendDeathMessage("You were killed by " + killer->getPlayer()->getName(), victim->getPlayer()->getClientID());
+                    }
                 }
 

code/trunk/src/orxonox/objects/gametypes/Pong.cc

@@ -160 +160 @@
         {
             this->center_->fireEvent();
+
+            if (player)
+                this->gtinfo_.sendAnnounceMessage(player->getName() + " scored");
         }
 

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -31 +31 @@
 #include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 #include "core/CoreIncludes.h"
+#include "objects/infos/PlayerInfo.h"
 
 namespace orxonox
@@ -58 +59 @@
                 int teamnr = this->getTeam(originator->getPlayer());
                 if (teamnr == 0)
+                {
                     base->setState(BaseState::controlTeam1);
+                    this->gtinfo_.sendAnnounceMessage("The red team captured a base");
+                }
                 if (teamnr == 1)
+                {
                     base->setState(BaseState::controlTeam2);
+                    this->gtinfo_.sendAnnounceMessage("The blue team captured a base");
+                }
             }
 
@@ -125 +132 @@
     void TeamBaseMatch::showPoints()
     {
+        if (!this->hasStarted() || this->hasEnded())
+            return;
+
         COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
         if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) COUT(0) << "Team 1 is near victory!" << std::endl;
@@ -159 +169 @@
         if (this->pointsTeam1_ >= 2000 || this->pointsTeam2_ >= 2000)
         {
+            int winningteam = -1;
+
             if (this->pointsTeam1_ > this->pointsTeam2_)
+            {
                 COUT(0) << "Team 1 has won the match" << std::endl;
+                winningteam = 0;
+            }
             else
+            {
                 COUT(0) << "Team 2 has won the match" << std::endl;
+                winningteam = 1;
+            }
+
+            for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
+            {
+                if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                    continue;
+
+                if (it->second == winningteam)
+                    this->gtinfo_.sendAnnounceMessage("You have won the match!", it->first->getClientID());
+                else
+                    this->gtinfo_.sendAnnounceMessage("You have lost the match!", it->first->getClientID());
+            }
 
             this->end();

code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc

@@ -36 +36 @@
 
 #include "objects/worldentities/pawns/Destroyer.h"
+#include "objects/infos/PlayerInfo.h"
 
 namespace orxonox
@@ -73 +74 @@
             Host::Broadcast(message);
             this->gameEnded_ = true;
+
+            for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
+            {
+                if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                    continue;
+
+                if (it->second == 0)
+                    this->gtinfo_.sendAnnounceMessage("You have won the match!", it->first->getClientID());
+                else
+                    this->gtinfo_.sendAnnounceMessage("You have lost the match!", it->first->getClientID());
+            }
         }
     }
@@ -145 +157 @@
                 COUT(0) << message << std::endl;
                 Host::Broadcast(message);
+
+                for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
+                {
+                    if (it->first->getClientID() == CLIENTID_UNKNOWN)
+                        continue;
+
+                    if (it->second == 1)
+                        this->gtinfo_.sendAnnounceMessage("You have won the match!", it->first->getClientID());
+                    else
+                        this->gtinfo_.sendAnnounceMessage("You have lost the match!", it->first->getClientID());
+                }
             }
 
              //prints gametime
-            if ( gameTime_ <= timesequence_)
+            if ( gameTime_ <= timesequence_ && gameTime_ > 0)
             {
-                std::string message = convertToString(timesequence_) + " sec left!";
+                std::string message = convertToString(timesequence_) + " seconds left!";
+/*
                 COUT(0) << message << std::endl;
                 Host::Broadcast(message);
+*/
+                this->gtinfo_.sendAnnounceMessage(message);
+
                 if (timesequence_ >= 30 && timesequence_ <= 60)
                 {

code/trunk/src/orxonox/objects/infos/GametypeInfo.cc

@@ -31 +31 @@
 
 #include "core/CoreIncludes.h"
+#include "core/GameMode.h"
+#include "network/NetworkFunction.h"
+#include "network/Host.h"
+#include "objects/GametypeMessageListener.h"
 
 namespace orxonox
 {
     CreateUnloadableFactory(GametypeInfo);
+
+    registerMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage);
+    registerMemberNetworkFunction(GametypeInfo, dispatchKillMessage);
+    registerMemberNetworkFunction(GametypeInfo, dispatchDeathMessage);
 
     GametypeInfo::GametypeInfo(BaseObject* creator) : Info(creator)
@@ -60 +68 @@
         registerVariable(this->hudtemplate_,            variableDirection::toclient);
     }
+
+    void GametypeInfo::sendAnnounceMessage(const std::string& message) const
+    {
+        if (GameMode::isMaster())
+        {
+            callMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage, this->getObjectID(), CLIENTID_UNKNOWN, message);
+            this->dispatchAnnounceMessage(message);
+        }
+    }
+
+    void GametypeInfo::sendAnnounceMessage(const std::string& message, unsigned int clientID) const
+    {
+        if (GameMode::isMaster())
+        {
+            if (clientID == CLIENTID_SERVER)
+                this->dispatchAnnounceMessage(message);
+            else
+                callMemberNetworkFunction(GametypeInfo, dispatchAnnounceMessage, this->getObjectID(), clientID, message);
+        }
+    }
+
+    void GametypeInfo::sendKillMessage(const std::string& message, unsigned int clientID) const
+    {
+        if (GameMode::isMaster())
+        {
+            if (clientID == CLIENTID_SERVER)
+                this->dispatchKillMessage(message);
+            else
+                callMemberNetworkFunction(GametypeInfo, dispatchKillMessage, this->getObjectID(), clientID, message);
+        }
+    }
+
+    void GametypeInfo::sendDeathMessage(const std::string& message, unsigned int clientID) const
+    {
+        if (GameMode::isMaster())
+        {
+            if (clientID == CLIENTID_SERVER)
+                this->dispatchDeathMessage(message);
+            else
+                callMemberNetworkFunction(GametypeInfo, dispatchDeathMessage, this->getObjectID(), clientID, message);
+        }
+    }
+
+    void GametypeInfo::dispatchAnnounceMessage(const std::string& message) const
+    {
+        for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
+            it->announcemessage(this, message);
+    }
+
+    void GametypeInfo::dispatchKillMessage(const std::string& message) const
+    {
+        for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
+            it->killmessage(this, message);
+    }
+
+    void GametypeInfo::dispatchDeathMessage(const std::string& message) const
+    {
+        for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
+            it->deathmessage(this, message);
+    }
 }

code/trunk/src/orxonox/objects/infos/GametypeInfo.h

@@ -59 +59 @@
                 { return this->hudtemplate_; }
 
+            void sendAnnounceMessage(const std::string& message) const;
+            void sendAnnounceMessage(const std::string& message, unsigned int clientID) const;
+            void sendKillMessage(const std::string& message, unsigned int clientID) const;
+            void sendDeathMessage(const std::string& message, unsigned int clientID) const;
+
+            void dispatchAnnounceMessage(const std::string& message) const;
+            void dispatchKillMessage(const std::string& message) const;
+            void dispatchDeathMessage(const std::string& message) const;
+
         private:
             bool bStarted_;

code/trunk/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

@@ -72 +72 @@
     {
         SUPER(CheckPoint, changedActivity);
-        
+
         if (this->BaseObject::isActive())
         {
@@ -93 +93 @@
             this->setRadarVisibility(false);
 
-            if (bIsTriggered && bIsFirst_)
+            if (bIsTriggered)
             {
-                gametype->setTimeLimit(addTime_);
-                gametype->firstCheckpointReached(true);
-            }
+                if (bIsFirst_)
+                {
+                    gametype->setTimeLimit(addTime_);
+                    gametype->firstCheckpointReached(true);
+                }
 
-            if (bIsTriggered && bIsDestination_)
-            {
-                gametype->end();
+                if (bIsDestination_)
+                {
+                    const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage("Congratulations - you have won the match!");
+                    gametype->end();
+                }
+
+                if (!bIsFirst_ && !bIsDestination_)
+                {
+                    const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage("Checkpoint reached");
+                }
             }
         }

code/trunk/src/orxonox/overlays/CMakeLists.txt

@@ -3 +3 @@
   OverlayGroup.cc
   OverlayText.cc
+  FadeoutText.cc
   GUIOverlay.cc
 )

code/trunk/src/orxonox/overlays/OverlayText.h

@@ -47 +47 @@
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-        inline void setCaption(const std::string& caption) { this->text_->setCaption(caption); }
+        inline void setCaption(const std::string& caption) { this->text_->setCaption(caption); this->changedCaption(); }
         inline std::string getCaption() const              { return this->text_->getCaption(); }
 
@@ -56 +56 @@
         inline float getSpaceWidth() const     { return this->text_->getSpaceWidth(); }
 
-        inline void setColour(const ColourValue& colour) { this->text_->setColour(colour); }
+        inline void setColour(const ColourValue& colour) { this->text_->setColour(colour); this->changedColour(); }
         inline const ColourValue& getColour() const      { return this->text_->getColour(); }
 
@@ -70 +70 @@
     protected:
         virtual void sizeChanged();
+        virtual void changedColour() {}
+        virtual void changedCaption() {}
 
         Ogre::TextAreaOverlayElement* text_;

code/trunk/src/orxonox/overlays/hud/CMakeLists.txt

@@ -8 +8 @@
   ChatOverlay.cc
   GametypeStatus.cc
+  AnnounceMessage.cc
+  KillMessage.cc
+  DeathMessage.cc
   PongScore.cc
 )