[Orxonox-commit 6666] r11303 - in code/branches/SpaceRace_HS16: data/levels data/levels/templates src/modules/gametypes
bberabi at orxonox.net
bberabi at orxonox.net
Mon Nov 21 16:06:13 CET 2016
Author: bberabi
Date: 2016-11-21 16:06:13 +0100 (Mon, 21 Nov 2016)
New Revision: 11303
Modified:
code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
Log:
blabla
Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-11-21 15:04:27 UTC (rev 11302)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-11-21 15:06:13 UTC (rev 11303)
@@ -17,6 +17,9 @@
include("HUDTemplates3.oxo")
include("templates/lodInformation.oxt")
include("templates/fastship.oxt")
+ include("templates/spaceshipPirate.oxt")
+
+ include("templates/spaceshipAssff.oxt")
include("templates/pickupRepresentationTemplates.oxt")
?>
@@ -80,13 +83,13 @@
<!-- ------------------SpawnPoint----------------- -->
<SpawnPoint position="0,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
</SpawnPoint>
-<SpawnPoint position="-50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
+<SpawnPoint position="-75,0,-50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
</SpawnPoint>
-<SpawnPoint position="-100,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
+<SpawnPoint position="-75,0,50" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
</SpawnPoint>
-<SpawnPoint position="-150,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
+<SpawnPoint position="-150,0,-100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
</SpawnPoint>
-<SpawnPoint position="-200,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
+<SpawnPoint position="-15,0,100" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" >
</SpawnPoint>
<!-- Launch station -->
@@ -228,7 +231,7 @@
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint3" yaw=90 pitch=90 position="5000,100,300" 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,100,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>
@@ -268,7 +271,7 @@
-<RaceCheckPoint name="checkpoint6" yaw=90 pitch=90 position="13000,100,100" 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,200,400" 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>
@@ -308,7 +311,7 @@
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint9" yaw=90 pitch=90 position="21000,120,-120" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
+<RaceCheckPoint name="checkpoint9" yaw=90 pitch=90 position="21000,200,-120" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -346,7 +349,7 @@
-<RaceCheckPoint name="checkpoint12" yaw=90 pitch=90 position="30000,-50,50" 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,-300,900" 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>
@@ -359,7 +362,7 @@
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint13" yaw=90 pitch=90 position="33000,80,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,600,60" 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>
@@ -385,7 +388,7 @@
</collisionShapes>
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="38000,80,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,-200,0" 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>
@@ -397,7 +400,7 @@
</collisionShapes>
</RaceCheckPoint>
-<RaceCheckPoint name="checkpoint15" yaw=90 pitch=90 position="41000,30,-50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="40" checkpointindex="14" 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="true">
<attached>
<Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
</attached>
@@ -418,17 +421,30 @@
<!-- ---------------------PickUps---------------------- -->
<!--at checkpoint3-->
- <PickupSpawner pickup=mediumpeedpickup position="4800,100,300" triggerDistance="60" respawnTime="10" maxSpawnedItems="99" scale="8" />
<!--at checkpoint#6-->
+ <!--at checkpoint#6--
+
<PickupSpawner pickup=mediumshrinkpickup position="14800,0,0" triggerDistance="60" respawnTime="20" maxSpawnedItems="5" scale="8"/>
- <!--at checkpoint9-->
+ <!--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" />
+
+
+
+ <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="29800,-50,50" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
- <!--stray pickups-->
+ <!--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=triplehealthspeedinvisibilitypickup position="20000,-400,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/> -->
</Scene>
</Level>
Modified: code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt 2016-11-21 15:04:27 UTC (rev 11302)
+++ code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt 2016-11-21 15:06:13 UTC (rev 11303)
@@ -24,10 +24,10 @@
stallSpeed = 220;
- boostPower = 10
- boostPowerRate = 10
- boostRate = 10
- boostCooldownDuration = 10
+ boostPower = 8
+ boostPowerRate = 3
+ boostRate = 8
+ boostCooldownDuration = 6
shakeFrequency = 50
shakeAmplitude = 30
@@ -84,17 +84,17 @@
<Template name=spaceshipassffengine baseclass=MultiStateEngine>
<MultiStateEngine
- boostfactor = 10
+ boostfactor = 4
- speedfront = 1000
- speedback = 1000
+ speedfront = 3000
+ speedback = 1500
speedleftright = 50
speedupdown = 50
defEngineSndNormal = "sounds/Engine_low.ogg"
defEngineSndBoost = "sounds/Engine_high.ogg"
- accelerationfront = 300
+ accelerationfront = 400
accelerationbrake = 300
accelerationback = 125
accelerationleftright = 125
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc 2016-11-21 15:04:27 UTC (rev 11302)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc 2016-11-21 15:06:13 UTC (rev 11303)
@@ -219,6 +219,10 @@
{
for (unsigned int i = 0; i < amount; ++i)
this->botclass_.fabricate(this->getContext());
+
+
+
+
}
@@ -226,7 +230,6 @@
-
bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
{
return true;
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-11-21 15:04:27 UTC (rev 11302)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-11-21 15:06:13 UTC (rev 11303)
@@ -379,6 +379,8 @@
}
//orxout(user_status) << "dt= " << dt << "; distance= " << (lastPositionSpaceship-this->getControllableEntity()->getPosition()).length() <<std::endl;
lastPositionSpaceship = this->getControllableEntity()->getPosition();
+
+this->boostControl();
this->moveToPosition(nextRaceCheckpoint_->getPosition());
}
More information about the Orxonox-commit
mailing list