Changeset 3086 for code/trunk

Timestamp:

May 27, 2009, 1:44:48 AM (16 years ago)

Author:

landauf

Message:

added bot-support for TeamBaseMatch (and some small fixes)

Location:

code/trunk/src/orxonox

Files:

• objects/controllers/ArtificialController.cc (modified) (2 diffs)
• objects/gametypes/TeamBaseMatch.cc (modified) (6 diffs)
• objects/worldentities/pawns/Pawn.h (modified) (1 diff)
• objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) (3 diffs)
• overlays/hud/HUDRadar.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/controllers/ArtificialController.cc

@@ -36 +36 @@
 #include "objects/gametypes/TeamDeathmatch.h"
 #include "objects/controllers/WaypointPatrolController.h"
+#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
 
 namespace orxonox
@@ -203 +204 @@
         }
 
+        TeamBaseMatchBase* base = 0;
+        base = dynamic_cast<TeamBaseMatchBase*>(entity1);
+        if (base)
+        {
+            switch (base->getState())
+            {
+                case BaseState::controlTeam1:
+                    team1 = 0;
+                    break;
+                case BaseState::controlTeam2:
+                    team1 = 1;
+                    break;
+                case BaseState::uncontrolled:
+                default:
+                    team1 = -1;
+            }
+        }
+        base = dynamic_cast<TeamBaseMatchBase*>(entity2);
+        if (base)
+        {
+            switch (base->getState())
+            {
+                case BaseState::controlTeam1:
+                    team2 = 0;
+                    break;
+                case BaseState::controlTeam2:
+                    team2 = 1;
+                    break;
+                case BaseState::uncontrolled:
+                default:
+                    team2 = -1;
+            }
+        }
+
         return (team1 == team2 && team1 != -1);
     }

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -41 +41 @@
 
         this->scoreTimer_.setTimer(10, true, this, createExecutor(createFunctor(&TeamBaseMatch::winPoints)));
-        this->outputTimer_.setTimer(30, true, this, createExecutor(createFunctor(&TeamBaseMatch::showPoints)));
+        this->outputTimer_.setTimer(10, true, this, createExecutor(createFunctor(&TeamBaseMatch::showPoints)));
 
         this->pointsTeam1_ = 0;
@@ -79 +79 @@
             std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.find(base);
             if (it != this->bases_.end())
-                return (!this->pawnsAreInTheSameTeam(victim, base));
-        }
-        return (!this->pawnsAreInTheSameTeam(victim, originator));
+                return (!this->pawnsAreInTheSameTeam(originator, base));
+        }
+        return TeamDeathmatch::allowPawnDamage(victim, originator);
     }
 
@@ -90 +90 @@
             std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
             int teamnrbase = -1;
-            int teamnrplayer = getTeam(pawn1->getPlayer());
+            int teamnrplayer = this->getTeam(pawn1->getPlayer());
 
             switch (base->getState())
@@ -106 +106 @@
 
             if (teamnrbase == teamnrplayer)
-                return false;
-        }
-        return true;
+                return true;
+        }
+        return false;
     }
 
@@ -126 +126 @@
     {
         COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
-        if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
-        if(pointsTeam2_ >=1700) COUT(0) << "Team 2 is near victory!" << std::endl;
+        if(pointsTeam1_ >=1700 && pointsTeam1_ < 2000) COUT(0) << "Team 1 is near victory!" << std::endl;
+        if(pointsTeam2_ >=1700 && pointsTeam2_ < 2000) COUT(0) << "Team 2 is near victory!" << std::endl;
     }
 
@@ -157 +157 @@
     void TeamBaseMatch::endGame()
     {
-        if(this->pointsTeam1_>=2000 || this->pointsTeam2_ >=2000)
-        {
+        if (this->pointsTeam1_ >= 2000 || this->pointsTeam2_ >= 2000)
+        {
+            if (this->pointsTeam1_ > this->pointsTeam2_)
+                COUT(0) << "Team 1 has won the match" << std::endl;
+            else
+                COUT(0) << "Team 2 has won the match" << std::endl;
+
             this->end();
+            this->scoreTimer_.stopTimer();
+            this->outputTimer_.stopTimer();
         }
     }

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -147 +147 @@
     class _OrxonoxExport PawnListener : virtual public OrxonoxClass
     {
-        friend class Pawn;
-
         public:
             PawnListener();
             virtual ~PawnListener() {}
 
-        protected:
             virtual void destroyedPawn(Pawn* pawn) = 0;
     };

code/trunk/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

@@ -48 +48 @@
             gametype->addBase(this);
         }
+
+        this->setRadarObjectShape(RadarViewable::Triangle);
     }
 
@@ -70 +72 @@
             case BaseState::uncontrolled:
             default:
-                colour = ColourValue(0.5, 0.5, 0.7, 1.0);
+                colour = ColourValue(0.5, 0.5, 0.5, 1.0);
                 break;
         }
@@ -84 +86 @@
             }
         }
+
+        this->setRadarObjectColour(colour);
+
+        // Call this so bots stop shooting at the base after they converted it
+        for (ObjectList<PawnListener>::iterator it = ObjectList<PawnListener>::begin(); it != ObjectList<PawnListener>::end(); ++it)
+            it->destroyedPawn(this);
     }
 }

code/trunk/src/orxonox/overlays/hud/HUDRadar.cc

@@ -64 +64 @@
 
         this->shapeMaterials_[RadarViewable::Dot]      = "RadarDot.tga";
-        this->shapeMaterials_[RadarViewable::Triangle] = "RadarSquare.tga";
+        this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.tga";
         this->shapeMaterials_[RadarViewable::Square]   = "RadarSquare.tga";