Add in camp versions of the pause menu/item loadout menu. Allow the player to change loadout items from the camp. Make mana gain numbers not stack on top of health gain numbers (for items like Berries). Release Build 11935.
parent
48a35faf49
commit
e893d3a54e
@ -0,0 +1,130 @@ |
||||
#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 "MenuLabel.h" |
||||
#include "AdventuresInLestoria.h" |
||||
#include "CharacterRotatingDisplay.h" |
||||
#include "ClassInfo.h" |
||||
#include "Unlock.h" |
||||
|
||||
INCLUDE_game |
||||
INCLUDE_GFX |
||||
|
||||
void Menu::InitializeHubPauseWindow(){ |
||||
Menu*hubPauseWindow=CreateMenu(MenuType::HUB_PAUSE,CENTERED,vi2d{96,168}); |
||||
|
||||
hubPauseWindow->ADD("Resume Button",MenuComponent)(geom2d::rect<float>{{6.f,0.f},{84.f,24.f}},"Resume",[](MenuFuncData data){void ClearGarbage(); |
||||
game->ClearGarbage(); |
||||
Menu::CloseMenu(); |
||||
return true; |
||||
},ButtonAttr::FIT_TO_LABEL)END; |
||||
hubPauseWindow->ADD("Character Button",MenuComponent)(geom2d::rect<float>{{6.f,28.f},{84.f,24.f}},"Character",[](MenuFuncData data){ |
||||
Component<CharacterRotatingDisplay>(CHARACTER_MENU,"Character Rotating Display")->SetIcon(GFX[classutils::GetClassInfo(game->GetPlayer()->GetClassName()).classFullImgName].Decal()); |
||||
Component<MenuComponent>(CHARACTER_MENU,"Equip Selection Select Button")->Click(); |
||||
Menu::OpenMenu(CHARACTER_MENU); |
||||
return true; |
||||
},ButtonAttr::FIT_TO_LABEL)END; |
||||
hubPauseWindow->ADD("Change Loadout Button",MenuComponent)(geom2d::rect<float>{{6.f,56.f},{84.f,24.f}},"Change\nLoadout",[](MenuFuncData data){ |
||||
Menu::OpenMenu(ITEM_HUB_LOADOUT); |
||||
return true; |
||||
},ButtonAttr::FIT_TO_LABEL)END; |
||||
hubPauseWindow->ADD("Inventory Button",MenuComponent)(geom2d::rect<float>{{6.f,84.f},{84.f,24.f}},"Inventory",[](MenuFuncData data){ |
||||
Menu::OpenMenu(INVENTORY); |
||||
return true; |
||||
},ButtonAttr::FIT_TO_LABEL)END; |
||||
hubPauseWindow->ADD("Settings Button",MenuComponent)(geom2d::rect<float>{{6.f,112.f},{84.f,24.f}},"Settings",[](MenuFuncData data){ |
||||
Menu::OpenMenu(SETTINGS); |
||||
return true; |
||||
},ButtonAttr::FIT_TO_LABEL)END; |
||||
hubPauseWindow->ADD("Return to Camp Button",MenuComponent)(geom2d::rect<float>{{6.f,140.f},{84.f,24.f}},"Leave Area",[](MenuFuncData data){ |
||||
Component<MenuLabel>(LEVEL_COMPLETE,"Stage Complete Label")->SetLabel("Stage Summary"); |
||||
Component<MenuComponent>(LEVEL_COMPLETE,"Level Details Outline")->SetLabel(""); |
||||
|
||||
if(game->GetCurrentMapName()=="HUB"&&game->PreviousStageCompleted())Unlock::UnlockCurrentMap(); //Special unlock for the hub area when leaving.
|
||||
|
||||
if(Unlock::IsUnlocked("STORY_1_1")){ |
||||
Component<MenuComponent>(LEVEL_COMPLETE,"Next Button")->Enable(); |
||||
}else{ |
||||
Component<MenuComponent>(LEVEL_COMPLETE,"Next Button")->Disable(); |
||||
} |
||||
if(GameState::STATE==GameState::states[States::GAME_HUB]){ |
||||
GameState::ChangeState(States::OVERWORLD_MAP,0.4f); |
||||
}else{ |
||||
GameState::ChangeState(States::LEVEL_COMPLETE,0.4f); |
||||
} |
||||
return true; |
||||
},ButtonAttr::FIT_TO_LABEL)END; |
||||
|
||||
hubPauseWindow->SetupKeyboardNavigation( |
||||
[](MenuType type,Data&returnData){ //On Open
|
||||
returnData="Resume Button"; |
||||
}, |
||||
{ //Button Key
|
||||
{game->KEY_SCROLL,{"Navigate",[](MenuType type){}}}, |
||||
{game->KEY_BACK,{"Resume",[](MenuType type){ |
||||
Component<MenuComponent>(type,"Resume Button")->Click(); |
||||
}}}, |
||||
{game->KEY_MENU,{"Resume",[](MenuType type){ |
||||
Component<MenuComponent>(type,"Resume Button")->Click(); |
||||
}}}, |
||||
{game->KEY_CONFIRM,{"Select",[](MenuType type){}}}, |
||||
} |
||||
,{ //Button Navigation Rules
|
||||
{"Resume Button",{ |
||||
.up="Return to Camp Button", |
||||
.down="Character Button",}}, |
||||
{"Character Button",{ |
||||
.up="Resume Button", |
||||
.down="Change Loadout Button",}}, |
||||
{"Change Loadout Button",{ |
||||
.up="Character Button", |
||||
.down="Inventory Button",}}, |
||||
{"Inventory Button",{ |
||||
.up="Change Loadout Button", |
||||
.down="Settings Button",}}, |
||||
{"Settings Button",{ |
||||
.up="Inventory Button", |
||||
.down="Return to Camp Button",}}, |
||||
{"Return to Camp Button",{ |
||||
.up="Settings Button", |
||||
.down="Resume Button",}}, |
||||
}); |
||||
} |
||||
@ -0,0 +1,148 @@ |
||||
#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 "DEFINES.h" |
||||
#include "Menu.h" |
||||
#include "MenuLabel.h" |
||||
#include "MenuItemLoadoutButton.h" |
||||
#include "State_OverworldMap.h" |
||||
|
||||
INCLUDE_game |
||||
using A=Attribute; |
||||
|
||||
void Menu::InitializeItemHubLoadoutWindow(){ |
||||
Menu*itemHubLoadoutWindow=CreateMenu(ITEM_HUB_LOADOUT,CENTERED,game->GetScreenSize()-vi2d{4,4}); |
||||
|
||||
float itemLoadoutWindowWidth=(game->GetScreenSize().x-5.f); |
||||
|
||||
itemHubLoadoutWindow->ADD("Loadout Label",MenuLabel)(geom2d::rect<float>{{0,24},{itemLoadoutWindowWidth,24}},"Setup Item Loadout",2,ComponentAttr::SHADOW|ComponentAttr::BACKGROUND|ComponentAttr::OUTLINE)END; |
||||
|
||||
itemHubLoadoutWindow->ADD("Loadout Description Label",MenuLabel)(geom2d::rect<float>{{0,58},{itemLoadoutWindowWidth,24}},"Bring up to 3 items with you.",1,ComponentAttr::SHADOW)END; |
||||
|
||||
float buttonBorderPadding=64; |
||||
|
||||
itemHubLoadoutWindow->ADD("Loadout Item 1",MenuItemLoadoutButton)(geom2d::rect<float>{{64,90},{48,48}},0,[](MenuFuncData data){ |
||||
Menu::menus.at(INVENTORY_CONSUMABLES)->I(A::LOADOUT_SLOT)=0;
|
||||
Menu::OpenMenu(INVENTORY_CONSUMABLES); |
||||
return true; |
||||
},[](MenuFuncData data){ |
||||
std::weak_ptr<MenuItemLoadoutButton>loadoutButton=DYNAMIC_POINTER_CAST<MenuItemLoadoutButton>(data.component); |
||||
if(!ISBLANK(loadoutButton.lock()->GetItem())){ |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); |
||||
} |
||||
return true; |
||||
},[](MenuFuncData data){ |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Name Label")->SetLabel(""); |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Description")->SetLabel(""); |
||||
return true; |
||||
})END |
||||
->SetIconScale({2.f,2.f}); |
||||
itemHubLoadoutWindow->ADD("Loadout Item 2",MenuItemLoadoutButton)(geom2d::rect<float>{{itemLoadoutWindowWidth/2-24,90},{48,48}},1,[](MenuFuncData data){ |
||||
Menu::menus.at(INVENTORY_CONSUMABLES)->I(A::LOADOUT_SLOT)=1; |
||||
Menu::OpenMenu(INVENTORY_CONSUMABLES); |
||||
return true; |
||||
},[](MenuFuncData data){ |
||||
std::weak_ptr<MenuItemLoadoutButton>loadoutButton=DYNAMIC_POINTER_CAST<MenuItemLoadoutButton>(data.component); |
||||
if(!ISBLANK(loadoutButton.lock()->GetItem())){ |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); |
||||
} |
||||
return true; |
||||
},[](MenuFuncData data){ |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Name Label")->SetLabel(""); |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Description")->SetLabel(""); |
||||
return true; |
||||
})END |
||||
->SetIconScale({2.f,2.f}); |
||||
itemHubLoadoutWindow->ADD("Loadout Item 3",MenuItemLoadoutButton)(geom2d::rect<float>{{itemLoadoutWindowWidth-48-64,90},{48,48}},2,[](MenuFuncData data){ |
||||
Menu::menus.at(INVENTORY_CONSUMABLES)->I(A::LOADOUT_SLOT)=2; |
||||
Menu::OpenMenu(INVENTORY_CONSUMABLES); |
||||
return true; |
||||
},[](MenuFuncData data){ |
||||
std::weak_ptr<MenuItemLoadoutButton>loadoutButton=DYNAMIC_POINTER_CAST<MenuItemLoadoutButton>(data.component); |
||||
if(!ISBLANK(loadoutButton.lock()->GetItem())){ |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Name Label")->SetLabel(loadoutButton.lock()->GetItem().lock()->DisplayName()); |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Description")->SetLabel(loadoutButton.lock()->GetItem().lock()->Description()); |
||||
} |
||||
return true; |
||||
},[](MenuFuncData data){ |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Name Label")->SetLabel(""); |
||||
Component<MenuLabel>(ITEM_HUB_LOADOUT,"Item Description")->SetLabel(""); |
||||
return true; |
||||
})END |
||||
->SetIconScale({2.f,2.f}); |
||||
|
||||
itemHubLoadoutWindow->ADD("Item Name Label",MenuLabel)(geom2d::rect<float>{{0,146},{itemLoadoutWindowWidth,12}},"",1,ComponentAttr::SHADOW)END; |
||||
itemHubLoadoutWindow->ADD("Item Description",MenuLabel)(geom2d::rect<float>{{0,158},{itemLoadoutWindowWidth,24}},"",1,ComponentAttr::SHADOW)END; |
||||
|
||||
itemHubLoadoutWindow->ADD("Back Button",MenuComponent)(geom2d::rect<float>{{itemLoadoutWindowWidth/2-32,202},{64,16}},"Back",[](MenuFuncData data){Menu::CloseMenu();return true;})END; |
||||
|
||||
itemHubLoadoutWindow->SetupKeyboardNavigation( |
||||
[](MenuType type,Data&returnData){ //On Open
|
||||
returnData="Loadout Item 1"; |
||||
}, |
||||
{ //Button Key
|
||||
{game->KEY_BACK,{"Back",[](MenuType type){ |
||||
Component<MenuComponent>(type,"Back Button")->Click(); |
||||
}}}, |
||||
{game->KEY_CONFIRM,{"Select",[](MenuType type){}}}, |
||||
} |
||||
,{ //Button Navigation Rules
|
||||
{"Loadout Item 1",{ |
||||
.up="Back Button", |
||||
.down="Back Button", |
||||
.left="Loadout Item 3", |
||||
.right="Loadout Item 2",}}, |
||||
{"Loadout Item 2",{ |
||||
.up="Back Button", |
||||
.down="Back Button", |
||||
.left="Loadout Item 1", |
||||
.right="Loadout Item 3",}}, |
||||
{"Loadout Item 3",{ |
||||
.up="Back Button", |
||||
.down="Back Button", |
||||
.left="Loadout Item 2", |
||||
.right="Loadout Item 1",}}, |
||||
{"Back Button",{ |
||||
.up="Loadout Item 1", |
||||
.down="Loadout Item 1", |
||||
.left="Back Button", |
||||
.right="Back Button",}}, |
||||
}); |
||||
} |
||||
Binary file not shown.
Loading…
Reference in new issue