Skip to content

Commit 143e4b6

Browse files
AyutoAyuto
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into engine_sdk2013
2 parents f1f85c5 + a0dcd98 commit 143e4b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1796
-858
lines changed

‎addons/source-python/data/source-python/entities/CBaseEntity.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@
8383
render_fx = m_nRenderFX
8484
render_mode_prop = m_nRenderMode
8585
move_type = movetype
86+
parent_inthandle = m_pParent

‎addons/source-python/data/source-python/entities/bms/CBaseCombatWeapon.ini

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[virtual_function]
2+
3+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
4+
[[primary_attack]]
5+
offset_linux = 294
6+
offset_windows = 293
7+
8+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
9+
[[secondary_attack]]
10+
offset_linux = 295
11+
offset_windows = 294

‎addons/source-python/data/source-python/entities/csgo/CBaseCombatWeapon.ini

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
srv_check = False
2+
3+
4+
[virtual_function]
5+
6+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
7+
[[primary_attack]]
8+
offset_linux = 313
9+
offset_windows = 307
10+
11+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
12+
[[secondary_attack]]
13+
offset_linux = 314
14+
offset_windows = 308
15+
16+
117
[property]
218

319
primary_ammo_count = m_iPrimaryReserveAmmoCount

‎addons/source-python/data/source-python/entities/csgo/CCSPlayer.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ srv_check = False
44
[function]
55

66
[[add_account]]
7-
identifier_windows = 55 8B EC 83 E4 F8 83 EC 3C 53 56 8B F1 57 8B 06 8B 80 2A 2A 2A 2A FF D0
7+
identifier_windows = 55 8B EC 83 E4 F8 83 EC 44 53 56 8B F1 57 8B 06
88
# identifier_linux = _ZN9CCSPlayer10AddAccountEibbPKc
9-
identifier_linux = 55 89 E5 57 56 53 81 EC 8C 00 00 00 8B 5D 08 0F B6 55 14
9+
identifier_linux = 55 89 E5 57 56 53 81 EC BC 00 00 00 8B 5D 08 0F B6 45 10
1010
arguments = INT, BOOL, BOOL, STRING
1111

1212
[[buy_internal]]

‎addons/source-python/data/source-python/entities/csgo/CKnife.ini

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎addons/source-python/data/source-python/entities/l4d2/CBaseCombatWeapon.ini

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[virtual_function]
2+
3+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
4+
[[primary_attack]]
5+
offset_linux = 282
6+
offset_windows = 281
7+
8+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
9+
[[secondary_attack]]
10+
offset_linux = 283
11+
offset_windows = 282

‎addons/source-python/data/source-python/entities/orangebox/cstrike/CKnife.ini renamed to ‎addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseCombatWeapon.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[virtual_function]
22

3-
# _ZN6CKnife13PrimaryAttackEv
3+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
44
[[primary_attack]]
55
offset_linux = 274
66
offset_windows = 273
77

8-
# _ZN6CKnife15SecondaryAttackEv
8+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
99
[[secondary_attack]]
1010
offset_linux = 275
1111
offset_windows = 274

‎addons/source-python/data/source-python/entities/orangebox/dod/CBaseCombatWeapon.ini

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[virtual_function]
2+
3+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
4+
[[primary_attack]]
5+
offset_linux = 274
6+
offset_windows = 273
7+
8+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
9+
[[secondary_attack]]
10+
offset_linux = 275
11+
offset_windows = 274

‎addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatWeapon.ini

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[virtual_function]
2+
3+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
4+
[[primary_attack]]
5+
offset_linux = 274
6+
offset_windows = 273
7+
8+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
9+
[[secondary_attack]]
10+
offset_linux = 275
11+
offset_windows = 274

‎addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatWeapon.ini

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[virtual_function]
2+
3+
# _ZN17CBaseCombatWeapon13PrimaryAttackEv
4+
[[primary_attack]]
5+
offset_linux = 283
6+
offset_windows = 282
7+
8+
# _ZN17CBaseCombatWeapon13SecondaryAttackEv
9+
[[secondary_attack]]
10+
offset_linux = 284
11+
offset_windows = 283

‎addons/source-python/data/source-python/weapons/csgo.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
hegrenade_projectile = "hegrenade"
2121
molotov_projectile = "molotov"
2222
smokegrenade_projectile = "smokegrenade"
23+
tagrenade_projectile = "tagrenade"
2324

2425

2526
[weapons]
@@ -474,10 +475,22 @@
474475
item_definition_index = 45
475476
tags = "all,grenade"
476477

478+
[[tagrenade]]
479+
slot = 4
480+
maxammo = "ammo_grenade_limit_default"
481+
ammoprop = 22
482+
tags = "all,grenade,tool,coop"
483+
477484
# =========================================================================
478485
# TOOLS
479486
# =========================================================================
480487
[[c4]]
481488
slot = 5
482489
item_definition_index = 49
483490
tags = "all,objective"
491+
492+
[[healthshot]]
493+
slot = 5
494+
maxammo = "ammo_item_limit_healthshot"
495+
ammoprop = 21
496+
tags = "all,tool,coop"

0 commit comments

Comments
 (0)