Skip to content

Commit 9e01af6

Browse files
committed
removed the is_ prefix from event helper methods
1 parent 307fd56 commit 9e01af6

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

sc2reader/objects.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ def __init__(self, elapsed_time, event_type, event_code, global_flag, player_id,
107107
self.bytes = bytes
108108

109109
# Added for convenience
110-
self.is_init = (event_type == 0x00)
111-
self.is_player_action = (event_type == 0x01)
112-
self.is_camera_movement = (event_type == 0x03)
113-
self.is_unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
110+
self.init = (event_type == 0x00)
111+
self.player_action = (event_type == 0x01)
112+
self.camera_movement = (event_type == 0x03)
113+
self.unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
114114

115115
def __call__(self, elapsed_time, event_type, global_flag, player_id, event_code, bytes):
116116
self.time, self.seconds = (elapsed_time, elapsed_time/16)
@@ -123,10 +123,10 @@ def __call__(self, elapsed_time, event_type, global_flag, player_id, event_code,
123123
self.abilitystr = ""
124124

125125
# Added for convenience
126-
self.is_init = (event_type == 0x00)
127-
self.is_player_action = (event_type == 0x01)
128-
self.is_camera_movement = (event_type == 0x03)
129-
self.is_unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
126+
self.init = (event_type == 0x00)
127+
self.player_action = (event_type == 0x01)
128+
self.camera_movement = (event_type == 0x03)
129+
self.unknown = (event_type == 0x02 or event_type == 0x04 or event_type == 0x05)
130130

131131
self.parse(bytes)
132132
return self

sc2reader/replay.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ def _parse_events(self):
153153
player = self.player[event.player]
154154
player.events.append(event)
155155

156-
if event.is_player_action:
156+
if event.player_action:
157157
player.avg_apm += 1
158158
else:
159159
print event.name
160160

161161
# Average the APM
162162
for player in self.players:
163-
player.avg_apm /= player.events[-1].seconds/60
163+
player.avg_apm /= player.events[-1].seconds/60.0
164164

165165
self._process_results()
166166

shell.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55

66
# replay = Replay("1.sc2replay")
77
#
8+
# print replay.player["Nexpacisor"].avg_apm
89
# print replay.player["dblrainbow"].avg_apm

0 commit comments

Comments
 (0)