Changeset 8735 for code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Jul 7, 2011, 3:59:54 PM (13 years ago)

Author:

jo

Message:

Adjust weapon behaviour if bot dies and is respawned with a different weaponsetting than before.

File:

• code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) (4 diffs)

code/branches/ai2/src/orxonox/controllers/ArtificialController.cc

@@ -90 +90 @@
         this->bSetupWorked = false;
         this->numberOfWeapons = 0;
-        this->botlevel_ = 1.0f;
+        this->botlevel_ = 0.5f;
         this->mode_ = DEFAULT;////Vector-implementation: mode_.push_back(DEFAULT);
         this->timeout_=0;
@@ -1043 +1043 @@
         else if(this->getControllableEntity()&&(numberOfWeapons>0)&&this->bShooting_ && this->isCloseAtTarget((1 + 2*botlevel_)*1000) && this->isLookingAtTarget(math::pi / 20.0f))
         {
-            if (this->isCloseAtTarget(130) &&(weapons[1]==1) )
+            if (this->isCloseAtTarget(130) &&weapons[1] )
             {//LENSFLARE: short range weapon     
                 this->getControllableEntity()->fire(1); //ai uses lens flare if they're close enough to the target
             }
-            else if((weapons[3]==3)&& this->isCloseAtTarget(400) /*&&projectiles[3]*/ )
+            else if(weapons[3]&& this->isCloseAtTarget(400) /*&&projectiles[3]*/ )
             {//ROCKET: mid range weapon
                 //TODO: How many rockets are available?
                 this->mode_ = ROCKET;//Vector-implementation: mode_.push_back(ROCKET);
-                this->getControllableEntity()->fire(3);//launch rocket BUG IS TRIGGERED HERE.
+                this->getControllableEntity()->fire(3);//launch rocket
                 if(this->getControllableEntity()&&this->target_)//after fire(3) getControllableEntity() refers to the rocket!
                 {
@@ -1064 +1064 @@
                 this->projectiles[3]-=1;//decrease ammo !!
             }
-            else if ((weapons[0]==0))//LASER: default weapon
+            else if (weapons[0])//LASER: default weapon
                 this->getControllableEntity()->fire(0);
         }
@@ -1083 +1083 @@
                     //const std::string wpn = getWeaponname(i, pawn); COUT(0)<<wpn<< std::endl;//Temporary debug info.
                     /*if(wpn=="")
-                        weapons[i]=-1;
+                        weapons[i]=false;
                     else if(wpn=="LaserMunition")//other munitiontypes are not defined yet :-(
-                        weapons[0]=0;
+                        weapons[0]=true;
                     else if(wpn=="FusionMunition")
-                        weapons[1]=1;
+                        weapons[1]=true;
                     else if(wpn=="TargetSeeking Rockets")
-                        weapons[2]=2;
-                    else if(wpn=="ROCKET")//TODO: insert right munition name
-                        weapons[3]=3;
+                        weapons[2]=true;
+                    else if(wpn=="RocketMunition")
+                        weapons[3]=true;
+                    else
+                        COUT(1)<< wpn << + << " has to be added in ArtificialController.cc as new weapon." << std::endl;
                     */
                     if(pawn->getWeaponSet(i)) //main part: find which weapons a pawn can use; hard coded at the moment!
                     {
-                        weapons[i]=i;
+                        weapons[i]=true;
                         projectiles[i]=1;//TODO: how to express infinite ammo? how to get data?? getWeaponmode(i)->getMunition()->getNumMunition(WeaponMode* user)
                           numberOfWeapons++;
                     }
                     else
-                        weapons[i]=-1;
+                        weapons[i]=-false;
                 }
                  //pawn->weaponSystem_->getMunition(SubclassIdentifier< Munition > *identifier)->getNumMunition (WeaponMode *user);