diff --git a/data/actor-bag.gif b/data/actor-bag.gif new file mode 100644 index 0000000..34bd8c0 Binary files /dev/null and b/data/actor-bag.gif differ diff --git a/data/actor-brows.gif b/data/actor-brows.gif new file mode 100644 index 0000000..44a09d0 Binary files /dev/null and b/data/actor-brows.gif differ diff --git a/data/actor-chin.gif b/data/actor-chin.gif new file mode 100644 index 0000000..f6fa363 Binary files /dev/null and b/data/actor-chin.gif differ diff --git a/data/actor-eyes.gif b/data/actor-eyes.gif new file mode 100644 index 0000000..a3403a4 Binary files /dev/null and b/data/actor-eyes.gif differ diff --git a/data/actor-hair.gif b/data/actor-hair.gif index 2dcc18d..9ca16d9 100644 Binary files a/data/actor-hair.gif and b/data/actor-hair.gif differ diff --git a/data/actor-nose.gif b/data/actor-nose.gif new file mode 100644 index 0000000..fd46758 Binary files /dev/null and b/data/actor-nose.gif differ diff --git a/data/jailmoji.lua b/data/jailmoji.lua index dfae671..584df0b 100644 --- a/data/jailmoji.lua +++ b/data/jailmoji.lua @@ -9,6 +9,11 @@ jailmoji={ local surf_base = surf.load("actor-base.gif") local surf_hair = surf.load("actor-hair.gif") + local surf_chin = surf.load("actor-chin.gif") + local surf_nose = surf.load("actor-nose.gif") + local surf_eyes = surf.load("actor-eyes.gif") + local surf_brows = surf.load("actor-brows.gif") + local surf_bag = surf.load("actor-bag.gif") if jailmoji.surface ~= -1 then surf.free(jailmoji.surface) end jailmoji.surface = surf.new(32,48) @@ -21,14 +26,58 @@ jailmoji={ pal.subpal(25,jailmoji.gendata[6]+1) -- pell2 pal.subpal(23,jailmoji.gendata[15]+1) -- monyo pal.subpal(26,jailmoji.gendata[11]+1) -- ulls + pal.subpal(27,jailmoji.gendata[13]+1) -- celles + pal.subpal(28,jailmoji.gendata[17]+1) -- motxilla1 + pal.subpal(29,jailmoji.gendata[18]+1) -- motxilla2 surf.source(surf_base) local dx=jailmoji.gendata[1]*32 draw.surf(dx,0,32,48,0,0) + + surf.source(surf_bag) + local dx=jailmoji.gendata[16]*6 + draw.surf(dx,0,6,5,5,25) + draw.surf(dx,0,6,5,21,26) + draw.surf(dx,5,6,5,8,41) + draw.surf(dx+3,5,2,2,27,42) + surf.source(surf_hair) local dx=jailmoji.gendata[14]*16 draw.surf(dx,0,16,48,0,0) draw.surf(dx,0,16,48,16,1) + + surf.source(surf_eyes) + local dx=jailmoji.gendata[10]*4 + draw.surf(dx,0,4,2,4,7,4,2,true) + draw.surf(dx,0,4,2,8,7) + draw.surf(dx,0,4,2,20,8,4,2,true) + draw.surf(dx,0,4,2,24,8) + draw.surf(dx,0,4,2,4,38) + draw.surf(dx,0,4,2,20,39) + + surf.source(surf_brows) + local dx=jailmoji.gendata[12]*2 + draw.surf(dx,0,2,2,5,6,2,2,true) + draw.surf(dx,0,2,2,9,6) + draw.surf(dx,0,2,2,21,7,2,2,true) + draw.surf(dx,0,2,2,25,7) + draw.surf(dx,0,2,2,5,37) + draw.surf(dx,0,2,2,21,38) + + surf.source(surf_chin) + local dx=jailmoji.gendata[7]*8 + draw.surf(dx,0,8,4,4,9) + draw.surf(dx,0,8,4,20,10) + draw.surf(dx,4,8,4,1,40) + draw.surf(dx,4,8,4,17,41) + + surf.source(surf_nose) + local dx=jailmoji.gendata[8]*4 + draw.surf(dx,4,4,4,6,7) + draw.surf(dx,4,4,4,22,8) + draw.surf(dx,0,4,4,0,37) + draw.surf(dx,0,4,4,16,38) + pal.subpal() surf.target(0) @@ -39,12 +88,13 @@ jailmoji={ view=0, animated=false, changed=false, + str="", show=function() jailmoji.editor.old_update=update update=jailmoji.editor.update --jailmoji.surface = surf.load("actor-base.gif") - jailmoji.generate("AABJONAAAAEAAAEAA") + jailmoji.generate("AABJONAAAAEAAAEAAB") end, text_button=function(x, y, label, current_value, own_value) @@ -98,9 +148,10 @@ jailmoji={ update=function() local self = jailmoji.editor - draw.rectf(10,10, 140, 120,5) - draw.rect(10,10, 140, 120,8) - draw.text("JAILMOJI EDITOR",20,14,8) + draw.rectf(10,10, 140, 100,5) + draw.rectf(10,10, 140, 10,9) + draw.rect(10,10, 140, 100,8) + draw.text("JAILMOJI EDITOR",14,13,8) draw.rectf(19,23, 50, 50,7) draw.rect(19,23, 50, 50,8) surf.source(jailmoji.surface) @@ -120,7 +171,7 @@ jailmoji={ view.origin(-70,-23) draw.text("Vestit:",1,2,8) - jailmoji.gendata[1] = self.spin_button(28,0,jailmoji.gendata[1],4) + jailmoji.gendata[1] = self.spin_button(28,0,jailmoji.gendata[1],3) jailmoji.gendata[2] = self.color_button(38,0,jailmoji.gendata[2]) jailmoji.gendata[3] = self.color_button(48,0,jailmoji.gendata[3]) jailmoji.gendata[4] = self.color_button(58,0,jailmoji.gendata[4]) @@ -130,31 +181,57 @@ jailmoji={ jailmoji.gendata[6] = self.color_button(38,10,jailmoji.gendata[6]) draw.text("Cara:",1,22,8) - jailmoji.gendata[7] = self.spin_button(28,20,jailmoji.gendata[7],10) - jailmoji.gendata[8] = self.spin_button(38,20,jailmoji.gendata[8],10) - jailmoji.gendata[9] = self.spin_button(48,20,jailmoji.gendata[9],10) + jailmoji.gendata[7] = self.spin_button(28,20,jailmoji.gendata[7],8) + jailmoji.gendata[8] = self.spin_button(38,20,jailmoji.gendata[8],9) + jailmoji.gendata[9] = self.spin_button(48,20,jailmoji.gendata[9],1) draw.text("Ulls:",1,32,8) - jailmoji.gendata[10] = self.spin_button(28,30,jailmoji.gendata[10],10) + jailmoji.gendata[10] = self.spin_button(28,30,jailmoji.gendata[10],7) jailmoji.gendata[11] = self.color_button(38,30,jailmoji.gendata[11]) - jailmoji.gendata[12] = self.spin_button(48,30,jailmoji.gendata[12],10) + jailmoji.gendata[12] = self.spin_button(48,30,jailmoji.gendata[12],4) jailmoji.gendata[13] = self.color_button(58,30,jailmoji.gendata[13]) draw.text("Monyo:",1,42,8) - jailmoji.gendata[14] = self.spin_button(28,40,jailmoji.gendata[14],7) + jailmoji.gendata[14] = self.spin_button(28,40,jailmoji.gendata[14],11) jailmoji.gendata[15] = self.color_button(38,40,jailmoji.gendata[15]) draw.text("Motxilla:",1,52,8) - jailmoji.gendata[16] = self.spin_button(38,50,jailmoji.gendata[16],10) + jailmoji.gendata[16] = self.spin_button(38,50,jailmoji.gendata[16],3) jailmoji.gendata[17] = self.color_button(48,50,jailmoji.gendata[17]) + jailmoji.gendata[18] = self.color_button(58,50,jailmoji.gendata[18]) view.origin(0,0) if jailmoji.editor.changed then jailmoji.editor.changed = false jailmoji.generate() + self.str="" + for i=1,#jailmoji.gendata do self.str = self.str .. string.char(jailmoji.gendata[i]+65) end + end + draw.rectf(19,88, 122, 9,7) + draw.rect(19,88, 122, 9,8) + draw.text(self.str,21,90,8) + + local mx,my = mouse.pos() mx,my = view.tolocal(mx,my) + draw.rectf(19,98, 24, 9,9) + draw.rect(19,98, 24, 9,8) + draw.text("COPY",23,100,8) + if mx>=19 and mx<19+24 and my>=98 and my<98+9 and mouse.press(mouse.LEFT) then + sys.clipboard(self.str) end + draw.rectf(116,98, 25, 9,10) + draw.rect(116,98, 25, 9,8) + draw.text("EIXIR",119,100,8) + if mx>=116 and mx<116+25 and my>=98 and my<98+9 and mouse.press(mouse.LEFT) then + if self.old_update then + update = self.old_update + else + surf.source(0) + surf.cls(0) + show_main_menu() + end + end end, }, } \ No newline at end of file