Fix having the exact amount of XP not actually leveling you up. Fix strange shadow text clipping for text scaled less than 1.0 vertically. Release Build 8068.

This commit is contained in:
sigonasr2 2024-03-08 23:40:04 -06:00
parent f588de19d0
commit 8917efbc51
13 changed files with 18 additions and 11 deletions

View File

@ -1282,7 +1282,7 @@ void Player::AddXP(const uint32_t xpGain){
totalXPEarned+=xpGain; totalXPEarned+=xpGain;
if(Level()<LevelCap()){ if(Level()<LevelCap()){
uint32_t nextLevelXP=NextLevelXPRequired(); uint32_t nextLevelXP=NextLevelXPRequired();
while(currentLevelXP>nextLevelXP){ while(currentLevelXP>=nextLevelXP){
currentLevelXP-=nextLevelXP; currentLevelXP-=nextLevelXP;
SetLevel(Level()+1); SetLevel(Level()+1);
OnLevelUp(); OnLevelUp();

View File

@ -101,5 +101,7 @@ void State_Death::OnUserUpdate(AiL*game){
accTime=0.f; accTime=0.f;
} }
} }
game->ClearTimedOutGarbage();
} }
void State_Death::Draw(AiL*game){} void State_Death::Draw(AiL*game){}

View File

