From b56e5dc0e92794b5bd499a51e2c38ec6f38c8081 Mon Sep 17 00:00:00 2001
From: Neil <neil@dip.sun.ac.za>
Date: Fri, 9 Sep 2016 22:08:07 +0200
Subject: [PATCH] Start working toward light placement

---
 data/images/32/lamp.png           | Bin 0 -> 797 bytes
 data/images/32/laser.png          | Bin 0 -> 552 bytes
 data/images/32/spotlight.png      | Bin 0 -> 1429 bytes
 data/images/Makefile              |   2 +-
 data/images/cursors/lamp.png      | Bin 0 -> 797 bytes
 data/images/cursors/laser.png     | Bin 0 -> 552 bytes
 data/images/cursors/spotlight.png | Bin 0 -> 1429 bytes
 tabakrolletjie/scenes/day.py      |  21 ++++++++++++++++++++-
 8 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 data/images/32/lamp.png
 create mode 100644 data/images/32/laser.png
 create mode 100644 data/images/32/spotlight.png
 create mode 100644 data/images/cursors/lamp.png
 create mode 100644 data/images/cursors/laser.png
 create mode 100644 data/images/cursors/spotlight.png

diff --git a/data/images/32/lamp.png b/data/images/32/lamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7cfa82e320c4b3fb134de7e48229a4a31a0eedf
GIT binary patch
literal 797
zcmV+&1LFLNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-8xgK~z|U%~vsRs!$aEc$2}Bw#yru$Y8?K!GYY#<#omQ8{XEv
zdlwe`6K-#DFs!C-yv2!-=+FgYB5rRf<u*WAPKVcPK;>DbefCR8kX*j+yXPFvxk^NY
zQ{vl6)vFqi-cX6-kQAJqowambztuGDT2YisS(YyVAdcgZbN=M}{-fu4{g;=Q*}F-J
zXzwM<@|9s2W81dFBuS_YNs^Fl+o53?V_BB3-ow3j0b}gWG|hRIWu?NK$g+$~)0{KL
z?)LGQra)1Y?>9F$zbwo8(Q377;`wT|g6p~nf&k)ONs^$dDi~vEG#YD;*=&~H-{1ds
z9OozJ{Leut=ytmg`CUg*M3!aIU@)NNa=EqZ<#I`b!GJ8wq9}?A(dc%&4+o`yF?Khd
zPS?qH9EW<nUV*p_Q4~?H*CWSq*3YKXX;PMsodsu_<~%Px91iyiZ(=wc7EG9?Ip0;7
zTLuin7>m%0-5iU2)Uqri!!XAGG*GYCTefY7f?zYBheFhifNk4hy<TtSH4B|k*Y(>@
zr*kf<z1eI+QIvQ0lpS9Zn$0Fws}%sC)9IY+x_+BqQ!t=u+I6k=_lt8~7wvZYXmNpd
zyA9WM0RXjH4VtE1ml{wM<x<=SK>$@%D;rQ%6+sZ})F>E`BuNsz9l*NDd<61bvMgWZ
z2iVsc$3#SN9Eaj}#VK1ro-2;yka8g@M1XVtB<?qJcPut*DX+0*!1w*fG)(~jj4@0m
zlgb7rlL;7O0Dv@2;rsq$sR7UP`lHe482}oM1{RA2IOj);bI!3?EY=fpG#Wj7p4Trd
z+H8#{ZN>Bzh7p~59E<CJ9Z0_Jku0B%&pedwH9+*a$MTc^F*(S<*2`~Ao+^-3GVl>N
b`8a+BLE<gp6*BC_00000NkvXXu0mjfa6)e|

literal 0
HcmV?d00001

diff --git a/data/images/32/laser.png b/data/images/32/laser.png
new file mode 100644
index 0000000000000000000000000000000000000000..789f0e5e8528794eeec7b2d1120cb70156a98418
GIT binary patch
literal 552
zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10i{VqK~z|U?UylYB0&_#e{;JcrVvC~Fw9n0rLapd&Gy$@`5F8m
z`%$#e{>trk<x0WsY-Wr^6v2duu)|z)3E>WRv$@=P#r|QM;m!O1X6EtW32QCql>44T
zLWnBR0-8U!w!p?(dn}wQ?*)VqpF5q-mv*~-<NLm>*Xx&!M&rWw{R=5&9YAZnS4utY
zcDtwjet)Nw(yP_#+iW)bYOVdAX<)5Axq$013?GzIwy2a+HVnfD;5ySI2jDi2<HF|8
zisRS<w^<&aivHP0s{}YZz`Odu@pxpj*|6Pi0cbXxv|25y)#}FsESF10qY+wbgb<`@
zO08DI^E^Dy17JR%vtF+`91ggyi?tRhC6!9$j{&Y0iv|6DA1URVZuBgzHN)W$;0j1i
z#pTt269mCY^H=@iH%Tc8f&jqDGRXY`V+=`>Fr7{@#{Al-UL=HgS&rk-?RGK7<fYFA
zxF3(l^m;u8g8{Dlwwg`Tlq5-*OeO&LnZac%E&)n_5}*Vq0seP@G>W1}t##qVT5F;x
qdIZv}xU-LDxd11i{@rl;xAg<I;P%Y{;KmOC0000<MNUMnLSTXnMf!*U

literal 0
HcmV?d00001

diff --git a/data/images/32/spotlight.png b/data/images/32/spotlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e55c022e23c4665dbb2ca7bef6df1481cf7f6c0
GIT binary patch
literal 1429
zcmV;G1#0?<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11rkX_K~z|U#g|`bQ&$|vzqfxhHcQg3xe}@__RkiBK4cw1Xq!BQ
zjVTD4^g$@a*S^gOz6yPl`eF!_mV)9#EhuzK5w^M3K@3%JOj}&*W^JOkiLE!y?Y%L{
zO%v~L56!){S-aVqurFM=_uL=9@8_Iz&+neY5E1@QRc$AjVVGS2^hFl{q}E?VwEDq0
z*N*_hFlK|naHy%N>8QbAI9y*}Utd>OS8p&FYWM8fvs<s%@2ab-tE#Q7-DNVFcAHEl
z9RP@;D2t+)U0GRK6$BxlN~KmanM^jBOs)umu)Msyyevu5OgJ2Vm`o<05m8(-B_b3c
z7>~!pO-xMWIgTSmQK(c>6oojBqlt-$yvO6=)Q%I;djKNB*|TS#mCSVu6+AT0iuLo6
z&1O^E`6hOvVvh{~xm>R70L2~~05X}(+j0XGdlUndeFTa<GysNSOtDz3-2RBgVqh4?
zr1=sN91e%?#EBDu=H_Pe%a<>A_xARd#k{w-7gnn^`{Kom_?<g<zI*cI$qyhRoH})C
zL|rC+zn>&YD*5u0B#HcfzxG`4T$=(}mXj(a%d*7te93#y^E_CV)yl5wSpfi&BqbF^
z0RUJm7L*IXVzB@K6h(m~N$&w<S&k+W2><}gvP?W4-zv|J6_3ZkvMd7ti9`ajEJrl}
zp6BP)UYpHkL?V%r14JSbn9XJs{J``4yavE=+^eOfrJM>73<i^1X4;{G!C+DaSXx@j
zaUAzb0|3BBqfrR}s;jFZ2!dE@06`GM>gs9$K*5VI21u*Hm6eqXp-?DOD)Ue%l&P$&
zTu`42Uhe^jD4R$mv>LsC|Nhm!zP<<Q%J>*5ih{nrz6S>m9LT9{iA3Tp5oI-i0##VO
zcQ_m^larGd0)fEmj|B(>0<R}0Coec0j?dM$g@uKA^<D#*pP&C-6xXKS=kql*G&FoQ
zIy!oDdV2bU_jkpbo}OME9UZ;d)YNp;>-AayKomthfByV8ElAy&=ybZKk&zKmEtTEf
z-46j&xLmGlQ&Usf?UvrDsi~~X<+=u-;>?*dkJR?-*RL-FXr#@yWL~c~s0Pl=%;cO-
z=XoN6+wHzGHZ~>}n{1`Au`$u@c3&YPIGxV(v$L~#_1(#nCx2b<xdFg#w|{;6_HFG?
z)ZgFFwYIi;i3m2E&C}W0d2f7tJekkusaW}Zp2o+=lbxNN_iQ$shltSH+Uo7^@8{H*
zTeohlG&eVUwgey|96x^ir*t~4B_0|Yigt8#Tm+yaB3P|fPkVd&C7;hX+|$!@x2LD)
zuFvNiZf|eDWVKp7w6??6b#!!G92y#ms(I4sG#xv3?8joi4d()2ZDVr!^yy!Qhlib2
zRcq&#H*enH^5x5agu~%Kd7e*5lJr+35_uGl$DaX!*=#;^@ZdqG(P;dFW!X;~8yjus
z&Ye5Fckf;RKt7*GcX#)r8#iuzLqr>kTrm+5p{Ay$p{uLwu^<SW&hg^nB85VscY}k2
z@xj5tcqkNlx45{tX{;a!)YaAXxTdD2VKc8y0ScpHY-?+~IxsL0+sPqCQ4|^&7>KpC
zwOs{Z+{))4Q&6mZ`}Tc#<j9flTUuJ|E|;st?RM9(EDN=+tIFka;CUXwU{JV!|Nh+E
z+}!Nbr%(OSX!P;F<^NBB_0s8dEq1&8Tb)k#nO?6q8I8tI06>zYx2aT0lx6wV?Ck8%
jvMkSiXwGc`ltX_5VH`IQvK9#I00000NkvXXu0mjfI{m1(

