Skip to content

Commit d979360

Browse files
committed
Merge branch 'entities_update'
2 parents db0357d + 5b29fe3 commit d979360

Some content is hidden

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

41 files changed

+1046
-1308
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[inputs]
1+
[input]
22

33
Ignite = ignite
44
IgniteLifetime = ignite_lifetime
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
[descriptors]
1+
[descriptor]
22

3-
[[gun_offset]]
4-
prop = 'm_HackedGunPos'
5-
type = 'vector'
6-
7-
[[hitgroup]]
8-
prop = 'm_LastHitGroup'
9-
type = 'int'
3+
m_HackedGunPos = gun_offset
4+
m_LastHitGroup = hitgroup
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[inputs]
1+
[input]
22

33
HideWeapon = hide_weapon

addons/source-python/data/source-python/entities/managers/engines/csgo/CBaseEntity.ini

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,42 @@
22

33
# _ZN11CBaseEntity9SetParentEPS_i
44
[[set_parent]]
5-
offset_linux = 39
6-
offset_windows = 38
7-
arguments = POINTER,INT
5+
offset_linux = 39
6+
offset_windows = 38
7+
arguments = POINTER,INT
88

99

10-
[inputs]
10+
[input]
1111

1212
AddOutput = add_output
1313
DisableShadow = disable_shadow
1414
DispatchEffect = dispatch_effect
1515
EnableShadow = enable_shadow
1616
KillHierarchy = kill_hierarchy
1717
Kill = remove
18+
19+
20+
[property]
21+
22+
m_hOwnerEntity = owner
23+
m_clrRender = render
24+
25+
[[movetype]]
26+
27+
[[[freeze]]]
28+
True = 0
29+
False = 2
30+
31+
[[[jetpack]]]
32+
True = 4
33+
False = 2
34+
35+
[[[noclip]]]
36+
True = 8
37+
False = 2
38+
39+
[[m_CollisionGroup]]
40+
41+
[[[noblock]]]
42+
True = 2
43+
False = 5

addons/source-python/data/source-python/entities/managers/engines/csgo/CBasePlayer.ini

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,68 +2,54 @@
22

33
# _ZN11CBasePlayer10BumpWeaponEP17CBaseCombatWeapon
44
[[bump_weapon]]
5-
offset_linux = 441
6-
offset_windows = 440
7-
arguments = POINTER
8-
return_type = BOOL
5+
offset_linux = 441
6+
offset_windows = 440
7+
arguments = POINTER
8+
return_type = BOOL
99

1010
# _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
1111
[[drop_weapon]]
12-
offset_linux = 283
13-
offset_windows = 282
14-
arguments = POINTER,POINTER,POINTER
15-
return_type = INT
12+
offset_linux = 283
13+
offset_windows = 282
14+
arguments = POINTER, POINTER, POINTER
15+
return_type = INT
1616

1717
# _ZN11CBasePlayer13GiveNamedItemEPKciP13CEconItemViewb
18-
# [[give_named_item]]
19-
# offset_linux = 445
20-
# offset_windows = 444
21-
# arguments =
22-
# return_type =
18+
# [[give_named_item]]
19+
# offset_linux = 445
20+
# offset_windows = 444
21+
# arguments =
22+
# return_type =
2323

2424
# _ZN11CBasePlayer14FlashlightIsOnEv
2525
[[is_flashlight_on]]
26-
offset_linux = 394
27-
offset_windows = 393
28-
return_type = BOOL
26+
offset_linux = 394
27+
offset_windows = 393
28+
return_type = BOOL
2929

3030
# _ZN11CBasePlayer20SetFlashlightEnabledEb
3131
[[set_flashlight]]
32-
offset_linux = 393
33-
offset_windows = 392
34-
arguments = BOOL
32+
offset_linux = 393
33+
offset_windows = 392
34+
arguments = BOOL
3535

3636
# _ZN11CBasePlayer17FlashlightTurnOffEb
3737
[[turn_flashlight_off]]
38-
offset_linux = 396
39-
offset_windows = 395
40-
arguments = BOOL
38+
offset_linux = 396
39+
offset_windows = 395
40+
arguments = BOOL
4141

4242
# _ZN11CBasePlayer16FlashlightTurnOnEb
4343
[[turn_flashlight_on]]
44-
offset_linux = 395
45-
offset_windows = 394
46-
arguments = BOOL
44+
offset_linux = 395
45+
offset_windows = 394
46+
arguments = BOOL
4747

4848

49-
[descriptors]
49+
[descriptor]
5050

51-
[[deadflag]]
52-
prop = 'pl.deadflag'
53-
type = 'int'
54-
55-
[[deaths]]
56-
prop = m_iDeaths
57-
type = 'int'
58-
59-
[[is_ducked]]
60-
prop = m_Local.m_bDucked
61-
type = 'int'
62-
63-
[[in_ducking]]
64-
prop = m_Local.m_bDucking
65-
type = 'int'
66-
67-
[[kills]]
68-
prop = m_iFrags
69-
type = 'int'
51+
pl.deadflag = deadflag
52+
m_iDeaths = deaths
53+
m_Local.m_bDucked = is_ducked
54+
m_Local.m_bDucking = in_ducking
55+
m_iFrags = kills

