Merge pull request #2 from CS2ModServer/dev

Upstream merge Source2Ze/CS2Fixes -> CS2ModServer/CS2Fixes

Author: CS2ModServer

.gitattributes

@@ -1 +1,3 @@
-docker-entrypoint.sh text eol=lf
+docker-entrypoint.sh text eol=lf
+clang-format.sh text eol=lf
+protobuf/protocompile.sh text eol=lf

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
     tags:
       - '*'
     branches:
-      - main
+      - '*'
     paths-ignore:
     - LICENSE
     - README.md

AMBuilder

@@ -63,6 +63,10 @@ for sdk_target in MMSPlugin.sdk_targets:
     'src/entities.cpp',
     'src/events.cpp',
     'src/utils/entity.cpp',
+    'src/utils/weapon.cpp',
+    'src/cs2_sdk/entity/services.cpp',
+    'src/cs2_sdk/entity/ccsplayerpawn.cpp',
+    'src/cs2_sdk/entity/cbasemodelentity.cpp',
     'src/cs2_sdk/schema.cpp',
     'src/ctimer.cpp',
     'src/panoramavote.cpp',

CS2Fixes.sln

@@ -14,7 +14,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2A734041-5881-4EA1-BF05-46F361443AF3}.Debug|x64.ActiveCfg = Debug|x64
-		{2A734041-5881-4EA1-BF05-46F361443AF3}.Debug|x64.Build.0 = Debug|x64
 		{2A734041-5881-4EA1-BF05-46F361443AF3}.Debug|x86.ActiveCfg = Debug|Win32
 		{2A734041-5881-4EA1-BF05-46F361443AF3}.Debug|x86.Build.0 = Debug|Win32
 		{2A734041-5881-4EA1-BF05-46F361443AF3}.Release|x64.ActiveCfg = Release|x64

CS2Fixes.vcxproj

@@ -225,6 +225,10 @@
     <ClCompile Include="src\utils\entity.cpp" />
     <ClCompile Include="src\utils\plat_unix.cpp" />
     <ClCompile Include="src\utils\plat_win.cpp" />
+    <ClCompile Include="src\utils\weapon.cpp" />
+    <ClCompile Include="src\cs2_sdk\entity\services.cpp" />
+    <ClCompile Include="src\cs2_sdk\entity\ccsplayerpawn.cpp" />
+    <ClCompile Include="src\cs2_sdk\entity\cbasemodelentity.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\adventuremenu.h" />
@@ -265,6 +269,7 @@
     <ClInclude Include="src\cs2_sdk\entity\lights.h" />
     <ClInclude Include="src\cs2_sdk\entity\services.h" />
     <ClInclude Include="src\cs2_sdk\entity\viewmodels.h" />
+    <ClInclude Include="src\cs2_sdk\entity\cpointhurt.h" />
     <ClInclude Include="src\cs2_sdk\schema.h" />
     <ClInclude Include="src\cs2_sdk\entityio.h" />
     <ClInclude Include="src\cdetour.h" />
@@ -303,6 +308,7 @@
     <ClInclude Include="src\utils\plat.h" />
     <ClInclude Include="src\utils\virtual.h" />
     <ClInclude Include="src\netmessages.h" />
+    <ClInclude Include="src\utils\weapon.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

CS2Fixes.vcxproj.filters

@@ -179,6 +179,18 @@
     <ClCompile Include="src\entwatch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\utils\weapon.cpp">
+      <Filter>Source Files\utils</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cs2_sdk\entity\services.cpp">
+      <Filter>Source Files\cs2_sdk\entity</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cs2_sdk\entity\ccsplayerpawn.cpp">
+      <Filter>Source Files\cs2_sdk\entity</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cs2_sdk\entity\cbasemodelentity.cpp">
+      <Filter>Source Files\cs2_sdk\entity</Filter>
+    </ClCompile>
     <ClCompile Include="src\PyAPI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -403,6 +415,12 @@
     <ClInclude Include="src\cs2_sdk\entity\viewmodels.h">
       <Filter>Header Files\cs2_sdk\entity</Filter>
     </ClInclude>
+    <ClInclude Include="src\cs2_sdk\entity\cpointhurt.h">
+      <Filter>Header Files\cs2_sdk\entity</Filter>
+    </ClInclude>
+    <ClInclude Include="src\utils\weapon.h">
+      <Filter>Header Files\utils</Filter>
+    </ClInclude>
     <ClInclude Include="src\PyInclude.h">
       <Filter>Header Files</Filter>
     </ClInclude>

Dockerfile

@@ -9,7 +9,6 @@ RUN cd ambuild && python setup.py install && cd ..
 RUN git clone https://github.com/alliedmodders/metamod-source
 RUN git config --global --add safe.directory /app
 
-COPY . ./source
 COPY ./docker-entrypoint.sh ./
 ENV HL2SDKCS2=/app/source/sdk
 ENV MMSOURCE112=/app/metamod-source

cfg/cs2fixes/cs2fixes.cfg

@@ -24,6 +24,7 @@ cs2f_drop_map_weapons			0		// Whether to force drop map-spawned weapons on death
 cs2f_shuffle_player_physics_sim 0		// Whether to enable shuffle player list in physics simulate
 cs2f_prevent_using_players		0		// Whether to prevent +use from hitting players (0=can use players, 1=cannot use players)
 cs2f_map_steamids_enable		0		// Whether to make Steam ID's available to maps
+cs2f_fix_game_bans				0		// Whether to fix CS2 game bans spreading to all new joining players
 
 cs2f_beacon_particle			"particles/cs2fixes/player_beacon.vpcf" // .vpcf file to be precached and used for player beacon
 
