adding events, expanding old events.

Author: CS2ModServer

CS2Fixes.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.3.32825.248
+VisualStudioVersion = 17.12.35707.178
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CS2Fixes", "CS2Fixes.vcxproj", "{2A734041-5881-4EA1-BF05-46F361443AF3}"
 EndProject
@@ -26,6 +26,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {12C11272-4784-4DD0-A905-B564ECADA421}
+		SolutionGuid = {B6F3ACAE-5F98-35F2-85C4-16713E0FC2A2}
 	EndGlobalSection
 EndGlobal

CS2Fixes.vcxproj

@@ -73,13 +73,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>cs2fixes</TargetName>
-    <LibraryPath>sdk\lib\public\win64;vendor/funchook/lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <LibraryPath>sdk\lib\public\win64;vendor/funchook/lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);vendor/nlohmann;vendor</LibraryPath>
     <OutDir>$(SolutionDir)/build/package/addons/cs2fixes/bin/win64/</OutDir>
     <IntDir>$(SolutionDir)/build/$(ShortProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>cs2fixes</TargetName>
-    <LibraryPath>sdk\lib\public\win64;vendor/funchook/lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
+    <LibraryPath>sdk\lib\public\win64;vendor/nlohmann;vendor/funchook/lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
     <OutDir>$(SolutionDir)/package/addons/cs2fixes/bin/win64/</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -125,7 +125,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;../metamod-source/core;../metamod-source/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);vendor/funchook/lib;C:/Python312/include;vendor/pybind11/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;../metamod-source/core;../metamod-source/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);vendor/funchook/lib;C:/Python312/include;vendor/pybind11/include;vendor/nlohmann/;%(AdditionalIncludeDirectories);../vendor/nlohmann/;../menu_system/public;../menu_system/public/imenusystem</AdditionalIncludeDirectories>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -151,7 +151,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;../metamod-source/core;../metamod-source/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);vendor/funchook/lib;C:/Python312/include;vendor/pybind11/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;../metamod-source/core;../metamod-source/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);vendor/funchook/lib;C:/Python312/include;vendor/pybind11/include;vendor/nlohmann/;vendor;%(AdditionalIncludeDirectories);../vendor/nlohmann/</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -163,7 +163,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <AdditionalDependencies>interfaces.lib;mathlib.lib;tier0.lib;tier1.lib;psapi.lib;funchook.lib;distorm.lib;steam_api64.lib;vendor/protobuf-lib/Release/libprotobuf.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>sdk/lib/public/win64;vendor/funchook/lib/Release;/NODEFAULTLIB;%(AdditionalLibraryDirectories);C:/Python312/libs</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>sdk/lib/public/win64;vendor/funchook/lib/Release;/NODEFAULTLIB;%(AdditionalLibraryDirectories);C:/Python312/libs;vendor/nlohmann/</AdditionalLibraryDirectories>
       <ShowProgress>
       </ShowProgress>
     </Link>
@@ -172,6 +172,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\adventuremenu.cpp" />
     <ClCompile Include="src\adventuremod.cpp" />
     <ClCompile Include="src\buttonwatch.cpp" />
     <ClCompile Include="protobuf\generated\cs_usercmd.pb.cc" />
@@ -226,6 +227,7 @@
     <ClCompile Include="src\utils\plat_win.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\adventuremenu.h" />
     <ClInclude Include="src\adventuremod.h" />
     <ClInclude Include="src\buttonwatch.h" />
     <ClInclude Include="src\adminsystem.h" />

CS2Fixes.vcxproj.filters

@@ -191,6 +191,9 @@
     <ClCompile Include="src\adventuremod.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\adventuremenu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\mempatch.h">
@@ -418,5 +421,8 @@
     <ClInclude Include="src\adventuremod.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\adventuremenu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

CS2Fixes.vcxproj.user

@@ -2,13 +2,13 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerCommand>E:/CS2Server\cs2\game\bin\win64\cs2.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>-dedicated -usercon +game_type 0 +game_mode 1 +map de_dust2 -maxplayers_override 64</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-dedicated</LocalDebuggerCommandArguments>
     <LocalDebuggerWorkingDirectory>E:/CS2Server\cs2\game\bin\win64</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LocalDebuggerCommand>E:/CS2Server\cs2\game\bin\win64\cs2.exe</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>-dedicated -usercon +game_type 0 +game_mode 1 +map de_dust2 -maxplayers_override 64 +login CS2ModServer )+:b9h:S4SZcQuE</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-insecure -language english -window -dedicated -usercon +game_type 0 +game_mode 1 +map de_dust2 -maxplayers_override 64 +login CS2ModServer )+:b9h:S4SZcQuE</LocalDebuggerCommandArguments>
     <LocalDebuggerWorkingDirectory>E:/CS2Server\cs2\game\bin\win64</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>

PyPlugins/pyplugins.ini

@@ -37,19 +37,23 @@
 ## python capture 'OnClientUltimate' but not as game event
 
 #tests/TestOnAllPluginsLoaded.py
-#MenuSystem by Wend4r python interface to CS2Fixes.
+##MenuSystem by Wend4r python interface to CS2Fixes.
 ##When a player connects UpdatePlayerItems is called by CPP which requests Python to send the players' info
 ##When a player opens a menu by '!menu' display that info and if stale, update it.
 
