Merge pull request #1 from CS2ModServer/dev

Dev

Author: CS2ModServer

.gitignore

@@ -23,3 +23,5 @@ bld/
 /configs/maplist.cfg
 /configs/admins.cfg
 /data/infractions.txt
+dump
+Adventure

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/SampleEvents.py

@@ -16,7 +16,7 @@ def alog(message: str, callername: bool = True):
     pass
 
 
-#TRISTEN YOU LEFT OFF HERE
+
 try:
     from ./tests import dumped_events
 except Exception as e:
@@ -27,23 +27,6 @@ def alog(message: str, callername: bool = True):
 event_dict_of_dict = dict({})
 for k, v in dumped_events.dumped_events.items():
     event_dict_of_dict.update(v)
-#fake events
-'''        
-    "player_hurt":dict({
-        "userid":"playercontroller",
-        "userid_pawn":"strict_ehandle",
-        "attacker":"playercontroller",
-        "attacker_pawn":"strict_ehandle",
-        "health":"byte",
-        "armor":"byte",
-        "weapon":"string",
-        "dmg_health":"short",
-        "dmg_armor":"byte",
-        "hitgroup":"byte",
-        }),
-'''
-event_dict_of_dict.update({"player_hurt_pre":event_dict_of_dict["player_hurt"]})
-event_dict_of_dict.update({"player_hurt_post":event_dict_of_dict["player_hurt"]})
 
 class Event(object):
     #ev = dict()
@@ -105,14 +88,6 @@ def __init__(self, _event):
             alog(traceback.format_exc())
         #alog("END\n\n")
 
-events_whitelist = list([
-    "player_spawn",
-    "player_shoot",
-    "player_hurt_pre",
-    "player_hurt",
-    "player_hurt_post",
-    "player_death",
-    ])
 empty_events_list = list([])
 class SampleEvents:
     def __init__(self):
@@ -139,28 +114,6 @@ def player_hurt(self, event):
         aPawn = ev["userid_pawn"]
         alog("dmg_health is now: " + str(ev["dmg_health"]))
         pass
-    def player_hurt_pre(self, event):
-        alog("-")
-        try:
-            alog("try")
-            ev = Event(event)
-            alog("dmg_health was: " + str(ev["dmg_health"]))
-            ev["dmg_health"] = 99
-            aPawn = ev["userid_pawn"]
-            alog("dmg_health is now: " + str(ev["dmg_health"]))
-        except Exception as e:
-            alog("exception")
-            alog(e.message)
-            alog(e.args)
-        pass
-    def player_hurt_post(self, event):
-        alog("-")
-        ev = Event(event)
-        alog("dmg_health was: " + str(ev["dmg_health"]))
-        ev["dmg_health"] = 99
-        aPawn = ev["userid_pawn"]
-        alog("dmg_health is now: " + str(ev["dmg_health"]))
-        pass
     def OnPluginLoad(self, printmymethods: bool = False):
         #alog("TEST" + str(dumped_events.dumped_events) + "TEST")
 
@@ -176,37 +129,3 @@ def OnPluginLoad(self, printmymethods: bool = False):
                 alog("k: " + str(k) + " v: " + str(v))
 
         pass
-    def OnPluginUnload(self):
-        alog("Empty events fired during play: ")
-        for name in empty_events_list:
-            alog(str(name))
-        pass
-    def _player_spawn(self, ev):
-        pass
-    def _player_shoot(self, ev):
-        pass
-    def _player_death(self, ev):
-        pass
-    def OnGameEvent(self, event):
-        #alog("pre")
-        ev = Event(event)
-        alog(ev["name"])
-        if (len(ev.__dict__) <= 1):
-            empty_events_list.append(ev["name"])
-        elif (ev["name"] in events_whitelist):
-            temp_method = getattr(self, "_"+ev["name"])
-            temp_method(self, ev)
-        #else:
-        #    alog("Ignored event: '" + ev["name"] + "'")
-
-        if (ev["name"] == "player_hurt"):
-            GEKS = Source2Py.GameEventKeySymbol_t("dmg_health")
-            alog("dmg_health is now: " + str(ev   ["dmg_health"]))
-            event.SetInt(GEKS, 99)
-            
-            alog("dmg_health finally is: " + str(event.GetInt(GEKS, -1)))
-
-
-
-
-

PyPlugins/TestLoadPlugin.py

@@ -1,9 +1,64 @@
 # List Python plugins to include here
 
 #tests/TestLoadPlugin.py
