Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7600


Ignore:
Timestamp:
Oct 28, 2010, 11:53:27 PM (13 years ago)
Author:
jo
Message:

New functionality successfully added. No bugs found so far. Only the delaytimer is running a little bit too fast.

Location:
code/branches/lastmanstanding
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/lastmanstanding/data/levels/gametype_lastmanstanding.oxw

    r7596 r7600  
    6161j = math.random()
    6262?>
     63
     64
     65    <!--SpawnPoint team=0 position="<?lua print(y*1.4) ?>,0,<?lua print(z*1.4) ?>" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
    6366
    6467    <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
  • code/branches/lastmanstanding/src/orxonox/gametypes/LastManStanding.cc

    r7596 r7600  
    4646        this->lives=4;
    4747        this->playersAlive=0;
    48         this->timeRemaining=20.0f;
     48        this->timeRemaining=10.0f;
    4949        this->respawnDelay=4.0f;
    5050        this->setHUDTemplate("LastmanstandingHUD");
     
    6464                {
    6565                    if (it->first->getClientID()== CLIENTID_UNKNOWN)
    66                         return;
     66                        continue;
    6767                    const std::string& message = "Respawn in " +multi_cast<std::string>(respawnDelay)+ " seconds." ;
    6868                    this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
     
    7171                {
    7272                    if (it->first->getClientID()== CLIENTID_UNKNOWN)
    73                         return;
     73                        continue;
    7474                    const std::string& message2 = "You have lost all " +multi_cast<std::string>(lives)+ " lives." ;
    7575                    this->gtinfo_->sendFadingMessage(message2,it->first->getClientID());
     
    236236            {   
    237237                if (playerGetLives(it->first)<=0)//Players without lives shouldn't be affected by time.
    238                     return;     
     238                    continue;     
    239239                it->second-=dt;//Decreases punishment time.
    240240                if (!inGame_[it->first])//Manages respawn delay - player is forced to respawn after the delaytime is used up.
     
    253253                {
    254254                    if (it->first->getClientID()== CLIENTID_UNKNOWN)
    255                         return;
     255                        continue;
    256256                    const std::string& message = "Camper Warning! Don't forget to shoot.";
    257257                    this->gtinfo_->sendFadingMessage(message,it->first->getClientID());
Note: See TracChangeset for help on using the changeset viewer.