Skip to content

Commit 4bd6341

Browse files
authored
Merge pull request #28 from ccopland94/updatetargetpointcommandevent_not_working
UpdateTargetPointEvent
2 parents 52ea388 + 73cb79c commit 4bd6341

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

sc2reader/events/game.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,16 @@ def __init__(self, frame, pid, data):
329329
#: The location of the target. Available for TargetPoint and TargetUnit type events
330330
self.location = (self.x, self.y, self.z)
331331

332+
class UpdateTargetPointCommandEvent(TargetPointCommandEvent):
333+
"""
334+
Extends :class: 'TargetPointCommandEvent'
335+
336+
This event is generated when the user changes the point of a unit. Appears to happen
337+
when a unit is moving and it is given a new command. It's possible there are other
338+
instances of this occurring.
339+
340+
"""
341+
name = 'UpdateTargetPointCommandEvent'
332342

333343
class UpdateTargetUnitCommandEvent(TargetUnitCommandEvent):
334344
"""

sc2reader/readers.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ def __init__(self):
15251525
25: (None, self.command_manager_reset_event), # Re-using this old number
15261526
61: (None, self.trigger_hotkey_pressed_event),
15271527
103: (None, self.command_manager_state_event),
1528-
104: (None, self.command_update_target_point_event),
1528+
104: (UpdateTargetPointCommandEvent, self.command_update_target_point_event),
15291529
105: (UpdateTargetUnitCommandEvent, self.command_update_target_unit_event),
15301530
106: (None, self.trigger_anim_length_query_by_name_event),
15311531
107: (None, self.trigger_anim_length_query_by_props_event),
@@ -1588,11 +1588,18 @@ def command_manager_state_event(self, data):
15881588

15891589
def command_update_target_point_event(self, data):
15901590
return dict(
1591-
target=dict(
1592-
x=data.read_bits(20),
1593-
y=data.read_bits(20),
1594-
z=data.read_uint32() - 2147483648,
1595-
)
1591+
flags=0, # fill me with previous TargetPointEvent.flags
1592+
ability=None, # fill me with previous TargetPointEvent.ability
1593+
data=('TargetPoint', dict(
1594+
point=dict(
1595+
x=data.read_bits(20),
1596+
y=data.read_bits(20),
1597+
z=data.read_bits(32) - 2147483648,
1598+
),
1599+
)),
1600+
sequence=0, # fill me with previous TargetPointEvent.flags
1601+
other_unit_tag=None, # fill me with previous TargetPointEvent.flags
1602+
unit_group=None, # fill me with previous TargetPointEvent.flags
15961603
)
15971604

15981605
def command_update_target_unit_event(self, data):

0 commit comments

Comments
 (0)