diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj index a8dee96a..f5627b95 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj @@ -1117,6 +1117,7 @@ + diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters index 5ac8282a..8b600ac8 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters @@ -1286,6 +1286,9 @@ Documentation\Mechanics + + Documentation + diff --git a/Adventures in Lestoria/ClassSelectionWindow.cpp b/Adventures in Lestoria/ClassSelectionWindow.cpp index a45f1e97..5a700353 100644 --- a/Adventures in Lestoria/ClassSelectionWindow.cpp +++ b/Adventures in Lestoria/ClassSelectionWindow.cpp @@ -165,12 +165,6 @@ void Menu::InitializeClassSelectionWindow(){ data.menu.components["Confirm"]->S(A::CLASS_SELECTION)=data.component.lock()->S(A::CLASS_SELECTION); return true; })END; - - if(i>=3){ - classLabel->SetGrayedOut(true); - classButton->SetGrayedOut(true); - classSprite->SetGrayedOut(true); - } classSprite->S(A::CLASS_SELECTION)=className; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 5d17c886..8d5aea2f 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 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 9906 +#define VERSION_BUILD 9911 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/VisualNovel.cpp b/Adventures in Lestoria/VisualNovel.cpp index 312c48f8..e1f8c095 100644 --- a/Adventures in Lestoria/VisualNovel.cpp +++ b/Adventures in Lestoria/VisualNovel.cpp @@ -306,15 +306,7 @@ void VisualNovel::Draw(){ } std::string VisualNovel::GetCharacterImage(std::u32string name){ if(name==U"You"){ //Assume we are using female player avatar for now! - switch(game->GetPlayer()->GetClass()){ - case Class::WARRIOR:{ - return "character_image_location"_S+"Player_F.png"; - }break; - case Class::WIZARD:{ - return "character_image_location"_S+"Wizard_F.png"; - }break; - default:return "character_image_location"_S+"Player_F.png"; - } + return std::format("{}{}_F.png","character_image_location"_S,game->GetPlayer()->GetClassName()); } return "character_image_location"_S+std::string(name.begin(),name.end())+".png"; } diff --git a/Adventures in Lestoria/assets/config/classes/Ranger.txt b/Adventures in Lestoria/assets/config/classes/Ranger.txt index e395f229..f5b25106 100644 --- a/Adventures in Lestoria/assets/config/classes/Ranger.txt +++ b/Adventures in Lestoria/assets/config/classes/Ranger.txt @@ -10,7 +10,7 @@ Ranger # Amount of attack gained per level. AtkGrowthRate = 3 - FullRender = unknown_full_render.png + FullRender = characters/commercial_assets/Ranger_F_NoOutline.png Auto Attack { diff --git a/Adventures in Lestoria/assets/config/classes/Trapper.txt b/Adventures in Lestoria/assets/config/classes/Trapper.txt index 363e42e7..4cbd10f4 100644 --- a/Adventures in Lestoria/assets/config/classes/Trapper.txt +++ b/Adventures in Lestoria/assets/config/classes/Trapper.txt @@ -10,7 +10,7 @@ Trapper # Amount of attack gained per level. AtkGrowthRate = 0.2 - FullRender = unknown_full_render.png + FullRender = characters/commercial_assets/Trapper_F_NoOutline.png Right Click Ability { diff --git a/Adventures in Lestoria/assets/config/classes/Witch.txt b/Adventures in Lestoria/assets/config/classes/Witch.txt index 3d986763..989ffb07 100644 --- a/Adventures in Lestoria/assets/config/classes/Witch.txt +++ b/Adventures in Lestoria/assets/config/classes/Witch.txt @@ -10,7 +10,7 @@ Witch # Amount of attack gained per level. AtkGrowthRate = 0.2 - FullRender = unknown_full_render.png + FullRender = characters/commercial_assets/Witch_F_NoOutline.png Right Click Ability { diff --git a/Adventures in Lestoria/assets/config/gfx/gfx.txt b/Adventures in Lestoria/assets/config/gfx/gfx.txt index f99cec7a..a6935985 100644 --- a/Adventures in Lestoria/assets/config/gfx/gfx.txt +++ b/Adventures in Lestoria/assets/config/gfx/gfx.txt @@ -127,5 +127,8 @@ Images # Full Class Icons GFX_Warrior_Full = characters/commercial_assets/Player_F_NoOutline.png GFX_Wizard_Full = characters/commercial_assets/Wizard_F_NoOutline.png + GFX_Ranger_Full = characters/commercial_assets/Ranger_F_NoOutline.png + GFX_Trapper_Full = characters/commercial_assets/Trapper_F_NoOutline.png + GFX_Witch_Full = characters/commercial_assets/Witch_F_NoOutline.png GFX_Unknown_Full = unknown_full_render.png } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index ff82f6ad..24ab9b74 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index c85cb419..dfe9243c 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