Changeset 10963 for code/branches/presentationHS15/data/levels

Timestamp:

Dec 9, 2015, 4:56:39 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and particleEffects branches. Added a new level, spaceshiptemplate and weaponsettings for the mine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/includes/weaponSettingsAssff2.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsEscortMine.oxi (added)
• data/levels/mineLevel.oxw (added)
• data/levels/pong.oxw (modified) (1 diff)
• data/levels/templates/spaceshipEscort.oxt (modified) (2 diffs)
• data/levels/templates/spaceshipEscortMine.oxt (added)

code/branches/presentationHS15/data/levels/emptyLevel.oxw

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipEscort.oxt")
-  include("templates/spaceshipHover.oxt")
 ?>
 
@@ -32 +30 @@
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
-    <SpaceShip
-        team                = "1"
-        position            = "1000,0,0"
-        >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>         
-    </SpaceShip>
-    <SpaceShip
-        team                = "1"
-        position            = "1000,200,0"
-        >
-        <templates>
-          <Template link=spaceshiphover />
-        </templates>
-                    
-    </SpaceShip>
-    <SpaceShip
-        team                = "1"
-        position            = "1000,400,0"
-        >
-        <templates>
-          <Template link=spaceshipescort />
-        </templates>
-
         
-                    
-    </SpaceShip>
-    
   </Scene>
 </Level>

code/branches/presentationHS15/data/levels/includes/weaponSettingsAssff2.oxi

@@ -1 @@
-    <weaponslots>
+t    <weaponslots>
       <WeaponSlot position="-15.0,-1.5,0" />
       <WeaponSlot position=" 15.0,-1.5,0" />

code/branches/presentationHS15/data/levels/pong.oxw

@@ -43 +43 @@
       <Backlight scale=0.2 colour="1.0, 1.0, 0.5" width=7 length=500 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" />
       <Light type=point diffuse="1.0, 1.0, 0.5" specular="1.0, 1.0, 0.5" attenuation="1200, 1.0, 0.0035, 0.00005" />
-      <ParticleSpawner name=hiteffect position="0,0,0" source="Orxonox/sparks2" lifetime=0.01 autostart=0 mainstate=spawn />
+      <ParticleSpawner name=hiteffect position="0,0,0" source="Orxonox/engineglow" lifetime=0.01 autostart=0 mainstate=spawn />
     </attached>
     <eventlisteners>

code/branches/presentationHS15/data/levels/templates/spaceshipEscort.oxt

@@ -104 +104 @@
     <EffectContainer condition="idle">
       <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+       />
+
+           <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=150 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
+
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 0.5, 0.65, 1.0" width=15 length=15 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=2 turnofftime=1 material="Flares/ThrusterFlare1" />
+
     </EffectContainer>
     <EffectContainer condition="not idle">
@@ -112 +118 @@
 
     </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" />
+        
+        
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position=" 12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=5 length=1500 lifetime=2 elements=1 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+
+      <Backlight mainstate=activity active=false scale=0.33 name=bltest position="-12, -2, 14" colour="0.2, 1.0, 0.65, 1.0" width=15 length=1500 lifetime=2 elements=1 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" />