Changeset 9731 for code/branches/levelMichael

Timestamp:

Nov 1, 2013, 12:17:13 AM (11 years ago)

Author:

jo

Message:

Merged trunk into branch levelMichael to add new features.

Location:

code/branches/levelMichael

Files:

• . (modified) (1 prop)
• src/libraries/core/CorePrereqs.h (modified) (2 diffs)
• src/orxonox/controllers/WaypointPatrolController.cc (modified) (4 diffs)
• src/orxonox/controllers/WaypointPatrolController.h (modified) (1 diff)
• src/orxonox/gametypes/Mission.cc (modified) (4 diffs)
• src/orxonox/gametypes/Mission.h (modified) (2 diffs)

code/branches/levelMichael/src/libraries/core/CorePrereqs.h

@@ -276 +276 @@
     }
 
-#elif (BOOST_VERSION < 104800)
+#elif (BOOST_VERSION < 105000)
 
 # if BOOST_FILESYSTEM_VERSION == 2
@@ -304 +304 @@
 #else
 
-    // TODO: Check this once boost 1.48 is released
     namespace filesystem
     {

code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.cc

@@ -42 +42 @@
         RegisterObject(WaypointPatrolController);
 
-        this->alertnessradius_ = 500;
+        this->alertnessradius_ = 500.0f;
+        this->attackradius_ = 1000.0f;
 
         this->patrolTimer_.setTimer(rnd(), true, createExecutor(createFunctor(&WaypointPatrolController::searchEnemy, this)));
@@ -52 +53 @@
 
         XMLPortParam(WaypointPatrolController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
+        XMLPortParam(WaypointPatrolController, "attackradius", setAttackRadius, getAttackRadius, xmlelement, mode).defaultValues(1000.0f);
     }
 
@@ -59 +61 @@
             return;
 
-        if (this->target_)
+        if (this->target_) //if there is a target, follow it and shoot it, if it is close enough
         {
             this->aimAtTarget();
@@ -66 +68 @@
                 this->moveToTargetPosition();
 
-            if (this->getControllableEntity() && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
+            if (this->getControllableEntity() && this->isCloseAtTarget(this->attackradius_) && this->isLookingAtTarget(math::pi / 20.0f))
                 this->getControllableEntity()->fire(0);
         }

code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h

@@ -50 +50 @@
             inline float getAlertnessRadius() const
                 { return this->alertnessradius_; }
+                
+            inline void setAttackRadius(float distance)
+                { this->attackradius_ = distance; }
+            inline float getAttackRadius() const
+                { return this->attackradius_; }
 
         protected:
             void searchEnemy();
 
-            float alertnessradius_;
+            float alertnessradius_; //!< Enemies within this radius are being followed and shot.
+            float attackradius_;    //!< Enemies only get shot, if they are within the attackradius_.
             Timer patrolTimer_;
     };

code/branches/levelMichael/src/orxonox/gametypes/Mission.cc

@@ -32 +32 @@
 
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
+#include "infos/PlayerInfo.h"
 #include "network/Host.h"
 #include "worldentities/pawns/Pawn.h"
 
+
 namespace orxonox
 {
+    SetConsoleCommand("Mission", "endMission", &Mission::endMission);
+    SetConsoleCommand("Mission", "setLives", &Mission::setLivesWrapper);
     RegisterUnloadableClass(Mission);
 
@@ -56 +61 @@
             this->end();
         }
+        else if (this->lives_ == 0)
+        {
+            this->missionAccomplished_ = false;
+            this->end();
+        }
     }
 
     void Mission::pawnKilled(Pawn* victim, Pawn* killer)
     {
-        if (victim && victim->getPlayer() && this->lives_ == 1)
+        if (victim && victim->getPlayer() && victim->getPlayer()->isHumanPlayer() )
         {
-            this->missionAccomplished_ = false;
-            this->end();
+            this->lives_--;
         }
     }
@@ -78 +87 @@
     {
         Gametype::end();
-        /*if (this->missionAccomplished_)
+        if (this->missionAccomplished_)
             this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
         else
             this->gtinfo_->sendAnnounceMessage("Mission failed!");
-        */
     }
 
@@ -94 +102 @@
         }
     }
-
+    void Mission::endMission(bool accomplished)
+    {
+        for (ObjectList<Mission>::iterator it = ObjectList<Mission>::begin(); it != ObjectList<Mission>::end(); ++it)
+        {//TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
+            it->setMissionAccomplished(accomplished);
+            it->end();
+        }
+    }
+    
+    void Mission::setLivesWrapper(unsigned int amount)
+    {
+        for (ObjectList<Mission>::iterator it = ObjectList<Mission>::begin(); it != ObjectList<Mission>::end(); ++it)
+        {//TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would affect ALL missions!
+            it->setLives(amount);
+        }
+    }
 
 

code/branches/levelMichael/src/orxonox/gametypes/Mission.h

@@ -52 +52 @@
             inline unsigned int getLives()
                 {return this->lives_;}
+            inline void setMissionAccomplished(bool acc)
+                {this->missionAccomplished_ = acc;}
+            static void endMission(bool accomplished);
+            static void setLivesWrapper(unsigned int amount);
 
         protected:
@@ -57 +61 @@
             bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
             int lives_; //<! amount of player's lives <-> nr. of retries
-
+            //<! If the lives_ are set negative -> unlimited lives.
     };
 }