diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 00d44098..200c7983 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -3996,8 +3996,10 @@ bool AiL::UseLoadoutItem(int slot,const std::optionaltargetingPos){ if(!ISBLANK(GetLoadoutItem(slot).lock())&&GetLoadoutItem(slot).lock()->Amt()>0){ Tutorial::GetTask(TutorialTaskName::USE_RECOVERY_ITEMS).I(A::ITEM_USE_COUNT)++; Inventory::UseItem(GetLoadoutItem(slot).lock()->ActualName(),1U,targetingPos); - Inventory::AddLoadoutItemUsed(GetLoadoutItem(slot).lock()->ActualName(),slot); - GetLoadoutItem(slot).lock()->amt--; + if(game->GetCurrentMapName()!="HUB"){ + Inventory::AddLoadoutItemUsed(GetLoadoutItem(slot).lock()->ActualName(),slot); + GetLoadoutItem(slot).lock()->amt--; + } if(GetLoadoutItem(slot).lock()->UseSound().length()>0){ SoundEffect::PlaySFX(GetLoadoutItem(slot).lock()->UseSound(),SoundEffect::CENTERED); } diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp index be1d6195..a5d312a7 100644 --- a/Adventures in Lestoria/Player.cpp +++ b/Adventures in Lestoria/Player.cpp @@ -886,8 +886,7 @@ bool Player::CanAct(){ const bool Player::CanAct(const Ability&ability){ return knockUpTimer==0&&!ability.waitForRelease&&(ability.canCancelCast||state!=State::CASTING)&&state!=State::ANIMATION_LOCK&&state!=State::DEADLYDASH&&state!=State::RETREAT&& - (GameState::STATE==GameState::states[States::GAME_RUN] - ||GameState::STATE==GameState::states[States::GAME_HUB]&&!ability.itemAbility); + (GameState::STATE==GameState::states[States::GAME_RUN]||GameState::STATE==GameState::states[States::GAME_HUB]); } bool Player::HasIframes(){ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index c8be3b6d..5104aede 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 11917 +#define VERSION_BUILD 11922 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/VisualNovel.cpp b/Adventures in Lestoria/VisualNovel.cpp index da9cb1f2..dfbc969e 100644 --- a/Adventures in Lestoria/VisualNovel.cpp +++ b/Adventures in Lestoria/VisualNovel.cpp @@ -126,40 +126,40 @@ void VisualNovel::Initialize(){ arguments=ReadCSVArgs(args); } - if(line.find("{LOCATION")!=std::string::npos){//Location command + if(line.find("{LOCATION")!=std::string::npos){ if(arguments.size()!=1)ERR("Arguments size is "<(arguments[0])); }else - if(line.find("{BACKGROUND")!=std::string::npos){//Background command + if(line.find("{BACKGROUND")!=std::string::npos){ if(arguments.size()!=1)ERR("Arguments size is "<(arguments[0])); }else - if(line.find("{LEFT")!=std::string::npos){//Left command + if(line.find("{LEFT")!=std::string::npos){ AddImagesForLoading(arguments); data.emplace_back(std::make_unique(arguments)); }else - if(line.find("{RIGHT")!=std::string::npos){//Right command + if(line.find("{RIGHT")!=std::string::npos){ AddImagesForLoading(arguments); data.emplace_back(std::make_unique(arguments)); }else - if(line.find("{PAUSE")!=std::string::npos){//Pause command + if(line.find("{PAUSE")!=std::string::npos){ if(arguments.size()!=0)ERR("Arguments size is "<()); }else - if(line.find("{AUDIOPITCH")!=std::string::npos){//Pause command + if(line.find("{AUDIOPITCH")!=std::string::npos){ if(arguments.size()!=1)ERR("Arguments size is "<(arguments[0])); }else - if(line.find("{BGM")!=std::string::npos){//Pause command + if(line.find("{BGM")!=std::string::npos){ if(arguments.size()!=1)ERR("Arguments size is "<(arguments[0])); }else - if(line.find("{CHAPTER")!=std::string::npos){//Pause command + if(line.find("{CHAPTER")!=std::string::npos){ if(arguments.size()!=1)ERR("Arguments size is "<(std::stoi(arguments[0]))); }else - if(line.find("{SETPLAYERWORLDLOC")!=std::string::npos){//Pause command + if(line.find("{SETPLAYERWORLDLOC")!=std::string::npos){ if(arguments.size()<1)ERR("Arguments size is "<