Merge pull request #1243 from mcsab/master

Skidding achievement
This commit is contained in:
auriamg 2014-03-15 15:01:41 -04:00
commit 847ceca671
3 changed files with 13 additions and 1 deletions

View File

@ -25,5 +25,9 @@
title="Marathoner" description="Make a race with 5 laps or more"> title="Marathoner" description="Make a race with 5 laps or more">
<laps goal="5"/> <laps goal="5"/>
</achievement> </achievement>
<achievement id="5" check-type="all-at-least" reset-after-race="yes"
title="Skid-row" description="Make 5 skidding in a single race">
<skidding goal="5"/>
</achievement>
</achievements> </achievements>

View File

@ -47,7 +47,7 @@ public:
ACHIEVE_STRIKE = 2, ACHIEVE_STRIKE = 2,
ACHIEVE_ARCH_ENEMY = 3, ACHIEVE_ARCH_ENEMY = 3,
ACHIEVE_MARATHONER = 4, ACHIEVE_MARATHONER = 4,
ACHIEVE_LAST = ACHIEVE_MARATHONER ACHIEVE_SKIDDING = 5
}; };
/** Achievement check type: /** Achievement check type:
* ALL_AT_LEAST: All goal values must be reached (or exceeded). * ALL_AT_LEAST: All goal values must be reached (or exceeded).

View File

@ -21,6 +21,8 @@
#ifdef SKID_DEBUG #ifdef SKID_DEBUG
# include "graphics/show_curve.hpp" # include "graphics/show_curve.hpp"
#endif #endif
#include "achievements/achievement_info.hpp"
#include "config/player_manager.hpp"
#include "karts/kart.hpp" #include "karts/kart.hpp"
#include "karts/kart_gfx.hpp" #include "karts/kart_gfx.hpp"
#include "karts/kart_properties.hpp" #include "karts/kart_properties.hpp"
@ -412,6 +414,12 @@ void Skidding::update(float dt, bool is_on_ground,
bonus_speed, bonus_speed, bonus_speed, bonus_speed,
bonus_force, bonus_time, bonus_force, bonus_time,
/*fade-out-time*/ 1.0f); /*fade-out-time*/ 1.0f);
StateManager::ActivePlayer *c = m_kart->getController()->getPlayer();
if (c && c->getConstProfile() == PlayerManager::get()->getCurrentPlayer())
{
PlayerManager::increaseAchievement(AchievementInfo::ACHIEVE_SKIDDING, "skidding");
}
} }
else { else {
m_kart->getKartGFX() m_kart->getKartGFX()