Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6953


Ignore:
Timestamp:
May 21, 2010, 10:30:42 AM (14 years ago)
Author:
scheusso
Message:

now the bots can shoot again

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/src/orxonox/controllers/AIController.cc

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/chat/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/chat2/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/gamestate/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/gamestates2/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/hudelements/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/lod/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/presentation2/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/rocket/src/orxonox/controllers/AIController.ccmergedeligible
      /code/branches/buildsystem/src/orxonox/controllers/AIController.cc1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/controllers/AIController.cc2506-2658
      /code/branches/buildsystem3/src/orxonox/controllers/AIController.cc2662-2708
      /code/branches/ceguilua/src/orxonox/controllers/AIController.cc1802-1808
      /code/branches/console/src/orxonox/controllers/AIController.cc5941-6104
      /code/branches/core3/src/orxonox/controllers/AIController.cc1572-1739
      /code/branches/core4/src/orxonox/controllers/AIController.cc3221-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.cc5768-5928,​6009
      /code/branches/gametypes/src/orxonox/controllers/AIController.cc2826-3031
      /code/branches/gcc43/src/orxonox/controllers/AIController.cc1580
      /code/branches/gui/src/orxonox/controllers/AIController.cc1635-1723,​2795-2894
      /code/branches/ingamemenu/src/orxonox/controllers/AIController.cc6000-6023
      /code/branches/input/src/orxonox/controllers/AIController.cc1629-1636
      /code/branches/libraries/src/orxonox/controllers/AIController.cc5612-5692
      /code/branches/libraries2/src/orxonox/controllers/AIController.cc5703-5737
      /code/branches/lodfinal/src/orxonox/controllers/AIController.cc2372-2411
      /code/branches/map/src/orxonox/controllers/AIController.cc2801-3086,​3089
      /code/branches/menu/src/orxonox/controllers/AIController.cc5941-6146,​6148
      /code/branches/miniprojects/src/orxonox/controllers/AIController.cc2754-2824
      /code/branches/netp2/src/orxonox/controllers/AIController.cc2835-2988
      /code/branches/netp3/src/orxonox/controllers/AIController.cc2988-3082
      /code/branches/netp6/src/orxonox/controllers/AIController.cc3214-3302
      /code/branches/network/src/orxonox/controllers/AIController.cc2356
      /code/branches/network64/src/orxonox/controllers/AIController.cc2210-2355
      /code/branches/objecthierarchy/src/orxonox/controllers/AIController.cc1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/controllers/AIController.cc2171-2479
      /code/branches/overlay/src/orxonox/controllers/AIController.cc2117-2385
      /code/branches/particles/src/orxonox/controllers/AIController.cc2829-3085
      /code/branches/particles2/src/orxonox/controllers/AIController.cc6050-6106,​6109
      /code/branches/pch/src/orxonox/controllers/AIController.cc3113-3194
      /code/branches/physics/src/orxonox/controllers/AIController.cc1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/controllers/AIController.cc2436-2457
      /code/branches/pickup2/src/orxonox/controllers/AIController.cc5942-6405
      /code/branches/pickup3/src/orxonox/controllers/AIController.cc6418-6523
      /code/branches/pickup4/src/orxonox/controllers/AIController.cc6594-6710
      /code/branches/pickups/src/orxonox/controllers/AIController.cc1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/orxonox/controllers/AIController.cc2107-2497,​2915-3071
      /code/branches/ppspickups1/src/orxonox/controllers/AIController.cc6552-6708
      /code/branches/ppspickups2/src/orxonox/controllers/AIController.cc6527-6532,​6554-6709
      /code/branches/presentation/src/orxonox/controllers/AIController.cc2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/controllers/AIController.cc1894-2088
      /code/branches/questsystem2/src/orxonox/controllers/AIController.cc2107-2259
      /code/branches/questsystem5/src/orxonox/controllers/AIController.cc2776-2905
      /code/branches/resource/src/orxonox/controllers/AIController.cc3327-3366
      /code/branches/resource2/src/orxonox/controllers/AIController.cc3372-5694
      /code/branches/script_trigger/src/orxonox/controllers/AIController.cc1295-1953,​1955
      /code/branches/sound/src/orxonox/controllers/AIController.cc2829-3010
      /code/branches/sound3/src/orxonox/controllers/AIController.cc5941-6102
      /code/branches/steering/src/orxonox/controllers/AIController.cc5949-6091
      /code/branches/weapon/src/orxonox/controllers/AIController.cc1925-2094
      /code/branches/weapon2/src/orxonox/controllers/AIController.cc2107-2488
      /code/branches/weapons/src/orxonox/controllers/AIController.cc2897-3051
      /code/branches/weaponsystem/src/orxonox/controllers/AIController.cc2742-2890
    r6951 r6953  
    5757
    5858        // search enemy
    59       /*  random = rnd(maxrand);
     59        random = rnd(maxrand);
    6060        if (random < 15 && (!this->target_))
    61             this->searchNewTarget();*/
     61            this->searchNewTarget();
    6262
    6363        // forget enemy
    64         //random = rnd(maxrand);
    65         //if (random < 5 && (this->target_))
    66         //    this->forgetTarget();
     64        random = rnd(maxrand);
     65        if (random < 5 && (this->target_))
     66            this->forgetTarget();
    6767
    6868        // next enemy
    69   /*      random = rnd(maxrand);
     69        random = rnd(maxrand);
    7070        if (random < 10 && (this->target_))
    71             this->searchNewTarget();*/
     71            this->searchNewTarget();
    7272
    7373        // fly somewhere
     
    8787
    8888        // shoot
    89         //random = rnd(maxrand);
    90         //if (random < 75 && (this->target_ && !this->bShooting_))
    91         //    this->bShooting_ = true;
     89        random = rnd(maxrand);
     90        if (random < 75 && (this->target_ && !this->bShooting_))
     91            this->bShooting_ = true;
    9292
    93         //// stop shooting
    94         //random = rnd(maxrand);
    95         //if (random < 25 && (this->bShooting_))
    96         //    this->bShooting_ = false;
     93        // stop shooting
     94        random = rnd(maxrand);
     95        if (random < 25 && (this->bShooting_))
     96            this->bShooting_ = false;
    9797    }
    9898
Note: See TracChangeset for help on using the changeset viewer.