diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 9315daa6..8ae99045 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -1340,9 +1340,9 @@ void AiL::RenderWorld(float fElapsedTime){ if(dn->lifeTime<=1){ if(dn->lifeTimeinvertedDirection){ - dn->pos.y+=40*fElapsedTime; + dn->pos.y+=dn->riseSpd*fElapsedTime; }else{ - dn->pos.y-=20*fElapsedTime; + dn->pos.y-=dn->riseSpd*fElapsedTime; } } } diff --git a/Adventures in Lestoria/DamageNumber.cpp b/Adventures in Lestoria/DamageNumber.cpp index bba0b4b1..6327a026 100644 --- a/Adventures in Lestoria/DamageNumber.cpp +++ b/Adventures in Lestoria/DamageNumber.cpp @@ -44,5 +44,6 @@ DamageNumber::DamageNumber() } DamageNumber::DamageNumber(vf2d pos,int damage,bool friendly,DamageNumberType type): - pos(pos),damage(damage),friendly(friendly),type(type),invertedDirection(type==INTERRUPT){ + pos(pos),damage(damage),friendly(friendly),type(type),invertedDirection(type==INTERRUPT),riseSpd(20.f){ + if(type==INTERRUPT||type==MANA_GAIN)riseSpd=40.f; } \ No newline at end of file diff --git a/Adventures in Lestoria/DamageNumber.h b/Adventures in Lestoria/DamageNumber.h index d2ac15f4..78f7158d 100644 --- a/Adventures in Lestoria/DamageNumber.h +++ b/Adventures in Lestoria/DamageNumber.h @@ -51,6 +51,7 @@ struct DamageNumber{ int damage; float lifeTime=0; float pauseTime=0; + float riseSpd=0.f; bool friendly=false; bool invertedDirection=false; DamageNumberType type=HEALTH_LOSS; diff --git a/Adventures in Lestoria/InventoryCreator.cpp b/Adventures in Lestoria/InventoryCreator.cpp index edc88a95..332dc7c5 100644 --- a/Adventures in Lestoria/InventoryCreator.cpp +++ b/Adventures in Lestoria/InventoryCreator.cpp @@ -64,7 +64,7 @@ std::function std::function InventoryCreator::Player_AddButtonOnSlotUpdate= [](InventoryScrollableWindowComponent&component,ITCategory cat){ size_t invSize=component.components.size()+1; - int invWidth=int(component.rect.size.x/(float(component.options.size.x)+component.options.padding)); + int invWidth=int((component.rect.size.x-12)/(float(component.options.size.x)+component.options.padding)); int x=int((invSize-1)%invWidth); int y=int((invSize-1)/invWidth); int itemIndex=y*invWidth+x; diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 99d553ac..38720c29 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -55,4 +55,12 @@ ERR messages become just output messages in release build and won't crash the ga {"Load Game Button",{ .up="New Game Button", .down="Quit Game Button",}}, - }); \ No newline at end of file + }); + + +- Equipment purchase method changes: +ok equipment cant be sold currently anyway. +So i think the easiest solution would be making gear unique. buying and upgrading it could be at the exact same location then. + +Only thing that needs to be changed in the ui would be removing the equipment tab in the vendor sell menu. +[12:07 AM]sigonasr2: So the process goes: See current list of gear, first you buy it, then you can choose it again to continuously upgrade it \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 85fe0182..20728461 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 6212 +#define VERSION_BUILD 6216 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx index f47ff588..cb31d889 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx @@ -1,5 +1,5 @@ - + diff --git a/Adventures in Lestoria/x64/Release Desktop/Crawler.res b/Adventures in Lestoria/x64/Release Desktop/Crawler.res deleted file mode 100644 index 93c41532..00000000 Binary files a/Adventures in Lestoria/x64/Release Desktop/Crawler.res and /dev/null differ diff --git a/runGame.bat b/runGame.bat index 3a3485b9..70fd8dd2 100644 --- a/runGame.bat +++ b/runGame.bat @@ -1,2 +1,3 @@ cd "Adventures in Lestoria" -"..\x64\Release\Adventures in Lestoria.exe" \ No newline at end of file +"..\x64\Release\Adventures in Lestoria.exe" +set /p DUMMY=Hit ENTER to exit... \ No newline at end of file diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 8c166ca9..a08a5fe2 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