Changeset 7023

Timestamp:

May 30, 2010, 4:36:43 PM (14 years ago)

Author:

dafrick

Message:

Made gametype_asteroids level easier to play and erased some debug output in TeamDeathmatch.

Location:

code/branches/presentation3

Files:

• data/levels/gametype_asteroids.oxw (modified) (5 diffs)
• src/orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)

code/branches/presentation3/data/levels/gametype_asteroids.oxw

@@ -143 +143 @@
 
 
-    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=13 />
-
-
-    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
+    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=26 />
+
+
+    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
       <events>
         <activity>
@@ -197 +197 @@
 
 
-    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
+    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
       <events>
         <activity>
@@ -248 +248 @@
 
 
-    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
+    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
       <events>
         <activity>
@@ -299 +299 @@
 
 
-    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=8>
+    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=18>
       <events>
         <activity>
@@ -350 +350 @@
 
 
-    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
+    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=20>
       <events>
         <activity>

code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -159 +159 @@
                 if(!(*it)->isActive())
                 {
-                    COUT(1) << (*it)->getName() << " is inactive." << std::endl;
                     teamSpawnPoints.erase(it++);
                     continue;
                 }
-                COUT(1) << (*it)->getName() << " is active." << std::endl;
 
                 ++it;
             }
-
-            COUT(1) << "MUP " << teamSpawnPoints.size() << std::endl;
 
             randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size())));