diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project index 26cb9889..997f3a89 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project +++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project @@ -271,7 +271,16 @@ "BOSS_2_B", "STORY_2_1", "STORY_2_2", - "NONE" + "NONE", + "CAMPAIGN_3_1", + "CAMPAIGN_3_2", + "CAMPAIGN_3_3", + "CAMPAIGN_3_4", + "CAMPAIGN_3_5", + "CAMPAIGN_3_6", + "CAMPAIGN_3_7", + "CAMPAIGN_3_8", + "CAMPAIGN_3_B1" ], "valuesAsFlags": false }, diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 77f06001..5e1cb81e 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 10910 +#define VERSION_BUILD 10911 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/3_1.tmx b/Adventures in Lestoria/assets/Campaigns/3_1.tmx index 3b313bf0..de60134d 100644 --- a/Adventures in Lestoria/assets/Campaigns/3_1.tmx +++ b/Adventures in Lestoria/assets/Campaigns/3_1.tmx @@ -1,5 +1,9 @@ - + + + + + diff --git a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx index e787d945..2c228069 100644 --- a/Adventures in Lestoria/assets/Campaigns/World_Map.tmx +++ b/Adventures in Lestoria/assets/Campaigns/World_Map.tmx @@ -1,5 +1,5 @@ - + @@ -603,6 +603,7 @@ + @@ -777,7 +778,7 @@ - + @@ -807,5 +808,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Adventures in Lestoria/assets/config/levels.txt b/Adventures in Lestoria/assets/config/levels.txt index e7eeec71..2d8eace3 100644 --- a/Adventures in Lestoria/assets/config/levels.txt +++ b/Adventures in Lestoria/assets/config/levels.txt @@ -196,4 +196,10 @@ Levels Loot[1] = Iron Ore, 1, 3, 100% Loot[2] = Yellow Gemstone, 1, 1, 5% } + CAMPAIGN_3_1 + { + Map File = 3_1.tmx + # Specify item, min quantity, and max quantity of items. Optionally specify a % drop chance per item. + # Loot[0] = Stone, 1, 3, 100% + } } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 138da3aa..5fdf8ffe 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/CMakeLists.txt b/CMakeLists.txt index d5b71ab2..b4200a2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,6 +325,8 @@ if (EMSCRIPTEN) -sFETCH=1 -sEXPORTED_RUNTIME_METHODS=stringToNewUTF8 -std=c++2a + -pthread + -sPTHREAD_POOL_SIZE=navigator.hardwareConcurrency --proxy-to-worker -sLLD_REPORT_UNDEFINED) endif() diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 6390299b..5237141e 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