[Orxonox-commit 3819] r8496 - code/trunk/data/levels

[youngk at orxonox.net]

Author: youngk
Date: 2011-05-16 21:01:09 +0200 (Mon, 16 May 2011)
New Revision: 8496

Modified:
   code/trunk/data/levels/earth.oxw
   code/trunk/data/levels/planets.oxw
Log:
Adjusted atmosphere size and added collision damage to planets.

Modified: code/trunk/data/levels/earth.oxw
===================================================================
--- code/trunk/data/levels/earth.oxw	2011-05-16 18:09:23 UTC (rev 8495)
+++ code/trunk/data/levels/earth.oxw	2011-05-16 19:01:09 UTC (rev 8496)
@@ -68,8 +68,10 @@
       atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
-      atmospheresize="300.0f"
+      atmospheresize="80.0f"
       imagesize="1024.0f"
+      collisiondamage = 2
+      enablecollisiondamage = true
     >
       <attached>
         <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
@@ -92,8 +94,10 @@
       atmosphere="atmosphere1"
       rotationaxis="0,1,0"
       rotationrate="0.2"
-      atmospheresize="300.0f"
+      atmospheresize="80.0f"
       imagesize="1024.0f"
+      collisiondamage = 2
+      enablecollisiondamage = true
     >
       <attached>
         <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
@@ -106,6 +110,6 @@
 
     <!-- Create portals from Earth to the Moon -->
     <PortalLink fromID="1" toID="2" />
-    <!--<PortalLink fromID="2" toID="1" />-->
+    <PortalLink fromID="2" toID="1" />
   </Scene>
 </Level>

Modified: code/trunk/data/levels/planets.oxw
===================================================================
--- code/trunk/data/levels/planets.oxw	2011-05-16 18:09:23 UTC (rev 8495)
+++ code/trunk/data/levels/planets.oxw	2011-05-16 19:01:09 UTC (rev 8496)
@@ -57,8 +57,10 @@
       atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="300.0f"
+      atmospheresize="80.0f"
       imagesize="1024.0f"
+      collisiondamage = 2
+      enablecollisiondamage = true
     >
       <attached>
         <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
@@ -80,8 +82,10 @@
       atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="224.0f"
+      atmospheresize="80.0f"
       imagesize="1024.0f"
+      collisiondamage = 2
+      enablecollisiondamage = true
     >
       <attached>
         <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />