diff --git a/data/actors.lua b/data/actors.lua index c78ee55..3f3dbe3 100644 --- a/data/actors.lua +++ b/data/actors.lua @@ -18,7 +18,12 @@ actors={ add=function(actor) actor.dx,actor.dy=0,0 - actor.surface=surf.load("sprites.gif") + if actor.jailmoji then + actor.surface=jailmoji.get(actor.jailmoji) + actor.gfx={x=0,y=0} + else + actor.surface=surf.load("sprites.gif") + end table.insert(actors.list, actor) end, diff --git a/data/game.lua b/data/game.lua index 6d14f5e..40d58bb 100644 --- a/data/game.lua +++ b/data/game.lua @@ -26,14 +26,14 @@ game={ objects.list={} --actors.main={name="jailer",x=43,y=25,o="u",gfx={x=32,y=0},level="vella"} --game.init("vella") - actors.main={name="jailer",x=12,y=12,o="r",gfx={x=32,y=0},level="arq"} + actors.main={name="jailer",x=12,y=12,o="r",jailmoji="AHDJONAAAAFAACFBBO",level="arq"} game.init("arq") end, startfromeditor=function(s_level, s_x, s_y) flags={} objects.list={} - actors.main={name="jailer",x=s_x,y=s_y,o="d",gfx={x=32,y=0},level=s_level} + actors.main={name="jailer",x=s_x,y=s_y,o="d",jailmoji="AHDJONAAAAFAACFBBO",level=s_level} game.init(s_level) --actors.main={name="jailer",x=8,y=12,o="l",gfx={x=32,y=0},level="arq"} --game.init("arq") @@ -48,7 +48,7 @@ game={ actors.init() switches.reset() if actors.main.level==levelname then - actors.add({name=actors.main.name,x=actors.main.x,y=actors.main.y,o=actors.main.o,gfx=actors.main.gfx}) + actors.add({name=actors.main.name,x=actors.main.x,y=actors.main.y,o=actors.main.o,jailmoji=actors.main.jailmoji}) end levels[game.level].load() diff --git a/data/jailmoji.lua b/data/jailmoji.lua index b0fdd0a..9d91594 100644 --- a/data/jailmoji.lua +++ b/data/jailmoji.lua @@ -91,11 +91,20 @@ jailmoji={ pal.subpal() surf.target(0) + end, + get=function(genstring) + jailmoji.generate(genstring) + local surf = jailmoji.surface + jailmoji.surface = -1 + return surf + end, + + update_text=function() jailmoji.editor.str="" for i=1,#jailmoji.gendata do jailmoji.editor.str = jailmoji.editor.str .. string.char(jailmoji.gendata[i]+65) end end, - + random=function() local str="" str = str .. string.char(math.random(jailmoji.MAX_BASE+1)+64) @@ -130,6 +139,8 @@ jailmoji={ str = str .. string.char(math.random(jailmoji.MAX_COLOR+1)+64) str = str .. string.char(math.random(jailmoji.MAX_COLOR+1)+64) jailmoji.generate(str) + + jailmoji.update_text() end, editor={ @@ -272,6 +283,7 @@ jailmoji={ if jailmoji.editor.changed then jailmoji.editor.changed = false jailmoji.generate() + jailmoji.update_text() --self.str="" --for i=1,#jailmoji.gendata do self.str = self.str .. string.char(jailmoji.gendata[i]+65) end end diff --git a/data/m_repro.lua b/data/m_repro.lua index 09c6768..6049293 100644 --- a/data/m_repro.lua +++ b/data/m_repro.lua @@ -53,7 +53,7 @@ levels["repro"]={ currante1_action=function() local hero = actors.search(actors.main.name) - flags.apuntes=1 + --flags.apuntes=1 if not flags.apuntes then scene.start({