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

Restock loadout items from previous setup automatically.

Browse Source
This commit is contained in:
sigonasr2, Sig, Sigo 2024-03-01 18:28:29 +00:00
parent f1dc45ea95
commit 84e713b9a2
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Adventures in Lestoria/AdventuresInLestoria.cpp
View File

@ -3225,6 +3225,14 @@ const std::weak_ptr<Item>AiL::GetLoadoutItem(int slot){
return loadout[slot]; return loadout[slot];
} }
void AiL::RestockLoadoutItems(){
for(int i=0;i<GetLoadoutSize();i++){
if(!ISBLANK(GetLoadoutItem(i))){
SetLoadoutItem(i,GetLoadoutItem(i).lock()->ActualName);
}
}
}
void AiL::SetLoadoutItem(int slot,std::string itemName){ void AiL::SetLoadoutItem(int slot,std::string itemName){
if(slot<0||slot>GetLoadoutSize()-1)ERR("Invalid inventory slot "+std::to_string(slot)+", please choose a slot in range (0-"+std::to_string(GetLoadoutSize()-1)+")."); if(slot<0||slot>GetLoadoutSize()-1)ERR("Invalid inventory slot "+std::to_string(slot)+", please choose a slot in range (0-"+std::to_string(GetLoadoutSize()-1)+").");
if(Inventory::GetItemCount(itemName)>0){ if(Inventory::GetItemCount(itemName)>0){

1
Adventures in Lestoria/AdventuresInLestoria.h
View File

@ -273,6 +273,7 @@ public:
const std::weak_ptr<Item>GetLoadoutItem(int slot); const std::weak_ptr<Item>GetLoadoutItem(int slot);
void SetLoadoutItem(int slot,std::string itemName); void SetLoadoutItem(int slot,std::string itemName);
int GetLoadoutSize()const; int GetLoadoutSize()const;
void RestockLoadoutItems();
//Returns true if the item can be used (we have >0 of it) //Returns true if the item can be used (we have >0 of it)
bool UseLoadoutItem(int slot); bool UseLoadoutItem(int slot);
//Blanks out this loadout item. //Blanks out this loadout item.

2
Adventures in Lestoria/OverworldMapLevelWindow.cpp
View File

@ -67,6 +67,8 @@ void Menu::InitializeOverworldMapLevelWindow(){
Tutorial::SetNextTask(TutorialTaskName::BLACKSMITH); Tutorial::SetNextTask(TutorialTaskName::BLACKSMITH);
} }
game->RestockLoadoutItems();
if(game->MAP_DATA[State_OverworldMap::GetCurrentConnectionPoint().map].skipLoadoutScreen|| if(game->MAP_DATA[State_OverworldMap::GetCurrentConnectionPoint().map].skipLoadoutScreen||
State_OverworldMap::GetCurrentConnectionPoint().type.starts_with("STORY")){ State_OverworldMap::GetCurrentConnectionPoint().type.starts_with("STORY")){
State_OverworldMap::StartLevel(); State_OverworldMap::StartLevel();