Remove Resume input helper on the death menu. Add multi-line centering label support. Add credits configuration and credits menu to the game. Release Build 7841. Push game Version to 0.4.
parent
a803531a4d
commit
3145bef2cc
@ -0,0 +1,89 @@ |
|||||||
|
#pragma region License |
||||||
|
/*
|
||||||
|
License (OLC-3) |
||||||
|
~~~~~~~~~~~~~~~ |
||||||
|
|
||||||
|
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification, |
||||||
|
are permitted provided that the following conditions are met: |
||||||
|
|
||||||
|
1. Redistributions or derivations of source code must retain the above copyright |
||||||
|
notice, this list of conditions and the following disclaimer. |
||||||
|
|
||||||
|
2. Redistributions or derivative works in binary form must reproduce the above |
||||||
|
copyright notice. This list of conditions and the following disclaimer must be |
||||||
|
reproduced in the documentation and/or other materials provided with the distribution. |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
Portions of this software are copyright © 2024 The FreeType |
||||||
|
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||||
|
All rights reserved. |
||||||
|
*/ |
||||||
|
#pragma endregion |
||||||
|
#include "AdventuresInLestoria.h" |
||||||
|
#include "Menu.h" |
||||||
|
#include "ScrollableWindowComponent.h" |
||||||
|
#include "MenuLabel.h" |
||||||
|
|
||||||
|
INCLUDE_WINDOW_SIZE |
||||||
|
|
||||||
|
void Menu::InitializeCreditsWindow(){ |
||||||
|
vf2d windowSize=WINDOW_SIZE-vf2d{78,78}; |
||||||
|
|
||||||
|
Menu*creditsWindow=CreateMenu(MenuType::CREDITS,CENTERED,windowSize); |
||||||
|
|
||||||
|
auto displayScrollWindow=creditsWindow->ADD("Display Text Scroll Window",ScrollableWindowComponent)(geom2d::rect<float>{{4,4},windowSize-vf2d{8,8}})END; |
||||||
|
|
||||||
|
displayScrollWindow->ADD("Display Text",MenuLabel)(geom2d::rect<float>{{2,2},windowSize-vf2d{24,12}},"Test Text\nEven more testing text that we could use for this game.",1.f,ComponentAttr::CENTER)END; |
||||||
|
|
||||||
|
creditsWindow->ADD("Go Back Button",MenuComponent)(geom2d::rect<float>{{windowSize.x/2.f-48.f,windowSize.y},{96.f,12.f}},"Back",[](MenuFuncData data){ |
||||||
|
Menu::CloseMenu(); |
||||||
|
return true; |
||||||
|
})END; |
||||||
|
|
||||||
|
creditsWindow->SetupKeyboardNavigation( |
||||||
|
[](MenuType type,Data&returnData){ //On Open
|
||||||
|
returnData="Go Back Button"; |
||||||
|
}, |
||||||
|
{ //Button Key
|
||||||
|
{{game->KEY_SCROLLUP,Held},{"",[](MenuType type){ |
||||||
|
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(1.f); |
||||||
|
}}}, |
||||||
|
{{game->KEY_SCROLLDOWN,Held},{"",[](MenuType type){ |
||||||
|
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.f); |
||||||
|
}}}, |
||||||
|
{{game->KEY_SHOULDER,Pressed},{"Scroll Encounters",[](MenuType type){ |
||||||
|
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.0f); |
||||||
|
}}}, |
||||||
|
{{game->KEY_FASTSCROLLUP,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll",[](MenuType type){ |
||||||
|
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.0f); |
||||||
|
}}}, |
||||||
|
{{game->KEY_FASTSCROLLDOWN,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll",[](MenuType type){ |
||||||
|
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(1.0f); |
||||||
|
}}}, |
||||||
|
{{game->KEY_SCROLLVERT_R,Analog,InputEngageGroup::NOT_VISIBLE},{"Scroll",[](MenuType type){ |
||||||
|
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(game->KEY_SCROLLVERT.Analog()); |
||||||
|
}}}, |
||||||
|
{game->KEY_BACK,{"Back",[](MenuType type){ |
||||||
|
Component<MenuComponent>(type,"Go Back Button")->Click(); |
||||||
|
}}}, |
||||||
|
{game->KEY_CONFIRM,{"Back",[](MenuType type){}}}, |
||||||
|
} |
||||||
|
,{ //Button Navigation Rules
|
||||||
|
}); |
||||||
|
} |
||||||
@ -0,0 +1,107 @@ |
|||||||
|
#pragma region License |
||||||
|
/*
|
||||||
|
License (OLC-3) |
||||||
|
~~~~~~~~~~~~~~~ |
||||||
|
|
||||||
|
Copyright 2024 Joshua Sigona <sigonasr2@gmail.com> |
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification, |
||||||
|
are permitted provided that the following conditions are met: |
||||||
|
|
||||||
|
1. Redistributions or derivations of source code must retain the above copyright |
||||||
|
notice, this list of conditions and the following disclaimer. |
||||||
|
|
||||||
|
2. Redistributions or derivative works in binary form must reproduce the above |
||||||
|
copyright notice. This list of conditions and the following disclaimer must be |
||||||
|
reproduced in the documentation and/or other materials provided with the distribution. |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
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. |
||||||
|
|
||||||
|
Portions of this software are copyright © 2024 The FreeType |
||||||
|
Project (www.freetype.org). Please see LICENSE_FT.txt for more information. |
||||||
|
All rights reserved. |
||||||
|
*/ |
||||||
|
#pragma endregion |
||||||
|
#pragma once |
||||||
|
#include "MenuComponent.h" |
||||||
|
#include "AdventuresInLestoria.h" |
||||||
|
#include "drawutil.h" |
||||||
|
#include "util.h" |
||||||
|
#include "ScrollableWindowComponent.h" |
||||||
|
|
||||||
|
using A=Attribute; |
||||||
|
|
||||||
|
INCLUDE_game |
||||||
|
|
||||||
|
//A button that directly draws in a location in the game.
|
||||||
|
class FloatingMenuComponent:public MenuComponent{ |
||||||
|
public: |
||||||
|
inline FloatingMenuComponent(geom2d::rect<float>rect,std::string label,MenuFunc onClick,ButtonAttr attributes=ButtonAttr::NONE) |
||||||
|
:MenuComponent(rect,label,onClick,attributes){}; |
||||||
|
|
||||||
|
inline virtual bool HandleOutsideDisabledButtonSelection(std::weak_ptr<MenuComponent>disabledButton)override final{ |
||||||
|
return true; |
||||||
|
}; |
||||||
|
|
||||||
|
inline virtual bool GetHoverState(AiL*game){ |
||||||
|
if(!parentComponent.expired()){ |
||||||
|
return parentComponent.lock()->GetHoverState(game,this); |
||||||
|
}else{ |
||||||
|
return geom2d::overlaps(geom2d::rect<float>{rect.pos,rect.size},game->GetMousePos()); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
inline virtual void DrawDecal(ViewPort&window,bool focused)override final{ |
||||||
|
if(background){ |
||||||
|
Pixel backCol=PixelLerp(Menu::themes[Menu::themeSelection].GetButtonCol(),Menu::themes[Menu::themeSelection].GetHighlightCol(),hoverEffect/"ThemeGlobal.HighlightTime"_F); |
||||||
|
if(grayedOut){ |
||||||
|
backCol=DARK_GREY; |
||||||
|
} |
||||||
|
game->FillRectDecal(rect.pos+V(A::DRAW_OFFSET),rect.size,backCol); |
||||||
|
} |
||||||
|
if(selected&&selectionType==HIGHLIGHT){ |
||||||
|
game->FillRectDecal(rect.pos+V(A::DRAW_OFFSET),rect.size,PixelLerp(Menu::themes[Menu::themeSelection].GetButtonCol(),Menu::themes[Menu::themeSelection].GetHighlightCol(),util::lerp(0.75f,1.0f,hoverEffect/"ThemeGlobal.HighlightTime"_F))); |
||||||
|
} |
||||||
|
if(border){ |
||||||
|
game->FillRectDecal(rect.pos+V(A::DRAW_OFFSET),{rect.size.x+1,1},borderCol); |
||||||
|
game->FillRectDecal(rect.pos+V(A::DRAW_OFFSET),{1,rect.size.y+1},borderCol); |
||||||
|
game->FillRectDecal(rect.pos+V(A::DRAW_OFFSET)+vf2d{rect.size.x-1+1,0},{1,rect.size.y+1},borderCol); |
||||||
|
game->FillRectDecal(rect.pos+V(A::DRAW_OFFSET)+vf2d{0,rect.size.y-1+1},{rect.size.x+1,1},borderCol); |
||||||
|
} |
||||||
|
if(showDefaultLabel){ |
||||||
|
vf2d adjustedScale=labelScaling; |
||||||
|
vi2d labelTextSize=vf2d(game->GetTextSizeProp(label))*adjustedScale; |
||||||
|
|
||||||
|
if(fitToLabel){ |
||||||
|
float sizeRatio=(vf2d(labelTextSize).x)/(rect.size.x-2); |
||||||
|
if(sizeRatio>1){ |
||||||
|
adjustedScale.x/=sizeRatio; |
||||||
|
labelTextSize.x/=sizeRatio; |
||||||
|
} |
||||||
|
} |
||||||
|
game->DrawStringPropDecal(rect.pos+V(A::DRAW_OFFSET)+rect.size/2-vf2d(labelTextSize)/2.f,label,WHITE,adjustedScale); |
||||||
|
} |
||||||
|
if(selected){ |
||||||
|
switch(selectionType){ |
||||||
|
case CROSSHAIR:drawutil::DrawCrosshairDecal(game,{rect.pos+V(A::DRAW_OFFSET),rect.size},0);break; |
||||||
|
case INNER_BOX:game->DrawRectDecal(rect.pos+V(A::DRAW_OFFSET)+vi2d{1,1},rect.size-vi2d{2,2});break; |
||||||
|
case HIGHLIGHT:break;//Not used.
|
||||||
|
case SelectionType::NONE:break;//Displays nothing.
|
||||||
|
default:ERR("Undefined selection type selected: "<<int(selectionType)); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
}; |
||||||
@ -0,0 +1,62 @@ |
|||||||
|
Credits |
||||||
|
{ |
||||||
|
LINE[0]="Development Team" |
||||||
|
LINE[1]="~~~~~~~~~~~~~~~~" |
||||||
|
LINE[2]=" " |
||||||
|
LINE[3]="Production & Programming" |
||||||
|
LINE[4]="#C03EE5sigonasr2#FFFFFF" |
||||||
|
LINE[5]=" " |
||||||
|
LINE[6]="Game Designer" |
||||||
|
LINE[7]="#7DDA58Quapsel#FFFFFF" |
||||||
|
LINE[8]=" " |
||||||
|
LINE[9]="Music Design" |
||||||
|
LINE[10]="#5DE2E7A2Z#FFFFFF" |
||||||
|
LINE[11]=" " |
||||||
|
LINE[12]="Tools & Tech" |
||||||
|
LINE[13]="~~~~~~~~~~~~~~~~" |
||||||
|
LINE[14]="Game Engine" |
||||||
|
LINE[15]="#FE9900javidx9#FFFFFF" |
||||||
|
LINE[16]="#FEF500olc::PixelGameEngine v.2.24#FFFFFF" |
||||||
|
LINE[17]=" " |
||||||
|
LINE[18]="olcPGEX_MiniAudio Copyright© 2024 by Moros Smith under the OLC-3 License" |
||||||
|
LINE[19]=" " |
||||||
|
LINE[20]="miniaudio library Copyright© 2024 by David Reid under the MIT No Attribution License" |
||||||
|
LINE[21]="Ogg Vorbis audio decoder - v1.22 - public domain http://nothings.org/stb_vorbis/" |
||||||
|
LINE[22]=" " |
||||||
|
LINE[23]="Portions of this software are copyright © 2024 The FreeType Project (www.freetype.org). All rights reserved." |
||||||
|
LINE[24]=" " |
||||||
|
LINE[25]="Assets" |
||||||
|
LINE[26]="~~~~~~~~~~~~~~~~" |
||||||
|
LINE[27]="ERA OF FANTASY - GRASSLANDS" |
||||||
|
LINE[28]="X: @Namatnieks" |
||||||
|
LINE[29]=" " |
||||||
|
LINE[30]="*** Minifantasy - Tiny Overworld v1.0 ***" |
||||||
|
LINE[31]="Minifantasy is an original idea by Krishna Palacio" |
||||||
|
LINE[32]=" " |
||||||
|
LINE[33]="Public Domain Font Authors" |
||||||
|
LINE[34]="c64esque by andraaspar" |
||||||
|
LINE[35]="Habbo by Omni" |
||||||
|
LINE[36]="Unknown by Anonymous" |
||||||
|
LINE[37]=" " |
||||||
|
LINE[38]="Nb Pixel Font Bundle" |
||||||
|
LINE[39]="Nb Pixel Font Bundle 2" |
||||||
|
LINE[40]=" " |
||||||
|
LINE[41]=" " |
||||||
|
LINE[42]="Game License" |
||||||
|
LINE[43]="~~~~~~~~~~~~~~~~" |
||||||
|
LINE[44]="License (OLC-3)" |
||||||
|
LINE[45]="~~~~~~~~~~~~~~~" |
||||||
|
LINE[46]=" " |
||||||
|
LINE[47]="Copyright 2024 Joshua Sigona <sigonasr2@gmail.com>" |
||||||
|
LINE[48]=" " |
||||||
|
LINE[49]="Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:" |
||||||
|
LINE[50]=" " |
||||||
|
LINE[51]="1. Redistributions or derivations of source code must retain the above copyright notice, this list of conditions and the following disclaimer." |
||||||
|
LINE[52]=" " |
||||||
|
LINE[53]="2. Redistributions or derivative works in binary form must reproduce the above copyright notice. This list of conditions and the following disclaimer must be reproduced in the documentation and/or other materials provided with the distribution." |
||||||
|
LINE[54]=" " |
||||||
|
LINE[55]="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[56]=" " |
||||||
|
LINE[57]="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." |
||||||
|
|
||||||
|
} |
||||||
Binary file not shown.
Loading…
Reference in new issue