Skip to content

Commit 57b07d3

Browse files
AyutoAyuto
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into engine_blade
2 parents 4097980 + 7350053 commit 57b07d3

35 files changed

Lines changed: 956 additions & 372 deletions

File tree

‎.pylintrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ignore=
77
# Definitions of codes disabled
88
# For a list of error codes, see:
99
# http://pylint-messages.wikidot.com/all-codes
10-
# disable=C0103, E0203, R0911, R0915, R0921, W0142, W0201, W0232, W0613
1110
disable=C0330, C0411, E0611, E1101, F0401, R0902, R0903, R0904, R0912, R0913, R0914, W0212, W0702
1211

1312

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
max_health = max_health
3939
parent_name = parentname
4040
render_color = rendercolor
41-
render_fx = renderfx
4241
render_mode = rendermode
4342
shadow_cast_dist = shadowcastdist
4443
spawn_flags = spawnflags
@@ -84,4 +83,6 @@
8483
ground_entity = m_hGroundEntity
8584
owner = m_hOwnerEntity
8685
team = m_iTeamNum
86+
render_fx = m_nRenderFX
87+
render_mode_prop = m_nRenderMode
8788
move_type = movetype

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ srv_check = False
8282
offset_windows = 368
8383

8484

85+
[instance_attribute]
86+
87+
[[assists]]
88+
offset_windows = 3868
89+
offset_linux = 3892
90+
type = INT
91+
92+
8593
[property]
8694

8795
[[view_offset]]

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ srv_check = False
1818
identifier_windows = 55 8B EC 83 EC 28 56 57 8B F9 F3 0F 11 4D FC
1919
identifier_linux = _ZN9CCSPlayer6DeafenEf
2020

21+
[[respawn]]
22+
identifier_windows = 55 8B EC 83 EC 08 56 8B F1 8B 0D 2A 2A 2A 2A 57 8B 01
23+
identifier_linux = _ZN9CCSPlayer12RoundRespawnEv
24+
2125
[[switch_team]]
2226
identifier_windows = 55 8B EC 83 EC 10 53 56 8B 75 08 57 8B F9 85 F6 0F 2A 2A 2A 2A
2327
identifier_linux = _ZN9CCSPlayer10SwitchTeamEi

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[input]
2+
3+
fire_win_condition = FireWinCondition

‎addons/source-python/data/source-python/entities/orangebox/cstrike/CMapInfo.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[input]
2+
3+
fire_win_condition = FireWinCondition

‎addons/source-python/docs/source-python/source/modules/listeners.tick.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@ listeners.tick package
55
:members:
66
:undoc-members:
77
:show-inheritance:
8-
:exclude-members: tick_delays
9-
10-
.. data:: tick_delays
11-
12-
The singleton object of the :class:`_TickDelays` class.

‎addons/source-python/packages/source-python/core/command.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from plugins.command import SubCommandManager
3737
from plugins.instance import LoadedPlugin
3838
# Tick
39-
from listeners.tick import tick_delays
39+
from listeners.tick import Delay
4040

4141

4242
# =============================================================================
@@ -111,7 +111,7 @@ def print_plugins(self):
111111
@staticmethod
112112
def delay_execution(*args):
113113
"""Execute a command after the given delay."""
114-
tick_delays.delay(
114+
Delay(
115115
float(args[0]),
116116
engine_server.server_command, ' '.join(args[1:]) + '\n')
117117

‎addons/source-python/packages/source-python/core/dumps.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from entities.factories import factory_dictionary
2121
from entities.props import SendPropType
2222
# Filters
23-
from filters.entities import EntityIter
23+
from filters.entities import BaseEntityIter
2424
# Memory
2525
from memory import CLASS_INFO
2626
from memory import Pointer
@@ -170,8 +170,8 @@ def _get_datamaps():
170170
def _get_datamap(classname):
171171
"""Return the DataMap object for the given entity classname."""
172172
# Check existing entities at first
173-
for index in EntityIter(classname):
174-
return BaseEntity(index).datamap
173+
for base_entity in BaseEntityIter(classname):
174+
return base_entity.datamap
175175

176176
# We haven't found an entity. Let's create it temporarily
177177
entity = factory_dictionary.create(classname)

‎addons/source-python/packages/source-python/effects/base.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,17 @@ def __setattr__(self, name, value):
307307
# Set the value of the given attribute...
308308
super().__setattr__(name, value)
309309

310+
def __dir__(self):
311+
"""Return an alphabetized list of attributes for the instance."""
312+
# Get the base attributes
313+
attributes = set(super().__dir__())
314+
315+
# Add all aliases to the attributes
316+
attributes.update(set(self.template.aliases))
317+
318+
# Return a sorted list of attributes
319+
return sorted(attributes)
320+
310321
def _get_property(self, prop_name, prop_type):
311322
"""Return the value of the given property name.
312323

0 commit comments

Comments
 (0)