+## event 'OnPluginLoad'
+## event 'OnPluginUnload'
+
 #tests/TestImportsPlugin.py
 #tests/TestExceptionTracebackPlugin.py
 #tests/TestLoadAnotherFile.py
-tests/TestPlayerHurt.py
-#SampleEvents.py
-#ManyRaces/AdventureTest.py
+
+#tests/TestPlayerHurt.py
+## event 'OnPlayerHurt'
+
+#tests/TestPlayerDeath.py
+## event 'OnPlayerDeath'
+
+#tests/TestConnections.py
+## event 'OnClientConnected'
+## event 'OnClientPutInServer'
+## event 'OnClientDisconnect'
+
+#tests/TestPlayerSpawn.py
+## event 'OnPlayerSpawn'
+## event 'OnPlayerSpawn_post'
+
+#tests/TestPlayerJump.py
+## event 'OnPlayerJump'
+## event 'OnPlayerLand'
+## event 'OnPlayerAirborn'
+
+#tests/TestPlayerInputs.py
+## buttons'n'bindings and stuff in here, lets see.
+## Check and report button states on player_jump and the following python captures
+## python capture 'OnClientCommand' but not as game event
+## python capture 'OnClientAbility1' but not as game event
+## python capture 'OnClientAbility2' but not as game event
+## python capture 'OnClientUltimate' but not as game event
+
+#tests/TestOnAllPluginsLoaded.py
+##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
+
+
+Adventure/Adventure.py
+
+
+###################tests/TestEffects.py
+## Here we go, time to make some nifty effects
+## playsound
+## create sprite
+
+##junk below is old work to pull from while making 
+##better working examples above
+###################SampleEvents.py
+###################ManyRaces/AdventureTest.py
+

PyPlugins/pyplugins.ini

@@ -0,0 +1,82 @@
+import Source2Py
+import logging, inspect
+import traceback
+
+#logging.basicConfig(filename='SampleEvents.log', encoding='utf-8', level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s', datefmt='%H:%M:%S')
+logging.basicConfig(filename='tests/TestConnections.log', encoding='utf-8', level=logging.DEBUG, format='[%(asctime)s]%(message)s', datefmt='%H:%M:%S')
+log = logging
+
+
+def alog(message: str, callername: bool = True):
+    caller = str("")
+    if (callername):
+        caller = "[" + str(inspect.stack()[1].function) + "] "
+    Source2Py.ServerPrint("[TestConnections]" + caller + str(message))
+    log.info(msg=("[TestConnections]" + caller + str(message)))
+    pass
+
+alog("START")
+class TestConnections:
+    ''' note that python does not need typing in it's method declarations but here it is being used 
+        as a reminder of the incoming type from CPP.
+    '''
+    def OnClientConnected(self, 
+        _slot: int, 
+        _name: str, 
+        _xuid: int, 
+        _networkID: str, 
+        _ipAddress: str, 
+        _fake: bool):
+        #first brush when player connects, no name available yet.
+        alog("START")
+        try:
+            alog("slot: " + str(_slot))
+            alog(_name + " connected")
+            alog("xuid: " + str(_xuid))
+            alog("networkID: " + str(_networkID))
+            alog("ipAddress: " + str(_ipAddress))
+            alog("fake: " + str(_fake))
+        except Exception as e:
+            alog(e)
+            alog(traceback.format_exc())
+        alog("END")
+        pass
+    def OnClientPutInServer(self, 
+        _slot: int, 
+        _name: str, 
+        _type: int, 
+        # type values could be:
+        # 0 - player
+        # 1 - fake player (bot)
+        # 2 - unknown
+        _xuid: int):
+        alog("START")
+        try:
+            alog("slot: " + str(_slot))
+            alog(_name + " put in server")
+            alog("type: " + str(_type))
+            alog("xuid: " + str(_xuid))
+        except Exception as e:
+            alog(e)
+            alog(traceback.format_exc())
+        alog("END")
+        pass
+    def OnClientDisconnect(self, 
+        _slot: int, 
+        _reason: int, 
+        _name: str, 
+        _xuid: int, 
+        _networkID: str):
+        alog("START")
+        try:
+            alog("slot: " + str(_slot))
+            alog("reason: " + str(_reason))
+            alog(_name + " disconnected")
+            alog("xuid: " + str(_xuid))
+            alog("networkID: " + str(_networkID))
+        except Exception as e:
+            alog(e)
+            alog(traceback.format_exc())
+        alog("END")
+        pass
+