From e370f1a04fcc4352e45bfef61bfa6a1f74e828e3 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 10 Mar 2019 10:01:35 +0100 Subject: [PATCH] scenes/mainmenu: add icons to basic menu --- .../assets/sprites/menu/bonus.png | Bin 0 -> 748 bytes .../assets/sprites/menu/exit.png | Bin 0 -> 576 bytes .../assets/sprites/menu/manage.png | Bin 0 -> 943 bytes .../assets/sprites/menu/options.png | Bin 0 -> 735 bytes .../assets/sprites/menu/worldmap.png | Bin 0 -> 693 bytes .../scenes/debugmenu/mainmenu.lua | 16 +++++++++++----- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 imperium-porcorum.love/assets/sprites/menu/bonus.png create mode 100644 imperium-porcorum.love/assets/sprites/menu/exit.png create mode 100644 imperium-porcorum.love/assets/sprites/menu/manage.png create mode 100644 imperium-porcorum.love/assets/sprites/menu/options.png create mode 100644 imperium-porcorum.love/assets/sprites/menu/worldmap.png diff --git a/imperium-porcorum.love/assets/sprites/menu/bonus.png b/imperium-porcorum.love/assets/sprites/menu/bonus.png new file mode 100644 index 0000000000000000000000000000000000000000..ec73fa21aabe55bc312b0937f278ab799f041e09 GIT binary patch literal 748 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00LA=L_t(o!|j+akK#ZW#ve8n zhzi803m@S^QWQZo^_AU*6Z;+NFz4&~9T2+`&SrUlw)<3Ei~-5)ZyFVyvR|I)Du=F|oH@%s_`>=pp9Tsz3V zL)ZkosRNbx3;@uLhX8=kb(lscK_0$ z%2c6Dz&z=l}ll)K5foun=Dg;MsQ$6eL zLIpAtxy(Wnkfy|9x{>z<+3sQiI92B&06g4%(XLNs_W%H1q#A7EGik92SOw}$#hBX{ z>aeESNQq2VQk$5}?!k*xQ&j~_d{(JdRLU`4q$fbM#`M zFkhh?4>drlHa+L`?eyyo)ZuTfDpj>eAp$Z1&2^pXtPCdYJFCdwVxS^Xfx7YVT}{@h z3gvv7Y84oz1Nlc$dW5DN3%w6G!P04g7pbhcOE#ZX;Pt_-+F(tfOLmzRU8RRrwvsj) zk8(i`^O8DcKIt^2qmyE$as>3A<8`A~tul+70$B|@2L1YZCpKR{3tO*n)&biO e9Bs7mFUB9WN_CPw=axGF0000Axe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00F2;L_t(o!|j-_Zi7%1#y^@X zDkcz!D^SZsGlf_(+mSuMCi@C=G<%GuxV=JCwI%p6wXCL8EvP930)a#{-2^4jru@72 z(%mdQ5^^p-zI*ODA1L=%H&}-uWD0{)DB6V%0MG}IQa}a%D*&J;6I79fFuv7~U>N1_ z8ev`Rl1F3go9=A@^)QWb9E|p2A0fMa6Be zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00S3EL_t(o!_}BQXxl&($Df1; z6GZV4n@~ii3?3RNp>=}67!;Gug9h7VEnPb}Q}-^Jtf6an)y|+Ho3RDKVEh55&<>uB z2q9TKh~Obu9psZwr#nfum7*RP8R_o5-~I2schYgCqYv=w;Q`{*-X9zQw=akQ03c@N zSU?$54FCZ6I6>hoJjAs9-(bd6vm%TkD-y6Mp*FF}2N}@osmPZ}ucrdx_>JKE3YBV7dSjFWe#qJ;}^U#?k zW@V0q#_x$)nG2(wq|9A?slneLNDf@$?Nd}EB)e5X*dyNd3O4Z{OIa)L)%(08+#MKvXrc#By zMrN}DD`sUbf2KRL6Y4Dw912vS-eMX?&&Z%Ql`07JmZMz$OsB?Sf>uLpIL+!0)^JfZ zWb5Vr+JPc{Q_BTjGW?cm*M@APQb8)q(*hrLTnF_kJTha%uWWCA3- zS!t`K*Hfzi&AiT*R0CKv4W}%Tah9M3zdZxZ(qXcS3$I~S9mD12M_&L{9Yck(FQR3n zl?f&o9*E1K2>hwxEGM1>m0}lE6_{|UI)+NI>sdnFHozQMI|R2ch@OuTa_^$O4cy$F zJO9h+1qh{r?Yz^2+oz;!0xZQ?su@#_4u&g7W=pbm0ylT(E*MrrkdbyJYY4^?PT<@93bjXtoz?s5jPjZzyG*r*+cUP^Sl7^kC7F0O~ee*rVv`n(Z| RVnzS}002ovPDHLkV1g{tpbP*2 literal 0 HcmV?d00001 diff --git a/imperium-porcorum.love/assets/sprites/menu/options.png b/imperium-porcorum.love/assets/sprites/menu/options.png new file mode 100644 index 0000000000000000000000000000000000000000..e4cb8db43fc7eaf61e003c747c8d2a36382dc794 GIT binary patch literal 735 zcmV<50wDc~P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00KuzL_t(o!_AmIOT$1I$Nwn~ zA`XE%h!lrX8b`6dfP)kfmrT+@`VkxzUk2-B1>dl4egQ!oB$In_D0FCXOr$u4(nZK5 z-Rk1iOS~jc>&51Q@FbV!`rQA1chB7^8<|DCb~=cY%}-B5nVL)i08(>Xu?WgG4FEtQ zPC@apBoI>@Bg)&8tcvpIz--g#?OvS0X;q9senL6-j`8gUSAE^bCe|xPFDy8c zV)f@IXj&3Zs|o-luW3n?8bBG%em&kGgN($OrX>LYY9>3`kjNBsT2e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00JFJL_t(o!_Am0Zo@zjhR2qn zVL*UYR8Uw@RV@gK(()dlppgoE07E0g9-yow2MCX>5`#oRg~3rk4q)!0vDTZJeRHIk;I9B9 z71aK?>HKzo_1q963@pNAY#-T-LI&kvDTmZR(Vl`c0;|gk;>An}TbC68KzpAI{PzCD z+EZ|$sal`K$HjN?HyM0?+;m>Hmk}5`MG$;X^K7u>H&zTGd_!RhID@G|jIdlDnnc4H z44uC|K9EYP6yQ|ptr!}odDf0le4q%o+U_n2Ww0DuZFe2#X`aDqyHn<(Y%eSA1&ngW zC4XI3)#X`WZ9z|ohl5fNxv7^>9B6T zzj79)E-Nq2o!f=znEUKnkuph_9tsJ*re zQ)lva%{O=?Z&K&Wq5%NFkg6P;hN~{Ci-o1Gg+$yA8Ua<1CaU2IR!j>D)OZpXJF*BV zg6byi`Lbwt;c1>(6;UvW6YFCr>TpCgIPQLKIyxQJZcA(1<0zNotI;kLLzHeT7qSFn bJskc8mxLlGz_CF>00000NkvXXu0mjfZI>Ws literal 0 HcmV?d00001 diff --git a/imperium-porcorum.love/scenes/debugmenu/mainmenu.lua b/imperium-porcorum.love/scenes/debugmenu/mainmenu.lua index 1b8619e..fd12c72 100644 --- a/imperium-porcorum.love/scenes/debugmenu/mainmenu.lua +++ b/imperium-porcorum.love/scenes/debugmenu/mainmenu.lua @@ -29,8 +29,8 @@ function MenuObject:new(scene) self.isActive = true MapWidget(self) - MainWidget(self, "MANAGE PIGS") - MainWidget(self, "BONUS", "green") + MainWidget(self, "MANAGE PIGS", "blue", "manage") + MainWidget(self, "BONUS", "green", "bonus") OptionsWidget(self) ExitWidget(self) self:addSlot(1, 0, 0, 13, 6) @@ -40,17 +40,20 @@ function MenuObject:new(scene) self:addSlot(5, 13, 9, 13, 3) end -function MainWidget:new(menusystem, label, color) +function MainWidget:new(menusystem, label, color, icon) MainWidget.super.new(self, menusystem) self.scene = menusystem.scene self.label = label or "" self.color = color or "blue" + self.icon = icon or "exit" end function MainWidget:redrawCanvas() self.width, self.height = self.menu:getWidgetSize(self.id) local filename = "assets/sprites/gui/textbox/" .. self.color .. "box.png" self.textbox = game.gui.newTextBox(filename, self.width, self.height) + local iconname = "assets/sprites/menu/" .. self.icon .. ".png" + self.icon = love.graphics.newImage(iconname) MainWidget.super.redrawCanvas(self) end @@ -58,8 +61,11 @@ function MainWidget:drawCanvas() love.graphics.draw(self.textbox, 0, 0) if self.height >= 64 then love.graphics.printf(self.label, 0, 8, self.width, "center") + love.graphics.draw(self.icon, self.width/2, self.height/2 + 12, 0, 1, 1, 19, 19) else love.graphics.printf(self.label, 64, 16, self.width, "left") + love.graphics.draw(self.icon, 19+16, self.height/2, 0, 1, 1, 19, 19) + end end @@ -78,7 +84,7 @@ function MainWidget:draw(x, y) end function MapWidget:new(menusystem) - MapWidget.super.new(self, menusystem, "WORLD MAP", "red") + MapWidget.super.new(self, menusystem, "WORLD MAP", "red", "worldmap") end function MapWidget:action() @@ -94,7 +100,7 @@ function ExitWidget:action() end function OptionsWidget:new(menusystem) - OptionsWidget.super.new(self, menusystem, "OPTIONS", "yellow") + OptionsWidget.super.new(self, menusystem, "OPTIONS", "yellow", "options") end function OptionsWidget:action()