@@ -38,7 +39,7 @@ cs2f_flashlight_shadows			1		// Whether to enable flashlight shadows
 cs2f_flashlight_transmit_others	0		// Whether to transmit other players' flashlights, recommended to have shadows disabled with this
 cs2f_flashlight_brightness		1.0		// How bright should flashlights be
 cs2f_flashlight_distance		54		// How far flashlights should be from the player's head (the default is such that an equipped awp doesn't block the light if shadows are enabled)
-cs2f_flashlight_color			"255 255 255"	// What color to use for flashlights
+cs2f_flashlight_color			"255 255 255 0"	// What color to use for flashlights
 cs2f_flashlight_attachment		axis_of_intent	// Which attachment to parent a flashlight to. If the player model is not properly setup, you might have to use clip_limit here instead
 
 // Damage block settings
@@ -125,6 +126,7 @@ cs2f_leader_defend_particle		"particles/cs2fixes/leader_defend_mark.vpcf"      /
 cs2f_leader_mark_particle		"particles/cs2fixes/leader_defend_mark.vpcf"      // Path to particle to be used when a ct leader using player_ping
 cs2f_leader_can_target_players	0       // Whether a leader can target other players with leader commands (not including c_leader)
 cs2f_leader_vote_multiple		1       // If 1, players can vote up to cs2f_max_leaders leaders. If 0, they may vote for a single leader
+cs2f_leader_extra_score			20000	// Extra score to give a leader to affect their position on the scoreboard
 cs2f_leader_max_leaders			3       // Max amount of leaders set via c_vl or a leader using c_leader (doesn't impact admins)
 cs2f_leader_max_markers			6       // Max amount of markers set by leaders (doesn't impact admins)
 cs2f_leader_max_glows			3       // Max amount of glows set by leaders (doesn't impact admins)

gamedata/cs2fixes.games.txt

@@ -45,20 +45,6 @@
 				"windows"		"\x76\x2A\xF2\x0F\x10\x4F\x2A\x41\x0F\x28\xC1\x0F\x28\xD1\xF3\x0F\x59\xC0"
 				"linux"			"\x0F\x87\x2A\x2A\x2A\x2A\x49\x8B\x7C\x24\x2A\xE8\x2A\x2A\x2A\x2A\x66\x0F\xEF\xED\x66\x0F\xD6\x85"
 			}
-			// Check vauff's pin in #scripting
-			"ClientMovementUnlock"
-			{
-				"library"		"client"
-				"windows"		"\x76\x2A\xF2\x0F\x10\x4F\x2A\x41\x0F\x28\xC1\x0F\x28\xD1\xF3\x0F\x59\xC0"
-				"linux"			"\x0F\x87\x2A\x2A\x2A\x2A\x49\x8B\x7D\x30\xE8\x2A\x2A\x2A\x2A\x66\x0F\xEF\xED\x66\x0F\xD6\x85\x2A\x2A\x2A\x2A"
-			}
-			// String: "Noise removal", there should be 3 customermachine checks
-			"HammerNoCustomerMachine"
-			{
-				"library"		"hammer"
-				"windows"		"\xFF\x15\x2A\x2A\x2A\x2A\x84\xC0\x0F\x85\x2A\x2A\x2A\x2A\xB9"
-				"linux"			""
-			}
 			// String: "CCSPlayerPawnBase::SwitchTeam", just keep in mind this is actually CCSPlayerController::SwitchTeam
 			"CCSPlayerController_SwitchTeam"
 			{
@@ -394,15 +380,16 @@
 			"GameSystem_Think_CheckSteamBan"
 			{
 				"library"	"server"
-				"windows"	"\x41\x54\x48\x83\xEC\x2A\xBA\x2A\x2A\x2A\x2A\x48\x8D\x0D\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x48\x85\xC0"
+				"windows"	"\x41\x54\x48\x81\xEC\x2A\x2A\x2A\x2A\xBA\x2A\x2A\x2A\x2A\x48\x8D\x0D\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x48\x85\xC0"
 				"linux"		"\x55\x48\x8D\x3D\x2A\x2A\x2A\x2A\xBE\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC"
 			}
 			// Location to CUtlMap unk that is referenced by function with "Notification about user penalty: %u/%u (%u sec)\n" string
+			// On Linux the unk is located in a sub-function that gets called with "CUtlRBTree overflow with %u elements!\n" string
 			"CCSGameRules__sm_mapGcBanInformation"
 			{
 				"library"	"server"
-				"windows"	"\x48\x8D\x0D\x2A\x2A\x2A\x2A\xF2\x0F\x58\xC1"
-				"linux"		"\x48\x8D\x3D\x2A\x2A\x2A\x2A\x44\x89\x6D"
+				"windows"	"\x48\x8D\x0D\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x48\x63\xD8\x48\x6B\xD3"
+				"linux"		"\x48\x8D\x3D\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x48\x8B\x05\x2A\x2A\x2A\x2A\x83\x05"
 			}
 		}
 		"Offsets"
@@ -585,18 +572,6 @@
 				"windows"		"\x49\x89\xF8\x90"
 				"linux"			"\x48\x89\xDA\x90\x90"
 			}
-			// Client
-			"ClientMovementUnlock"
-			{
-				"windows"		"\xEB"
-				"linux"			"\x90\x90\x90\x90\x90\x90"
-			}
-			// Hammer
-			"HammerNoCustomerMachine"
-			{
-				"windows"		"\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90"
-				"linux"			""
-			}
 		}
 	}
-}
+}