[Orxonox-commit 7065] r11683 - in code/branches/Presentation_HS17: . data/levels data/levels/includes data/levels/templates data/overlays src/modules
patricwi at orxonox.net
patricwi at orxonox.net
Sat Dec 16 15:10:43 CET 2017
Author: patricwi
Date: 2017-12-16 15:10:43 +0100 (Sat, 16 Dec 2017)
New Revision: 11683
Added:
code/branches/Presentation_HS17/data/levels/Asteroids2D.oxw
code/branches/Presentation_HS17/data/levels/includes/asteroids2DWeapon.oxi
code/branches/Presentation_HS17/data/levels/templates/asteroidsAsteroids2D.oxt
code/branches/Presentation_HS17/data/levels/templates/spaceshipAsteroids2D.oxt
code/branches/Presentation_HS17/data/overlays/Asteroids2DHUD.oxo
code/branches/Presentation_HS17/src/modules/asteroids2D/
Modified:
code/branches/Presentation_HS17/
code/branches/Presentation_HS17/src/modules/CMakeLists.txt
Log:
asteroids merged
Index: code/branches/Presentation_HS17
===================================================================
--- code/branches/Presentation_HS17 2017-12-16 12:44:42 UTC (rev 11682)
+++ code/branches/Presentation_HS17 2017-12-16 14:10:43 UTC (rev 11683)
Property changes on: code/branches/Presentation_HS17
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
/code/branches/AI_HS15:10640-10832
/code/branches/Alejandro_FS17:11369-11447
/code/branches/AsteroidMining_HS17:11461-11678
+/code/branches/Asteroid_HS17:11456-11682
/code/branches/BigShip_HS16:11213-11356
/code/branches/CampaignMap_HS17:11458-11680
/code/branches/Dialog_HS17:11455-11681
Copied: code/branches/Presentation_HS17/data/levels/Asteroids2D.oxw (from rev 11682, code/branches/Asteroid_HS17/data/levels/Asteroids2D.oxw)
===================================================================
--- code/branches/Presentation_HS17/data/levels/Asteroids2D.oxw (rev 0)
+++ code/branches/Presentation_HS17/data/levels/Asteroids2D.oxw 2017-12-16 14:10:43 UTC (rev 11683)
@@ -0,0 +1,82 @@
+<LevelInfo
+ name = "Asteroids2D"
+ description = "Try to prevent asteroids from colliding into your spaceship. Be prepared to dodge all asteroids or destroy them."
+ tags = "minigame"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipAsteroids2D.oxt")
+ include("templates/enemyInvader.oxt")
+ include("overlays/Asteroids2DHUD.oxo")
+ include("templates/asteroidsAsteroids2D.oxt")
+?>
+
+<Level
+ plugins = asteroids2D
+ gametype = Asteroids2D
+>
+ <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="0,0,0" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
+
+ <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
+
+
+ <!--<?lua
+ for i = 1, 250, 1
+ do
+ j = math.random()
+ ?>
+
+ <MovableEntity
+ position = "<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"
+ collisionType = dynamic
+ linearDamping = 0.8
+ angularDamping = 0
+ scale = "<?lua print(j * 150)?>"
+ collisiondamage = 1
+ enablecollisiondamage = true
+ >
+ <attached>
+ <Model mass="<?lua print(j * 1000) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="<?lua print(j * 350) ?>" />
+ </collisionShapes>
+ </MovableEntity>
+
+ <?lua
+ end
+ ?>-->
+
+ <Asteroids2DCenterPoint name=asteroids2Dcenter />
+
+
+ </Scene>
+</Level>
\ No newline at end of file
Copied: code/branches/Presentation_HS17/data/levels/includes/asteroids2DWeapon.oxi (from rev 11682, code/branches/Asteroid_HS17/data/levels/includes/asteroids2DWeapon.oxi)
===================================================================
--- code/branches/Presentation_HS17/data/levels/includes/asteroids2DWeapon.oxi (rev 0)
+++ code/branches/Presentation_HS17/data/levels/includes/asteroids2DWeapon.oxi 2017-12-16 14:10:43 UTC (rev 11683)
@@ -0,0 +1,30 @@
+ <weaponslots>
+ <WeaponSlot position="-9.2,2,-13" />
+ <WeaponSlot position=" 9.2,2,-13" />
+ </weaponslots>
+ <weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+ </weaponsets>
+ <weaponpacks>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ </links>
+ <Weapon>
+ <Asteroids2DWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="laserbeam.mesh" />
+ </Weapon>
+ <Weapon>
+ <Asteroids2DWeapon mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="laserbeam.mesh" />
+ </Weapon>
+ </WeaponPack>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+ </links>
+ </WeaponPack>
+ </weaponpacks>
+ <munition>
+ <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+ </munition>
Copied: code/branches/Presentation_HS17/data/levels/templates/asteroidsAsteroids2D.oxt (from rev 11682, code/branches/Asteroid_HS17/data/levels/templates/asteroidsAsteroids2D.oxt)
===================================================================
--- code/branches/Presentation_HS17/data/levels/templates/asteroidsAsteroids2D.oxt (rev 0)
+++ code/branches/Presentation_HS17/data/levels/templates/asteroidsAsteroids2D.oxt 2017-12-16 14:10:43 UTC (rev 11683)
@@ -0,0 +1,62 @@
+<Template name = stone1>
+ <Asteroids2DStone
+ collisionType = dynamic
+ linearDamping = 0
+ angularDamping = 0
+ scale= 10
+ enablecollisiondamage = true
+
+ health = 10
+ maxhealth = 10
+ initialhealth = 10
+ >
+ <attached>
+ <Model mass= 4000 mesh="ast1.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="10" />
+ </collisionShapes>
+ </Asteroids2DStone>
+</Template>
+
+<Template name = stone2>
+ <Asteroids2DStone
+ collisionType = dynamic
+ linearDamping = 0
+ angularDamping = 0
+ scale= 20
+ enablecollisiondamage = true
+
+ health = 10
+ maxhealth = 10
+ initialhealth = 10
+ >
+ <attached>
+ <Model mass= 8000 mesh="ast1.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="20" />
+ </collisionShapes>
+ </Asteroids2DStone>
+</Template>
+
+<Template name = stone3>
+ <Asteroids2DStone
+ collisionType = dynamic
+ linearDamping = 0
+ angularDamping = 0
+ scale= 30
+ enablecollisiondamage = true
+
+ health = 10
+ maxhealth = 10
+ initialhealth = 10
+ >
+ <attached>
+ <Model mass= 16000 mesh="ast1.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="30" />
+ </collisionShapes>
+ </Asteroids2DStone>
+</Template>
\ No newline at end of file
Copied: code/branches/Presentation_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (from rev 11682, code/branches/Asteroid_HS17/data/levels/templates/spaceshipAsteroids2D.oxt)
===================================================================
--- code/branches/Presentation_HS17/data/levels/templates/spaceshipAsteroids2D.oxt (rev 0)
+++ code/branches/Presentation_HS17/data/levels/templates/spaceshipAsteroids2D.oxt 2017-12-16 14:10:43 UTC (rev 11683)
@@ -0,0 +1,137 @@
+<Template name=spaceshipasteroids2d>
+ <Asteroids2DShip
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipescortcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 4
+
+ health = 10
+ maxhealth = 10
+ initialhealth = 10
+
+ shieldhealth = 20
+ initialshieldhealth = 20
+ maxshieldhealth = 20
+ shieldabsorption = 0.1
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
+
+ primaryThrust = 150
+ auxilaryThrust = 30
+ rotationThrust = 100
+
+ lift = 1;
+ stallSpeed = 220;
+
+ boostPower = 20
+ boostPowerRate = 1
+ boostRate = 5
+ boostCooldownDuration = 10
+
+ shakeFrequency = 15
+ shakeAmplitude = 6
+
+ collisionType = "dynamic"
+ mass = 4200000
+ linearDamping = 0.9
+ angularDamping = 0.9999999
+
+ collisiondamage = 100
+ enablecollisiondamage = true
+
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipasteroids2dengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipasteroids2dengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
+ <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 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 , 3" halfExtents="10, 4,8" />
+ <BoxCollisionShape position="12.6 ,-2, 3" halfExtents="2.8,2.8,11"/>
+ <BoxCollisionShape position="-12.6,-2, 3" halfExtents="2.8,2.8,11"/>
+ <BoxCollisionShape position="0, 0,-12" halfExtents="4 , 4 ,7" />
+ </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/asteroids2DWeapon.oxi")
+?>
+ </Asteroids2DShip>
+</Template>
+
+<Template name=spaceshipescortcameras defaults=0>
+ <Asteroids2DShip>
+ <camerapositions>
+ <!--<CameraPosition position="0,100,180" direction="0, -0.2, -1" 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 />
+-->
+ <CameraPosition position="0,600,0" pitch=-90 absolute=true drag = false mouselook=true/>
+ <CameraPosition position="0,50,160" drag=true mouselook=true />
+ <CameraPosition position="0,40,125" drag=true mouselook=true />
+ <CameraPosition position="0,30, 90" drag=true mouselook=true />
+ </camerapositions>
+ </Asteroids2DShip>
+</Template>
+
+<Template name=spaceshipasteroids2dengine baseclass=MultiStateEngine>
+ <MultiStateEngine
+ boostfactor = 2.2
+
+ speedfront = 200
+ speedback = 200
+ speedleftright = 100
+ speedupdown = 100
+
+ defEngineSndNormal = "sounds/Engine_low.ogg"
+ defEngineSndBoost = "sounds/Engine_high.ogg"
+
+ accelerationfront = 700
+ accelerationbrake = 700
+ accelerationback = 700
+ accelerationleftright = 500
+ accelerationupdown = 500
+ >
+
+ <!-- backlight error if you fly over the edge
+ <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.09 position="12, -2, 13" 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.09 position="-12, -2, 13" 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.33 name=bltest position=" 12, 0, 10" colour="0.2, 1.0, 0.65, 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.33 name=bltest position="-12, 0, 10" colour="0.2, 1.0, 0.65, 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.33 name=bltest position=" 12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+ <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, 0, 10" colour="0.6, 0.8, 0.75, 0.7" width=25 length=1000 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/Presentation_HS17/data/overlays/Asteroids2DHUD.oxo (from rev 11682, code/branches/Asteroid_HS17/data/overlays/Asteroids2DHUD.oxo)
===================================================================
--- code/branches/Presentation_HS17/data/overlays/Asteroids2DHUD.oxo (rev 0)
+++ code/branches/Presentation_HS17/data/overlays/Asteroids2DHUD.oxo 2017-12-16 14:10:43 UTC (rev 11683)
@@ -0,0 +1,84 @@
+<Template name="spectatorhud">
+ <OverlayGroup name = "spectatorhud" scale = "1, 1">
+ </OverlayGroup>
+</Template>
+
+<Template name="Asteroids2DHUD">
+ <OverlayGroup name="Asteroids2DHUD" scale = "1, 1">
+
+ <OverlayText
+ position = "0.02, 0.1"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "Lives: "
+ />
+
+ <Asteroids2DHUDinfo
+ position = "0.14, 0.1"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+
+ showlives = true
+ showlevel = false
+ showpoints = false
+ />
+
+ <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: "
+ />
+
+ <Asteroids2DHUDinfo
+ 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
+ />
+
+ <OverlayText
+ position = "0.02, 0.055"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+ caption = "Level: "
+ />
+
+ <Asteroids2DHUDinfo
+ position = "0.14, 0.055"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+
+ showlives = false
+ showlevel = true
+ showpoints = false
+ />
+
+
+ </OverlayGroup>
+</Template>
+
+<Template name="spaceshiphud">
+ <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+
+ </OverlayGroup>
+</Template>
\ No newline at end of file
Modified: code/branches/Presentation_HS17/src/modules/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17/src/modules/CMakeLists.txt 2017-12-16 12:44:42 UTC (rev 11682)
+++ code/branches/Presentation_HS17/src/modules/CMakeLists.txt 2017-12-16 14:10:43 UTC (rev 11683)
@@ -46,4 +46,5 @@
ADD_SUBDIRECTORY(dodgerace)
ADD_SUBDIRECTORY(hover)
ADD_SUBDIRECTORY(superorxobros)
+ADD_SUBDIRECTORY(asteroids2D)
ADD_SUBDIRECTORY(flappyorx)
More information about the Orxonox-commit
mailing list