Changeset 11596 for code/branches
- Timestamp:
- Nov 27, 2017, 2:05:12 PM (7 years ago)
- Location:
- code/branches/FlappyOrx_HS17
- Files:
-
- 6 edited
-
data/levels/FlappyOrx.oxw (modified) (7 diffs)
-
data/levels/Invaders.oxw (modified) (2 diffs)
-
data/levels/templates/spaceshipFlappyOrx.oxt (modified) (6 diffs)
-
data/overlays/FlappyOrxHUD.oxo (modified) (1 diff)
-
src/modules/flappyorx/FlappyOrx.h (modified) (2 diffs)
-
src/modules/flappyorx/FlappyOrxShip.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
r11580 r11596 1 1 <LevelInfo 2 2 name = "Flappy Orx" 3 description = " TODO"3 description = "A clone of the iconic Flappy Bird" 4 4 tags = "minigame" 5 5 screenshot = "orxonoxArcade.png" … … 7 7 8 8 <?lua 9 include("stats.oxo")10 9 include("templates/lodInformation.oxt") 11 ?> 10 include("templates/spaceshipFlappyOrx.oxt") 11 include("overlays/FlappyOrxHUD.oxo") 12 12 13 <?lua14 include("templates/spaceshipAssff2.oxt")15 include("templates/spaceshipPirate.oxt")16 include("templates/spaceshipFlappyOrx.oxt")17 include("templates/enemyFlappyOrx.oxt")18 include("overlays/FlappyOrxHUD.oxo")19 13 ?> 20 14 … … 26 20 <Template link=lodtemplate_default /> 27 21 </templates> 28 <?lua include("includes/notifications.oxi") ?>29 22 30 <!-- ambientlight = "0.8, 0.8, 0.8"31 skybox = "Orxonox/Starbox" -->32 23 <Scene 33 24 ambientlight = "0.8, 0.7, 0.4" 34 25 skybox = "Orxonox/skyBoxBasic" 35 26 > 36 37 27 <WorldAmbientSound 38 28 source="Earth.ogg" … … 41 31 /> 42 32 43 <!-- <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"/> --> 44 <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" /> 33 <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" /> 45 34 <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx /> 46 35 … … 48 37 <FlappyOrxCenterPoint name=flappyorxcenter /> 49 38 50 51 52 39 <?lua 53 40 for i = 1, 5, 1 do … … 55 42 ?> 56 43 57 <Template name=Asteroid<?lua print(j) ?>_<?lua print(i) ?>>58 <MovableEntity59 collisionType = dynamic60 linearDamping = 0.861 angularDamping = 062 scale = "<?lua print(j) ?>"63 collisiondamage = 1000064 enablecollisiondamage = true65 >66 67 <attached>68 <Model mass="1000" mesh="ast<?lua print(i) ?>.mesh" />69 </attached>70 <collisionShapes>71 <SphereCollisionShape radius="<?lua print(j + 5) ?>" />72 </collisionShapes>73 </MovableEntity>74 </Template>44 <Template name=Asteroid<?lua print(j) ?>_<?lua print(i) ?>> 45 <MovableEntity 46 collisionType = dynamic 47 linearDamping = 0.8 48 angularDamping = 0 49 scale = "<?lua print(j) ?>" 50 collisiondamage = 10000 51 enablecollisiondamage = true 52 > 53 54 <attached> 55 <Model mass="1000" mesh="ast<?lua print(i) ?>.mesh" /> 56 </attached> 57 <collisionShapes> 58 <SphereCollisionShape radius="<?lua print(j + 5) ?>" /> 59 </collisionShapes> 60 </MovableEntity> 61 </Template> 75 62 76 63 <?lua … … 78 65 end 79 66 ?> 80 81 <!--82 <?lua83 for i = 1, 30, 1 do84 j = math.random()85 ?>86 87 <MovableEntity88 position = "<?lua print(i* 300) ?>,0, <?lua print(j* 200) ?>"89 collisionType = dynamic90 linearDamping = 0.891 angularDamping = 092 scale = "<?lua print(10)?>"93 collisiondamage = 10000094 enablecollisiondamage = true95 >96 97 <attached>98 <Model mass="1000" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />99 </attached>100 <collisionShapes>101 <SphereCollisionShape radius="<?lua print(10) ?>" />102 </collisionShapes>103 </MovableEntity>104 105 <MovableEntity106 position = "<?lua print(i* 300) ?>,0,<?lua print(-150 + j* 200) ?>"107 collisionType = dynamic108 linearDamping = 0.8109 angularDamping = 0110 scale = "<?lua print(10)?>"111 collisiondamage = 100000112 enablecollisiondamage = true113 >114 115 <attached>116 <Model mass="1000" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />117 </attached>118 <collisionShapes>119 <SphereCollisionShape radius="<?lua print(10) ?>" />120 </collisionShapes>121 </MovableEntity>122 123 <?lua124 end125 ?>126 -->127 128 129 67 </Scene> 130 68 </Level> -
code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw
r11589 r11596 49 49 50 50 <InvaderCenterPoint name=invadercenter /> 51 <?lua 52 for i = 1, 30, 1 do 53 j = math.random() 54 ?> 55 56 <MovableEntity 57 position = "<?lua print(i* 3000) ?>,0, <?lua print(j* 200) ?>" 51 52 <MovableEntity 53 position = "3000,0,0" 58 54 collisionType = dynamic 59 55 linearDamping = 0.8 60 56 angularDamping = 0 61 scale = " <?lua print(10)?>"57 scale = "10" 62 58 collisiondamage = 0 63 59 enablecollisiondamage = true … … 65 61 66 62 <attached> 67 <Model mass="1000" mesh="ast <?lua print( math.mod(i,6) + 1) ?>.mesh" />63 <Model mass="1000" mesh="ast6.mesh" /> 68 64 </attached> 69 65 <collisionShapes> 70 <SphereCollisionShape radius=" <?lua print(10) ?>" />66 <SphereCollisionShape radius="10" /> 71 67 </collisionShapes> 72 68 </MovableEntity> 73 69 74 <MovableEntity75 position = "<?lua print(i* 3000) ?>,0,<?lua print(-150 + j* 200) ?>"76 collisionType = dynamic77 linearDamping = 0.878 angularDamping = 079 scale = "<?lua print(10)?>"80 collisiondamage = 081 enablecollisiondamage = true82 >83 70 84 <attached>85 <Model mass="1000" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />86 </attached>87 <collisionShapes>88 <SphereCollisionShape radius="<?lua print(10) ?>" />89 </collisionShapes>90 </MovableEntity>91 92 <?lua93 end94 ?>95 71 96 72 </Scene> -
code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
r11580 r11596 1 1 <Template name=spaceshipFlappyOrx> 2 2 <FlappyOrxShip 3 hudtemplate = spaceshiphud 3 4 4 camerapositiontemplate = spaceshipescortcameras 5 5 spawnparticlesource = "Orxonox/fairytwirl" 6 spawnparticleduration = 3 7 explosionchunks = 4 6 spawnparticleduration = 6 8 7 9 8 health = 80 … … 11 10 initialhealth = 80 12 11 13 shieldhealth = 3514 initialshieldhealth = 3515 maxshieldhealth = 6016 shieldabsorption = 0.917 shieldrechargerate = 118 shieldrechargewaittime = 119 20 12 primaryThrust = 150 21 13 auxilaryThrust = 30 22 14 rotationThrust = 50 23 24 lift = 1;25 stallSpeed = 220;26 27 boostPower = 2028 boostPowerRate = 129 boostRate = 530 boostCooldownDuration = 1031 32 shakeFrequency = 1533 shakeAmplitude = 634 15 35 16 collisionType = "dynamic" … … 51 32 <attached> 52 33 <Model position="0,0,0" yaw=180 pitch=90 roll=270 scale=9 mesh="FlappyOrxShip.mesh" /> 53 <!-- <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" /> --> 54 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" /> 55 <Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" /> 56 <Model mesh="cube.mesh" mass=10 position="-12.6,-2,3" scale3D="2.8,2.8,11" /> 57 <Model mesh="cube.mesh" mass=10 position="0,0,-12" scale3D="4,4,7" /--> 34 58 35 </attached> 59 36 <collisionShapes> … … 62 39 <SphereCollisionShape position="0 ,0 , 11" radius="12.5" /> 63 40 </collisionShapes> 64 <explosion > 65 <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" /> 66 <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" /> 67 <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" /> 68 69 <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" /> 70 <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" /> 71 <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" /> 72 <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" /> 73 <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" /> 74 </explosion> 75 <?lua 76 include("../includes/FlappyOrxWeapon.oxi") 77 ?> 41 78 42 </FlappyOrxShip> 79 43 </Template> … … 82 46 <FlappyOrxShip> 83 47 <camerapositions> 84 <!-- <CameraPosition position="0,15, 60" drag=true mouselook=true />85 <CameraPosition position="0,20, 90" drag=true mouselook=true />86 <CameraPosition position="0,30,120" drag=true mouselook=true /> -->87 48 <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false absolute=true mouselook=true /> 88 49 </camerapositions> … … 90 51 </Template> 91 52 92 <Template name=spaceshipFlappyOrxengine baseclass=MultiStateEngine>93 <MultiStateEngine94 boostfactor = 2.295 96 speedfront = 20097 speedback = 7098 speedleftright = 7099 speedupdown = 70100 101 defEngineSndNormal = "sounds/Engine_low.ogg"102 defEngineSndBoost = "sounds/Engine_high.ogg"103 104 accelerationfront = 700105 accelerationbrake = 700106 accelerationback = 125107 accelerationleftright = 125108 accelerationupdown = 125109 >110 <EffectContainer condition="idle">111 <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>112 </EffectContainer>113 <EffectContainer condition="not idle">114 <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 />115 <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 />116 </EffectContainer>117 <EffectContainer condition="normal or brake">118 119 </EffectContainer>120 <EffectContainer condition="normal or boost">121 <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" />122 <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" />123 </EffectContainer>124 <EffectContainer condition="boost">125 <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" />126 <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" />127 </EffectContainer>128 129 </MultiStateEngine>130 </Template> -
code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo
r11576 r11596 1 <Template name="spectatorhud">2 <OverlayGroup name = "spectatorhud" scale = "1, 1">3 </OverlayGroup>4 </Template>5 6 1 <Template name="FlappyOrxHUD"> 7 2 <OverlayGroup name="FlappyOrxHUD" scale = "1, 1"> -
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
r11595 r11596 168 168 "You should really try that again", 169 169 "You can do better, can you?", 170 "Hey maybe you get a participation award, that's good isn't it?",170 "Hey, maybe you get a participation award, that's good isn't it?", 171 171 "Congratulations, you get a medal, a wooden one", 172 172 "That was flappin bad!", 173 "Getting closer to something",174 173 "Well, that was a waste of time"}; 175 174 std::vector<std::string> DeathMessage30 = { … … 179 178 "That was somehow enjoyable to watch", 180 179 "Flappin average", 180 "Getting closer to something", 181 181 "That wasn't crap, not bad"}; 182 182 std::vector<std::string> DeathMessage50 = { -
code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
r11595 r11596 123 123 } 124 124 125 void FlappyOrxShip::moveFrontBack(const Vector2& value)126 {127 128 }129 130 void FlappyOrxShip::moveRightLeft(const Vector2& value){}131 132 125 int FlappyOrxShip::timeUntilRespawn(){ 133 126 return 2-time(0)+deathTime;
Note: See TracChangeset
for help on using the changeset viewer.
