Changeset 6987 for code/branches/dynamicmatch/src/orxonox

Timestamp:

May 27, 2010, 8:46:00 PM (15 years ago)

Author:

jo

Message:

additional infomassages, improved level

File:

• code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc (modified) (11 diffs)

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

@@ -126 +126 @@
                          {
                               this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
+                              this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
                          }
                     }
@@ -140 +141 @@
                              {
                                   this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
+                                  this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
                              }
                         }
@@ -168 +170 @@
                      {
                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
+                          this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
                      }
                 }
@@ -186 +189 @@
                           if (numberOf[killer]>0)
                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it3->first->getClientID());
+                              
                           else
                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it3->first->getClientID());
+                          this->gtinfo_->sendFadingMessage("You're now a chaser.",it3->first->getClientID());
                      }
                 }
@@ -229 +234 @@
                           else
                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                          this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
                      }
                      std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer());
@@ -234 +240 @@
                      {
                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
+                          this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
                      }
                 }
@@ -261 +268 @@
                  {
                       this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
+                      this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
                  }
                  std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer());
@@ -266 +274 @@
                  {
                       this->gtinfo_->sendStaticMessage("Take the chasers down.",it2->first->getClientID());
+                      this->gtinfo_->sendFadingMessage("You're now a killer.",it2->first->getClientID());
                  }
                 }
@@ -457 +466 @@
                            else
                                this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                           //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_->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_->sendFadingMessage("You're now a killer.",it->first->getClientID());
+                       }
                   }
                   
@@ -499 +515 @@
                            else
                                this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                           //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_->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_->sendFadingMessage("You're now a killer.",it->first->getClientID());
+                       }
                   }
                   
@@ -542 +565 @@
                            else
                                this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
+                           //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_->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_->sendFadingMessage("You're now a killer.",it->first->getClientID());
+                       }
                   }