diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
index 95f18045..a087d11f 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
@@ -745,7 +745,7 @@
-
+
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
index 71f0f2e2..b7496ad6 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
@@ -791,7 +791,7 @@
Source Files\Interface
-
+
Source Files\Interface
diff --git a/Adventures in Lestoria/CharacterAbilityPreviewComponent.h b/Adventures in Lestoria/CharacterAbilityPreviewComponent.h
index 4c1fca48..dfaa9596 100644
--- a/Adventures in Lestoria/CharacterAbilityPreviewComponent.h
+++ b/Adventures in Lestoria/CharacterAbilityPreviewComponent.h
@@ -64,10 +64,11 @@ protected:
float boxWidth=rect.size.y-4; //No, the y is not a typo. It's a square, we use the y to determine the x.
window.DrawRectDecal(rect.pos+vi2d{2,2},vi2d{int(rect.size.y)-4,int(rect.size.y)-4});
- window.DrawDecal(iconPos,GFX[ability->icon].Decal());
+ window.DrawDecal(iconPos,GFX[ability->icon].Decal(),{1.33f,1.33f});
- vi2d descriptionPos=iconPos+vi2d{int(rect.size.y)-2,-1};
+ vi2d descriptionPos=iconPos+vi2d{int(rect.size.y)-2,9};
+ window.DrawShadowStringPropDecal(descriptionPos-vf2d{0,10},ability->name,{0xFF,0xAF,0x56},BLACK,{0.8f,1.f},int(rect.size.x-(descriptionPos.x-rect.pos.x))-4);
window.DrawShadowStringPropDecal(descriptionPos,ability->description,WHITE,BLACK,{0.8f,1.f},int(rect.size.x-(descriptionPos.x-rect.pos.x))-4);
InputType controlType=KEY;
diff --git a/Adventures in Lestoria/CharacterInfoWindow.cpp b/Adventures in Lestoria/ClassInfoWindow.cpp
similarity index 86%
rename from Adventures in Lestoria/CharacterInfoWindow.cpp
rename to Adventures in Lestoria/ClassInfoWindow.cpp
index 9299d1c1..04efc66a 100644
--- a/Adventures in Lestoria/CharacterInfoWindow.cpp
+++ b/Adventures in Lestoria/ClassInfoWindow.cpp
@@ -48,7 +48,7 @@ INCLUDE_DATA
using A=Attribute;
void Menu::InitializeClassInfoWindow(){
- Menu*classInfoWindow=CreateMenu(CLASS_INFO,CENTERED,game->GetScreenSize()-vi2d{24,24});
+ Menu*classInfoWindow=CreateMenu(CLASS_INFO,CENTERED,game->GetScreenSize()-vi2d{24,0});
Menu*classSelectionWindow=Menu::menus[CLASS_SELECTION];
ClassInfo data=classutils::GetClassInfo(classSelectionWindow->S(A::CLASS_SELECTION));
@@ -66,12 +66,12 @@ void Menu::InitializeClassInfoWindow(){
vf2d abilityIconOffsets = {0,32};
- classInfoWindow->ADD("Ability 1 Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,32*0}+abilityIconOffsets,labelSize*vf2d{1,2}},data.ability1)END;
- classInfoWindow->ADD("Ability 2 Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,32*1}+abilityIconOffsets,labelSize*vf2d{1,2}},data.ability2)END;
- classInfoWindow->ADD("Ability 3 Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,32*2}+abilityIconOffsets,labelSize*vf2d{1,2}},data.ability3)END;
- classInfoWindow->ADD("Right Click Ability Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,32*3}+abilityIconOffsets,labelSize*vf2d{1,2}},data.rightClickAbility)END;
+ classInfoWindow->ADD("Ability 1 Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,40*0}+abilityIconOffsets,labelSize*vf2d{1,2}+vf2d{0,8}},data.ability1)END;
+ classInfoWindow->ADD("Ability 2 Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,40*1}+abilityIconOffsets,labelSize*vf2d{1,2}+vf2d{0,8}},data.ability2)END;
+ classInfoWindow->ADD("Ability 3 Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,40*2}+abilityIconOffsets,labelSize*vf2d{1,2}+vf2d{0,8}},data.ability3)END;
+ classInfoWindow->ADD("Right Click Ability Display",CharacterAbilityPreviewComponent)(geom2d::rect{healthDisplayLabelPos+vf2d{0,40*3}+abilityIconOffsets,labelSize*vf2d{1,2}+vf2d{0,8}},data.rightClickAbility)END;
- classInfoWindow->ADD("Back Button",MenuComponent)(geom2d::rect{{classInfoWindow->center().x/2,healthDisplayLabelPos.y+32*4+abilityIconOffsets.y+12},{classInfoWindow->size.x/2,16}},"Back",[](MenuFuncData data){Menu::CloseMenu();return true;})END;
+ classInfoWindow->ADD("Back Button",MenuComponent)(geom2d::rect{{0.f,healthDisplayLabelPos.y+32*4+abilityIconOffsets.y+16},{classInfoWindow->size.x/3-6.f,12}},"Back",[](MenuFuncData data){Menu::CloseMenu();return true;})END;
classInfoWindow->SetupKeyboardNavigation(
[](MenuType type,Data&returnData){ //On Open
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index 1fb0cfb9..c2b7763e 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 10044
+#define VERSION_BUILD 10050
#define stringify(a) stringify_(a)
#define stringify_(a) #a
diff --git a/Adventures in Lestoria/assets/config/classes/Trapper.txt b/Adventures in Lestoria/assets/config/classes/Trapper.txt
index d6349b58..52a858fd 100644
--- a/Adventures in Lestoria/assets/config/classes/Trapper.txt
+++ b/Adventures in Lestoria/assets/config/classes/Trapper.txt
@@ -97,7 +97,7 @@ Trapper
{
Name = Explosive Trap
Short Name = EXTRAP
- Description = A trap exploding on touch/5 seconds, applying marks to targets hit. Already marked targets trigger 2 marks.
+ Description = Explodes on touch or in 5 seconds, marks hit targets. Already marked targets triggers mark twice.
Icon = block.png
Cooldown = 0
Mana Cost = 0
diff --git a/Adventures in Lestoria/assets/config/classes/Warrior.txt b/Adventures in Lestoria/assets/config/classes/Warrior.txt
index ceb292ae..a9dd266b 100644
--- a/Adventures in Lestoria/assets/config/classes/Warrior.txt
+++ b/Adventures in Lestoria/assets/config/classes/Warrior.txt
@@ -112,7 +112,7 @@ Warrior
# Whether or not this ability cancels casts.
CancelCast = 1
- Description = Leaps and then dives into the ground, knocking back and destroying everything nearby in the process.
+ Description = Leaps and dive into the ground, knocking back and damaging nearby enemies in the process.
#RGB Values. Color 1 is the circle at full cooldown, Color 2 is the color at empty cooldown.
Cooldown Bar Color 1 = 64, 0, 0, 192
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index 27d788be..23d2e33b 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