@ -64,6 +64,7 @@ void State_GameHub::OnLevelLoad(){
} }
void State_GameHub::OnUserUpdate(AiL*game){ void State_GameHub::OnUserUpdate(AiL*game){
State_GameRun::OnUserUpdate(game); State_GameRun::OnUserUpdate(game);
game->ClearTimedOutGarbage();
} }
void State_GameHub::Draw(AiL*game){ void State_GameHub::Draw(AiL*game){
State_GameRun::Draw(game); State_GameRun::Draw(game);

View File

@ -124,6 +124,8 @@ void State_LevelComplete::OnUserUpdate(AiL*game){
}else{ }else{
Audio::Engine().SetVolume(xpGainSound,0.f); Audio::Engine().SetVolume(xpGainSound,0.f);
} }
game->ClearTimedOutGarbage();
}; };
void State_LevelComplete::Draw(AiL*game){ void State_LevelComplete::Draw(AiL*game){
game->RenderHud(); game->RenderHud();

View File

@ -74,6 +74,8 @@ void State_MainMenu::OnUserUpdate(AiL*game){
ItemDrop::UpdateDrops(game->GetElapsedTime()); ItemDrop::UpdateDrops(game->GetElapsedTime());
game->UpdateBullets(game->GetElapsedTime()); game->UpdateBullets(game->GetElapsedTime());
game->UpdateCamera(game->GetElapsedTime()); game->UpdateCamera(game->GetElapsedTime());
game->ClearTimedOutGarbage();
}; };
void State_MainMenu::Draw(AiL*game){ void State_MainMenu::Draw(AiL*game){
TitleScreen::Draw(); TitleScreen::Draw();

View File

@ -151,6 +151,8 @@ void State_OverworldMap::OnUserUpdate(AiL*game){
if(abs(game->KEY_SCROLLVERT_L.Analog())<0.2f&&abs(game->KEY_SCROLLHORZ_L.Analog())<0.2f){ if(abs(game->KEY_SCROLLVERT_L.Analog())<0.2f&&abs(game->KEY_SCROLLHORZ_L.Analog())<0.2f){
analogMove=false; analogMove=false;
} }
game->ClearTimedOutGarbage();
}; };
void State_OverworldMap::Draw(AiL*game){ void State_OverworldMap::Draw(AiL*game){
currentTime+=game->GetElapsedTime(); currentTime+=game->GetElapsedTime();

View File

@ -38,6 +38,7 @@ All rights reserved.
#include "State_Story.h" #include "State_Story.h"
#include "VisualNovel.h" #include "VisualNovel.h"
#include "Menu.h" #include "Menu.h"
#include "AdventuresInLestoria.h"
void State_Story::OnStateChange(GameState*prevState){ void State_Story::OnStateChange(GameState*prevState){
Menu::CloseAllMenus(); Menu::CloseAllMenus();
@ -45,6 +46,7 @@ void State_Story::OnStateChange(GameState*prevState){
void State_Story::OnLevelLoad(){} void State_Story::OnLevelLoad(){}
void State_Story::OnUserUpdate(AiL*game){ void State_Story::OnUserUpdate(AiL*game){
VisualNovel::novel.Update(); VisualNovel::novel.Update();
game->ClearTimedOutGarbage();
}; };
void State_Story::Draw(AiL*game){ void State_Story::Draw(AiL*game){
VisualNovel::novel.Draw(); VisualNovel::novel.Draw();

View File

@ -11,7 +11,3 @@ should gemstones dropp from boss stages aswell? (Maybe lower droprate?)
Funny text colors with text color override on blacksmith menu Funny text colors with text color override on blacksmith menu
Toggle for displaying error messages Toggle for displaying error messages
Fix size of icons in merchant menus.
Sherman's consumable crafting menu needs enabling/disabling of +/- buttons
Label doesn't constantly update in the merchant window.

View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 5 #define VERSION_MINOR 5
#define VERSION_PATCH 1 #define VERSION_PATCH 1
#define VERSION_BUILD 8066 #define VERSION_BUILD 8068
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -707,7 +707,7 @@ void olc::ViewPort::DrawShadowStringDecal(const olc::vf2d& pos, std::string_view
vi2d imageSize=pge->GetWrappedTextSize(sText,width,scale); vi2d imageSize=pge->GetWrappedTextSize(sText,width,scale);
Decal*newDecal=nullptr; Decal*newDecal=nullptr;
if(!pge->garbageCollector.count(key)){ if(!pge->garbageCollector.count(key)){
newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
pge->garbageCollector[key].decal=newDecal; pge->garbageCollector[key].decal=newDecal;
}else{ }else{
newDecal=pge->garbageCollector[key].decal; newDecal=pge->garbageCollector[key].decal;
@ -754,7 +754,7 @@ void olc::ViewPort::DrawShadowStringPropDecal(const olc::vf2d& pos, std::string_
vi2d imageSize=pge->GetWrappedTextSizeProp(sText,width,scale); vi2d imageSize=pge->GetWrappedTextSizeProp(sText,width,scale);
Decal*newDecal=nullptr; Decal*newDecal=nullptr;
if(!pge->garbageCollector.count(key)){ if(!pge->garbageCollector.count(key)){
newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
pge->garbageCollector[key].decal=newDecal; pge->garbageCollector[key].decal=newDecal;
}else{ }else{
newDecal=pge->garbageCollector[key].decal; newDecal=pge->garbageCollector[key].decal;

View File

@ -3552,7 +3552,7 @@ namespace olc
vi2d imageSize=GetWrappedTextSize(sText,width,scale); vi2d imageSize=GetWrappedTextSize(sText,width,scale);
Decal*newDecal=nullptr; Decal*newDecal=nullptr;
if(!garbageCollector.count(key)){ if(!garbageCollector.count(key)){
newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
garbageCollector[key].decal=newDecal; garbageCollector[key].decal=newDecal;
}else{ }else{
newDecal=garbageCollector[key].decal; newDecal=garbageCollector[key].decal;
@ -3654,7 +3654,7 @@ namespace olc
vi2d imageSize=GetWrappedTextSizeProp(sText,width,scale); vi2d imageSize=GetWrappedTextSizeProp(sText,width,scale);
Decal*newDecal=nullptr; Decal*newDecal=nullptr;
if(!garbageCollector.count(key)){ if(!garbageCollector.count(key)){
newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.y/scale.x)); newDecal=new Decal(new Sprite(imageSize.x/scale.x,imageSize.x/scale.x));
garbageCollector[key].decal=newDecal; garbageCollector[key].decal=newDecal;
}else{ }else{
newDecal=garbageCollector[key].decal; newDecal=garbageCollector[key].decal;