projects
/
tabakrolletjie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b56e5dc
)
Use multiply transform
author
Neil
<neil@dip.sun.ac.za>
Fri, 9 Sep 2016 20:28:03 +0000
(22:28 +0200)
committer
Neil
<neil@dip.sun.ac.za>
Fri, 9 Sep 2016 20:28:03 +0000
(22:28 +0200)
tabakrolletjie/scenes/day.py
patch
|
blob
|
history
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index cf27859592052a62027fa62b9de3d6682462b868..fc79ffce07f41a69d13b472aa2d70b3676365388 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-11,12
+11,11
@@
from ..obstacles import ObstacleManager
from ..events import SceneChangeEvent
from ..utils import debug_timer
from ..loader import loader
from ..events import SceneChangeEvent
from ..utils import debug_timer
from ..loader import loader
-from ..transforms import Overlay
+from ..transforms import Overlay
, Multiply
from ..constants import SCREEN_SIZE, FONTS
from ..widgets import ImageButton
from ..turnip import Turnip, TurnipInvalidPosition
from ..constants import SCREEN_SIZE, FONTS
from ..widgets import ImageButton
from ..turnip import Turnip, TurnipInvalidPosition
-from ..transforms import Overlay
class DayScene(BaseScene):
class DayScene(BaseScene):
@@
-48,10
+47,10
@@
class DayScene(BaseScene):
pos=(50, SCREEN_SIZE[1] - 40)),
ImageButton('32', 'spotlight.png', name='blue_spotlight',
pos=(100, SCREEN_SIZE[1] - 40),
pos=(50, SCREEN_SIZE[1] - 40)),
ImageButton('32', 'spotlight.png', name='blue_spotlight',
pos=(100, SCREEN_SIZE[1] - 40),
- transform=
Overlay(colour=(0, 0, 255, 128
))),
+ transform=
Multiply(colour=(0, 0, 255, 255
))),
ImageButton('32', 'spotlight.png', name='red_spotlight',
pos=(150, SCREEN_SIZE[1] - 40),
ImageButton('32', 'spotlight.png', name='red_spotlight',
pos=(150, SCREEN_SIZE[1] - 40),
- transform=
Overlay(colour=(255, 0, 0, 128
))),
+ transform=
Multiply(colour=(255, 0, 0, 255
))),
ImageButton('32', 'default_cursor.png', name='reset tool',
pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
]
ImageButton('32', 'default_cursor.png', name='reset tool',
pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
]
@@
-106,11
+105,13
@@
class DayScene(BaseScene):
elif self._tool == 'red_spotlight':
self._set_cursor(
'spotlight',
elif self._tool == 'red_spotlight':
self._set_cursor(
'spotlight',
- transform=Overlay(colour=(255, 0, 0, 128)))
+ transform=Multiply(
+ colour=(255, 0, 0, 172)))
elif self._tool == 'blue_spotlight':
self._set_cursor(
'spotlight',
elif self._tool == 'blue_spotlight':
self._set_cursor(
'spotlight',
- transform=Overlay(colour=(0, 0, 255, 128)))
+ transform=Multiply(
+ colour=(0, 0, 255, 172)))
return
if self._tool == "seed":
if self._seeds > 0:
return
if self._tool == "seed":
if self._seeds > 0: