diff --git a/.gitignore b/.gitignore index 6d79d265..b0678d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -421,3 +421,6 @@ desktop.ini /x64/Adventures in Lestoria.idb /x64/Adventures in Lestoria.lib /Adventures in Lestoria Tests/x64/Library (Release) +/x64/Unit Testing/assets +/Adventures in Lestoria Tests/x64/Unit Testing +/x64/Unit Testing diff --git a/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj b/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj index 31fa287c..5732d917 100644 --- a/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj +++ b/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj @@ -1,36 +1,12 @@ - - Debug + + Unit Testing Win32 - - Library (Debug) - Win32 - - - Library (Debug) - x64 - - - Library (Release) - Win32 - - - Library (Release) - x64 - - - Release - Win32 - - - Debug - x64 - - - Release + + Unit Testing x64 @@ -43,140 +19,40 @@ NativeUnitTestProject - - DynamicLibrary - true - v143 - Unicode - false - - - DynamicLibrary - true - v143 - Unicode - false - - - DynamicLibrary - false - v143 - true - Unicode - false - - - DynamicLibrary - false - v143 - true - Unicode - false - - + DynamicLibrary true v143 Unicode false - + DynamicLibrary true v143 Unicode false - - DynamicLibrary - false - v143 - true - Unicode - false - - - DynamicLibrary - false - v143 - true - Unicode - false - - - - - - - - + - - - - - - - - - - - - - + - - true - - + true C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria;$(IncludePath) - - true - - + true - - false - - - false - - - false - - - false - $(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria;$(IncludePath) - - - - NotUsing - Level3 - true - $(VCInstallDir)UnitTest\include;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\OneDrive\Documents\include;%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - true - pch.h - stdcpp20 - - - Windows - C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\OneDrive\Documents\include;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria Tests;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - discord_game_sdk.dll.lib;freetype.lib;steam_api64.lib;$(CoreLibraryDependencies);Adventures in Lestoria.lib;%(AdditionalDependencies) - - - + NotUsing Level3 @@ -193,7 +69,7 @@ $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - + Use Level3 @@ -208,245 +84,35 @@ $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - Use - Level3 - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - pch.h - - - Windows - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - Level3 - true - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - Level3 - true - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - Use - Level3 - true - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - true - pch.h - stdcpp20 + + + + + + + + + + + + + + + + + + - - Windows - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - - - - NotUsing - Level3 - true - true - true - C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\OneDrive\Documents\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - true - - - stdcpp20 + + + - - Windows - true - true - C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\OneDrive\Documents\include;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria Tests;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - discord_game_sdk.dll.lib;freetype.lib;steam_api64.lib;$(CoreLibraryDependencies);Adventures in Lestoria.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8e3067af-cfe7-4b11-bc6b-b867c32753d7} - - - diff --git a/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj.filters b/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj.filters index c0ac2d70..37b5ab11 100644 --- a/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj.filters +++ b/Adventures in Lestoria Tests/Adventures in Lestoria Tests.vcxproj.filters @@ -13,425 +13,58 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - {7c17cf40-e313-440d-8b28-a46736e838c7} - {a858da34-e037-467f-9f95-8066221a9657} - - {2ad4b357-0b91-4282-b869-a9600baebfe2} - - - {0a314412-8a4b-44ff-ab46-ac039bd0e494} - - - {d9d0ec7d-b067-4f75-ad65-f7e5147f8539} - - + Source Files - - Source Files\discord-files + + Source Files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - + Source Files\discord-files - - - - Header Files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\discord-files - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files\steam - - - Header Files - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype - - - Header Files\freetype\config - - - Header Files\freetype\config - - - Header Files\freetype\config - - - Header Files\freetype\config - - - Header Files\freetype\config - - - Header Files\freetype\config - - - Header Files\freetype\config - - - Header Files\freetype\config - - - - - Header Files\steam - + + Source Files + \ No newline at end of file diff --git a/Adventures in Lestoria Tests/GeometryTests.cpp b/Adventures in Lestoria Tests/GeometryTests.cpp new file mode 100644 index 00000000..bc2b6514 --- /dev/null +++ b/Adventures in Lestoria Tests/GeometryTests.cpp @@ -0,0 +1,55 @@ +#pragma region License +/* +License (OLC-3) +~~~~~~~~~~~~~~~ + +Copyright 2024 Joshua Sigona + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions or derivations of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions or derivative works in binary form must reproduce the above +copyright notice. This list of conditions and the following disclaimer must be +reproduced in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may +be used to endorse or promote products derived from this software without specific +prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +Portions of this software are copyright © 2024 The FreeType +Project (www.freetype.org). Please see LICENSE_FT.txt for more information. +All rights reserved. +*/ +#pragma endregion +#include "CppUnitTest.h" +#include "olcUTIL_Geometry2D.h" + +using namespace Microsoft::VisualStudio::CppUnitTestFramework; +using namespace olc::utils; + +namespace GeometryTests +{ + TEST_CLASS(GeometryTest) + { + public: + + TEST_METHOD(CircleOverlapTest) + { + Assert::IsTrue(geom2d::overlaps(geom2d::circle{vf2d{},10},vf2d{5,5})); + } + }; +} diff --git a/Adventures in Lestoria Tests/Adventures in Lestoria Tests.cpp b/Adventures in Lestoria Tests/MonsterTests.cpp similarity index 84% rename from Adventures in Lestoria Tests/Adventures in Lestoria Tests.cpp rename to Adventures in Lestoria Tests/MonsterTests.cpp index 62eaa94f..f9b927c7 100644 --- a/Adventures in Lestoria Tests/Adventures in Lestoria Tests.cpp +++ b/Adventures in Lestoria Tests/MonsterTests.cpp @@ -1,5 +1,41 @@ +#pragma region License +/* +License (OLC-3) +~~~~~~~~~~~~~~~ + +Copyright 2024 Joshua Sigona + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions or derivations of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions or derivative works in binary form must reproduce the above +copyright notice. This list of conditions and the following disclaimer must be +reproduced in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may +be used to endorse or promote products derived from this software without specific +prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +Portions of this software are copyright © 2024 The FreeType +Project (www.freetype.org). Please see LICENSE_FT.txt for more information. +All rights reserved. +*/ +#pragma endregion #include "CppUnitTest.h" -#include "olcUTIL_Geometry2D.h" #include "AdventuresInLestoria.h" #include "config.h" #include "ItemDrop.h" @@ -35,6 +71,7 @@ namespace MonsterTests } void SetupMockMap(){ game->MAP_DATA["CAMPAIGN_1_1"]; + ItemDrop::drops.clear(); } #pragma endregion @@ -222,17 +259,4 @@ namespace MonsterTests Assert::IsTrue(testMonster.IsAlive()); } }; -} - -namespace GeometryTests -{ - TEST_CLASS(GeometryTest) - { - public: - - TEST_METHOD(CircleOverlapTest) - { - Assert::IsTrue(geom2d::overlaps(geom2d::circle{vf2d{},10},vf2d{5,5})); - } - }; -} +} \ No newline at end of file diff --git a/Adventures in Lestoria Tests/PlayerTests.cpp b/Adventures in Lestoria Tests/PlayerTests.cpp new file mode 100644 index 00000000..7ff95285 --- /dev/null +++ b/Adventures in Lestoria Tests/PlayerTests.cpp @@ -0,0 +1,51 @@ +#pragma region License +/* +License (OLC-3) +~~~~~~~~~~~~~~~ + +Copyright 2024 Joshua Sigona + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions or derivations of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions or derivative works in binary form must reproduce the above +copyright notice. This list of conditions and the following disclaimer must be +reproduced in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may +be used to endorse or promote products derived from this software without specific +prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +Portions of this software are copyright © 2024 The FreeType +Project (www.freetype.org). Please see LICENSE_FT.txt for more information. +All rights reserved. +*/ +#pragma endregion +#include "CppUnitTest.h" +#include "AdventuresInLestoria.h" + +using namespace Microsoft::VisualStudio::CppUnitTestFramework; +using namespace olc::utils; + +namespace PlayerTests +{ + TEST_CLASS(PlayerTest) + { + public: + + }; +} diff --git a/Adventures in Lestoria.sln b/Adventures in Lestoria.sln index 332002fd..7fd217ba 100644 --- a/Adventures in Lestoria.sln +++ b/Adventures in Lestoria.sln @@ -15,14 +15,12 @@ Global Emscripten Debug|x86 = Emscripten Debug|x86 Emscripten|x64 = Emscripten|x64 Emscripten|x86 = Emscripten|x86 - Library (Debug)|x64 = Library (Debug)|x64 - Library (Debug)|x86 = Library (Debug)|x86 - Library (Release)|x64 = Library (Release)|x64 - Library (Release)|x86 = Library (Release)|x86 Release Desktop|x64 = Release Desktop|x64 Release Desktop|x86 = Release Desktop|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 + Unit Testing|x64 = Unit Testing|x64 + Unit Testing|x86 = Unit Testing|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Debug|x64.ActiveCfg = Debug|x64 @@ -37,14 +35,6 @@ Global {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Emscripten|x64.Build.0 = Emscripten|x64 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Emscripten|x86.ActiveCfg = Emscripten|Win32 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Emscripten|x86.Build.0 = Emscripten|Win32 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Debug)|x64.ActiveCfg = Library (Debug)|x64 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Debug)|x64.Build.0 = Library (Debug)|x64 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Debug)|x86.ActiveCfg = Library (Debug)|Win32 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Debug)|x86.Build.0 = Library (Debug)|Win32 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Release)|x64.ActiveCfg = Library (Release)|x64 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Release)|x64.Build.0 = Library (Release)|x64 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Release)|x86.ActiveCfg = Library (Release)|Win32 - {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Library (Release)|x86.Build.0 = Library (Release)|Win32 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Release Desktop|x64.ActiveCfg = Release Desktop|x64 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Release Desktop|x64.Build.0 = Release Desktop|x64 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Release Desktop|x86.ActiveCfg = Release Desktop|Win32 @@ -53,34 +43,24 @@ Global {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Release|x64.Build.0 = Release Desktop|x64 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Release|x86.ActiveCfg = Release Desktop|Win32 {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Release|x86.Build.0 = Release Desktop|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Debug|x64.ActiveCfg = Debug|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Debug|x64.Build.0 = Debug|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Debug|x86.ActiveCfg = Debug|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Debug|x86.Build.0 = Debug|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten Debug|x64.ActiveCfg = Debug|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten Debug|x64.Build.0 = Debug|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten Debug|x86.ActiveCfg = Debug|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten Debug|x86.Build.0 = Debug|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten|x64.ActiveCfg = Debug|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten|x64.Build.0 = Debug|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten|x86.ActiveCfg = Debug|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten|x86.Build.0 = Debug|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Debug)|x64.ActiveCfg = Library (Debug)|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Debug)|x64.Build.0 = Library (Debug)|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Debug)|x86.ActiveCfg = Library (Debug)|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Debug)|x86.Build.0 = Library (Debug)|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Release)|x64.ActiveCfg = Library (Release)|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Release)|x64.Build.0 = Library (Release)|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Release)|x86.ActiveCfg = Library (Release)|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Library (Release)|x86.Build.0 = Library (Release)|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release Desktop|x64.ActiveCfg = Release|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release Desktop|x64.Build.0 = Release|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release Desktop|x86.ActiveCfg = Release|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release Desktop|x86.Build.0 = Release|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release|x64.ActiveCfg = Release|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release|x64.Build.0 = Release|x64 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release|x86.ActiveCfg = Release|Win32 - {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release|x86.Build.0 = Release|Win32 + {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Unit Testing|x64.ActiveCfg = Unit Testing|x64 + {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Unit Testing|x64.Build.0 = Unit Testing|x64 + {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Unit Testing|x86.ActiveCfg = Unit Testing|Win32 + {8E3067AF-CFE7-4B11-BC6B-B867C32753D7}.Unit Testing|x86.Build.0 = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Debug|x64.ActiveCfg = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Debug|x86.ActiveCfg = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten Debug|x64.ActiveCfg = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten Debug|x86.ActiveCfg = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten|x64.ActiveCfg = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Emscripten|x86.ActiveCfg = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release Desktop|x64.ActiveCfg = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release Desktop|x86.ActiveCfg = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release|x64.ActiveCfg = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Release|x86.ActiveCfg = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Unit Testing|x64.ActiveCfg = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Unit Testing|x64.Build.0 = Unit Testing|x64 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Unit Testing|x86.ActiveCfg = Unit Testing|Win32 + {11969B7B-3D50-4825-9584-AF01D15B88E0}.Unit Testing|x86.Build.0 = Unit Testing|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj index 8a6df8c8..a8dee96a 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj @@ -21,20 +21,12 @@ Emscripten x64 - - Library (Debug) + + Unit Testing Win32 - - Library (Debug) - x64 - - - Library (Release) - Win32 - - - Library (Release) + + Unit Testing x64 @@ -65,7 +57,7 @@ v143 Unicode - + Application true v143 @@ -78,20 +70,13 @@ true Unicode - - Application - false - v143 - true - Unicode - Application true v143 Unicode - + StaticLibrary true v143 @@ -104,13 +89,6 @@ true Unicode - - StaticLibrary - false - v143 - true - Unicode - v143 @@ -131,51 +109,39 @@ - + - - - - + - - - $(SolutionDir)$(PlatformTarget)\Release - - $(SolutionDir)$(PlatformTarget)\Release - $(SolutionDir)$(PlatformTarget)\Release - - $(SolutionDir)$(PlatformTarget)\$(Configuration)\ - $(IncludePath) - + $(IncludePath) $(VCInstallDir)Auxiliary\VS\UnitTest\include;$(IncludePath) $(VCInstallDir)Auxiliary\VS\UnitTest\lib;$(LibraryPath) - + $(VCInstallDir)Auxiliary\VS\UnitTest\include;$(IncludePath) $(VCInstallDir)Auxiliary\VS\UnitTest\lib;$(LibraryPath) $(SolutionDir)$(Platform)\$(Configuration)\ @@ -201,7 +167,7 @@ powershell.exe -ExecutionPolicy Bypass -NoProfile -NonInteractive -File update_version.ps1 "./version.h" - + Level3 true @@ -245,29 +211,6 @@ powershell.exe -ExecutionPolicy Bypass -NoProfile -NonInteractive -File update_version.ps1 "./version.h" - - - TurnOffAllWarnings - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp20 - /MP8 %(AdditionalOptions) - C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\Documents\include;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files - - - Console - true - true - true - discord_game_sdk.dll.lib;freetype.lib;$(CoreLibraryDependencies);%(AdditionalDependencies);discord_game_sdk.dll.lib - - - powershell.exe -ExecutionPolicy Bypass -NoProfile -NonInteractive -File update_version.ps1 "./version.h" - - Level3 @@ -293,7 +236,7 @@ - + Level3 true @@ -352,40 +295,6 @@ - - - TurnOffAllWarnings - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp20 - /MP20 %(AdditionalOptions) - C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\steam;C:\Users\sigon\source\repos\AdventuresInLestoria\Adventures in Lestoria\discord-files;C:\Users\sigon\OneDrive\Documents\include - - - Windows - true - true - true - discord_game_sdk.dll.lib;freetype.lib;steam_api64.lib;$(CoreLibraryDependencies);%(AdditionalDependencies);discord_game_sdk.dll.lib - - - powershell.exe -ExecutionPolicy Bypass -NoProfile -NonInteractive -File update_version.ps1 "./version.h" - - - - - - - - - - - discord_game_sdk.dll.lib;freetype.lib;steam_api64.lib;$(CoreLibraryDependencies);%(AdditionalDependencies); - - Console diff --git a/Adventures in Lestoria/ItemDrop.h b/Adventures in Lestoria/ItemDrop.h index b68d3938..7791f289 100644 --- a/Adventures in Lestoria/ItemDrop.h +++ b/Adventures in Lestoria/ItemDrop.h @@ -39,8 +39,13 @@ All rights reserved. #include "util.h" #include "AdventuresInLestoria.h" +namespace MonsterTests{ + class MonsterTest; +} + class ItemDrop{ friend class AiL; + friend class MonsterTests::MonsterTest; vf2d pos; vf2d speed{}; float zSpeed=0; diff --git a/Adventures in Lestoria/StoneGolem.cpp b/Adventures in Lestoria/StoneGolem.cpp index e224609b..36d42fa7 100644 --- a/Adventures in Lestoria/StoneGolem.cpp +++ b/Adventures in Lestoria/StoneGolem.cpp @@ -148,7 +148,6 @@ void Monster::STRATEGY::STONE_GOLEM(Monster&m,float fElapsedTime,std::string str //Extending the bear script's variables to read the state of it... const bool SlamHasFinished=m.I(A::ATTACK_COUNT)!=m.I(A::BEAR_STOMP_COUNT); if(SlamHasFinished){ - if(m.F(A::HEALTH_PCT_PHASE)-m.GetHealthRatio()>=0.1f){ m.F(A::HEALTH_PCT_PHASE)-=0.1f; m.F(A::CASTING_TIMER)=ConfigFloat("Shockwave.Cast Time"); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 17d91468..d16b6e5b 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 9792 +#define VERSION_BUILD 9798 #define stringify(a) stringify_(a) #define stringify_(a) #a