[Orxonox-commit 7135] r11752 - in code/branches/Presentation_HS17_merge: . data/levels data/levels/templates data/overlays data/particle src/modules
landauf at orxonox.net
landauf at orxonox.net
Thu Feb 15 23:32:36 CET 2018
Author: landauf
Date: 2018-02-15 23:32:36 +0100 (Thu, 15 Feb 2018)
New Revision: 11752
Added:
code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw
code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt
code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt
code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo
code/branches/Presentation_HS17_merge/src/modules/flappyorx/
Modified:
code/branches/Presentation_HS17_merge/
code/branches/Presentation_HS17_merge/data/particle/fire3.particle
code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt
Log:
merged FlappyOrx_HS17
Index: code/branches/Presentation_HS17_merge
===================================================================
--- code/branches/Presentation_HS17_merge 2018-02-15 22:29:31 UTC (rev 11751)
+++ code/branches/Presentation_HS17_merge 2018-02-15 22:32:36 UTC (rev 11752)
Property changes on: code/branches/Presentation_HS17_merge
___________________________________________________________________
Modified: svn:mergeinfo
## -6,6 +6,7 ##
/code/branches/CampaignMap_HS17:11458-11742
/code/branches/Dialog_HS17:11455-11746
/code/branches/Dialogue_FS17:11360-11450
+/code/branches/FlappyOrx_HS17:11460-11751
/code/branches/HUD_HS16:11212-11390,11392-11699
/code/branches/Highscore_HS16:11226-11355
/code/branches/ParticleEffectsFS15:10309-10612
Copied: code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (from rev 11751, code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw)
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw (rev 0)
+++ code/branches/Presentation_HS17_merge/data/levels/FlappyOrx.oxw 2018-02-15 22:32:36 UTC (rev 11752)
@@ -0,0 +1,69 @@
+<LevelInfo
+ name = "Flappy Orx"
+ description = "A clone of the iconic Flappy Bird"
+ tags = "minigame"
+ screenshot = "FlappyOrx.png"
+/>
+
+<?lua
+ include("templates/lodInformation.oxt")
+ include("templates/spaceshipFlappyOrx.oxt")
+ include("overlays/FlappyOrxHUD.oxo")
+
+?>
+
+<Level
+ plugins = flappyorx
+ gametype = FlappyOrx
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+
+ <Scene
+ ambientlight = "0.8, 0.7, 0.4"
+ skybox = "Orxonox/skyBoxBasic"
+ >
+ <WorldAmbientSound
+ source="Earth.ogg"
+ looping="true"
+ playOnLoad="true"
+ />
+
+ <Light type=directional position="11000, 11000, -7000" lookat="0, 0, 0" diffuse="1, 1, 1, 1" specular="1.0, 0.9, 0.9, 1.0" />
+ <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
+
+ <FlappyOrxCenterPoint name=flappyorxcenter />
+
+
+
+ <?lua
+ for i = 1, 5, 1 do
+ for j = 3, 12,3 do
+ ?>
+
+ <Template name=Asteroid<?lua print(j) ?>_<?lua print(i) ?>>
+ <MovableEntity
+ collisionType = dynamic
+ linearDamping = 0.8
+ angularDamping = 1
+ scale = "<?lua print(j) ?>"
+ collisiondamage = 10000
+ enablecollisiondamage = true
+ >
+
+ <attached>
+ <Model mass="1000" mesh="ast<?lua print(i) ?>.mesh" />
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape radius="<?lua print(j + 8) ?>" />
+ </collisionShapes>
+ </MovableEntity>
+ </Template>
+
+ <?lua
+ end
+ end
+ ?>
+ </Scene>
+</Level>
Copied: code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt (from rev 11751, code/branches/FlappyOrx_HS17/data/levels/templates/enemyFlappyOrx.oxt)
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt (rev 0)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/enemyFlappyOrx.oxt 2018-02-15 22:32:36 UTC (rev 11752)
@@ -0,0 +1,174 @@
+<Template name=enemyFlappyOrx>
+ <FlappyOrxEnemy
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipescortcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 4
+
+ health = 10
+ maxhealth = 10
+ initialhealth = 10
+
+ shieldhealth = 10
+ initialshieldhealth = 10
+ maxshieldhealth = 10
+ shieldabsorption = 0.9
+ 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 = 0.00001
+ linearDamping = 0
+ angularDamping = 0
+
+ collisiondamage = 100
+ enablecollisiondamage = true
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="swallow_mat.mesh" />
+ <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="escortWeapon.mesh" />
+ </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/FlappyOrxWeapon.oxi")
+?>
+ </FlappyOrxEnemy>
+</Template>
+
+<Template name=enemyFlappyOrxshooter>
+ <FlappyOrxEnemyShooter
+ hudtemplate = spaceshiphud
+ camerapositiontemplate = spaceshipescortcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 4
+
+ health = 20
+ maxhealth = 20
+ initialhealth = 20
+
+ shieldhealth = 20
+ initialshieldhealth = 20
+ maxshieldhealth = 20
+ shieldabsorption = 0.9
+ 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 = 100
+ linearDamping = 0
+ angularDamping = 0
+
+ collisiondamage = 100
+ enablecollisiondamage = true
+ >
+ <engines>
+ <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipescortengine />
+ <MultiStateEngine position="-7.6, 0, 0" template=spaceshipescortengine />
+ </engines>
+ <attached>
+ <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="ghost.mesh" />
+ <Model position="0,0,0" yaw=180 pitch=270 roll=0 scale=2 mesh="escortWeapon.mesh" />
+ </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>
+<?lua
+ include("../includes/FlappyOrxWeaponEnemy.oxi")
+?>
+ </FlappyOrxEnemyShooter>
+</Template>
+
+<Template name=spaceshipescortengine 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.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>
Copied: code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt (from rev 11751, code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt)
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt (rev 0)
+++ code/branches/Presentation_HS17_merge/data/levels/templates/spaceshipFlappyOrx.oxt 2018-02-15 22:32:36 UTC (rev 11752)
@@ -0,0 +1,56 @@
+<Template name=spaceshipFlappyOrx>
+ <FlappyOrxShip
+
+ camerapositiontemplate = spaceshipescortcameras
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 6
+
+ health = 80
+ maxhealth = 200
+ initialhealth = 80
+
+ primaryThrust = 150
+ auxilaryThrust = 30
+ rotationThrust = 50
+
+ collisionType = "dynamic"
+ mass = 4200000
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+
+ collisiondamage = 100
+ enablecollisiondamage = true
+
+ speedBase = 100
+ speedIncrease = 0.5
+ tubeDistanceBase = 200
+ tubeDistanceIncrease = -1
+
+ upwardThrust = 220
+ gravity = 700
+
+ >
+
+ <attached>
+ <Model position="0,0,0" yaw=180 pitch=90 roll=270 scale=9 mesh="FlappyOrxShip.mesh" />
+
+ <ParticleSpawner source="Orxonox/fire3" startdelay=0 position="0,0,20" visible="true"/>
+
+ </attached>
+ <collisionShapes>
+ <SphereCollisionShape position="-1.8 ,0 , -11" radius="15" />
+ <SphereCollisionShape position="-0.8 ,0 , 0" radius="16" />
+ <!-- <SphereCollisionShape position="0 ,0 , 11" radius="12.5" /> -->
+ </collisionShapes>
+
+ </FlappyOrxShip>
+</Template>
+
+<Template name=spaceshipescortcameras defaults=0>
+ <FlappyOrxShip>
+ <camerapositions>
+ <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false absolute=true mouselook=true />
+ </camerapositions>
+ </FlappyOrxShip>
+</Template>
+
Copied: code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo (from rev 11751, code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo)
===================================================================
--- code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo (rev 0)
+++ code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo 2018-02-15 22:32:36 UTC (rev 11752)
@@ -0,0 +1,69 @@
+<Template name="spectatorhud">
+ <OverlayGroup name = "spectatorhud" scale = "1, 1">
+ </OverlayGroup>
+</Template>
+<Template name="FlappyOrxHUD">
+ <OverlayGroup name="FlappyOrxHUD" scale = "1, 1">
+
+ <FlappyOrxHUDinfo
+ position = "0.02, 0.01"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+
+ showpoints = true
+ />
+
+ <FlappyOrxHUDinfo
+ position = "0.5, 0.5"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 0.0, 0.0, 1.0"
+ align = "center"
+
+ showmessage = true
+ messageID = 0
+
+ />
+
+ <FlappyOrxHUDinfo
+ position = "0.5, 0.6"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "center"
+
+ showmessage = true
+ messageID = 1
+ />
+ <FlappyOrxHUDinfo
+ position = "0.5, 0.65"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "center"
+
+ showmessage = true
+ messageID = 2
+ />
+ <FlappyOrxHUDinfo
+ position = "0.5, 0.7"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.04
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "center"
+
+ showmessage = true
+ messageID = 3
+
+ />
+
+
+ </OverlayGroup>
+</Template>
Modified: code/branches/Presentation_HS17_merge/data/particle/fire3.particle
===================================================================
--- code/branches/Presentation_HS17_merge/data/particle/fire3.particle 2018-02-15 22:29:31 UTC (rev 11751)
+++ code/branches/Presentation_HS17_merge/data/particle/fire3.particle 2018-02-15 22:32:36 UTC (rev 11752)
@@ -64,9 +64,6 @@
time2 0.4
colour3 0 0 0 0
time3 1
- colour4 0.5 0.5 0.5 0
- time4 1
- colour5 0.5 0.5 0.5 0
- time5 1
+
}
}
Modified: code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt 2018-02-15 22:29:31 UTC (rev 11751)
+++ code/branches/Presentation_HS17_merge/src/modules/CMakeLists.txt 2018-02-15 22:32:36 UTC (rev 11752)
@@ -47,3 +47,4 @@
ADD_SUBDIRECTORY(hover)
ADD_SUBDIRECTORY(superorxobros)
ADD_SUBDIRECTORY(asteroids2D)
+ADD_SUBDIRECTORY(flappyorx)
More information about the Orxonox-commit
mailing list