[Orxonox-commit 3206] r7899 - in code/branches/lastmanstanding2: data/levels data/overlays src/orxonox/gametypes

[jo at orxonox.net]

Author: jo
Date: 2011-02-15 11:41:02 +0100 (Tue, 15 Feb 2011)
New Revision: 7899

Modified:
   code/branches/lastmanstanding2/data/levels/lastManStanding.oxw
   code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo
   code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo
   code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc
Log:
Level polishing.

Modified: code/branches/lastmanstanding2/data/levels/lastManStanding.oxw
===================================================================
--- code/branches/lastmanstanding2/data/levels/lastManStanding.oxw	2011-02-15 10:37:15 UTC (rev 7898)
+++ code/branches/lastmanstanding2/data/levels/lastManStanding.oxw	2011-02-15 10:41:02 UTC (rev 7899)
@@ -37,31 +37,25 @@
 <Bot />
 
 <!-- ------------ middle asteroid -------------- -->
-    <StaticEntity position="0,20,0" collisionType=static>
-       <attached>
-           <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
-           <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
-       </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="145" />
-      </collisionShapes>
+    <StaticEntity position="0,0,0" collisionType=static>    
+        <attached>
+            <MovableEntity position="0,20,0" rotationrate="-4.5" rotationaxis="0,1,0" >
+                <attached>
+                    <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
+                    <Model position="-160,40,28.4" scale=1 mesh="sphere.mesh" /><!--EasterEgg indicator-->
+                    <PickupSpawner position="-160,40,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="15"><!--EasterEgg-->
+                        <pickup>
+                            <InvisiblePickup template=hugeinvisiblepickup />
+                        </pickup>
+                    </PickupSpawner>
+                </attached>
+            </MovableEntity>
+        </attached>
+        <collisionShapes>
+            <SphereCollisionShape radius="145" />
+        </collisionShapes>
     </StaticEntity>
 
-    <PickupSpawner position="-160,65,10" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=mediuminvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <PickupSpawner position="-160,60,17" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=hugeinvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-      </attached>
-    </StaticEntity>
 
 <!-- ---------------asteroid dome----------------- -->
 <?lua
@@ -137,7 +131,7 @@
     </StaticEntity>
 
 
-<?lua end ?>
+<?lua end ?><!-- ---------------asteroid dome END------------------->
 
   </Scene>
 </Level>

Modified: code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo
===================================================================
--- code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo	2011-02-15 10:37:15 UTC (rev 7898)
+++ code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo	2011-02-15 10:41:02 UTC (rev 7899)
@@ -64,7 +64,7 @@
      showplayers     = true
     />
 
-    <OverlayText
+    <!--OverlayText
      position  = "0.02, 0.07"
      pickpoint = "0.0, 0.0"
      font      = "ShareTechMono"
@@ -92,7 +92,7 @@
      colour    = "1.0, 1.0, 1.0, 1.0"
      align     = "left"
      caption   = "|"
-    />
+    /-->
 
   </OverlayGroup>
 </Template>

Modified: code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo
===================================================================
--- code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo	2011-02-15 10:37:15 UTC (rev 7898)
+++ code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo	2011-02-15 10:41:02 UTC (rev 7899)
@@ -1,7 +1,7 @@
-<Template name="LastteamstandingHUD">
-  <OverlayGroup name="LastteamstandingHUD" scale = "1, 1">
+<Template name="lastTeamStandingHUD">
+  <OverlayGroup name="lastTeamStandingHUD" scale = "1, 1">
 
-<GametypeFadingMessage
+<GametypeFadingMessag
      name     = "fadingmessage"
      position = "0.5, 0.01"
      font     = "VeraMono"
@@ -54,35 +54,5 @@
      showteams     = true
     />
 
-    <OverlayText
-     position  = "0.02, 0.07"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-     caption   = "__________|"
-    />
-
-    <OverlayText
-     position  = "0.022, 0.07"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-     caption   = "__________"
-    />
-
-    <OverlayText
-     position  = "0.1733, 0.038"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-     caption   = "|"
-    />
-
   </OverlayGroup>
 </Template>

Modified: code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc
===================================================================
--- code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc	2011-02-15 10:37:15 UTC (rev 7898)
+++ code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc	2011-02-15 10:41:02 UTC (rev 7899)
@@ -34,7 +34,6 @@
 #include "worldentities/pawns/Pawn.h"
 #include "core/ConfigValueIncludes.h"
 #include "util/Convert.h"
-//TODO: teamsAlive instead of playersAlive
 
 namespace orxonox
 {
@@ -53,6 +52,7 @@
         this->punishDamageRate = 0.4f;
         this->timeRemaining = 15.0f;
         this->respawnDelay = 4.0f;
+        this->setHUDTemplate("lastTeamStandingHUD");
     }
     
     LastTeamStanding::~LastTeamStanding()