Merge branch 'master' into collisions_transmit

jordanbriere · jordanbriere · commit bab9b13ce2f3 · 2023-06-29T23:48:07.000-04:00
diff --git a/addons/source-python/Python3/plat-linux/libz.so.1.2.11 b/addons/source-python/Python3/plat-linux/libz.so.1.2.11
diff --git a/addons/source-python/data/source-python/entities/csgo/CBaseCSGrenadeProjectile.ini b/addons/source-python/data/source-python/entities/csgo/CBaseCSGrenadeProjectile.ini
@@ -5,7 +5,7 @@ srv_check = False
 
     [[set_attacker]]
         identifier_windows = 55 8B EC 53 8B 5D 08 56 57 8B F9 53
-        identifier_linux = 55 89 E5 57 56 53 83 EC 2C C7 45 E4 00 00 00 00 8B 5D 08 8B 75 0C
+        identifier_linux = 55 89 E5 57 56 53 83 EC 2C 8B 5D 08 8B 7D 0C 8B 83 2A 2A 00 00 83 F8 FF 0F 84 2A 2A 00 00 8B 0D
         arguments = POINTER
 
 
diff --git a/addons/source-python/data/source-python/entities/csgo/CCSPlayer.ini b/addons/source-python/data/source-python/entities/csgo/CCSPlayer.ini
@@ -21,19 +21,19 @@ srv_check = False
     [[deafen]]
         identifier_windows = 55 8B EC 83 EC 28 56 57 8B F9 F3 0F 11 4D FC
         # identifier_linux = _ZN9CCSPlayer6DeafenEf
-        identifier_linux = 55 89 E5 83 EC 48 89 7D FC 8B 7D 08 89 5D F4 89 75 F8 8B 07
+        identifier_linux = 55 89 E5 57 56 53 83 EC 38 8B 5D 08 8B 03 53 FF 90 2A 2A 00 00 83 C4 10 85 C0
 
     # Reference string: sf_ui_tint
     [[_spawn]]
         identifier_windows = 55 8B EC 83 EC 0C 53 56 57 8B F9 8B 0D 2A 2A 2A 2A 8B 01
         # identifier_linux = _ZN9CCSPlayer12RoundRespawnEv
-        identifier_linux = 55 89 E5 56 53 83 EC 1C 8B 5D 08 FF 35 2A 2A 2A 2A E8 AA 32 F8 FF
+        identifier_linux = 55 89 E5 56 53 83 EC 1C 8B 5D 08 FF 35 2A 2A 2A 2A E8 2A 2A 2A 2A 83 C4 10 84 C0 0F 85 2A 2A 2A 2A 8B 13
 
     # Reference string: CCSPlayer::SwitchTeam( %d ) - invalid t
     [[switch_team]]
         identifier_windows = 55 8B EC 83 EC 10 53 56 8B 75 08 57 8B F9 85 F6
         # identifier_linux = _ZN9CCSPlayer10SwitchTeamEi
-        identifier_linux = 55 89 E5 56 53 83 EC 2C 8B 5D 0C 8B 75 08 53 E8 0C 7E C7 FF
+        identifier_linux = 55 89 E5 56 53 83 EC 2C 8B 5D 0C 8B 75 08 53
         arguments = INT
 
 
diff --git a/addons/source-python/data/source-python/entities/csgo/CDecoyProjectile.ini b/addons/source-python/data/source-python/entities/csgo/CDecoyProjectile.ini
@@ -6,4 +6,4 @@ srv_check = False
     # CDecoyProjectile::Think_Detonate
     [[detonate]]
         identifier_windows = 55 8B EC 51 56 8B F1 57 8B 86 D4 00 00 00
