diff --git a/Adventures in Lestoria/State_LevelComplete.cpp b/Adventures in Lestoria/State_LevelComplete.cpp index 21dcf1dc..f7ab6ae4 100644 --- a/Adventures in Lestoria/State_LevelComplete.cpp +++ b/Adventures in Lestoria/State_LevelComplete.cpp @@ -60,7 +60,7 @@ void State_LevelComplete::OnStateChange(GameState*prevState){ Component(MenuType::LEVEL_COMPLETE,"XP Bar")->ResetProgressBar(game->GetPlayer()->CurrentXP(),game->GetPlayer()->NextLevelXPRequired()); accumulatedXP=game->GetPlayer()->GetAccumulatedXP(); - gainRate=(game->GetPlayer()->NextLevelXPRequired()*0.5f)/60.f; + gainRate=(game->GetPlayer()->NextLevelXPRequired()*0.5f); float xpBonus=1.1f; //10% XP bonus for finishing a stage. if(Component(LEVEL_COMPLETE,"Stage Complete Label")->GetLabel()!="Stage Summary"){ //If the label says stage summary, we didn't actually complete the level. Don't reward any stage items to the player. @@ -106,7 +106,7 @@ void State_LevelComplete::OnUserUpdate(AiL*game){ if(accumulatedXP>0){ Audio::Engine().SetVolume(xpGainSound,Audio::GetCalculatedSFXVolume(0.6f)); if(lastXPGain<=0.f){ - int incrementAmt=gainRate*game->GetElapsedTime()+1; + int incrementAmt=gainRate*(1/60.f)+1; accumulatedXP=std::max(0,accumulatedXP-incrementAmt); auto progressBar=Component(MenuType::LEVEL_COMPLETE,"XP Bar"); progressBar->UpdateProgressBar(progressBar->GetCurrentProgress()+incrementAmt); diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 6364f388..e6ba2321 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -34,4 +34,6 @@ Animations when using DPad lock up Reset tutorials when loading a new character When opening craft/buy/sell menu, default to the appropriate button. Pressing back on the Select button of the equip menu causes you to exit the menu. -Funny text colors with text color override on blacksmith menu \ No newline at end of file +Funny text colors with text color override on blacksmith menu + +Toggle for displaying error messages \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 5524d64a..9d4fca92 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 4 #define VERSION_PATCH 4 -#define VERSION_BUILD 7896 +#define VERSION_BUILD 7897 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index d5f0da7a..c31684af 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