Changeset 10847 for code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

Timestamp:

Nov 24, 2015, 11:54:47 AM (9 years ago)

Author:

gania

Message:

I hope that you don't code today, that version is not compilable just yet

File:

• code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) (2 diffs)

code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

@@ -76 +76 @@
 
         
-        if (this->action_ == Action::FIGHT)
+  /*      if (this->target_)
+        {
+            if (CommonController::distance (this->getControllableEntity(), newTarget) < 
+                CommonController::distance (this->getControllableEntity(), target_))
+            {
+                Actionpoint* ap = new Actionpoint(this->getContext());
+                ap->setPosition (0, 0, 0);
+                ap->setActionXML ("FIGHT");
+                //ap->setEnemyXML(CommonController::getName(newTarget));
+                this->addActionpoint (ap);
+            }
+
+        }*/
+        //----Whatever ship is doing, if there are targets close to it and its own target is far away, fight them----
+        //analog to attack move
+        if (this->action_ != Action::FIGHT && this->action_ != Action::FIGHTALL)
+        {
+            if ((this->target_ && CommonController::distance (this->getControllableEntity(), this->target_) > this->attackRange_) ||
+             !this->target_)
+            {
+                ControllableEntity* newTarget = this->closestTarget();
+                if (newTarget && CommonController::distance (this->getControllableEntity(), newTarget) < this->attackRange_)
+                {
+                    this->backupAction();
+                    this->setAction (Action::FIGHT, newTarget);
+                }
+            }
+        }
+        //action is NONE whenever ships finishes current action, 
+        //if it was fighting before because enemies were close, resume what it was doing
+        //otherwise try to execute next action
+        if (this->action_ == Action::NONE)
+        {
+            if (this->bBackuped_)
+            {
+                this->restoreAction();
+            } else if (!this->actionpoints_.empty())
+            {
+                this->popAction();
+            }
+        }
+        if (this->action_ == Action::FIGHT || this->action_ == Action::FIGHTALL)
         {
             if (!this->hasTarget())
             {
                 //----find a target----
-                this->setClosestTarget(); 
-            }
-            else
+                if (this->action_ == Action::FIGHT)
+                {
+                    ControllableEntity* newTarget = this->closestTarget();
+                    if (newTarget && CommonController::distance (this->getControllableEntity(), newTarget) < this->attackRange_)
+                    {
+                        this->setAction (Action::FIGHT, newTarget);
+                    }
+                    else
+                    {
+                        this->setAction (Action::NONE);
+                    }
+                }
+                else if (this->action_ == Action::FIGHTALL)
+                {
+                    this->setClosestTarget();                     
+                }
+
+            }
+            else if (this->hasTarget())
             {
                 //----fly in formation if far enough----
                 Vector3 diffVector = this->positionOfTarget_ - this->getControllableEntity()->getWorldPosition();         
-                if (diffVector.length() > 3000)
+                if (diffVector.length() > this->attackRange_)
                 {
                     this->setTargetPositionOfWingman();
@@ -131 +188 @@
                         this->setProtect (static_cast<ControllableEntity*>(*itP));
                     }
+                }
+                if (!this->getProtect())
+                {
+                    this->setAction (Action::NONE);
                 }
             }