[Orxonox-commit 6682] r11312 - in code/branches/SpaceRace_HS16: data/levels src/modules/gametypes src/orxonox/infos
meilel at orxonox.net
meilel at orxonox.net
Mon Nov 28 16:36:54 CET 2016
Author: meilel
Date: 2016-11-28 16:36:54 +0100 (Mon, 28 Nov 2016)
New Revision: 11312
Modified:
code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
Log:
boards added and other stuff done
Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-11-28 15:07:25 UTC (rev 11311)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-11-28 15:36:54 UTC (rev 11312)
@@ -81,16 +81,7 @@
<!-- ------------------SpawnPoint----------------- -->
- <SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
- </SpawnPoint>
-<SpawnPoint position="-75,0,-50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
- </SpawnPoint>
-<SpawnPoint position="-75,0,50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
- </SpawnPoint>
-<SpawnPoint position="-150,0,-100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
- </SpawnPoint>
-<SpawnPoint position="-15,0,100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
- </SpawnPoint>
+ <SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" />
<!-- Launch station -->
<StaticEntity mass="50" position="-400,-20,0" direction="0,-90,0" collisionType="static">
@@ -197,14 +188,42 @@
?>
<?lua end ?>
+ <!-- ------------------Boards----------------- -->
+ <StaticEntity position="1000,160,0" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <attached>
+ <Model scale="20" mesh="Board1.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" />
+ </collisionShapes>
+ </StaticEntity>
+ <StaticEntity position="3000,330,100" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <attached>
+ <Model scale="20" mesh="Board2.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" />
+ </collisionShapes>
+ </StaticEntity>
+
+<StaticEntity position="5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <attached>
+ <Model scale="20" mesh="Board2.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" />
+ </collisionShapes>
+ </StaticEntity>
+
+
<!-- ---------------------Checkpoints---------------------- -->
<SpaceRaceManager>
<checkpoints>
- <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">
+ <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">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -400,7 +419,7 @@
</collisionShapes>
</RaceCheckPoint>
-<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">
+<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">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -412,40 +431,69 @@
</collisionShapes>
</RaceCheckPoint>
+<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">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
-</checkpoints>
-</SpaceRaceManager>
+<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">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+ <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">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+ <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">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
-<!-- ---------------------PickUps---------------------- -->
- <!--at checkpoint3-->
- <!--at checkpoint#6-->
- <!--at checkpoint#6--
+</checkpoints>
+</SpaceRaceManager>
- <PickupSpawner pickup=mediumshrinkpickup position="14800,0,0" triggerDistance="60" respawnTime="20" maxSpawnedItems="5" scale="8"/>
- <!--at checkpoint9
- <PickupSpawner pickup=smallspeedpickup position="3000,200,100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12" />
- <PickupSpawner pickup=mediumspeedpickup position="1000,30,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12"/>
- <PickupSpawner pickup=hugespeedpickup position="5000,100,300" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" scale = "12" />
-
+<!-- ---------------------PickUps---------------------- -->
+ <PickupSpawner pickup=smallshrinkpickup position="10000,-200,200" triggerDistance="60" respawnTime="10" maxSpawnedItems="10" scale="8"/>
+ <PickupSpawner pickup=mediumboostpickup position="24000,-150,-80" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=smallboostpickup position="38000,-200,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
- <PickupSpawner pickup=smalljumppickup position="50,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-
-
-
- <PickupSpawner pickup=smallshrinkpickup position="20800,120,-120" triggerDistance="60" respawnTime="10" maxSpawnedItems="10" scale="8"/>
- <!--at checkpoint12
- <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="8000,-150,150" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
- <!--stray pickups-
- <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="6000,-300,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
- <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="9000,300,200" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
- <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="20000,-400,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> -->
-
+ <PickupSpawner pickup=smallspeedpickup position="7000,-200,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=mediumshinkpickup position="16000,150,50" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="41000,-300,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
</Scene>
</Level>
\ No newline at end of file
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc 2016-11-28 15:07:25 UTC (rev 11311)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc 2016-11-28 15:36:54 UTC (rev 11312)
@@ -217,9 +217,16 @@
void SpaceRace::addBots(unsigned int amount)
{
- for (unsigned int i = 0; i < amount; ++i)
+ for (unsigned int i = 1; i <= amount/2; ++i){
this->botclass_.fabricate(this->getContext());
-
+ //SpaceRaceBot* bot = new SpaceRaceBot(this->getContext());
+ //bot->setPosition(-i*150,0,-i*100);
+ }
+ for (unsigned int i = 1; i <= amount/2; ++i){
+ this->botclass_.fabricate(this->getContext());
+ //SpaceRaceBot* bot = new SpaceRaceBot(this->getContext());
+ //bot->setPosition(-i*150,0,i*100);
+ }
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc 2016-11-28 15:07:25 UTC (rev 11311)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceBot.cc 2016-11-28 15:36:54 UTC (rev 11312)
@@ -34,6 +34,7 @@
+
namespace orxonox
{
RegisterClass(SpaceRaceBot);
@@ -57,14 +58,10 @@
"Berkay Berabi",
"Louis Meile"
- "Dominic Greene"
+ "Abradolf Lincler"
};
static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
SetConfigValue(names_, defaultnames);
}
-
-
-
-
}
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-11-28 15:07:25 UTC (rev 11311)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-11-28 15:36:54 UTC (rev 11312)
@@ -370,13 +370,7 @@
return true;
}
-/*
- void SpaceRaceController::useBoost()
- {
- }
-*/
-
/*void SpaceRaceController::computeVirtualCheckpoint(RaceCheckPoint* racepoint1, RaceCheckPoint* racepoint2, const std::vector<StaticEntity*>& allObjects)
{
Vector3 cP1ToCP2=(racepoint2->getPosition()-racepoint1->getPosition()) / (racepoint2->getPosition()-racepoint1->getPosition()).length(); //unit Vector
Modified: code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc 2016-11-28 15:07:25 UTC (rev 11311)
+++ code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc 2016-11-28 15:36:54 UTC (rev 11312)
@@ -90,7 +90,7 @@
"Elektra King",
"Viktor Zokas",
"Gustav Graves",
- "Le Chiffre",
+ "Kung Fury",
"Mr. White",
"Dominic Greene"
};
More information about the Orxonox-commit
mailing list