Fix catch2 compatibility when building the game normally. Add freetype includes to sources list.

Adventures in Lestoria/Adventures in Lestoria.tiled-project

@@ -76,7 +76,9 @@
                 "beach",
                 "beach_boss",
                 "undead_swamp",
-                "undead_swamp_boss"
+                "undead_swamp_boss",
+                "foresty2",
+                "mountain2"
             ],
             "valuesAsFlags": false
         },

Adventures in Lestoria/TODO.txt

@@ -34,6 +34,8 @@ Qty Up/Down is finicky
 Add item icons in crafting menu descriptions
 HP Recovery can be too much
 
+Make molotov bigger
+
 In-universe explanation of item sets
 Battle Cry movement speed buff?
 Add potential upgrade amount on description before upgrading

Adventures in Lestoria/Version.h

@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 3
 #define VERSION_PATCH 0
-#define VERSION_BUILD 13412
+#define VERSION_BUILD 13418
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a

Adventures in Lestoria/assets/Campaigns/1_2.tmx

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" class="Map" orientation="orthogonal" renderorder="right-down" width="192" height="156" tilewidth="24" tileheight="24" infinite="0" nextlayerid="8" nextobjectid="109">
+<map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="192" height="156" tilewidth="24" tileheight="24" infinite="0" nextlayerid="8" nextobjectid="109">
  <properties>
   <property name="Backdrop" propertytype="Backdrop" value="forest"/>
-  <property name="Background Music" propertytype="BGM" value="foresty1_1"/>
+  <property name="Background Music" propertytype="BGM" value="foresty2"/>
   <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
  </properties>
  <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>

Adventures in Lestoria/assets/Campaigns/1_4.tmx

@@ -2,7 +2,7 @@
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="200" height="122" tilewidth="24" tileheight="24" infinite="0" nextlayerid="10" nextobjectid="83">
  <properties>
   <property name="Backdrop" propertytype="Backdrop" value="forest"/>
-  <property name="Background Music" propertytype="BGM" value="foresty1_1"/>
+  <property name="Background Music" propertytype="BGM" value="foresty2"/>
   <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
  </properties>
  <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>

Adventures in Lestoria/assets/Campaigns/2_2.tmx

@@ -2,7 +2,7 @@
 <map version="1.10" tiledversion="1.10.2" class="Map" orientation="orthogonal" renderorder="right-down" width="245" height="275" tilewidth="24" tileheight="24" infinite="0" nextlayerid="7" nextobjectid="70">
  <properties>
   <property name="Backdrop" propertytype="Backdrop" value="mountain_day"/>
-  <property name="Background Music" propertytype="BGM" value="mountain"/>
+  <property name="Background Music" propertytype="BGM" value="mountain2"/>
   <property name="Level Type" type="int" propertytype="LevelType" value="0"/>
  </properties>
  <tileset firstgid="1" source="../maps/Tilesheet_No_Shadow24x24.tsx"/>

Adventures in Lestoria/assets/config/PrecacheTimestamps.txt

@@ -6,12 +6,12 @@ WORLD_MAP = 2026-02-27 21:53:33.6568368
 CAMPAIGN_1_1 = 2026-01-21 20:30:58.3723266
 BOSS_1_B = 2024-09-13 21:28:58.8886132
 BOSS_2 = 2026-01-21 20:30:58.4312572
-BOSS_3 = 2026-04-13 20:07:59.9982330
-BOSS_3_B = 2026-04-21 02:50:32.8922615
+BOSS_3 = 2026-04-23 20:04:39.8919861
+BOSS_3_B = 2026-04-23 20:04:39.8919861
 CAMPAIGN_7_1 = 2024-09-13 21:28:58.8570782
-CAMPAIGN_1_4 = 2024-09-13 21:41:17.0083532
+CAMPAIGN_1_4 = 2026-04-28 20:00:03.4806604
 BOSS_2_B = 2026-01-21 20:30:58.4322614
-CAMPAIGN_1_2 = 2026-01-21 20:30:58.3736269
+CAMPAIGN_1_2 = 2026-04-28 19:44:26.2017819
 CAMPAIGN_1_3 = 2024-09-13 21:28:58.8532684
 CAMPAIGN_1_5 = 2024-09-13 21:28:58.8557772
 CAMPAIGN_4_8 = 2026-02-26 21:44:13.5419545
@@ -21,10 +21,10 @@ CAMPAIGN_1_B1 = 2024-09-13 21:28:58.8605592
 CAMPAIGN_1_8 = 2024-09-13 21:28:58.8595553
 CAMPAIGN_4_5 = 2026-02-26 21:44:13.5315825
 CAMPAIGN_2_1 = 2026-01-21 20:30:58.3756334
