diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
index 24280b05..85f3eee8 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
@@ -726,6 +726,7 @@
+
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
index 490bce68..437e4341 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
@@ -1160,6 +1160,9 @@
Source Files\Game States
+
+ Source Files\Interface
+
diff --git a/Adventures in Lestoria/ArtificerWindow.cpp b/Adventures in Lestoria/ArtificerWindow.cpp
new file mode 100644
index 00000000..f19af5eb
--- /dev/null
+++ b/Adventures in Lestoria/ArtificerWindow.cpp
@@ -0,0 +1,100 @@
+#pragma region License
+/*
+License (OLC-3)
+~~~~~~~~~~~~~~~
+
+Copyright 2024 Joshua Sigona
+
+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{{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{{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{{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{{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{{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",}},
+ });
+}
\ No newline at end of file
diff --git a/Adventures in Lestoria/Menu.cpp b/Adventures in Lestoria/Menu.cpp
index 658042db..45913cdb 100644
--- a/Adventures in Lestoria/Menu.cpp
+++ b/Adventures in Lestoria/Menu.cpp
@@ -118,6 +118,7 @@ void Menu::InitializeMenus(){
InitializePauseWindow();
InitializeDeathWindow();
InitializeCreditsWindow();
+ InitializeArtificerWindow();
for(MenuType type=MenuType(int(MenuType::ENUM_START)+1);typedialogFinishedCallbackFunc){
+ novel.dialogFinishedCallbackFunc=dialogFinishedCallbackFunc;
novel.storyLevel=dialogName;
novel.Reset();
for(std::unique_ptr&command:storyLevelData.at(dialogName)){
@@ -236,6 +237,7 @@ void VisualNovel::ExecuteNextCommand(){
if(GameState::STATE==GameState::states[States::DIALOG]){
Reset();
GameState::STATE=GameState::states[States::GAME_RUN];
+ dialogFinishedCallbackFunc();
}else{
if(game->GetCurrentMapName()=="NPCs.Greg.Camp Notification Unlock Condition"_S&&
!Unlock::IsUnlocked("NPCs.Greg.Camp Notification Unlock Condition"_S))State_OverworldMap::ConnectionPointFromString("HUB").value()->ResetVisitedFlag();
diff --git a/Adventures in Lestoria/VisualNovel.h b/Adventures in Lestoria/VisualNovel.h
index b8d92c8a..a1803b3a 100644
--- a/Adventures in Lestoria/VisualNovel.h
+++ b/Adventures in Lestoria/VisualNovel.h
@@ -174,6 +174,7 @@ class VisualNovel{
float prevBackgroundScrollAmt=0;
static constexpr float maxTextScrollTime=1.0f;
float audioPitch=1.f;
+ std::functiondialogFinishedCallbackFunc{[](){}};
public:
static Font font,narratorFont,locationFont;
private:
@@ -187,7 +188,7 @@ public:
VisualNovel(VisualNovel&)=delete;
VisualNovel(VisualNovel&&)=delete;
static void Initialize();
- static void LoadDialog(std::string dialogName);
+ static void LoadDialog(std::string dialogName,std::functiondialogFinishedCallbackFunc=[](){});
static void LoadVisualNovel(std::string storyLevelName);
void ExecuteNextCommand();
void Update();