Skip to content

#63 cast players in TrackerEvent.__str__ #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 4, 2018
Merged

#63 cast players in TrackerEvent.__str__ #64

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59987e9
#63 cast players in TrackerEvent.__str__
StoicLoofah Jul 26, 2018
fdb913f
#63 cast players in TrackerEvent.__str__
StoicLoofah Jul 26, 2018
5cdfad1
Add test for print functionality.
Gusgus01 Oct 31, 2018
a66278d
Merge pull request #3 from Gusgus01/63-trackerevent_str_error
StoicLoofah Nov 1, 2018
8c90728
Fix Python 2 issues with test_event_print.
Gusgus01 Nov 2, 2018
f16dddd
Merge pull request #4 from Gusgus01/63-trackerevent_str_error
StoicLoofah Nov 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#63 cast players in TrackerEvent.__str__
  • Loading branch information
@StoicLoofah @Gusgus01
StoicLoofah authored and Gusgus01 committed Oct 31, 2018
commit fdb913fe7e5bd59eac37818e7015cb57f5b3cb90
16 changes: 8 additions & 8 deletions sc2reader/events/tracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def __init__(self, frames, data, build):
self.ff_vespene_lost_technology = clamp(self.stats[38]) if build >= 26490 else None

def __str__(self):
return self._str_prefix() + "{0: >15} - Stats Update".format(self.player)
return self._str_prefix() + "{0: >15} - Stats Update".format(str(self.player))


class UnitBornEvent(TrackerEvent):
Expand Down Expand Up @@ -291,7 +291,7 @@ def __init__(self, frames, data, build):
self.location = (self.x, self.y)

def __str__(self):
return self._str_prefix() + "{0: >15} - Unit born {1}".format(self.unit_upkeeper, self.unit)
return self._str_prefix() + "{0: >15} - Unit born {1}".format(str(self.unit_upkeeper), self.unit)


class UnitDiedEvent(TrackerEvent):
Expand Down Expand Up @@ -361,7 +361,7 @@ def __init__(self, frames, data, build):
self.killing_unit_id = self.killing_unit_index << 18 | self.killing_unit_recycle

def __str__(self):
return self._str_prefix() + "{0: >15} - Unit died {1}.".format(self.unit.owner, self.unit)
return self._str_prefix() + "{0: >15} - Unit died {1}.".format(str(self.unit.owner), self.unit)


class UnitOwnerChangeEvent(TrackerEvent):
Expand Down Expand Up @@ -397,7 +397,7 @@ def __init__(self, frames, data, build):
self.unit_controller = None

def __str__(self):
return self._str_prefix() + "{0: >15} took {1}".format(self.unit_upkeeper, self.unit)
return self._str_prefix() + "{0: >15} took {1}".format(str(self.unit_upkeeper), self.unit)


class UnitTypeChangeEvent(TrackerEvent):
Expand Down Expand Up @@ -425,7 +425,7 @@ def __init__(self, frames, data, build):
self.unit_type_name = data[2].decode('utf8')

def __str__(self):
return self._str_prefix() + "{0: >15} - Unit {0} type changed to {1}".format(self.unit.owner, self.unit, self.unit_type_name)
return self._str_prefix() + "{0: >15} - Unit {0} type changed to {1}".format(str(self.unit.owner), self.unit, self.unit_type_name)


class UpgradeCompleteEvent(TrackerEvent):
Expand All @@ -448,7 +448,7 @@ def __init__(self, frames, data, build):
self.count = data[2]

def __str__(self):
return self._str_prefix() + "{0: >15} - {1}upgrade completed".format(self.player, self.upgrade_type_name)
return self._str_prefix() + "{0: >15} - {1} upgrade completed".format(str(self.player), self.upgrade_type_name)


class UnitInitEvent(TrackerEvent):
Expand Down Expand Up @@ -504,7 +504,7 @@ def __init__(self, frames, data, build):
self.location = (self.x, self.y)

def __str__(self):
return self._str_prefix() + "{0: >15} - Unit initiated {1}".format(self.unit_upkeeper, self.unit)
return self._str_prefix() + "{0: >15} - Unit initiated {1}".format(str(self.unit_upkeeper), self.unit)


class UnitDoneEvent(TrackerEvent):
Expand All @@ -528,7 +528,7 @@ def __init__(self, frames, data, build):
self.unit = None

def __str__(self):
return self._str_prefix() + "{0: >15} - Unit {1} done".format(self.unit.owner, self.unit)
return self._str_prefix() + "{0: >15} - Unit {1} done".format(str(self.unit.owner), self.unit)


class UnitPositionsEvent(TrackerEvent):
Expand Down