Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6987 for code


Ignore:
Timestamp:
May 27, 2010, 8:46:00 PM (14 years ago)
Author:
jo
Message:

additional infomassages, improved level

Location:
code/branches/dynamicmatch
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw

    r6955 r6987  
    1818    <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" />
    1919
    20 <!-- Planet braucht noch Collisionshape und evtl. Gravitation-->
     20<!-- ------------------Planet needs gravity----------------- -->
    2121<Planet position="0,0,0" scale=500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    2222<StaticEntity position="0,0,0" collisionType=static>
    2323      <collisionShapes>
    24         <SphereCollisionShape radius="500" />
     24        <SphereCollisionShape radius="499" />
    2525      </collisionShapes>
    2626    </StaticEntity>
    2727
    28 <!-- Die Spawnpoints sollten auf der Oberlaeche des Planeten sein, so verteilt, dass Spieler sich nicht sehen; spaeter: Teamspawnpoints fuer chaser!!-->
     28<!-- -----------12-Spawnpoints around the planet------------- -->
    2929<TeamSpawnPoint team=0 position="1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    3030<TeamSpawnPoint team=0 position="-1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    … …  
    3333<TeamSpawnPoint team=0 position="0,0,1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    3434<TeamSpawnPoint team=0 position="0,0,-1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
     35<!--outer Spawnpoints -->
     36<TeamSpawnPoint team=0 position="2000,0,0" lookat="0,0,1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
     37<TeamSpawnPoint team=0 position="-2000,0,0" lookat="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    3538<TeamSpawnPoint team=0 position="0,2000,0" lookat="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    3639<TeamSpawnPoint team=0 position="0,-2000,0" lookat="0,-1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
    … …  
    4144    dofile("includes/CuboidSpaceStation.lua")
    4245  ?>
    43 <!--Rotating satellite -->
     46<!-- ----------------Rotating satellite--------------- -->
    4447<MovableEntity position="1,1,1" rotationrate="-4.5" rotationaxis="0,0,1">
    4548        <attached>
    … …  
    5760</MovableEntity>
    5861
    59 <!--particleTest
    60  <ParticleEmitter position="800,800,800" source="Orxonox/Steam" >
    61     </ParticleEmitter>
    62  <ParticleEmitter position="900,900,900" source="Orxonox/Steam" >
    63     </ParticleEmitter>
    64  <ParticleEmitter position="700,700,700" source="Orxonox/Steam" >
    65     </ParticleEmitter>
    66  <ParticleEmitter position="770,770,770" source="Orxonox/Steam" >
    67     </ParticleEmitter>
    68 <ParticleEmitter position="760,760,760" source="Orxonox/Steam" >
    69     </ParticleEmitter>
    70 <ParticleEmitter position="760,760,760" source="Orxonox/Steam" >
    71     </ParticleEmitter>
    72 <ParticleEmitter position="760,900,600" source="Orxonox/Steam" >
    73     </ParticleEmitter>
    74 <ParticleEmitter position="760,900,700" source="Orxonox/Steam" >
    75     </ParticleEmitter>
    76 <ParticleEmitter position="760,900,800" source="Orxonox/Steam" >
    77     </ParticleEmitter>
    78 <ParticleEmitter position="760,900,900" source="Orxonox/Steam" >
    79     </ParticleEmitter>
    80 -->
    81 
    82 
    83 <!-- asteroid ellypse-->
     62<!-- ---------------asteroid ellypse----------------- -->
    8463<?lua
    8564max = 20
    … …  
    9675?>
    9776
    98     <MovableEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
     77    <StaticEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" scale=<?lua print(j * 5) ?> >
    9978      <attached>
    100         <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
     79        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
     80          <attached><!-- ---------asteroid fog----- -->
     81            <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
     82          </attached>
     83        </Model>
    10184      </attached>
    10285      <?lua if i == 5 then ?><collisionShapes>
    10386        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
    10487      </collisionShapes> <?lua end ?>
    105     </MovableEntity>
     88    </StaticEntity>
    10689<?lua
    10790end
    … …  
    11699      </events>
    117100    </GlobalShader>
    118 
    119 <!--
     101<!-- ----------------random fog --- not in use
    120102<?lua
    121103for i = 1, 100, 1
    … …  
    124106?>
    125107
    126     <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
     108    <StaticEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>">
    127109      <attached>
    128         <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
     110        <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
    129111      </attached>
    130       <collisionShapes>
    131         <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
    132       </collisionShapes>
    133     </MovableEntity>
     112    </StaticEntity>
     113
    134114<?lua
    135115end
    136116?>
    137117-->
    138 
    139118  </Scene>
    140119</Level>

  • code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo

    r6954 r6987  
    66   position = "0.5, 0.01"
    77   font     = "VeraMono"
    8    caption  = "Instructions"
    9    textsize = 0.035
     8   caption  = ""
     9   textsize = 0.033
    1010   colour   = "1.0, 1.0, 0.5, 1.0"
    1111   align    = "center"
    … …  
    1414<GametypeFadingMessage
    1515     name     = "fadingmessage"
    16      position = "0.25, 0.5"
     16     position = "0.5, 0.05"
    1717     font     = "VeraMono"
    18      textsize = 0.035
     18     textsize = 0.04
    1919     colour   = "1.0, 1.0, 0.5, 1.0"
    2020     align    = "center"

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

    r6959 r6987  
    126126                         {
    127127                              this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
     128                              this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
    128129                         }
    129130                    }
    … …  
    140141                             {
    141142                                  this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
     143                                  this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
    142144                             }
    143145                        }
    … …  
    168170                     {
    169171                          this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID());
     172                          this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID());
    170173                     }
    171174                }
    … …  
    186189                          if (numberOf[killer]>0)
    187190                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it3->first->getClientID());
     191                             
    188192                          else
    189193                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it3->first->getClientID());
     194                          this->gtinfo_->sendFadingMessage("You're now a chaser.",it3->first->getClientID());
    190195                     }
    191196                }
    … …  
    229234                          else
    230235                              this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
     236                          this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
    231237                     }
    232238                     std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer());
    … …  
    234240                     {
    235241                          this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID());
     242                          this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID());
    236243                     }
    237244                }
    … …  
    261268                 {
    262269                      this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
     270                      this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
    263271                 }
    264272                 std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer());
    … …  
    266274                 {
    267275                      this->gtinfo_->sendStaticMessage("Take the chasers down.",it2->first->getClientID());
     276                      this->gtinfo_->sendFadingMessage("You're now a killer.",it2->first->getClientID());
    268277                 }
    269278                }
    … …  
    457466                           else
    458467                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
     468                           //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
    459469                       }
    460470                       else if (it->second==piggy)
     471                       {
    461472                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
     473                           //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
     474                       }
    462475                       else if (it->second==killer)
     476                       {
    463477                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
     478                           //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
     479                       }
    464480                  }
    465481                 
    … …  
    499515                           else
    500516                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
     517                           //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
    501518                       }
    502519                       else if (it->second==piggy)
     520                       {
    503521                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
     522                           //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
     523                       }
    504524                       else if (it->second==killer)
     525                       {
    505526                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
     527                           //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
     528                       }
    506529                  }
    507530                 
    … …  
    542565                           else
    543566                               this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible.",it->first->getClientID());
     567                           //this->gtinfo_->sendFadingMessage("You're now a chaser.",it->first->getClientID());
    544568                       }
    545569                       else if (it->second==piggy)
     570                       {
    546571                           this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID());
     572                           //this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID());
     573                       }
    547574                       else if (it->second==killer)
     575                       {
    548576                           this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID());
     577                           //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID());
     578                       }
    549579                  }
    550580                 
Note: See TracChangeset for help on using the changeset viewer.