[Orxonox-commit 2237] r6953 - code/branches/presentation3/src/orxonox/controllers

scheusso at orxonox.net scheusso at orxonox.net
Fri May 21 10:30:42 CEST 2010 

Author: scheusso
Date: 2010-05-21 10:30:42 +0200 (Fri, 21 May 2010)
New Revision: 6953

Modified:
   code/branches/presentation3/src/orxonox/controllers/AIController.cc
Log:
now the bots can shoot again


Modified: code/branches/presentation3/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/AIController.cc	2010-05-21 08:26:31 UTC (rev 6952)
+++ code/branches/presentation3/src/orxonox/controllers/AIController.cc	2010-05-21 08:30:42 UTC (rev 6953)
@@ -56,19 +56,19 @@
         float maxrand = 100.0f / ACTION_INTERVAL;
 
         // search enemy
-      /*  random = rnd(maxrand);
+        random = rnd(maxrand);
         if (random < 15 && (!this->target_))
-            this->searchNewTarget();*/
+            this->searchNewTarget();
 
         // forget enemy
-        //random = rnd(maxrand);
-        //if (random < 5 && (this->target_))
-        //    this->forgetTarget();
+        random = rnd(maxrand);
+        if (random < 5 && (this->target_))
+            this->forgetTarget();
 
         // next enemy
-  /*      random = rnd(maxrand);
+        random = rnd(maxrand);
         if (random < 10 && (this->target_))
-            this->searchNewTarget();*/
+            this->searchNewTarget();
 
         // fly somewhere
         random = rnd(maxrand);
@@ -86,14 +86,14 @@
             this->searchRandomTargetPosition();
 
         // shoot
-        //random = rnd(maxrand);
-        //if (random < 75 && (this->target_ && !this->bShooting_))
-        //    this->bShooting_ = true;
+        random = rnd(maxrand);
+        if (random < 75 && (this->target_ && !this->bShooting_))
+            this->bShooting_ = true;
 
-        //// stop shooting
-        //random = rnd(maxrand);
-        //if (random < 25 && (this->bShooting_))
-        //    this->bShooting_ = false;
+        // stop shooting
+        random = rnd(maxrand);
+        if (random < 25 && (this->bShooting_))
+            this->bShooting_ = false;
     }
 
     void AIController::tick(float dt)


Property changes on: code/branches/presentation3/src/orxonox/controllers/AIController.cc
___________________________________________________________________
Added: svn:mergeinfo
   + /code/branches/buildsystem/src/orxonox/controllers/AIController.cc:1874-2276,2278-2400
