Changeset 7062 for code/branches/presentation3/src/orxonox

Timestamp:

May 31, 2010, 4:55:05 PM (14 years ago)

Author:

jo

Message:

coloured messages, different spaceships in one level, with bug

Location:

code/branches/presentation3/src/orxonox

Files:

• gametypes/Dynamicmatch.cc (modified) (24 diffs)
• gametypes/Dynamicmatch.h (modified) (1 diff)
• infos/GametypeInfo.cc (modified) (2 diffs)
• infos/GametypeInfo.h (modified) (2 diffs)
• interfaces/GametypeMessageListener.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc

@@ -82 +82 @@
         this->pointsPerTime=0.0f;
         this->setHUDTemplate("DynamicmatchHUD");
-
+        this->allowDeath=false;
+        this->notYet=true;
     }
 
@@ -119 +120 @@
                 playerParty_[victim->getPlayer()]=piggy;        //victim's new party: pig
                 setPlayerColour(victim->getPlayer());           //victim's new colour
-                numberOf[piggy]++;                              //party switch: number of players is not affected (decrease and increase)
+                numberOf[piggy]++;                              //party switch: number of players is not affected (decrease and increase)
+
+                if (target == killer)
+                {
+                     allowDeath=true;
+                     victim->kill(); //new ship
+                }
+
                     if(tutorial)                                //announce party switch
                     {
@@ -125 +133 @@
                          if (it2 != this->players_.end())
                          {
-                              this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
+                              this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID(), partyColours_[chaser]);
                               this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
                          }
@@ -135 +143 @@
                         setPlayerColour(originator->getPlayer());               //originator's new colour
                         numberOf[killer]++;
+                        allowDeath=true;
+                        originator->kill(); //new ship for killer
                         if(tutorial)                            //announce party switch
                         {
@@ -140 +150 @@
                              if (it3 != this->players_.end())
                              {
-                                  this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
+                                  this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID(), partyColours_[chaser]);
                                   this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
                              }
@@ -160 +170 @@
             else if (notEnoughKillers)
             {
-                numberOf[target]--;     //decrease numberof victims's party
-                playerParty_[victim->getPlayer()]=killer;       //victim's new party: killer
-                setPlayerColour(victim->getPlayer());           //victim colour
+                numberOf[source]--;     //decrease numberof originator's party
+                playerParty_[originator->getPlayer()]=killer;   //originator's new party: killer
+                setPlayerColour(originator->getPlayer());       //originator colour
                 numberOf[killer]++;                             //party switch: number of players is not affected (decrease and increase)
+
+                allowDeath=true;
+                originator->kill(); //new ship
                 if(tutorial)                            //announce party switch
                 {
@@ -169 +182 @@
                      if (it3 != this->players_.end())
                      {
-                          this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
+                          this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID(),partyColours_[chaser]);
                           this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
                      }
@@ -182 +195 @@
                 setPlayerColour(victim->getPlayer());           //victim colour
                 numberOf[chaser]++;                             //party switch: number of players is not affected (decrease and increase)
+                
+                allowDeath=true;
+                victim->kill(); //new ship
+
                 if(tutorial)                                    //announce party switch
                 {
@@ -188 +205 @@
                      {
                           if (numberOf[killer]>0)
-                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it3->first->getClientID());
+                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it3->first->getClientID(),partyColours_[piggy]);
                               
                           else
-                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it3->first->getClientID());
+                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it3->first->getClientID(),partyColours_[piggy]);
                           this->gtinfo_->sendFadingMessage("You're now a chaser.",it3->first->getClientID());
                      }
@@ -231 +248 @@
                      {    
                           if (numberOf[killer]>0)
-                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
+                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID(), partyColours_[piggy]);
                           else
-                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID(),partyColours_[piggy]);
                           this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
                      }
@@ -239 +256 @@
                      if (it2 != this->players_.end())
                      {
-                          this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
+                          this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID(),partyColours_[chaser]);
                           this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
                      }
@@ -261 +278 @@
             setPlayerColour(victim->getPlayer());               //victim colour
             setPlayerColour(originator->getPlayer());           //originator colour
-             
+
+            notYet=false;
+            allowDeath=true;
+            victim->kill(); //new ship
+            originator->kill(); //new ship
+
+
             if(tutorial) //Announce pary switch
             {
@@ -267 +290 @@
                  if (it != this->players_.end())
                  {
-                      this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+                      this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID(),partyColours_[chaser]);
                       this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
                  }
@@ -273 +296 @@
                  if (it2 != this->players_.end())
                  {
-                      this->gtinfo_->sendStaticMessage("Take the chasers down.",it2->first->getClientID());
+                      this->gtinfo_->sendStaticMessage("Take the chasers down.",it2->first->getClientID(),partyColours_[chaser]);
                       this->gtinfo_->sendFadingMessage("You're now a killer.",it2->first->getClientID());
                  }
