[Orxonox-commit 6708] r11337 - in code/branches/SpaceRace_HS16: data/levels src/modules/gametypes
bberabi at orxonox.net
bberabi at orxonox.net
Tue Dec 13 17:46:18 CET 2016
Author: bberabi
Date: 2016-12-13 17:46:18 +0100 (Tue, 13 Dec 2016)
New Revision: 11337
Removed:
code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw
code/branches/SpaceRace_HS16/data/levels/SurfaceRacePresentation.oxw
code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw
code/branches/SpaceRace_HS16/data/levels/surfaceRace.oxw
code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.cc
code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.h
code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc
code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h
Modified:
code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
Log:
all the other unnessary spacerace files are deleted, oldracecheckpoint is deleted, there is already a racecheckpoint class, comments are added, everything seems okay
Deleted: code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,220 +0,0 @@
-<LevelInfo
- name = "Spacerace 2"
- description = "New Spacerace with Multiple Paths."
- tags = "gametype"
- screenshot = "spacerace2.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
-
- include("templates/spaceshipAssff.oxt")
-
-?>
-
-
-<?lua
- include("templates/spaceshipAssff2.oxt")
- include("templates/spaceshipPirate.oxt")
-?>
-
-<Level
- name = "Spacerace2"
- description = "Just a few tests"
- plugins = "gametypes"
- gametype = "SpaceRace"
->
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-
- <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"/>
-
-
- <SpaceRaceManager>
- <checkpoints>
- <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false" nextcheckpoints="1,2,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint2" position="0,2100,2300" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false" nextcheckpoints="3,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint3" position="0,700,2700" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint4" position="0,-400,300" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="true">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </RaceCheckPoint>
- </checkpoints>
- </SpaceRaceManager>
-
-
- <SpaceShip position="0,0,200" lookat="0,0,0">
- <templates>
- <Template link=spaceshipassff />
- </templates>
- <controller>
- <WaypointPatrolController alertnessradius=0 team=10>
- <waypoints>
- <Model mesh="cube.mesh" scale=0 position="0,-2000,1000" />
- <Model mesh="cube.mesh" scale=0 position="0,2100,2300" />
- <Model mesh="cube.mesh" scale=0 position="0,-400,300" />
- </waypoints>
- </WaypointPatrolController>
- </controller>
- </SpaceShip>
-
- <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
- <!-- SOUNDS & MUSIC -->
- <WorldSound name="scoreSound" position="-200,0,0" source="sounds/ReadyGo.ogg" >
- <events>
- <play>
- <EventListener event="start" />
- </play>
- </events>
- </WorldSound>
- <DistanceTrigger name="start" position="-200,0,0" target="Pawn" distance=100 stayActive="true" delay=0.5 />
-
- <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
-
- <!-- ------------------Planet----------------- -->
- <Planet position="0,0,0" scale=300 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
- <StaticEntity position="0,0,0" collisionType=static>
- <collisionShapes>
- <SphereCollisionShape radius="399" />
- </collisionShapes>
- </StaticEntity>
-
- <!-- ---------------asteroid ellipse----------------- -->
- <?lua
- max = 20
- for i = 0, max, 1
- do
- y = math.sin(i/max*6)*2000
- z = math.cos(i/max*6)*2500
- x = 0
- ?>
- <?lua
- for k = 1, 15, 1
- do
- j = math.random()
- ?>
-
- <MovableEntity
- position = "<?lua print(x + math.random() * 500) ?>,<?lua print(y + math.random() * 500) ?>,<?lua print(z + math.random() * 1000) ?>"
- collisionType = "dynamic"
- linearDamping = "0.5"
- angularDamping = "0.01"
- collisiondamage = "0.01"
- enablecollisiondamage = "true"
- scale="<?lua print(j * 5) ?>" >
- <attached>
- <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
- <?lua if k == 5 then ?><attached><!-- ---------asteroid fog----- -->
- <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
- </attached> <?lua end ?>
- </Model>
- </attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
- </collisionShapes>
- </MovableEntity>
- <?lua
- end
- ?>
- <?lua end ?>
-
- <!-- ---------------ForceFields----------------- -->
- <ForceField position="0,-700,2700" direction="0,1,0" diameter=500 velocity=2000 length=600 />
- <MovableEntity position="0,-400,2700">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,15,1 do ?>
- <Billboard position="-200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <ForceField position="0,2500,2000" direction="0,0,-1" diameter=250 velocity=2000 length=600 />
- <MovableEntity position="0,2500,2000">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,15,1 do ?>
- <Billboard position="-100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <ForceField position="0,1300,-800" direction="0,-1,-1" diameter=250 velocity=2000 length=800 />
- <MovableEntity position="0,1300,-800">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,20,1 do ?>
- <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <ForceField position="0,-1400,-700" direction="0,-1,1" diameter=250 velocity=2000 length=600 />
- <MovableEntity position="0,-1400,-700">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,15,1 do ?>
- <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
-
-
- </Scene>
-</Level>
-
Deleted: code/branches/SpaceRace_HS16/data/levels/SurfaceRacePresentation.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/SurfaceRacePresentation.oxw 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/data/levels/SurfaceRacePresentation.oxw 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,377 +0,0 @@
-<LevelInfo
- name = "Surface Race Presentation"
- description = "just awesome 2.0"
- screenshot = "surfaceRace.png"
- tags = "gametype, shipselection"
- startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser, spaceshiprace"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
- include("templates/spaceshipRace.oxt")
- include("templates/spaceshipAssff.oxt")
- include("templates/spaceshipGhost.oxt")
- include("templates/spaceshipSpacecruiser.oxt")
- include("templates/pickupRepresentationTemplates.oxt")
-
-?>
-
-<Level
-plugins = gametypes
-gametype = SpaceRace
->
-
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "2.0, 2.0, 2.0"
- skybox = "Orxonox/skyBoxClouds"
- gravity = "0,-75,0"
- negativeWorldRange = "-100000, -100000, -100000"
- positiveWorldRange = " 100000, 100000, 100000"
- hasPhysics = true
- >
-
- <Template name=PortalDefault>
- <PortalEndPoint>
- <attached>
- <Model mesh="Spacegate.mesh" scale="3"/>
- </attached>
- </PortalEndPoint>
- </Template>
-
- <PortalEndPoint position="6000,8050,2500" id="1" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
- <PortalEndPoint position="6100,8050,-4500" id="2" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
- <PortalLink fromID="1" toID="2" />
- <PortalLink fromID="2" toID="1" />
-
- <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"/>
-
-
- <Model position="4200,8050,-1000" scale=10 mesh="debris-pile01.mesh" shadow=true />
- <Model position="4200,8050,-1000" scale=10 mesh="debris-pile02.mesh" shadow=true />
- <Model position="4200,8050,-1000" scale=10 mesh="debris-pile03.mesh" shadow=true />
-
- <MovableEntity position="-700,8090,-300" velocity="80,0,0" rotationaxis="1,0,1" rotationrate=200>
- <attached>
- <Model position="0,0,-20" scale=10 mesh="cokebottle.mesh" />
- </attached>
- </MovableEntity>
-
-
-<SpaceRaceManager>
- <checkpoints>
- <RaceCheckPoint name="checkpoint1" position="0,8050,-1000" direction="0,1,0" collisionType="static" scale="4" distance="150" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint2" position="1000,8050,-4000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="1" islast="false" nextcheckpoints="2,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint3" position="3000,8050,-4000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint4" position="4000,8050,-1000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="3" islast="false" nextcheckpoints="4,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint5" position="4000,8050,0" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="4" islast="false" nextcheckpoints="5,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint6" position="3000,8050,1000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint7" position="0,8050,2000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="6" islast="false" nextcheckpoints="7,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint8" position="-4000,8050,3000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="7" islast="false" nextcheckpoints="8,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint9" position="-4000,8050,5000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint10" position="-3000,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="9" islast="false" nextcheckpoints="10,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint11" position="0,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="120" checkpointindex="10" islast="false" nextcheckpoints="11,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint12" position="6000,8050,6000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint13" position="5500,8050,3000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint14" position="6000,8050,-5000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="13" islast="true" >
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-</checkpoints>
-</SpaceRaceManager>
-
- <SpawnPoint team=0 position="0,8050,0" lookat="0,8000,-8000" spawnclass=SpaceShip pawndesign=shipselection />
-
-
- <!-- -----------------------Zylinder---------------------------- -->
-<StaticEntity position="2750,8050,6000" direction="1,0,0" roll="90" scale="4" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="cylinder.mesh" scale3D="100,100,400" />
- <!--
- <Model position="0,80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
- <Model position="0,-80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
- <Model position="80,0,600" mesh="testcube.mesh" scale3D="18,90,-600" />
- <Model position="-80,0,600" mesh="testcube.mesh" scale3D="18,09,-600" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,320,2400" halfExtents="360,72,2400" />
- <BoxCollisionShape position="0,-320,2400" halfExtents="360,72,2400" />
- <BoxCollisionShape position="320,0,2400" halfExtents="72,360,2400" />
- <BoxCollisionShape position="-320,0,2400" halfExtents="72,360,2400" />
-
-
-
- </collisionShapes>
-
- </StaticEntity>
-
-<!-- ------------------Cube between gate 4 and 5----------------- -->
-<StaticEntity position="4465,8050,-500" direction="0,0,0" scale="1" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
- <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,0" halfExtents="450,600,50" />
-
- </collisionShapes>
-
- </StaticEntity>
-
-<StaticEntity position="3535,8050,-500" direction="0,0,0" scale="1" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
- <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,0" halfExtents="450,600,50" />
-
- </collisionShapes>
-
- </StaticEntity>
-
-
-
-
- <!-- ------------------Boden----------------- -->
- <StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000 friction=0.01>
- <attached>
- <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="8000,8000,8000" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,50,0" halfExtents="8000,8000,8000" />um j?:P"{
-
- </collisionShapes>
-</StaticEntity>
-
-
-<!-- ---------------------PickUp---------------------- -->
-
-
- <PickupSpawner pickup=smallspeedpickup position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
- <PickupSpawner pickup=mediumspeedpickup position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
- <PickupSpawner pickup="mediumshrinkpickup" position="3000,8050,-4000" triggerDistance="40" respawnTime="60" maxSpawnedItems="5" scale="8" />
-
-
-
-
- <!-- ---------------asteroid ellipse----------------- -->
-
- <?lua
- max = 15
- for i = 0, max, 1
- do
- x=-12000
- y=10000
- z=-12000
-
- ?>
- <?lua
- for k = 1, 15, 1
- do
- j = math.random()
- ?>
-
- <MovableEntity
- position = "<?lua print(x + math.random() * 20000) ?>,<?lua print(y + math.random() * 5000) ?>,<?lua print(z + math.random() * 20000) ?>"
- collisionType = "dynamic"
- linearDamping = "0.5"
- angularDamping = "0.5"
- collisiondamage = "100"
- enablecollisiondamage = "true"
- scale="<?lua print(j * 5) ?>" >
- <attached>
- <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
- <?lua if k == 0 then ?><attached><!-- ---------asteroid fog----- -->
- <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
- </attached> <?lua end ?>
- </Model>
- </attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
- </collisionShapes>
- </MovableEntity>
- <?lua
- end
- ?>
- <?lua end ?>
-
- </Scene>
-</Level>
-
Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-12-13 16:46:18 UTC (rev 11337)
@@ -6,8 +6,8 @@
-->
<LevelInfo
- name = "New Old Space Race 2"
- description = "Under maintenance..."
+ name = "The Space Race "
+ description = "Fell The Blaze of The ONE and ONLY Space Race"
tags = "gametype"
screenshot = "spacerace.png"
/>
@@ -43,7 +43,12 @@
?>
- <!-- SOUNDS & MUSIC -->
+ <!-- SOUNDS & MUSIC
+
+to hear the sound one has to use a headphones
+countdown at the beginning of the race
+at the and of the countdown we have the sound "go"
+racetheme will be played during the whole race-->
<WorldSound name="Countdown" position="0,0,0" source="sounds/Countdown.ogg" >
@@ -79,11 +84,11 @@
<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"/>
<SimpleNotification message="Reach the last check point within 150 seconds!!" />
-
- <!-- ------------------SpawnPoint----------------- -->
+ <!-- ------------------SpawnPoint of the human player----------------- -->
+ <!-- to change the starting positions of bots go to spacerace.cc star function -->
<SpawnPoint position="-50,0,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=fastship active="true" />
- <!-- Launch station -->
+ <!-- Launch station of the aircrafts also starting place of the race-->
<StaticEntity mass="50" position="-400,-20,0" direction="0,-90,0" collisionType="static">
<attached>
<Model scale="20" mesh="Carrier.mesh" />
@@ -222,7 +227,9 @@
<SpaceRaceManager>
<checkpoints>
+ <!-- distance = how far from the middle point of a check point do i have to fly ? distance variable answers this question -->
+
<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_Green.mesh"/>
@@ -467,6 +474,7 @@
</collisionShapes>
</RaceCheckPoint>
+<!-- the last checkpoint is bigger and red -->
<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"/>
Deleted: code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,494 +0,0 @@
-<LevelInfo
- name = "Space Race"
- description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
- tags = "gametype"
- screenshot = "spacerace.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
-?>
-
-<?lua
- include("templates/spaceshipAssff.oxt")
- include("templates/spaceshipPirate.oxt")
-?>
-
-<Level
- plugins = "gametypes"
- gametype = "OldSpaceRace"
->
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/skyBoxMoreNebula"
- >
-
- <!-- SOUNDS & MUSIC -->
- <WorldSound name="scoreSound" position="0,-2100,0" source="sounds/ReadyGo.ogg" >
- <events>
- <play>
- <EventListener event="start" />
- </play>
- </events>
- </WorldSound>
-
- <WorldSound name="Countdown" position="0,-2100,0" source="sounds/Countdown.ogg" >
- <events>
- <play>
- <EventListener event="start" />
- </play>
- </events>
- </WorldSound>
-
-
-
-
- <DistanceTrigger name="start" position="0,-2100,0" target="Pawn" distance=100 stayActive="true" delay=0.5 />
-
-
-
- <?lua math.randomseed(98) ?>
-
- <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"/>
-
- <SimpleNotification message="Reach the last check point within 150 seconds!!" />
-
- <!-- ------------------SpawnPoint----------------- -->
- <SpawnPoint position="0,-2100,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="true" >
- <events>
- <activity>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint2" />
- </trigger>
- </events>
- </EventTrigger>
- </activity>
- </events>
- </SpawnPoint>
-
- <!-- ------------------CheckPoints----------------- -->
- <OldRaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint2" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint3" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint3" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint4" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <DistanceTrigger name="trigger3" position="0,0,0" distance=40 stayActive="true" />
- <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint4" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint5" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <DistanceTrigger name="trigger4" position="0,0,0" distance=40 stayActive="true" />
- <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint5" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint6" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <DistanceTrigger name="trigger5" position="0,0,0" distance=40 stayActive="true" />
- <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint6" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint7" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <DistanceTrigger name="trigger6" position="0,0,0" distance=40 stayActive="true" />
- <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint7" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint8" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <DistanceTrigger name="trigger7" position="0,0,0" distance=40 stayActive="true" />
- <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <Trigger mode="xor" invert="true" >
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint8" />
- </trigger>
- </events>
- </EventTrigger>
- <EventTrigger invert="true">
- <events>
- <trigger>
- <EventListener event="checkpoint9" />
- </trigger>
- </events>
- </EventTrigger>
- </Trigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- <DistanceTrigger name="trigger8" position="0,0,0" distance=40 stayActive="true" />
- <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
- <events>
- <activity>
- <EventTrigger>
- <events>
- <trigger>
- <EventListener event="checkpoint9" />
- </trigger>
- </events>
- </EventTrigger>
- </activity>
- </events>
- </SpawnPoint>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <OldRaceCheckPoint name="checkpoint10" position="0,-2100,0" collisionType="static" scale="1" distance="40" checkpointindex="9" islast="true" timelimit="150">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="0,0,-55" halfExtents="55, 10, 10" />
- <BoxCollisionShape position="55,0,0" halfExtents="10, 10, 55" />
- <BoxCollisionShape position="-55,0,0" halfExtents="10, 10, 55" />
- </collisionShapes>
- </OldRaceCheckPoint>
-
- <!-- ------------------Planet----------------- -->
- <Planet position="0,0,0" scale=300 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
- <StaticEntity position="0,0,0" collisionType=static>
- <collisionShapes>
- <SphereCollisionShape radius="399" />
- </collisionShapes>
- </StaticEntity>
-
- <!-- ---------------asteroid ellipse----------------- -->
- <?lua
- max = 20
- for i = 0, max, 1
- do
- y = math.sin(i/max*6)*2000
- z = math.cos(i/max*6)*2500
- x = 0
- ?>
- <?lua
- for k = 1, 15, 1
- do
- j = math.random()
- ?>
-
- <MovableEntity
- position = "<?lua print(x + math.random() * 500) ?>,<?lua print(y + math.random() * 500) ?>,<?lua print(z + math.random() * 1000) ?>"
- collisionType = "dynamic"
- linearDamping = "0.5"
- angularDamping = "0.01"
- collisiondamage = "0.01"
- enablecollisiondamage = "true"
- scale="<?lua print(j * 5) ?>" >
- <attached>
- <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
- <?lua if k == 5 then ?><attached><!-- ---------asteroid fog----- -->
- <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
- </attached> <?lua end ?>
- </Model>
- </attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
- </collisionShapes>
- </MovableEntity>
- <?lua
- end
- ?>
- <?lua end ?>
-
- <!-- ---------------ForceFields----------------- -->
- <ForceField position="0,-700,2700" direction="0,1,0" diameter=500 velocity=2000 length=600 />
- <MovableEntity position="0,-400,2700">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,15,1 do ?>
- <Billboard position="-200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <ForceField position="0,2500,2000" direction="0,0,-1" diameter=250 velocity=2000 length=600 />
- <MovableEntity position="0,2500,2000">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,15,1 do ?>
- <Billboard position="-100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <ForceField position="0,1300,-800" direction="0,-1,-1" diameter=250 velocity=2000 length=800 />
- <MovableEntity position="0,1300,-800">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,20,1 do ?>
- <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <ForceField position="0,-1400,-700" direction="0,-1,1" diameter=250 velocity=2000 length=600 />
- <MovableEntity position="0,-1400,-700">
- <attached>
- <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
- <?lua for i=0,15,1 do ?>
- <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
- <?lua end ?>
- </attached>
- </MovableEntity>
-
- <!-- ---------------SpaceShips----------------- -->
- <SpaceShip position="0,2000,2000" lookat="0,0,0" team=1 >
- <templates>
- <Template link=spaceshipassff />
- </templates>
- <controller>
- <WaypointPatrolController alertnessradius=1500 team=0 >
- <waypoints>
- <Model scale=0 position="0,2000,2000" />
- </waypoints>
- </WaypointPatrolController>
- </controller>
- </SpaceShip>
-
- <SpaceShip position="0,2000,-2000" lookat="0,0,0" team=1 >
- <templates>
- <Template link=spaceshipassff />
- </templates>
- <controller>
- <WaypointPatrolController alertnessradius=1500 team=0 >
- <waypoints>
- <Model scale=0 position="0,2000,-2000" />
- </waypoints>
- </WaypointPatrolController>
- </controller>
- </SpaceShip>
-
-
-
- </Scene>
-</Level>
Deleted: code/branches/SpaceRace_HS16/data/levels/surfaceRace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/surfaceRace.oxw 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/data/levels/surfaceRace.oxw 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,463 +0,0 @@
-<!--
-TODO:
- Replace bottom's texture. It just does not look good.
--->
-
-<LevelInfo
- name = "Surface Race"
- description = "Race on a planet's surface. Try to reach the goal in 70 Seconds."
- screenshot = "surfaceRace.png"
- tags = "gametype"
-/>
-
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
- include("templates/spaceshipRace.oxt")
- include("templates/pickupRepresentationTemplates.oxt")
-
-?>
-
-
-<Level
- plugins = gametypes
- gametype = SpaceRace
->
-
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "2.0, 2.0, 2.0"
- skybox = "Orxonox/skyBoxClouds"
- gravity = "0,-75,0"
- negativeWorldRange = "-100000, -100000, -100000"
- positiveWorldRange = " 100000, 100000, 100000"
- hasPhysics = true
- >
-
- <?lua
- include("includes/pickups.oxi")
- ?>
-
- <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"/>
-
-
-
-<SpaceRaceManager>
- <checkpoints>
- <RaceCheckPoint name="checkpoint1" position="0,8050,-1000" direction="0,1,0" collisionType="static" scale="4" distance="150" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-
-<!--
- <Model position="0,0,55" mesh="testcube.mesh" scale3D="110,20,20" />
- <Model position="0,0,-55" mesh="testcube.mesh" scale3D="110,20,20" />
- <Model position="55,0,0" mesh="testcube.mesh" scale3D="20,20,110" />
- <Model position="-55,0,0" mesh="testcube.mesh" scale3D="20,20,110" />
-
--->
-
-
- </attached>
-
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
-
-
-
- </RaceCheckPoint>
-
-<RaceCheckPoint name="checkpoint2" position="1000,8050,-4000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="1" islast="false" nextcheckpoints="2,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
-
-
- <collisionShapes>
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
- </collisionShapes>
- </RaceCheckPoint>
-
-
-
-<RaceCheckPoint name="checkpoint3" position="3000,8050,-4000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-
-<RaceCheckPoint name="checkpoint4" position="4000,8050,-1000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="3" islast="false" nextcheckpoints="4,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-
-<RaceCheckPoint name="checkpoint5" position="4000,8050,0" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="4" islast="false" nextcheckpoints="5,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-
-<RaceCheckPoint name="checkpoint6" position="3000,8050,1000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
- </RaceCheckPoint>
-
-
-
-<RaceCheckPoint name="checkpoint7" position="0,8050,2000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="6" islast="false" nextcheckpoints="7,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-
-
-<RaceCheckPoint name="checkpoint8" position="-4000,8050,3000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="7" islast="false" nextcheckpoints="8,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
- </collisionShapes>
- </RaceCheckPoint>
-
-
-<RaceCheckPoint name="checkpoint9" position="-4000,8050,5000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-
-<RaceCheckPoint name="checkpoint10" position="-3000,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="9" islast="false" nextcheckpoints="10,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-<RaceCheckPoint name="checkpoint11" position="0,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="120" checkpointindex="10" islast="false" nextcheckpoints="11,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-<RaceCheckPoint name="checkpoint12" position="6000,8050,6000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
-
- </collisionShapes>
-
- </RaceCheckPoint>
-
-
-
-<RaceCheckPoint name="checkpoint13" position="5500,8050,3000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
- </collisionShapes>
- </RaceCheckPoint>
-
-
-<RaceCheckPoint name="checkpoint14" position="6000,8050,-5000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="13" islast="true" >
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
-
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
-
- </collisionShapes>
- </RaceCheckPoint>
-
-
-</checkpoints>
-</SpaceRaceManager>
-
- <SpawnPoint team=0 position="0,8050,0" lookat="0,8000,-8000" spawnclass=SpaceShip pawndesign=spaceshiprace />
-
-
- <!-- -----------------------Zylinder---------------------------- -->
-<StaticEntity position="2750,8050,6000" direction="1,0,0" roll="90" scale="4" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="cylinder.mesh" scale3D="100,100,400" />
- <!--
- <Model position="0,80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
- <Model position="0,-80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
- <Model position="80,0,600" mesh="testcube.mesh" scale3D="18,90,-600" />
- <Model position="-80,0,600" mesh="testcube.mesh" scale3D="18,09,-600" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,320,2400" halfExtents="360,72,2400" />
- <BoxCollisionShape position="0,-320,2400" halfExtents="360,72,2400" />
- <BoxCollisionShape position="320,0,2400" halfExtents="72,360,2400" />
- <BoxCollisionShape position="-320,0,2400" halfExtents="72,360,2400" />
-
-
-
- </collisionShapes>
-
- </StaticEntity>
-
-<!-- ------------------Cube between gate 4 and 5----------------- -->
-<StaticEntity position="4465,8050,-500" direction="0,0,0" scale="1" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
- <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,0" halfExtents="450,600,50" />
-
- </collisionShapes>
-
- </StaticEntity>
-
-<StaticEntity position="3535,8050,-500" direction="0,0,0" scale="1" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
- <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,0" halfExtents="450,600,50" />
-
- </collisionShapes>
-
- </StaticEntity>
-
-
-
-
- <!-- ------------------Boden----------------- -->
- <StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000 friction=0.01>
- <attached>
- <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="8000,8000,8000" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,50,0" halfExtents="8000,8000,8000" />um j?:P"{
-
- </collisionShapes>
-</StaticEntity>
-
-
-<!-- ---------------------PickUp---------------------- -->
-
-
- <PickupSpawner pickup=smallspeedpickup position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
- <PickupSpawner pickup=mediumspeedpickup position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
- <PickupSpawner pickup="mediumshrinkpickup" position="3000,8050,-4000" triggerDistance="40" respawnTime="60" maxSpawnedItems="5" scale="8" />
-
-
-
-
- <!-- ---------------asteroid ellipse----------------- -->
-
- <?lua
- max = 15
- for i = 0, max, 1
- do
- x=-12000
- y=10000
- z=-12000
-
- ?>
- <?lua
- for k = 1, 15, 1
- do
- j = math.random()
- ?>
-
- <MovableEntity
- position = "<?lua print(x + math.random() * 20000) ?>,<?lua print(y + math.random() * 5000) ?>,<?lua print(z + math.random() * 20000) ?>"
- collisionType = "dynamic"
- linearDamping = "0.5"
- angularDamping = "0.5"
- collisiondamage = "100"
- enablecollisiondamage = "true"
- scale="<?lua print(j * 5) ?>" >
- <attached>
- <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
- <?lua if k == 0 then ?><attached><!-- ---------asteroid fog----- -->
- <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
- </attached> <?lua end ?>
- </Model>
- </attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
- </collisionShapes>
- </MovableEntity>
- <?lua
- end
- ?>
- <?lua end ?>
-
- <!-- SOUNDS & MUSIC -->
- <WorldSound name="scoreSound" position="0,8050,0" source="sounds/ReadyGo.ogg" >
- <events>
- <play>
- <EventListener event="start" />
- </play>
- </events>
- </WorldSound>
- <DistanceTrigger name="start" position="0,8050,0" target="Pawn" distance=100 stayActive="true" delay=0.5 />
- <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
-
- </Scene>
-</Level>
-
Deleted: code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.cc 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.cc 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,120 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Mauro Salomon
- * Co-authors:
- * ...
- *
- */
-
-#include "OldRaceCheckPoint.h"
-
-#include "util/Convert.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "chat/ChatManager.h"
-
-#include "OldSpaceRace.h"
-
-namespace orxonox
-{
- RegisterClass(OldRaceCheckPoint);
-
- OldRaceCheckPoint::OldRaceCheckPoint(Context* context): DistanceTrigger(context), RadarViewable(this, static_cast<WorldEntity*>(this))
- {
- RegisterObject(OldRaceCheckPoint);
-
- this->bCheckpointIndex_ = 0;
- this->bIsLast_ = false;
- this->bTimeLimit_ = 0;
-
- this->setRadarObjectColour(ColourValue::Blue);
- this->setRadarObjectShape(RadarViewable::Shape::Triangle);
- this->setRadarVisibility(false);
- }
-
- OldRaceCheckPoint::~OldRaceCheckPoint()
- {
- }
-
- void OldRaceCheckPoint::tick(float dt)
- {
- SUPER(OldRaceCheckPoint, tick, dt);
-
- OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype());
- assert(gametype);
- if (this->getCheckpointIndex() == gametype->getCheckpointsReached())
- this->setRadarVisibility(true);
- else
- this->setRadarVisibility(false);
- }
-
- void OldRaceCheckPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(OldRaceCheckPoint, XMLPort, xmlelement, mode);
-
- XMLPortParam(OldRaceCheckPoint, "checkpointindex", setCheckpointIndex, getCheckpointIndex, xmlelement, mode).defaultValues(0);
- XMLPortParam(OldRaceCheckPoint, "islast", setLast, getLast, xmlelement, mode).defaultValues(false);
- XMLPortParam(OldRaceCheckPoint, "timelimit", setTimelimit, getTimeLimit, xmlelement, mode).defaultValues(0);
- }
-
- void OldRaceCheckPoint::triggered(bool bIsTriggered)
- {
- DistanceTrigger::triggered(bIsTriggered);
-
- OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype());
- if (gametype && this->getCheckpointIndex() == gametype->getCheckpointsReached() && bIsTriggered)
- {
- gametype->clock_.capture();
- float time = gametype->clock_.getSecondsPrecise();
- if (this->bTimeLimit_!=0 && time > this->bTimeLimit_)
- {
- gametype->timeIsUp();
- gametype->end();
- }
- else if (this->getLast())
- gametype->end();
- else
- {
- gametype->newCheckpointReached();
- this->setRadarObjectColour(ColourValue::Green); //sets the radar colour of the checkpoint to green if it is reached, else it is red.
- }
- }
- }
-
- void OldRaceCheckPoint::setTimelimit(float timeLimit)
- {
- this->bTimeLimit_ = timeLimit;
- if (this->bTimeLimit_ != 0)
- {
- OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype());
- if (gametype)
- {
- const std::string& message = "You have " + multi_cast<std::string>(this->bTimeLimit_)
- + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1);
- gametype->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
- }
- }
- }
-
-}
Deleted: code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.h
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.h 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldRaceCheckPoint.h 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,77 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Mauro Salomon
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _OldRaceCheckPoint_H__
-#define _OldRaceCheckPoint_H__
-
-#include "gametypes/GametypesPrereqs.h"
-
-#include "objects/triggers/DistanceTrigger.h"
-#include "interfaces/RadarViewable.h"
-
-namespace orxonox
-{
- /**
- @brief
- The OldRaceCheckPoint class enables the creation of a check point to use in a OldSpaceRace level.
- !!! Don't forget to control the indexes of your check points and to set one last check point!!!
- */
- class _GametypesExport OldRaceCheckPoint : public DistanceTrigger, public RadarViewable
- {
- public:
- OldRaceCheckPoint(Context* context);
- virtual ~OldRaceCheckPoint();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void tick(float dt) override;
-
- protected:
- virtual void triggered(bool bIsTriggered) override;
- inline void setLast(bool isLast)
- { this->bIsLast_ = isLast; }
- inline bool getLast()
- { return this->bIsLast_; }
- inline void setCheckpointIndex(int checkpointIndex)
- { this->bCheckpointIndex_ = checkpointIndex; }
- inline int getCheckpointIndex()
- { return this->bCheckpointIndex_; }
- virtual void setTimelimit(float timeLimit);
- inline float getTimeLimit()
- { return this->bTimeLimit_;}
- virtual inline const WorldEntity* getWorldEntity() const override
- { return this; }
-
- private:
- int bCheckpointIndex_; //The index of this check point. This value will be compared with the number of check points reached in the level. The check points must be indexed in ascending order beginning from zero and without any jumps between the indexes.
- bool bIsLast_; //True if this check point is the last of the level. There can be only one last check point for each level and there must be a last check point in the level.
- float bTimeLimit_; //The time limit (from the start of the level) to reach this check point. If the check point is reached after this time, the game ends and the player looses.
-
- };
-}
-
-#endif /* _OldRaceCheckPoint_H__ */
Deleted: code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,195 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Mauro Salomon
- * Co-authors:
- * ...
- *
- */
-
-#include "OldSpaceRace.h"
-
-#include "core/CoreIncludes.h"
-#include "chat/ChatManager.h"
-#include "util/Convert.h"
-#include "util/Math.h"
-#include "infos/Bot.h"
-#include "items/Engine.h"
-#include "controllers/HumanController.h"
-
-#include "core/CoreIncludes.h"
-#include "chat/ChatManager.h"
-#include "infos/PlayerInfo.h"
-#include "worldentities/pawns/Pawn.h"
-#include "core/config/ConfigValueIncludes.h"
-#include "infos/Bot.h"
-#include "SpaceRaceBot.h"
-
-
-
-namespace orxonox
-{
- RegisterUnloadableClass(OldSpaceRace);
-
-
- OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
- {
- RegisterObject(OldSpaceRace);
-
- //this->botclass_ = Class();
- this->botclass_ = Class(SpaceRaceBot);//ClassByString("")
-
- this->checkpointsReached_ = 0;
- this->bTimeIsUp_ = false;
- this->setConfigValues();
- }
-
- void OldSpaceRace::setConfigValues()
- {
-
-
- }
-
- void OldSpaceRace::end()
- {
- this->Gametype::end();
-
- if (this->bTimeIsUp_)
- {
- this->clock_.capture();
- int s = this->clock_.getSeconds();
- int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
- const std::string& message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
- + "You didn't reach the check point " + multi_cast<std::string>(this->checkpointsReached_+1)
- + " before the time limit. You lose!";
- this->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
- }
- else
- {
- this->clock_.capture();
- int s = this->clock_.getSeconds();
- int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
- const std::string& message = "Congratulations! Last check point reached after "+ multi_cast<std::string>(s)
- + "." + multi_cast<std::string>(ms) + " seconds.";
- this->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
-/*
- float time = this->clock_.getSecondsPrecise();
- this->scores_.insert(time);
- std::set<float>::iterator it;
- for (it=this->scores_.begin(); it!=this->scores_.end(); it++)
- orxout(level::message) << multi_cast<std::string>(*it) << endl;
-*/
- }
- }
-
- void OldSpaceRace::start()
- {
- Gametype::start();
-
- if (true)
- {
- this->spawnPlayersIfRequested();
- this->cantMove_ = true;
-
- for (Engine* engine : ObjectList<Engine>()){
- engine->setActive(false);
-
-
- }
-
- }
-
-
-
- std::string message("BE FAST BE FIRST");
- this->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
-
-Timer* countdownTimer = new Timer();
- countdownTimer->setTimer(11, false, createExecutor(createFunctor(&OldSpaceRace::countdownFinished, this)));
- }
-
- void OldSpaceRace::countdownFinished()
- {
-
- std::string message("RACE STARTED ");
- this->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
-
-
- for (Engine* engine : ObjectList<Engine>())
- engine->setActive(true);
-
-
-
- }
-
-
- void OldSpaceRace::playerEntered(PlayerInfo* player)
- {
- Gametype::playerEntered(player);
-
- const std::string& message = player->getName() + " entered the game";
- ChatManager::message(message);
- }
-
-
-
- void OldSpaceRace::newCheckpointReached()
- {
- this->checkpointsReached_++;
- this->clock_.capture();
- int s = this->clock_.getSeconds();
- int ms = static_cast<int>(this->clock_.getMilliseconds()-1000*s);
- const std::string& message = "Checkpoint " + multi_cast<std::string>(this->getCheckpointsReached())
- + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms)
- + " seconds.";
- this->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
- }
-
- /*void playerEntered(PlayerInfo* player) {
-
-
- Gametype::playerEntered(player);
-
- const std::string& message = player->getName() + " entered the game";
- ChatManager::message(message);
-
- }*/
-
-
-
-
- void OldSpaceRace::addBots(unsigned int amount)
- {
- for (unsigned int i = 0; i < amount; ++i)
- this->botclass_.fabricate(this->getContext());
- }
-
-
-
-
-
-}
Deleted: code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h 2016-12-13 16:46:18 UTC (rev 11337)
@@ -1,90 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Mauro Salomon
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _OldSpaceRace_H__
-#define _OldSpaceRace_H__
-
-#include "gametypes/GametypesPrereqs.h"
-
-#include <set>
-#include <string>
-
-#include <util/Clock.h>
-
-#include "gametypes/Gametype.h"
-#include "SpaceRaceManager.h"
-
-#include "OldRaceCheckPoint.h"
-
-namespace orxonox
-{
- /**
- @brief
- The OldSpaceRace class enables the creation of a space race level, where the player has to reach check points in a given order.
- */
- class _GametypesExport OldSpaceRace : public Gametype
- {
- friend class OldRaceCheckPoint;
-
- public:
- OldSpaceRace(Context* context);
- virtual ~OldSpaceRace() {}
-
- void setConfigValues();
-
- virtual void start() override;
-
- virtual void end() override;
-
- virtual void playerEntered(PlayerInfo* player) override;
- virtual void newCheckpointReached();
- virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
- //<! This is only a temporary solution. Better: create racingBots.
-
-
- virtual void countdownFinished();
-
- inline void setCheckpointsReached(int n)
- { this->checkpointsReached_ = n;}
- inline int getCheckpointsReached()
- { return this->checkpointsReached_; }
- inline void timeIsUp()
- { this->bTimeIsUp_ = true;}
-
- protected:
-
- private:
- bool cantMove_; ///< Helper variable, used to stall the engines before the race starts.
- int checkpointsReached_; //The current number of check points reached by the player.
- std::set<float> scores_; //The times of the players are saved in a set.
- bool bTimeIsUp_; //True if one of the check points is reached too late.
- Clock clock_; //The clock starts running at the beginning of the game. It is used to give the time at each check point, the give the time at the end of the game, and to stop the game if a check point is reached too late.
- };
-}
-
-#endif /* _OldSpaceRace_H__ */
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc 2016-12-12 15:20:50 UTC (rev 11336)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRace.cc 2016-12-13 16:46:18 UTC (rev 11337)
@@ -22,18 +22,22 @@
* Author:
* Mauro Salomon
* Co-authors:
- * Celine Egger
+ * Celine Egger*/
+
+
+
+
+/*
+Edited, Renewed and Revised by
Berkay Berabi
Louis Meile
- *
- */
-
-/*
-Todo:
+
+
+To-do- list by Louis Meile and Berkay Berabi for future projects :
- improve AI (SpaceRaceController):
i) so far bots arent able to evade obstacles. fix that!
ii) bots should be able to use pickups
-- game crashes when bot wins the game
+- game crashes when bot wins the game(this is a huge problem you should work with the log file to find out what the errors are )
- bots rotate while waiting for the countdown to end. make it stop!
- add elements to level file to make it even more fun to play. be creative!
*/
@@ -80,7 +84,8 @@
this->bTimeIsUp_ = false;
this->setConfigValues();
- this->numberOfBots_ = 5; // quick fix: don't allow default-bots to enter the race
+ this->numberOfBots_ = 5; // quick fix: don't allow default-bots to enter the race
+ //we fixed the number of bots in order to have the same starting position all the time !
}
void SpaceRace::setConfigValues()
@@ -89,9 +94,9 @@
}
- // define spawn positions of the 5 bots
void SpaceRace::start()
{
+ // define spawn positions of the 5 bots
int startpos[15];
@@ -123,7 +128,7 @@
{
this->spawnPlayersIfRequested();
this->cantMove_ = true;
- //bots unable to move while countdown is running
+ //players are unable to move while countdown is running
for (Engine* engine : ObjectList<Engine>()){
engine->setActive(false);
@@ -150,7 +155,7 @@
this->getGametypeInfo()->sendAnnounceMessage(message);
ChatManager::message(message);
-//after 11 s, countdownFinished is called to activate bots` engines
+//after 11 seconds , countdownFinished function is called to activate bots` engines
Timer* countdownTimer = new Timer();
countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
}
@@ -206,7 +211,7 @@
}
- void SpaceRace::countdownFinished()
+ void SpaceRace::countdownFinished()//activates the engines of all players
{
std::string message("RACE STARTED ");
@@ -230,7 +235,7 @@
}
- void SpaceRace::addBots(unsigned int amount)
+ void SpaceRace::addBots(unsigned int amount) //function that add the bots to the game
{
for (unsigned int i = 1; i <= amount; ++i){
this->botclass_.fabricate(this->getContext());
@@ -249,7 +254,8 @@
return true;
}
- bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)
+ bool SpaceRace::allowPawnDeath(Pawn* victim, Pawn* originator)// false because the bots can not recognize the objects and die to early
+ //if they can
{
return false;
}
More information about the Orxonox-commit
mailing list