projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added tooltips with information about light tools
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
day.py
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index 8dd9c7b84add10af9ffbb1187ef1baa8d22f98a1..a43517cd92efa0574515be687539f7cb58c006d2 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-11,7
+11,7
@@
import pymunk.pygame_util
from .base import BaseScene
from ..battery import BatteryManager
from .base import BaseScene
from ..battery import BatteryManager
-from ..lights import LightManager, light_fitting_by_type, check_space_for_light, seed_cost
+from ..lights import LightManager, light_fitting_by_type, check_space_for_light, seed_cost
, light_info
from ..infobar import InfoBar
from ..obstacles import ObstacleManager
from ..events import SceneChangeEvent
from ..infobar import InfoBar
from ..obstacles import ObstacleManager
from ..events import SceneChangeEvent
@@
-21,7
+21,7
@@
from ..sound import sound
from ..transforms import Overlay, Alpha, ColourWedges
from ..constants import SCREEN_SIZE, FONTS, FPS, NIGHT_HOURS_PER_TICK, DEBUG
from ..transforms import Overlay, Alpha, ColourWedges
from ..constants import SCREEN_SIZE, FONTS, FPS, NIGHT_HOURS_PER_TICK, DEBUG
-from ..widgets import ImageButton
+from ..widgets import ImageButton
, Tooltip
from ..turnip import Turnip, TurnipInvalidPosition
from ..turnip import Turnip, TurnipInvalidPosition
@@
-159,6
+159,7
@@
class DayScene(BaseScene):
tool.render(surface)
for light_tool in self._light_toolbar:
light_tool.render(surface)
tool.render(surface)
for light_tool in self._light_toolbar:
light_tool.render(surface)
+
self._draw_cursor(surface)
if self._game_over_text:
for surf, pos in self._game_over_text:
self._draw_cursor(surface)
if self._game_over_text:
for surf, pos in self._game_over_text:
@@
-176,12
+177,15
@@
class DayScene(BaseScene):
light_tool = ImageButton(
"32", light_fitting, transform=ColourWedges(colours=colours),
pos=(x, height), name=combo)
light_tool = ImageButton(
"32", light_fitting, transform=ColourWedges(colours=colours),
pos=(x, height), name=combo)
- font = loader.load_font(FONTS["sans"], size=12)
- tool_cost = font.render("%d" % cost, True, (0, 0, 0))
- light_tool._img.blit(tool_cost, (16, 12), None)
light_tool.colours = colours
light_tool.cost = cost
light_tool.colours = colours
light_tool.cost = cost
+
+ tooltip_text = ["cost: %d" % cost] + light_info(light_config)
+
+ tooltip = Tooltip(tooltip_text)
+ light_tool.tooltip = tooltip
+
self._light_toolbar.append(light_tool)
x += 40
self._light_toolbar.append(light_tool)
x += 40