Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11596


Ignore:
Timestamp:
Nov 27, 2017, 2:05:12 PM (7 years ago)
Author:
merholzl
Message:

Cleanup of level files

Location:
code/branches/FlappyOrx_HS17
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

    r11580 r11596  
    11<LevelInfo
    22 name = "Flappy Orx"
    3  description = "TODO"
     3 description = "A clone of the iconic Flappy Bird"
    44 tags = "minigame"
    55 screenshot = "orxonoxArcade.png"
     
    77
    88<?lua
    9   include("stats.oxo")
    109  include("templates/lodInformation.oxt")
    11 ?>
     10  include("templates/spaceshipFlappyOrx.oxt")
     11  include("overlays/FlappyOrxHUD.oxo")
    1212
    13 <?lua
    14   include("templates/spaceshipAssff2.oxt")
    15   include("templates/spaceshipPirate.oxt")
    16   include("templates/spaceshipFlappyOrx.oxt")
    17   include("templates/enemyFlappyOrx.oxt")
    18   include("overlays/FlappyOrxHUD.oxo")
    1913?>
    2014
     
    2620    <Template link=lodtemplate_default />
    2721  </templates>
    28   <?lua include("includes/notifications.oxi") ?>
    2922
    30     <!-- ambientlight = "0.8, 0.8, 0.8"
    31     skybox       = "Orxonox/Starbox" -->
    3223  <Scene
    3324    ambientlight = "0.8, 0.7, 0.4"
    3425    skybox     = "Orxonox/skyBoxBasic"
    3526  >
    36 
    3727  <WorldAmbientSound
    3828    source="Earth.ogg"
     
    4131  />
    4232
    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" />
    4534    <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
    4635
     
    4837    <FlappyOrxCenterPoint name=flappyorxcenter />
    4938   
    50 
    51 
    5239    <?lua
    5340      for i = 1, 5, 1 do
     
    5542    ?>
    5643
    57     <Template name=Asteroid<?lua print(j) ?>_<?lua print(i) ?>>
    58       <MovableEntity
    59         collisionType = dynamic
    60         linearDamping = 0.8
    61         angularDamping = 0
    62         scale = "<?lua print(j) ?>"
    63         collisiondamage = 10000
    64         enablecollisiondamage = true
    65       >
    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>
    7562
    7663    <?lua
     
    7865      end
    7966    ?>
    80 
    81     <!--
    82      <?lua
    83       for i = 1, 30, 1 do
    84         j = math.random()
    85     ?>
    86 
    87     <MovableEntity
    88       position = "<?lua print(i* 300) ?>,0, <?lua print(j* 200) ?>"
    89       collisionType = dynamic
    90       linearDamping = 0.8
    91       angularDamping = 0
    92       scale = "<?lua print(10)?>"
    93       collisiondamage = 100000
    94       enablecollisiondamage = true
    95     >
    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      <MovableEntity
    106       position = "<?lua print(i* 300) ?>,0,<?lua print(-150 + j* 200) ?>"
    107       collisionType = dynamic
    108       linearDamping = 0.8
    109       angularDamping = 0
    110       scale = "<?lua print(10)?>"
    111       collisiondamage = 100000
    112       enablecollisiondamage = true
    113     >
    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     <?lua
    124       end
    125     ?>
    126   -->
    127    
    128    
    12967  </Scene>
    13068</Level>
  • code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw

    r11589 r11596  
    4949   
    5050    <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"
    5854      collisionType = dynamic
    5955      linearDamping = 0.8
    6056      angularDamping = 0
    61       scale = "<?lua print(10)?>"
     57      scale = "10"
    6258      collisiondamage = 0
    6359      enablecollisiondamage = true
     
    6561   
    6662      <attached>
    67         <Model mass="1000" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
     63        <Model mass="1000" mesh="ast6.mesh" />
    6864      </attached>
    6965      <collisionShapes>
    70         <SphereCollisionShape radius="<?lua print(10) ?>" />
     66        <SphereCollisionShape radius="10" />
    7167      </collisionShapes>
    7268    </MovableEntity>
    7369
    74      <MovableEntity
    75       position = "<?lua print(i* 3000) ?>,0,<?lua print(-150 + j* 200) ?>"
    76       collisionType = dynamic
    77       linearDamping = 0.8
    78       angularDamping = 0
    79       scale = "<?lua print(10)?>"
    80       collisiondamage = 0
    81       enablecollisiondamage = true
    82     >
    8370   
    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     <?lua
    93       end
    94     ?>
    9571   
    9672  </Scene>
  • code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt

    r11580 r11596  
    11<Template name=spaceshipFlappyOrx>
    22  <FlappyOrxShip
    3    hudtemplate            = spaceshiphud
     3
    44   camerapositiontemplate = spaceshipescortcameras
    55   spawnparticlesource    = "Orxonox/fairytwirl"
    6    spawnparticleduration  = 3
    7    explosionchunks        = 4
     6   spawnparticleduration  = 6
    87
    98   health            = 80
     
    1110   initialhealth     = 80
    1211
    13    shieldhealth        = 35
    14    initialshieldhealth = 35
    15    maxshieldhealth     = 60
    16    shieldabsorption    = 0.9
    17    shieldrechargerate  = 1
    18    shieldrechargewaittime = 1
    19 
    2012   primaryThrust     = 150
    2113   auxilaryThrust    = 30
    2214   rotationThrust    = 50
    23 
    24    lift = 1;
    25    stallSpeed = 220;
    26 
    27    boostPower            = 20
    28    boostPowerRate        = 1
    29    boostRate             = 5
    30    boostCooldownDuration = 10
    31 
    32    shakeFrequency = 15
    33    shakeAmplitude = 6
    3415
    3516   collisionType     = "dynamic"
     
    5132    <attached>
    5233      <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   
    5835    </attached>
    5936    <collisionShapes>
     
    6239      <SphereCollisionShape position="0   ,0 ,  11" radius="12.5" />
    6340    </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 
    7842  </FlappyOrxShip>
    7943</Template>
     
    8246  <FlappyOrxShip>
    8347    <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 /> -->
    8748      <CameraPosition position="0,300,-100" direction="0, -1, 0" drag=false absolute=true mouselook=true />
    8849    </camerapositions>
     
    9051</Template>
    9152
    92 <Template name=spaceshipFlappyOrxengine baseclass=MultiStateEngine>
    93   <MultiStateEngine
    94    boostfactor    = 2.2
    95 
    96    speedfront     = 200
    97    speedback      =  70
    98    speedleftright =  70
    99    speedupdown    =  70
    100 
    101    defEngineSndNormal = "sounds/Engine_low.ogg"
    102    defEngineSndBoost = "sounds/Engine_high.ogg"
    103 
    104    accelerationfront     = 700
    105    accelerationbrake     = 700
    106    accelerationback      =  125
    107    accelerationleftright =  125
    108    accelerationupdown    =  125
    109   >
    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 
    61<Template name="FlappyOrxHUD">
    72  <OverlayGroup name="FlappyOrxHUD" scale = "1, 1">
  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

    r11595 r11596  
    168168                "You should really try that again",
    169169                "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?",
    171171                "Congratulations, you get a medal, a wooden one",
    172172                "That was flappin bad!",
    173                 "Getting closer to something",
    174173                "Well, that was a waste of time"};
    175174            std::vector<std::string> DeathMessage30 = {
     
    179178                "That was somehow enjoyable to watch",
    180179                "Flappin average",
     180                "Getting closer to something",
    181181                "That wasn't crap, not bad"};
    182182            std::vector<std::string> DeathMessage50 = {
  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

    r11595 r11596  
    123123    }
    124124
    125     void FlappyOrxShip::moveFrontBack(const Vector2& value)
    126     {
    127 
    128     }
    129 
    130     void FlappyOrxShip::moveRightLeft(const Vector2& value){}
    131 
    132125    int FlappyOrxShip::timeUntilRespawn(){
    133126        return 2-time(0)+deathTime;
Note: See TracChangeset for help on using the changeset viewer.