@@ -295 +318 @@
     bool Dynamicmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
     {   
+        if (allowDeath)//Hack for Ghost-Spaceship
+        {
+          if (notYet)
+          {allowDeath=false;}
+          else
+          {notYet=true;}
+         return true;
+        }
         //killers can kill chasers and killers can be killed by chasers
         if ((playerParty_[originator->getPlayer()] == killer && playerParty_[victim->getPlayer()] == chaser)||(playerParty_[victim->getPlayer()] == killer &&
@@ -411 +442 @@
         }
     }
-    void Dynamicmatch::setPlayerColour(PlayerInfo* player) // sets a players colour
+    void Dynamicmatch::setPlayerColour(PlayerInfo* player) // sets a player's colour
     {
         std::map<PlayerInfo*, int>::const_iterator it_player = this->playerParty_.find(player);
@@ -445 +476 @@
                     if (it->first->getClientID() == CLIENTID_UNKNOWN)
                         continue;
-                    this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID());
+                    this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
                 }
             }
@@ -463 +494 @@
                        {
                            if (numberOf[killer]>0)
-                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
+                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID(),partyColours_[piggy]);
                            else
-                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID(),partyColours_[piggy]);
                            //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
                        }
                        else if (it->second==piggy)
                        {
-                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID(),partyColours_[chaser]);
                            //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
                        }
                        else if (it->second==killer)
                        {
-                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
+                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID(),partyColours_[chaser]);
                            //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
                        }
@@ -494 +525 @@
                     if (it->first->getClientID() == CLIENTID_UNKNOWN)
                         continue;
-                    this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID());
+                    this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
                 }
             }
@@ -512 +543 @@
                        {
                            if (numberOf[killer]>0)
-                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
+                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID(),partyColours_[piggy]);
                            else
-                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID(),partyColours_[piggy]);
                            //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
                        }
                        else if (it->second==piggy)
                        {
-                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID(),partyColours_[piggy]);
                            //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
                        }
                        else if (it->second==killer)
                        {
-                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
+                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID(),partyColours_[piggy]);
                            //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
                        }
@@ -544 +575 @@
                     if (it->first->getClientID() == CLIENTID_UNKNOWN)
                         continue;
-                    this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID());
+                    this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
                 }
             }
@@ -562 +593 @@
                        {
                            if (numberOf[killer]>0)
-                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID());
+                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it->first->getClientID(),partyColours_[piggy]);
                            else
-                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID(),partyColours_[piggy]);
                            //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
                        }
                        else if (it->second==piggy)
                        {
-                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID(),partyColours_[chaser]);
                            //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
                        }
                        else if (it->second==killer)
                        {
-                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
+                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID(),partyColours_[chaser]);
                            //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
                        }
@@ -625 +656 @@
                 if (it->first->getClientID() == CLIENTID_UNKNOWN)
                     continue;
-                this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID());
+                this->gtinfo_->sendStaticMessage("Selection phase: Shoot at everything that moves.",it->first->getClientID(),ColourValue(1.0f, 1.0f, 0.5f));
             }
         }
@@ -651 +682 @@
         COUT(0) << message << std::endl;
         Host::Broadcast(message);
-        /*for (std::map<PlayerInfo*, int>::iterator it = this->playerParty_.begin(); it != this->playerParty_.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());
-                }*/
     }
     SpawnPoint* Dynamicmatch::getBestSpawnPoint(PlayerInfo* player) const

code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h

@@ -79 +79 @@
         protected:
 
+            bool allowDeath;
+            bool notYet;
             std::map< PlayerInfo*, int > playerParty_; //player's parties are recorded here
             std::vector<ColourValue> partyColours_; //aus TeamDeathmatch

code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc

@@ -112 +112 @@
     }
 
-    void GametypeInfo::sendStaticMessage(const std::string& message, unsigned int clientID)
+    void GametypeInfo::sendStaticMessage(const std::string& message, unsigned int clientID, const ColourValue& colour)
     {
         if (GameMode::isMaster())
         {
             if (clientID == CLIENTID_SERVER)
-                this->dispatchStaticMessage(message);
+                this->dispatchStaticMessage(message, colour);
             else
-                callMemberNetworkFunction(GametypeInfo, dispatchStaticMessage, this->getObjectID(), clientID, message);
+                callMemberNetworkFunction(GametypeInfo, dispatchStaticMessage, this->getObjectID(), clientID, message, colour);
         }
     }
@@ -152 +152 @@
     }
 
-     void GametypeInfo::dispatchStaticMessage(const std::string& message)
+     void GametypeInfo::dispatchStaticMessage(const std::string& message, const ColourValue& colour)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
-            it->staticmessage(this, message);
+            it->staticmessage(this, message, colour);
     }
     

code/branches/presentation3/src/orxonox/infos/GametypeInfo.h

@@ -64 +64 @@
             void sendKillMessage(const std::string& message, unsigned int clientID);
             void sendDeathMessage(const std::string& message, unsigned int clientID);
-            void sendStaticMessage(const std::string& message, unsigned int clientID);
+            void sendStaticMessage(const std::string& message, unsigned int clientID, const ColourValue& colour);
             void sendFadingMessage(const std::string& message, unsigned int clientID);
 
@@ -70 +70 @@
             void dispatchKillMessage(const std::string& message);
             void dispatchDeathMessage(const std::string& message);
-            void dispatchStaticMessage(const std::string& message);
+            void dispatchStaticMessage(const std::string& message,const ColourValue& colour);
             void dispatchFadingMessage(const std::string& message);
 

code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h

@@ -44 +44 @@
             virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) {}
             virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) {}
-            virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message) {}
+            virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) {}
             virtual void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) {}
     };