[Orxonox-commit 6275] r10932 - in code/branches/campaignHS15/data/levels: . templates

[bhatiab at orxonox.net]

Author: bhatiab
Date: 2015-12-07 14:37:44 +0100 (Mon, 07 Dec 2015)
New Revision: 10932

Modified:
   code/branches/campaignHS15/data/levels/expeditionSector.oxw
   code/branches/campaignHS15/data/levels/shuttleAttack.oxw
   code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw
   code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt
Log:
Added the screenshots to the levels, please UPDATE data_extern Branch before starting the campaing/levells!

Modified: code/branches/campaignHS15/data/levels/expeditionSector.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/expeditionSector.oxw	2015-12-07 13:37:04 UTC (rev 10931)
+++ code/branches/campaignHS15/data/levels/expeditionSector.oxw	2015-12-07 13:37:44 UTC (rev 10932)
@@ -1,9 +1,8 @@
-<!--TODO: Rename screenshot as soon as it is in data_extern branch -->
 <LevelInfo
     name = "Expedition to Sector 5C"
     description = "Commander, our scientists are reporting strange binary radio signals from a yet unexplored and thought to be uninhabited region, sector 5C. Explore the sector and get to the bottom of these messages!"
     tags = "mission"
-    screenshot = "missionOne.png"
+    screenshot = "expeditionSector.png"
 />
 
 <?lua

Modified: code/branches/campaignHS15/data/levels/shuttleAttack.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/shuttleAttack.oxw	2015-12-07 13:37:04 UTC (rev 10931)
+++ code/branches/campaignHS15/data/levels/shuttleAttack.oxw	2015-12-07 13:37:44 UTC (rev 10932)
@@ -1,10 +1,9 @@
-<!--TODO: Rename screenshot as soon as it is in data_extern branch -->
 <!--TODO: Shuttle and Stations -->
 <LevelInfo
     name = "Shuttle under Attack"
     description = "The newly discovered hostile alien species is attacking one of our outset stations, Andromeda! There is no protecting it; you have to escort the escape shuttle to a safer location."
     tags = "mission"
-    screenshot = "missionOne.png"
+    screenshot = "shuttleProtect.png"
 />
 
 <?lua

Modified: code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw	2015-12-07 13:37:04 UTC (rev 10931)
+++ code/branches/campaignHS15/data/levels/shuttleRetaliation.oxw	2015-12-07 13:37:44 UTC (rev 10932)
@@ -1,9 +1,8 @@
-<!--TODO: Rename screenshot as soon as it is in data_extern branch -->
 <LevelInfo
     name = "Retaliation"
     description = "This attack cannot be met with no consequences! Commander, we order you to get back to sector 5C and erradicate the alien menace at once!"
     tags = "mission"
-    screenshot = "missionOne.png"
+    screenshot = "retailiation.png"
 />
 
 <?lua

Modified: code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt
===================================================================
--- code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt	2015-12-07 13:37:04 UTC (rev 10931)
+++ code/branches/campaignHS15/data/levels/templates/spaceshipShuttle.oxt	2015-12-07 13:37:44 UTC (rev 10932)
@@ -23,7 +23,7 @@
       <MultiStateEngine position=" 0, 0, 0" template=spaceshipTransporterengine />
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Spaceshiptransporter.mesh" />
+      <Model position="0,0,0" yaw=180 pitch=0 roll=0 scale=10 mesh="Transporterspaceship.mesh" />
     </attached>
     <collisionShapes>
       <!--TODO: real collision shapes -->
@@ -80,12 +80,13 @@
 
     </EffectContainer>
     <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=2 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=2 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=2 name=bltest position=" -80, 25, -85" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     </EffectContainer>
     <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=3 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=3 name=bltest position=" -85, -105, 25" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=3 name=bltest position=" -72, 75, 25" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 85, -105, 25" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 75, 75, 25" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
     </EffectContainer>
     <EffectContainer condition="brake">
       <FadingBillboard mainstate=activity active=false scale=2 position=" 22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />