[Orxonox-commit 6713] r11342 - in code/branches/Presentation_HS16: . data/levels data/levels/templates src/modules/gametypes src/orxonox/controllers src/orxonox/gametypes src/orxonox/infos src/orxonox/sound
maxima at orxonox.net
maxima at orxonox.net
Wed Dec 14 16:05:12 CET 2016
Author: maxima
Date: 2016-12-14 16:05:11 +0100 (Wed, 14 Dec 2016)
New Revision: 11342
Added:
code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw
code/branches/Presentation_HS16/data/levels/templates/fastship.oxt
code/branches/Presentation_HS16/svn-commit.2.tmp
code/branches/Presentation_HS16/svn-commit.tmp
Removed:
code/branches/Presentation_HS16/data/levels/Spacerace2.oxw
code/branches/Presentation_HS16/data/levels/SurfaceRacePresentation.oxw
code/branches/Presentation_HS16/data/levels/spaceRace.oxw
code/branches/Presentation_HS16/data/levels/surfaceRace.oxw
code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.cc
code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.h
code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.cc
code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.h
Modified:
code/branches/Presentation_HS16/
code/branches/Presentation_HS16/src/modules/gametypes/CMakeLists.txt
code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.cc
code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.h
code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.cc
code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.h
code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceController.cc
code/branches/Presentation_HS16/src/orxonox/controllers/HumanController.h
code/branches/Presentation_HS16/src/orxonox/gametypes/Gametype.cc
code/branches/Presentation_HS16/src/orxonox/infos/Bot.cc
code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h
code/branches/Presentation_HS16/src/orxonox/sound/WorldAmbientSound.cc
Log:
spacerace branch merged to presentation
Property changes on: code/branches/Presentation_HS16
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/AI_HS15:10640-10832
/code/branches/Highscore_HS16:11226-11338
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/StoryModeMap_HS16:11221-11340
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/campaignHS15:10639-10973
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hoverHS15:10633-10959
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particleEffectsHS15:10644-10962
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/planetLevelHS15:10637-10966
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/presentationHS15:10959-11055
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/soundEffects:9382-11020
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
/code/trunk:11212-11225
+ /code/branches/AI_HS15:10640-10832
/code/branches/Highscore_HS16:11226-11338
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Racingbot:9388-9513
/code/branches/SciptableControllerFS15:10308-10613
/code/branches/ScriptableController:9999-10075
/code/branches/SpaceRace_HS16:11214-11341
/code/branches/StoryModeMap_HS16:11221-11340
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/campaignHS15:10639-10973
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/clangenb:10385-10609
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/core7:10328-10623
/code/branches/cpp11:10439-10732
/code/branches/cpp11_v2:10732-11067
/code/branches/cpp11_v3:11053-11070
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/explosionChunksHS15:10641-10961
/code/branches/fabienHS15:10685-11033
/code/branches/formation:8885-8991
/code/branches/formationFS15:10320-10610
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hoverHS15:10633-10959
/code/branches/hud:8883-8986
/code/branches/hudHS14:10083-10241
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/invaders:9694-9896
/code/branches/ipv6:7293-7458
/code/branches/keckslevelHS14:10082-10222
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/levelElias:9697-9921
/code/branches/levelKaan:9695-9921
/code/branches/levelMichael:9696-9921
/code/branches/leveljoemeHS14:10087-10223
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/minigame4DHS14:10081-10230
/code/branches/miniprojects:2754-2824
/code/branches/modularships:9994-10071
/code/branches/multiplayerFS15:10324-10611
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particleEffectsHS15:10644-10962
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/pickupsFS14:10000-10259
/code/branches/planetLevelHS15:10637-10966
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationFS14:10069-10215
/code/branches/presentationFS15:10499
/code/branches/presentationFS15merge:10595-10621
/code/branches/presentationHS12:9481-9525
/code/branches/presentationHS13:9891-9938
/code/branches/presentationHS14merge:10222-10257
/code/branches/presentationHS15:10959-11055
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/radarDreiD:9690-9901
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/sfxThilo:9691-9917
/code/branches/shaders:9379-11072
/code/branches/shaders_merge:11072-11079
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/soundEffects:9382-11020
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/spacestationentry:9699-9905
/code/branches/steering:5949-6091,8140-8595
/code/branches/storymodeHS14:10085-10254
/code/branches/surfaceRace:9028-9199
/code/branches/surfaceraceHS14:10080-10236
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/towerdefenseFS15:10283-10614
/code/branches/towerdefenseHS14:10086-10247
/code/branches/turret:9380-9501
/code/branches/turretFS14:9998-10070
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weaponFS15:10302-10615
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
/code/trunk:11212-11225
Deleted: code/branches/Presentation_HS16/data/levels/Spacerace2.oxw
===================================================================
--- code/branches/Presentation_HS16/data/levels/Spacerace2.oxw 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/data/levels/Spacerace2.oxw 2016-12-14 15:05:11 UTC (rev 11342)
@@ -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/Presentation_HS16/data/levels/SurfaceRacePresentation.oxw
===================================================================
--- code/branches/Presentation_HS16/data/levels/SurfaceRacePresentation.oxw 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/data/levels/SurfaceRacePresentation.oxw 2016-12-14 15:05:11 UTC (rev 11342)
@@ -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>
-
Copied: code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw (from rev 11341, code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw)
===================================================================
--- code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw (rev 0)
+++ code/branches/Presentation_HS16/data/levels/newnewnewspacerace.oxw 2016-12-14 15:05:11 UTC (rev 11342)
@@ -0,0 +1,507 @@
+
+ <!-- Authors:
+Louis Meile
+Berkay Berabi
+ at 2016
+-->
+
+<LevelInfo
+ name = "The Space Race "
+ description = "Fell The Blaze of The ONE and ONLY Space Race"
+ tags = "gametype"
+ screenshot = "spacerace.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+ include("templates/fastship.oxt")
+ include("templates/spaceshipPirate.oxt")
+
+ include("templates/spaceshipAssff.oxt")
+ include("templates/pickupRepresentationTemplates.oxt")
+
+?>
+
+<Level
+ 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/skyBoxMoreNebula"
+ >
+
+ <?lua
+ include("includes/pickups.oxi")
+ ?>
+
+
+ <!-- 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" >
+ <events>
+ <play>
+ <EventListener event="start1" />
+ </play>
+ </events>
+ </WorldSound>
+
+
+<WorldSound name="Go" position="0,0,0" source="sounds/Go.ogg" >
+ <events>
+ <play>
+ <EventListener event="go" />
+ </play>
+ </events>
+ </WorldSound>
+ <DistanceTrigger name="start1" position="0,0,0" target="Pawn" distance=100 stayActive="true" delay=0.5 />
+ <DistanceTrigger name="go" position="0,0,0" target="Pawn" distance=100 stayActive="true" delay=10.5 />
+
+ <DistanceTrigger name="racetheme" position="0,0,0" target="Pawn" distance=100 stayActive="true" delay=10.75 />
+ <WorldAmbientSound source="racetheme.ogg" looping="true" playOnLoad="false" >
+ <events>
+ <play>
+ <EventListener event="racetheme" />
+ </play>
+ </events>
+ </WorldAmbientSound>
+
+
+ <?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 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 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" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="280,0,-100" halfExtents="600, 200, 100" />
+ <BoxCollisionShape position="380,300,-64" halfExtents="280, 40, 48" />
+ <BoxCollisionShape position="380,-300,-64" halfExtents="280, 40, 48" />
+ <BoxCollisionShape position="308, 188,120" halfExtents="440, 80, 120" />
+ <BoxCollisionShape position="308,-188,120" halfExtents="440, 80, 120" />
+ <BoxCollisionShape position="308,0,200" halfExtents="440, 180, 24" />
+ <BoxCollisionShape position="668,0,280" halfExtents="108, 80, 80" />
+ </collisionShapes>
+ </StaticEntity>
+
+ <!-- ---------------ForceFields----------------- -->
+ <ForceField position="0,0,0" direction="0,-1,0" diameter=700 velocity=2000 length=2000/>
+
+ <!-- ------------------Planet----------------- -->
+ <Planet position="25000,5000,5000" scale=3000 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="1" />
+ </collisionShapes>
+ </StaticEntity>
+
+ <!-- ---------------asteroid belt1----------------- -->
+ <?lua
+ max = 50
+ for i = 0, max, 1
+ do
+ x = 800+ i*1000
+ y = -500+ math.cos(i)*20
+ z = -500+ math.sin(i)*20
+ ?>
+ <?lua
+ for k = 1, 15, 1
+ do
+ j = math.random()
+ ?>
+
+ <MovableEntity
+ position = "<?lua print(x + math.random() * 500) ?>,<?lua print(y + math.random() * 1000) ?>,<?lua print(z + math.random() * 1000) ?>"
+ collisionType = "dynamic"
+ linearDamping = "0.5"
+ angularDamping = "0.01"
+ collisiondamage = "0.02"
+ 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 ?>
+
+ <!-- ---------------asteroid belt2----------------- -->
+ <?lua
+ max = 50
+ for i = 0, max, 1
+ do
+ x = 800+ i*1000
+ y = 100+ math.cos(i)*-20
+ z = 100+ math.sin(i)*-20
+ ?>
+ <?lua
+ for k = 1, 15, 1
+ do
+ j = math.random()
+ ?>
+
+ <MovableEntity
+ position = "<?lua print(x + math.random() * 500) ?>,<?lua print(y + math.random() * 1000) ?>,<?lua print(z + math.random() * 1000) ?>"
+ collisionType = "dynamic"
+ linearDamping = "0.5"
+ angularDamping = "0.01"
+ collisiondamage = "0.02"
+ 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 ?>
+
+
+ <!-- ------------------Boards----------------- -->
+ <StaticEntity position="1000,160,0" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <attached>
+ <Model scale="20" mesh="Board1.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" />
+ </collisionShapes>
+ </StaticEntity>
+
+ <StaticEntity position="5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <attached>
+ <Model scale="20" mesh="Board2.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" />
+ </collisionShapes>
+ </StaticEntity>
+
+<StaticEntity position="10000,-70,200" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <attached>
+ <Model scale="20" mesh="Board2.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="5,10,10" />
+ </collisionShapes>
+ </StaticEntity>
+
+<!-- ---------------------Checkpoints---------------------- -->
+
+<SpaceRaceManager>
+ <checkpoints>
+
+ <!-- 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"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+
+<RaceCheckPoint name="checkpoint2" yaw=90 pitch=90 position="3000,200,100" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="1" islast="false" nextcheckpoints="2,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+<RaceCheckPoint name="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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+<RaceCheckPoint name="checkpoint4" yaw=90 pitch=90 position="8000,-150,150" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="3" islast="false" nextcheckpoints="4,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+<RaceCheckPoint name="checkpoint5" yaw=90 pitch=90 position="10000,-200,200" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="4" islast="false" nextcheckpoints="5,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+
+<RaceCheckPoint name="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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+
+<RaceCheckPoint name="checkpoint7" yaw=90 pitch=90 position="15000,0,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="6" islast="false" nextcheckpoints="7,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+<RaceCheckPoint name="checkpoint8" yaw=90 pitch=90 position="18000,150,-150" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="7" islast="false" nextcheckpoints="8,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+<RaceCheckPoint name="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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<RaceCheckPoint name="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"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<RaceCheckPoint name="checkpoint11" yaw=90 pitch=90 position="27000,-200,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="10" islast="false" nextcheckpoints="11,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+
+<RaceCheckPoint name="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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+<RaceCheckPoint name="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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+
+<RaceCheckPoint name="checkpoint14" yaw=90 pitch=90 position="35000,120,20" 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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<RaceCheckPoint name="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>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<RaceCheckPoint name="checkpoint16" yaw=90 pitch=90 position="41000,30,-50" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="15" islast="false" nextcheckpoints="16,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<RaceCheckPoint name="checkpoint17" yaw=90 pitch=90 position="44000,90,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="16" islast="false" nextcheckpoints="17,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<RaceCheckPoint name="checkpoint18" yaw=90 pitch=90 position="47000,120,30" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="17" islast="false" nextcheckpoints="18,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+ <RaceCheckPoint name="checkpoint19" yaw=90 pitch=90 position="50000,0,100" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="18" islast="false" nextcheckpoints="19,-1,-1">
+ <attached>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
+ <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+<!-- 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"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,90" halfExtents="90, 13, 13" />
+ <BoxCollisionShape position="0,0,-90" halfExtents="90, 13, 13" />
+ <BoxCollisionShape position="90,0,0" halfExtents="13, 13, 90" />
+ <BoxCollisionShape position="-90,0,0" halfExtents="13, 13, 90" />
+ </collisionShapes>
+ </RaceCheckPoint>
+
+
+</checkpoints>
+</SpaceRaceManager>
+
+
+
+<!-- ---------------------PickUps---------------------- -->
+
+ <PickupSpawner pickup=smallshrinkpickup position="10000,-200,200" triggerDistance="60" respawnTime="10" maxSpawnedItems="10" scale="8"/>
+ <PickupSpawner pickup=mediumboostpickup position="24000,-150,-80" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=smallboostpickup position="38000,-200,0" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+
+ <PickupSpawner pickup=smallspeedpickup position="7000,-200,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=mediumshinkpickup position="16000,150,50" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="41000,-300,100" triggerDistance="60" respawnTime="10" maxSpawnedItems="8" scale="10"/>
+ </Scene>
+</Level>
+
\ No newline at end of file
Deleted: code/branches/Presentation_HS16/data/levels/spaceRace.oxw
===================================================================
--- code/branches/Presentation_HS16/data/levels/spaceRace.oxw 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/data/levels/spaceRace.oxw 2016-12-14 15:05:11 UTC (rev 11342)
@@ -1,483 +0,0 @@
-<LevelInfo
- name = "Old 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>
- <DistanceTrigger name="start" position="0,-2100,0" target="Pawn" distance=100 stayActive="true" delay=0.5 />
-
- <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
-
-
- <?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/Presentation_HS16/data/levels/surfaceRace.oxw
===================================================================
--- code/branches/Presentation_HS16/data/levels/surfaceRace.oxw 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/data/levels/surfaceRace.oxw 2016-12-14 15:05:11 UTC (rev 11342)
@@ -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>
-
Copied: code/branches/Presentation_HS16/data/levels/templates/fastship.oxt (from rev 11341, code/branches/SpaceRace_HS16/data/levels/templates/fastship.oxt)
===================================================================
--- code/branches/Presentation_HS16/data/levels/templates/fastship.oxt (rev 0)
+++ code/branches/Presentation_HS16/data/levels/templates/fastship.oxt 2016-12-14 15:05:11 UTC (rev 11342)
@@ -0,0 +1,129 @@
+<Template name=fastship>
+ <SpaceShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipassffcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+
+ health = 150
+ maxhealth = 200
+ initialhealth = 150
+
+ shieldhealth = 70
+ initialshieldhealth = 50
+ maxshieldhealth = 100
+ shieldabsorption = 0.8
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
+
+ primaryThrust = 2000
+ auxilaryThrust = 1000
+ rotationThrust = 50
+
+ lift = 0;
+ stallSpeed = 220;
+
+
+ boostPower = 8
+ boostPowerRate = 3
+ boostRate = 8
+ boostCooldownDuration = 6
+
+ shakeFrequency = 50
+ shakeAmplitude = 30
+
+ collisionType = "dynamic"
+ mass = 100
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+
+ explosionSound = "sounds/Explosion2.ogg"
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+ <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+ <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="10, 3, 5" />
+ <BoxCollisionShape position="13,-1.3,0" halfExtents="3, 1, 2" />
+ <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+ <BoxCollisionShape position="0,0,7" halfExtents="3, 2, 2" />
+ <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" />
+ <BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
+ </collisionShapes>
+ <explosion>
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+ <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+
+ <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+ </explosion>
+<?lua
+ include("../includes/weaponSettingsAssff.oxi")
+?>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffcameras defaults=0>
+ <SpaceShip>
+ <camerapositions>
+ <CameraPosition position="0,10, 40" drag=true mouselook=true />
+ <CameraPosition position="0,20, 80" drag=true mouselook=true />
+ <CameraPosition position="0,30,120" drag=true mouselook=true />
+ </camerapositions>
+ </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+ <MultiStateEngine
+ boostfactor = 4
+
+ speedfront = 3000
+ speedback = 1500
+ speedleftright = 50
+ speedupdown = 50
+
+ defEngineSndNormal = "sounds/Engine_low.ogg"
+ defEngineSndBoost = "sounds/Engine_high.ogg"
+
+ accelerationfront = 400
+ accelerationbrake = 300
+ accelerationback = 125
+ accelerationleftright = 125
+ accelerationupdown = 125
+ >
+ <EffectContainer condition="idle">
+ <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+ </EffectContainer>
+ <EffectContainer condition="not idle">
+ <FadingBillboard mainstate=activity active=false scale=0.1 position="7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.1 position="-7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ </EffectContainer>
+ <EffectContainer condition="normal or brake">
+
+ </EffectContainer>
+ <EffectContainer condition="normal or boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ </EffectContainer>
+ <EffectContainer condition="boost">
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ </EffectContainer>
+<!-- <EffectContainer condition="brake">
+ <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.15 position=" 8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.15 position="-8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+ </EffectContainer>
+-->
+ </MultiStateEngine>
+</Template>
Modified: code/branches/Presentation_HS16/src/modules/gametypes/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/CMakeLists.txt 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/CMakeLists.txt 2016-12-14 15:05:11 UTC (rev 11342)
@@ -2,8 +2,7 @@
SpaceRace.cc
RaceCheckPoint.cc
SpaceRaceManager.cc
- OldSpaceRace.cc
- OldRaceCheckPoint.cc
+
SpaceRaceBot.cc
SpaceRaceController.cc
)
Deleted: code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.cc
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -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/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.h
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.h 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/OldRaceCheckPoint.h 2016-12-14 15:05:11 UTC (rev 11342)
@@ -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/Presentation_HS16/src/modules/gametypes/OldSpaceRace.cc
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -1,104 +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"
-
-namespace orxonox
-{
- RegisterUnloadableClass(OldSpaceRace);
-
- OldSpaceRace::OldSpaceRace(Context* context) : Gametype(context)
- {
- RegisterObject(OldSpaceRace);
- this->checkpointsReached_ = 0;
- this->bTimeIsUp_ = false;
- this->numberOfBots_ = 0;
- }
-
- 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 = "You win!! You have reached the last check point 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();
-
- std::string message("The match has started! Reach the check points as quickly as possible!");
- this->getGametypeInfo()->sendAnnounceMessage(message);
- 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);
- }
-
-}
Deleted: code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.h 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/OldSpaceRace.h 2016-12-14 15:05:11 UTC (rev 11342)
@@ -1,81 +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 "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() {}
-
- virtual void start() override;
- virtual void end() 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.
-
- inline void setCheckpointsReached(int n)
- { this->checkpointsReached_ = n;}
- inline int getCheckpointsReached()
- { return this->checkpointsReached_; }
- inline void timeIsUp()
- { this->bTimeIsUp_ = true;}
-
- protected:
-
- private:
- 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/Presentation_HS16/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -22,21 +22,55 @@
* Author:
* Mauro Salomon
* Co-authors:
- * Celine Egger
- *
- */
+ * Celine Egger*/
+
+
+
+/*
+Edited, Renewed and Revised by
+ Berkay Berabi
+ Louis Meile
+
+
+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(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!
+*/
+
+
#include "SpaceRace.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"
+#include "items/Engine.h"
+
+#include "core/CoreIncludes.h"
+#include "chat/ChatManager.h"
#include "util/Convert.h"
#include "util/Math.h"
#include "SpaceRaceBot.h"
#include "items/Engine.h"
+#include <vector>
+
namespace orxonox
{
RegisterUnloadableClass(SpaceRace);
@@ -45,13 +79,90 @@
{
RegisterObject(SpaceRace);
- this->botclass_ = Class(SpaceRaceBot);//ClassByString("")
+ this->botclass_ = Class(SpaceRaceBot); //ClassByString("")
this->cantMove_ = false;
this->bTimeIsUp_ = false;
- this->numberOfBots_ = 0; // quick fix: don't allow default-bots to enter the race
- // remove this line, if a raceBot has been created.
+ this->setConfigValues();
+
+ 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()
+ {
+
+
+ }
+
+ void SpaceRace::start()
+ {
+ // define spawn positions of the 5 bots
+
+ int startpos[15];
+
+ startpos[0] =100;
+ startpos[1] =-40;
+ startpos[2] =0;
+
+ startpos[3] =100;
+ startpos[4] =-40;
+ startpos[5] =100;
+
+ startpos[6] =100;
+ startpos[7] =-40;
+ startpos[8] =-100;
+
+ startpos[9] =0;
+ startpos[10] =-40;
+ startpos[11] =-80;
+
+ startpos[12] =0;
+ startpos[13] =-40;
+ startpos[14] =80;
+
+
+
+
+ Gametype::start();
+ if (true)
+ {
+ this->spawnPlayersIfRequested();
+ this->cantMove_ = true;
+ //players are unable to move while countdown is running
+ for (Engine* engine : ObjectList<Engine>()){
+ engine->setActive(false);
+
+
+ }
+ //append spawn positions to bots
+ int a,b,c;
+ a=0;
+ b=1;
+ c=2;
+ for (SpaceRaceBot* bot : ObjectList<SpaceRaceBot>()){
+ bot->getControllableEntity()->setPosition(startpos[a],startpos[b],startpos[c]);
+ a= a+3;
+ b = b+3;
+ c+= 3;
+ }
+
+
+ }
+
+
+
+ std::string message("Use headphones to hear the countdown!");
+ this->getGametypeInfo()->sendAnnounceMessage(message);
+ ChatManager::message(message);
+
+//after 11 seconds , countdownFinished function is called to activate bots` engines
+Timer* countdownTimer = new Timer();
+ countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
+ }
+
+
+
+
void SpaceRace::end()
{
this->clock_.capture();
@@ -62,11 +173,11 @@
if (this->bTimeIsUp_)
{
message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
- + "You didn't reach the check point before the time limit. You lose!";
+ + "You lose!";
}
else
{
- message = "You win!! You have reached the last check point after "+ multi_cast<std::string>(s)
+ message = "You win!! Final check point reached after "+ multi_cast<std::string>(s)
+ "." + multi_cast<std::string>(ms) + " seconds.";
}
if (!this->hasEnded())
@@ -77,34 +188,12 @@
this->Gametype::end();
}
- void SpaceRace::tick(float dt)
+
+void SpaceRace::tick(float dt)
{
SUPER(SpaceRace,tick,dt);
+}
- // spawn the players already when the countdown starts, but deactivate their engines
- if (this->isStartCountdownRunning() && !this->cantMove_)
- {
- this->spawnPlayersIfRequested();
- this->cantMove_ = true;
-
- for (Engine* engine : ObjectList<Engine>())
- engine->setActive(false);
- }
-
- // activate the engines again if the countdown ends
- if (!this->isStartCountdownRunning() && this->cantMove_)
- {
- for (Engine* engine : ObjectList<Engine>())
- engine->setActive(true);
-
- this->cantMove_= false;
-
- std::string message = "The match has started! Reach the check points as quickly as possible!";
- this->getGametypeInfo()->sendAnnounceMessage(message);
- ChatManager::message(message);
- }
- }
-
void SpaceRace::newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player)
{
this->checkpointReached_[player] = checkpoint;
@@ -113,23 +202,60 @@
int s = this->clock_.getSeconds();
int ms = this->clock_.getMilliseconds() % 1000;
- const std::string& message = "Checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1)
- + " reached after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
+
+
+ const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1)
+ + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
+ this->getGametypeInfo()->sendAnnounceMessage(message);
+ ChatManager::message(message);
+
+ }
+
+ void SpaceRace::countdownFinished()//activates the engines of all players
+ {
+
+ std::string message("RACE STARTED ");
this->getGametypeInfo()->sendAnnounceMessage(message);
ChatManager::message(message);
+
+
+ for (Engine* engine : ObjectList<Engine>())
+ engine->setActive(true);
+
+
+
+}
+
+ void SpaceRace::playerEntered(PlayerInfo* player)
+ {
+ Gametype::playerEntered(player);
+
+ const std::string& message = player->getName() + " entered the game";
+ ChatManager::message(message);
}
+
+ 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());
+ }
+ }
+
+
+//set bot configurations
bool SpaceRace::allowPawnHit(Pawn* victim, Pawn* originator)
{
- return false;
+ return true;
}
bool SpaceRace::allowPawnDamage(Pawn* victim, Pawn* originator)
{
- return false;
+ 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;
}
Modified: code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.h
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.h 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/SpaceRace.h 2016-12-14 15:05:11 UTC (rev 11342)
@@ -56,11 +56,24 @@
SpaceRace(Context* context);
virtual ~SpaceRace() {}
+ void setConfigValues();
+
virtual void tick(float dt) override;
-
+ virtual void start() override;
virtual void end() override;
+ virtual void countdownFinished();
+ virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
+
+
+ virtual void playerEntered(PlayerInfo* player) override;
+
+ //virtual void newCheckpointReached();
+
void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
+
+
+
inline RaceCheckPoint* getCheckpointReached(PlayerInfo* player)
{ return this->checkpointReached_[player]; }
Modified: code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.cc
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -22,10 +22,19 @@
* Created on: Oct 8, 2012
* Author: purgham
*/
+#include <vector>
#include "SpaceRaceBot.h"
+#include "core/GameMode.h"
#include "core/CoreIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "gametypes/Gametype.h"
+#include "controllers/AIController.h"
+#include "gametypes/SpaceRaceController.h"
+
+
+
namespace orxonox
{
RegisterClass(SpaceRaceBot);
@@ -34,5 +43,24 @@
RegisterObject(SpaceRaceBot);
this->defaultController_ = Class(SpaceRaceController);// ClassByString("")
this->createController();
+
}
+
+SpaceRaceBot::~SpaceRaceBot(){
+
}
+
+void SpaceRaceBot::setConfigValues()
+ {
+ static const std::string names[] =
+ {
+ "Dr. Julius No",
+ "Berkay Berabi",
+ "Louis Meile"
+ "Yo mama"
+ };
+ static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
+
+ SetConfigValue(names_, defaultnames);
+ }
+}
Modified: code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.h
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.h 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceBot.h 2016-12-14 15:05:11 UTC (rev 11342)
@@ -29,19 +29,34 @@
#include "infos/Bot.h"
#include "gametypes/GametypesPrereqs.h"
#include "gametypes/SpaceRaceController.h"
+#include <vector>
namespace orxonox
{
- /**
-
- */
class _GametypesExport SpaceRaceBot: public Bot
{
public:
- SpaceRaceBot(Context* context);
- virtual ~SpaceRaceBot() {}
+ SpaceRaceBot(Context* context);
+ virtual ~SpaceRaceBot();
+
+ void setConfigValues();
+
+
+
+ virtual inline bool isInitialized() const override
+ { return true; }
+ virtual inline float getPing() const override
+ { return 0; }
+ virtual inline float getPacketLossRatio() const override
+ { return 0; }
+
+
+ private:
+ std::vector<std::string> names_;
+
+
};
}
Modified: code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -15,7 +15,7 @@
* 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
+ * You should have 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.
*
@@ -57,61 +57,6 @@
OrxAssert(!checkpoints.empty(), "No Checkpoints in Level");
checkpoints_ = checkpoints;
- /*orxout()<<"es gibt: "<<checkpoints_.size()<<"checkpoints"<<endl;
- for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
- {
- orxout()<<"Checkpoint "<<(*it)->getCheckpointIndex()<<"; NExtReal: ";
- std::set<int> temp =(*it)->getNextCheckpoints();
- for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
- {
- orxout()<<(*ii)<<", ";
- }
-
- orxout()<<" NextVirtual: ";
- temp=(*it)->getVirtualNextCheckpoints();
- for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
- {
- orxout()<<(*ii)<<", ";
- }
- orxout()<<endl<<endl;
-
- }//ausgabe*/
- /*
- for (std::vector<RaceCheckPoint*>::iterator it = checkpoints.begin(); it != checkpoints.end(); ++it)
- {
- std::set<int> nextCheckPoints = ((*it)->getNextCheckpoints());
- if(!nextCheckPoints.empty())
- {
- for (std::set<int>::iterator numb = nextCheckPoints.begin(); numb!=nextCheckPoints.end(); numb++)
- {
- RaceCheckPoint* point2 = findCheckpoint((*numb));
-
- //if(point2 != nullptr)
- //placeVirtualCheckpoints((*it), point2);
- }
- }
- }
- */
- /*
- for(std::vector<RaceCheckPoint*>::iterator it=checkpoints_.begin(); it!=checkpoints_.end(); it++)
- {
- orxout()<<"Checkpoint "<<(*it)->getCheckpointIndex()<<"; NExtReal: ";
- std::set<int> temp =(*it)->getNextCheckpoints();
- for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
- {
- orxout()<<(*ii)<<", ";
- }
-
- orxout()<<" NextVirtual: ";
- temp=(*it)->getVirtualNextCheckpoints();
- for (std::set<int>::iterator ii =temp.begin(); ii!=temp.end(); ii++)
- {
- orxout()<<(*ii)<<", ";
- }
- orxout()<<endl;
-
- }//ausgabe
- orxout()<<"es gibt: "<<checkpoints_.size()<<"checkpoints"<<endl;*/
staticRacePoints_ = findStaticCheckpoints(nextRaceCheckpoint_, checkpoints);
// initialisation of currentRaceCheckpoint_
currentRaceCheckpoint_ = nullptr;
@@ -121,7 +66,6 @@
{
continue;
}
- //orxout()<<"Die ANzahl der virtuellen CP betraegt: "<< (-i)-2<<endl;
}
@@ -224,6 +168,7 @@
minDistance = distance;
minNextRaceCheckPoint = nextRaceCheckPoint;
}
+
}
return minNextRaceCheckPoint;
@@ -362,6 +307,7 @@
lastPositionSpaceship = this->getControllableEntity()->getPosition();
//orxout()<< "CP "<< currentRaceCheckpoint_->getCheckpointIndex()<<" chanched to: "<< nextRaceCheckpoint_->getCheckpointIndex()<<endl;
}
+
else if ((lastPositionSpaceship-this->getControllableEntity()->getPosition()).length()/dt > ADJUSTDISTANCE)
{
nextRaceCheckpoint_ = adjustNextPoint();
@@ -379,7 +325,10 @@
}
//orxout(user_status) << "dt= " << dt << "; distance= " << (lastPositionSpaceship-this->getControllableEntity()->getPosition()).length() <<std::endl;
lastPositionSpaceship = this->getControllableEntity()->getPosition();
+
+this->boostControl();
this->moveToPosition(nextRaceCheckpoint_->getPosition());
+ this->boostControl();
}
// True if a coordinate of 'pointToPoint' is smaller then the corresponding coordinate of 'groesse'
Modified: code/branches/Presentation_HS16/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/Presentation_HS16/src/orxonox/controllers/HumanController.h 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/orxonox/controllers/HumanController.h 2016-12-14 15:05:11 UTC (rev 11342)
@@ -91,9 +91,9 @@
static Pawn* getLocalControllerEntityAsPawn();
//friend class, for mouselook
friend class Map;
+ static HumanController* localController_s;
protected:
- static HumanController* localController_s;
bool controlPaused_;
}; // tolua_export
Modified: code/branches/Presentation_HS16/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/Presentation_HS16/src/orxonox/gametypes/Gametype.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/orxonox/gametypes/Gametype.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -95,7 +95,7 @@
ModifyConsoleCommand(__CC_killBots_name).setObject(nullptr);
}
}
-
+
/**
* @brief Initializes sub-objects of the Gametype. This must be called after the constructor.
* At this point, the context is expected to have the current gametype. This allows to pass the current gametype to the sub-objects via constructor.
Modified: code/branches/Presentation_HS16/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/Presentation_HS16/src/orxonox/infos/Bot.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/orxonox/infos/Bot.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -67,30 +67,19 @@
{
static const std::string names[] =
{
- "Dr. Julius No",
- "Rosa Klebb",
- "Auric Goldfinger",
- "Emilio Largo",
- "Ernst Stavro Blofeld",
- "Dr. Kananga",
- "Francisco Scaramanga",
- "Karl Stromberg",
- "Sir Hugo Drax",
- "Aris Kristatos",
+ "Berkay Berabi",
+ "Louis Meile"
+ "Muten Roshi",
+ "Abradolf Lincler",
+ "Lionel Messi",
"Kamal Khan",
- "General Orlov",
- "Max Zorin",
- "Brad Whitaker",
- "General Georgi Koskov",
- "Franz Sanchez",
- "Alec Trevelyan",
- "Elliot Carver",
- "Elektra King",
- "Viktor Zokas",
- "Gustav Graves",
- "Le Chiffre",
- "Mr. White",
- "Dominic Greene"
+ "Karl the Llama",
+ "Thomas the Tankengine",
+ "Rick",
+ "Morty",
+ "Charlie the Unicorn",
+ "Kung Fury",
+ "Postman Pat"
};
static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
Modified: code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h
===================================================================
--- code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/orxonox/infos/GametypeInfo.h 2016-12-14 15:05:11 UTC (rev 11342)
@@ -82,6 +82,7 @@
*/
inline bool isStartCountdownRunning() const
{ return this->bStartCountdownRunning_; }
+
void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
/**
@@ -131,11 +132,12 @@
void dispatchDeathMessage(const std::string& message) const;
void dispatchStaticMessage(const std::string& message,const ColourValue& colour) const;
void dispatchFadingMessage(const std::string& message) const;
+ void setStartCountdown(float countdown); // Set the start countdown to the input value.
+
protected:
void start(void); // Inform the GametypeInfo that the game has started.
void end(void); // Inform the GametypeInfo that the game has ended.
- void setStartCountdown(float countdown); // Set the start countdown to the input value.
void countdownStartCountdown(float countDown); // Count down the start countdown by the specified value.
void countDown(); // Count down the start countdown counter.
void startStartCountdown(void); // Inform the GametypeInfo about the start of the start countdown.
Modified: code/branches/Presentation_HS16/src/orxonox/sound/WorldAmbientSound.cc
===================================================================
--- code/branches/Presentation_HS16/src/orxonox/sound/WorldAmbientSound.cc 2016-12-14 14:33:41 UTC (rev 11341)
+++ code/branches/Presentation_HS16/src/orxonox/sound/WorldAmbientSound.cc 2016-12-14 15:05:11 UTC (rev 11342)
@@ -57,7 +57,9 @@
soundList_.emplace_back("Asteroid_rocks.ogg");
soundList_.emplace_back("Ganymede.ogg");
soundList_.emplace_back("luke_grey_-_hypermode.ogg");
+ soundList_.emplace_back("racetheme.ogg");
+
}
WorldAmbientSound::~WorldAmbientSound()
{
Copied: code/branches/Presentation_HS16/svn-commit.2.tmp (from rev 11341, code/branches/SpaceRace_HS16/svn-commit.2.tmp)
===================================================================
--- code/branches/Presentation_HS16/svn-commit.2.tmp (rev 0)
+++ code/branches/Presentation_HS16/svn-commit.2.tmp 2016-12-14 15:05:11 UTC (rev 11342)
@@ -0,0 +1,4 @@
+
+--This line, and those below, will be ignored--
+
+M data/levels/newnewnewspacerace.oxw
Copied: code/branches/Presentation_HS16/svn-commit.tmp (from rev 11341, code/branches/SpaceRace_HS16/svn-commit.tmp)
===================================================================
--- code/branches/Presentation_HS16/svn-commit.tmp (rev 0)
+++ code/branches/Presentation_HS16/svn-commit.tmp 2016-12-14 15:05:11 UTC (rev 11342)
@@ -0,0 +1,4 @@
+
+--This line, and those below, will be ignored--
+
+M data/levels/newnewnewspacerace.oxw
More information about the Orxonox-commit
mailing list