-tests/TestPyMySQL.py
-#Check for Database or Add
-#Check for Table or Add
-#Check for Connecting Player or Add
-#Count kills for Player
-#Print killcount
+#tests/TestPyMySQL.py
+##Check for Database or Add
+##Check for Table or Add
+##Check for Connecting Player or Add
+##Count kills for Player
+##Print killcount
+
+
+Adventure/Adventure.py
+
 
 ###################tests/TestEffects.py
-## Here we go, time to make some nifty effects, pokeball go!
+## Here we go, time to make some nifty effects
 ## playsound
 ## create sprite
 
@@ -58,4 +62,3 @@ tests/TestPyMySQL.py
 ###################SampleEvents.py
 ###################ManyRaces/AdventureTest.py
 
-###################Adventure/Adventure.py

cfg/cs2fixes/cs2fixes.cfg

@@ -1,6 +1,6 @@
 // Feature cvars
 cs2f_commands_enable			1		// Whether to enable chat commands
-cs2f_admin_commands_enable		0		// Whether to enable admin chat commands
+cs2f_admin_commands_enable		1		// Whether to enable admin chat commands
 cs2f_admin_immunity             0       // Mode for which admin immunity system targetting allows: 0 - strictly lower, 1 - equal to or lower, 2 - ignore immunity levels
 cs2f_weapons_enable 			0		// Whether to enable weapon commands
 cs2f_stopsound_enable 			0		// Whether to enable stopsound

configs/maplist.jsonc.example

@@ -48,5 +48,32 @@
 			"max_players": 20,
 			"groups": [ "MyFirstGroup", "MySecondGroup" ] // A map can be in multiple groups
 		}
+		"de_ancient":{"enabled": true},
+		"de_train":{"enabled": true},
+		"de_vertigo":{"enabled": true},
+		"de_anubis":{"enabled": true},
+		"de_nuke":{"enabled": true},
+		"de_inferno":{"enabled": true},
+		"cs_italy":{"enabled": true},
+		"cs_office":{"enabled": true},
+		"ze_my_first_ze_map": {
+			"enabled": true,
+			"workshop_id": 123,
+			"min_players": 30,
+			"cooldown": 2
+		},
+		"ze_my_second_ze_map": {
+			"enabled": true,
+			"workshop_id": 456,
+			"min_players": 5,
+			"max_players": 10,
+			"cooldown": 3
+		},
+		"ze_my_third_ze_map": {
+			"enabled": true,
+			"workshop_id": 789,
+			"max_players": 20,
+			"cooldown": 1
+		}
 	}
 }

src/PyModule.h

@@ -41,8 +41,7 @@ PYBIND11_EMBEDDED_MODULE(Source2Py, m) {
 				//py::init<const char*>(((std::string*)s)->c_str());
 				return GameEventKeySymbol_t(((std::string*)s)->c_str());
 			}))
-			
-		;
+			;
 	}
 
 	//IGameEvent player_hurt

src/PyPlugin.cpp

@@ -97,6 +97,33 @@ namespace Source2Py {
 		PyRuntime::ExecuteObjectMethod(m_PluginObject, "OnPlayerDeath", event);
 	}
 
+	void PyPlugin::PyPlayerDeathNew(
+		IGameEvent* event,
+		CPlayerSlot killerSlot,
+		uint64_t killerSteam,
+		CPlayerSlot victimSlot,
+		uint64_t victimSteam,
+		CPlayerSlot assisterSlot,
+		uint64_t assisterSteam,
+		bool suicide)
+	{
+		PyRuntime::ExecuteObjectMethod(m_PluginObject, "OnPlayerDeath", event, killerSlot, killerSteam, victimSlot, victimSteam, assisterSlot, assisterSteam, suicide);
+	}
+	void PyPlugin::PyBombPlanted(IGameEvent* event, int slot, int site)
+	{
+		PyRuntime::ExecuteObjectMethod(m_PluginObject, "OnBombPlanted", event, slot, site);
+	}
+
+	void PyPlugin::PyBombDefused(IGameEvent* event, int slot, int site)
+	{
+		PyRuntime::ExecuteObjectMethod(m_PluginObject, "OnBombDefused", event, slot, site);
+	}
+
+	void PyPlugin::PyBombExploded(IGameEvent* event, int slot, int site)
+	{
+		PyRuntime::ExecuteObjectMethod(m_PluginObject, "OnBombExploded", event, slot, site);
+	}
+
 	void PyPlugin::PyPlayerSpawn(int playerSlot)
 	{
 		PyRuntime::ExecuteObjectMethod(m_PluginObject, "OnPlayerSpawn", playerSlot);

src/PyPlugin.h

@@ -34,8 +34,25 @@ namespace Source2Py {
 		void PyClientUltimate(int playerSlot);
 
 		void PyPlayerHurt(IGameEvent* event);
+
+		//event, killerslot, killersteam,    victimslot, victimsteam,    assistorslot, assistorsteam, suicide
+		void PyPlayerDeathNew(
+			IGameEvent* event, 
+			CPlayerSlot	killerSlot,
+			uint64_t	killerSteam, 
+			CPlayerSlot victimSlot,
+			uint64_t	victimSteam, 
+			CPlayerSlot assisterSlot,
+			uint64_t	assisterSteam, 
+			bool		suicide
+			);
 		void PyPlayerDeath(IGameEvent* event);
+
 
+		void PyBombPlanted(IGameEvent* event, int slot, int site);
+		void PyBombDefused(IGameEvent* event, int slot, int site);
+		void PyBombExploded(IGameEvent* event, int slot, int site);
+
 		void PyPlayerJump(int playerSlot);
 		void PyPlayerAirborn(int playerSlot);
 		void PyPlayerLand(int playerSlot);