diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project
index 535d01da..69a2a224 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project
+++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project
@@ -47,7 +47,8 @@
"None",
"foresty1_1",
"overworld",
- "foresty_boss"
+ "foresty_boss",
+ "foresty_loop1"
],
"valuesAsFlags": false
},
@@ -132,10 +133,44 @@
"Birds1",
"Birds2",
"Birds3",
- "Birds4"
+ "Birds4",
+ "Campfire"
],
"valuesAsFlags": false
},
+ {
+ "id": 34,
+ "name": "EventFlag",
+ "storageType": "string",
+ "type": "enum",
+ "values": [
+ "None",
+ "UnlockBlacksmith",
+ "UnlockPotionCrafting",
+ "CompleteChapter1",
+ "UnlockArtificer"
+ ],
+ "valuesAsFlags": false
+ },
+ {
+ "color": "#ffa0a0a4",
+ "drawFill": true,
+ "id": 35,
+ "members": [
+ {
+ "name": "Visibility Flag",
+ "propertyType": "EventFlag",
+ "type": "string",
+ "value": "None"
+ }
+ ],
+ "name": "EventLayer",
+ "type": "class",
+ "useAs": [
+ "property",
+ "layer"
+ ]
+ },
{
"color": "#ffd9d929",
"drawFill": true,
@@ -295,6 +330,65 @@
],
"valuesAsFlags": false
},
+ {
+ "color": "#ff636bff",
+ "drawFill": true,
+ "id": 32,
+ "members": [
+ {
+ "name": "Function",
+ "propertyType": "NPCFunction",
+ "type": "string",
+ "value": "None"
+ },
+ {
+ "name": "NPC Name",
+ "type": "string",
+ "value": ""
+ },
+ {
+ "name": "Roaming Range",
+ "type": "int",
+ "value": 0
+ },
+ {
+ "name": "Spawn Flag",
+ "propertyType": "EventFlag",
+ "type": "string",
+ "value": "None"
+ },
+ {
+ "name": "Spritesheet",
+ "type": "string",
+ "value": ""
+ }
+ ],
+ "name": "NPC",
+ "type": "class",
+ "useAs": [
+ "property",
+ "map",
+ "layer",
+ "object",
+ "tile",
+ "tileset",
+ "wangcolor",
+ "wangset"
+ ]
+ },
+ {
+ "id": 33,
+ "name": "NPCFunction",
+ "storageType": "string",
+ "type": "enum",
+ "values": [
+ "None",
+ "Blacksmith",
+ "PotionCrafting",
+ "TravelingMerchant"
+ ],
+ "valuesAsFlags": false
+ },
{
"color": "#fffa00f6",
"drawFill": true,
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
index 15f6081a..35a44b8b 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj
@@ -816,6 +816,8 @@
+
+
diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
index 2ffdd5b5..10c5ac7f 100644
--- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
+++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters
@@ -909,6 +909,12 @@
Configurations
+
+ Documentation
+
+
+ Documentation
+
diff --git a/Adventures in Lestoria/Crawler_System_Overview.txt b/Adventures in Lestoria/Crawler_System_Overview.txt
index 31277a57..2691abc5 100644
--- a/Adventures in Lestoria/Crawler_System_Overview.txt
+++ b/Adventures in Lestoria/Crawler_System_Overview.txt
@@ -22,8 +22,8 @@ Gear:
Chapter Specific Unlock
- Every Story Chapter has 1 side boss that unlocks something new.
- Chapter 1 in addition unlocks the Blacksmith after 1-2
-- Chapter 1 side boss unlocks an npc to craft consumables
-- Chapter 2 unlocks a Jeweler
+- Chapter 1 side boss unlocks an npc to craft potions
+- Chapter 2 unlocks a Artificer
=> you can melt accesories to get ressources to "repair" your acceosries = you increase the stat rolls
=> cant exceed max roll this way. Just a way to grind your way up if you are unlucky with stat rolls
- Chapter 3 ??? (Maybe the Legendary Modifier mechanic from Post game gear will be used here instead if i dont find another idea i like)
diff --git a/Adventures in Lestoria/LoadGameWindow.cpp b/Adventures in Lestoria/LoadGameWindow.cpp
index 014672b7..dab79a0e 100644
--- a/Adventures in Lestoria/LoadGameWindow.cpp
+++ b/Adventures in Lestoria/LoadGameWindow.cpp
@@ -39,6 +39,7 @@ All rights reserved.
#include "Menu.h"
#include "ScrollableWindowComponent.h"
#include "SaveFile.h"
+#include "SoundEffect.h"
void Menu::InitializeLoadGameWindow(){
Menu*loadGameWindow=CreateMenu(LOAD_GAME,CENTERED,vi2d{192,144});
@@ -49,13 +50,13 @@ void Menu::InitializeLoadGameWindow(){
loadGameWindow->ADD("Online Game Files List",ScrollableWindowComponent)(geom2d::rect{{40,24},{112,116}})END
->Enable(false);
loadGameWindow->ADD("Go Back Button",MenuComponent)(geom2d::rect{{72,148},{48,12}},"Back",[](MenuFuncData menu){Menu::CloseMenu();return true;})END;
-
#ifdef __EMSCRIPTEN__
auto offlineCharacterTab = loadGameWindow->ADD("Offline Character Tab",MenuComponent)(geom2d::rect{{-8,4},{102,16}},"Offline Characters",[](MenuFuncData data){
Component(data.menu.GetType(),"Game Files List")->Enable(true);
Component(data.menu.GetType(),"Online Game Files List")->Enable(false);
Component(data.menu.GetType(),"Online Character Tab")->SetSelected(false);
data.component.lock()->SetSelected(true);
+ SoundEffect::PlaySFX("Button Click",SoundEffect::CENTERED);
SaveFile::SetOnlineMode(false);
return true;
},ButtonAttr::FIT_TO_LABEL)END;
@@ -65,6 +66,7 @@ void Menu::InitializeLoadGameWindow(){
Component(data.menu.GetType(),"Game Files List")->Enable(false);
Component(data.menu.GetType(),"Online Game Files List")->Enable(true);
Component(data.menu.GetType(),"Offline Character Tab")->SetSelected(false);
+ SoundEffect::PlaySFX("Button Click",SoundEffect::CENTERED);
data.component.lock()->SetSelected(true);
if(!SaveFile::IsOnline()){
if(SaveFile::GetUserID().length()==0){
diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt
index a3b8241a..cee1e94f 100644
--- a/Adventures in Lestoria/TODO.txt
+++ b/Adventures in Lestoria/TODO.txt
@@ -1,6 +1,14 @@
January 1st
===========
The Hub / NPC Interactions
+- Hub will have an NPC to bring you to the Stage select Map / World Map
+- Hub will have additional NPCs for all the Additional Chapter specific Unlocks
+- There will be traveling merchants that sell consumables or over priced Materials from Monster dropps.
+ What get offered will change around at random after every stage
+
+- Blacksmith (Craft/Enhance Equipment)
+- Consumable Crafter
+
Settings Menu
- Any settings should be saved to the save file!
- Volume Controls
@@ -14,6 +22,9 @@ Settings Menu
- XP Bar
+- Implement escape menu during gameplay.
+- If you leave a stage, the stage complete window still shows up, showing only the loot you obtained that session.
+
January 31st
============
@@ -23,14 +34,6 @@ Story proofreading/correcting/storyboarding
- Loading Screen
- Title Screen setpieces
-- Emscripten saving/loading files locally or cloud, can choose at menu.
- -> New Game: Add checkbox to turn online saving on.
- If clicked, prompts the user to enter a username for online saving to occur on.
- Username gets stored and online mode is turned on.
- -> Load Game: Two tabs at the top, Default will be "Local Saves". Second tab says "Online Saves".
- If Local Saves is clicked, repopulate the list with the files from the metadata file.
- If Online Saves is clicked, repopulate the list with the files from the metadata_online file received.
-
- Lock up unimplemented classes.
- Add Death screen (Zoom in on fatal blow, slow time down... Display some game over text... Allow retry or return to world map.)
diff --git a/Adventures in Lestoria/assets/Campaigns/Hub.tmx b/Adventures in Lestoria/assets/Campaigns/Hub.tmx
index d0300eb3..409d4822 100644
--- a/Adventures in Lestoria/assets/Campaigns/Hub.tmx
+++ b/Adventures in Lestoria/assets/Campaigns/Hub.tmx
@@ -1,5 +1,10 @@
-