-        identifier_linux = 55 89 E5 57 56 53 83 EC 3C 8B 5D 08 F6 83 2A 00 00 00 10
+        identifier_linux = 55 89 E5 57 56 53 83 EC 1C 8B 5D 08 F6 83 2A 00 00 00 10
diff --git a/addons/source-python/data/source-python/entities/csgo/CSensorGrenadeProjectile.ini b/addons/source-python/data/source-python/entities/csgo/CSensorGrenadeProjectile.ini
@@ -11,12 +11,12 @@ srv_check = False
     # CSensorGrenadeProjectile::SensorThink
     [[detonate]]
         identifier_windows = 55 8B EC 83 E4 F8 51 53 56 57 8B F1 E8 2A 2A 2A 2A 8B F8
-        identifier_linux = 55 89 E5 57 56 53 83 EC 28 8B 5D 08 53 E8 EE 49 95 FF 83 C4 10 85
+        identifier_linux = 55 89 E5 57 56 53 83 EC 28 8B 5D 08 53 E8 2A 2A 2A 2A 83 C4 10 85 C0 0F 84 2A 2A 2A 2A 89 C6 8B 00
 
     # CSensorGrenadeProjectile::DoDetectWave
     [[do_detect_wave]]
         identifier_windows = 53 8B DC 83 EC 08 83 E4 F0 83 C4 04 55 8B 6B 04 89 6C 24 04 8B EC 81 EC 38 01 00 00 56 8B F1
-        identifier_linux = 55 89 E5 57 56 53 81 EC 68 01 00 00 FF 75 08 E8 4C 58 95 FF
+        identifier_linux = 55 89 E5 57 56 53 81 EC 68 01 00 00 FF 75 08
 
 
 [instance_attribute]
diff --git a/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini b/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini
@@ -5,3 +5,13 @@
     [[eye_angle]]
         name = m_angEyeAngles[0]
         type = QAngle
+
+
+[virtual_function]
+
+    # _ZN10CDODPlayer13GiveNamedItemEPKci
+    [[give_named_item]]
+        offset_linux = 401
+        offset_windows = 400
+        arguments = STRING, INT
+        return_type = POINTER
diff --git a/addons/source-python/data/source-python/weapons/csgo.ini b/addons/source-python/data/source-python/weapons/csgo.ini
@@ -38,7 +38,7 @@
         slot = 0
         maxammo = 30
         ammoprop = 6
-        clip = 10
+        clip = 5
         cost = 4750
         item_definition_index = 9
         tags = "all,primary,rifle,sniper"
@@ -118,10 +118,10 @@
 
     [[m4a1_silencer]]
         slot = 0
-        maxammo = 75
+        maxammo = 80
         ammoprop = 4
-        clip = 25
-        cost = 3100
+        clip = 20
+        cost = 2900
         item_definition_index = 60
         parent_class = "weapon_m4a1"
         tags = "all,secondary,rifle"
diff --git a/addons/source-python/data/source-python/weapons/dod.ini b/addons/source-python/data/source-python/weapons/dod.ini
@@ -6,113 +6,200 @@
 
 [weapons]
 
-    [[30cal]]
-        tags = "all"
+    # =========================================================================
+    # PRIMARY WEAPONS
+    # =========================================================================
+    [[garand]]
+        slot = 0
+        clip = 8
+        ammoprop = 4
+        tags = "all,primary,rifle"
 
-    [[amerknife]]
-        tags = "all"
+    [[thompson]]
+        slot = 0
+        clip = 30
+        ammoprop = 8
+        tags = "all,primary"
 
     [[bar]]
-        tags = "all"
+        slot = 0
+        clip = 20
+        ammoprop = 9
+        tags = "all,primary"
 
-    [[basebomb]]
-        tags = "all"
+    [[spring]]
+        slot = 0
+        clip = 5
+        ammoprop = 7
+        tags = "all,primary,rifle"
 
-    [[basedodgrenade]]
-        tags = "all"
+    [[30cal]]
+        slot = 0
+        clip = 150
+        ammoprop = 10
+        tags = "all,primary,machinegun"
 
     [[bazooka]]
-        tags = "all"
-
-    [[c96]]
-        tags = "all"
-
-    [[colt]]
-        tags = "all"
-
-    [[dod_base]]
-        tags = "all"
+        slot = 0
+        clip = 1
+        ammoprop = 12
+        tags = "all,primary,explosive"
 
