diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 4d2da65f..026f9fc7 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -355,7 +355,6 @@ bool AiL::OnUserUpdate(float fElapsedTime){ Audio::Update(); GameState::STATE->Draw(this); RenderMenu(); - Tutorial::Draw(); GameState::STATE->DrawOverlay(this); RenderFadeout(); LoadingScreen::Draw(); diff --git a/Adventures in Lestoria/ItemLoadoutWindow.cpp b/Adventures in Lestoria/ItemLoadoutWindow.cpp index c5edbaf0..9bda4c44 100644 --- a/Adventures in Lestoria/ItemLoadoutWindow.cpp +++ b/Adventures in Lestoria/ItemLoadoutWindow.cpp @@ -63,8 +63,10 @@ void Menu::InitializeItemLoadoutWindow(){ return true; },[](MenuFuncData data){ std::weak_ptrloadoutButton=DYNAMIC_POINTER_CAST(data.component); - Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); - Component(ITEM_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); + if(!ISBLANK(loadoutButton.lock()->GetItem())){ + Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); + Component(ITEM_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); + } return true; },[](MenuFuncData data){ Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(""); @@ -78,8 +80,10 @@ void Menu::InitializeItemLoadoutWindow(){ return true; },[](MenuFuncData data){ std::weak_ptrloadoutButton=DYNAMIC_POINTER_CAST(data.component); - Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); - Component(ITEM_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); + if(!ISBLANK(loadoutButton.lock()->GetItem())){ + Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); + Component(ITEM_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); + } return true; },[](MenuFuncData data){ Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(""); @@ -93,8 +97,10 @@ void Menu::InitializeItemLoadoutWindow(){ return true; },[](MenuFuncData data){ std::weak_ptrloadoutButton=DYNAMIC_POINTER_CAST(data.component); - Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); - Component(ITEM_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); + if(!ISBLANK(loadoutButton.lock()->GetItem())){ + Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); + Component(ITEM_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); + } return true; },[](MenuFuncData data){ Component(ITEM_LOADOUT,"Item Name Label")->SetLabel(""); diff --git a/Adventures in Lestoria/State_GameRun.cpp b/Adventures in Lestoria/State_GameRun.cpp index ee99579c..ba2617bc 100644 --- a/Adventures in Lestoria/State_GameRun.cpp +++ b/Adventures in Lestoria/State_GameRun.cpp @@ -93,4 +93,5 @@ void State_GameRun::OnUserUpdate(AiL*game){ void State_GameRun::Draw(AiL*game){ game->RenderWorld(game->GetElapsedTime()); game->RenderHud(); + Tutorial::Draw(); } \ No newline at end of file diff --git a/Adventures in Lestoria/State_LevelComplete.cpp b/Adventures in Lestoria/State_LevelComplete.cpp index 21c89cba..6b59520b 100644 --- a/Adventures in Lestoria/State_LevelComplete.cpp +++ b/Adventures in Lestoria/State_LevelComplete.cpp @@ -44,6 +44,7 @@ All rights reserved. #include "ProgressBar.h" #include "SoundEffect.h" #include "Unlock.h" +#include "Tutorial.h" INCLUDE_MONSTER_LIST INCLUDE_game @@ -85,6 +86,7 @@ void State_LevelComplete::OnStateChange(GameState*prevState){ game->GetPlayer()->AddXP(game->GetPlayer()->GetAccumulatedXP()); + Tutorial::GiveUpCurrentTask(); game->GetPlayer()->SetState(State::NORMAL); Menu::OpenMenu(LEVEL_COMPLETE); }; diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index f1f7a673..90a1beb8 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -12,8 +12,4 @@ Toggle for displaying error messages Equip Gear using Start menu tutorial Steam Controller SDK -Add in vsync system option - -Hint text does not appear except during actual gameplay. - -Terrain Collision Boxes \ No newline at end of file +Add in vsync system option \ No newline at end of file diff --git a/Adventures in Lestoria/Tutorial.cpp b/Adventures in Lestoria/Tutorial.cpp index ec243402..2cfb04fe 100644 --- a/Adventures in Lestoria/Tutorial.cpp +++ b/Adventures in Lestoria/Tutorial.cpp @@ -126,4 +126,8 @@ void Tutorial::Draw(){ const bool Tutorial::TaskIsComplete(TutorialTaskName task){ return taskList.at(task)->IsComplete(); +} + +void Tutorial::GiveUpCurrentTask(){ + SetNextTask(TutorialTaskName::NONE); } \ No newline at end of file diff --git a/Adventures in Lestoria/Tutorial.h b/Adventures in Lestoria/Tutorial.h index e7adbf0c..8abe607a 100644 --- a/Adventures in Lestoria/Tutorial.h +++ b/Adventures in Lestoria/Tutorial.h @@ -91,6 +91,7 @@ public: static void SetNextTask(TutorialTaskName task); static TutorialTask&GetTask(TutorialTaskName task); static void CompleteTask(TutorialTaskName task); + static void GiveUpCurrentTask(); private: static TutorialTaskName currentTaskState; static std::map>taskList; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index ed2d87b7..a664a26c 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 5 #define VERSION_PATCH 1 -#define VERSION_BUILD 8208 +#define VERSION_BUILD 8210 #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 03f9fb6e..0bbd6322 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