sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Actions Projects 1 Releases Wiki Activity

Allow loadout items to be used in the camp without consuming the item. Release Build 11922.

Browse Source
This commit is contained in:
sigonasr2 2025-01-03 15:05:56 -06:00
parent d89b82bc41
commit 7d0b15f652
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Adventures in Lestoria/AdventuresInLestoria.cpp
View File

@ -3996,8 +3996,10 @@ bool AiL::UseLoadoutItem(int slot,const std::optional<vf2d>targetingPos){
if(!ISBLANK(GetLoadoutItem(slot).lock())&&GetLoadoutItem(slot).lock()->Amt()>0){ if(!ISBLANK(GetLoadoutItem(slot).lock())&&GetLoadoutItem(slot).lock()->Amt()>0){
Tutorial::GetTask(TutorialTaskName::USE_RECOVERY_ITEMS).I(A::ITEM_USE_COUNT)++; Tutorial::GetTask(TutorialTaskName::USE_RECOVERY_ITEMS).I(A::ITEM_USE_COUNT)++;
Inventory::UseItem(GetLoadoutItem(slot).lock()->ActualName(),1U,targetingPos); Inventory::UseItem(GetLoadoutItem(slot).lock()->ActualName(),1U,targetingPos);
Inventory::AddLoadoutItemUsed(GetLoadoutItem(slot).lock()->ActualName(),slot); if(game->GetCurrentMapName()!="HUB"){
GetLoadoutItem(slot).lock()->amt--; Inventory::AddLoadoutItemUsed(GetLoadoutItem(slot).lock()->ActualName(),slot);
GetLoadoutItem(slot).lock()->amt--;
}
if(GetLoadoutItem(slot).lock()->UseSound().length()>0){ if(GetLoadoutItem(slot).lock()->UseSound().length()>0){
SoundEffect::PlaySFX(GetLoadoutItem(slot).lock()->UseSound(),SoundEffect::CENTERED); SoundEffect::PlaySFX(GetLoadoutItem(slot).lock()->UseSound(),SoundEffect::CENTERED);
} }

3
Adventures in Lestoria/Player.cpp
View File

@ -886,8 +886,7 @@ bool Player::CanAct(){
const bool Player::CanAct(const Ability&ability){ 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&& 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_RUN]||GameState::STATE==GameState::states[States::GAME_HUB]);
||GameState::STATE==GameState::states[States::GAME_HUB]&&!ability.itemAbility);
} }
bool Player::HasIframes(){ bool Player::HasIframes(){

2
Adventures in Lestoria/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 11917 #define VERSION_BUILD 11922
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

18
Adventures in Lestoria/VisualNovel.cpp
View File

@ -126,40 +126,40 @@ void VisualNovel::Initialize(){
arguments=ReadCSVArgs(args); 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.size()<<". Expecting only 1 argument.") if(arguments.size()!=1)ERR("Arguments size is "<<arguments.size()<<". Expecting only 1 argument.")
data.emplace_back(std::make_unique<LocationCommand>(arguments[0])); data.emplace_back(std::make_unique<LocationCommand>(arguments[0]));
}else }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.size()<<". Expecting only 1 argument.") if(arguments.size()!=1)ERR("Arguments size is "<<arguments.size()<<". Expecting only 1 argument.")
graphicsToLoad.insert("story_background_image_location"_S+arguments[0]); graphicsToLoad.insert("story_background_image_location"_S+arguments[0]);
data.push_back(std::make_unique<BackgroundCommand>(arguments[0])); data.push_back(std::make_unique<BackgroundCommand>(arguments[0]));
}else }else
if(line.find("{LEFT")!=std::string::npos){//Left command if(line.find("{LEFT")!=std::string::npos){
AddImagesForLoading(arguments); AddImagesForLoading(arguments);
data.emplace_back(std::make_unique<LeftCommand>(arguments)); data.emplace_back(std::make_unique<LeftCommand>(arguments));
}else }else
if(line.find("{RIGHT")!=std::string::npos){//Right command if(line.find("{RIGHT")!=std::string::npos){
AddImagesForLoading(arguments); AddImagesForLoading(arguments);
data.emplace_back(std::make_unique<RightCommand>(arguments)); data.emplace_back(std::make_unique<RightCommand>(arguments));
}else }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 "<<arguments.size()<<". Expecting no arguments.") if(arguments.size()!=0)ERR("Arguments size is "<<arguments.size()<<". Expecting no arguments.")
data.emplace_back(std::make_unique<PauseCommand>()); data.emplace_back(std::make_unique<PauseCommand>());
}else }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.size()<<". Expecting only 1 argument.") if(arguments.size()!=1)ERR("Arguments size is "<<arguments.size()<<". Expecting only 1 argument.")
data.emplace_back(std::make_unique<AudioPitchCommand>(arguments[0])); data.emplace_back(std::make_unique<AudioPitchCommand>(arguments[0]));
}else }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.size()<<". Expecting only 1 argument.") if(arguments.size()!=1)ERR("Arguments size is "<<arguments.size()<<". Expecting only 1 argument.")
data.emplace_back(std::make_unique<BGMCommand>(arguments[0])); data.emplace_back(std::make_unique<BGMCommand>(arguments[0]));
}else }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 "<<arguments.size()<<". Expecting only 1 argument.") if(arguments.size()!=1)ERR("Arguments size is "<<arguments.size()<<". Expecting only 1 argument.")
data.emplace_back(std::make_unique<ChapterCommand>(std::stoi(arguments[0]))); data.emplace_back(std::make_unique<ChapterCommand>(std::stoi(arguments[0])));
}else }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 "<<arguments.size()<<". Expecting at least 1 argument.") if(arguments.size()<1)ERR("Arguments size is "<<arguments.size()<<". Expecting at least 1 argument.")
std::string connectionPointName{}; std::string connectionPointName{};
for(int i=0;std::string&arg:arguments){ for(int i=0;std::string&arg:arguments){

4
Adventures in Lestoria/assets/config/levels.txt
View File

@ -25,7 +25,7 @@ Levels
Loot[1] = Berries, 1, 1, 30% Loot[1] = Berries, 1, 1, 30%
Loot[2] = Green Gemstone, 1, 1, 5% Loot[2] = Green Gemstone, 1, 1, 5%
} }
BOSS_1 BOSS_1
{ {
Map File = Boss_1_v2.tmx Map File = Boss_1_v2.tmx
} }
@ -106,7 +106,7 @@ Levels
Loot[2] = Berries, 1, 2, 25% Loot[2] = Berries, 1, 2, 25%
Loot[3] = Green Gemstone, 1, 1, 5% Loot[3] = Green Gemstone, 1, 1, 5%
} }
BOSS_1_B BOSS_1_B
{ {
Map File = Boss_1_B.tmx Map File = Boss_1_B.tmx
} }

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.