-    [[dod_base_gun]]
-        tags = "all"
-
-    [[dod_base_melee]]
-        tags = "all"
+    [[k98]]
+        slot = 0
+        clip = 5
+        ammoprop = 5
+        tags = "all,primary,rifle"
 
-    [[dodbaserpg]]
-        tags = "all"
+    [[mp40]]
+        slot = 0
+        clip = 30
+        ammoprop = 8
+        tags = "all,primary"
 
-    [[frag_ger]]
-        tags = "all"
+    [[mp44]]
+        slot = 0
+        clip = 30
+        ammoprop = 8
+        tags = "all,primary"
 
-    [[frag_ger_live]]
-        tags = "all"
+    [[k98_scoped]]
+        slot = 0
+        clip = 5
+        ammoprop = 5
+        tags = "all,primary,rifle"
 
-    [[frag_us]]
-        tags = "all"
+    [[mg42]]
+        slot = 0
+        clip = 250
+        ammoprop = 11
+        tags = "all,primary,machinegun"
 
-    [[frag_us_live]]
-        tags = "all"
+    [[pschreck]]
+        slot = 0
+        clip = 1
+        ammoprop = 12
+        tags = "all,primary,explosive"
+
+    # =========================================================================
+    # SECONDARY WEAPONS
+    # =========================================================================
+    [[colt]]
+        slot = 1
+        clip = 7
+        ammoprop = 1
+        tags = "all,secondary,pistol"
 
-    [[garand]]
-        tags = "all"
+    [[m1carbine]]
+        slot = 1
+        clip = 15
+        ammoprop = 6
+        tags = "all,secondary,rifle"
 
-    [[ifm_base]]
-        tags = "all"
+    [[p38]]
+        slot = 1
+        clip = 8
+        ammoprop = 2
+        tags = "all,secondary,pistol"
 
-    [[ifm_base_camera]]
-        tags = "all"
+    [[c96]]
+        slot = 0
+        clip = 20
+        ammoprop = 3
+        tags = "all,secondary,pistol"
+
+    # =========================================================================
+    # MELEE WEAPONS
+    # =========================================================================
+    [[amerknife]]
+        slot = 2
+        clip = -1
+        ammoprop = -1
+        tags = "all,melee"
 
-    [[ifm_steadycam]]
-        tags = "all"
+    [[spade]]
+        slot = 2
+        clip = -1
+        ammoprop = -1
+        tags = "all,melee"
+
+    # =========================================================================
+    # PROJECTILE WEAPONS
+    # =========================================================================
+    [[riflegren_us]]
+        slot = 3
+        clip = -1
+        ammoprop = 21
+        tags = "all,grenade,explosive"
 
-    [[k98]]
-        tags = "all"
+    [[smoke_us]]
+        slot = 2
+        clip = -1
+        ammoprop = 17
+        tags = "all,grenade"
 
-    [[k98_scoped]]
-        tags = "all"
+    [[frag_us]]
+        slot = 3
+        clip = -1
+        ammoprop = 13
+        tags = "all,grenade,explosive"
 
-    [[m1carbine]]
-        tags = "all"
+    [[riflegren_ger]]
+        slot = 3
+        clip = -1
+        ammoprop = 22
+        tags = "all,grenade,explosive"
 
-    [[mg42]]
-        tags = "all"
+    [[smoke_ger]]
+        slot = 2
+        clip = -1
+        ammoprop = 18
+        tags = "all,grenade"
 
-    [[mp40]]
+    [[frag_ger]]
+        slot = 3
+        clip = -1
+        ammoprop = 14
+        tags = "all,grenade,explosive"
+
+    # =========================================================================
+    # UNKNOWN WEAPONS
+    # =========================================================================
+    [[dod_base]]
         tags = "all"
 
-    [[mp44]]
+    [[basebomb]]
         tags = "all"
 
-    [[p38]]
+    [[basedodgrenade]]
         tags = "all"
 
-    [[pschreck]]
+    [[dod_base_gun]]
         tags = "all"
 