/code/branches/buildsystem2/src/orxonox/controllers/AIController.cc:2506-2658
/code/branches/buildsystem3/src/orxonox/controllers/AIController.cc:2662-2708
/code/branches/ceguilua/src/orxonox/controllers/AIController.cc:1802-1808
/code/branches/chat/src/orxonox/controllers/AIController.cc:6527-6797
/code/branches/chat2/src/orxonox/controllers/AIController.cc:6836-6910
/code/branches/console/src/orxonox/controllers/AIController.cc:5941-6104
/code/branches/core3/src/orxonox/controllers/AIController.cc:1572-1739
/code/branches/core4/src/orxonox/controllers/AIController.cc:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/src/orxonox/controllers/AIController.cc:5768-5928,6009
/code/branches/gamestate/src/orxonox/controllers/AIController.cc:6430-6572,6621-6661
/code/branches/gamestates2/src/orxonox/controllers/AIController.cc:6594-6745
/code/branches/gametypes/src/orxonox/controllers/AIController.cc:2826-3031
/code/branches/gcc43/src/orxonox/controllers/AIController.cc:1580
/code/branches/gui/src/orxonox/controllers/AIController.cc:1635-1723,2795-2894
/code/branches/hudelements/src/orxonox/controllers/AIController.cc:6584-6941
/code/branches/ingamemenu/src/orxonox/controllers/AIController.cc:6000-6023
/code/branches/input/src/orxonox/controllers/AIController.cc:1629-1636
/code/branches/libraries/src/orxonox/controllers/AIController.cc:5612-5692
/code/branches/libraries2/src/orxonox/controllers/AIController.cc:5703-5737
/code/branches/lod/src/orxonox/controllers/AIController.cc:6586-6911
/code/branches/lodfinal/src/orxonox/controllers/AIController.cc:2372-2411
/code/branches/map/src/orxonox/controllers/AIController.cc:2801-3086,3089
/code/branches/menu/src/orxonox/controllers/AIController.cc:5941-6146,6148
/code/branches/miniprojects/src/orxonox/controllers/AIController.cc:2754-2824
/code/branches/netp2/src/orxonox/controllers/AIController.cc:2835-2988
/code/branches/netp3/src/orxonox/controllers/AIController.cc:2988-3082
/code/branches/netp6/src/orxonox/controllers/AIController.cc:3214-3302
/code/branches/network/src/orxonox/controllers/AIController.cc:2356
/code/branches/network64/src/orxonox/controllers/AIController.cc:2210-2355
/code/branches/objecthierarchy/src/orxonox/controllers/AIController.cc:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/orxonox/controllers/AIController.cc:2171-2479
/code/branches/overlay/src/orxonox/controllers/AIController.cc:2117-2385
/code/branches/particles/src/orxonox/controllers/AIController.cc:2829-3085
/code/branches/particles2/src/orxonox/controllers/AIController.cc:6050-6106,6109
/code/branches/pch/src/orxonox/controllers/AIController.cc:3113-3194
/code/branches/physics/src/orxonox/controllers/AIController.cc:1912-2055,2107-2439
/code/branches/physics_merge/src/orxonox/controllers/AIController.cc:2436-2457
/code/branches/pickup2/src/orxonox/controllers/AIController.cc:5942-6405
/code/branches/pickup3/src/orxonox/controllers/AIController.cc:6418-6523
/code/branches/pickup4/src/orxonox/controllers/AIController.cc:6594-6710
/code/branches/pickups/src/orxonox/controllers/AIController.cc:1926-2086,2127,2827-2915
/code/branches/pickups2/src/orxonox/controllers/AIController.cc:2107-2497,2915-3071
/code/branches/ppspickups1/src/orxonox/controllers/AIController.cc:6552-6708
/code/branches/ppspickups2/src/orxonox/controllers/AIController.cc:6527-6532,6554-6709
/code/branches/presentation/src/orxonox/controllers/AIController.cc:2369-2652,2654-2660
/code/branches/presentation2/src/orxonox/controllers/AIController.cc:6106-6416
/code/branches/questsystem/src/orxonox/controllers/AIController.cc:1894-2088
/code/branches/questsystem2/src/orxonox/controllers/AIController.cc:2107-2259
/code/branches/questsystem5/src/orxonox/controllers/AIController.cc:2776-2905
/code/branches/resource/src/orxonox/controllers/AIController.cc:3327-3366
/code/branches/resource2/src/orxonox/controllers/AIController.cc:3372-5694
/code/branches/rocket/src/orxonox/controllers/AIController.cc:6779-6950
/code/branches/script_trigger/src/orxonox/controllers/AIController.cc:1295-1953,1955
/code/branches/sound/src/orxonox/controllers/AIController.cc:2829-3010
/code/branches/sound3/src/orxonox/controllers/AIController.cc:5941-6102
/code/branches/steering/src/orxonox/controllers/AIController.cc:5949-6091
/code/branches/weapon/src/orxonox/controllers/AIController.cc:1925-2094
/code/branches/weapon2/src/orxonox/controllers/AIController.cc:2107-2488
/code/branches/weapons/src/orxonox/controllers/AIController.cc:2897-3051
/code/branches/weaponsystem/src/orxonox/controllers/AIController.cc:2742-2890

More information about the Orxonox-commit mailing list