Changeset 10903 for code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc

Timestamp:

Nov 30, 2015, 5:39:43 PM (8 years ago)

Author:

gania

Message:

AI attacks targets that are close

File:

• code/branches/campaignHS15/src/orxonox/controllers/FightingController.cc (modified) (7 diffs)

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

@@ -37 +37 @@
 #include "weaponsystem/Weapon.h"
 #include "weaponsystem/WeaponSlot.h"
-#include "weaponsystem/WeaponSlot.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "weaponsystem/Munition.h"
+
 namespace orxonox
 {
@@ -139 +141 @@
         }
         //too close? How do u expect to dodge anything? Just attack!
-        else if (diffLength < 400)
+        else if (diffLength < 1000)
         {   
             this->bKeepFormation_ = false;
 
             //at this point, just look and shoot
-            if (diffLength < 200)
+            if (diffLength < 500)
             {
                 this->stopMoving();
@@ -151 +153 @@
             else
             {
-                this->setTargetPosition(this->positionOfTarget_ - diffUnit * 100.0f);
+                this->setTargetPosition(this->positionOfTarget_ - diffUnit * 300.0f);
             }
         }
@@ -158 +160 @@
         {
             this->bKeepFormation_ = false;
-            this->setTargetPosition(this->positionOfTarget_ - diffUnit * 100.0f);
+            this->setTargetPosition(this->positionOfTarget_ - diffUnit * 300.0f);
         }
         //That's unfortunate, he is looking and probably shooting... try to dodge what we can...  
@@ -166 +168 @@
             if (maneuverCounter_ == 0)
             {
-                this->setTargetPosition(this->positionOfTarget_ - diffUnit * 50.0f);   
+                this->setTargetPosition(this->positionOfTarget_ - diffUnit * 100.0f);   
                 return;
             }
-            dodge(thisPosition, diffUnit);
+            if (this->actionCounter_ % 3 == 0)
+                dodge(thisPosition, diffUnit);
         }
     }
@@ -365 +368 @@
                     {
                         std::string wName = wMode->getIdentifier()->getName();
+                        // SubclassIdentifier<Munition> munition =  ClassByString(wName);
                         if (wName == "RocketFire")
                             this->rocketsLeft_ = 10;
+                            // this->rocketsLeft_ = orxonox_cast<Pawn*>(this->getControllableEntity())->getWeaponSystem()->getMunition(&munition)->getNumMunitionInCurrentMagazine(wMode);
                         if(this->getFiremode(wName) == -1) //only add a weapon, if it is "new"
                             weaponModes_[wName] = wMode->getMode();
@@ -375 +380 @@
             }//pawn->weaponSystem_->getMunition(SubclassIdentifier< Munition > *identifier)->getNumMunition (WeaponMode *user);
         }
+
+        //orxout (internal_error) << this->rocketsLeft_ << " rockets left" << endl;
     }