ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect item utilisation in zipper path

Browse Source 
Also remove the code logic which tells to use a zipper instead of nitro (not always useful, and should be managed inside handleNitroAndZipper anyway) ; and fixes the code disabling the use of zipper at start in time-trial (the previous code made the AI use it at random, when it's sometimes better to not use it at all at this moment and to wait later).
This commit is contained in:
Alayan-stk-2 2018-04-11 19:00:46 +02:00 committed by GitHub
parent 5b4a938165
commit 8f7502e204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/karts/controller/skidding_ai.cpp
View File

@ -361,23 +361,13 @@ void SkiddingAI::update(float dt)
if(!m_controls->getNitro())
handleNitroAndZipper(item_skill);
}
// If we are supposed to use nitro, but have a zipper,
// use the zipper instead (unless there are items to avoid cloe by)
if(m_controls->getNitro() &&
m_kart->getPowerup()->getType()==PowerupManager::POWERUP_ZIPPER &&
m_kart->getSpeed()>1.0f &&
m_kart->getSpeedIncreaseTimeLeft(MaxSpeed::MS_INCREASE_ZIPPER)<=0 &&
!m_avoid_item_close)
// Make sure that not all AI karts use the zipper at the same
// time in time trial at start up, so disable it during the 5 first seconds
if(race_manager->getMinorMode()== RaceManager::MINOR_MODE_TIME_TRIAL &&
(m_world->getTime()<5.0f) )
{
// Make sure that not all AI karts use the zipper at the same
// time in time trial at start up, so during the first 5 seconds
// this is done at random only.
if(race_manager->getMinorMode()!=RaceManager::MINOR_MODE_TIME_TRIAL ||
(m_world->getTime()<3.0f && rand()%50==1) )
{
m_controls->setNitro(false);
m_controls->setFire(true);
}
m_controls->setFire(false);
}
/*And obviously general kart stuff*/
@ -2259,7 +2249,8 @@ void SkiddingAI::handleNitroAndZipper(int item_skill)
}
// Use zipper
if(item_skill >= 2 && m_kart->getSpeed()>1.0f &&
if(m_kart->getPowerup()->getType() == PowerupManager::POWERUP_ZIPPER
&& item_skill >= 2 && m_kart->getSpeed()>1.0f &&
m_kart->getSpeedIncreaseTimeLeft(MaxSpeed::MS_INCREASE_ZIPPER)<=0)
{
DriveNode::DirectionType dir;