Skip to content

Commit ea21511

Browse files
committed
changing name back to resource_collection_rate as it was previously
1 parent 0191d2f commit ea21511

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

sc2reader/resources.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,12 +1051,11 @@ def load_players(self):
10511051

10521052
# Economic Breakdown Tab
10531053
if isinstance(player.income_graph, Graph):
1054-
# TODO: Is this algorithm right?
10551054
values = player.income_graph.values
1056-
player.income_rate = sum(values)/len(values)
1055+
player.resource_collection_rate = sum(values)/len(values)
10571056
else:
10581057
# In old s2gs files the field with this name was actually a number not a graph
1059-
player.income_rate = player.income_graph
1058+
player.resource_collection_rate = player.income_graph
10601059
player.income_graph = None
10611060

10621061
player.avg_unspent_resources = stats.get('Average Unspent Resources', None)

sc2reader/scripts/sc2parse.py

100644100755
File mode changed.

test_s2gs/test_all_s2gs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
def test_a_WoL_s2gs():
1414
summary = sc2reader.load_game_summary("test_s2gs/s2gs1.s2gs")
15+
assert summary.players[0].resource_collection_rate == 1276
1516

1617
def test_a_HotS_s2gs():
1718
summary = sc2reader.load_game_summary("test_s2gs/hots1.s2gs")
19+
assert summary.players[0].resource_collection_rate == 1599

0 commit comments

Comments
 (0)