[Orxonox-commit 6636] r11275 - in code/branches/BigShip_HS16/data/levels: . templates

[pschefer at orxonox.net]

Author: pschefer
Date: 2016-11-07 16:04:07 +0100 (Mon, 07 Nov 2016)
New Revision: 11275

Modified:
   code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw
   code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt
Log:
explosion parts

Modified: code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw
===================================================================
--- code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw	2016-11-07 15:02:03 UTC (rev 11274)
+++ code/branches/BigShip_HS16/data/levels/endurancetestlevel.oxw	2016-11-07 15:04:07 UTC (rev 11275)
@@ -30,11 +30,11 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="-100,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 
-    <MovableEntity position="0,0,0" >
+    <SpaceShip position="0,0,0" >
       <templates>
         <Template link=endurance/>
       </templates>
-    </MovableEntity>
+    </SpaceShip>
 
     
   </Scene>

Modified: code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt
===================================================================
--- code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt	2016-11-07 15:02:03 UTC (rev 11274)
+++ code/branches/BigShip_HS16/data/levels/templates/endurancetest_template.oxt	2016-11-07 15:04:07 UTC (rev 11275)
@@ -1,7 +1,9 @@
 <Template name=endurance>
 
 
-	<ModularSpaceShip collisionType=kinematic mass=10000 lineardamping=0.99 angularDamping=0.99 rotationaxis = "1,0,0" explosionchunks = 12 >
+	<ModularSpaceShip collisionType=dynamic mass=10000 lineardamping=0.99 angularDamping=0.99 rotationaxis = "1,0,0" explosionchunks = 12 health            = 100
+   maxhealth         = 200
+   initialhealth     = 100>
 	
 
 	<!-- Test endurance -->