[Orxonox-commit 7321] r11938 - in code/branches/RacingBots_FS18: data/levels data/levels/templates src/modules/gametypes src/orxonox/worldentities/pawns
arismu at orxonox.net
arismu at orxonox.net
Thu May 3 16:09:38 CEST 2018
Author: arismu
Date: 2018-05-03 16:09:37 +0200 (Thu, 03 May 2018)
New Revision: 11938
Modified:
code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw
code/branches/RacingBots_FS18/data/levels/templates/fastship.oxt
code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc
code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.cc
Log:
checkpoints, boost, AI
Modified: code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw 2018-05-03 14:02:58 UTC (rev 11937)
+++ code/branches/RacingBots_FS18/data/levels/newnewnewspacerace.oxw 2018-05-03 14:09:37 UTC (rev 11938)
@@ -260,7 +260,7 @@
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint3" yaw=90 pitch=90 position="5000,-100,500" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
+<RaceCheckPoint name="checkpoint3" yaw=90 pitch=90 position="5000,80,500" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -300,7 +300,7 @@
-<RaceCheckPoint name="checkpoint6" yaw=90 pitch=90 position="13000,-50,400" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
+<RaceCheckPoint name="checkpoint6" yaw=90 pitch=90 position="13000,-70,350" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -351,7 +351,6 @@
<BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
</collisionShapes>
</RaceCheckPoint>
-
<RaceCheckPoint name="checkpoint10" yaw=90 pitch=90 position="24000,-150,-80" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="9" islast="false" nextcheckpoints="10,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
@@ -378,7 +377,7 @@
-<RaceCheckPoint name="checkpoint12" yaw=90 pitch=90 position="30000,-300,900" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
+<RaceCheckPoint name="checkpoint12" yaw=90 pitch=90 position="30000,-250,670" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -391,7 +390,7 @@
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint13" yaw=90 pitch=90 position="33000,600,60" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
+<RaceCheckPoint name="checkpoint13" yaw=90 pitch=90 position="33000,150,600" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -405,7 +404,7 @@
-<RaceCheckPoint name="checkpoint14" yaw=90 pitch=90 position="35000,700,20" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="13" islast="false" nextcheckpoints="14,-1,-1">
+<RaceCheckPoint name="checkpoint14" yaw=90 pitch=90 position="35000,500,300" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="13" islast="false" nextcheckpoints="14,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -417,7 +416,7 @@
</collisionShapes>
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="38000,-200,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="14" islast="false" nextcheckpoints="15,-1,-1">
+<RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="38000,150,150" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="14" islast="false" nextcheckpoints="15,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -478,7 +477,7 @@
</RaceCheckPoint>
<!-- the last checkpoint is bigger and red -->
- <RaceCheckPoint name="checkpoint20" yaw=90 pitch=90 position="51000,0,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="19" islast="true">
+ <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_Finish.mesh"/>
</attached>
@@ -533,9 +532,11 @@
<PickupSpawner pickup=mediumboostpickup position="24000,-165,-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=smallboostpickup position="42000,70,-30" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=smallboostpickup position="32000,0,650" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
- <PickupSpawner pickup=smallspeedpickup position="9000,-150,150" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=smallspeedpickup position="9000,-185,66" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
</Scene>
</Level>
Modified: code/branches/RacingBots_FS18/data/levels/templates/fastship.oxt
===================================================================
--- code/branches/RacingBots_FS18/data/levels/templates/fastship.oxt 2018-05-03 14:02:58 UTC (rev 11937)
+++ code/branches/RacingBots_FS18/data/levels/templates/fastship.oxt 2018-05-03 14:09:37 UTC (rev 11938)
@@ -20,13 +20,13 @@
auxilaryThrust = 1000
rotationThrust = 50
- lift = 0;
- stallSpeed = 220;
+ lift = 0
+ stallSpeed = 220
- boostPower = 8
+ boostPower = 8
boostPowerRate = 3
- boostRate = 8
+ boostRate = 8
boostCooldownDuration = 6
shakeFrequency = 50
Modified: code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc 2018-05-03 14:02:58 UTC (rev 11937)
+++ code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc 2018-05-03 14:09:37 UTC (rev 11938)
@@ -124,9 +124,12 @@
for (Engine* engine : ObjectList<Engine>())
{
engine->setActive(false);
- engine->addSpeedMultiply(3.5f);
+ engine->addSpeedMultiply(1.7);
+
+
}
+
//append spawn positions to bots
int a,b,c;
a=0;
Modified: code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.cc 2018-05-03 14:02:58 UTC (rev 11937)
+++ code/branches/RacingBots_FS18/src/orxonox/worldentities/pawns/SpaceShip.cc 2018-05-03 14:09:37 UTC (rev 11938)
@@ -64,7 +64,7 @@
this->boostPower_ = 10.0f;
this->boostPowerRate_ = 1.0f;
this->boostRate_ = 5.0f;
- this->boostCooldownDuration_ = 5.0f;
+ this->boostCooldownDuration_ = 10.0f;
this->shakeFrequency_ = 15.0f;
this->shakeAmplitude_ = 5.0f;
More information about the Orxonox-commit
mailing list