diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 693a0846..3d0a09a2 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -3147,6 +3147,8 @@ void AiL::InitializeGraphics(){ LoadResource(image,"GFX_Prefix"_S+img); } std::cout<GetMouse(0).bHeld&&!geom2d::contains(rect,bounds)&& geom2d::overlaps(geom2d::rect(windowAbsPos+vf2d{rect.size.x-12.f,12.f},{12.f,rect.size.y-12.f}),game->GetMousePos())){ - ScrollToClickedPosition(); + ScrollToClickedPosition(); + scrollBarSelected=true; Menu::menus[parentMenu]->alreadyClicked=true; } } diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 433834bc..3b5aaf06 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 5 #define VERSION_PATCH 1 -#define VERSION_BUILD 8155 +#define VERSION_BUILD 8165 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/credits.txt b/Adventures in Lestoria/assets/config/credits.txt index f79d3365..eb144ec9 100644 --- a/Adventures in Lestoria/assets/config/credits.txt +++ b/Adventures in Lestoria/assets/config/credits.txt @@ -23,14 +23,14 @@ Credits LINE[20]="#FE9900javidx9#FFFFFF" LINE[21]="#FEF500olc::PixelGameEngine v.2.25#FFFFFF" LINE[22]=" " - LINE[23]="olcPGEX_MiniAudio Copyright© 2024 by Moros Smith under the OLC-3 License" + LINE[23]="olcPGEX_MiniAudio Copyright` 2024 by Moros Smith under the OLC-3 License" LINE[24]=" " LINE[25]="olcPGEX_ViewPort by Gorbit99" LINE[26]=" " - LINE[27]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License" + LINE[27]="miniaudio library Copyright` 2024 by David Reid under the MIT No Attribution License" LINE[28]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/" LINE[29]=" " - LINE[30]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved." + LINE[30]="Portions of this software are copyright ` 2024 The FreeType Project (www.freetype.org). All rights reserved." LINE[31]=" " LINE[32]="Assets" LINE[33]="~~~~~~~~~~~~~~~~" @@ -57,7 +57,7 @@ Credits LINE[54]="License (OLC-3)" LINE[55]="~~~~~~~~~~~~~~~" LINE[56]=" " - LINE[57]="Copyright 2024 Joshua Sigona " + LINE[57]="Copyright ` 2024 Sig Productions " LINE[58]=" " LINE[59]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:" LINE[60]=" " @@ -68,4 +68,9 @@ Credits LINE[65]="3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission." LINE[66]=" " LINE[67]="THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + LINE[68]=" " + LINE[69]=" " + LINE[70]=" " + LINE[71]=" " + LINE[72]=" " } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/config/gfx/gfx.txt b/Adventures in Lestoria/assets/config/gfx/gfx.txt index 7fb0ee8e..071359e6 100644 --- a/Adventures in Lestoria/assets/config/gfx/gfx.txt +++ b/Adventures in Lestoria/assets/config/gfx/gfx.txt @@ -83,6 +83,7 @@ Images GFX_Lock = lock.png GFX_Unlock = unlock.png GFX_SwordSlash = swordslash.png + GFX_CustomFont = font.png # Ability Icons GFX_Warrior_BattleCry_Icon = Ability Icons/battlecry.png diff --git a/Adventures in Lestoria/assets/font.png b/Adventures in Lestoria/assets/font.png new file mode 100644 index 00000000..4fa4bf09 Binary files /dev/null and b/Adventures in Lestoria/assets/font.png differ diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 94ebe1d0..81509315 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/Adventures in Lestoria/olcPGEX_SplashScreen.h b/Adventures in Lestoria/olcPGEX_SplashScreen.h index 2ec4dec2..5b7c70d8 100644 --- a/Adventures in Lestoria/olcPGEX_SplashScreen.h +++ b/Adventures in Lestoria/olcPGEX_SplashScreen.h @@ -210,8 +210,8 @@ namespace olc pge->DrawPartialDecal(vScale * vBoom[y * spr.Sprite()->width + x].first * 2.0f, spr.Decal(), olc::vf2d(x, y), { 1, 1 }, vScale * 2.0f, olc::PixelF(1.0f, 1.0f, 1.0f, std::min(1.0f, std::max(4.0f - fParticleTime, 0.0f)))); } - olc::vi2d vSize = pge->GetTextSizeProp("Copyright OneLoneCoder.com 2024"); - pge->DrawStringPropDecal(olc::vf2d(float(pge->ScreenWidth()/2) - vSize.x/2, float(pge->ScreenHeight()) - vSize.y * 3.0f), "Copyright OneLoneCoder.com 2024", olc::PixelF(1.0f, 1.0f, 1.0f, 0.5f), olc::vf2d(1.0, 2.0f)); + olc::vi2d vSize = pge->GetTextSizeProp("Copyright ` OneLoneCoder.com 2024"); + pge->DrawStringPropDecal(olc::vf2d(float(pge->ScreenWidth()/2) - vSize.x/2, float(pge->ScreenHeight()) - vSize.y * 3.0f), "Copyright ` OneLoneCoder.com 2024", olc::PixelF(1.0f, 1.0f, 1.0f, 0.5f), olc::vf2d(1.0, 2.0f)); return true; } diff --git a/Adventures in Lestoria/olcPixelGameEngine.h b/Adventures in Lestoria/olcPixelGameEngine.h index c67327b4..d65606ba 100644 --- a/Adventures in Lestoria/olcPixelGameEngine.h +++ b/Adventures in Lestoria/olcPixelGameEngine.h @@ -1223,6 +1223,7 @@ namespace olc olc::Sprite* GetFontSprite(); // Returns the font image olc::Decal* GetFontDecal(); + void SetFontSprite(std::string_view filename); // Clip a line segment to visible area bool ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2); @@ -2592,6 +2593,8 @@ namespace olc { return fontRenderable.Sprite(); } olc::Decal* PixelGameEngine::GetFontDecal() { return fontRenderable.Decal(); } + void PixelGameEngine::SetFontSprite(std::string_view filename) + { fontRenderable.Load(std::string(filename)); } bool PixelGameEngine::ClipLineToScreen(olc::vi2d& in_p1, olc::vi2d& in_p2) { @@ -4986,7 +4989,7 @@ namespace olc 0x08,0x17,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x24,0x15,0x06,0x07,0x16,0x17, 0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x17,0x08,0x08,0x08, 0x08,0x08,0x08,0x08,0x17,0x08,0x08,0x08,0x08,0x17,0x08,0x15,0x08,0x15,0x08,0x08, - 0x24,0x18,0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x33,0x17,0x17,0x33,0x18,0x17,0x17, + 0x09,0x18,0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x33,0x17,0x17,0x33,0x18,0x17,0x17, 0x17,0x17,0x17,0x17,0x07,0x17,0x17,0x18,0x18,0x17,0x17,0x07,0x33,0x07,0x08,0x00, } }; for (auto c : vSpacing) vFontSpacing.push_back({ c >> 4, c & 15 }); diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 54661556..fb2fd46c 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