Changeset 10617 for code/branches/presentationFS15merge/data/levels

Timestamp:

Oct 4, 2015, 2:18:02 PM (9 years ago)

Author:

landauf

Message:

added new levels and modified ship definitions from branch presentationFS15

Location:

code/branches/presentationFS15merge/data/levels

Files:

• clangenb.oxw (modified) (1 diff)
• includes/weaponSettingsFS15.oxi (copied) (copied from code/branches/presentationFS15/data/levels/includes/weaponSettingsFS15.oxi)
• includes/weaponSettingsHeartAttack.oxi (modified) (1 diff)
• includes/weaponSettingsRing.oxi (copied) (copied from code/branches/presentationFS15/data/levels/includes/weaponSettingsRing.oxi)
• presentationFS15.oxw (copied) (copied from code/branches/presentationFS15/data/levels/presentationFS15.oxw)
• simone.oxw (copied) (copied from code/branches/presentationFS15/data/levels/simone.oxw)
• templates/spaceshipFS15.oxt (copied) (copied from code/branches/presentationFS15/data/levels/templates/spaceshipFS15.oxt)
• templates/spaceshipHeartAttack.oxt (modified) (2 diffs)
• templates/spaceshipRing.oxt (copied) (copied from code/branches/presentationFS15/data/levels/templates/spaceshipRing.oxt)

code/branches/presentationFS15merge/data/levels/clangenb.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "Empty level"
+ name = "clangenb"
  description = "A level with absolutely nothing in it."
  tags = "test"

code/branches/presentationFS15merge/data/levels/includes/weaponSettingsHeartAttack.oxi

@@ -35 +35 @@
           <LaserFire mode=1 munitionpershot=0 muzzleoffset="-2.2,6,16" damage=30 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+          <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
         </Weapon>
         <Weapon>

code/branches/presentationFS15merge/data/levels/templates/spaceshipHeartAttack.oxt

@@ -2 +2 @@
   <SpaceShip
    hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
+   camerapositiontemplate = spaceshipheartattackcameras
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
@@ -69 +69 @@
 </Template>
 
-<Template name=spaceshipassffcameras defaults=0>
+<Template name=spaceshipheartattackcameras defaults=0>
   <SpaceShip>
     <camerapositions>
-      <CameraPosition position="0,10, 40" drag=true mouselook=true />
+      <CameraPosition position="0,12, 48" drag=true mouselook=true />
       <CameraPosition position="0,20, 80" drag=true mouselook=true />
       <CameraPosition position="0,30,120" drag=true mouselook=true />