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

ItemEnchant::AbilitySlot renamed to ItemEnchant::EnchantAbilitySlot. Release Build 12246.
All checks were successful
Emscripten Build / Build_and_Deploy_Web_Build (push) Successful in 7m13s
Details

Browse Source
This commit is contained in:
sigonasr2 2025-08-01 14:13:47 -05:00
parent 9b252334e5
commit 4d2eb86efe
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Adventures in Lestoria/Ability.h
View File

@ -56,7 +56,7 @@ struct PrecastData{
PrecastData(float castTime,float range,float size); PrecastData(float castTime,float range,float size);
}; };
enum class AbilitySlot{ enum class EnchantAbilitySlot{
ABILITY1, ABILITY1,
ABILITY2, ABILITY2,
ABILITY3, ABILITY3,

20
Adventures in Lestoria/CharacterMenuWindow.cpp
View File

@ -349,11 +349,11 @@ void Menu::InitializeCharacterMenuWindow(){
#pragma region Skill Selection Boxes #pragma region Skill Selection Boxes
const std::array abilityBoxes{ const std::array abilityBoxes{
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility1(),AbilitySlot::ABILITY1}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility1(),EnchantAbilitySlot::ABILITY1},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility2(),AbilitySlot::ABILITY2}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility2(),EnchantAbilitySlot::ABILITY2},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility3(),AbilitySlot::ABILITY3}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility3(),EnchantAbilitySlot::ABILITY3},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility4(),AbilitySlot::ABILITY4}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility4(),EnchantAbilitySlot::ABILITY4},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetRightClickAbility(),AbilitySlot::DEFENSIVE}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetRightClickAbility(),EnchantAbilitySlot::DEFENSIVE},
}; };
for(size_t i{0};auto&[ability,slot]:abilityBoxes){ for(size_t i{0};auto&[ability,slot]:abilityBoxes){
float x=8; float x=8;
@ -401,11 +401,11 @@ void Menu::InitializeCharacterMenuWindow(){
else slot->Disable(); else slot->Disable();
} }
const std::array abilityBoxes{ const std::array abilityBoxes{
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility1(),AbilitySlot::ABILITY1}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility1(),EnchantAbilitySlot::ABILITY1},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility2(),AbilitySlot::ABILITY2}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility2(),EnchantAbilitySlot::ABILITY2},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility3(),AbilitySlot::ABILITY3}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility3(),EnchantAbilitySlot::ABILITY3},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility4(),AbilitySlot::ABILITY4}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility4(),EnchantAbilitySlot::ABILITY4},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetRightClickAbility(),AbilitySlot::DEFENSIVE}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetRightClickAbility(),EnchantAbilitySlot::DEFENSIVE},
}; };
for(int i=0;i<abilityBoxes.size();i++){ for(int i=0;i<abilityBoxes.size();i++){
auto&[ability,slot]{abilityBoxes[i]}; auto&[ability,slot]{abilityBoxes[i]};

10
Adventures in Lestoria/HubPauseMenu.cpp
View File

@ -61,11 +61,11 @@ void Menu::InitializeHubPauseWindow(){
Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal()); Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal());
Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click(); Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click();
std::array abilityBoxes{ std::array abilityBoxes{
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility1(),AbilitySlot::ABILITY1}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility1(),EnchantAbilitySlot::ABILITY1},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility2(),AbilitySlot::ABILITY2}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility2(),EnchantAbilitySlot::ABILITY2},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility3(),AbilitySlot::ABILITY3}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility3(),EnchantAbilitySlot::ABILITY3},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility4(),AbilitySlot::ABILITY4}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility4(),EnchantAbilitySlot::ABILITY4},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetRightClickAbility(),AbilitySlot::DEFENSIVE}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetRightClickAbility(),EnchantAbilitySlot::DEFENSIVE},
}; };
for(size_t i{0};auto&[ability,slot]:abilityBoxes){ for(size_t i{0};auto&[ability,slot]:abilityBoxes){
//Attempt to update icons in case the abilities have changed at some point. //Attempt to update icons in case the abilities have changed at some point.

8
Adventures in Lestoria/ItemEnchant.cpp
View File

@ -102,8 +102,8 @@ void ItemEnchantInfo::Initialize(){
newEnchant.category=enchantCategory; newEnchant.category=enchantCategory;
newEnchant.name=keyName; newEnchant.name=keyName;
std::string enchantDescription{enchant["Description"].GetString()}; std::string enchantDescription{enchant["Description"].GetString()};
using enum AbilitySlot; using enum EnchantAbilitySlot;
const std::unordered_map<std::string,AbilitySlot>affectSlots{ const std::unordered_map<std::string,EnchantAbilitySlot>affectSlots{
{"Auto Attack",AUTO_ATTACK}, {"Auto Attack",AUTO_ATTACK},
{"Right Click Ability",RIGHT_CLICK}, {"Right Click Ability",RIGHT_CLICK},
{"Ability 1",ABILITY_1}, {"Ability 1",ABILITY_1},
@ -236,7 +236,7 @@ const std::string_view ItemEnchant::Description()const{
const ItemEnchantInfo::ItemEnchantCategory&ItemEnchant::Category()const{ const ItemEnchantInfo::ItemEnchantCategory&ItemEnchant::Category()const{
return GetEnchantInfo().Category(); return GetEnchantInfo().Category();
} }
const std::optional<ItemEnchantInfo::AbilitySlot>&ItemEnchant::AbilitySlot()const{ const std::optional<ItemEnchantInfo::EnchantAbilitySlot>&ItemEnchant::EnchantAbilitySlot()const{
return GetEnchantInfo().abilitySlot; return GetEnchantInfo().abilitySlot;
} }
const std::unordered_map<std::string,ItemEnchantInfo>&ItemEnchantInfo::GetEnchants(){ const std::unordered_map<std::string,ItemEnchantInfo>&ItemEnchantInfo::GetEnchants(){
@ -324,7 +324,7 @@ const Pixel&ItemEnchant::DisplayCol()const{
return ItemEnchantInfo::enchantTextDisplayCol.at(Category()); return ItemEnchantInfo::enchantTextDisplayCol.at(Category());
} }
const std::optional<ItemEnchantInfo::AbilitySlot>&ItemEnchantInfo::GetAbilitySlot()const{ const std::optional<ItemEnchantInfo::EnchantAbilitySlot>&ItemEnchantInfo::GetAbilitySlot()const{
return abilitySlot; return abilitySlot;
} }

8
Adventures in Lestoria/ItemEnchant.h
View File

@ -56,7 +56,7 @@ public:
CLASS, CLASS,
UNIQUE, UNIQUE,
}; };
enum class AbilitySlot{ enum class EnchantAbilitySlot{
AUTO_ATTACK, AUTO_ATTACK,
RIGHT_CLICK, RIGHT_CLICK,
ABILITY_1, ABILITY_1,
@ -84,7 +84,7 @@ public:
const std::string_view Description()const; const std::string_view Description()const;
const ItemEnchantCategory&Category()const; const ItemEnchantCategory&Category()const;
const std::optional<Class>&GetClass()const; const std::optional<Class>&GetClass()const;
const std::optional<AbilitySlot>&GetAbilitySlot()const; const std::optional<EnchantAbilitySlot>&GetAbilitySlot()const;
const std::optional<Ability*>GetAbility()const; //Get the ability this enchant is tied to. const std::optional<Ability*>GetAbility()const; //Get the ability this enchant is tied to.
const Pixel&DisplayCol()const; const Pixel&DisplayCol()const;
const float GetConfigValue(const std::string_view keyName)const; const float GetConfigValue(const std::string_view keyName)const;
@ -104,7 +104,7 @@ private:
std::string name; std::string name;
std::string description; std::string description;
std::optional<Class>abilityClass; std::optional<Class>abilityClass;
std::optional<AbilitySlot>abilitySlot; std::optional<EnchantAbilitySlot>abilitySlot;
ItemAttributable minStatModifiers; ItemAttributable minStatModifiers;
ItemAttributable maxStatModifiers; ItemAttributable maxStatModifiers;
std::unordered_map<std::string,float>config; std::unordered_map<std::string,float>config;
@ -121,7 +121,7 @@ public:
const std::string Name(ItemEnchantInfo::TextStyle style=ItemEnchantInfo::TextStyle::NORMAL)const; const std::string Name(ItemEnchantInfo::TextStyle style=ItemEnchantInfo::TextStyle::NORMAL)const;
const std::string_view Description()const; const std::string_view Description()const;
const ItemEnchantInfo::ItemEnchantCategory&Category()const; const ItemEnchantInfo::ItemEnchantCategory&Category()const;
const std::optional<ItemEnchantInfo::AbilitySlot>&AbilitySlot()const; const std::optional<ItemEnchantInfo::EnchantAbilitySlot>&EnchantAbilitySlot()const;
const static std::vector<ItemEnchantInfo>GetAvailableEnchants(); const static std::vector<ItemEnchantInfo>GetAvailableEnchants();
//Rolls a class-appropriate random enchant. //Rolls a class-appropriate random enchant.
const static ItemEnchant RollRandomEnchant(const std::optional<ItemEnchant>previousEnchant={}); const static ItemEnchant RollRandomEnchant(const std::optional<ItemEnchant>previousEnchant={});

10
Adventures in Lestoria/PauseMenu.cpp
View File

@ -60,11 +60,11 @@ void Menu::InitializePauseWindow(){
Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal()); Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal());
Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click(); Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click();
std::array abilityBoxes{ std::array abilityBoxes{
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility1(),AbilitySlot::ABILITY1}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility1(),EnchantAbilitySlot::ABILITY1},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility2(),AbilitySlot::ABILITY2}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility2(),EnchantAbilitySlot::ABILITY2},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility3(),AbilitySlot::ABILITY3}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility3(),EnchantAbilitySlot::ABILITY3},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetAbility4(),AbilitySlot::ABILITY4}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetAbility4(),EnchantAbilitySlot::ABILITY4},
std::pair<std::reference_wrapper<Ability>,AbilitySlot>{game->GetPlayer()->GetRightClickAbility(),AbilitySlot::DEFENSIVE}, std::pair<std::reference_wrapper<Ability>,EnchantAbilitySlot>{game->GetPlayer()->GetRightClickAbility(),EnchantAbilitySlot::DEFENSIVE},
}; };
for(size_t i{0};auto&[ability,slot]:abilityBoxes){ for(size_t i{0};auto&[ability,slot]:abilityBoxes){
//Attempt to update icons in case the abilities have changed at some point. //Attempt to update icons in case the abilities have changed at some point.

4
Adventures in Lestoria/Player.cpp
View File

@ -2328,8 +2328,8 @@ const std::unordered_set<std::string>&Player::GetEnchants()const{
return enchantList; return enchantList;
} }
const Ability&Player::GetAbility(AbilitySlot slot){ const Ability&Player::GetAbility(EnchantAbilitySlot slot){
using enum AbilitySlot; using enum EnchantAbilitySlot;
switch(slot){ switch(slot){
case ABILITY1:return GetAbility1(); case ABILITY1:return GetAbility1();
case ABILITY2:return GetAbility2(); case ABILITY2:return GetAbility2();

2
Adventures in Lestoria/Player.h
View File

@ -230,7 +230,7 @@ public:
virtual Ability&GetAbility2()=0; virtual Ability&GetAbility2()=0;
virtual Ability&GetAbility3()=0; virtual Ability&GetAbility3()=0;
virtual Ability&GetAbility4()=0; virtual Ability&GetAbility4()=0;
const Ability&GetAbility(AbilitySlot slot); const Ability&GetAbility(EnchantAbilitySlot slot);
virtual void SetAbility4(const Ability&originalAbility)=0; //NOTE: Make sure to provide the original ability and not a current ability! virtual void SetAbility4(const Ability&originalAbility)=0; //NOTE: Make sure to provide the original ability and not a current ability!
virtual std::string&GetWalkNAnimation()=0; virtual std::string&GetWalkNAnimation()=0;
virtual std::string&GetWalkEAnimation()=0; virtual std::string&GetWalkEAnimation()=0;

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 12245 #define VERSION_BUILD 12246
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

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

Binary file not shown.