literal 0
HcmV?d00001

diff --git a/data/images/Makefile b/data/images/Makefile
index b1a7f01..d460e6b 100644
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@ -6,7 +6,7 @@ MOULD=eyeballA eyeballB eyeballC
 LIGHT=spotlight lamp laser
 
 IMG16=$(MOULD_BODY)
-IMG32=$(TURNIP) $(MOULD_BODY) $(MOULD)
+IMG32=$(TURNIP) $(MOULD_BODY) $(MOULD) $(LIGHT)
 IMG64=$(MOULD_BODY) $(LIGHT)
 
 CURSORS=seed
diff --git a/data/images/cursors/lamp.png b/data/images/cursors/lamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7cfa82e320c4b3fb134de7e48229a4a31a0eedf
GIT binary patch
literal 797
zcmV+&1LFLNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-8xgK~z|U%~vsRs!$aEc$2}Bw#yru$Y8?K!GYY#<#omQ8{XEv
zdlwe`6K-#DFs!C-yv2!-=+FgYB5rRf<u*WAPKVcPK;>DbefCR8kX*j+yXPFvxk^NY
zQ{vl6)vFqi-cX6-kQAJqowambztuGDT2YisS(YyVAdcgZbN=M}{-fu4{g;=Q*}F-J
zXzwM<@|9s2W81dFBuS_YNs^Fl+o53?V_BB3-ow3j0b}gWG|hRIWu?NK$g+$~)0{KL
z?)LGQra)1Y?>9F$zbwo8(Q377;`wT|g6p~nf&k)ONs^$dDi~vEG#YD;*=&~H-{1ds
z9OozJ{Leut=ytmg`CUg*M3!aIU@)NNa=EqZ<#I`b!GJ8wq9}?A(dc%&4+o`yF?Khd
zPS?qH9EW<nUV*p_Q4~?H*CWSq*3YKXX;PMsodsu_<~%Px91iyiZ(=wc7EG9?Ip0;7
zTLuin7>m%0-5iU2)Uqri!!XAGG*GYCTefY7f?zYBheFhifNk4hy<TtSH4B|k*Y(>@
zr*kf<z1eI+QIvQ0lpS9Zn$0Fws}%sC)9IY+x_+BqQ!t=u+I6k=_lt8~7wvZYXmNpd
zyA9WM0RXjH4VtE1ml{wM<x<=SK>$@%D;rQ%6+sZ})F>E`BuNsz9l*NDd<61bvMgWZ
z2iVsc$3#SN9Eaj}#VK1ro-2;yka8g@M1XVtB<?qJcPut*DX+0*!1w*fG)(~jj4@0m
zlgb7rlL;7O0Dv@2;rsq$sR7UP`lHe482}oM1{RA2IOj);bI!3?EY=fpG#Wj7p4Trd
z+H8#{ZN>Bzh7p~59E<CJ9Z0_Jku0B%&pedwH9+*a$MTc^F*(S<*2`~Ao+^-3GVl>N
b`8a+BLE<gp6*BC_00000NkvXXu0mjfa6)e|

literal 0
HcmV?d00001

diff --git a/data/images/cursors/laser.png b/data/images/cursors/laser.png
new file mode 100644
index 0000000000000000000000000000000000000000..789f0e5e8528794eeec7b2d1120cb70156a98418
GIT binary patch
literal 552
zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10i{VqK~z|U?UylYB0&_#e{;JcrVvC~Fw9n0rLapd&Gy$@`5F8m
z`%$#e{>trk<x0WsY-Wr^6v2duu)|z)3E>WRv$@=P#r|QM;m!O1X6EtW32QCql>44T
zLWnBR0-8U!w!p?(dn}wQ?*)VqpF5q-mv*~-<NLm>*Xx&!M&rWw{R=5&9YAZnS4utY
zcDtwjet)Nw(yP_#+iW)bYOVdAX<)5Axq$013?GzIwy2a+HVnfD;5ySI2jDi2<HF|8
zisRS<w^<&aivHP0s{}YZz`Odu@pxpj*|6Pi0cbXxv|25y)#}FsESF10qY+wbgb<`@
zO08DI^E^Dy17JR%vtF+`91ggyi?tRhC6!9$j{&Y0iv|6DA1URVZuBgzHN)W$;0j1i
z#pTt269mCY^H=@iH%Tc8f&jqDGRXY`V+=`>Fr7{@#{Al-UL=HgS&rk-?RGK7<fYFA
zxF3(l^m;u8g8{Dlwwg`Tlq5-*OeO&LnZac%E&)n_5}*Vq0seP@G>W1}t##qVT5F;x
qdIZv}xU-LDxd11i{@rl;xAg<I;P%Y{;KmOC0000<MNUMnLSTXnMf!*U

literal 0
HcmV?d00001

diff --git a/data/images/cursors/spotlight.png b/data/images/cursors/spotlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e55c022e23c4665dbb2ca7bef6df1481cf7f6c0
GIT binary patch
literal 1429
zcmV;G1#0?<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11rkX_K~z|U#g|`bQ&$|vzqfxhHcQg3xe}@__RkiBK4cw1Xq!BQ
zjVTD4^g$@a*S^gOz6yPl`eF!_mV)9#EhuzK5w^M3K@3%JOj}&*W^JOkiLE!y?Y%L{
zO%v~L56!){S-aVqurFM=_uL=9@8_Iz&+neY5E1@QRc$AjVVGS2^hFl{q}E?VwEDq0
z*N*_hFlK|naHy%N>8QbAI9y*}Utd>OS8p&FYWM8fvs<s%@2ab-tE#Q7-DNVFcAHEl
z9RP@;D2t+)U0GRK6$BxlN~KmanM^jBOs)umu)Msyyevu5OgJ2Vm`o<05m8(-B_b3c
z7>~!pO-xMWIgTSmQK(c>6oojBqlt-$yvO6=)Q%I;djKNB*|TS#mCSVu6+AT0iuLo6
z&1O^E`6hOvVvh{~xm>R70L2~~05X}(+j0XGdlUndeFTa<GysNSOtDz3-2RBgVqh4?
zr1=sN91e%?#EBDu=H_Pe%a<>A_xARd#k{w-7gnn^`{Kom_?<g<zI*cI$qyhRoH})C
zL|rC+zn>&YD*5u0B#HcfzxG`4T$=(}mXj(a%d*7te93#y^E_CV)yl5wSpfi&BqbF^
z0RUJm7L*IXVzB@K6h(m~N$&w<S&k+W2><}gvP?W4-zv|J6_3ZkvMd7ti9`ajEJrl}
zp6BP)UYpHkL?V%r14JSbn9XJs{J``4yavE=+^eOfrJM>73<i^1X4;{G!C+DaSXx@j
zaUAzb0|3BBqfrR}s;jFZ2!dE@06`GM>gs9$K*5VI21u*Hm6eqXp-?DOD)Ue%l&P$&
zTu`42Uhe^jD4R$mv>LsC|Nhm!zP<<Q%J>*5ih{nrz6S>m9LT9{iA3Tp5oI-i0##VO
zcQ_m^larGd0)fEmj|B(>0<R}0Coec0j?dM$g@uKA^<D#*pP&C-6xXKS=kql*G&FoQ
zIy!oDdV2bU_jkpbo}OME9UZ;d)YNp;>-AayKomthfByV8ElAy&=ybZKk&zKmEtTEf
z-46j&xLmGlQ&Usf?UvrDsi~~X<+=u-;>?*dkJR?-*RL-FXr#@yWL~c~s0Pl=%;cO-
z=XoN6+wHzGHZ~>}n{1`Au`$u@c3&YPIGxV(v$L~#_1(#nCx2b<xdFg#w|{;6_HFG?
z)ZgFFwYIi;i3m2E&C}W0d2f7tJekkusaW}Zp2o+=lbxNN_iQ$shltSH+Uo7^@8{H*
zTeohlG&eVUwgey|96x^ir*t~4B_0|Yigt8#Tm+yaB3P|fPkVd&C7;hX+|$!@x2LD)
zuFvNiZf|eDWVKp7w6??6b#!!G92y#ms(I4sG#xv3?8joi4d()2ZDVr!^yy!Qhlib2
zRcq&#H*enH^5x5agu~%Kd7e*5lJr+35_uGl$DaX!*=#;^@ZdqG(P;dFW!X;~8yjus
z&Ye5Fckf;RKt7*GcX#)r8#iuzLqr>kTrm+5p{Ay$p{uLwu^<SW&hg^nB85VscY}k2
z@xj5tcqkNlx45{tX{;a!)YaAXxTdD2VKc8y0ScpHY-?+~IxsL0+sPqCQ4|^&7>KpC
zwOs{Z+{))4Q&6mZ`}Tc#<j9flTUuJ|E|;st?RM9(EDN=+tIFka;CUXwU{JV!|Nh+E
z+}!Nbr%(OSX!P;F<^NBB_0s8dEq1&8Tb)k#nO?6q8I8tI06>zYx2aT0lx6wV?Ck8%
jvMkSiXwGc`ltX_5VH`IQvK9#I00000NkvXXu0mjfI{m1(

