From aa4d35d7546b023e80ec1b57b6f580138efc535d Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Thu, 29 Feb 2024 05:54:23 -0600 Subject: [PATCH] Fix crash with emscripten version during story scenes. Fix inproper Blacksmith equipment displays for crafting menu (chapter check missing, wrong enhancement level checks). Fix Blacksmith trigger not unlocking on the right node. Fix Chapter 2 trigger. Fix emscripten build scripts. Release Version 7848. --- Adventures in Lestoria/InventoryCreator.cpp | 4 +- Adventures in Lestoria/MenuLabel.h | 14 +- .../OverworldMapLevelWindow.cpp | 4 +- Adventures in Lestoria/State_OverworldMap.cpp | 5 + Adventures in Lestoria/Version.h | 2 +- Adventures in Lestoria/VisualNovel.cpp | 14 +- .../assets/config/items/Equipment.txt | 340 +++++++++--------- .../assets/config/items/Weapons.txt | 6 +- Adventures in Lestoria/buildtemplate.html | 2 +- Adventures in Lestoria/emscripten_build.ps1 | 2 +- .../emscripten_debug_build.ps1 | 2 +- distribute.ps1 | 2 + emscripten_build.ps1 | 19 + emscripten_debug_build.ps1 | 19 + x64/Release/Adventures in Lestoria.exe | Bin 3328512 -> 3327488 bytes 15 files changed, 241 insertions(+), 194 deletions(-) diff --git a/Adventures in Lestoria/InventoryCreator.cpp b/Adventures in Lestoria/InventoryCreator.cpp index 0ab86a66..66518d07 100644 --- a/Adventures in Lestoria/InventoryCreator.cpp +++ b/Adventures in Lestoria/InventoryCreator.cpp @@ -140,7 +140,7 @@ std::function [](InventoryScrollableWindowComponent&component,ITCategory cat){ std::vector>weapons; std::copy_if(Inventory::get("Equipment").begin(),Inventory::get("Equipment").end(),std::back_inserter(weapons),[](std::shared_ptritem){return item->IsWeapon();}); - std::copy_if(Inventory::blacksmithInventory.begin(),Inventory::blacksmithInventory.end(),std::back_inserter(weapons),[](std::shared_ptritem){return item->CanEnhanceItem()&&item->GetClass()==game->GetPlayer()->GetClassName()&&item->IsWeapon();}); + std::copy_if(Inventory::blacksmithInventory.begin(),Inventory::blacksmithInventory.end(),std::back_inserter(weapons),[](std::shared_ptritem){return item->GetEnhancementInfo().size()>0&&game->GetCurrentChapter()>=item->GetEnhancementInfo()[0].chapterAvailable&&item->GetClass()==game->GetPlayer()->GetClassName()&&item->IsWeapon();}); std::sort(weapons.begin(),weapons.end(),[](const std::weak_ptr&it1,const std::weak_ptr&it2){ return ItemSortRules::GetItemSortRanking(it1) [](InventoryScrollableWindowComponent&component,ITCategory cat){ std::vector>armor; std::copy_if(Inventory::get("Equipment").begin(),Inventory::get("Equipment").end(),std::back_inserter(armor),[](std::shared_ptritem){return item->IsArmor();}); - std::copy_if(Inventory::blacksmithInventory.begin(),Inventory::blacksmithInventory.end(),std::back_inserter(armor),[](std::shared_ptritem){return item->CanEnhanceItem()&&item->GetClass()==game->GetPlayer()->GetClassName()&&item->IsArmor();}); + std::copy_if(Inventory::blacksmithInventory.begin(),Inventory::blacksmithInventory.end(),std::back_inserter(armor),[](std::shared_ptritem){return item->GetEnhancementInfo().size()>0&&game->GetCurrentChapter()>=item->GetEnhancementInfo()[0].chapterAvailable&&item->GetClass()==game->GetPlayer()->GetClassName()&&item->IsArmor();}); std::sort(armor.begin(),armor.end(),[](const std::weak_ptr&it1,const std::weak_ptr&it2){ return ItemSortRules::GetItemSortRanking(it1)GetTextSizeProp(text).x; offsets.push_back(rect.size.x/2.f-width/2); } - } - //Recalculate label height based on line count. - rect.size.y=lines.size()*10.f; - if(!parentComponent.expired()){ - parentComponent.lock()->CalculateBounds(); + //Recalculate label height based on line count. + rect.size.y=lines.size()*10.f; + if(!parentComponent.expired()){ + parentComponent.lock()->CalculateBounds(); + } } } }; \ No newline at end of file diff --git a/Adventures in Lestoria/OverworldMapLevelWindow.cpp b/Adventures in Lestoria/OverworldMapLevelWindow.cpp index 6dd4a6af..37acb39b 100644 --- a/Adventures in Lestoria/OverworldMapLevelWindow.cpp +++ b/Adventures in Lestoria/OverworldMapLevelWindow.cpp @@ -38,7 +38,7 @@ All rights reserved. #include "AdventuresInLestoria.h" #include "DEFINES.h" #include "Menu.h" -#include "EncountersSpawnListScrollableWindowComponent.h"a +#include "EncountersSpawnListScrollableWindowComponent.h" #include "MenuLabel.h" #include "MenuComponent.h" #include "State_OverworldMap.h" @@ -63,7 +63,7 @@ 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("CAMPAIGN_1_3")&&!Tutorial::TaskIsComplete(TutorialTaskName::BLACKSMITH)){ + if(State_OverworldMap::GetCurrentConnectionPoint().map=="HUB"&&Unlock::IsUnlocked("STORY_1_2")&&!Tutorial::TaskIsComplete(TutorialTaskName::BLACKSMITH)){ Tutorial::SetNextTask(TutorialTaskName::BLACKSMITH); } diff --git a/Adventures in Lestoria/State_OverworldMap.cpp b/Adventures in Lestoria/State_OverworldMap.cpp index 4e9db42d..f8aeb90f 100644 --- a/Adventures in Lestoria/State_OverworldMap.cpp +++ b/Adventures in Lestoria/State_OverworldMap.cpp @@ -62,6 +62,11 @@ State_OverworldMap::State_OverworldMap(){ void State_OverworldMap::OnStateChange(GameState*prevState){ Component(MenuType::PAUSE,"Return to Camp Button")->SetGrayedOut(false); SaveFile::SaveGame(); + + if(Unlock::IsUnlocked("STORY_1_3")){ + game->SetChapter(2); + } + game->LoadLevel("WORLD_MAP"); }; void State_OverworldMap::OnLevelLoad(){ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index df92205b..b0708b17 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 4 #define VERSION_PATCH 0 -#define VERSION_BUILD 7841 +#define VERSION_BUILD 7848 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/VisualNovel.cpp b/Adventures in Lestoria/VisualNovel.cpp index 604d8af1..2062a767 100644 --- a/Adventures in Lestoria/VisualNovel.cpp +++ b/Adventures in Lestoria/VisualNovel.cpp @@ -275,12 +275,14 @@ void VisualNovel::Draw(){ vf2d dialogDisplaySize={game->GetScreenSize().x-48.f,20.f}; Menu::DrawThemedWindow(dialogDisplayPos,dialogDisplaySize); FontRect dialogTextSize=font.GetStringBounds(activeText); - FontRect speakerTextSize=font.GetStringBounds(displayedName); - if(displayedName.length()>0){ - game->DrawShadowStringDecal(font,nameDisplayPos-vf2d{10,7}+(nameDisplayWindowSize+vf2d{24,0})/2-speakerTextSize.size/2+speakerTextSize.offset/2,displayedName); - game->DrawShadowStringDecal(font,dialogDisplayPos-vf2d{10,6}+dialogTextSize.offset,activeText); - }else{ - game->DrawDropShadowStringDecal(narratorFont,dialogDisplayPos-vf2d{10,6}+dialogTextSize.offset,activeText,{190,190,220}); + if(dialogTextSize.size.x>0&&dialogTextSize.size.y>0){ + if(displayedName.length()>0){ + FontRect speakerTextSize=font.GetStringBounds(displayedName); + game->DrawShadowStringDecal(font,nameDisplayPos-vf2d{10,7}+(nameDisplayWindowSize+vf2d{24,0})/2-speakerTextSize.size/2+speakerTextSize.offset/2,displayedName); + game->DrawShadowStringDecal(font,dialogDisplayPos-vf2d{10,6}+dialogTextSize.offset,activeText); + }else{ + game->DrawDropShadowStringDecal(narratorFont,dialogDisplayPos-vf2d{10,6}+dialogTextSize.offset,activeText,{190,190,220}); + } } float yOffset=util::lerp(dialogDisplaySize.y+12,-8,textScrollTime/maxTextScrollTime); game->DrawPolygonDecal( diff --git a/Adventures in Lestoria/assets/config/items/Equipment.txt b/Adventures in Lestoria/assets/config/items/Equipment.txt index 6bdab664..0ff945a4 100644 --- a/Adventures in Lestoria/assets/config/items/Equipment.txt +++ b/Adventures in Lestoria/assets/config/items/Equipment.txt @@ -27,7 +27,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Flower Petals,1 Gold = 5 @@ -151,7 +151,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Green Slime Remains,5 Gold = 5 @@ -274,7 +274,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Green Slime Remains,3 Gold = 5 @@ -402,7 +402,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Flower Petals,1 Gold = 5 @@ -526,7 +526,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Logs,1 Gold = 5 @@ -648,7 +648,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Wolf Skin,1 Gold = 5 @@ -656,7 +656,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -664,7 +664,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -672,7 +672,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -680,7 +680,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -688,7 +688,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 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 = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -705,7 +705,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -713,7 +713,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -721,7 +721,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -729,7 +729,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -762,7 +762,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Wolf Skin,1 Gold = 5 @@ -770,7 +770,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -778,7 +778,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -786,7 +786,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -794,7 +794,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -802,7 +802,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 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 = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -819,7 +819,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -827,7 +827,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -835,7 +835,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -843,7 +843,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -876,7 +876,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Wolf Skin,1 Gold = 5 @@ -884,7 +884,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -892,7 +892,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -900,7 +900,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -908,7 +908,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -916,7 +916,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 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 = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -933,7 +933,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -941,7 +941,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -949,7 +949,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -957,7 +957,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -990,7 +990,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Wolf Skin,1 Gold = 5 @@ -998,7 +998,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1006,7 +1006,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1014,7 +1014,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1022,7 +1022,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1030,7 +1030,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 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 = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1047,7 +1047,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1055,7 +1055,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1063,7 +1063,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1071,7 +1071,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1104,7 +1104,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Wolf Skin,1 Gold = 5 @@ -1112,7 +1112,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1120,7 +1120,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1128,7 +1128,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1136,7 +1136,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1144,7 +1144,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 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 = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1161,7 +1161,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1169,7 +1169,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1177,7 +1177,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1185,7 +1185,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 2 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1218,7 +1218,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Wolf Skin,1 Gold = 5 @@ -1226,7 +1226,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1234,7 +1234,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1242,7 +1242,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1250,7 +1250,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1258,7 +1258,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1267,7 +1267,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1275,7 +1275,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1283,7 +1283,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1291,7 +1291,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1299,7 +1299,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1332,7 +1332,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Wolf Skin,1 Gold = 5 @@ -1340,7 +1340,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1348,7 +1348,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1356,7 +1356,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1364,7 +1364,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1372,7 +1372,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1381,7 +1381,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1389,7 +1389,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1397,7 +1397,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1405,7 +1405,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1413,7 +1413,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1446,7 +1446,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Wolf Skin,1 Gold = 5 @@ -1454,7 +1454,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1462,7 +1462,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1470,7 +1470,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1478,7 +1478,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1486,7 +1486,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1495,7 +1495,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1503,7 +1503,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1511,7 +1511,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1519,7 +1519,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1527,7 +1527,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1560,7 +1560,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Wolf Skin,1 Gold = 5 @@ -1568,7 +1568,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1576,7 +1576,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1584,7 +1584,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1592,7 +1592,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1600,7 +1600,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1609,7 +1609,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1617,7 +1617,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1625,7 +1625,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1633,7 +1633,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1641,7 +1641,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1674,7 +1674,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Wolf Skin,1 Gold = 5 @@ -1682,7 +1682,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1690,7 +1690,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1698,7 +1698,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1706,7 +1706,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1714,7 +1714,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1723,7 +1723,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1731,7 +1731,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1739,7 +1739,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1747,7 +1747,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1755,7 +1755,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 3 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1788,7 +1788,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Wolf Skin,1 Gold = 5 @@ -1796,7 +1796,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1804,7 +1804,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1812,7 +1812,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1820,7 +1820,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1828,7 +1828,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1837,7 +1837,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1845,7 +1845,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1853,7 +1853,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1861,7 +1861,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1869,7 +1869,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1902,7 +1902,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Wolf Skin,1 Gold = 5 @@ -1910,7 +1910,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1918,7 +1918,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1926,7 +1926,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1934,7 +1934,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1942,7 +1942,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -1951,7 +1951,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1959,7 +1959,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1967,7 +1967,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1975,7 +1975,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -1983,7 +1983,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2017,7 +2017,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Wolf Skin,1 Gold = 5 @@ -2025,7 +2025,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2033,7 +2033,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2041,7 +2041,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2049,7 +2049,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2057,7 +2057,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -2066,7 +2066,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2074,7 +2074,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2082,7 +2082,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2090,7 +2090,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2098,7 +2098,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2131,7 +2131,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Wolf Skin,1 Gold = 5 @@ -2139,7 +2139,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2147,7 +2147,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2155,7 +2155,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2163,7 +2163,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2171,7 +2171,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -2180,7 +2180,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2188,7 +2188,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2196,7 +2196,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2204,7 +2204,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2212,7 +2212,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2245,7 +2245,7 @@ Equipment Crafting { # When this crafting recipe is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Wolf Skin,1 Gold = 5 @@ -2253,7 +2253,7 @@ Equipment Level[1] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2261,7 +2261,7 @@ Equipment Level[2] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2269,7 +2269,7 @@ Equipment Level[3] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2277,7 +2277,7 @@ Equipment Level[4] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2285,7 +2285,7 @@ Equipment Level[5] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,30 Item[1] = High-Quality Logs,1 @@ -2294,7 +2294,7 @@ Equipment Level[6] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2302,7 +2302,7 @@ Equipment Level[7] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2310,7 +2310,7 @@ Equipment Level[8] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2318,7 +2318,7 @@ Equipment Level[9] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 @@ -2326,7 +2326,7 @@ Equipment Level[10] { # When this enhancement is available. - AvailableChapter = 1 + AvailableChapter = 4 Item[0] = Green Slime Remains,1 Gold = 1 diff --git a/Adventures in Lestoria/assets/config/items/Weapons.txt b/Adventures in Lestoria/assets/config/items/Weapons.txt index 08b6e98f..43360338 100644 --- a/Adventures in Lestoria/assets/config/items/Weapons.txt +++ b/Adventures in Lestoria/assets/config/items/Weapons.txt @@ -27,7 +27,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Logs,1 Gold = 5 @@ -161,7 +161,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Logs,1 Gold = 5 @@ -284,7 +284,7 @@ Equipment { # When this crafting recipe is available. AvailableChapter = 1 - Item[0] = Wolf Skin,1 + Item[0] = Logs,1 Gold = 5 diff --git a/Adventures in Lestoria/buildtemplate.html b/Adventures in Lestoria/buildtemplate.html index 7e6698dd..8da87f6d 100644 --- a/Adventures in Lestoria/buildtemplate.html +++ b/Adventures in Lestoria/buildtemplate.html @@ -35,7 +35,7 @@ var Module = { })(), }; - +