Changeset 6978 for code/branches/ai/src/orxonox/controllers/AIController.cc

Timestamp:

May 27, 2010, 6:39:59 PM (14 years ago)

Author:

solex

Message:

consle commands

File:

• code/branches/ai/src/orxonox/controllers/AIController.cc (modified) (7 diffs)

code/branches/ai/src/orxonox/controllers/AIController.cc

@@ -23 +23 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
- *      ...
+ *      Dominik Solenicki
  *
  */
@@ -61 +61 @@
             if (this->formationFlight_)
             {
-            // return to Master after being forced free
+                // return to Master after being forced free
                 if (this->freedomCount_ == 1)
                 {
@@ -103 +103 @@
                 this->searchRandomTargetPosition();
 
-/*
-            random = rnd(maxrand);
-            if (random < 75 && (this->target_ && !this->bShooting_))
+            // shoot
+            random = rnd(maxrand);
+            if (!(this->passive_) && random < 75 && (this->target_ && !this->bShooting_))
                 this->bShooting_ = true;
 
@@ -111 +111 @@
             random = rnd(maxrand);
             if (random < 25 && (this->bShooting_))
-                this->bShooting_ = false; */
+                this->bShooting_ = false; 
 
         }
@@ -120 +120 @@
         }
 
-        if (this->state_ == MASTER)//MASTER
+        if (this->state_ == MASTER)
         {
 
@@ -136 +136 @@
                 if (this->specificMasterAction_ == SPIN)
                     this->spin();
+
+//                 if (this->specificMasterAction_ == FOLLOWHUMAN)
+//                     this->followHuman(this->HumanToFollow_, false);
             }
 
@@ -188 +191 @@
                 // shoot
                 random = rnd(maxrand);
-                if (random < 5 && (this->target_ && !this->bShooting_))
+                if (!(this->passive_) && random < 15 && (this->target_ && !this->bShooting_))
                 {
                 this->bShooting_ = true;