literal 0
HcmV?d00001

diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py
index 9e55fba..cf27859 100644
--- a/tabakrolletjie/scenes/day.py
+++ b/tabakrolletjie/scenes/day.py
@@ -16,6 +16,7 @@ from ..transforms import Overlay
 from ..constants import SCREEN_SIZE, FONTS
 from ..widgets import ImageButton
 from ..turnip import Turnip, TurnipInvalidPosition
+from ..transforms import Overlay
 
 
 class DayScene(BaseScene):
@@ -45,6 +46,12 @@ class DayScene(BaseScene):
         self._tools = [
             ImageButton('32', 'seed.png', name='seed',
                         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))),
+            ImageButton('32', 'spotlight.png', name='red_spotlight',
+                        pos=(150, SCREEN_SIZE[1] - 40),
+                        transform=Overlay(colour=(255, 0, 0, 128))),
             ImageButton('32', 'default_cursor.png', name='reset tool',
                         pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
         ]
@@ -94,7 +101,16 @@ class DayScene(BaseScene):
                             self._tool = None
                         else:
                             self._tool = tool.name
-                            self._set_cursor(tool.name)
+                            if self._tool == 'seed':
+                                self._set_cursor(tool.name)
+                            elif self._tool == 'red_spotlight':
+                                self._set_cursor(
+                                    'spotlight',
+                                    transform=Overlay(colour=(255, 0, 0, 128)))
+                            elif self._tool == 'blue_spotlight':
+                                self._set_cursor(
+                                    'spotlight',
+                                    transform=Overlay(colour=(0, 0, 255, 128)))
                         return
                 if self._tool == "seed":
                     if self._seeds > 0:
@@ -116,6 +132,9 @@ class DayScene(BaseScene):
                     # Not tool, so check lights
                     self._lights.toggle_nearest(ev.pos, surfpos=True)
                     print self._lights.lit_by(ev.pos, surfpos=True)
+            elif ev.button == 3 and self._tool:
+                self._tool = None
+                self._unset_cursor()
 
     @debug_timer("day.tick")
     def tick(self, gamestate):
-- 
2.34.1