-CAMPAIGN_2_2 = 2026-01-21 20:30:58.3769261
-CAMPAIGN_2_3 = 2026-04-13 20:04:48.1801993
+CAMPAIGN_2_2 = 2026-04-28 19:44:26.2126272
+CAMPAIGN_2_3 = 2026-04-23 20:04:39.8896736
 CAMPAIGN_2_4 = 2026-01-21 20:30:58.3804324
-CAMPAIGN_2_5 = 2026-04-22 02:07:26.4326535
+CAMPAIGN_2_5 = 2026-04-23 20:04:39.8906724
 CAMPAIGN_2_6 = 2026-01-21 20:30:58.3836104
 CAMPAIGN_2_7 = 2026-01-21 20:30:58.3846135
 CAMPAIGN_2_8 = 2026-01-21 20:30:58.3866133
@@ -38,7 +38,7 @@ CAMPAIGN_3_5 = 2026-01-21 20:30:58.3977329
 CAMPAIGN_3_6 = 2026-01-21 20:30:58.4008008
 CAMPAIGN_3_7 = 2026-01-21 20:30:58.4023071
 CAMPAIGN_3_8 = 2026-01-21 20:30:58.4049027
-CAMPAIGN_3_B1 = 2026-04-21 02:50:32.8922615
+CAMPAIGN_3_B1 = 2026-04-23 20:04:39.8919861
 CAMPAIGN_4_1 = 2026-04-13 18:08:48.5353335
 CAMPAIGN_4_2 = 2026-02-26 21:44:13.5210572
 CAMPAIGN_4_4 = 2026-02-26 21:44:13.5270745

Adventures in Lestoria/assets/config/audio/bgm.txt

@@ -20,6 +20,24 @@ BGM
 		}
 	}
 
+	#Song title followed by filenames for individual parts
+	foresty2
+	{
+		Track Name = Foresty 2
+
+		channel[0]=commercial_assets/foresty2.ogg
+
+		# Transition time between one phase to the next.
+		Fade Time = 2.0
+
+		Loop Repeat Start Point = 0.0s
+
+		Events
+		{
+			Default Volume = 70%
+		}
+	}
+
 	#Song title followed by filenames for individual parts
 	overworld
 	{

Adventures in Lestoria/catch.h

@@ -1,3 +1,4 @@
+#ifdef UNIT_TESTING
 /*
  *  Catch v2.13.10
  *  Generated: 2022-10-16 11:01:23.452308
@@ -17993,5 +17994,10 @@ using Catch::Detail::Approx;
 // end catch_reenable_warnings.h
 // end catch.hpp
 #endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
-#define TEST(cl,testCaseName) TEST_CASE_METHOD(cl,"["#cl"] "##testCaseName)
+#endif
+#ifdef UNIT_TESTING
+#define TEST(cl,testCaseName) TEST_CASE_METHOD(cl,"["#cl"] "##testCaseName)
+#else
+#define TEST(cl,testCaseName) void UnusedFunc##cl()
+#define REQUIRE(condition) 
+#endif

CMakeLists.txt

@@ -97,8 +97,13 @@ if (NOT EMSCRIPTEN)
         "${SOURCE_CXX_SRC_DIR}/discord-files/*.cpp"
     )
 endif()
+file(
+    GLOB FREETYPE_INCLUDE_FILES
+    "${SOURCE_CXX_SRC_DIR}/include/*.h"
+)
 
 list(APPEND SOURCE_CXX_FILES ${SOURCE_CXX_FILES2})
+list(APPEND SOURCE_CXX_FILES ${FREETYPE_INCLUDE_FILES})
 
 # Search in the "cmake" directory for additional CMake modules.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -255,6 +260,7 @@ if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT TEST_ONLY)
 
     find_package(Freetype REQUIRED)
     target_link_libraries(${OutputExecutable} ${FREETYPE_LIBRARIES})
+    target_include_directories(${OutputExecutable} PRIVATE "${SOURCE_CXX_INCLUDE_DIR}/include")
     target_include_directories(${OutputExecutable} PRIVATE ${FREETYPE_INCLUDE_DIRS})
 
     target_include_directories(${OutputExecutable} PRIVATE "${C_CXX_SOURCES_DIR}/discord-files")
@@ -292,6 +298,7 @@ if(UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND TEST_ONLY)
 
     find_package(Freetype REQUIRED)
     target_link_libraries(AiL_test ${FREETYPE_LIBRARIES})
+    target_include_directories(AiL_test PRIVATE ${FREETYPE_INCLUDE_FILES})
     target_include_directories(AiL_test PRIVATE ${FREETYPE_INCLUDE_DIRS})
 
     target_include_directories(AiL_test PRIVATE "${C_CXX_SOURCES_DIR}/discord-files")

runGame - NO STEAM.bat

@@ -1,3 +1,3 @@
 cd "Adventures in Lestoria"
-"..\x64\Release\Adventures in Lestoria.exe" nosteam
+"..\x64\Release\Adventures in Lestoria.scr" nosteam
 set /p DUMMY=Hit ENTER to exit...