Changeset 6987 for code/branches
- Timestamp:
- May 27, 2010, 8:46:00 PM (14 years ago)
- Location:
- code/branches/dynamicmatch
- Files:
-
- 3 edited
-
data/levels/gametype_dynamicmatch.oxw (modified) (7 diffs)
-
data/overlays/dynamicmatchhud.oxo (modified) (2 diffs)
-
src/orxonox/gametypes/Dynamicmatch.cc (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/dynamicmatch/data/levels/gametype_dynamicmatch.oxw
r6955 r6987 18 18 <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" /> 19 19 20 <!-- Planet braucht noch Collisionshape und evtl. Gravitation-->20 <!-- ------------------Planet needs gravity----------------- --> 21 21 <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 /> 22 22 <StaticEntity position="0,0,0" collisionType=static> 23 23 <collisionShapes> 24 <SphereCollisionShape radius=" 500" />24 <SphereCollisionShape radius="499" /> 25 25 </collisionShapes> 26 26 </StaticEntity> 27 27 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------------- --> 29 29 <TeamSpawnPoint team=0 position="1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> 30 30 <TeamSpawnPoint team=0 position="-1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> … … 33 33 <TeamSpawnPoint team=0 position="0,0,1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> 34 34 <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/> 35 38 <TeamSpawnPoint team=0 position="0,2000,0" lookat="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> 36 39 <TeamSpawnPoint team=0 position="0,-2000,0" lookat="0,-1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/> … … 41 44 dofile("includes/CuboidSpaceStation.lua") 42 45 ?> 43 <!-- Rotating satellite-->46 <!-- ----------------Rotating satellite--------------- --> 44 47 <MovableEntity position="1,1,1" rotationrate="-4.5" rotationaxis="0,0,1"> 45 48 <attached> … … 57 60 </MovableEntity> 58 61 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----------------- --> 84 63 <?lua 85 64 max = 20 … … 96 75 ?> 97 76 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) ?> > 99 78 <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> 101 84 </attached> 102 85 <?lua if i == 5 then ?><collisionShapes> 103 86 <SphereCollisionShape radius="<?lua print(j * 70) ?>" /> 104 87 </collisionShapes> <?lua end ?> 105 </ MovableEntity>88 </StaticEntity> 106 89 <?lua 107 90 end … … 116 99 </events> 117 100 </GlobalShader> 118 119 <!-- 101 <!-- ----------------random fog --- not in use 120 102 <?lua 121 103 for i = 1, 100, 1 … … 124 106 ?> 125 107 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) ?>"> 127 109 <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" /> 129 111 </attached> 130 <collisionShapes> 131 <SphereCollisionShape radius="<?lua print(j * 70) ?>" /> 132 </collisionShapes> 133 </MovableEntity> 112 </StaticEntity> 113 134 114 <?lua 135 115 end 136 116 ?> 137 117 --> 138 139 118 </Scene> 140 119 </Level> -
code/branches/dynamicmatch/data/overlays/dynamicmatchhud.oxo
r6954 r6987 6 6 position = "0.5, 0.01" 7 7 font = "VeraMono" 8 caption = " Instructions"9 textsize = 0.03 58 caption = "" 9 textsize = 0.033 10 10 colour = "1.0, 1.0, 0.5, 1.0" 11 11 align = "center" … … 14 14 <GametypeFadingMessage 15 15 name = "fadingmessage" 16 position = "0. 25, 0.5"16 position = "0.5, 0.05" 17 17 font = "VeraMono" 18 textsize = 0.0 3518 textsize = 0.04 19 19 colour = "1.0, 1.0, 0.5, 1.0" 20 20 align = "center" -
code/branches/dynamicmatch/src/orxonox/gametypes/Dynamicmatch.cc
r6959 r6987 126 126 { 127 127 this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID()); 128 this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID()); 128 129 } 129 130 } … … 140 141 { 141 142 this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID()); 143 this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID()); 142 144 } 143 145 } … … 168 170 { 169 171 this->gtinfo_->sendStaticMessage("Take the chasers down.",it3->first->getClientID()); 172 this->gtinfo_->sendFadingMessage("You're now a killer.",it3->first->getClientID()); 170 173 } 171 174 } … … 186 189 if (numberOf[killer]>0) 187 190 this->gtinfo_->sendStaticMessage("Shoot at the victim as often as possible. Defend yourself against the killers.",it3->first->getClientID()); 191 188 192 else 189 193 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()); 190 195 } 191 196 } … … 229 234 else 230 235 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()); 231 237 } 232 238 std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer()); … … 234 240 { 235 241 this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it2->first->getClientID()); 242 this->gtinfo_->sendFadingMessage("You're now a victim.",it2->first->getClientID()); 236 243 } 237 244 } … … 261 268 { 262 269 this->gtinfo_->sendStaticMessage("Either hide or shoot a chaser.",it->first->getClientID()); 270 this->gtinfo_->sendFadingMessage("You're now a victim.",it->first->getClientID()); 263 271 } 264 272 std::map<PlayerInfo*, Player>::iterator it2 = this->players_.find(victim->getPlayer()); … … 266 274 { 267 275 this->gtinfo_->sendStaticMessage("Take the chasers down.",it2->first->getClientID()); 276 this->gtinfo_->sendFadingMessage("You're now a killer.",it2->first->getClientID()); 268 277 } 269 278 } … … 457 466 else 458 467 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()); 459 469 } 460 470 else if (it->second==piggy) 471 { 461 472 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 } 462 475 else if (it->second==killer) 476 { 463 477 this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID()); 478 //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID()); 479 } 464 480 } 465 481 … … 499 515 else 500 516 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()); 501 518 } 502 519 else if (it->second==piggy) 520 { 503 521 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 } 504 524 else if (it->second==killer) 525 { 505 526 this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID()); 527 //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID()); 528 } 506 529 } 507 530 … … 542 565 else 543 566 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()); 544 568 } 545 569 else if (it->second==piggy) 570 { 546 571 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 } 547 574 else if (it->second==killer) 575 { 548 576 this->gtinfo_->sendStaticMessage("Take the chasers down.",it->first->getClientID()); 577 //this->gtinfo_->sendFadingMessage("You're now a killer.",it->first->getClientID()); 578 } 549 579 } 550 580
Note: See TracChangeset
for help on using the changeset viewer.
