diff options
| author | Florian Jung <flo@windfisch.org> | 2015-08-18 18:04:28 +0200 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2015-08-18 18:04:28 +0200 |
| commit | f81e93b0bf2fbce41cab5bc43c7689bbfa453c3a (patch) | |
| tree | f9d009b18a00e4dfedf67275d9a4617dadb921d8 | |
| parent | 48d6950cbbc2eec66d557861c5507b31bbf3c0e8 (diff) | |
| parent | 1abc1581137fe968fb94f89810ac8563afbfd800 (diff) | |
Merge branch 'master' into strategy-reworkstrategy-rework
| -rw-r--r-- | gui.py | 2 | ||||
| -rw-r--r-- | strategy.py | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -172,7 +172,7 @@ def draw_cell(cell): # surface = draw_text(cell.name, (0, 0, 0), font_size) # screen.blit(surface, (cx - (surface.get_width()/2), cy + radius + 5)) - draw_text((cx, cy), str(int(cell.mass)), (255, 255, 255), font_size, False, True) + draw_text((cx, cy), str(int(cell.mass))+"/"+str(int(cell.size)), (255, 255, 255), font_size, False, True) # surface = draw_text(str(int(cell.mass)), (255, 255, 255), font_size) # screen.blit(surface, (cx - (surface.get_width()/2), cy - (surface.get_height()/2))) else: diff --git a/strategy.py b/strategy.py index da50f9a..d8efe4e 100644 --- a/strategy.py +++ b/strategy.py @@ -150,6 +150,4 @@ class Strategy: gui.draw_text(self.target, str(round(zipped[0][1], 2)), (0,0,0), draw_centered = True) - gui.draw_text(self.target, str(round(zipped[0][1], 2)), (0,0,0), draw_centered = True) - return self.target |