-    [[riflegren_ger]]
+    [[dod_base_melee]]
         tags = "all"
 
-    [[riflegren_ger_live]]
+    [[dodbaserpg]]
         tags = "all"
 
-    [[riflegren_us]]
+    [[frag_ger_live]]
         tags = "all"
 
-    [[riflegren_us_live]]
+    [[frag_us_live]]
         tags = "all"
 
-    [[smoke_ger]]
+    [[ifm_base]]
         tags = "all"
 
-    [[smoke_us]]
+    [[ifm_base_camera]]
         tags = "all"
 
-    [[spade]]
+    [[ifm_steadycam]]
         tags = "all"
 
-    [[spring]]
+    [[riflegren_ger_live]]
         tags = "all"
 
-    [[thompson]]
+    [[riflegren_us_live]]
         tags = "all"
diff --git a/addons/source-python/packages/source-python/core/__init__.py b/addons/source-python/packages/source-python/core/__init__.py
@@ -41,6 +41,7 @@
 # Source.Python Imports
 #   Paths
 from paths import GAME_PATH
+from paths import CFG_PATH
 from paths import PLUGIN_PATH
 
 
@@ -64,13 +65,15 @@
 # =============================================================================
 __all__ = ('AutoUnload',
            'BoostPythonClass',
+           'ConfigFile',
            'GameConfigObj',
            'WeakAutoUnload',
            'GAME_NAME',
            'OutputReturn',
            'PLATFORM',
            'SOURCE_ENGINE',
            'SOURCE_ENGINE_BRANCH',
+           'Tokenize',
            'check_info_output',
            'console_message',
            'create_checksum',
diff --git a/src/core/modules/players/players_entity.cpp b/src/core/modules/players/players_entity.cpp
@@ -745,12 +745,12 @@ void PlayerMixin::SetSuitPowerLoad(float value)
 
 unsigned char PlayerMixin::GetDesiredPlayerClass()
 {
-	static int offset = FindNetworkPropertyOffset("m_Shared.m_iDesiredPlayerClass");
+	static int offset = FindNetworkPropertyOffset(DESIRED_PLAYER_CLASS_PROPERTY);
 	return GetNetworkPropertyByOffset<unsigned char>(offset);
 }
 
 void PlayerMixin::SetDesiredPlayerClass(unsigned char value)
 {
-	static int offset = FindNetworkPropertyOffset("m_Shared.m_iDesiredPlayerClass");
+	static int offset = FindNetworkPropertyOffset(DESIRED_PLAYER_CLASS_PROPERTY);
 	SetNetworkPropertyByOffset<unsigned char>(offset, value);
 }
diff --git a/src/core/modules/players/players_entity.h b/src/core/modules/players/players_entity.h
diff --git a/src/loader/definitions.h b/src/loader/definitions.h
diff --git a/src/loader/loader_main.cpp b/src/loader/loader_main.cpp

Original file line number	Diff line number	Diff line change
`@@ -745,12 +745,12 @@ void PlayerMixin::SetSuitPowerLoad(float value)`
`745`	`745`
`746`	`746`	`unsigned char PlayerMixin::GetDesiredPlayerClass()`
`747`	`747`	`{`
`748`		`- static int offset = FindNetworkPropertyOffset("m_Shared.m_iDesiredPlayerClass");`
	`748`	`+ static int offset = FindNetworkPropertyOffset(DESIRED_PLAYER_CLASS_PROPERTY);`
`749`	`749`	`return GetNetworkPropertyByOffset<unsigned char>(offset);`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`void PlayerMixin::SetDesiredPlayerClass(unsigned char value)`
`753`	`753`	`{`
`754`		`- static int offset = FindNetworkPropertyOffset("m_Shared.m_iDesiredPlayerClass");`
	`754`	`+ static int offset = FindNetworkPropertyOffset(DESIRED_PLAYER_CLASS_PROPERTY);`
`755`	`755`	`SetNetworkPropertyByOffset<unsigned char>(offset, value);`
`756`	`756`	`}`