[Orxonox-commit 7419] r12030 - in code/branches/mergeFS18: . data/levels data/levels/templates data/overlays src/modules
merholzl at orxonox.net
merholzl at orxonox.net
Wed Oct 10 15:55:21 CEST 2018
Author: merholzl
Date: 2018-10-10 15:55:21 +0200 (Wed, 10 Oct 2018)
New Revision: 12030
Added:
code/branches/mergeFS18/data/levels/OrxyRoad.oxw
code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt
code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt
code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo
code/branches/mergeFS18/src/modules/orxyroad/
Modified:
code/branches/mergeFS18/
code/branches/mergeFS18/src/modules/CMakeLists.txt
Log:
added OrxyRoad
Index: code/branches/mergeFS18
===================================================================
--- code/branches/mergeFS18 2018-10-10 13:36:53 UTC (rev 12029)
+++ code/branches/mergeFS18 2018-10-10 13:55:21 UTC (rev 12030)
Property changes on: code/branches/mergeFS18
___________________________________________________________________
Modified: svn:mergeinfo
## -10,6 +10,7 ##
/code/branches/HUD_HS16:11212-11390,11392-11699
/code/branches/Highscore_HS16:11226-11355
/code/branches/Masterserver_FS18:11816-12026
+/code/branches/OrxyRoad_FS18:11823-12029
/code/branches/ParticleEffectsFS15:10309-10612
/code/branches/Presentation_HS17_merge:11723-11782
/code/branches/ProtectBoss_HS17:11457-11763
## -200,4 +201,4 ##
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/branches/weaponupdateHS14:10084-10237
-/code/trunk:11785-11821
\ No newline at end of property
+/code/trunk:11785-11822
\ No newline at end of property
Copied: code/branches/mergeFS18/data/levels/OrxyRoad.oxw (from rev 12029, code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw)
===================================================================
--- code/branches/mergeFS18/data/levels/OrxyRoad.oxw (rev 0)
+++ code/branches/mergeFS18/data/levels/OrxyRoad.oxw 2018-10-10 13:55:21 UTC (rev 12030)
@@ -0,0 +1,54 @@
+<LevelInfo
+ name = "Orxy Road"
+ description = "Try to come as far as possible"
+ tags = "minigame"
+ screenshot = "OrxyRoad.png"
+/>
+<?lua
+ include("stats.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipOrxyRoad.oxt")
+ include("templates/enemyInvader.oxt")
+ include("templates/OrxyRoadPattern.oxt")
+ include("overlays/OrxyRoadHUD.oxo")
+?>
+
+<Level
+ plugins = orxyroad
+ gametype = OrxyRoad
+ >
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <Scene
+ ambientlight = "1.0, 1.0, 1.0"
+ skybox = "Orxonox/Starbox"
+ negativeWorldRange = "-100000, -100000, -100000"
+ positiveWorldRange = " 100000, 100000, 100000"
+ >
+
+ <WorldAmbientSound
+ source="Earth.ogg"
+ looping="true"
+ playOnLoad="true"
+ />
+
+ <!-- <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"/> -->
+ <Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+ <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=OrxyRoadShip pawndesign=spaceshiporxyroad />
+
+ <DistanceTrigger name="start" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=0 />
+
+
+ <OrxyRoadCenterPoint name=invadercenter />
+
+ </Scene>
+</Level>
+
Copied: code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt (from rev 12029, code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt)
===================================================================
--- code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt (rev 0)
+++ code/branches/mergeFS18/data/levels/templates/OrxyRoadPattern.oxt 2018-10-10 13:55:21 UTC (rev 12030)
@@ -0,0 +1,164 @@
+<Template name=OrxyRoadCube01>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="700,0,50" mesh="CuboidBody.mesh" scale3D="300,50,50" />
+ <Model position="700,0,1150" mesh="CuboidBody.mesh" scale3D="300,50,50" />
+ <Model position="1200,0,200" mesh="CuboidBody.mesh" scale3D="100,50,100" />
+ <Model position="1200,0,1000" mesh="CuboidBody.mesh" scale3D="100,50,100" />
+ <Model position="1250,-10,430" mesh="CuboidBody.mesh" scale3D="50,40,30" />
+ <Model position="1250,-10,600" mesh="CuboidBody.mesh" scale3D="50,40,30" />
+ <Model position="1250,-10,770" mesh="CuboidBody.mesh" scale3D="50,40,30" />
+ <Model position="1650,0,350" mesh="CuboidBody.mesh" scale3D="50,50,150" />
+ <Model position="1650,0,850" mesh="CuboidBody.mesh" scale3D="50,50,150" />
+ <Model position="2100,0,150" mesh="CuboidBody.mesh" scale3D="100,50,150" />
+ <Model position="2100,0,1050" mesh="CuboidBody.mesh" scale3D="100,50,150" />
+ <Model position="2150,0,600" mesh="CuboidBody.mesh" scale3D="50,50,100" />
+ </attached>
+
+ <collisionShapes>
+ <BoxCollisionShape position="700,0,50" halfExtents="300,50,50" />
+ <BoxCollisionShape position="700,0,1150" halfExtents="300,50,50" />
+ <BoxCollisionShape position="1200,0,200" halfExtents="100,50,100" />
+ <BoxCollisionShape position="1200,0,1000" halfExtents="100,50,100" />
+ <BoxCollisionShape position="1250,-10,430" halfExtents="50,40,30" />
+ <BoxCollisionShape position="1250,-10,600" halfExtents="50,40,30" />
+ <BoxCollisionShape position="1250,-10,770" halfExtents="50,40,30" />
+ <BoxCollisionShape position="1650,0,350" halfExtents="50,50,150" />
+ <BoxCollisionShape position="1650,0,850" halfExtents="50,50,150" />
+ <BoxCollisionShape position="2100,0,150" halfExtents="100,50,150" />
+ <BoxCollisionShape position="2100,0,1050" halfExtents="100,50,150" />
+ <BoxCollisionShape position="2150,0,600" halfExtents="50,50,100" />
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+<Template name=OrxyRoadCube02>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="450,0,300" mesh="CuboidBody.mesh" scale3D="50,50,300" />
+ <Model position="950,0,850" mesh="CuboidBody.mesh" scale3D="50,50,350" />
+ <Model position="1350,0,200" mesh="CuboidBody.mesh" scale3D="50,50,200" />
+ <Model position="1350,0,700" mesh="CuboidBody.mesh" scale3D="50,50,100" />
+ <Model position="1750,0,350" mesh="CuboidBody.mesh" scale3D="50,50,350" />
+ <Model position="2000,0,1000" mesh="CuboidBody.mesh" scale3D="100,50,100" />
+ <Model position="1650,0,1150" mesh="CuboidBody.mesh" scale3D="450,50,50" />
+ </attached>
+
+ <collisionShapes>
+ <BoxCollisionShape position="450,0,300" halfExtents="50,50,300" />
+ <BoxCollisionShape position="950,0,850" halfExtents="50,50,350" />
+ <BoxCollisionShape position="1350,0,200" halfExtents="50,50,200" />
+ <BoxCollisionShape position="1350,0,700" halfExtents="50,50,100" />
+ <BoxCollisionShape position="1750,0,350" halfExtents="50,50,350" />
+ <BoxCollisionShape position="2000,0,1000" halfExtents="100,50,100" />
+ <BoxCollisionShape position="1650,0,1150" halfExtents="450,50,50" />
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+<Template name=SingleOrxyRoadCube>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="CuboidBody.mesh" scale3D="300,50,50" />
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="300,50,50" />
+
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+<Template name=cokebottle>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="cokebottle.mesh" scale="50" />
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="100,100,100" />
+
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+
+
+<Template name=spaceshuttle>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" roll=0 pitch=0 collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="Transporterspaceship.mesh" scale="10" />
+
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position=" 0, 0, 20" halfExtents=" 37, 25, 80" />
+ <BoxCollisionShape position=" 0, 21, 20" halfExtents=" 37, 21, 80" />
+ <BoxCollisionShape position=" 0, 40, 110" halfExtents=" 20, 10, 40" />
+ <BoxCollisionShape position=" 0, 45, 170" halfExtents=" 33, 25, 20" />
+ <BoxCollisionShape position=" -60, 33, 0" halfExtents=" 24, 16, 120" />
+ <BoxCollisionShape position=" 60, 33, 0" halfExtents=" 24, 16, 120" />
+ <BoxCollisionShape position=" 0, 10, -90" halfExtents=" 30, 25, 30" />
+ <BoxCollisionShape position=" 0, -3, -145" halfExtents=" 20, 20, 30" />
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+
+
+<Template name=asteroid1>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="ast1.mesh" scale="50" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="120" />
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+
+
+<Template name=asteroid2>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="ast2.mesh" scale="50" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="120" />
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+
+
+<Template name=satellite>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" yaw="90" pitch="-90" roll="0" scale="30" mesh="satellite.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="30,30,30" />
+ <BoxCollisionShape position="75,0,0" halfExtents="120,10,30" />
+ <BoxCollisionShape position="-75,0,0" halfExtents="120 ,10,30" />
+ </collisionShapes>
+ </OrxyRoadCube>
+
+</Template>
+
+
+
Copied: code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt (from rev 12029, code/branches/OrxyRoad_FS18/data/levels/templates/spaceshipOrxyRoad.oxt)
===================================================================
--- code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt (rev 0)
+++ code/branches/mergeFS18/data/levels/templates/spaceshipOrxyRoad.oxt 2018-10-10 13:55:21 UTC (rev 12030)
@@ -0,0 +1,130 @@
+<Template name=spaceshiporxyroad>
+ <OrxyRoadShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipescortcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 4
+
+ health = 40
+ maxhealth = 40
+ initialhealth = 40
+
+ shieldhealth = 20
+ initialshieldhealth = 20
+ maxshieldhealth = 20
+ shieldabsorption = 0.1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
+
+ primaryThrust = 150
+ auxilaryThrust = 30
+ rotationThrust = 50
+
+ lift = 1;
+ stallSpeed = 220;
+
+ boostPower = 20
+ boostPowerRate = 1
+ boostRate = 5
+ boostCooldownDuration = 10
+
+ shakeFrequency = 15
+ shakeAmplitude = 6
+
+ collisionType = "dynamic"
+ mass = 4200000
+ linearDamping = 0.9999999
+ angularDamping = 0.9999999
+
+ collisiondamage = 100
+ enablecollisiondamage = true
+
+ >
+ <engines>
+ <MultiStateEngine position=" 15.2, 0, 12" template=spaceshipinvaderengine />
+ <MultiStateEngine position="-15.2, 0, 0" template=spaceshipinvaderengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=8 mesh="escortShip.mesh" /> <!-- EXPERIMENTAL: changed scale form 4 to 8 /-->
+ <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=8 mesh="escortWeapon.mesh" />
+<!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
+<Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />
+<Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" />
+<Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /-->
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0 ,0 , 6" halfExtents="20, 8,16" />
+ <BoxCollisionShape position="25.2 ,-4, 6" halfExtents="5.6,5.6,22"/>
+ <BoxCollisionShape position="-25.2,-4, 6" halfExtents="5.6,5.6,22"/>
+ <BoxCollisionShape position="0, 0,-24" halfExtents="8 , 8 ,14
+ " />
+ </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 minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+ <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/invaderWeapon.oxi")
+?>
+ </OrxyRoadShip>
+</Template>
+
+<Template name=spaceshipescortcameras defaults=0>
+ <OrxyRoadShip>
+ <camerapositions>
+ <CameraPosition position="400,400,720" direction="-0.4, -0.4, -1" yaw="0" drag=false mouselook=true />
+ <CameraPosition position="0,200,250" direction="0, -0.4, -1" drag=false mouselook=true />
+ <CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />
+ <CameraPosition position="0,1300,-100" direction="0, -1, 0" drag=false mouselook=true />
+ </camerapositions>
+ </OrxyRoadShip>
+</Template>
+
+<Template name=spaceshipinvaderengine baseclass=MultiStateEngine>
+ <MultiStateEngine
+ boostfactor = 2.2
+
+ speedfront = 200
+ speedback = 70
+ speedleftright = 70
+ speedupdown = 70
+
+ defEngineSndNormal = "sounds/Engine_low.ogg"
+ defEngineSndBoost = "sounds/Engine_high.ogg"
+
+ accelerationfront = 700
+ accelerationbrake = 700
+ 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.18 position="24, -4, 26" colour="0.2, 1.0, 0.65, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+ <FadingBillboard mainstate=activity active=false scale=0.18 position="-24, -4, 26" colour="0.2, 1.0, 0.65, 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.66 name=bltest position=" 24, 0, 20" colour="0.2, 1.0, 0.65, 1.0" width=30 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+ <Backlight mainstate=activity active=false scale=0.66 name=bltest position=" -24, 0, 20" colour="0.2, 1.0, 0.65, 1.0" width=30 length=3000 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.66 name=bltest position=" 24, 0, 20" colour="0.6, 0.8, 0.75, 0.7" width=50 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.66 name=bltest position=" -24, 0, 20" colour="0.6, 0.8, 0.75, 0.7" width=50 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ </EffectContainer>
+
+
+ </MultiStateEngine>
+</Template>
\ No newline at end of file
Copied: code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo (from rev 12029, code/branches/OrxyRoad_FS18/data/overlays/OrxyRoadHUD.oxo)
===================================================================
--- code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo (rev 0)
+++ code/branches/mergeFS18/data/overlays/OrxyRoadHUD.oxo 2018-10-10 13:55:21 UTC (rev 12030)
@@ -0,0 +1,38 @@
+<Template name="spectatorhud">
+ <OverlayGroup name = "spectatorhud" scale = "1, 1">
+ </OverlayGroup>
+</Template>
+
+<Template name="OrxyRoadHUD">
+ <OverlayGroup name="OrxyRoadHUD" scale = "1, 1">
+
+ <OverlayText
+ position = "0.02, 0.02"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "Points: "
+ />
+
+ <OrxyRoadHUDinfo
+ position = "0.14, 0.02"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+
+ showpoints = true
+ />
+
+
+ </OverlayGroup>
+</Template>
+
+<Template name="spaceshiphud">
+ <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+
+ </OverlayGroup>
+</Template>
\ No newline at end of file
Modified: code/branches/mergeFS18/src/modules/CMakeLists.txt
===================================================================
--- code/branches/mergeFS18/src/modules/CMakeLists.txt 2018-10-10 13:36:53 UTC (rev 12029)
+++ code/branches/mergeFS18/src/modules/CMakeLists.txt 2018-10-10 13:55:21 UTC (rev 12030)
@@ -48,3 +48,4 @@
ADD_SUBDIRECTORY(superorxobros)
ADD_SUBDIRECTORY(asteroids2D)
ADD_SUBDIRECTORY(flappyorx)
+ADD_SUBDIRECTORY(orxyroad)
More information about the Orxonox-commit
mailing list