Merge branch 'master' of http://sig.projectdivar.com/sigonasr2/AdventuresInLestoria
commit
fe42089080
@ -0,0 +1,100 @@ |
|||||||
|
#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 "Menu.h" |
||||||
|
#include "MenuComponent.h" |
||||||
|
#include "GameState.h" |
||||||
|
#include "AdventuresInLestoria.h" |
||||||
|
#include "Unlock.h" |
||||||
|
#include "MenuLabel.h" |
||||||
|
#include "VisualNovel.h" |
||||||
|
|
||||||
|
INCLUDE_game |
||||||
|
|
||||||
|
void Menu::InitializeArtificerWindow(){ |
||||||
|
Menu*artificerWindow=CreateMenu(ARTIFICER,CENTERED,vi2d{144,144}); |
||||||
|
|
||||||
|
artificerWindow->ADD("Refine Button",MenuComponent)(geom2d::rect<float>{{0.f,4.f},{144.f,24.f}},"Refine",[](MenuFuncData data){ |
||||||
|
|
||||||
|
return true; |
||||||
|
},vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; |
||||||
|
artificerWindow->ADD("Disassemble Button",MenuComponent)(geom2d::rect<float>{{0.f,32.f},{144.f,24.f}},"Disassemble",[](MenuFuncData data){ |
||||||
|
return true; |
||||||
|
},vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; |
||||||
|
artificerWindow->ADD("Enchant Button",MenuComponent)(geom2d::rect<float>{{0.f,60.f},{144.f,24.f}},"Enchant",[](MenuFuncData data){ |
||||||
|
|
||||||
|
return true; |
||||||
|
},vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; |
||||||
|
artificerWindow->ADD("Help Button",MenuComponent)(geom2d::rect<float>{{0.f,88.f},{144.f,24.f}},"Help",[](MenuFuncData data){ |
||||||
|
VisualNovel::LoadDialog("ARTIFICER_HELP",[](){Menu::OpenMenu(MenuType::ARTIFICER);}); |
||||||
|
return true; |
||||||
|
},vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; |
||||||
|
artificerWindow->ADD("Leave Button",MenuComponent)(geom2d::rect<float>{{0.f,116.f},{144.f,24.f}},"Leave",[](MenuFuncData data){ |
||||||
|
Menu::CloseMenu(); |
||||||
|
return true; |
||||||
|
},vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; |
||||||
|
|
||||||
|
artificerWindow->SetupKeyboardNavigation( |
||||||
|
[](MenuType type,Data&returnData){ //On Open
|
||||||
|
returnData="Refine Button"; |
||||||
|
}, |
||||||
|
{ //Button Key
|
||||||
|
{game->KEY_SCROLL,{"Navigate",[](MenuType type){}}}, |
||||||
|
{game->KEY_BACK,{"Stay",[](MenuType type){ |
||||||
|
Menu::CloseMenu(); |
||||||
|
}}}, |
||||||
|
{game->KEY_CONFIRM,{"Select",[](MenuType type){}}}, |
||||||
|
} |
||||||
|
,{ //Button Navigation Rules
|
||||||
|
{"Refine Button",{ |
||||||
|
.up="Leave Button", |
||||||
|
.down="Disassemble Button",}}, |
||||||
|
{"Disassemble Button",{ |
||||||
|
.up="Refine Button", |
||||||
|
.down="Enchant Button",}}, |
||||||
|
{"Enchant Button",{ |
||||||
|
.up="Disassemble Button", |
||||||
|
.down="Help Button",}}, |
||||||
|
{"Help Button",{ |
||||||
|
.up="Enchant Button", |
||||||
|
.down="Leave Button",}}, |
||||||
|
{"Leave Button",{ |
||||||
|
.up="Help Button", |
||||||
|
.down="Refine Button",}}, |
||||||
|
}); |
||||||
|
} |
||||||
@ -0,0 +1,55 @@ |
|||||||
|
#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 "State_Dialog.h" |
||||||
|
#include "VisualNovel.h" |
||||||
|
#include "Menu.h" |
||||||
|
#include "AdventuresInLestoria.h" |
||||||
|
|
||||||
|
void State_Dialog::OnStateChange(GameState*prevState){ |
||||||
|
Menu::CloseAllMenus(); |
||||||
|
}; |
||||||
|
void State_Dialog::OnLevelLoad(){} |
||||||
|
void State_Dialog::OnUserUpdate(AiL*game){ |
||||||
|
GameState::states[States::GAME_RUN]->OnUserUpdate(game); |
||||||
|
VisualNovel::novel.Update(); |
||||||
|
game->ClearTimedOutGarbage(); |
||||||
|
}; |
||||||
|
void State_Dialog::Draw(AiL*game){ |
||||||
|
GameState::states[States::GAME_RUN]->Draw(game); |
||||||
|
VisualNovel::novel.Draw(0U); |
||||||
|
}; |
||||||
@ -0,0 +1,46 @@ |
|||||||
|
#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 "GameState.h" |
||||||
|
|
||||||
|
class State_Dialog:public GameState { |
||||||
|
virtual void OnStateChange(GameState*prevState)override final; |
||||||
|
virtual void OnUserUpdate(AiL*game)override final; |
||||||
|
virtual void Draw(AiL*game)override final; |
||||||
|
virtual void OnLevelLoad()override final; |
||||||
|
}; |
||||||
Loading…
Reference in new issue