[Orxonox-commit 6091] r10749 - code/branches/campaignHS15/data/levels

[bhatiab at orxonox.net]

Author: bhatiab
Date: 2015-11-02 14:25:06 +0100 (Mon, 02 Nov 2015)
New Revision: 10749

Modified:
   code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Added planets, changed skybox, fixed asteroids, changed starting spaceschip, removed unneccessary code

Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-02 13:10:11 UTC (rev 10748)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw	2015-11-02 13:25:06 UTC (rev 10749)
@@ -9,14 +9,10 @@
     include("stats.oxo")
     include("HUDTemplates3.oxo")
     include("templates/lodInformation.oxt")
-?>
 
-<?lua
     include("templates/spaceshipAssff2.oxt")
     include("templates/spaceshipPirate.oxt")
     include("templates/spaceshipEscort.oxt")
-    include("templates/spaceshipRing.oxt")
-    include("templates/spaceshipSwallow.oxt")
     include("templates/spaceshipTransporter.oxt")
     include("templates/FPS.oxt")
 ?>
@@ -49,11 +45,11 @@
 
     <Scene
         ambientlight = "0.8, 0.8, 0.8"
-        skybox = "Orxonox/Starbox"
+        skybox = "Orxonox/skyBoxMoreNebula"
         hasPhysics = true
     >
 
-    <SpawnPoint name="playerSpawn" team=0 position="0,-50,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
+    <SpawnPoint name="playerSpawn" team=0 position="0,-50,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
     <WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
 
@@ -571,18 +567,21 @@
         </collisionShapes>
     </StaticEntity>
 
-    <ForceField position="0,-2300,1001" direction="0,0,1" mode="homogen" diameter="400" forcedirection = "0,0,-500" />
-
     <!--ELEMENTS -->
 
     <?lua
         dofile("includes/asteroidField.lua")
-        asteroidBelt(0,-2000, 0, 30, 0, 5, 20, 40, 500, 3300, 75, 0)
+       asteroidField(2500, 400, 0, 20, 30, 2200, 250, 0)
     ?>
 
+    <?lua
+        dofile("includes/asteroidField.lua")
+       asteroidField(-2500, 400, 0, 20, 30, 2200, 250, 0)
+    ?>
+
     <Planet
-        position="5000,0,0"
-        scale="1000"
+        position="15000,8000,-2000"
+        scale="2000"
         collisionType="dynamic"
         linearDamping="0.8"
         angularDamping="0"
@@ -598,18 +597,48 @@
         enablecollisiondamage = true
       >
       <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="2000" velocity="-500" />
+        <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
         </attached>
           <collisionShapes>
-            <SphereCollisionShape radius="1000" position="0,0,0" />
+            <SphereCollisionShape radius="2000" position="0,0,0" />
       </collisionShapes>
     </Planet>
 
     <?lua
         dofile("includes/asteroidField.lua")
-        asteroidBelt(5000, 0, 0, 30, 0, 30, 5, 10, 1400, 1500, 200, 1)
+        asteroidBelt(15000, 8000, -2000, 30, 0, 30, 20, 40, 2800, 3000, 200, 1)
     ?>
 
+    <Planet
+        position="-1000,-20000,4000"
+        scale="3000"
+        collisionType="dynamic"
+        linearDamping="0.8"
+        angularDamping="0"
+        mass="5000000"
+        pitch="0"
+        mesh="planets/planet3.mesh"
+        atmosphere="atmosphere1"
+        rotationaxis="1,0,0"
+        rotationrate="1.0"
+        atmospheresize="80.0f"
+        imagesize="1024.0f"
+        collisiondamage = 2
+        enablecollisiondamage = true
+      >
+      <attached>
+        <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
+        </attached>
+          <collisionShapes>
+            <SphereCollisionShape radius="3000" position="0,0,0" />
+      </collisionShapes>
+    </Planet>
+
+    <?lua
+        dofile("includes/asteroidField.lua")
+        asteroidBelt(-1000, -20000, 4000, 30, 20, 100, 20, 40, 3400, 3700, 400, 1)
+    ?>
+
     <!-- Allies, 3000,-2000 -->
     <?lua
     for i = 1, allies, 1