[Orxonox-commit 367] r2130 - in media: levels particle

[Aurelian at orxonox.net]

Author: Aurelian
Date: 2009-05-11 17:02:15 +0200 (Mon, 11 May 2009)
New Revision: 2130

Modified:
   media/levels/gametype_asteroids.oxw
   media/levels/hudtemplates3.oxw
   media/particle/forcefield.particle
Log:
Asteroids with working timer, HudTemplates Timer added...

Modified: media/levels/gametype_asteroids.oxw
===================================================================
--- media/levels/gametype_asteroids.oxw	2009-05-11 14:19:43 UTC (rev 2129)
+++ media/levels/gametype_asteroids.oxw	2009-05-11 15:02:15 UTC (rev 2130)
@@ -17,7 +17,7 @@
 <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 position="-300,300,0" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+<SpawnPoint position="-300,300,0" name="playerstart" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
 
 
@@ -33,7 +33,7 @@
 
 
 
-<ForceField position="0,-500,0" direction="0,1,0" diameter=1000 velocity=50>
+<ForceField position="0,-500,0" direction="0,1,1" diameter=1000 velocity=50>
   <attached>
     <ParticleEmitter source="Orxonox/forcefield" lifetime=10000 startdelay=0 />
   </attached>         
@@ -44,10 +44,10 @@
 
 
 
-<CheckPoint name=trigger1 position="600,300,0" isdestination=false stayactive=true distance=20 />
+<CheckPoint name=trigger1 position="-300,300,0" scale=5 isdestination=false isfirst=true stayactive=true distance=50 addtime=5 visibility=false />
 
 
-<CheckPoint name=trigger2 position="1000,300,600" isdestination=false stayactive=true distance=20 >
+<CheckPoint name=trigger2 position="1000,300,600" scale=5 isdestination=false stayactive=true distance=50 addtime=5>
   <events>
     <activity>
       <EventListener event=trigger1 />
@@ -56,7 +56,7 @@
 </CheckPoint>
 
 
-<CheckPoint name=trigger3 position="1800,300,800" stayactive=true distance=20 >
+<CheckPoint name=trigger3 position="1800,300,800" stayactive=true distance=50 addtime=5>
   <events>
     <activity>
       <EventListener event=trigger2 />
@@ -64,7 +64,10 @@
   </events>
 </CheckPoint>
 
-<CheckPoint name=trigger4 position="2600,400,1100" stayactive=true distance=20 >
+
+
+
+<CheckPoint name=trigger4 position="2600,400,1100" stayactive=true distance=10 addtime=25>
   <events>
     <activity>
       <EventListener event=trigger3 />
@@ -72,14 +75,21 @@
   </events>
 </CheckPoint>
 
-<CheckPoint name=trigger5 position="3600,300,1400" isdestination=true stayactive=true distance=20 >
-  <events>
-    <activity>
-      <EventListener event=trigger4 />
-    </activity>
-  </events>
-</CheckPoint>
 
 
+<Model position="3600,300,1400" scale=10 mesh="Carrier.mesh">
+  <attached>
+    <CheckPoint position="0,0,0" name=trigger5 stayactive=true distance=50 isdestination=true>
+      <events>
+        <activity>
+          <EventListener event=trigger4 />
+        </activity>
+      </events>
+    </CheckPoint>
+  </attached>
+</Model>
+
+
+
   </Scene>
 </Level>

Modified: media/levels/hudtemplates3.oxw
===================================================================
--- media/levels/hudtemplates3.oxw	2009-05-11 14:19:43 UTC (rev 2129)
+++ media/levels/hudtemplates3.oxw	2009-05-11 15:02:15 UTC (rev 2130)
@@ -83,5 +83,15 @@
      halfDotSizeDistance = 3000
      maximumDotSize      = 0.1
     />
+
+    <HUDTimer
+     name     = "Timer"
+     position = "0.5, 0.85"
+     font     = "VeraMono"
+     textsize = 0.1
+     colour   = "1.0, 1.0, 0.0, 0.8"
+     align    = "center"
+    />
+
   </OverlayGroup>
 </Template>

Modified: media/particle/forcefield.particle
===================================================================
--- media/particle/forcefield.particle	2009-05-11 14:19:43 UTC (rev 2129)
+++ media/particle/forcefield.particle	2009-05-11 15:02:15 UTC (rev 2130)
@@ -1,7 +1,7 @@
 
 Orxonox/forcefield
 {
-	quota	1200
+	quota	10000
 	material	PE/lensflare
 	particle_width	30
 	particle_height	30
@@ -12,16 +12,16 @@
 	emitter Ring
 	{
 		angle	0
-		colour	1 1 1 1
+		colour	1 1 1 0.5
 		colour_range_start	0 0.2 0.3 0
 		colour_range_end	0 0.4 1 0.1
 		direction	0 1 0
-		emission_rate	200
+		emission_rate	100
 		position	0 0 0
 		velocity	100
 		velocity_min	50
 		velocity_max	100
-		time_to_live	30
+		time_to_live	20
 		duration	0
 		duration_min	0
 		duration_max	0
@@ -31,8 +31,8 @@
 		width	500
 		height	500
 		depth	400
-		inner_width	0.5
-		inner_height	0.5
+		inner_width	0.1
+		inner_height	0.1
 	}
 
 }