Changeset 11312 for code/branches/SpaceRace_HS16
- Timestamp:
- Nov 28, 2016, 4:36:54 PM (8 years ago)
- Location:
- code/branches/SpaceRace_HS16
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
r11306 r11312 82 82 83 83 <!-- ------------------SpawnPoint----------------- --> 84 <SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" > 85 </SpawnPoint> 86 <SpawnPoint position="-75,0,-50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" > 87 </SpawnPoint> 88 <SpawnPoint position="-75,0,50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" > 89 </SpawnPoint> 90 <SpawnPoint position="-150,0,-100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" > 91 </SpawnPoint> 92 <SpawnPoint position="-15,0,100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" > 93 </SpawnPoint> 84 <SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" /> 94 85 95 86 <!-- Launch station --> … … 198 189 <?lua end ?> 199 190 191 <!-- ------------------Boards----------------- --> 192 <StaticEntity position="1000,160,0" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static"> 193 <attached> 194 <Model scale="20" mesh="Board1.mesh" /> 195 </attached> 196 <collisionShapes> 197 <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" /> 198 </collisionShapes> 199 </StaticEntity> 200 201 <StaticEntity position="3000,330,100" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static"> 202 <attached> 203 <Model scale="20" mesh="Board2.mesh" /> 204 </attached> 205 <collisionShapes> 206 <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" /> 207 </collisionShapes> 208 </StaticEntity> 209 210 <StaticEntity position="5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static"> 211 <attached> 212 <Model scale="20" mesh="Board2.mesh" /> 213 </attached> 214 <collisionShapes> 215 <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" /> 216 </collisionShapes> 217 </StaticEntity> 218 200 219 201 220 <!-- ---------------------Checkpoints---------------------- --> … … 205 224 206 225 207 <RaceCheckPoint name="checkpoint1" position="1000,30,0" yaw=90 pitch=90 direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1">226 <RaceCheckPoint name="checkpoint1" yaw=90 pitch=90 position="1000,30,0" roll="0" direction="0,1,0" collisionType="static" scale="1" distance="60" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1"> 208 227 <attached> 209 228 <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/> … … 401 420 </RaceCheckPoint> 402 421 403 <RaceCheckPoint name="checkpoint16" yaw=90 pitch=90 position="41000,30,-50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="15" islast="true"> 422 <RaceCheckPoint name="checkpoint16" yaw=90 pitch=90 position="41000,30,-50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="15" islast="false" nextcheckpoints="16,-1,-1"> 423 <attached> 424 <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/> 425 </attached> 426 <collisionShapes> 427 <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" /> 428 <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" /> 429 <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" /> 430 <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" /> 431 </collisionShapes> 432 </RaceCheckPoint> 433 434 <RaceCheckPoint name="checkpoint17" yaw=90 pitch=90 position="44000,90,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="16" islast="false" nextcheckpoints="17,-1,-1"> 435 <attached> 436 <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/> 437 </attached> 438 <collisionShapes> 439 <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" /> 440 <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" /> 441 <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" /> 442 <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" /> 443 </collisionShapes> 444 </RaceCheckPoint> 445 446 <RaceCheckPoint name="checkpoint18" yaw=90 pitch=90 position="47000,120,30" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="17" islast="false" nextcheckpoints="18,-1,-1"> 447 <attached> 448 <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/> 449 </attached> 450 <collisionShapes> 451 <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" /> 452 <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" /> 453 <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" /> 454 <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" /> 455 </collisionShapes> 456 </RaceCheckPoint> 457 458 <RaceCheckPoint name="checkpoint19" yaw=90 pitch=90 position="50000,0,100" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="18" islast="false" nextcheckpoints="19,-1,-1"> 459 <attached> 460 <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/> 461 </attached> 462 <collisionShapes> 463 <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" /> 464 <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" /> 465 <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" /> 466 <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" /> 467 </collisionShapes> 468 </RaceCheckPoint> 469 470 <RaceCheckPoint name="checkpoint20" yaw=90 pitch=90 position="53000,0,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="19" islast="true"> 404 471 <attached> 405 472 <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/> … … 421 488 <!-- ---------------------PickUps---------------------- --> 422 489 423 <!--at checkpoint3--> 424 <!--at checkpoint#6--> 425 <!--at checkpoint#6-- 426 427 <PickupSpawner pickup=mediumshrinkpickup position="14800,0,0" triggerDistance="60" respawnTime="20" maxSpawnedItems="5" scale="8"/> 428 <!--at checkpoint9 429 430 431 <PickupSpawner pickup=smallspeedpickup position="3000,200,100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12" /> 432 <PickupSpawner pickup=mediumspeedpickup position="1000,30,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12"/> 433 <PickupSpawner pickup=hugespeedpickup position="5000,100,300" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12" /> 434 435 436 437 <PickupSpawner pickup=smalljumppickup position="50,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" /> 438 439 440 441 <PickupSpawner pickup=smallshrinkpickup position="20800,120,-120" triggerDistance="60" respawnTime="10" maxSpawnedItems="10" scale="8"/> 442 <!--at checkpoint12 443 <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="8000,-150,150" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 444 <!--stray pickups- 445 <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="6000,-300,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 446 <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="9000,300,200" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 447 <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="20000,-400,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> --> 448 490 <PickupSpawner pickup=smallshrinkpickup position="10000,-200,200" triggerDistance="60" respawnTime="10" maxSpawnedItems="10" scale="8"/> 491 <PickupSpawner pickup=mediumboostpickup position="24000,-150,-80" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 492 <PickupSpawner pickup=smallboostpickup position="38000,-200,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 493 494 <PickupSpawner pickup=smallspeedpickup position="7000,-200,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 495 <PickupSpawner pickup=mediumshinkpickup position="16000,150,50" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 496 <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="41000,-300,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> 449 497 </Scene> 450 498 </Level> -
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
r11303 r11312 218 218 void SpaceRace::addBots(unsigned int amount) 219 219 { 220 for (unsigned int i = 0; i < amount; ++i)220 for (unsigned int i = 1; i <= amount/2; ++i){ 221 221 this->botclass_.fabricate(this->getContext()); 222 222 //SpaceRaceBot* bot = new SpaceRaceBot(this->getContext()); 223 //bot->setPosition(-i*150,0,-i*100); 224 } 225 for (unsigned int i = 1; i <= amount/2; ++i){ 226 this->botclass_.fabricate(this->getContext()); 227 //SpaceRaceBot* bot = new SpaceRaceBot(this->getContext()); 228 //bot->setPosition(-i*150,0,i*100); 229 } 223 230 224 231 -
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc
r11281 r11312 35 35 36 36 37 37 38 namespace orxonox 38 39 { … … 58 59 "Louis Meile" 59 60 60 " Dominic Greene"61 "Abradolf Lincler" 61 62 }; 62 63 static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string)); … … 64 65 SetConfigValue(names_, defaultnames); 65 66 } 66 67 68 69 70 67 } -
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
r11306 r11312 371 371 372 372 } 373 /*374 void SpaceRaceController::useBoost()375 {376 377 }378 */379 373 380 374 /*void SpaceRaceController::computeVirtualCheckpoint(RaceCheckPoint* racepoint1, RaceCheckPoint* racepoint2, const std::vector<StaticEntity*>& allObjects) -
code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
r11283 r11312 91 91 "Viktor Zokas", 92 92 "Gustav Graves", 93 " Le Chiffre",93 "Kung Fury", 94 94 "Mr. White", 95 95 "Dominic Greene"
Note: See TracChangeset
for help on using the changeset viewer.