diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 7c51ff35..337610ae 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -353,7 +353,6 @@ bool AiL::OnUserUpdate(float fElapsedTime){ InputListener::Update(); Tutorial::Update(); Audio::Update(); - RenderWorld(GetElapsedTime()); GameState::STATE->Draw(this); RenderMenu(); Tutorial::Draw(); @@ -2513,7 +2512,11 @@ geom2d::rectAiL::GetTileCollision(MapName map,vf2d pos,bool upperLevel){ } const MapName&AiL::GetCurrentLevel()const{ - return currentLevel; + if(GameState::STATE!=nullptr&&GameState::STATE==GameState::states[States::STORY]){ //If we're inside a story, we expect the map/level name to be from the visual novel itself. Right now currentLevel would be WORLD_MAP which is not useful for a function like this. + return VisualNovel::novel.storyLevel; + }else{ + return currentLevel; + } } void AiL::ChangePlayerClass(Class cl){ @@ -3183,6 +3186,14 @@ void AiL::ValidateGameStatus(){ } } + auto MapStoryDataExists = [&](std::string_view mapName){ + return MAP_DATA.count(MapName(mapName))>0|| + VisualNovel::storyLevelData.count(std::string(mapName))>0; + }; + + if(!MapStoryDataExists("NPCs.Sherman.Potion Crafting Unlock Condition"_S))ERR(std::format("WARNING! Sherman's Potion Crafting Unlock Condition: {} is not a valid map!","NPCs.Sherman.Potion Crafting Unlock Condition"_S)) + if(!MapStoryDataExists("NPCs.Greg.Camp Notification Unlock Condition"_S))ERR(std::format("WARNING! Greg's Potion Crafting Unlock Condition: {} is not a valid map!","NPCs.Greg.Camp Notification Unlock Condition"_S)) + #pragma region Map Spawn Statistics if("display_spawn_report"_I){ for(auto&[map,data]:MAP_DATA){ diff --git a/Adventures in Lestoria/ConnectionPoint.cpp b/Adventures in Lestoria/ConnectionPoint.cpp index fa1bbaff..e389152e 100644 --- a/Adventures in Lestoria/ConnectionPoint.cpp +++ b/Adventures in Lestoria/ConnectionPoint.cpp @@ -51,6 +51,10 @@ void ConnectionPoint::SetVisited(){ visited=true; } +void ConnectionPoint::ResetVisitedFlag(){ + visited=false; +} + const bool ConnectionPoint::Visited()const{ return visited; } \ No newline at end of file diff --git a/Adventures in Lestoria/ConnectionPoint.h b/Adventures in Lestoria/ConnectionPoint.h index 0d516dcc..24f9ca58 100644 --- a/Adventures in Lestoria/ConnectionPoint.h +++ b/Adventures in Lestoria/ConnectionPoint.h @@ -63,6 +63,7 @@ struct ConnectionPoint{ bool IsNeighbor(ConnectionPoint&testPoint); //Sets the visited flag to true. void SetVisited(); + void ResetVisitedFlag(); //Whether or not this connection point has been visited yet. const bool Visited()const; }; diff --git a/Adventures in Lestoria/OverworldMapLevelWindow.cpp b/Adventures in Lestoria/OverworldMapLevelWindow.cpp index 0a4ec093..6c55517d 100644 --- a/Adventures in Lestoria/OverworldMapLevelWindow.cpp +++ b/Adventures in Lestoria/OverworldMapLevelWindow.cpp @@ -43,7 +43,6 @@ All rights reserved. #include "MenuComponent.h" #include "State_OverworldMap.h" #include "Map.h" -#include "Unlock.h" #include "Tutorial.h" INCLUDE_game @@ -63,10 +62,6 @@ void Menu::InitializeOverworldMapLevelWindow(){ levelSelectWindow->ADD("Spawns List",EncountersSpawnListScrollableWindowComponent)(geom2d::rect{{1,64},{windowSize.x-2,84}},ComponentAttr::BACKGROUND)END; levelSelectWindow->ADD("Enter Button",MenuComponent)(geom2d::rect{{0,166},{windowSize.x-1,16}},"Enter",[](MenuFuncData data){ - if(State_OverworldMap::GetCurrentConnectionPoint().map=="HUB"&&Unlock::IsUnlocked("STORY_1_2")&&!Tutorial::TaskIsComplete(TutorialTaskName::BLACKSMITH)){ - Tutorial::SetNextTask(TutorialTaskName::BLACKSMITH); - } - game->RestockLoadoutItems(); if(game->MAP_DATA[State_OverworldMap::GetCurrentConnectionPoint().map].skipLoadoutScreen|| diff --git a/Adventures in Lestoria/PauseMenu.cpp b/Adventures in Lestoria/PauseMenu.cpp index 93ffbe08..b051c5cc 100644 --- a/Adventures in Lestoria/PauseMenu.cpp +++ b/Adventures in Lestoria/PauseMenu.cpp @@ -73,6 +73,9 @@ void Menu::InitializePauseWindow(){ pauseWindow->ADD("Return to Camp Button",MenuComponent)(geom2d::rect{{6.f,112.f},{84.f,24.f}},"Leave Area",[](MenuFuncData data){ Component(LEVEL_COMPLETE,"Stage Complete Label")->SetLabel("Stage Summary"); Component(LEVEL_COMPLETE,"Level Details Outline")->SetLabel(""); + + if(game->GetCurrentMapName()=="HUB")Unlock::UnlockCurrentMap(); //Special unlock for the hub area when leaving. + if(Unlock::IsUnlocked("STORY_1_1")){ Component(LEVEL_COMPLETE,"Next Button")->Enable(); }else{ diff --git a/Adventures in Lestoria/SaveFile.cpp b/Adventures in Lestoria/SaveFile.cpp index 9301b7d9..c74e15fb 100644 --- a/Adventures in Lestoria/SaveFile.cpp +++ b/Adventures in Lestoria/SaveFile.cpp @@ -112,17 +112,15 @@ const void SaveFile::SaveGame(){ saveFile["Player"]["Base Stats"][std::string(attr.ActualName())].SetReal(val); } for(const std::string&unlockName:Unlock::unlocks){ - saveFile["Unlocks"][unlockName].SetString("True"); if(unlockName=="WORLD_MAP")continue; //This is a special exception, because the world map is not an actual stage. + saveFile["Unlocks"][unlockName].SetString("True"); auto opt_cp=State_OverworldMap::ConnectionPointFromString(unlockName); - if(!opt_cp.has_value()){ERR(std::format("WARNING! Could not find connection point {}! THIS SHOULD NOT BE HAPPENING! Potential invalid unlock name.",unlockName)); + if(!opt_cp.has_value())continue; //Harmless, we probably just deleted the map. + if(opt_cp.value()->Visited()){ + saveFile["Unlocks"][unlockName].SetString("True",1U); }else{ - if(opt_cp.value()->Visited()){ - saveFile["Unlocks"][unlockName].SetString("True",1U); - }else{ - saveFile["Unlocks"][unlockName].SetString("False",1U); - } + saveFile["Unlocks"][unlockName].SetString("False",1U); } } @@ -320,7 +318,7 @@ void SaveFile::LoadFile(){ Unlock::UnlockArea(key); if(data.GetValueCount()>1&&data.GetBool(1U)){ auto opt_cp=State_OverworldMap::ConnectionPointFromString(key); - if(!opt_cp)ERR(std::format("WARNING! Could not find connection point {}! THIS SHOULD NOT BE HAPPENING! Potential invalid unlock name.",key)) + if(!opt_cp)continue; //Harmless, it just means the connection point used to exist and doesn't anymore. else opt_cp.value()->SetVisited(); } } diff --git a/Adventures in Lestoria/ShermanWindow.cpp b/Adventures in Lestoria/ShermanWindow.cpp index 9d9aac60..f7425b78 100644 --- a/Adventures in Lestoria/ShermanWindow.cpp +++ b/Adventures in Lestoria/ShermanWindow.cpp @@ -40,6 +40,7 @@ All rights reserved. #include "MenuComponent.h" #include "GameState.h" #include "AdventuresInLestoria.h" +#include "Unlock.h" INCLUDE_game @@ -47,6 +48,7 @@ void Menu::InitializeShermanWindow(){ Menu*shermanWindow=CreateMenu(SHERMAN,CENTERED,vi2d{144,88}); shermanWindow->ADD("Leave Button",MenuComponent)(geom2d::rect{{0.f,4.f},{144.f,24.f}},"Leave",[](MenuFuncData data){ + Unlock::UnlockCurrentMap(); GameState::ChangeState(States::OVERWORLD_MAP,0.3f); return true; },vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; diff --git a/Adventures in Lestoria/State_Death.cpp b/Adventures in Lestoria/State_Death.cpp index c9890376..452218bc 100644 --- a/Adventures in Lestoria/State_Death.cpp +++ b/Adventures in Lestoria/State_Death.cpp @@ -104,4 +104,6 @@ void State_Death::OnUserUpdate(AiL*game){ game->ClearTimedOutGarbage(); } -void State_Death::Draw(AiL*game){} \ No newline at end of file +void State_Death::Draw(AiL*game){ + game->RenderWorld(game->GetElapsedTime()); +} \ No newline at end of file diff --git a/Adventures in Lestoria/State_GameHub.cpp b/Adventures in Lestoria/State_GameHub.cpp index e1feeb6c..4ec2c0d2 100644 --- a/Adventures in Lestoria/State_GameHub.cpp +++ b/Adventures in Lestoria/State_GameHub.cpp @@ -45,6 +45,8 @@ All rights reserved. #include "GameEvent.h" #include "SaveFile.h" #include "MenuComponent.h" +#include "Unlock.h" +#include "Tutorial.h" INCLUDE_MONSTER_LIST INCLUDE_game @@ -53,6 +55,11 @@ void State_GameHub::OnStateChange(GameState*prevState){ if(Menu::IsMenuOpen()){ Menu::CloseAllMenus(); } + + if(Unlock::IsUnlocked("STORY_1_2")&&!Tutorial::TaskIsComplete(TutorialTaskName::BLACKSMITH)){ + Tutorial::SetNextTask(TutorialTaskName::BLACKSMITH); + } + SaveFile::SaveGame(); game->GetPlayer()->SetState(State::NORMAL); diff --git a/Adventures in Lestoria/State_GameRun.cpp b/Adventures in Lestoria/State_GameRun.cpp index f913793c..ee99579c 100644 --- a/Adventures in Lestoria/State_GameRun.cpp +++ b/Adventures in Lestoria/State_GameRun.cpp @@ -91,5 +91,6 @@ void State_GameRun::OnUserUpdate(AiL*game){ game->UpdateCamera(game->GetElapsedTime()); } void State_GameRun::Draw(AiL*game){ + game->RenderWorld(game->GetElapsedTime()); game->RenderHud(); } \ No newline at end of file diff --git a/Adventures in Lestoria/State_LevelComplete.cpp b/Adventures in Lestoria/State_LevelComplete.cpp index 5f0977f0..21c89cba 100644 --- a/Adventures in Lestoria/State_LevelComplete.cpp +++ b/Adventures in Lestoria/State_LevelComplete.cpp @@ -43,6 +43,7 @@ All rights reserved. #include "SaveFile.h" #include "ProgressBar.h" #include "SoundEffect.h" +#include "Unlock.h" INCLUDE_MONSTER_LIST INCLUDE_game @@ -78,7 +79,6 @@ void State_LevelComplete::OnStateChange(GameState*prevState){ xpBonus=1.0f; } - accumulatedXP*=xpBonus; Component(MenuType::LEVEL_COMPLETE,"Level EXP Gain Outline")->SetLabel(std::format("+{} Exp",accumulatedXP)); @@ -128,6 +128,7 @@ void State_LevelComplete::OnUserUpdate(AiL*game){ game->ClearTimedOutGarbage(); }; void State_LevelComplete::Draw(AiL*game){ + game->RenderWorld(game->GetElapsedTime()); game->RenderHud(); }; diff --git a/Adventures in Lestoria/State_MainMenu.cpp b/Adventures in Lestoria/State_MainMenu.cpp index f0acad6f..0fe0480e 100644 --- a/Adventures in Lestoria/State_MainMenu.cpp +++ b/Adventures in Lestoria/State_MainMenu.cpp @@ -78,6 +78,7 @@ void State_MainMenu::OnUserUpdate(AiL*game){ game->ClearTimedOutGarbage(); }; void State_MainMenu::Draw(AiL*game){ + game->RenderWorld(game->GetElapsedTime()); TitleScreen::Draw(); }; diff --git a/Adventures in Lestoria/State_OverworldMap.cpp b/Adventures in Lestoria/State_OverworldMap.cpp index 294452db..06f6e8fe 100644 --- a/Adventures in Lestoria/State_OverworldMap.cpp +++ b/Adventures in Lestoria/State_OverworldMap.cpp @@ -155,6 +155,7 @@ void State_OverworldMap::OnUserUpdate(AiL*game){ game->ClearTimedOutGarbage(); }; void State_OverworldMap::Draw(AiL*game){ + game->RenderWorld(game->GetElapsedTime()); currentTime+=game->GetElapsedTime(); for(ConnectionPoint&cp:connections){ if(!Unlock::IsUnlocked(cp)){ diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index 27ddf9dd..1212f30d 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -11,4 +11,14 @@ should gemstones dropp from boss stages aswell? (Maybe lower droprate?) Toggle for displaying error messages Equip Gear using Start menu tutorial -Steam Controller SDK \ No newline at end of file +Steam Controller SDK +Add in vsync system option + +Hint text does not appear except during actual gameplay. + +Terrain Collision Boxes +Add hotkeys to loadout slots when selecting them from the menu +When Blacksmith is unlocked, camp notification is reset +Allow Block to interrupt casts (Bandages) + +Pressing any skill overrides an item's cast....? \ No newline at end of file diff --git a/Adventures in Lestoria/Unlock.cpp b/Adventures in Lestoria/Unlock.cpp index b42e01e8..eeae723c 100644 --- a/Adventures in Lestoria/Unlock.cpp +++ b/Adventures in Lestoria/Unlock.cpp @@ -37,6 +37,7 @@ All rights reserved. #pragma endregion #include "Unlock.h" #include "State_OverworldMap.h" +#include "config.h" std::setUnlock::unlocks; @@ -45,6 +46,8 @@ void Unlock::Initialize(){ } void Unlock::UnlockArea(std::string mapName){ + if(mapName=="NPCs.Sherman.Potion Crafting Unlock Condition"_S&& //When we beat the bonus chapter 1 fight, before sherman's potion crafting is unlocked, if the current map we just unlocked for is the bonus boss stage we will notify the Hub connection point and reset it so the player has a notification to go there again. + !Unlock::IsUnlocked("NPCs.Sherman.Potion Crafting Unlock Condition"_S))State_OverworldMap::ConnectionPointFromString("HUB").value()->ResetVisitedFlag(); unlocks.insert(mapName); } bool Unlock::IsUnlocked(std::string mapName){ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 1cdd6714..6b88ead2 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 5 #define VERSION_PATCH 1 -#define VERSION_BUILD 8168 +#define VERSION_BUILD 8187 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/VisualNovel.cpp b/Adventures in Lestoria/VisualNovel.cpp index 2062a767..0b188da6 100644 --- a/Adventures in Lestoria/VisualNovel.cpp +++ b/Adventures in Lestoria/VisualNovel.cpp @@ -44,6 +44,7 @@ All rights reserved. #include "Menu.h" #include "util.h" #include "SaveFile.h" +#include "State_OverworldMap.h" INCLUDE_game INCLUDE_GFX @@ -213,6 +214,8 @@ void VisualNovel::ExecuteNextCommand(){ commandIndex++; commands[size_t(commandIndex-1)]->Execute(novel); }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(); Unlock::UnlockCurrentMap(); Menu::themeSelection=novel.prevTheme; GameState::ChangeState(States::OVERWORLD_MAP,0.5f); diff --git a/Adventures in Lestoria/assets/AdventuresInLestoria_Capsule.png b/Adventures in Lestoria/assets/AdventuresInLestoria_Capsule.png index f0dddc0e..b6474491 100644 Binary files a/Adventures in Lestoria/assets/AdventuresInLestoria_Capsule.png and b/Adventures in Lestoria/assets/AdventuresInLestoria_Capsule.png differ diff --git a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx index c75110c2..6ba387e0 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx @@ -1,5 +1,5 @@ - + @@ -320,7 +320,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,3402,0,0,0,0,0,0,0,3357,0,0,0,0,0,3359,3360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2343,2344,2345,2344,2345,2346,2348,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3796,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,995,996,0,0,0,0,0,0,0,0,0,0,0,0,0,941,942,942,942,943,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2343,2344,2345,2346,2347,2399,2400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1099,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1097,0,0,0,0,0,0,0,0,0,3402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3371,0,0,1048,0,0,3536,3537,0,0,0,0,0,0,0,0,0,1044,0,3404,3405,995,996,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2395,2396,2397,2398,2399,2400,2452,0,0,0,0,0,3493,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1044,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3661,0,0,0,0,0,0,1055,1056,1056,1056,1056,1056,1056,1056, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,3581,3582,3538,3539,0,0,0,0,0,0,0,1044,0,3292,3493,1099,1100,3402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2447,2448,2449,2450,2451,2452,2400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3488,3489,0,0,0,0,3287,3288,0,0,0,0,0,1048,0,0,0,3357,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3447,0,0,0,0,3447,0,1044,3512,3513,3514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,3581,3582,3538,3539,0,0,0,0,0,0,0,1044,0,3292,3493,1099,1100,3402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2447,2448,2449,2450,2451,2452,2400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3488,3489,0,0,0,0,3287,3288,0,0,0,0,0,1048,0,0,0,3357,0,0,0,0,0,0,0,0,0,3448,0,0,0,0,0,3447,0,0,0,0,3447,0,1044,3512,3513,3514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,3626,3627,3583,3584,0,0,0,0,0,0,3402,1096,1150,1150,1150,1151,1256,0,0,0,0,0,0,0,0,0,0,0,0,0,3358,0,0,0,0,0,0,0,0,2447,2448,2449,2450,2451,2452,2452,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3533,3534,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1044,3557,3558,3559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3796,1048,0,0,0,0,3628,3629,0,0,0,0,0,0,0,1305,1306,1306,1306,1307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2499,2500,2501,2502,2503,2503,2504,0,0,0,0,0,0,0,0,0,0,0,3492,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3706,0,1048,0,0,0,0,0,0,0,0,0,3402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1044,0,0,0,3620,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3402,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,3402,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1044,0,0,0,0,3492,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3276,3277,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3620,0,1044,0,0,0,0,0,0,0,0,0,3491,0,0,0,3620,0,0,0,0,0,0,0,0,0,0,0,0,0,1048,0,0,0,0,0,0,0,0, diff --git a/Adventures in Lestoria/assets/Campaigns/1_5.tmx b/Adventures in Lestoria/assets/Campaigns/1_5.tmx index bfcf0dbd..ce11fa55 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_5.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_5.tmx @@ -1,5 +1,5 @@ - + @@ -670,6 +670,9 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3094,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3139,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3155,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -689,12 +692,9 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3155,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx index c47cf7e3..7401db94 100644 --- a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx +++ b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx @@ -96,12 +96,12 @@ 713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1029,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1187,715,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,4278,715,1188,1030,1030,1030,1030,1030,1030,1030,1030,1031,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, 713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1029,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1187,715,4278,4278,4278,715,1188,1030,1030,1030,1031,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2068,2069,2069,2069,2305,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, 713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1029,1030,1030,1030,1030,1030,1031,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,6010,6011,6012,6010,6011,6012,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,6089,6090,6091,6089,6090,6091,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,160,161,161,161,397,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,6168,6169,6170,6168,6169,6170,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,6010,6011,6012,6010,6011,6012,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,6089,6090,6091,6089,6090,6091,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,6168,6169,6170,6168,6169,6170,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,160,161,161,161,397,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, 713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, 713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, 713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,1116,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,2147,82,82,82,82,82,82,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, @@ -603,7 +603,7 @@ - + @@ -686,12 +686,5 @@ - - - - - - - diff --git a/Adventures in Lestoria/assets/config/NPCs.txt b/Adventures in Lestoria/assets/config/NPCs.txt index bc61ce6b..ccbcd2e6 100644 --- a/Adventures in Lestoria/assets/config/NPCs.txt +++ b/Adventures in Lestoria/assets/config/NPCs.txt @@ -4,6 +4,8 @@ NPCs { Strategy = NPC + Camp Notification Unlock Condition = STORY_1_2 + #Size of each animation frame SheetFrameSize = 24,24 diff --git a/Adventures in Lestoria/assets/config/audio/bgm.txt b/Adventures in Lestoria/assets/config/audio/bgm.txt index 4f2170dc..daddd4bc 100644 --- a/Adventures in Lestoria/assets/config/audio/bgm.txt +++ b/Adventures in Lestoria/assets/config/audio/bgm.txt @@ -23,7 +23,7 @@ BGM { Track Name = Overworld - channel[0]=overworld.ogg + channel[0]=overworld_v2.ogg # Transition time between one phase to the next. Fade Time = 2.0 diff --git a/Adventures in Lestoria/assets/config/items/Equipment.txt b/Adventures in Lestoria/assets/config/items/Equipment.txt index 0ff945a4..46e3739b 100644 --- a/Adventures in Lestoria/assets/config/items/Equipment.txt +++ b/Adventures in Lestoria/assets/config/items/Equipment.txt @@ -648,7 +648,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Wolf Skin,1 Gold = 5 @@ -656,7 +656,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -664,7 +664,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -672,7 +672,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -680,7 +680,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -688,7 +688,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -697,7 +697,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -705,7 +705,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -713,7 +713,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -721,7 +721,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -729,7 +729,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -762,7 +762,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Wolf Skin,1 Gold = 5 @@ -770,7 +770,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -778,7 +778,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -786,7 +786,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -794,7 +794,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -802,7 +802,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -811,7 +811,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -819,7 +819,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -827,7 +827,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -835,7 +835,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -843,7 +843,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -876,7 +876,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Wolf Skin,1 Gold = 5 @@ -884,7 +884,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -892,7 +892,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -900,7 +900,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -908,7 +908,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -916,7 +916,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -925,7 +925,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -933,7 +933,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -941,7 +941,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -949,7 +949,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -957,7 +957,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -990,7 +990,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Wolf Skin,1 Gold = 5 @@ -998,7 +998,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1006,7 +1006,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1014,7 +1014,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1022,7 +1022,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1030,7 +1030,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1039,7 +1039,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1047,7 +1047,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1055,7 +1055,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1063,7 +1063,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1071,7 +1071,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1104,7 +1104,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Wolf Skin,1 Gold = 5 @@ -1112,7 +1112,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1120,7 +1120,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1128,7 +1128,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1136,7 +1136,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1144,7 +1144,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1153,7 +1153,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1161,7 +1161,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1169,7 +1169,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1177,7 +1177,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1185,7 +1185,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 2 + AvailableChapter = 6 Item[0] = Green Slime Remains,1 Gold = 1 diff --git a/Adventures in Lestoria/assets/config/levels.txt b/Adventures in Lestoria/assets/config/levels.txt index 60ed08b3..561d552a 100644 --- a/Adventures in Lestoria/assets/config/levels.txt +++ b/Adventures in Lestoria/assets/config/levels.txt @@ -116,10 +116,4 @@ Levels Map File = Hub_v2.tmx } - CAMPAIGN_1_B2 - { - Map File = 1_B2.tmx - # Specify item, min quantity, and max quantity of items. Optionally specify a % drop chance per item. - Loot[0] = Slimy Bun, 1, 1, 50% - } } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 62e6ae6f..7d12d391 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/Adventures in Lestoria/assets/music/overworld.ogg b/Adventures in Lestoria/assets/music/overworld.ogg deleted file mode 100644 index f6c03dd1..00000000 Binary files a/Adventures in Lestoria/assets/music/overworld.ogg and /dev/null differ diff --git a/Adventures in Lestoria/assets/music/overworld_v2.ogg b/Adventures in Lestoria/assets/music/overworld_v2.ogg new file mode 100644 index 00000000..8e02c51d Binary files /dev/null and b/Adventures in Lestoria/assets/music/overworld_v2.ogg differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index ae7236f9..26397842 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