addons/source-python/data/source-python/entities/managers/engines/csgo/CBaseTrigger.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[inputs]
1+
[input]
22

33
Disable = disable
44
Enable = enable

addons/source-python/data/source-python/entities/managers/engines/csgo/CFire.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[inputs]
1+
[input]
22

33
Extinguish = extinguish
44
ExtinguishTemporary = extinguish_temporary
Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,36 @@
11
[function]
22

33
[[lookup_attachment]]
4-
identifier_windows = " 55 8B EC 56 8B F1 80 BE 2D 2A 2A 2A 2A 75 3A 83 BE 4C 2A 2A 2A 2A 75"
5-
identifier_linux = _ZN14CBaseAnimating16LookupAttachmentEPKc
6-
arguments = STRING
7-
return_type = INT
4+
identifier_windows = " 55 8B EC 56 8B F1 80 BE 2D 2A 2A 2A 2A 75 3A 83 BE 4C 2A 2A 2A 2A 75"
5+
identifier_linux = _ZN14CBaseAnimating16LookupAttachmentEPKc
6+
arguments = STRING
7+
return_type = INT
88

9-
[inputs]
109

10+
[input]
11+
12+
BecomeRagdoll = become_ragdoll
1113
Ignite = ignite
14+
IgniteHitboxFireScale = ignite_hitbox_fire_scale
1215
IgniteLifetime = ignite_lifetime
16+
IgniteNumHitboxFires = ignite_num_hitbox_fires
17+
SetLightingOrigin = set_lighting_origin
18+
SetLightingOriginHack = set_lighting_origin_hack
19+
SetModelScale = set_model_scale
20+
21+
22+
[keyvalue]
23+
24+
LightingOrigin = lighting_origin
25+
LightingOriginHack = lighting_origin_hack
26+
SetBodyGroup = set_body_group
27+
body = body
28+
cycle = cycle
29+
fademaxdist = fademaxdist
30+
fademindist = fademindist
31+
fadescale = fadescale
32+
hitboxset = hitboxset
33+
modelscale = modelscale
34+
playbackrate = playbackrate
35+
sequence = sequence
36+
skin = skin
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[input]
2+
3+
Lock = lock
4+
Press = press
5+
PressIn = press_in
6+
PressOut = press_out
7+
Unlock = unlock
8+
9+
10+
[keyvalue]
11+
12+
movedir = movedir
13+
sounds = sounds
Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
[descriptors]
1+
[input]
22

3-
[[gun_offset]]
4-
prop = 'm_HackedGunPos'
5-
type = 'vector'
3+
KilledNPC = killed_npc
64

7-
[[hitgroup]]
8-
prop = 'm_LastHitGroup'
9-
type = 'int'
105

6+
[descriptor]
117

12-
[properties]
8+
m_HackedGunPos = gun_offset
9+
m_LastHitGroup = hitgroup
1310

14-
[[active_weapon]]
15-
prop = 'm_hActiveWeapon'
16-
type = 'int'
1711

18-
[[last_weapon]]
19-
prop = 'localdata.m_hLastWeapon'
20-
type = 'int'
12+
[keyvalue]
13+
14+
Relationship = relationship
15+
physdamagescale = physdamagescale
16+
17+
18+
[property]
19+
20+
m_hActiveWeapon = active_weapon
21+
localdata.m_hLastWeapon = last_weapon
Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
[inputs]
1+
[input]
22

33
HideWeapon = hide_weapon
44

55

6-
[properties]
6+
[property]
77

8-
[[ammoprop]]
9-
prop = 'm_iPrimaryAmmoType'
10-
type = 'int'
11-
12-
[[clip]]
13-
prop = 'm_iClip1'
14-
type = 'int'
8+
m_iPrimaryAmmoType = ammoprop
9+
m_iClip1 = clip
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[input]
2+
3+
Close = close
4+
Lock = lock
5+
Open = open
6+
SetSpeed = set_speed
7+
SetToggleState = set_toggle_state
8+
Toggle = toggle
9+
Unlock = unlock
10+
11+
12+
[keyvalue]
13+
14+
WaveHeight = wave_height
15+
chainstodoor = chainstodoor
16+
closesound = closesound
17+
dmg = dmg
18+
forceclosed = forceclosed
19+
ignoredebris = ignoredebris
20+
locked_sound = locked_sound
21+
loopmovesound = loopmovesound
22+
movedir = movedir
23+
noise1 = noise1
24+
noise2 = noise2
25+
spawnpos = spawnpos
26+
startclosesound = startclosesound
27+
unlocked_sound = unlocked_sound

0 commit comments

Comments
 (0)